From 54db925813d9b6e6785558664a8b03193e5fda59 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 25 Aug 2003 21:46:13 +0000 Subject: [PATCH] release commit --- ChangeLog | 5 ++++ Documentation/topdocs/NEWS.texi | 15 ++++++++-- Documentation/user/invoking.itexi | 2 -- Documentation/user/lilypond-book.itely | 17 +++++++++++ Documentation/user/refman.itely | 5 ++-- scripts/convert-ly.py | 39 +++++++++++++------------- 6 files changed, 57 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae8148af4b..3608606716 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-08-25 Han-Wen Nienhuys + * VERSION (PACKAGE_NAME): release 1.9.0 + + * Documentation/user/lilypond-book.itely (Invoking lilypond-book): + note about dvips. (Should backport.) + * scripts/convert-ly.py (FatalConversionError.articulation_substitute): add convert-new-chords code. Remove convert-new-chords.py diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 63012cd2b1..6c207e4ba0 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -12,6 +12,7 @@ @item Octave checks make octave errors easier to correct. The syntax is + @example \octave @var{pitch} @end example @@ -26,28 +27,36 @@ All articulations must now be entered postfix. For example, @example c8[( d8]) @end example + +@noindent is a pair of beamed slurred eighth notes. @item The definition of @code{\relative} has been simplified. Octaves are now always propagated in the order that music is entered. In the following example, + @example PRE - \repeat "unfold" 3 BODY \alternative { ALT1 ALT2 ALT3 } + \repeat "unfold" 3 BODY \alternative @{ ALT1 ALT2 ALT3 @} POST @end example + +@noindent the octave of BODY is based on PRE, the starting octave of ALT1 on BODY, the starting octave of ALT2 on ALT1, etc. + The same mechanism is used for all other music expressions, except the -chord. Backwards compatibility is retained through a special option, -which is invoked as +chord. Backwards compatibility is retained through a special program option, +which is set through @example #(ly:set-option 'old-relative) @end example +@end itemize + diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 90cfca002a..43a3609948 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -13,8 +13,6 @@ This chapter details the technicalities of running LilyPond. * Invoking ly2dvi:: Titling LilyPond scores. @end menu - - @node Invoking the lilypond binary @section Invoking the lilypond binary @cindex Invoking LilyPond diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 5e03f8744c..c05b68b256 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -33,6 +33,8 @@ text and music}. For more information about La@TeX{} Short Introduction to LaTeX} provides a introction to using La@TeX{}. + + @menu * Integrating Texinfo and music:: * Integrating LaTeX and music:: @@ -380,6 +382,20 @@ following to the top of the La@TeX{} file: \def\preLilyPondExample@{\def\mustmakelilypondtitle@{@}@} @end example +@cindex outline fonts +@cindex type1 fonts +@cindex dvips +@cindex invoking dvips + +For printing the LaTeX document, you will need to use dvips. For +producing PS with scalable fonts, add the following options to the dvips +command line: +@example + -Ppdf -u +lilypond.map +@end example + + + @command{lilypond-book} accepts the following command line options: @table @code @@ -433,6 +449,7 @@ Print a short help message. @end table + @section Bugs The La@TeX{} @code{\includeonly@{...@}} command is ignored. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 47bd848c35..87f7cc0584 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -657,9 +657,10 @@ once again. @end example -The octave of a note following an octave check is determined with +The octave of a note following an octave check is determined with respect to the note preceding it. In the next fragment, the last note -is a @code{a'}, above central C. +is a @code{a'}, above central C. Hence, the @code{\octave} check may +be deleted without changing the meaning of the piece. @lilypond[verbatim,fragment] \relative c' { diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index d13fad6140..749b42b6b0 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1286,28 +1286,28 @@ if 1: while last_str <> str: last_str = str def sub_dyn_end (m): - dyns.append (' -\!') + dyns.append (' \!') return ' ' + m.group(2) str = re.sub (r'(\\!)\s*([a-z]+)', sub_dyn_end, str) def sub_slurs(m): if '-)' not in slur_strs: - slur_strs.append ( '-)') + slur_strs.append ( ')') return m.group(1) def sub_p_slurs(m): if '-\)' not in slur_strs: - slur_strs.append ( '-\)') + slur_strs.append ( '\)') return m.group(1) str = re.sub (r"\)[ ]*([a-z]+)", sub_slurs, str) str = re.sub (r"\\\)[ ]*([a-z]+)", sub_p_slurs, str) def sub_begin_slurs(m): if '-(' not in slur_strs: - slur_strs.append ( '-(') + slur_strs.append ( '(') return m.group(1) str = re.sub (r"([a-z]+[,'!?0-9 ]*)\(", sub_begin_slurs, str) def sub_begin_p_slurs(m): if '-\(' not in slur_strs: - slur_strs.append ( '-\(') + slur_strs.append ( '\(') return m.group(1) str = re.sub (r"([a-z]+[,'!?0-9 ]*)\\\(", sub_begin_p_slurs, str) @@ -1315,11 +1315,11 @@ if 1: def sub_dyns (m): s = m.group(0) if s == '@STARTCRESC@': - slur_strs.append ("-\\<") + slur_strs.append ("\\<") elif s == '@STARTDECRESC@': - slur_strs.append ("-\\>") + slur_strs.append ("\\>") elif s == r'-?\\!': - slur_strs.append ('-\\!') + slur_strs.append ('\\!') return '' str = re.sub (r'@STARTCRESC@', sub_dyns, str) @@ -1336,7 +1336,7 @@ if 1: str = re.sub (r"([_^-][>_.+|^-])", sub_articulations, str) def sub_pslurs(m): - slur_strs.append ( ' -\\)') + slur_strs.append ( ' \\)') return m.group(1) str = re.sub (r"\\\)[ ]*([a-z]+)", sub_pslurs, str) @@ -1354,6 +1354,7 @@ if 1: simstart = "<" chordstart = '<<' chordend = '>>' + marker_str = '%% new-chords-done %%' if re.search (marker_str,str): return str @@ -1362,11 +1363,11 @@ if 1: str= re.sub (r'([_^-])>', r'\1@ACCENT@', str) str = re.sub ('<([^<>{}]+)>', sub_chord, str) - str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', - r'\1-[', + str = re.sub (r'\[ *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)', + r'\1[', str) - str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]+)', - r'\1-\\!', + str = re.sub (r'\\! *(@STARTCHORD@[^@]+@ENDCHORD@[0-9.]*)', + r'\1\\!', str) str = re.sub ('<([^?])', r'%s\1' % simstart, str) str = re.sub ('>([^?])', r'%s\1' % simend, str) @@ -1380,11 +1381,11 @@ if 1: def articulation_substitute (str): str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r" \1 \2-[", str) + r" \1 \2[", str) str = re.sub (r"""([^-])\) *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r"\1 \2-)", str) + r"\1 \2)", str) str = re.sub (r"""([^-])\\! *([a-z]+[,']*[!?]?[0-9:]*\.*)""", - r"\1 \2-\\!", str) + r"\1 \2\\!", str) return str def conv_relative(str): @@ -1395,15 +1396,14 @@ if 1: def conv (str): str = conv_relative (str) - if re.search (marker_str, str) == None : - str = sub_chords (str) + str = sub_chords (str) str = articulation_substitute (str) return str conversions.append (((1,9,0), conv, """New relative mode, -Postfix articulations, new chord syntax.")) +Postfix articulations, new chord syntax.""")) ################################ # END OF CONVERSIONS @@ -1555,4 +1555,5 @@ for f in files: else: sys.stderr.write ("%s: skipping: `%s' " % (program_name, f)) pass + sys.stderr.write ('\n') -- 2.39.5