From 6ed53e56f0830718834bdecf366b3ac5b6e87ae2 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 19 Nov 2005 06:08:20 +0000 Subject: [PATCH] Merged from mwolson@gnu.org--2005 (patch 272-273) Patches applied: * mwolson@gnu.org--2005/muse--main--1.0--patch-272 muse-texinfo: Correct markup strings for dots, enddots, center. * mwolson@gnu.org--2005/muse--main--1.0--patch-273 muse-latex: Make footnotes look a bit more natural for LaTeX users. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-19 --- AUTHORS | 13 +++++++------ ChangeLog | 24 ++++++++++++++++++++++++ ChangeLog.main | 31 +++++++++++++++++++++++++++++++ lisp/muse-latex.el | 2 -- lisp/muse-texinfo.el | 8 ++++---- 5 files changed, 66 insertions(+), 12 deletions(-) diff --git a/AUTHORS b/AUTHORS index f41ab1f..a974b51 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,7 +9,7 @@ John Wiegley: Original author Michael Olson: Current maintainer Trent Buck: Contributor, - muse-latex.el: 4 lines changed + muse-latex.el: 4 lines changed. Sacha Chua: Contributor -- documentation (assigned past and future changes) @@ -29,9 +29,10 @@ Peter K. Lee: Contributor, (assignment pending) Jim Ottaway: Contributor, - muse-latex.el: 1 line changed - muse-mode.el: 7 lines changed - muse-wiki.el: 7 lines changed + 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) Andrea Riciputi: Idea taken from code, but re-implemented @@ -50,10 +51,10 @@ Gary Vaughan: Original author of emacs-wiki-blosxom.el, which was the (assigned past and future changes) Sergey Vlasov: Contributor, - muse-colors.el: 3 lines changed + muse-colors.el: 3 lines changed. Lan Yufeng: Contributor, - muse-colors.el: 1 line changed + muse-colors.el: 1 line changed. Contributed software diff --git a/ChangeLog b/ChangeLog index 1fdaee6..c53f350 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,30 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2005-11-19 06:08:20 GMT Michael Olson patch-19 + + Summary: + Merged from mwolson@gnu.org--2005 (patch 272-273) + Revision: + muse--rel--3.02--patch-19 + + Patches applied: + + * mwolson@gnu.org--2005/muse--main--1.0--patch-272 + muse-texinfo: Correct markup strings for dots, enddots, center. + + * mwolson@gnu.org--2005/muse--main--1.0--patch-273 + muse-latex: Make footnotes look a bit more natural for LaTeX users. + + modified files: + AUTHORS ChangeLog ChangeLog.main lisp/muse-latex.el + lisp/muse-texinfo.el + + new patches: + mwolson@gnu.org--2005/muse--main--1.0--patch-272 + mwolson@gnu.org--2005/muse--main--1.0--patch-273 + + 2005-11-19 05:51:32 GMT Michael Olson patch-18 Summary: diff --git a/ChangeLog.main b/ChangeLog.main index 57b5c11..d1c8709 100644 --- a/ChangeLog.main +++ b/ChangeLog.main @@ -2,6 +2,37 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-11-19 00:01:26 GMT Michael Olson patch-273 + + Summary: + muse-latex: Make footnotes look a bit more natural for LaTeX users. + Revision: + muse--main--1.0--patch-273 + + * lisp/muse-latex.el (muse-latex-markup-strings): Remove markup strings + for footnotemark and footnotetext-end, as recommended by Jim Ottaway. + + modified files: + ChangeLog lisp/muse-latex.el + + +2005-11-18 23:56:22 GMT Michael Olson patch-272 + + Summary: + muse-texinfo: Correct markup strings for dots, enddots, center. + Revision: + muse--main--1.0--patch-272 + + * AUTHORS: Bookkeeping + + * lisp/muse-texinfo.el (muse-texinfo-markup-strings): Apply patch from + Jim Ottaway that produces correct output for dots, enddots, and + centered text. + + modified files: + AUTHORS ChangeLog lisp/muse-texinfo.el + + 2005-11-16 23:56:20 GMT Michael Olson patch-268 Summary: diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el index 6dfa3b9..617e490 100644 --- a/lisp/muse-latex.el +++ b/lisp/muse-latex.el @@ -181,9 +181,7 @@ For more on the structure of this list, see (section-other-end . "}") (footnote . "\\footnote{") (footnote-end . "}") - (footnotemark . "\\footnotemark[%d]") (footnotetext . "\\footnotetext[%d]{") - (footnotetext-end . "}") (begin-underline . "\\underline{") (end-underline . "}") (begin-literal . "\\texttt{") diff --git a/lisp/muse-texinfo.el b/lisp/muse-texinfo.el index 52a0b56..359276b 100644 --- a/lisp/muse-texinfo.el +++ b/lisp/muse-texinfo.el @@ -134,8 +134,8 @@ For more on the structure of this list, see (comment-begin . "@ignore\n") (comment-end . "\n@end ignore\n") (rule . "@sp 1") - (enddots . "@enddots") - (dots . "@dots") + (enddots . "@enddots{}") + (dots . "@dots{}") (section . "@chapter ") (subsection . "@section ") (subsubsection . "@subsection ") @@ -158,8 +158,8 @@ For more on the structure of this list, see (end-verse . "\n@end display") (begin-example . "@example") (end-example . "@end example") - (begin-center . "@center\n") - (end-center . "\n@end center") + (begin-center . "@quotation\n") + (end-center . "\n@end quotation") (begin-quote . "@quotation\n") (end-quote . "\n@end quotation") (begin-uli . "@itemize @bullet\n@item\n") -- 2.11.4.GIT