From 106b5117fd75230a729191edcd57e4a364e6a04c Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Thu, 17 Nov 2005 01:49:21 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2005 (patch 263, 266-268) Patches applied: * mwolson@gnu.org--2005/muse--main--1.0--patch-263 Fix mistyping of new option name. * mwolson@gnu.org--2005/muse--main--1.0--patch-266 Call pdflatex a reasonable number of times. * mwolson@gnu.org--2005/muse--main--1.0--patch-267 muse-latex: Fix "generation of PDF failed" message. * mwolson@gnu.org--2005/muse--main--1.0--patch-268 Allow "-" in publishing directives. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-6 --- ChangeLog | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.defs | 4 ++-- debian/changelog | 7 +++++++ debian/rules | 2 +- lisp/muse-latex.el | 20 +++++++++++++++--- lisp/muse-publish.el | 6 +++--- 6 files changed, 88 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28c2278..57b5c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,64 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-11-16 23:56:20 GMT Michael Olson patch-268 + + Summary: + Allow "-" in publishing directives. + Revision: + muse--main--1.0--patch-268 + + * lisp/muse-publish.el (muse-publish-markup-regexps): Allow "-" in + publishing directives. Thanks to Jim Ottaway for the suggestion. + + modified files: + ChangeLog lisp/muse-publish.el + + +2005-11-14 20:28:47 GMT Michael Olson patch-267 + + Summary: + muse-latex: Fix "generation of PDF failed" message. + Revision: + muse--main--1.0--patch-267 + + * lisp/muse-latex.el (muse-latex-pdf-generate): Make sure that we return + t or nil depending on whether the publishing attempt was successful. + + modified files: + ChangeLog lisp/muse-latex.el + + +2005-11-10 01:26:15 GMT Michael Olson patch-266 + + Summary: + Call pdflatex a reasonable number of times. + Revision: + muse--main--1.0--patch-266 + + * lisp/muse-latex.el (muse-latex-pdf-generate): Call pdflatex up to 3 + times, depending on what return value we get. Thanks to John Wiegley + for the heads up. + + modified files: + ChangeLog Makefile.defs debian/changelog debian/rules + lisp/muse-latex.el + + +2005-10-31 20:38:52 GMT Michael Olson patch-263 + + Summary: + Fix mistyping of new option name. + Revision: + muse--main--1.0--patch-263 + + * lisp/muse-publish.el (muse-publish-markup-comment) + (muse-publish-comment-tag): s/markup-//g. Fix mistyping of new option. + + modified files: + ChangeLog lisp/muse-publish.el + + 2005-10-29 09:15:07 GMT Michael Olson patch-257 Summary: diff --git a/Makefile.defs b/Makefile.defs index cc5ce4f..7ede7cc 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -20,6 +20,6 @@ INSTALLINFO = install-info --info-dir=$(INFODIR) #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR) # Useful only for the maintainer -VERSION = 3.02.01 -LASTUPLOAD = 3.02-1 +VERSION = 3.02.01.arch.265 +LASTUPLOAD = 3.02.01-1 BUILDOPTS = diff --git a/debian/changelog b/debian/changelog index 8b90910..640b250 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +muse-el (3.02.01.arch.265-1) unstable; urgency=low + + * New Arch snapshot. + * debian/rules: Update dh_compat to v5. + + -- Michael W. Olson (GNU address) Sun, 6 Nov 2005 19:08:38 -0500 + muse-el (3.02.01-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index cb355d7..5eef1d7 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ DOCDIR = /usr/share/doc/${PACKAGE} LISPDIR = /usr/share/emacs/site-lisp/${PACKAGE} # This is the debhelper compatibility version to use. -export DH_COMPAT=3 +export DH_COMPAT=5 configure: configure-stamp configure-stamp: diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el index 47061ed..7bd442b 100644 --- a/lisp/muse-latex.el +++ b/lisp/muse-latex.el @@ -322,9 +322,23 @@ If the anchor occurs at the end of a line, ignore it." file output-path final-target "PDF" (function (lambda (file output-path) - (let ((command (format "cd \"%s\"; pdflatex \"%s\"; pdflatex \"%s\"" - (file-name-directory output-path) file file))) - (shell-command command)))) + (let ((command (format "cd \"%s\"; pdflatex \"%s\"" + (file-name-directory output-path) file)) + (times 0) + result) + ;; XEmacs can sometimes return a non-number result. We'll err + ;; on the side of caution by continuing to attempt to generate + ;; the PDF if this happens and treat the final result as + ;; successful. + (while (and (< times 3) + (or (not (numberp result)) + (not (eq result 0)))) + (setq result (shell-command command) + times (1+ times))) + (if (or (not (numberp result)) + (eq result 0)) + t + nil)))) ".aux" ".toc" ".out" ".log")) (unless (assoc "latex" muse-publishing-styles) diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index c8688c9..cb4d2f2 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -94,7 +94,7 @@ If non-nil, publish comments using the markup of the current style." (1100 ,(concat "[" muse-regexp-blank "]+$") 0 "") ;; Handle any leading #directives - (1200 "\\`#\\([a-zA-Z]+\\)\\s-+\\(.+\\)\n+" 0 directive) + (1200 "\\`#\\([a-zA-Z-]+\\)\\s-+\\(.+\\)\n+" 0 directive) ;; markup tags (1300 muse-tag-regexp 0 tag) @@ -673,7 +673,7 @@ the file is published no matter what." (defun muse-publish-markup-anchor () "") (defun muse-publish-markup-comment () - (if (null muse-publish-markup-comments-p) + (if (null muse-publish-comments-p) "" (goto-char (match-end 0)) (muse-insert-markup (muse-markup-text 'comment-end)) @@ -1164,7 +1164,7 @@ like read-only from being inadvertently deleted." (muse-publish-mark-read-only beg (point)))) (defun muse-publish-comment-tag (beg end) - (if (null muse-publish-markup-comments-p) + (if (null muse-publish-comments-p) (delete-region beg end) (goto-char end) (muse-insert-markup (muse-markup-text 'comment-end)) -- 2.11.4.GIT