From: Jan Nieuwenhuizen Date: Wed, 31 Jan 2001 20:47:53 +0000 (+0100) Subject: patch::: 1.3.127.jcn1 X-Git-Tag: release/1.3.128~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e4b7c0a9148d2c0f0eca488b0a6f973b8cd97d7;p=lilypond.git patch::: 1.3.127.jcn1 1.3.127.jcn1 ============ * Small doco fixes. * Bugfix: no alternatives. --- diff --git a/CHANGES b/CHANGES index 24ab2a8f67..2af4125e72 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.127.jcn1 +============ + +* Small doco fixes. + +* Bugfix: no alternatives. + 1.3.126.jcn2 ============ diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 9ef47bbbec..11e225ff77 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -46,7 +46,8 @@ @unnumberedsubsubsection \word\ @end macro -@end ignore - @macro c_ {word} @end macro + +@end ignore + diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ea338517a1..1c85434ee2 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -5,7 +5,8 @@ @c to automagically fill in these menus @c before saving changes -@c_{Reference Manual} +@c.{Reference Manual} + @node Reference Manual @chapter Reference Manual @menu @@ -25,7 +26,7 @@ * Unsorted:: @end menu -@c_ {Overview} +@c. {Overview} @node Overview @section Overview @@ -64,7 +65,7 @@ can enter and edit them in manageable chunks. @end itemize -@c_ {Music constructs} +@c. {Music constructs} @node Music constructs @section Music constructs @cindex Music constructs @@ -77,7 +78,7 @@ can enter and edit them in manageable chunks. * Explicit atomic music:: @end menu -@c_ {Music expressions} +@c. {Music expressions} @node Music expressions @subsection Music expressions @@ -104,7 +105,7 @@ subsection @ref{Atomic music expressions}. Compound music expressions are discussed in subsection @ref{Compound music expressions}. -@c_ {Sequential music} +@c. {Sequential music} @node Sequential music @subsection Sequential music @cindex Sequential music @@ -127,7 +128,7 @@ There is a shorthand, which leaves out the keyword: @code{@{} @var{musicexprlist} @code{@}} @end example -@c_ {Simultanious music} +@c. {Simultanious music} @node Simultanious music @subsection Simultanious music @cindex Simultanious music @@ -171,7 +172,7 @@ a Voice context: } @end lilypond -@c_ {Compound music expressions} +@c. {Compound music expressions} @node Compound music expressions @subsection Compound music expressions @@ -201,7 +202,7 @@ If the context does not exist, it will be created. The new context can optionally be given a name. -@c_ {Grace music} <-> Grace notes +@c. {Grace music} <-> Grace notes @node Grace music @subsection Grace music @cindex Grace music @@ -258,7 +259,7 @@ The present implementation is not robust and generally kludgy. We expect it to change after LilyPond 1.4 -@c_ {Explicit atomic music} +@c. {Explicit atomic music} @node Explicit atomic music @subsection Explicit atomic music @cindex Explicit atomic music @@ -292,7 +293,7 @@ numbers and dots. -@c_ {Modifying music} +@c. {Modifying music} @node Modifying music @section Modifying music @cindex Modifying music @@ -304,7 +305,8 @@ numbers and dots. * Apply:: * Transform:: @end menu -@c_ {Relative} + +@c. {Relative} @node Relative @subsection Relative @cindex Relative @@ -372,7 +374,7 @@ relative within transposed music, you must place an additional It is strongly recommended to use relative pitch mode: less work, less error-prone, and more readable. -@c_ {Transpose} +@c. {Transpose} @node Transpose @subsection Transpose @cindex Transpose @@ -410,7 +412,7 @@ If you want to use both @code{\transpose} and @code{\relative}, then you must use @code{\transpose} first. @code{\relative} will have no effect music that appears inside a @code{\transpose}. -@c_ {Repeat} +@c. {Repeat} @node Repeat @subsection Repeat @cindex Repeat @@ -561,7 +563,7 @@ To create tremolo beams on a single note, simply attach c'4:32 @end lilypond -@c_ {Times} +@c. {Times} @node Times @subsection Times @cindex Times @@ -585,7 +587,7 @@ their written length: @end lilypond -@c_ {Apply} +@c. {Apply} @node Apply @subsection Apply @cindex Apply @@ -618,13 +620,13 @@ of the music it processes. For more information on what is possible, see the @ref{Tricks} and the automatically generated documentation. -@c_ {Transform} +@c. {Transform} @node Transform @subsection Transform @cindex Transform -@c_ {Note entry} +@c. {Note entry} @node Note entry @section Note entry @cindex Note entry @@ -634,7 +636,7 @@ automatically generated documentation. * Pitch names:: @end menu -@c_ {Notes mode} +@c. {Notes mode} @node Notes mode @subsection Notes mode @@ -653,7 +655,7 @@ durations, it is not possible to enter real numbers in this mode. @cindex Notes mode -@c_ {Pitch names} +@c. {Pitch names} @node Pitch names @subsection Pitch names @cindex Pitch names @@ -750,7 +752,7 @@ question mark `@code{?}' after the pitch. @end lilypond -@c_ {Rests} +@c. {Rests} @menu * Rests:: * Durations:: @@ -768,7 +770,7 @@ There is also a note name duration. -@c_ {Durations} +@c. {Durations} @node Durations @subsection Durations @cindex Durations @@ -829,7 +831,7 @@ a quarter note is assumed. The duration can be followed by a dot You can alter the length of duration by writing `@code{*}@var{fraction}' after it. This will not affect the appearance of note heads or rests. -@c_ {Multi measure rests} +@c. {Multi measure rests} @node Multi measure rests @subsection Multi measure rests @cindex Multi measure rests @@ -850,7 +852,7 @@ automatically adds the appropriate number. Note that there is currently no way to condense multiple rests into a single multimeasure rest. -@c_ {Skip} +@c. {Skip} @node Skip @subsection Skip @cindex Skip @@ -870,7 +872,7 @@ this has the same effect as the spacer rest. -@c_ {Music notation} +@c. {Music notation} @node Music notation @section Music notation @cindex Music notation @@ -883,7 +885,7 @@ this has the same effect as the spacer rest. * Bar check:: @end menu -@c_ {Key} +@c. {Key} @node Key @subsection Key @cindex Key @@ -915,13 +917,13 @@ major key, e.g., @code{\minor} is defined as 3. The standard mode names @code{\lydian}, @code{\phrygian}, and @code{\dorian} are also defined. -@c_ {Clef} +@c. {Clef} @node Clef @subsection Clef @cindex Clef -@c_ {Clef changes} +@c. {Clef changes} @subsubsection Clef changes @cindex @code{\clef} @example @@ -941,7 +943,7 @@ Supported clef-names include [todo] -@c_ {Time signature} +@c. {Time signature} @node Time signature @subsection Time signature @cindex Time signature @@ -960,7 +962,7 @@ A short-cut for doing See the documentation of @code{timeSignatureFraction} -@c_ {Partial} +@c. {Partial} @subsubsection Partial @cindex Partial @cindex anacrusis @@ -984,7 +986,7 @@ See the documentation of @code{measurePosition}. -@c_ {Spanners} +@c. {Spanners} @node Spanners @subsection Spanners @cindex Spanners @@ -1000,11 +1002,11 @@ See the documentation of @code{measurePosition}. * Ottava:: * Span requests:: @end menu -@c_ {Beam} +@c. {Beam} @node Beam @subsubsection Beam @cindex Beam -@c_ {Automatic beams} +@c. {Automatic beams} @unnumberedsubsubsec Automatic beams @cindex automatic beam generation @@ -1059,7 +1061,7 @@ you would use @code{(end * * 1 32)}. -@c_ {Manual beams} +@c. {Manual beams} @cindex Automatic beams @unnumberedsubsubsec Manual beams @@ -1083,12 +1085,12 @@ A beam is specified by surrounding the beamed notes with brackets @cindex @code{-}@code{-} -@c_ {Adjusting beams} +@c. {Adjusting beams} @unnumberedsubsubsec Adjusting beams @cindex Adjusting beams -@c_ {Slur} +@c. {Slur} @node Slur @subsubsection Slur @@ -1109,9 +1111,9 @@ slurs from both sides: -@c_ {Adjusting slurs} +@c. {Adjusting slurs} @unnumberedsubsubsec Adjusting slurs -@c_ {Tie} +@c. {Tie} @cindex Adusting slurs @node Tie @subsubsection Tie @@ -1133,21 +1135,21 @@ warning message will appear and no ties will be created. [sparseTies] -@c_ {Tuplet} +@c. {Tuplet} @node Tuplet @subsubsection Tuplet @cindex Tuplet See @ref{Times}. -@c_ {Volta} +@c. {Volta} @node Volta @subsubsection Volta @cindex Volta See @ref{Repeat}. -@c_ {Crescendo and Decrescendo} +@c. {Crescendo and Decrescendo} @node Crescendo and Decrescendo @subsubsection Crescendo and Decrescendo @cindex Crescendo and Decrescendo @@ -1180,7 +1182,7 @@ want to get several marks during one note, you must use spacer notes. [todo: text cr] -@c_ {Text spanner} +@c. {Text spanner} @node Text spanner @subsubsection Text spanner @cindex Text spanner @@ -1195,7 +1197,7 @@ Have crescendo set a text spanner instead of hairpin } @end lilypond -@c_ {Ottava} +@c. {Ottava} @node Ottava @subsubsection Ottava @cindex Ottava @@ -1212,12 +1214,12 @@ Have crescendo set a text spanner instead of hairpin -@c_ {Text crescendo and decrescendo} +@c. {Text crescendo and decrescendo} @unnumberedsubsubsec Text crescendo and decrescendo TODO -@c_ {Span requests} +@c. {Span requests} @node Span requests @subsubsection Span requests @cindex Span requests @@ -1247,7 +1249,7 @@ You can attach a (general) span request to a note using The slur syntax with parentheses is a shorthand for this. -@c_ {Ornaments} +@c. {Ornaments} @node Ornaments @subsection Ornaments @cindex Ornaments @@ -1264,7 +1266,7 @@ The slur syntax with parentheses is a shorthand for this. * Rehearsal marks:: @end menu -@c_ {Articulation} +@c. {Articulation} @node Articulation @subsubsection Articulation @cindex Articulation @@ -1315,7 +1317,7 @@ name of the corresponding symbol appearing underneath. @end lilypond -@c_ {Text scripts} +@c. {Text scripts} @node Text scripts @subsubsection Text scripts @cindex Text scripts @@ -1329,7 +1331,7 @@ can be placed by simply using digits. All of these note ornaments appear in the printed output but have no effect on the MIDI rendering of the music. -@c_ {Fingerings} +@c. {Fingerings} @unnumberedsubsubsec Fingerings @cindex Fingerings @@ -1404,14 +1406,14 @@ helpful identifier definitions appear in @file{script.ly}. -@c_ {Grace notes} +@c. {Grace notes} @node Grace notes @subsubsection Grace notes @cindex Grace notes See @ref{Grace music}. -@c_ {Stem tremolo} +@c. {Stem tremolo} @node Stem tremolo @subsubsection Stem tremolo @cindex tremolo marks @@ -1431,7 +1433,7 @@ no last value. @end lilypond -@c_ {Arpeggio} +@c. {Arpeggio} @node Arpeggio @subsubsection Arpeggio @cindex Arpeggio @@ -1441,7 +1443,7 @@ no last value. You can specify an @rgrob{Arpeggio} sign on a chord by issuing an @c FIXME -@c @code{\arpeggio} request: + @code{\arpeggio} request: @@ -1469,7 +1471,7 @@ extended arpeggio sign is printed. @end quotation -@c_ {Glissando} +@c. {Glissando} @node Glissando @subsubsection Glissando @cindex Glissando @@ -1477,8 +1479,8 @@ extended arpeggio sign is printed. @cindex @code{\glissando} A @rgrob{Glissando} line can be requested by issuing a -@c FIXME -@c @code{\glissando} request: +FIXME + @code{\glissando} request: @@ -1491,7 +1493,7 @@ A @rgrob{Glissando} line can be requested by issuing a Printing of the additional text @samp{gliss.} must be done manually. -@c_ {Follow Thread} +@c. {Follow Thread} @subsubsection Follow Thread @cindex follow thread @cindex staff switching @@ -1519,7 +1521,7 @@ switches to another staff. This is enabled if the property -@c_ {Dynamics} +@c. {Dynamics} @node Dynamics @subsubsection Dynamics @cindex Dynamics @@ -1558,7 +1560,7 @@ The available dynamic marks are: See also @ref{Crescendo and Decrescendo} -@c_ {Bar lines} +@c. {Bar lines} @node Bar lines @subsubsection Bar lines @cindex Bar lines @@ -1583,12 +1585,12 @@ You are encouraged to use @code{\repeat} for repetitions. See [FIXME] -@c_ {Breath marks} +@c. {Breath marks} @node Breath marks @subsubsection Breath marks @cindex Breath marks -@c_ {Rehearsal marks} +@c. {Rehearsal marks} @node Rehearsal marks @subsubsection Rehearsal marks @cindex Rehearsal marks @@ -1604,7 +1606,7 @@ You are encouraged to use @code{\repeat} for repetitions. See Prints a mark over or under the staff. -@c_ {Bar check} +@c. {Bar check} @node Bar check @subsection Bar check @cindex Bar check @@ -1625,7 +1627,7 @@ A bar check is entered using the bar symbol, @code{|} This can help you finding errors in the input. -@c_ {Lyrics entry} +@c. {Lyrics entry} @node Lyrics entry @section Lyrics entry @cindex Lyrics entry @@ -1638,7 +1640,7 @@ This can help you finding errors in the input. * Addlyrics:: @end menu -@c_ {Lyrics mode} +@c. {Lyrics mode} @node Lyrics mode @subsection Lyrics mode @cindex Lyrics mode @@ -1698,7 +1700,7 @@ not4}. All unquoted underscores are converted to spaces. Printing lyrics is discussed in section @ref{lyricprint}. -@c_ {Printing Lyrics} +@c. {Printing Lyrics} @node Printing lyrics @subsection lyricprint @cindex lyrics @@ -1786,7 +1788,7 @@ For example: -@c_ {Lyric hyphen} +@c. {Lyric hyphen} @node Lyric hyphen @subsection Lyric hyphen @cindex Lyric hyphen @@ -1794,7 +1796,7 @@ For example: The syntax for a spanning hyphen (i.e., a hyphen that will be printed between two lyric syllables) is `@code{-}@code{-}'. -@c_ {Lyric extender} +@c. {Lyric extender} @node Lyric extender @subsection Lyric extender @cindex Lyric extender @@ -1808,7 +1810,7 @@ be used within lyrics mode. -@c_ {Addlyrics} +@c. {Addlyrics} @node Addlyrics @subsection Addlyrics @cindex Addlyrics @@ -1869,7 +1871,7 @@ lyrics for @var{musicexpr2}. -@c_ {Chord entry} +@c. {Chord entry} @node Chord entry @section Chord entry @cindex Chord entry @@ -1880,7 +1882,7 @@ lyrics for @var{musicexpr2}. * Printing named chords:: @end menu -@c_ {Chords mode} +@c. {Chords mode} @node Chords mode @subsection Chords mode @cindex Chords mode @@ -1895,7 +1897,7 @@ durations, you can not enter real numbers in this mode. Dashes and carets are used to indicate chord additions and subtractions, so scripts can not be entered in Chord mode. -@c_ {Entering named chords} +@c. {Entering named chords} @node Entering named chords @subsection Entering named chords @cindex Chords names @@ -2011,7 +2013,7 @@ See @ref{Chord names}. You should not combine @code{\relative} with named chords. [FIXME] -@c_ {Printing named chords} +@c. {Printing named chords} @node Printing named chords @subsection Printing named chords @@ -2232,7 +2234,7 @@ scheme = \chords { -@c_ {Page layout} +@c. {Page layout} @node Page layout @section Page layout @cindex Page layout @@ -2246,7 +2248,7 @@ scheme = \chords { * Page break:: @end menu -@c_ {Paper block} +@c. {Paper block} @node Paper block @subsection Paper block @cindex Paper block @@ -2300,7 +2302,7 @@ where each of the items is one of See @file{font.scm} for details of @var{alist}. @end itemize -@c_ {Paper variables} +@c. {Paper variables} @node Paper variables @subsection Paper variables @cindex Paper variables @@ -2350,7 +2352,7 @@ The paper block has some variables you may want to use or change: @end table -@c_ {Font size} +@c. {Font size} @node Font Size @subsection Font size @cindex font size @@ -2372,7 +2374,7 @@ details, see the file @file{font.scm}. -@c_ {Paper size} +@c. {Paper size} @node Paper size @subsection Paper size @cindex Paper size @@ -2408,7 +2410,7 @@ will set the paper variables @code{hsize} and @code{vsize} (used by -@c_ {Line break} +@c. {Line break} @node Line break @subsection Line break @cindex Line break @@ -2442,7 +2444,7 @@ barline by entering @code{\bar "";}. -@c_ {Page break} +@c. {Page break} @node Page break @subsection Page break @cindex Page break @@ -2463,7 +2465,7 @@ example file @file{input/test/between-systems.ly} -@c_ {Sound} +@c. {Sound} @node Sound @section Sound @cindex Sound @@ -2473,7 +2475,7 @@ example file @file{input/test/between-systems.ly} * Tempo:: @end menu -@c_ {MIDI block} +@c. {MIDI block} @node MIDI block @subsection MIDI block @cindex MIDI block @@ -2499,7 +2501,7 @@ Context definitions follow precisely the same syntax as within the The contexts for MIDI output are defined in @file{ly/performer.ly}. -@c_ {MIDI instrument names} +@c. {MIDI instrument names} @node MIDI instrument names @subsection MIDI instrument names @cindex instrument names @@ -2565,7 +2567,7 @@ default piano. -@c_ {Tempo} +@c. {Tempo} @node Tempo @subsection Tempo @cindex Tempo @@ -2584,7 +2586,7 @@ output with 76 quarter notes per minute. -@c_ {Music entry} +@c. {Music entry} @node Music entry @section Music entry @cindex Music entry @@ -2593,7 +2595,7 @@ output with 76 quarter notes per minute. * Point and click:: @end menu -@c_ {Music entry} +@c. {Pre-defined Identifiers} @node Pre-defined Identifiers @subsection Pre-defined Identifiers @cindex pre-defined identifiers @@ -2640,13 +2642,13 @@ set different shift values. @end table -@c_ {Point and click} +@c. {Point and click} @node Point and click @subsection Point and click [todo] -@c_ {Engravers} +@c. {Engravers} @node Engravers @section Engravers @cindex engravers @@ -2655,7 +2657,7 @@ set different shift values. * Notation Contexts:: @end menu -@c_ {Context definitions} +@c. {Context definitions} @node Context definitions @subsection Context definitions @@ -2845,7 +2847,7 @@ translator: -@c_ {Notation Contexts} +@c. {Notation Contexts} @node Notation Contexts @subsection Notation Contexts @@ -3000,7 +3002,7 @@ called @emph{performers}. -@c_ {Lexer innards} +@c. {Lexer innards} @node Lexer innards @section Lexer innards @cindex Lexer innards @@ -3013,7 +3015,7 @@ called @emph{performers}. * Ambiguities:: @end menu -@c_ {Top level} +@c. {Top level} @node Top level @subsection Top level @cindex Top level @@ -3035,19 +3037,19 @@ definition. A score block has the following syntax: definition is supplied, the default @code{\paper} block will be added. -@c_ {Score} +@c. {Score} @subsubsection Score @cindex Score -@c_ {Paper} +@c. {Paper} @subsubsection Paper @cindex Paper -@c_ {Midi} +@c. {Midi} @subsubsection Midi @cindex Midi -@c_ {Header} +@c. {Header} @subsubsection Header @cindex Header @cindex @code{\header} @@ -3075,7 +3077,7 @@ A @code{\midi} or @code{\paper} block at top-level sets the default paper block for all scores that lack an explicit paper block. -@c_ {Identifiers} +@c. {Identifiers} @node Identifiers @subsection Identifiers @cindex Identifiers @@ -3112,11 +3114,11 @@ See @ref{Molecules} @item Translator: object that produces audio objects or Grobs. This is not yet user accessible. @item Font_metric: object representing a font. (See @ref{Font metrics}) -@c @item Audio_element: (todo, smobme) + @end itemize -@c_ {Assignments} +@c. {Assignments} @node Assignments @subsection Assignments @cindex Assignments @@ -3163,14 +3165,14 @@ foo = 1.0 -@c_ {Lexical details} +@c. {Lexical details} @node Lexical details @subsection Lexical details @cindex Lexical details @menu @end menu -@c_ {Comments} +@c. {Comments} @subsubsection Comments @cindex Comments @@ -3181,7 +3183,7 @@ A one line comment is introduced by a @code{%} character. Block comments are started by @code{%@{} and ended by `@code{%@}}'. They cannot be nested. -@c_ {Direct Scheme} +@c. {Direct Scheme} @subsubsection Direct Scheme @cindex Scheme @cindex GUILE @@ -3210,7 +3212,7 @@ the website @uref{http://www.schemers.org/} for more information on Scheme. -@c_ {Keywords} +@c. {Keywords} @subsubsection Keywords @cindex Keywords @@ -3231,7 +3233,7 @@ script stylesheet skip textscript tempo translator transpose type @end example -@c_ {Integers} +@c. {Integers} @subsubsection Integers @cindex integers @@ -3244,7 +3246,7 @@ Formed from an optional minus sign followed by digits. Arithmetic operations cannot be done with integers, and integers cannot be mixed with reals. -@c_ {Reals} +@c. {Reals} @subsubsection Reals @cindex real numbers @@ -3270,7 +3272,7 @@ points, inches and centimeters, respectively. This converts the number to a real that is the internal representation of dimensions. -@c_ {Strings} +@c. {Strings} @subsubsection Strings @cindex string @cindex concatenate @@ -3287,7 +3289,7 @@ The tokenizer accepts the following commands. They have no grammatical function, hence they can appear anywhere in the input. -@c_ {Main input} +@c. {Main input} @subsubsection Main input @cindex Main input @@ -3296,7 +3298,7 @@ function, hence they can appear anywhere in the input. The @code{\maininput} command is used in init files to signal that the user file must be read. This command cannot be used in a user file. -@c_ {File inclusion} +@c. {File inclusion} @subsubsection Main input @cindex Main input @@ -3327,7 +3329,7 @@ See @ref{convert-ly} for more information on @code{convert-ly}. -@c_ {Pitch names} +@c. {Pitch names} @subsubsection Pitch names @cindex Lexical modes @cindex pitch names @@ -3352,7 +3354,7 @@ section @ref{Other languages}. A @code{\paper} block at top level sets the default paper block. A @code{\midi} block at top level works similarly. -@c_ {Assignments} +@c. {Assignments} @subsubsection Assignments @cindex assignments @cindex @code{#} @@ -3361,14 +3363,14 @@ Identifier assignments may appear at top level. @ref{Assignments} -@c_ {Direct scheme} +@c. {Direct scheme} @subsubsection Direct scheme @cindex Direct scheme Scheme statements maybe issued to produce interesting side-effects. -@c_ {Lexical modes} +@c. {Lexical modes} @node Lexical modes @subsection Lexical modes @cindex Lexical modes @@ -3418,7 +3420,7 @@ expressions do not add anything to the meaning of their arguments. They are just a way to indicate that the arguments should be parsed in indicated mode. See @ref{Lexical modes} for more information on modes. -@c_ {Ambiguities} +@c. {Ambiguities} @node Ambiguities @subsection Ambiguities @cindex ambiguities @@ -3472,7 +3474,7 @@ foo = -6 -@c_ {Unsorted} +@c. {Unsorted} @node Unsorted @section Unsorted @@ -3538,13 +3540,13 @@ result will depend very heavily on the implementation of the backend, which we change regularly and unscrupulously. -@c_{Local emacs vars} +@c.{Local emacs vars} @c Local variables: @c mode: texinfo @c minor-mode: font-lock @c minor-mode: outline -@c xoutline-layout: (0 : -1 -1 0) @c outline-layout: (-1 : 0) +@c outline-use-mode-specific-leader: "@c\." @c outline-primary-bullet: "{" @c outline-stylish-prefixes: nil @c outline-override-protect: t diff --git a/VERSION b/VERSION index 5a8e32e50c..dbd42b45bb 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=127 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly index 802727f22e..04f9ecbbac 100644 --- a/input/regression/triplets.ly +++ b/input/regression/triplets.ly @@ -8,7 +8,7 @@ texidoc="Simple beams. This broke somewhere < 1.3.110 linebreak = \penalty -1000; -$ex8 = \notes \relative c' { +ex = \notes \relative c' { \repeat "volta" 2 { \times 2/3 {c8( cis d} \times 2/3 {dis e f} \times 2/3 {fis g gis} \times 2/3 {a bes b} | @@ -24,4 +24,4 @@ $ex8 = \notes \relative c' { c1 || \linebreak } -\score { \context Staff { \notes { \$ex8 } } } +\score { \context Staff { \notes { \ex } } } diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 32e8202e81..5785e114cf 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -96,8 +96,11 @@ Repeated_music::alternatives_length_mom (bool fold) const Moment Repeated_music::alternatives_volta_length_mom () const { - SCM p = alternatives ()->music_list (); + if (!alternatives ()) + return 0; + Moment m; + SCM p = alternatives ()->music_list (); while (gh_pair_p (p)) { m = m + unsmob_music (gh_car (p))->length_mom (); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 4195416c33..f7b7341288 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -1,4 +1,4 @@ -i% +% % feta-generic.mf -- implement generic stuff: include lots of files, but don't % set dims. % diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 0f40e13370..0806189af7 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -711,8 +711,9 @@ Calc dimensions for the Separating_group_spanner; this has to be (lily-interface 'system-start-delimiter-interface "#'style can be bar-line, bracket or brace" - '(thickness arch-height arch-angle arch-thick - arch-width bracket-thick glyph ))) + '(bar-line-collapse-height brace-collapse-height bracket-collapse-height + thickness arch-height arch-angle arch-thick + arch-width bracket-thick glyph ))) (define text-spanner-interface (lily-interface