From f691ef9d579a53b63724caa64c73ec1902408d9d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 9 Apr 2004 09:35:06 +0000 Subject: [PATCH] (Top): manual for v2.3 (backportme) --- ChangeLog | 9 +++++++++ Documentation/user/lilypond.tely | 2 +- THANKS | 1 + scripts/convert-ly.py | 18 +++++++++++++++--- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8e2517c80..c3e36e4466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-04-09 Han-Wen Nienhuys + + * Documentation/user/lilypond.tely (Top): manual for v2.3 (backportme) + 2004-04-09 Jan Nieuwenhuizen * scm/font.scm (add-century-schoolbook-fonts): @@ -7,6 +11,11 @@ 2004-04-09 Han-Wen Nienhuys + * scripts/convert-ly.py: limited old-style markup convert. (Thanks + to Erik Sandberg) + + * Documentation/user/lilypond.tely (Top): update, + * lily/font-metric.cc (LY_DEFINE): new function, return fontName. * scm/output-ps.scm (define-fonts): remove hack for feta/parmesan. diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index da5e4828e8..9f1e8e6a11 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -142,7 +142,7 @@ Copyright 1999--2004 by the authors @top GNU LilyPond --- The music typesetter @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX. -This is the user manual for GNU LilyPond 2.1.x series. +This is the user manual for GNU LilyPond 2.3.x series. @ifhtml (See the bottom of this page for the exact version number). @end ifhtml diff --git a/THANKS b/THANKS index 542079c2bc..ca417da882 100644 --- a/THANKS +++ b/THANKS @@ -12,6 +12,7 @@ CONTRIBUTORS Michael Welsh Duggan Pedro Kroger +Erik Sandberg BUG HUNTERS/SUGGESTIONS diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 4272e0fb65..9c8f35f254 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -148,7 +148,7 @@ if 1: # need new a namespace return str conversions.append (( - ((0,1,20), conv, 'deprecated \\textstyle, new \key syntax'))) + ((0,1,20), conv, 'deprecated \\textstyle, new \\key syntax'))) if 1: @@ -402,7 +402,7 @@ if 1: return str conversions.append (((1,3,4), conv, - '\\cadenza -> \cadenza{On|Off}')) + '\\cadenza -> \\cadenza{On|Off}')) if 1: def conv (str): @@ -1406,6 +1406,17 @@ if 1: str = re.sub (r'@ACCENT@', '>', str) return str + def text_markup (str): + str = re.sub (r"""([-_^]) *# *' *\( *music *(\"[^"]*\") *\)""", + r"\1\\markup { \\musicglyph #\2 }", str) + str = re.sub (r"""([-_^]) *# *' *\( *([a-z]+) *([^()]*)\)""", + r"\1\\markup { \\\2 \3 }", str) + str = re.sub (r"""\\mark *# *' *\( *music *(\"[^"]*\") *\)""", + r"\\mark \\markup { \\musicglyph #\1 }", str) + str = re.sub (r"""\\mark *# *' *\( *([a-z]+) *([^()]*)\)""", + r"\\mark \\markup { \\\1 \2 }", str) + return str + def articulation_substitute (str): str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""", r"\1 \2[", str) @@ -1428,13 +1439,14 @@ if 1: str = conv_relative (str) str = sub_chords (str) + str = text_markup (str) str = articulation_substitute (str) str = re.sub ("@SCM_EOL@", "#'()", str) return str conversions.append (((1,9,0), conv, """New relative mode, -Postfix articulations, new chord syntax.""")) +Postfix articulations, new text markup syntax, new chord syntax.""")) if 1: def conv (str): -- 2.39.5