From 075c4543be79463173aa5302209f6f6a301dd1ec Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Fri, 6 Jan 2006 20:29:16 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2005 (patch 279, 311, 318) Patches applied: * mwolson@gnu.org--2005/muse--main--1.0--patch-279 Update AUTHORS. * mwolson@gnu.org--2005/muse--main--1.0--patch-311 muse-build: Prevent backup files when generating autoloads. * mwolson@gnu.org--2005/muse--main--1.0--patch-318 Fix a markup error involving links like [[#foo]]. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-48 --- AUTHORS | 8 ++----- ChangeLog | 29 ++++++++++++++++++++++++++ ChangeLog.main | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ lisp/muse-docbook.el | 9 ++++---- lisp/muse-html.el | 35 ++++++++++++++++--------------- lisp/muse-latex.el | 3 ++- lisp/muse-publish.el | 8 +++---- lisp/muse-texinfo.el | 9 ++++---- lisp/muse-xml.el | 9 ++++---- scripts/muse-build.el | 1 + 10 files changed, 129 insertions(+), 40 deletions(-) diff --git a/AUTHORS b/AUTHORS index dbb56af..69df20a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,12 +31,8 @@ Peter K. Lee: Contributor, Phillip Lord: Contributor, muse-colors.el: 3 lines changed. -Jim Ottaway: Contributor, - muse-latex.el: 1 line changed. - muse-mode.el: 7 lines changed. - muse-texinfo.el: 4 lines changed. - muse-wiki.el: 7 lines changed. - (assignment pending) +Jim Ottaway: Contributor + (assigned past and future changes) Andrea Riciputi: Idea taken from code, but re-implemented diff --git a/ChangeLog b/ChangeLog index 28b7b5d..1122f6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,35 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2006-01-06 20:29:16 GMT Michael Olson patch-48 + + Summary: + Merged from mwolson@gnu.org--2005 (patch 279, 311, 318) + Revision: + muse--rel--3.02--patch-48 + + Patches applied: + + * mwolson@gnu.org--2005/muse--main--1.0--patch-279 + Update AUTHORS. + + * mwolson@gnu.org--2005/muse--main--1.0--patch-311 + muse-build: Prevent backup files when generating autoloads. + + * mwolson@gnu.org--2005/muse--main--1.0--patch-318 + Fix a markup error involving links like [[#foo]]. + + modified files: + AUTHORS ChangeLog ChangeLog.main lisp/muse-docbook.el + lisp/muse-html.el lisp/muse-latex.el lisp/muse-publish.el + lisp/muse-texinfo.el lisp/muse-xml.el scripts/muse-build.el + + new patches: + mwolson@gnu.org--2005/muse--main--1.0--patch-279 + mwolson@gnu.org--2005/muse--main--1.0--patch-311 + mwolson@gnu.org--2005/muse--main--1.0--patch-318 + + 2006-01-06 19:27:17 GMT Michael Olson patch-47 Summary: diff --git a/ChangeLog.main b/ChangeLog.main index d18999c..f9f3dec 100644 --- a/ChangeLog.main +++ b/ChangeLog.main @@ -171,6 +171,51 @@ lisp/muse-texinfo.el lisp/muse-xml.el +2005-12-25 03:15:36 GMT Michael Olson patch-318 + + Summary: + Fix a markup error involving links like [[#foo]]. + Revision: + muse--main--1.0--patch-318 + + * examples/QuickStart.muse: Move higher. Remove + tags around the centered text. + + * lisp/muse-html.el (muse-html-markup-regexps): Cosmetic change. + (muse-html-markup-strings): Remove table-group strings, since they + aren't valid (X)HTML like I had thought. Change center to use

+ rather than . + (muse-html-insert-anchor): Remove. + (muse-html-markup-anchor): Respect the noemphasis property. This fixes + a bug with links like [[#foo]]. + (muse-html-markup-footnote): Insert the correct footnote number. + + * lisp/muse-publish.el (muse-publish-markup-regexps): Make noemphasis + rule higher than anchor rule. + (muse-publish-markup-anchor): Respect the noemphasis property. + + * lisp/muse-xml-common.el (muse-xml-markup-anchor): Respect the + noemphasis property. + + modified files: + ChangeLog examples/QuickStart.muse lisp/muse-html.el + lisp/muse-publish.el lisp/muse-xml-common.el + + +2005-12-23 01:42:39 GMT Michael Olson patch-311 + + Summary: + muse-build: Prevent backup files when generating autoloads. + Revision: + muse--main--1.0--patch-311 + + * scripts/muse-build.el (muse-generate-autoloads): Inhibit backups so + that we don't get muse-autoloads.el~ files. + + modified files: + ChangeLog scripts/muse-build.el + + 2005-12-17 01:19:30 GMT Michael Olson patch-305 Summary: @@ -432,6 +477,19 @@ AUTHORS ChangeLog lisp/muse-colors.el +2005-11-21 21:14:20 GMT Michael Olson patch-279 + + Summary: + Update AUTHORS. + Revision: + muse--main--1.0--patch-279 + + * AUTHORS: Update. + + modified files: + AUTHORS ChangeLog + + 2005-11-21 21:11:14 GMT Michael Olson patch-278 Summary: diff --git a/lisp/muse-docbook.el b/lisp/muse-docbook.el index 9847960..3d6cd75 100644 --- a/lisp/muse-docbook.el +++ b/lisp/muse-docbook.el @@ -254,10 +254,11 @@ match is found, `muse-docbook-charset-default' is used instead." (defun muse-docbook-insert-anchor (anchor) "Insert an anchor, either before the next word, or within a tag." - (skip-chars-forward muse-regexp-space) - (when (looking-at "<\\([^ />]+\\)>") - (goto-char (match-end 0))) - (insert "\n")) + (unless (get-text-property (match-end 1) 'noemphasis) + (skip-chars-forward muse-regexp-space) + (when (looking-at "<\\([^ />]+\\)>") + (goto-char (match-end 0))) + (insert "\n"))) (defun muse-docbook-markup-anchor () (save-match-data diff --git a/lisp/muse-html.el b/lisp/muse-html.el index c1e2b32..1168846 100644 --- a/lisp/muse-html.el +++ b/lisp/muse-html.el @@ -330,8 +330,8 @@ differs little between the various styles." (fn-sep . "

\n") (begin-underline . "") (end-underline . "") - (begin-center . "\n") - (end-center . "\n") + (begin-center . "

\n") + (end-center . "\n

") (end-verse-line . "
") (end-last-stanza-line . "
") (empty-verse-line . "
")) @@ -423,21 +423,22 @@ system to an associated HTML coding system. If no match is found, (defun muse-html-insert-anchor (anchor) "Insert an anchor, either around the word at point, or within a tag." - (skip-chars-forward muse-regexp-space) - (if (looking-at "<\\([^ />]+\\)>") - (let ((tag (match-string 1))) - (goto-char (match-end 0)) - (insert "") - (when muse-html-anchor-on-word - (or (and (search-forward (format "" tag) - (muse-line-end-position) t) - (goto-char (match-beginning 0))) - (forward-word 1))) - (insert "")) - (insert "") - (when muse-html-anchor-on-word - (forward-word 1)) - (insert "\n"))) + (unless (get-text-property (match-end 1) 'noemphasis) + (skip-chars-forward muse-regexp-space) + (if (looking-at "<\\([^ />]+\\)>") + (let ((tag (match-string 1))) + (goto-char (match-end 0)) + (insert "") + (when muse-html-anchor-on-word + (or (and (search-forward (format "" tag) + (muse-line-end-position) t) + (goto-char (match-beginning 0))) + (forward-word 1))) + (insert "")) + (insert "") + (when muse-html-anchor-on-word + (forward-word 1)) + (insert "\n")))) (defun muse-html-markup-anchor () (save-match-data diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el index 5447fd2..c10fafa 100644 --- a/lisp/muse-latex.el +++ b/lisp/muse-latex.el @@ -274,7 +274,8 @@ This applies to text in \\texttt{} regions." (defun muse-latex-insert-anchor (anchor) "Insert an anchor, either around the word at point, or within a tag. If the anchor occurs at the end of a line, ignore it." - (unless (bolp) ; point is placed after newline if anchor at end + (unless (or (bolp) ; point is placed after newline if anchor at end + (get-text-property (match-end 1) 'noemphasis)) (skip-chars-forward muse-regexp-space) (if (looking-at "<\\([^ />]+\\)>") (let ((tag (match-string 1))) diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index b9bdcbb..a7666a2 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -102,11 +102,11 @@ If non-nil, publish comments using the markup of the current style." ;; commented lines (1350 "^;\\s-+\\(.+\\)" 0 comment) - ;; define anchor points - (1400 "^\\(\\W*\\)#\\(\\S-+\\)\\s-*" 0 anchor) - ;; prevent emphasis characters in explicit links from being marked - (1500 muse-explicit-link-regexp 0 muse-publish-mark-noemphasis) + (1400 muse-explicit-link-regexp 0 muse-publish-mark-noemphasis) + + ;; define anchor points + (1500 "^\\(\\W*\\)#\\(\\S-+\\)\\s-*" 0 anchor) ;; emphasized or literal text (1600 ,(concat diff --git a/lisp/muse-texinfo.el b/lisp/muse-texinfo.el index 95d1d8e..3d9577b 100644 --- a/lisp/muse-texinfo.el +++ b/lisp/muse-texinfo.el @@ -186,10 +186,11 @@ differs little between the various styles." (defun muse-texinfo-insert-anchor (anchor) "Insert an anchor, either before the next word, or within a tag." - (skip-chars-forward muse-regexp-space) - (when (looking-at "<\\([^ />]+\\)>") - (goto-char (match-end 0))) - (insert "@anchor{" anchor "}")) + (unless (get-text-property (match-end 1) 'noemphasis) + (skip-chars-forward muse-regexp-space) + (when (looking-at "<\\([^ />]+\\)>") + (goto-char (match-end 0))) + (insert "@anchor{" anchor "}"))) (defun muse-texinfo-markup-anchor () (save-match-data diff --git a/lisp/muse-xml.el b/lisp/muse-xml.el index a3effa4..cb90130 100644 --- a/lisp/muse-xml.el +++ b/lisp/muse-xml.el @@ -266,10 +266,11 @@ match is found, `muse-xml-charset-default' is used instead." (defun muse-xml-insert-anchor (anchor) "Insert an anchor, either around the word at point, or within a tag." - (skip-chars-forward muse-regexp-space) - (when (looking-at "<\\([^ />]+\\)>") - (goto-char (match-end 0))) - (insert "\n")) + (unless (get-text-property (match-end 1) 'noemphasis) + (skip-chars-forward muse-regexp-space) + (when (looking-at "<\\([^ />]+\\)>") + (goto-char (match-end 0))) + (insert "\n"))) (defun muse-xml-markup-anchor () (save-match-data diff --git a/scripts/muse-build.el b/scripts/muse-build.el index 334f6d0..e30bee5 100644 --- a/scripts/muse-build.el +++ b/scripts/muse-build.el @@ -42,6 +42,7 @@ (defvar command-line-args-left) (defvar generated-autoload-file) (require 'autoload) + (setq backup-inhibited t) (setq generated-autoload-file (expand-file-name "muse-autoloads.el")) (setq command-line-args-left (mapcar #'expand-file-name command-line-args-left)) -- 2.11.4.GIT