From d8e1d7d9dcfbef4636abc8c910a68cb203f70142 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 13 Aug 2005 00:25:54 +0000 Subject: [PATCH] Minor fixups from Peter K. Lee. * experimental/muse-xml.el (muse-xml-fixup-tables): Be slightly less restrictive with our end-of-table regexp. * lisp/muse-docbook.el (muse-docbook-fixup-tables): Look for tgroup instead of start of table. Be less restrictive with several of our regexps. * lisp/muse-html.el: Patch from Peter K. Lee. (muse-html-prepare-buffer): Work around edge case where the "charset=" part has already been appended to muse-html-meta-content-type. (muse-html-fixup-tables): Be slightly less restrictive with our end-of-table regexp. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-199 --- ChangeLog | 25 +++++++++++++++++++++++++ experimental/muse-xml.el | 2 +- lisp/muse-docbook.el | 6 +++--- lisp/muse-html.el | 9 ++++++--- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99334f0..4db0c31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,31 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-08-13 00:25:54 GMT Michael Olson patch-199 + + Summary: + Minor fixups from Peter K. Lee. + Revision: + muse--main--1.0--patch-199 + + * experimental/muse-xml.el (muse-xml-fixup-tables): Be slightly less + restrictive with our end-of-table regexp. + + * lisp/muse-docbook.el (muse-docbook-fixup-tables): Look for tgroup + instead of start of table. Be less restrictive with several of our + regexps. + + * lisp/muse-html.el: Patch from Peter K. Lee. + (muse-html-prepare-buffer): Work around edge case where the "charset=" + part has already been appended to muse-html-meta-content-type. + (muse-html-fixup-tables): Be slightly less restrictive with our + end-of-table regexp. + + modified files: + ChangeLog experimental/muse-xml.el lisp/muse-docbook.el + lisp/muse-html.el + + 2005-08-12 20:36:10 GMT Michael Olson patch-198 Summary: diff --git a/experimental/muse-xml.el b/experimental/muse-xml.el index e881c04..86af837 100644 --- a/experimental/muse-xml.el +++ b/experimental/muse-xml.el @@ -277,7 +277,7 @@ match is found, `muse-xml-charset-default' is used instead." (forward-line 1) (save-restriction (let ((beg (point))) - (narrow-to-region beg (and (re-search-forward "^$" + (narrow-to-region beg (and (re-search-forward "^" nil t) (match-beginning 0)))) (goto-char (point-min)) diff --git a/lisp/muse-docbook.el b/lisp/muse-docbook.el index 56b54a9..d2df34d 100644 --- a/lisp/muse-docbook.el +++ b/lisp/muse-docbook.el @@ -304,12 +304,12 @@ and anything after `Firstname' is optional." "Sort table parts." (goto-char (point-min)) (let (last) - (while (re-search-forward "^$" nil t) + (while (re-search-forward "^ *]*>$" nil t) (unless (get-text-property (point) 'read-only) - (forward-line 2) + (forward-line 1) (save-restriction (let ((beg (point))) - (narrow-to-region beg (and (re-search-forward "^ $" + (narrow-to-region beg (and (re-search-forward "^ *" nil t) (match-beginning 0)))) (goto-char (point-min)) diff --git a/lisp/muse-html.el b/lisp/muse-html.el index 2c6c01e..7ba3d6a 100644 --- a/lisp/muse-html.el +++ b/lisp/muse-html.el @@ -576,8 +576,11 @@ if not escaped." (cons 'muse-html-escape-string muse-publish-url-transforms)) (make-local-variable 'muse-html-meta-http-equiv) (set (make-local-variable 'muse-html-meta-content-type) - (concat muse-html-meta-content-type "; charset=" - (muse-html-encoding)))) + (if (save-match-data + (string-match "charset=" muse-html-meta-content-type)) + muse-html-meta-content-type + (concat muse-html-meta-content-type "; charset=" + (muse-html-encoding))))) (defun muse-html-fixup-tables () "Sort table parts." @@ -588,7 +591,7 @@ if not escaped." (forward-line 1) (save-restriction (let ((beg (point))) - (narrow-to-region beg (and (re-search-forward "^$" + (narrow-to-region beg (and (re-search-forward "^" nil t) (match-beginning 0)))) (goto-char (point-min)) -- 2.11.4.GIT