From: Han-Wen Nienhuys Date: Tue, 23 Nov 2004 20:09:16 +0000 (+0000) Subject: add < > to markup lexer mode (backportme) X-Git-Tag: release/2.5.14~494 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dd0c4aee8ae02b95d31e958e42b72724d6cb9955;p=lilypond.git add < > to markup lexer mode (backportme) --- diff --git a/ChangeLog b/ChangeLog index c8c0aad7c2..19030afcf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-11-23 Han-Wen Nienhuys + * 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 424d09575a..f47925cf04 100644 --- 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 a1c7623703..98d77c0650 100644 --- 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];