From 1236895f4eb93bd99e819e56aadeb0e8312dc478 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sun, 29 Jul 2007 17:03:12 +0000
Subject: [PATCH] Merged from mwolson@gnu.org--2006-muse-el/muse-el--devel--0
 (patch 170)

Patches applied:

 * mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-170
   Fixed the "rule" command in latex and context styles; defined verse
   mechanism and fixed problems with muse-context-markup-specials-literal
   in context
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-421
---
 ChangeLog            |  9 +++++++++
 lisp/muse-context.el | 21 +++++++--------------
 lisp/muse-latex.el   |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e61fc4a..801e097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-29  cordier   <jean@bornier.net>
+
+	* lisp/muse-latex.el (muse-latex-markup-strings): Change rule
+	command which did not work correctly
+
+	* lisp/muse-context.el (muse-context-markup-strings): Change rule
+	command which did not work correctly; defined verse commands
+	(muse-context-markup-specials-literal): Eliminate all unuseful entries
+
 2007-07-29  Michael Olson  <mwolson@gnu.org>
 
 	* contrib/httpd.el (httpd-send-file): Use
diff --git a/lisp/muse-context.el b/lisp/muse-context.el
index 0d34413..876ec39 100644
--- a/lisp/muse-context.el
+++ b/lisp/muse-context.el
@@ -127,7 +127,7 @@ For more on the structure of this list, see
     (emdash          . "---")
     (comment-begin   . "\\doifmode{comment}{")
     (comment-end     . "}")
-    (rule            . "\\bigskip")
+    (rule            . "\\blank[medium]\\hrule\\blank[medium]")
     (no-break-space  . "~")
     (enddots         . "\\ldots ")
     (dots            . "\\dots ")
@@ -175,7 +175,11 @@ For more on the structure of this list, see
     (begin-dl        . "\\startitemize\n")
     (end-dl          . "\n\\stopitemize")
     (begin-ddt       . "\\head ")
-    (end-ddt         . "\n"))
+    (end-ddt         . "\n")
+    (begin-verse     . "\\blank[big]")
+    (end-verse-line  . "\\par")
+    (verse-space     . "\\fixedspaces ~~")
+    (end-verse       . "\\blank[big]"))
   "Strings used for marking up text.
 These cover the most basic kinds of markup, the handling of which
 differs little between the various styles."
@@ -242,18 +246,7 @@ need to be escaped."
   :group 'muse-context)
 
 (defcustom muse-context-markup-specials-literal
-  '((?\n . "\\\n")
-    (?_  . "\\textunderscore")
-    (?\< . "\\switchtobodyfont[small]")
-    (?\> . "\\switchtobodyfont[big]")
-    (?^  . "\\type{^}")
-    (?\~ . "\\type{~}")
-    (?\$ . "\\type{$}")
-    (?\% . "\\type{%}")
-    (?\{ . "\\type{{}")
-    (?\} . "\\type{}}")
-    (?\& . "\\type{&}")
-    (?\# . "\\type{#}"))
+  '()
   "A table of characters which must be represented specially.
 This applies to =monospaced text= and <code> regions."
   :type '(alist :key-type character :value-type string)
diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el
index 834c92d..5d37787 100644
--- a/lisp/muse-latex.el
+++ b/lisp/muse-latex.el
@@ -229,7 +229,7 @@ For more on the structure of this list, see
     (anchor          . "\\label{%s}")
     (emdash          . "---")
     (comment-begin   . "% ")
-    (rule            . "\\bigskip")
+    (rule            . "\\vspace{.5cm}\\hrule\\vspace{.5cm}")
     (no-break-space  . "~")
     (enddots         . "\\ldots{}")
     (dots            . "\\dots{}")
-- 
2.11.4.GIT