add < > to markup lexer mode (backportme)

diff --git a/ChangeLog b/ChangeLog
index c8c0aad7c23ab3a9d7dcf88dd99bc114ef647200..19030afcf3877194ce8f8e2a01621afb33efc257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/lexer.ll: add < >  to markup lexer mode (backportme)
+
        * scripts/abc2ly.py (dump_slyrics): add ord(). 
 
        * lily/note-heads-engraver.cc (process_music): add shapeNoteStyles

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 424d09575a90b9f4a8e5c6a34b501c212dc45aa4..f47925cf04b7041bbc5dd43ce46a1aba296978af 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -2163,7 +2163,7 @@ A more advanced option is to change the definitions of the following
 variables in the @code{\paper} block. The init file
 @file{ly/titling-init.ly} lists the default layout.
 
-@itemize @code
+@table @code
 @item bookTitleMarkup
   This is the title put over an entire @code{\book} block. Typically,
   it has the composer and the title of the piece
@@ -2192,7 +2192,7 @@ field).
 
   By default, the footer has the copyright notice on the first, and
   the tagline on the last page.
-@end itemize
+@end table
 
 
 @cindex \paper

diff --git a/lily/lexer.ll b/lily/lexer.ll
index a1c7623703f107f67a50401d80efc87e186c89e6..98d77c065009e1eb1120b909cdd48e4ff1a7d5a5 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -530,7 +530,7 @@ HYPHEN              --
        [{}]    {
                return YYText ()[0];
        }
-       [^#{}"\\ \t\n\r\f]+ {
+       [^<>#{}"\\ \t\n\r\f]+ {
                String s (YYText ()); 
 
                char c = s[s.length () - 1];