From: John Mandereau Date: Sat, 7 Jun 2008 18:20:22 +0000 (+0200) Subject: Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond X-Git-Tag: release/2.11.49-1~11^2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dafdaf6f564e4b658de316f629484cbeecf3c803;hp=8f2b7704b353e11bb85128498200e7f8d09d040d;p=lilypond.git Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond * 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond: Compile fix. Remove separate midi chapter. Move midi info into input.itely. GDP: Section names in NR3 Add todo from issue tracker. Clean the snippets when running "make test-clean" Fix 213. LSR: update. Tidy up some comments. Add predefs for chords. Minor snippet edits. Corrections to grob property descriptions. Fix repeatCommands volta markup. Fix 65. Spelling fixes. Update from Ralph. Implementation of international standard paper sizes. New snippet from Patrick Update markup command snippets. --- diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index d3ea39769c..a6876f470d 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -58,7 +58,7 @@ notation. For example, giving each staff a separate time signature. @item Page layout: changing the appearance of the spacing, line breaks, and page dimensions. These modifications are discussed -in @ref{Non-musical notation}, and @ref{Spacing issues}. +@c in @ref{notation}, and @ref{Spacing issues}. @end itemize Internally, LilyPond uses Scheme (a LISP dialect) to provide diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely index 23286185c7..3f04aff558 100644 --- a/Documentation/user/editorial.itely +++ b/Documentation/user/editorial.itely @@ -164,7 +164,7 @@ chord by adding them after the pitches. @end lilypond Fingering instructions may be manually placed above or below the -staff, see @ref{Controlling direction and placement}. +staff, see @ref{Direction and placement}. @snippets @@ -175,7 +175,7 @@ staff, see @ref{Controlling direction and placement}. @seealso Notation Reference: -@ref{Controlling direction and placement} +@ref{Direction and placement} Snippets: @rlsr{Editorial annotations}. @@ -403,7 +403,7 @@ made invisible. @seealso Notation Reference: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Snippets: @rlsr{Editorial annotations}. diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely index c8c2feeaec..78e83fc526 100644 --- a/Documentation/user/expressive.itely +++ b/Documentation/user/expressive.itely @@ -99,7 +99,7 @@ c-> c-. c-_ The rules for the default placement of articulations are defined in @file{scm/@/script@/.scm}. Articulations and ornamentations may be manually placed above or below the staff, see -@ref{Controlling direction and placement}. +@ref{Direction and placement}. @snippets @@ -120,7 +120,7 @@ Music Glossary: @rglos{portato}. Notation Reference: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Installed Files: @file{scm/@/script@/.scm}. @@ -170,8 +170,8 @@ such as @code{c4\ff}. The available dynamic marks are @code{\mp}, @code{\mf}, @code{\f}, @code{\ff}, @code{\fff}, @code{\ffff}, @code{\fp}, @code{\sf}, @code{\sff}, @code{\sp}, @code{\spp}, @code{\sfz}, and @code{\rfz}. The dynamic marks may -be manually placed above or below the staff, see @ref{Controlling -direction and placement}. +be manually placed above or below the staff, see +@ref{Direction and placement}. @lilypond[verbatim,quote,relative=2] c2\ppp c\mp @@ -336,7 +336,7 @@ Learning Manual: @rlearning{Articulation and dynamics}. Notation Reference: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Snippets: @rlsr{Expressive marks}. @@ -423,7 +423,7 @@ Just as with ties, the direction of a slur can be specified with @code{\slur@emph{DIR}}, where @code{@emph{DIR}} is either @code{Up}, @code{Down}, or @code{Neutral} (@code{Neutral} is the default). Slurs may be manually placed above or below the staff, -see @ref{Controlling direction and placement}. +see @ref{Direction and placement}. @lilypond[verbatim,quote,relative=2] c4_( c) c^( c) @@ -461,7 +461,7 @@ Music Glossary: @rglos{slur}. Notation Reference: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Snippets: @rlsr{Expressive marks}. @@ -491,7 +491,7 @@ normal slur. However, they are treated as different objects. A @code{\slurUp} will have no effect on a phrasing slur; instead, use @code{\phrasingSlurUp}, @code{\phrasingSlurDown}, and @code{\phrasingSlurNeutral}. Phrasing slurs may be manually -placed above or below the staff, see @ref{Controlling direction +placed above or below the staff, see @ref{Direction and placement}. You cannot have simultaneous phrasing slurs. @@ -510,7 +510,7 @@ You cannot have simultaneous phrasing slurs. @seealso Notation Reference: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Snippets: @rlsr{Expressive marks}. diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely index 3cd37ae70c..5e77708f3d 100644 --- a/Documentation/user/input.itely +++ b/Documentation/user/input.itely @@ -19,11 +19,12 @@ FIXME: don't complain about anything in this chapter. It's still under heavy development. @menu -* Input structure:: -* Useful concepts and properties:: -* Titles and headers:: -* Working with input files:: -* Controlling output:: +* Input structure:: +* Useful concepts and properties:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: @end menu @@ -34,9 +35,9 @@ The main format of input for LilyPond are text files. By convention, these files end with @code{.ly}. @menu -* Structure of a score:: -* Multiple scores in a book:: -* File structure:: +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: @end menu @@ -108,7 +109,7 @@ Learning Manual: @rlearning{Working on input files}, @rlearning{Music expressions explained}, -@rlearning{Score is a single (compound) music expression}. +@rlearning{Score is a single (compound) musical expression}. @node Multiple scores in a book @@ -338,10 +339,10 @@ Learning Manual: @menu -* Input modes:: -* Controlling direction and placement:: -* Distances and measurements:: -* Spanners:: +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Spanners:: @end menu @node Input modes @@ -446,10 +447,8 @@ the markings: -@node Controlling direction and placement -@subsection Controlling direction and placement - -TODO: Maybe rename section to "directions". +@node Direction and placement +@subsection Direction and placement In typesetting music the direction and placement of many items is a matter of choice. For example, the stems of notes can @@ -546,6 +545,12 @@ TODO: staff spaces. Maybe move into tweaks? @node Spanners @subsection Spanners +Many objects of musical notation extend over several notes or even +several bars. Examples are crescendi, trills, tuplet brackets, and +volta repeat brackets. Such objects are called @qq{spanners}, and +have special properties to control their appearance and behaviour. +Some of these properties are common to all spanners; others are +restricted to a sub-set of the spanners. @node Titles and headers @section Titles and headers @@ -554,10 +559,10 @@ Almost all printed music includes a title and the composer's name; some pieces include a lot more information. @menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: @end menu @@ -1184,12 +1189,12 @@ lilypond file.ly >display.txt @section Controlling output @menu -* Extracting fragments of notation:: +* Extracting fragments of music:: * Skipping corrected music:: @end menu -@node Extracting fragments of notation -@subsection Extracting fragments of notation +@node Extracting fragments of music +@subsection Extracting fragments of music It is possible to quote small fragments of a large score directly from the output. This can be compared to clipping a piece of a paper score @@ -1268,3 +1273,246 @@ In polyphonic music, @code{Score.skipTypesetting} will affect all voices and staves, saving even more time. + +@node MIDI output +@section MIDI output + +@cindex Sound +@cindex MIDI + +MIDI (Musical Instrument Digital Interface) is a standard for +connecting and controlling digital instruments. A MIDI file is a +series of notes in a number of tracks. It is not an actual +sound file; you need special software to translate between the +series of notes and actual sounds. + +Pieces of music can be converted to MIDI files, so you can listen to +what was entered. This is convenient for checking the music; octaves +that are off or accidentals that were mistyped stand out very much +when listening to the MIDI output. + +@knownissues + +Many musically interesting effects, such as swing, articulation, +slurring, etc., are not translated to midi. + +The midi output allocates a channel for each staff, and one for global +settings. Therefore the midi file should not have more than 15 staves +(or 14 if you do not use drums). Other staves will remain silent. + +Not all midi players correctly handle tempo changes in the midi +output. Players that are known to work include +@uref{http://@/timidity@/.sourceforge@/.net/,timidity}. + +@menu +* Creating MIDI files:: +* MIDI block:: +* MIDI instrument names:: +* What goes into the MIDI? FIXME:: +* other midi:: +@end menu + +@node Creating MIDI files +@subsection Creating MIDI files + +To create a MIDI from a music piece of music, add a @code{\midi} block +to a score, for example, + +@example +\score @{ + @var{...music...} + \midi @{ + \context @{ + \Score + tempoWholesPerMinute = #(ly:make-moment 72 4) + @} + @} +@} +@end example + +The tempo can be specified using the @code{\tempo} command within the +actual music, see @ref{Metronome marks}. An alternative, which does not +result in a metronome mark in the printed score, is shown in the example +above. In this example the tempo of quarter notes is set to 72 beats per +minute. +This kind of tempo +specification can not take dotted note lengths as an argument. In this +case, break the dotted notes into smaller units. For example, a tempo +of 90 dotted quarter notes per minute can be specified as 270 eighth +notes per minute + +@example +tempoWholesPerMinute = #(ly:make-moment 270 8) +@end example + +If there is a @code{\midi} command in a @code{\score}, only MIDI will +be produced. When notation is needed too, a @code{\layout} block must +be added + +@example +\score @{ + @var{...music...} + \midi @{ @} + \layout @{ @} +@} +@end example +@cindex layout block + + + +Ties, dynamics, and tempo changes are interpreted. Dynamic marks, +crescendi and decrescendi translate into MIDI volume levels. Dynamic +marks translate to a fixed fraction of the available MIDI volume +range, crescendi and decrescendi make the volume vary linearly between +their two extremes. The fractions can be adjusted by +@code{dynamicAbsoluteVolumeFunction} in @rinternals{Voice} context. +For each type of MIDI instrument, a volume range can be defined. This +gives a basic equalizer control, which can enhance the quality of +the MIDI output remarkably. The equalizer can be controlled by +setting @code{instrumentEqualizer}, or by setting + +@example +\set Staff.midiMinimumVolume = #0.2 +\set Staff.midiMaximumVolume = #0.8 +@end example + +To remove dynamics from the MIDI output, insert the following lines +in the @code{\midi@{@}} section. + +@example +\midi @{ + ... + \context @{ + \Voice + \remove "Dynamic_performer" + @} +@} +@end example + + +@knownissues + +Unterminated (de)crescendos will not render properly in the midi file, +resulting in silent passages of music. The workaround is to explicitly +terminate the (de)crescendo. For example, + +@example +@{ a\< b c d\f @} +@end example + +@noindent +will not work properly but + +@example +@{ a\< b c d\!\f @} +@end example + +@noindent +will. + + +MIDI output is only created when the @code{\midi} command is within +a @code{\score} block. If you put it within an explicitly instantiated +context ( i.e. @code{\new Score} ) the file will fail. To solve this, +enclose the @code{\new Score} and the @code{\midi} in a @code{\score} block. + +@example +\score @{ + \new Score @{ @dots{}notes@dots{} @} + \midi +@} +@end example + + +@node MIDI block +@subsection MIDI block +@cindex MIDI block + + +The MIDI block is analogous to the layout block, but it is somewhat +simpler. The @code{\midi} block is similar to @code{\layout}. It can contain +context definitions. + + +@cindex context definition + +Context definitions follow precisely the same syntax as within the +\layout block. Translation modules for sound are called performers. +The contexts for MIDI output are defined in @file{ly/@/performer@/-init@/.ly}. + + +@node MIDI instrument names +@subsection MIDI instrument names + +@cindex instrument names +@funindex Staff.midiInstrument + +The MIDI instrument name is set by the @code{Staff.midiInstrument} +property. The instrument name should be chosen from the list in +@ref{MIDI instruments}. + +@example +\set Staff.midiInstrument = "glockenspiel" +@var{...notes...} +@end example + +If the selected instrument does not exactly match an instrument from +the list of MIDI instruments, the Grand Piano (@code{"acoustic grand"}) +instrument is used. + + +@node What goes into the MIDI? FIXME +@subsection What goes into the MIDI? FIXME + +@menu +* Repeats and MIDI:: +@end menu + +@node Repeats and MIDI +@subsubsection Repeats and MIDI + +@cindex expanding repeats +@funindex \unfoldRepeats + +With a little bit of tweaking, all types of repeats can be present +in the MIDI output. This is achieved by applying the +@code{\unfoldRepeats} music function. This function changes all +repeats to unfold repeats. + +@lilypond[quote,verbatim,fragment,line-width=8.0\cm] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond + +When creating a score file using @code{\unfoldRepeats} for MIDI, +it is necessary to make two @code{\score} blocks: one for MIDI +(with unfolded repeats) and one for notation (with volta, tremolo, +and percent repeats). For example, + +@example +\score @{ + @var{..music..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..music..} + \midi @{ .. @} +@} +@end example + + +@node other midi +@subsection other midi + +Micro tones are also exported to the MIDI file. + +Figured bass has no effect on MIDI. + diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index e18ae8371d..9b3ef5a500 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -155,7 +155,6 @@ of this and other documentation. specific purposes. * Input syntax:: General information about lilypond input files. -* Non-musical notation:: Output that is not musical notation. * Spacing issues:: Display of output on paper. * Changing defaults:: Tuning output. * Interfaces for programmers:: Expert usage. @@ -178,7 +177,6 @@ Appendices @include specialist.itely @include input.itely -@include non-music.itely @include spacing.itely @include changing-defaults.itely diff --git a/Documentation/user/non-music.itely b/Documentation/user/non-music.itely deleted file mode 100644 index 15afed59c1..0000000000 --- a/Documentation/user/non-music.itely +++ /dev/null @@ -1,268 +0,0 @@ -@c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond.tely -@ignore - Translation of GIT committish: FILL-IN-HEAD-COMMITTISH - - When revising a translation, copy the HEAD committish of the - version that you are working on. See TRANSLATION for details. -@end ignore - -@c \version "2.11.38" - -@c A menu is needed before every deeper *section nesting of @node's; run -@c M-x texinfo-all-menus-update -@c to automatically fill in these menus before saving changes - -@node Non-musical notation -@chapter Non-musical notation - -This section deals with general LilyPond issues, rather than -specific notation. - -@menu -* MIDI output:: -* other midi:: -@end menu - - -@node MIDI output -@section MIDI output - -@cindex Sound -@cindex MIDI - -MIDI (Musical Instrument Digital Interface) is a standard for -connecting and controlling digital instruments. A MIDI file is a -series of notes in a number of tracks. It is not an actual -sound file; you need special software to translate between the -series of notes and actual sounds. - -Pieces of music can be converted to MIDI files, so you can listen to -what was entered. This is convenient for checking the music; octaves -that are off or accidentals that were mistyped stand out very much -when listening to the MIDI output. - -@knownissues - -Many musically interesting effects, such as swing, articulation, -slurring, etc., are not translated to midi. - -The midi output allocates a channel for each staff, and one for global -settings. Therefore the midi file should not have more than 15 staves -(or 14 if you do not use drums). Other staves will remain silent. - -Not all midi players correctly handle tempo changes in the midi -output. Players that are known to work include -@uref{http://@/timidity@/.sourceforge@/.net/,timidity}. - -@menu -* Creating MIDI files:: -* MIDI block:: -* MIDI instrument names:: -* What goes into the MIDI? FIXME:: -@end menu - -@node Creating MIDI files -@subsection Creating MIDI files - -To create a MIDI from a music piece of music, add a @code{\midi} block -to a score, for example, - -@example -\score @{ - @var{...music...} - \midi @{ - \context @{ - \Score - tempoWholesPerMinute = #(ly:make-moment 72 4) - @} - @} -@} -@end example - -The tempo can be specified using the @code{\tempo} command within the -actual music, see @ref{Metronome marks}. An alternative, which does not -result in a metronome mark in the printed score, is shown in the example -above. In this example the tempo of quarter notes is set to 72 beats per -minute. -This kind of tempo -specification can not take dotted note lengths as an argument. In this -case, break the dotted notes into smaller units. For example, a tempo -of 90 dotted quarter notes per minute can be specified as 270 eighth -notes per minute - -@example -tempoWholesPerMinute = #(ly:make-moment 270 8) -@end example - -If there is a @code{\midi} command in a @code{\score}, only MIDI will -be produced. When notation is needed too, a @code{\layout} block must -be added - -@example -\score @{ - @var{...music...} - \midi @{ @} - \layout @{ @} -@} -@end example -@cindex layout block - - - -Ties, dynamics, and tempo changes are interpreted. Dynamic marks, -crescendi and decrescendi translate into MIDI volume levels. Dynamic -marks translate to a fixed fraction of the available MIDI volume -range, crescendi and decrescendi make the volume vary linearly between -their two extremes. The fractions can be adjusted by -@code{dynamicAbsoluteVolumeFunction} in @rinternals{Voice} context. -For each type of MIDI instrument, a volume range can be defined. This -gives a basic equalizer control, which can enhance the quality of -the MIDI output remarkably. The equalizer can be controlled by -setting @code{instrumentEqualizer}, or by setting - -@example -\set Staff.midiMinimumVolume = #0.2 -\set Staff.midiMaximumVolume = #0.8 -@end example - -To remove dynamics from the MIDI output, insert the following lines -in the @code{\midi@{@}} section. - -@example -\midi @{ - ... - \context @{ - \Voice - \remove "Dynamic_performer" - @} -@} -@end example - - -@knownissues - -Unterminated (de)crescendos will not render properly in the midi file, -resulting in silent passages of music. The workaround is to explicitly -terminate the (de)crescendo. For example, - -@example -@{ a\< b c d\f @} -@end example - -@noindent -will not work properly but - -@example -@{ a\< b c d\!\f @} -@end example - -@noindent -will. - - -MIDI output is only created when the @code{\midi} command is within -a @code{\score} block. If you put it within an explicitly instantiated -context ( i.e. @code{\new Score} ) the file will fail. To solve this, -enclose the @code{\new Score} and the @code{\midi} in a @code{\score} block. - -@example -\score @{ - \new Score @{ @dots{}notes@dots{} @} - \midi -@} -@end example - - -@node MIDI block -@subsection MIDI block -@cindex MIDI block - - -The MIDI block is analogous to the layout block, but it is somewhat -simpler. The @code{\midi} block is similar to @code{\layout}. It can contain -context definitions. - - -@cindex context definition - -Context definitions follow precisely the same syntax as within the -\layout block. Translation modules for sound are called performers. -The contexts for MIDI output are defined in @file{ly/@/performer@/-init@/.ly}. - - -@node MIDI instrument names -@subsection MIDI instrument names - -@cindex instrument names -@funindex Staff.midiInstrument - -The MIDI instrument name is set by the @code{Staff.midiInstrument} -property. The instrument name should be chosen from the list in -@ref{MIDI instruments}. - -@example -\set Staff.midiInstrument = "glockenspiel" -@var{...notes...} -@end example - -If the selected instrument does not exactly match an instrument from -the list of MIDI instruments, the Grand Piano (@code{"acoustic grand"}) -instrument is used. - - -@node What goes into the MIDI? FIXME -@subsection What goes into the MIDI? FIXME - -@menu -* Repeats and MIDI:: -@end menu - -@node Repeats and MIDI -@subsubsection Repeats and MIDI - -@cindex expanding repeats -@funindex \unfoldRepeats - -With a little bit of tweaking, all types of repeats can be present -in the MIDI output. This is achieved by applying the -@code{\unfoldRepeats} music function. This function changes all -repeats to unfold repeats. - -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } -} -\bar "|." -@end lilypond - -When creating a score file using @code{\unfoldRepeats} for MIDI, -it is necessary to make two @code{\score} blocks: one for MIDI -(with unfolded repeats) and one for notation (with volta, tremolo, -and percent repeats). For example, - -@example -\score @{ - @var{..music..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..music..} - \midi @{ .. @} -@} -@end example - - -@node other midi -@section other midi - -Micro tones are also exported to the MIDI file. - -Figured bass has no effect on MIDI. - diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely index 0bb23654a4..b448e1ddc4 100644 --- a/Documentation/user/repeats.itely +++ b/Documentation/user/repeats.itely @@ -228,24 +228,63 @@ Print a @code{|:} bar line. Print a @code{:|} bar line. @item @code{(volta @var{text})} -Print a volta bracket saying @var{text}. The text can be specified as -a text string or as a markup text, see @ref{Formatting text}. Do not -forget to change the font, as the default number font does not contain -alphabetic characters; - +Print a volta bracket saying @var{text}. @item @code{(volta #f)} Stop a running volta bracket. @end table +Printing a @code{|:} bar line: + +@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +c1 +\set Score.repeatCommands = #'( start-repeat ) +d4 e f g +c1 +@end lilypond + +Printing a @code{:|} bar line: + @lilypond[quote,ragged-right,verbatim,fragment,relative=2] -c4 -\set Score.repeatCommands = #'((volta "93") end-repeat) -c4 b -\set Score.repeatCommands = #'((volta #f)) -d4 e +c1 +d4 e f g +\set Score.repeatCommands = #'( end-repeat ) +c1 +@end lilypond + +Printing a volta bracket saying @var{text}. The text can be specified +as a text string or as a markup text, see @ref{Formatting text}. Do +not forget to change the font, as the default number font does not +contain alphabetic characters. + + +@lilypond[verbatim,quote,relative=2] +c1 +d4 e f g +\override Staff.VoltaBracket #'font-name = #"sans" +\set Score.repeatCommands = #'( ( volta "1. Repeat to CHORUS" ) ) +f4 g a b +\set Score.repeatCommands = #'( ( volta #f ) \text ( volta "2., 3. To VERSE" ) end-repeat ) +g4 a g a +c1 @end lilypond +Note: unless explicitly stopped as in the next example, the volta +bracket will continue indefinitely. + +Stopping a running volta bracket: + +@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +c1 +d4 e f g +\set Score.repeatCommands = #'( ( volta #f ) ( volta "2" ) end-repeat ) +g4 a g a +f4 e f +\set Score.repeatCommands = #'( ( volta #f ) ) +d4 +c1 +@end lilypond + @c FIXME: improve visibility of bar lines link? @seealso @@ -456,4 +495,5 @@ into the MIDI output. @seealso -@c Notation Reference: @re +Snippets: @rlsr{Repeats}. + diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index f2365278cc..da68dada95 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -139,7 +139,7 @@ proportional notation, see @ref{Proportional notation}. Dots are normally moved up to avoid staff lines, except in polyphonic situations. Predefined commands are available to force a particular direction manually, for details -see @ref{Controlling direction and placement}. +see @ref{Direction and placement}. @predefined @@ -214,7 +214,7 @@ c4 c \times 2/3 { b4 a g } The automatic placement of the tuplet bracket above or below the notes may be overridden manually with predefined commands, for -details see @ref{Controlling direction and placement}. +details see @ref{Direction and placement}. Tuplets may be nested: @@ -449,7 +449,7 @@ be entered as follows: The vertical placement of ties may be controlled, see Predefined commands, or for details, see -@ref{Controlling direction and placement}. +@ref{Direction and placement}. @cindex ties, appearance @funindex \tieDotted diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely index 3cfd80ce65..7aa0dd6264 100644 --- a/Documentation/user/spacing.itely +++ b/Documentation/user/spacing.itely @@ -46,6 +46,10 @@ help, but it is in turn explained by x-space which again is missing from the list. Who has the knowledge to fix this? + +Clarify +http://code.google.com/p/lilypond/issues/detail?id=68 + @end ignore @node Spacing issues diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index 40830f2050..a2daa9837f 100644 --- a/Documentation/user/text.itely +++ b/Documentation/user/text.itely @@ -58,7 +58,7 @@ It is possible to add arbitrary text indications to a score, as demonstrated in the following example. Such indications can also be manually placed above or below the staff, using the -simple syntax described in @ref{Controlling direction and +simple syntax described in @ref{Direction and placement}. @lilypond[quote,fragment,ragged-right,verbatim,relative=1] @@ -95,7 +95,7 @@ d8^"pizz." e f g \textLengthOn a4_"scherzando" f @seealso Notation Reference: @ref{Formatting text}, -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Snippets: @rlsr{Text}. diff --git a/GNUmakefile.in b/GNUmakefile.in index 6da515c15d..0cd13623ca 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -217,7 +217,7 @@ test-baseline: $(MAKE) test $(MAKE) out=test -C input/regression/ local-test-baseline $(MAKE) out=test -C input/regression/musicxml local-test-baseline - rm -rf out/lybook-testdb/ + $(MAKE) test-snippets-clean local-check: test @@ -234,8 +234,11 @@ test-redo: done $(MAKE) check -test-clean: snippets-clean +test-clean: test-snippets-clean $(MAKE) -C input/regression/ out=test clean snippets-clean: rm -rf out/lybook-db + +test-snippets-clean: + rm -rf out/lybook-testdb diff --git a/THANKS b/THANKS index cc163569fd..b87177b6a2 100644 --- a/THANKS +++ b/THANKS @@ -81,6 +81,7 @@ Georg Dummer Georg Romstorfer Gilles Thibault Hernán J. González +Hu Haipeng Jay Anderson James Kilfinger Jean-Marie Mouchel diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly index 66b38f461a..e603616729 100644 --- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly +++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "chords, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/adding-ambitus-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly index 7d1c0e123a..66d04fe862 100644 --- a/input/lsr/adding-ambitus-per-voice.ly +++ b/input/lsr/adding-ambitus-per-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, staff-notation, vocal-music" diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly index c9ae07a9e3..5dd38aec97 100644 --- a/input/lsr/adding-an-extra-staff-at-a-line-break.ly +++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, contexts-and-engravers, breaks" diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly index fbebf90553..324545efd5 100644 --- a/input/lsr/adding-an-extra-staff.ly +++ b/input/lsr/adding-an-extra-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/adding-bars-to-chordnames.ly b/input/lsr/adding-bars-to-chordnames.ly index dffd3b150c..eb303fa72e 100644 --- a/input/lsr/adding-bars-to-chordnames.ly +++ b/input/lsr/adding-bars-to-chordnames.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "chords" diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly index 55b358ae47..9b73063520 100644 --- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, expressive-marks" diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly index eca1307fc4..149bb31e31 100644 --- a/input/lsr/adding-drum-parts.ly +++ b/input/lsr/adding-drum-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, percussion" @@ -27,11 +27,11 @@ timb = \drummode { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb } \override StaffSymbol #'line-count = #2 \override BarLine #'bar-size = #2 } << - \set Staff.instrumentName = "timbales" + \set Staff.instrumentName = #"timbales" \timb >> \new DrumStaff << - \set Staff.instrumentName = "drums" + \set Staff.instrumentName = #"drums" \new DrumVoice { \stemUp \drh } \new DrumVoice { \stemDown \drl } >> diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly index 32276fff42..a666a6d380 100644 --- a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly +++ b/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly index b3ee589826..c60ad80efa 100644 --- a/input/lsr/adding-the-current-date-to-a-score.ly +++ b/input/lsr/adding-the-current-date-to-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "titles" @@ -27,7 +27,7 @@ details on this format string: Formatting Calendar Time. " doctitle = "Adding the current date to a score" } % begin verbatim -\version "2.11.46" +\version "2.11.48" % first, define a variable to hold the formatted date: date = #(strftime "%d-%m-%Y" (localtime (current-time))) diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly index 45e433c721..32c3843224 100644 --- a/input/lsr/adding-volta-brackets-to-additional-staves.ly +++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "repeats" diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index 5bda716c77..8920e6b8fb 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, vocal-music, spacing" diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly index 288c58ea71..f05c942740 100644 --- a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly +++ b/input/lsr/adjusting-the-shape-of-falls-and-doits.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 93b903c324..86e931e16e 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index 47659547c6..15ec5b6b26 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly index 961e683fd1..f0a56d43f8 100644 --- a/input/lsr/aligning-marks-with-various-notation-objects.ly +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text" diff --git a/input/lsr/alignment-vertical-spacing.ly b/input/lsr/alignment-vertical-spacing.ly index 14dff606b2..7012989087 100644 --- a/input/lsr/alignment-vertical-spacing.ly +++ b/input/lsr/alignment-vertical-spacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides, paper-and-layout, spacing" diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly index e60352a290..63d0a3dc56 100644 --- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly +++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations, spacing" diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly index 906ac3ef8d..e93e9bec05 100644 --- a/input/lsr/ambitus-with-multiple-voices.ly +++ b/input/lsr/ambitus-with-multiple-voices.ly @@ -1,13 +1,13 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, vocal-music" texidoc = " -Adding the @code{Ambitus_engraver} to the @code{Staff} context create a -single ambitus per staff, even in the case of staves with multiple +Adding the @code{Ambitus_engraver} to the @code{Staff} context creates +a single ambitus per staff, even in the case of staves with multiple voices. " diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly index 66425043f7..e679141c28 100644 --- a/input/lsr/ancient-fonts.ly +++ b/input/lsr/ancient-fonts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index e387b5b454..b611e14493 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index 928bb0ad09..7e579dd5f2 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation, template" diff --git a/input/lsr/ancient-time-signatures.ly b/input/lsr/ancient-time-signatures.ly index 419a0f5463..9119840e2f 100644 --- a/input/lsr/ancient-time-signatures.ly +++ b/input/lsr/ancient-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation" diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly index 8a675dee15..49653156b0 100644 --- a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly +++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, editorial-annotations" diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index 6640a02adf..0fd6d775c6 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index 07d34abfc8..246d5a1bb2 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" @@ -21,8 +21,6 @@ changes the beaming to quarter note beats. % _ _ % Required | | | | -% The good way adapted from David Bobroff - % macro for beamed two per two in 2/2 and 4/4 time signature qBeam = { #(override-auto-beam-setting '(end 1 8 * *) 1 4 'Staff) @@ -34,15 +32,15 @@ qBeam = { << \new Staff \relative c'' { \time 4/4 - g8^\markup { without the macro } g g g g g g g | - g8 g g g4 g8 g g | + g8^\markup { without the macro } g g g g g g g + g8 g g g4 g8 g g } %Use the macro \new Staff \relative c'' { \time 4/4 \qBeam - g8^\markup { with the macro } g g g g g g g | - g8 g g g4 g8 g g | + g8^\markup { with the macro } g g g g g g g + g8 g g g4 g8 g g } >> \layout { diff --git a/input/lsr/bar-counter.ly b/input/lsr/bar-counter.ly new file mode 100644 index 0000000000..dead05b4fc --- /dev/null +++ b/input/lsr/bar-counter.ly @@ -0,0 +1,29 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "repeats, staff-notation, editorial-annotations" + + texidoc = " +This snippet provides an example how to emit bar counters which +LilyPond doesn't provide currently. + +" + doctitle = "Bar counter" +} % begin verbatim + +<< + \context Voice = "foo" { + \clef bass + c4 r g r | + c4 r g r | + c4 r g r | + c4 r g r | + } + \context Voice = "foo" { + \set countPercentRepeats = ##t + \override PercentRepeat #'transparent = ##t + \repeat percent 4 { s1 } + } +>> diff --git a/input/lsr/beams-across-line-breaks.ly b/input/lsr/beams-across-line-breaks.ly index 84cc7d8d5f..74d6e22e8a 100644 --- a/input/lsr/beams-across-line-breaks.ly +++ b/input/lsr/beams-across-line-breaks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, breaks" diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index ead6733afa..96c70ce6e1 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly index 036e43838d..259d7c527d 100644 --- a/input/lsr/breathing-signs.ly +++ b/input/lsr/breathing-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "winds" diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index dc1ab53a07..77b48c4989 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/input/lsr/caesura-railtracks-with-fermata.ly index 3a5c6eb2a0..bd677ab75a 100644 --- a/input/lsr/caesura-railtracks-with-fermata.ly +++ b/input/lsr/caesura-railtracks-with-fermata.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 7ed4e7b3de..134360333c 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly index b91c78cf3c..f3b58c1a4c 100644 --- a/input/lsr/changing--flageolet-mark-size.ly +++ b/input/lsr/changing--flageolet-mark-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, unfretted-strings" diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly index 3e955c36c8..11d481cc20 100644 --- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly +++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides" diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly index 8c436c0c32..dc14142adf 100644 --- a/input/lsr/changing-form-of-multi--measure-rests.ly +++ b/input/lsr/changing-form-of-multi--measure-rests.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" -\layout { ragged-right = ##t } +\version "2.11.48" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/input/lsr/changing-properties-for-individual-grobs.ly index 29956ca2bd..250e003e1d 100644 --- a/input/lsr/changing-properties-for-individual-grobs.ly +++ b/input/lsr/changing-properties-for-individual-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides" diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly index 9d88a95704..50d0faf711 100644 --- a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly +++ b/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -1,25 +1,25 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" - +\version "2.11.48" \header { - lsrtags = "expressive-marks" - + lsrtags = "rhythms,tweaks-and-overrides" texidoc = " -The text used for crescendos and decrescendos can be changed by -modifying the context properties @code{crescendoText} and -@code{decrescendoText}. The style of the spanner line can be changed -by modifying the context properties @code{crescendoSpanner} and -@code{decrescendoSpanner}. Available values for the spanner properties -are @code{'hairpin}, @code{'line}, @code{'dashed-line}, and -@code{'dotted-line}. If unset, a hairpin crescendo is used: - +The text used for crescendos and decrescendos can be +changed by modifying the context properties @code{crescendoText} +and @code{decrescendoText}. The style of the spanner line can +be changed by modifying the @code{'style} property of +@code{DynamicTextSpanner}. The default value is +@code{'hairpin}, and other possible values include +@code{'line}, @code{'dashed-line}, and +@code{'dotted-line}: " doctitle = "Changing text and spanner styles for text dynamics" } % begin verbatim + \relative c'' { \set crescendoText = \markup { \italic { cresc. poco } } - \set crescendoSpanner = #'dotted-line + \set crescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dotted-line a2\< a a2 a a2 a diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 60826803db..0624b624c1 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, editorial-annotations" diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly index 462fea5d32..8a1141b0db 100644 --- a/input/lsr/changing-the-breath-mark-symbol.ly +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly index 8b31d059fc..600df9c62c 100644 --- a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly +++ b/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "chords" diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index 060ac75a38..9992a6a21c 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, tweaks-and-overrides" diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/changing-the-number-of-lines-in-a-staff.ly index 1c64e1e658..631a5c79a1 100644 --- a/input/lsr/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/changing-the-number-of-lines-in-a-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation" diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly new file mode 100644 index 0000000000..cae32887f0 --- /dev/null +++ b/input/lsr/changing-the-positions-of-figured-bass-alterations.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "chords" + + texidoc = " +Accidentals and plus signs can appear before or after the numbers, +depending on the @code{figuredBassAlterationDirection} and +@code{figuredBassPlusDirection} properties. + +" + doctitle = "Changing the positions of figured bass alterations" +} % begin verbatim +\figures { + <6\+> <5+> <6 4-> r + \set figuredBassAlterationDirection = #RIGHT + <6\+> <5+> <6 4-> r + \set figuredBassPlusDirection = #LEFT + <6\+> <5+> <6 4-> r + \set figuredBassAlterationDirection = #LEFT + <6\+> <5+> <6 4-> r +} diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly index 68548625c4..44dd4b03d3 100644 --- a/input/lsr/changing-the-staff-size.ly +++ b/input/lsr/changing-the-staff-size.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout" diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index 7a8f8e58fa..5778397266 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index 09dfad965d..1c96d98fa7 100644 --- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -4,12 +4,12 @@ \header { lsrtags = "rhythms,contexts-and-engravers" texidoc = "The @code{measureLength} property, together with -@code{measurePosition}, determines when a bar line is needed. However, +@code{measurePosition}, determines when a bar line is needed. However, when using @code{\\scaleDurations}, the scaling of durations makes it -difficult to change time signatures without making a mess of it. -Therefore, @code{measureLength} has to be set manually, using the -@code{ly:make-moment} callback. The second argument must be the same as -the second argument of @code{\\scaleDurations}." +difficult to change time signatures. In this case, @code{measureLength} +should be set manually, using the @code{ly:make-moment} callback. The +second argument must be the same as the second argument of +@code{\\scaleDurations}." doctitle = "Changing time signatures inside a polymetric section using @code{\\scaleDurations}" } % begin verbatim diff --git a/input/lsr/chant-or-psalms-notation.ly b/input/lsr/chant-or-psalms-notation.ly index 123289c27f..86740012f2 100644 --- a/input/lsr/chant-or-psalms-notation.ly +++ b/input/lsr/chant-or-psalms-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers" diff --git a/input/lsr/chord-name-exceptions.ly b/input/lsr/chord-name-exceptions.ly index e9944046ec..be815077a7 100644 --- a/input/lsr/chord-name-exceptions.ly +++ b/input/lsr/chord-name-exceptions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "chords" diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index 9451f28f73..0742ed134c 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -1,9 +1,13 @@ +changing-the-positions-of-figured-bass-alterations.ly changing-the-chord-names-to-german-or-semi-german-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly +single-staff-template-with-notes,-lyrics,-chords-and-frets.ly +showing-chords-at-changes.ly single-staff-template-with-notes-and-chords.ly controlling-the-placement-of-chord-fingerings.ly clusters.ly single-staff-template-with-notes,-lyrics,-and-chords.ly +adding-bars-to-chordnames.ly chord-name-exceptions.ly volta-below-chords.ly -adding-bars-to-chordnames.ly +simple-lead-sheet.ly diff --git a/input/lsr/clip-systems.ly b/input/lsr/clip-systems.ly index 3bd07ac06b..f5690c8b49 100644 --- a/input/lsr/clip-systems.ly +++ b/input/lsr/clip-systems.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" -\layout { ragged-right= ##t } +\version "2.11.48" \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm @@ -38,13 +37,13 @@ origScore = \score { \relative c' { \set Staff.instrumentName = #"bla" c1 - d + d1 \grace c16 e1 \key d \major - f \break + f1 \break \clef bass - g, - fis + g,1 + fis1 } } diff --git a/input/lsr/clusters.ly b/input/lsr/clusters.ly index b264c4787d..b2384d3d2f 100644 --- a/input/lsr/clusters.ly +++ b/input/lsr/clusters.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "simultaneous-notes, chords, keyboards" diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly index 17451c4b2e..642661c189 100644 --- a/input/lsr/combining-dynamics-with-markup-texts.ly +++ b/input/lsr/combining-dynamics-with-markup-texts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index fc200d6578..3032f926af 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "simultaneous-notes, text" diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly index e4cb4f3e71..42d0d98b03 100644 --- a/input/lsr/compound-time-signatures.ly +++ b/input/lsr/compound-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" @@ -28,6 +28,6 @@ database.) \time 5/8 #(override-auto-beam-setting '(end 1 8 5 8) 1 4) c8 d e fis gis - c fis, gis e d + c8 fis, gis e d c8 d e4 gis8 } diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly index 504fe41d15..73bb5eea66 100644 --- a/input/lsr/conducting-signs,-measure-grouping-signs.ly +++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly index 4e71e4d351..471f343552 100644 --- a/input/lsr/contemporary-glissando.ly +++ b/input/lsr/contemporary-glissando.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/input/lsr/controlling-the-placement-of-chord-fingerings.ly index 55b703ca6e..abfae576c2 100644 --- a/input/lsr/controlling-the-placement-of-chord-fingerings.ly +++ b/input/lsr/controlling-the-placement-of-chord-fingerings.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations, chords, keyboards" diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly index 71a8a7febe..3e2affaf44 100644 --- a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly +++ b/input/lsr/controlling-the-vertical-ordering-of-scripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, tweaks-and-overrides" diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly index 85aa4bc23c..02adca504b 100644 --- a/input/lsr/controlling-tuplet-bracket-visibility.ly +++ b/input/lsr/controlling-tuplet-bracket-visibility.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly index 787d4c22c7..ae2761b521 100644 --- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly index 6d3a09f311..342d791db4 100644 --- a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly +++ b/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly index 38e35daf0e..b2bfab4d05 100644 --- a/input/lsr/creating-blank-staves.ly +++ b/input/lsr/creating-blank-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly index 9d74ca01ac..8dc06abaad 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly index 97557da5f7..8447bb1a78 100644 --- a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly +++ b/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly index a94dd4b285..720fd87191 100644 --- a/input/lsr/creating-real-parenthesized-dynamics.ly +++ b/input/lsr/creating-real-parenthesized-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, text" diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/input/lsr/creating-simultaneous-rehearsal-marks.ly index bfbb3ed8a8..a6946d50df 100644 --- a/input/lsr/creating-simultaneous-rehearsal-marks.ly +++ b/input/lsr/creating-simultaneous-rehearsal-marks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks,text,tweaks-and-overrides" texidoc = " @@ -15,15 +15,13 @@ end of one system and the start of the following system. doctitle = "Creating simultaneous rehearsal marks" } % begin verbatim -% Thanks to Risto Vääräniemi for this snippet - { \key a \major \set Score.markFormatter = #format-mark-box-letters \once \override Score.RehearsalMark #'outside-staff-priority = #5000 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT \once \override Score.RehearsalMark #'break-align-symbols = #'(key-signature) - \mark \markup { \bold "Senza denti" } + \mark \markup { \bold { Senza denti } } % the hidden measure and bar line \once \override Score.TimeSignature #'stencil = ##f @@ -33,7 +31,7 @@ end of one system and the start of the following system. \time 4/4 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT \once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line) - \mark \markup { \box \bold "Intro" } + \mark \markup { \box \bold Intro } d'1 \mark \default d'1 diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly index 034926d38d..dd6a5cb14f 100644 --- a/input/lsr/creating-slurs-across-voices.ly +++ b/input/lsr/creating-slurs-across-voices.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, keyboards, unfretted-strings" diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly index 5a75db0d0e..b0cb6638b0 100644 --- a/input/lsr/creating-text-spanners.ly +++ b/input/lsr/creating-text-spanners.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks, text, tweaks-and-overrides" diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index ccf24dcee4..eb4839c814 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly index 45b068e838..6d21338bbe 100644 --- a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly +++ b/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 11a013596e..1b7debba9d 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, keyboards, unfretted-strings, midi" diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 2e02e1a8f5..69c968a186 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, paper-and-layout, titles" diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index 2fab8a77c6..7ccb1fbd46 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation,tweaks-and-overrides" texidoc = "If there is only one staff in one of the staff types @@ -26,7 +26,7 @@ property has to be set, as shown on the second system in the example. c'1 } >> - \layout {} + \layout { } } \score { \new PianoStaff << @@ -36,6 +36,6 @@ property has to be set, as shown on the second system in the example. c'1 } >> - \layout {} + \layout { } } } diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly index ae1aa4de8b..19b1f73538 100644 --- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/input/lsr/drawing-boxes-around-grobs.ly index c8c95c3c3d..acba6f9469 100644 --- a/input/lsr/drawing-boxes-around-grobs.ly +++ b/input/lsr/drawing-boxes-around-grobs.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/input/lsr/drawing-circles-around-various-objects.ly index 7aae0d3b41..672b231752 100644 --- a/input/lsr/drawing-circles-around-various-objects.ly +++ b/input/lsr/drawing-circles-around-various-objects.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides" texidoc = " diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index 028db73cf7..050ea6c42d 100644 --- a/input/lsr/editorial-annotations.snippet-list +++ b/input/lsr/editorial-annotations.snippet-list @@ -3,10 +3,11 @@ making-some-staff-lines-thicker-than-the-others.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly embedding-native-postscript-in-a--markup-block.ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly -grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +default-direction-of-stems-on-the-center-line-of-the-staff.ly changing-a-single-notes-size-in-a-chord.ly +grid-lines--emphasizing-rhythms-and-notes-synchronization.ly grid-lines--changing-their-appearance.ly controlling-the-placement-of-chord-fingerings.ly allowing-fingerings-to-be-printed-inside-the-staff.ly blanking-staff-lines-using-the--whiteout-command.ly -default-direction-of-stems-on-the-center-line-of-the-staff.ly +bar-counter.ly diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/input/lsr/embedding-native-postscript-in-a--markup-block.ly index 0ab90c7728..ef255e75b3 100644 --- a/input/lsr/embedding-native-postscript-in-a--markup-block.ly +++ b/input/lsr/embedding-native-postscript-in-a--markup-block.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations, text" diff --git a/input/lsr/engravers-one-by-one.ly b/input/lsr/engravers-one-by-one.ly index 89b4341847..c082b73ae9 100644 --- a/input/lsr/engravers-one-by-one.ly +++ b/input/lsr/engravers-one-by-one.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "contexts-and-engravers" diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index efc41bcdb2..b7bdb58776 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" @@ -15,8 +15,8 @@ number indicates the direction (1 = up, -1 = down). doctitle = "Engraving ties manually" } % begin verbatim \relative c' { - 2 ~ | + 2 ~ \override TieColumn #'tie-configuration = #'((0.0 . 1) (-2.0 . 1) (-4.0 . 1)) - ~ | + ~ } diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index ef3e7befa7..7087372679 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index b0ea9ca4bc..f484267f44 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index 682860b608..ce31b038d6 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly index b28ecef0d8..f7fd39321a 100644 --- a/input/lsr/generating-random-notes.ly +++ b/input/lsr/generating-random-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/input/lsr/grid-lines--changing-their-appearance.ly index 49488741c7..c5910712e1 100644 --- a/input/lsr/grid-lines--changing-their-appearance.ly +++ b/input/lsr/grid-lines--changing-their-appearance.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index 3cfb92f968..ba7916782f 100644 --- a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "editorial-annotations" diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/input/lsr/heavily-customized-polymetric-time-signatures.ly index 3bcaa25db0..02cbbd21d5 100644 --- a/input/lsr/heavily-customized-polymetric-time-signatures.ly +++ b/input/lsr/heavily-customized-polymetric-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly index f4afd0089f..bf690e2db6 100644 --- a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly +++ b/input/lsr/hiding-the-extender-line-for-text-dynamics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly index 7ebc8b8932..d2af614d8a 100644 --- a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly +++ b/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, vocal-music" diff --git a/input/lsr/incipit.ly b/input/lsr/incipit.ly index 718c48ed11..7f7e6b87aa 100644 --- a/input/lsr/incipit.ly +++ b/input/lsr/incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation,ancient-notation" texidoc = "Incipits can be added using the instrument name grob, but diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly index dc25bbd58e..f1ae7d0246 100644 --- a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly +++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "keyboards" diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly index 4260799b7e..a87efa6e9e 100644 --- a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation" diff --git a/input/lsr/integrating-text-indications-in-metronome-marks.ly b/input/lsr/integrating-text-indications-in-metronome-marks.ly index 78b69b9148..4372405624 100644 --- a/input/lsr/integrating-text-indications-in-metronome-marks.ly +++ b/input/lsr/integrating-text-indications-in-metronome-marks.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, text" diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index 20d9370ac3..45fc065102 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "keyboards, percussion, template" diff --git a/input/lsr/line-arrows.ly b/input/lsr/line-arrows.ly index 9550264445..5e1772af5d 100644 --- a/input/lsr/line-arrows.ly +++ b/input/lsr/line-arrows.ly @@ -1,10 +1,10 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" texidoc = "Arrows can be applied to text-spanners and line-spanners -(such as the Glissando)" +(such as the Glissando)." doctitle = "Line arrows" } % begin verbatim diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly index f7784135bc..513f23aeea 100644 --- a/input/lsr/makam.ly +++ b/input/lsr/makam.ly @@ -1,13 +1,13 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" texidoc = "Makam is a type of melody from Turkey using 1/9th-tone microtonal alterations. Consult the initialization file -@code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly}) -for details of pitch names and alterations. -" +@code{makam-init.ly} (see the `Learning Manual @version{}, +4.6.3 Other sources of information' for the location of this file) +for details of pitch names and alterations." doctitle = "Makam" } % begin verbatim diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly index dc38e325c5..17a7c3a9c9 100644 --- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly +++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly index 9b245e603b..169e03a45a 100644 --- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly +++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, editorial-annotations" diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly index af520baa4e..a848443245 100644 --- a/input/lsr/manually-controlling-beam-positions.ly +++ b/input/lsr/manually-controlling-beam-positions.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/markup-lines.ly b/input/lsr/markup-lines.ly index 95fd0e2234..093614921d 100644 --- a/input/lsr/markup-lines.ly +++ b/input/lsr/markup-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text" diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly index 04d014e25e..3b3f43aad7 100644 --- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly +++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly index 0708f2308c..30eb0e806b 100644 --- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly +++ b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly index d9b68fee34..82480c9b00 100644 --- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly +++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/input/lsr/modifying-tuplet-bracket-length.ly index 6284916b28..cf3eb9050e 100644 --- a/input/lsr/modifying-tuplet-bracket-length.ly +++ b/input/lsr/modifying-tuplet-bracket-length.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/move-specific-text.ly b/input/lsr/move-specific-text.ly index 76bc3d69bc..38e74bec65 100644 --- a/input/lsr/move-specific-text.ly +++ b/input/lsr/move-specific-text.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" % possible rename to scheme- or something like that. -gp \header { lsrtags = "tweaks-and-overrides" @@ -22,5 +22,5 @@ Objects of the same type, like text, can be moved around by using some Scheme co 'extra-offset '(-3.5 . -4.5)) a^2^"m.d." } - \layout { ragged-right = ##t} + \layout { } } diff --git a/input/lsr/nesting-staves.ly b/input/lsr/nesting-staves.ly index 48f6926dc9..514de0c6fe 100644 --- a/input/lsr/nesting-staves.ly +++ b/input/lsr/nesting-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides" diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly index f27b5673f4..0d614ba8d1 100644 --- a/input/lsr/non-traditional-key-signatures.ly +++ b/input/lsr/non-traditional-key-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, staff-notation" diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly index c848203d41..41c4eb9680 100644 --- a/input/lsr/ottava-text.ly +++ b/input/lsr/ottava-text.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, text" diff --git a/input/lsr/outputting-the-version-number.ly b/input/lsr/outputting-the-version-number.ly index 61192b369f..11279877ff 100644 --- a/input/lsr/outputting-the-version-number.ly +++ b/input/lsr/outputting-the-version-number.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text" @@ -13,7 +13,7 @@ a score, or in a document generated with @code{lilypond-book}. } % begin verbatim \score { - \context Lyrics { + \new Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) diff --git a/input/lsr/page-label.ly b/input/lsr/page-label.ly index b376adfac2..86bb42aeb7 100644 --- a/input/lsr/page-label.ly +++ b/input/lsr/page-label.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "spacing" texidoc = "Page labels may be placed inside music or at top-level, diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly index 0b2fb510e9..107d4e68db 100644 --- a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly +++ b/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index b4bccc8e8f..b0aa26cb6b 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "keyboards, template" diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly index 316cb4da94..c42ca6fe20 100644 --- a/input/lsr/piano-template-with-centered-dynamics.ly +++ b/input/lsr/piano-template-with-centered-dynamics.ly @@ -1,15 +1,13 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks,keyboards,template" texidoc = " Many piano scores have the dynamics centered between the two staves. This requires a bit of tweaking to implement, but since the template is -right here, you don't have to do the tweaking yourself. Note that -the two piano staves will move closer together in any system that -does not contain at least one dynamic marking. +right here, you don't have to do the tweaking yourself. " doctitle = "Piano template with centered dynamics" } % begin verbatim @@ -18,7 +16,7 @@ upper = \relative c'' { \clef treble \key c \major \time 4/4 - + a4 b c d } @@ -26,7 +24,7 @@ lower = \relative c { \clef bass \key c \major \time 4/4 - + a2 c } @@ -55,22 +53,22 @@ pedal = { % So that \cresc works, for example. \alias Voice \consists "Output_property_engraver" - + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) \override DynamicLineSpanner #'Y-offset = #0 pedalSustainStrings = #'("Ped." "*Ped." "*") pedalUnaCordaStrings = #'("una corda" "" "tre corde") - + \consists "Piano_pedal_engraver" \consists "Script_engraver" \consists "Dynamic_engraver" \consists "Text_engraver" - + \override TextScript #'font-size = #2 \override TextScript #'font-shape = #'italic - + \consists "Skip_event_swallow_translator" - + \consists "Axis_group_engraver" } \context { @@ -80,11 +78,9 @@ pedal = { } } \score { - \unfoldRepeats { - \new PianoStaff << - \new Staff = "upper" << \upper \dynamics \pedal >> - \new Staff = "lower" << \lower \dynamics \pedal >> - >> - } - \midi {} + \new PianoStaff << + \new Staff = "upper" << \upper \dynamics \pedal >> + \new Staff = "lower" << \lower \dynamics \pedal >> + >> + \midi { } } diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index 53d1fb551b..2dba0eaba1 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, keyboards, template" diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index efb47ae36c..0b81f57e9d 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly index 616b47574f..6f39e1d23f 100644 --- a/input/lsr/positioning-multi--measure-rests.ly +++ b/input/lsr/positioning-multi--measure-rests.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly index 5ae2a185d2..e2f74c81d7 100644 --- a/input/lsr/positioning-segno-and-coda-with-line-break.ly +++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "repeats, breaks" diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly index f2d56592dd..9aa18b1408 100644 --- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly +++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly index 443c362822..cd7e4ea2ae 100644 --- a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly +++ b/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches" diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/input/lsr/printing-hairpins-using-al-niente-notation.ly index c7ad090b7f..32ab7d5e33 100644 --- a/input/lsr/printing-hairpins-using-al-niente-notation.ly +++ b/input/lsr/printing-hairpins-using-al-niente-notation.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly index 95f3b034a1..4e21abef39 100644 --- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text" diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly index 22a3e84058..468c1189fa 100644 --- a/input/lsr/printing-marks-on-every-staff.ly +++ b/input/lsr/printing-marks-on-every-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text" diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly index ea429db83c..98718283cb 100644 --- a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly +++ b/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, expressive-marks, staff-notation, tweaks-and-overrides" diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly index 5fa330703a..14fda53293 100644 --- a/input/lsr/printing-music-with-different-time-signatures.ly +++ b/input/lsr/printing-music-with-different-time-signatures.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, percussion" diff --git a/input/lsr/proportional-strict-notespacing.ly b/input/lsr/proportional-strict-notespacing.ly index 952e6dfe1b..6d6746ca32 100644 --- a/input/lsr/proportional-strict-notespacing.ly +++ b/input/lsr/proportional-strict-notespacing.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly index 4fa8974460..9640483b56 100644 --- a/input/lsr/quoting-another-voice-with-transposition.ly +++ b/input/lsr/quoting-another-voice-with-transposition.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches,staff-notation" texidoc = "Quotations take into account the transposition of both @@ -14,7 +14,7 @@ transposed using @code{\\transpose}. In this case, all the pitches \addQuote clarinet { \transposition bes - \repeat unfold 8 { d'16 d'16 d'8 } + \repeat unfold 8 { d'16 d' d'8 } } \addQuote sax { diff --git a/input/lsr/quoting-another-voice.ly b/input/lsr/quoting-another-voice.ly index c822b72618..9c3139e9a2 100644 --- a/input/lsr/quoting-another-voice.ly +++ b/input/lsr/quoting-another-voice.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation" texidoc = "With @code{\\quote}, fragments of previously entered @@ -21,15 +21,15 @@ original = \relative c'' { << \new Staff { - \set Staff.instrumentName = "quoteMe" + \set Staff.instrumentName = #"quoteMe" \quoteMe } \new Staff { - \set Staff.instrumentName = "orig" + \set Staff.instrumentName = #"orig" \original } \new Staff \relative c'' << - \set Staff.instrumentName = "orig+quote" + \set Staff.instrumentName = #"orig+quote" \set Staff.quotedEventTypes = #'(note-event articulation-event) \original \new Voice { diff --git a/input/lsr/removing-the-first-empty-line.ly b/input/lsr/removing-the-first-empty-line.ly index e2e6f8a01d..e7b58832b5 100644 --- a/input/lsr/removing-the-first-empty-line.ly +++ b/input/lsr/removing-the-first-empty-line.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, tweaks-and-overrides, breaks" diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list index a04d57124b..01c31d2f09 100644 --- a/input/lsr/repeats.snippet-list +++ b/input/lsr/repeats.snippet-list @@ -2,4 +2,6 @@ positioning-segno-and-coda-with-line-break.ly volta-below-chords.ly adding-volta-brackets-to-additional-staves.ly volta-multi-staff.ly +bar-counter.ly +volta-text-markup-using-repeatcommands.ly shortening-volta-brackets.ly diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly index 11630a1bbe..32f610aae8 100644 --- a/input/lsr/rest-styles.ly +++ b/input/lsr/rest-styles.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly index 225b4a101f..9926048d31 100644 --- a/input/lsr/rhythmic-slashes.ly +++ b/input/lsr/rhythmic-slashes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, tweaks-and-overrides" diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index d36a0ea575..d0697943fa 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -8,6 +8,7 @@ controlling-tuplet-bracket-visibility.ly heavily-customized-polymetric-time-signatures.ly positioning-multi--measure-rests.ly using-ties-with-arpeggios.ly +changing-text-and-spanner-styles-for-text-dynamics.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly integrating-text-indications-in-metronome-marks.ly compound-time-signatures.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 25185b6989..bd49c1cb31 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "template" diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly index 8d10683a42..af7f832e85 100644 --- a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly +++ b/input/lsr/setting-hairpin-behavior-at-bar-lines.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" texidoc = "If the note which ends a hairpin falls on a downbeat, diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/input/lsr/setting-the-minimum-length-of-hairpins.ly index 0384a4892b..227d9aafac 100644 --- a/input/lsr/setting-the-minimum-length-of-hairpins.ly +++ b/input/lsr/setting-the-minimum-length-of-hairpins.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly index 571a2a8562..5807294460 100644 --- a/input/lsr/shortening-volta-brackets.ly +++ b/input/lsr/shortening-volta-brackets.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "repeats" diff --git a/input/lsr/showing-chords-at-changes.ly b/input/lsr/showing-chords-at-changes.ly new file mode 100644 index 0000000000..375205967d --- /dev/null +++ b/input/lsr/showing-chords-at-changes.ly @@ -0,0 +1,26 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "chords" + + texidoc = " +Chord names can be displayed only at the start of lines and when the +chord changes. + +" + doctitle = "Showing chords at changes" +} % begin verbatim +harmonies = \chordmode { + c1:m c:m \break c:m c:m d +} +<< + \new ChordNames { + \set chordChanges = ##t + \harmonies + } + \new Staff { + \relative c' { \harmonies } + } +>> diff --git a/input/lsr/simple-lead-sheet.ly b/input/lsr/simple-lead-sheet.ly new file mode 100644 index 0000000000..fdb0e31737 --- /dev/null +++ b/input/lsr/simple-lead-sheet.ly @@ -0,0 +1,21 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "chords" + + texidoc = " +When put together, chord names, a melody, and lyrics form a lead sheet: + +" + doctitle = "Simple lead sheet" +} % begin verbatim +<< + \chords { c2 g:sus4 f e } + \relative c'' { + a4 e c8 e r4 + b2 c4( d) + } + \addlyrics { One day this shall be free __ } +>> diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index 42321ef976..4b323fd3cc 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, chords, template" diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly new file mode 100644 index 0000000000..ab5c0d169e --- /dev/null +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly @@ -0,0 +1,66 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "vocal-music, chords, template" + + texidoc = " +Here is a simple lead sheet template with melody, lyrics, chords and +fret diagrams. + +" + doctitle = "Single staff template with notes, lyrics, chords and frets" +} % begin verbatim +% Define the fret diagrams to be used +cFretDiagram = \markup { + \fret-diagram #"5-3-3;4-2-2;3-o;2-1-1;1-o" +} + +gFretDiagram = \markup { + \fret-diagram #"6-3-2;5-2-1;4-o;3-o;2-o;1-3-3" +} + +verseI = \lyricmode { + \set stanza = #"1." + This is the first verse +} + +verseII = \lyricmode { + \set stanza = #"2." + This is the second verse. +} + +theChords = \new ChordNames { + \chordmode { + % insert the chords for chordnames here + c2 g4 c + } +} + +staffMelody = \new Staff { + \context Voice = "voiceMelody" { + \key c \major + \clef treble + \relative c' { + % Type notes and fret diagram markups here + c4^\cFretDiagram d8 e f4^\gFretDiagram g^\cFretDiagram + \bar "|." + } + } +} + +\score { + << + \theChords + \staffMelody + \new Lyrics = "lyricsI" \lyricmode { + \lyricsto "voiceMelody" \verseI + } + \new Lyrics = "lyricsII" \lyricmode { + \lyricsto "voiceMelody" \verseII + } + >> + \layout { } + \midi { } +} diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index c266220cb1..bf38522058 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "chords, template" diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 4c0c724878..fb959ecdac 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index fdaabce9eb..2ff4813222 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "template" diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/input/lsr/skips-in-lyric-mode-2.ly index 01a42d3ad3..4041a179f3 100644 --- a/input/lsr/skips-in-lyric-mode-2.ly +++ b/input/lsr/skips-in-lyric-mode-2.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/skips-in-lyric-mode.ly b/input/lsr/skips-in-lyric-mode.ly index c777c76c22..4317bac90d 100644 --- a/input/lsr/skips-in-lyric-mode.ly +++ b/input/lsr/skips-in-lyric-mode.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, vocal-music" diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index bed61d8a90..4bc85e9b9b 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -8,6 +8,7 @@ printing-metronome-and-rehearsal-marks-below-the-staff.ly tweaking-clef-properties.ly quoting-another-voice.ly volta-multi-staff.ly +bar-counter.ly non-traditional-key-signatures.ly creating-blank-staves.ly adding-ambitus-per-voice.ly diff --git a/input/lsr/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index 29f2c71dcf..d0e18bd5d8 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index 0091bfc2df..32718de9c2 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "unfretted-strings, template" diff --git a/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly b/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly index a4e37c48ef..700975c7cd 100644 --- a/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly +++ b/input/lsr/suppressing-compiler-warnings-when-two-glissandos-intersect.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/table-of-contents.ly b/input/lsr/table-of-contents.ly index abab3fffc7..1a643dd07d 100644 --- a/input/lsr/table-of-contents.ly +++ b/input/lsr/table-of-contents.ly @@ -1,11 +1,11 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The TOC items are added with -the @code{\\tocItem} command." +@w{@code{\\markuplines \\table-of-contents}}. The TOC items are +added with the @code{\\tocItem} command." doctitle = "Table of contents" } % begin verbatim diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 869448422f..a1604d79fe 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,5 +1,6 @@ vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly single-staff-template-with-notes-and-lyrics.ly +single-staff-template-with-notes,-lyrics,-chords-and-frets.ly single-staff-template-with-only-notes.ly piano-template-with-centered-lyrics.ly vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 44525eec0b..a815c6e089 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms, text" diff --git a/input/lsr/time-signature-in-parentheses.ly b/input/lsr/time-signature-in-parentheses.ly index 869190be8b..e79f93f666 100644 --- a/input/lsr/time-signature-in-parentheses.ly +++ b/input/lsr/time-signature-in-parentheses.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, tweaks-and-overrides" diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/input/lsr/transcription-of-ancient-music-with-incipit.ly index 37361f436c..efb5932726 100644 --- a/input/lsr/transcription-of-ancient-music-with-incipit.ly +++ b/input/lsr/transcription-of-ancient-music-with-incipit.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "ancient-notation, tweaks-and-overrides" diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index b0a42bf218..9deef1dc06 100644 --- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { texidoces = " Este ejemplo utiliza código de Scheme para forzar las @@ -99,7 +99,7 @@ naturalizeMusic = (ly:music?) (naturalize m)) -music = \relative c' { c4 d e g } +music = \relative c' { c4 d e g } \score { \new Staff { @@ -108,5 +108,5 @@ music = \relative c' { c4 d e g } \transpose c deses \music \naturalizeMusic \transpose c deses \music } - \layout {} + \layout { } } diff --git a/input/lsr/tweaking-clef-properties.ly b/input/lsr/tweaking-clef-properties.ly index 8f0e651fa0..5cebde96df 100644 --- a/input/lsr/tweaking-clef-properties.ly +++ b/input/lsr/tweaking-clef-properties.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 097eeee195..20bcff63c3 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -10,6 +10,7 @@ using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly positioning-multi--measure-rests.ly changing-the-staff-size.ly +changing-text-and-spanner-styles-for-text-dynamics.ly controlling-the-vertical-ordering-of-scripts.ly vertically-aligning-ossias-and-lyrics.ly changing-properties-for-individual-grobs.ly diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly index f1522176a2..bed6e6a6b1 100644 --- a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly +++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "staff-notation, contexts-and-engravers" diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly index 922d96dcde..ac1b15b912 100644 --- a/input/lsr/using-double-slurs-for-legato-chords.ly +++ b/input/lsr/using-double-slurs-for-legato-chords.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly index 65b5c8e48f..f286c4310c 100644 --- a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,14 +1,13 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" -\layout { ragged-right= ##t } +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides" texidoc = " With the @code{\\tweak} command, every grob can be tuned directly. Here are some examples of available tweaks. " - doctitle = "Using the @code{\tweak} command to tweak individual grobs" + doctitle = "Using the @code{\\tweak} command to tweak individual grobs" } % begin verbatim \relative c' { diff --git a/input/lsr/using-ties-with-arpeggios.ly b/input/lsr/using-ties-with-arpeggios.ly index ba037df42b..98836130ba 100644 --- a/input/lsr/using-ties-with-arpeggios.ly +++ b/input/lsr/using-ties-with-arpeggios.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "rhythms" diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly index 479bbe5ed8..35198baae5 100644 --- a/input/lsr/utf-8.ly +++ b/input/lsr/utf-8.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly index 84925b1e39..558d484027 100644 --- a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly +++ b/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "expressive-marks" diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index 6a6164951c..db2261c836 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, tweaks-and-overrides, spacing" diff --git a/input/lsr/vertically-centered-dynamics-and-textscripts.ly b/input/lsr/vertically-centered-dynamics-and-textscripts.ly index 63b83a8c2d..a4f4fab4f4 100644 --- a/input/lsr/vertically-centered-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-centered-dynamics-and-textscripts.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "tweaks-and-overrides, spacing" diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly index 1371cf4459..083ccd08db 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, keyboards, template" diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 366a74507d..8dd8df2b3d 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "text, vocal-music, contexts-and-engravers, template" diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 4703bd637e..6cdc68c614 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "vocal-music, template" diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index adf492d73c..14754e6d08 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -1,6 +1,7 @@ vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly single-staff-template-with-notes-and-lyrics.ly adding-ambitus-per-voice.ly +single-staff-template-with-notes,-lyrics,-chords-and-frets.ly skips-in-lyric-mode-2.ly skips-in-lyric-mode.ly vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/volta-below-chords.ly b/input/lsr/volta-below-chords.ly index 1c714a2008..f8e04795d6 100644 --- a/input/lsr/volta-below-chords.ly +++ b/input/lsr/volta-below-chords.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" -\layout { ragged-right= ##t } +\version "2.11.48" \header { lsrtags = "repeats,staff-notation,chords" texidoc = "By adding the @code{Volta_engraver} to the relevant @@ -9,23 +8,21 @@ staff, volte can be put under chords." doctitle = "Volta under chords" } % begin verbatim -% chords above volta \score { << \chords { c1 - c - } - \new Staff \with { \consists Volta_engraver } { - \repeat volta 2 { c'1 } - \alternative { c' } - } + c1 + } + \new Staff \with { \consists "Volta_engraver" } { + \repeat volta 2 { c'1 } + \alternative { c' } + } >> \layout { \context { \Score - \remove Volta_engraver + \remove "Volta_engraver" } } } - diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly index 2f89351c25..270704d54e 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,6 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. -\version "2.11.46" +\version "2.11.48" \header { lsrtags = "repeats,staff-notation,fretted-strings" texidoc = "By adding the @code{Volta_engraver} to the relevant @@ -10,12 +10,13 @@ one in a score." } % begin verbatim voltaMusic = \relative c'' { - \repeat volta 2 + \repeat volta 2 { c1 - \alternative { + } + \alternative { d1 e - } + } } << diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/input/lsr/volta-text-markup-using-repeatcommands.ly new file mode 100644 index 0000000000..32de134a3d --- /dev/null +++ b/input/lsr/volta-text-markup-using-repeatcommands.ly @@ -0,0 +1,29 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.48" + +\header { + lsrtags = "repeats" + texidoc = "Though volte are best specified using +@code{\\repeat volta}, the context property @code{repeatCommands} +must be used in cases where the volta text needs more advanced +formatting with @code{\\markup}. + +Since @code{repeatCommands} takes a list, the simplest method of +including markup is to use an identifier for the text and embed +it in the command list using the Scheme syntax +@w{@code{#(list (list 'volta textIdentifier))}}. Start- and end-repeat commands +can be added as separate list elements:" +doctitle = "Volta text markup using @code{\\repeatCommands}" +} % begin verbatim + +voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } + +\relative c'' { + c1 + \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat) + c4 b d e + \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat) + f1 + \set Score.repeatCommands = #'((volta #f)) +} diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly index f0567c7083..ef9027d949 100644 --- a/input/new/changing-form-of-multi--measure-rests.ly +++ b/input/new/changing-form-of-multi--measure-rests.ly @@ -1,5 +1,4 @@ \version "2.11.42" -\layout { ragged-right = ##t } \header { lsrtags = "rhythms,tweaks-and-overrides" texidoc = " diff --git a/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly new file mode 100644 index 0000000000..2e905d94fc --- /dev/null +++ b/input/new/changing-text-and-spanner-styles-for-text-dynamics.ly @@ -0,0 +1,25 @@ +\version "2.11.47" +\header { + lsrtags = "rhythms,tweaks-and-overrides" + texidoc = " +The text used for crescendos and decrescendos can be +changed by modifying the context properties @code{crescendoText} +and @code{decrescendoText}. The style of the spanner line can +be changed by modifying the @code{'style} property of +@code{DynamicTextSpanner}. The default value is +@code{'hairpin}, and other possible values include +@code{'line}, @code{'dashed-line}, and +@code{'dotted-line}: +" + doctitle = "Changing text and spanner styles for text dynamics" +} + +\relative c'' { + \set crescendoText = \markup { \italic { cresc. poco } } + \set crescendoSpanner = #'text + \override DynamicTextSpanner #'style = #'dotted-line + a2\< a + a2 a + a2 a + a2 a\mf +} diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly index 6cef1f8770..8477c1aee8 100644 --- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly +++ b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly @@ -2,12 +2,12 @@ \header { lsrtags = "rhythms,contexts-and-engravers" texidoc = "The @code{measureLength} property, together with -@code{measurePosition}, determines when a bar line is needed. However, +@code{measurePosition}, determines when a bar line is needed. However, when using @code{\\scaleDurations}, the scaling of durations makes it -difficult to change time signatures without making a mess of it. -Therefore, @code{measureLength} has to be set manually, using the -@code{ly:make-moment} callback. The second argument must be the same as -the second argument of @code{\\scaleDurations}." +difficult to change time signatures. In this case, @code{measureLength} +should be set manually, using the @code{ly:make-moment} callback. The +second argument must be the same as the second argument of +@code{\\scaleDurations}." doctitle = "Changing time signatures inside a polymetric section using @code{\\scaleDurations}" } diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly index dcd51ce87e..6f330de463 100644 --- a/input/new/clip-systems.ly +++ b/input/new/clip-systems.ly @@ -1,5 +1,4 @@ \version "2.10.0" -\layout { ragged-right= ##t } \header { lsrtags = "paper-and-layout" % a new tag like "Mixing text and music" or % "Special output" might be more adequate -jm @@ -36,13 +35,13 @@ origScore = \score { \relative c' { \set Staff.instrumentName = #"bla" c1 - d + d1 \grace c16 e1 \key d \major - f \break + f1 \break \clef bass - g, - fis + g,1 + fis1 } } diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly index ec5302cb82..cbf8aa6fcd 100644 --- a/input/new/creating-simultaneous-rehearsal-marks.ly +++ b/input/new/creating-simultaneous-rehearsal-marks.ly @@ -13,7 +13,7 @@ end of one system and the start of the following system. doctitle = "Creating simultaneous rehearsal marks" } -% Thanks to Risto Vääräniemi for this snippet +% LSR: Thanks to Risto Vääräniemi for this snippet { \key a \major @@ -21,7 +21,7 @@ end of one system and the start of the following system. \once \override Score.RehearsalMark #'outside-staff-priority = #5000 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT \once \override Score.RehearsalMark #'break-align-symbols = #'(key-signature) - \mark \markup { \bold "Senza denti" } + \mark \markup { \bold { Senza denti } } % the hidden measure and bar line \once \override Score.TimeSignature #'stencil = ##f @@ -31,7 +31,7 @@ end of one system and the start of the following system. \time 4/4 \once \override Score.RehearsalMark #'self-alignment-X = #LEFT \once \override Score.RehearsalMark #'break-align-symbols = #'(bar-line) - \mark \markup { \box \bold "Intro" } + \mark \markup { \box \bold Intro } d'1 \mark \default d'1 diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly index 690f37114e..01b0c53569 100644 --- a/input/new/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/new/display-bracket-with-only-one-staff-in-a-system.ly @@ -24,7 +24,7 @@ property has to be set, as shown on the second system in the example. c'1 } >> - \layout {} + \layout { } } \score { \new PianoStaff << @@ -34,6 +34,6 @@ property has to be set, as shown on the second system in the example. c'1 } >> - \layout {} + \layout { } } } diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly index 9c50cec1ea..72c347073d 100644 --- a/input/new/line-arrows.ly +++ b/input/new/line-arrows.ly @@ -2,7 +2,7 @@ \header { lsrtags = "expressive-marks" texidoc = "Arrows can be applied to text-spanners and line-spanners -(such as the Glissando)" +(such as the Glissando)." doctitle = "Line arrows" } diff --git a/input/new/makam.ly b/input/new/makam.ly index 96447ff589..de1a6ace43 100644 --- a/input/new/makam.ly +++ b/input/new/makam.ly @@ -3,9 +3,9 @@ lsrtags = "pitches" texidoc = "Makam is a type of melody from Turkey using 1/9th-tone microtonal alterations. Consult the initialization file -@code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly}) -for details of pitch names and alterations. -" +@code{makam-init.ly} (see the `Learning Manual @version{}, +4.6.3 Other sources of information' for the location of this file) +for details of pitch names and alterations." doctitle = "Makam" } diff --git a/input/new/move-specific-text.ly b/input/new/move-specific-text.ly index 0335be73f3..c25c6a515d 100644 --- a/input/new/move-specific-text.ly +++ b/input/new/move-specific-text.ly @@ -20,5 +20,5 @@ Objects of the same type, like text, can be moved around by using some Scheme co 'extra-offset '(-3.5 . -4.5)) a^2^"m.d." } - \layout { ragged-right = ##t} + \layout { } } diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly index 67c63d2513..87a89cb4a0 100644 --- a/input/new/outputting-the-version-number.ly +++ b/input/new/outputting-the-version-number.ly @@ -11,7 +11,7 @@ a score, or in a document generated with @code{lilypond-book}. } \score { - \context Lyrics { + \new Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version))) diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly index 063c0b33ca..ca93a44e05 100644 --- a/input/new/piano-template-with-centered-dynamics.ly +++ b/input/new/piano-template-with-centered-dynamics.ly @@ -80,5 +80,5 @@ pedal = { \new Staff = "upper" << \upper \dynamics \pedal >> \new Staff = "lower" << \lower \dynamics \pedal >> >> - \midi {} + \midi { } } diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly index 2f67b56eb5..dc7a9cf7d7 100644 --- a/input/new/quoting-another-voice-with-transposition.ly +++ b/input/new/quoting-another-voice-with-transposition.ly @@ -12,7 +12,7 @@ transposed using @code{\\transpose}. In this case, all the pitches \addQuote clarinet { \transposition bes - \repeat unfold 8 { d'16 d'16 d'8 } + \repeat unfold 8 { d'16 d' d'8 } } \addQuote sax { diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly index cfa4726f42..e6fff64c13 100644 --- a/input/new/quoting-another-voice.ly +++ b/input/new/quoting-another-voice.ly @@ -19,15 +19,15 @@ original = \relative c'' { << \new Staff { - \set Staff.instrumentName = "quoteMe" + \set Staff.instrumentName = #"quoteMe" \quoteMe } \new Staff { - \set Staff.instrumentName = "orig" + \set Staff.instrumentName = #"orig" \original } \new Staff \relative c'' << - \set Staff.instrumentName = "orig+quote" + \set Staff.instrumentName = #"orig+quote" \set Staff.quotedEventTypes = #'(note-event articulation-event) \original \new Voice { diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly index 559ea79052..2be389d4e0 100644 --- a/input/new/table-of-contents.ly +++ b/input/new/table-of-contents.ly @@ -2,8 +2,8 @@ \header { lsrtags = "paper-and-layout" texidoc = "A table of contents is included using -@code{\\markuplines \\table-of-contents}. The TOC items are added with -the @code{\\tocItem} command." +@w{@code{\\markuplines \\table-of-contents}}. The TOC items are +added with the @code{\\tocItem} command." doctitle = "Table of contents" } diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly index dd5c7b5f43..40bf9fb664 100644 --- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly +++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly @@ -70,7 +70,7 @@ naturalizeMusic = (ly:music?) (naturalize m)) -music = \relative c' { c4 d e g } +music = \relative c' { c4 d e g } \score { \new Staff { @@ -79,5 +79,5 @@ music = \relative c' { c4 d e g } \transpose c deses \music \naturalizeMusic \transpose c deses \music } - \layout {} + \layout { } } diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly index 5b5d3650d2..75c8c59030 100644 --- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly +++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly @@ -1,12 +1,11 @@ \version "2.11.23" -\layout { ragged-right= ##t } \header { lsrtags = "tweaks-and-overrides" texidoc = " With the @code{\\tweak} command, every grob can be tuned directly. Here are some examples of available tweaks. " - doctitle = "Using the @code{\tweak} command to tweak individual grobs" + doctitle = "Using the @code{\\tweak} command to tweak individual grobs" } \relative c' { diff --git a/input/new/volta-below-chords.ly b/input/new/volta-below-chords.ly index 63844f39da..8c4ad9d2a8 100644 --- a/input/new/volta-below-chords.ly +++ b/input/new/volta-below-chords.ly @@ -1,5 +1,4 @@ -\version "2.11.36" -\layout { ragged-right= ##t } +\version "2.11.47" \header { lsrtags = "repeats,staff-notation,chords" texidoc = "By adding the @code{Volta_engraver} to the relevant @@ -7,23 +6,21 @@ staff, volte can be put under chords." doctitle = "Volta under chords" } -% chords above volta \score { << \chords { c1 - c - } - \new Staff \with { \consists Volta_engraver } { - \repeat volta 2 { c'1 } - \alternative { c' } - } + c1 + } + \new Staff \with { \consists "Volta_engraver" } { + \repeat volta 2 { c'1 } + \alternative { c' } + } >> \layout { \context { \Score - \remove Volta_engraver + \remove "Volta_engraver" } } } - diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly index 9f35204490..276a49f9a7 100644 --- a/input/new/volta-multi-staff.ly +++ b/input/new/volta-multi-staff.ly @@ -8,12 +8,13 @@ one in a score." } voltaMusic = \relative c'' { - \repeat volta 2 + \repeat volta 2 { c1 - \alternative { + } + \alternative { d1 e - } + } } << diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly new file mode 100644 index 0000000000..0d72332a10 --- /dev/null +++ b/input/new/volta-text-markup-using-repeatcommands.ly @@ -0,0 +1,27 @@ +\version "2.11.48" + +\header { + lsrtags = "repeats" + texidoc = "Though volte are best specified using +@code{\\repeat volta}, the context property @code{repeatCommands} +must be used in cases where the volta text needs more advanced +formatting with @code{\\markup}. + +Since @code{repeatCommands} takes a list, the simplest method of +including markup is to use an identifier for the text and embed +it in the command list using the Scheme syntax +@w{@code{#(list (list 'volta textIdentifier))}}. Start- and end-repeat commands +can be added as separate list elements:" +doctitle = "Volta text markup using @code{\\repeatCommands}" +} + +voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } + +\relative c'' { + c1 + \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat) + c4 b d e + \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat) + f1 + \set Score.repeatCommands = #'((volta #f)) +} diff --git a/input/regression/lyric-extender-right-margin.ly b/input/regression/lyric-extender-right-margin.ly index 5fb01d5682..03f95a27a4 100644 --- a/input/regression/lyric-extender-right-margin.ly +++ b/input/regression/lyric-extender-right-margin.ly @@ -1,6 +1,6 @@ \version "2.10.19" \header { - texidoc = "extenders will not protude into the right margin" + texidoc = "Extenders will not protrude into the right margin" } \score{ @@ -16,8 +16,4 @@ e d c } } - -} -\paper { - ragged-right = ##t -} +} \ No newline at end of file diff --git a/input/regression/volta-markup-text.ly b/input/regression/volta-markup-text.ly new file mode 100644 index 0000000000..46a2a3b2af --- /dev/null +++ b/input/regression/volta-markup-text.ly @@ -0,0 +1,17 @@ +\version "2.11.48" + +\header { + texidoc = "Volte using @code{repeatCommands} can have markup +text." +} + +voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } } + +\relative c'' { + c1 + \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat) + c4 b d e + \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat) + f1 + \set Score.repeatCommands = #'((volta #f)) +} diff --git a/input/simple.ly b/input/simple.ly index a532db7663..fc78b35e34 100644 --- a/input/simple.ly +++ b/input/simple.ly @@ -1,6 +1,6 @@ %% A simple piece in LilyPond, a scale. -\relative { - c d e f g a b c +\relative c' { + c d e f g a b c } %% Optional helper for automatic updating by convert-ly. May be omitted. diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc index 9f5602fef0..99115e9a52 100644 --- a/lily/bend-engraver.cc +++ b/lily/bend-engraver.cc @@ -22,6 +22,7 @@ public: protected: DECLARE_TRANSLATOR_LISTENER (bend_after); + void finalize (); void process_music (); void stop_translation_timestep (); void start_translation_timestep (); @@ -31,9 +32,19 @@ private: Moment stop_moment_; Stream_event *fall_event_; Spanner *fall_; + Spanner *last_fall_; Grob *note_head_; }; +void +Bend_engraver::finalize () +{ + // We shouldn't end a spanner on the last musical column of a piece because then + // it would extend past the last breakable column of the piece. + if (last_fall_) + last_fall_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn"))); +} + void Bend_engraver::stop_fall () { @@ -43,6 +54,7 @@ Bend_engraver::stop_fall () fall_->set_bound (RIGHT, unsmob_grob (bar ? get_property ("currentCommandColumn") : get_property ("currentMusicalColumn"))); + last_fall_ = fall_; fall_ = 0; note_head_ = 0; fall_event_ = 0; @@ -61,6 +73,8 @@ Bend_engraver::stop_translation_timestep () void Bend_engraver::start_translation_timestep () { + last_fall_ = 0; + if (fall_ && now_mom ().main_part_ >= stop_moment_.main_part_) { stop_fall (); @@ -86,6 +100,7 @@ Bend_engraver::acknowledge_note_head (Grob_info info) Bend_engraver::Bend_engraver () { fall_ = 0; + last_fall_ = 0; note_head_ = 0; fall_event_ = 0; } diff --git a/lily/context-def.cc b/lily/context-def.cc index f4023a09a1..a810159aa3 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -193,12 +193,24 @@ Context_def::get_default_child (SCM user_mod) const return name; } +/* + Given a name of a context that we want to create, finds a list of context + definitions such that: + - the first element in the list defines a context that is a valid child of + the context defined by this Context_def + - each subsequent element in the list defines a context that is a valid child + of the the context defined by the preceding element in the list + - the last element in the list defines a context with the given name + + The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this + specific context def (but not any of the child context defs) should accept. +*/ vector -Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const +Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef, SCM additional_accepts) const { assert (scm_is_symbol (type_sym)); - SCM accepted = get_accepted (SCM_EOL); + SCM accepted = get_accepted (additional_accepts); vector accepteds; for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s)) @@ -224,7 +236,7 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const Context_def *g = accepteds[i]; vector result - = g->path_to_acceptable_context (type_sym, odef); + = g->path_to_acceptable_context (type_sym, odef, SCM_EOL); if (result.size () && result.size () < best_depth) { best_depth = result.size (); diff --git a/lily/context.cc b/lily/context.cc index 3c982751fd..ba3809e69a 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -104,17 +104,12 @@ Context::create_unique_context (SCM name, string id, SCM operations) if (gthis && gthis->get_score_context ()) return gthis->get_score_context ()->create_unique_context (name, id, operations); - /* - TODO: use accepts_list_. - */ - vector path - = unsmob_context_def (definition_)->path_to_acceptable_context (name, get_output_def ()); - + vector path = path_to_acceptable_context (name); if (path.size ()) { Context *current = this; - // start at 1. The first one (index 0) will be us. + // Iterate through the path and create all of the implicit contexts. for (vsize i = 0; i < path.size (); i++) { SCM ops = SCM_EOL; @@ -167,11 +162,7 @@ Context::find_create_context (SCM n, string id, SCM operations) return tg; } - /* - TODO: use accepts_list_. - */ - vector path - = unsmob_context_def (definition_)->path_to_acceptable_context (n, get_output_def ()); + vector path = path_to_acceptable_context (n); if (path.size ()) { @@ -261,8 +252,8 @@ Context::create_context_from_event (SCM sev) SCM type_scm = ev->get_property ("type"); string type = ly_symbol2string (type_scm); - vector path - = unsmob_context_def (definition_)->path_to_acceptable_context (type_scm, get_output_def ()); + vector path = path_to_acceptable_context (type_scm); + if (path.size () != 1) { programming_error (_f ("Invalid CreateContext event: Cannot create %s context", type.c_str ())); @@ -312,6 +303,25 @@ Context::create_context_from_event (SCM sev) ly_symbol2scm ("creator"), sev); } +vector +Context::path_to_acceptable_context (SCM name) const +{ + // The 'accepts elements in definition_mods_ is a list of ('accepts string), + // but the Context_def expects to see elements of the form ('accepts symbol). + SCM accepts = SCM_EOL; + for (SCM s = scm_reverse (definition_mods_); scm_is_pair (s); s = scm_cdr (s)) + if (scm_caar (s) == ly_symbol2scm ("accepts")) + { + SCM elt = scm_list_2 (scm_caar (s), scm_string_to_symbol (scm_cadar (s))); + accepts = scm_cons (elt, accepts); + } + + return unsmob_context_def (definition_)->path_to_acceptable_context (name, + get_output_def (), + accepts); + +} + Context * Context::create_context (Context_def *cdef, string id, diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh index dd4df4c802..ea81eb1295 100644 --- a/lily/include/context-def.hh +++ b/lily/include/context-def.hh @@ -49,7 +49,7 @@ public: VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def); vector path_to_acceptable_context (SCM type_string, - Output_def *) const; + Output_def *, SCM) const; Context *instantiate (SCM extra_ops); SCM to_alist () const; diff --git a/lily/include/context.hh b/lily/include/context.hh index 88019f4b88..648a52ae3b 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -114,8 +114,7 @@ public: string id, SCM ops); Context *create_unique_context (SCM context_name, string context_id, SCM ops); - vector path_to_acceptable_context (SCM alias, - Output_def *) const; + vector path_to_acceptable_context (SCM alias) const; }; /* diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index ec8aeede49..b07acd6ef0 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -16,7 +16,7 @@ struct Lookup { static Stencil dot (Offset p, Real radius); - static Stencil bracket (Axis a, Interval iv, Real thick, Real protude, Real blot); + static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot); static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm); static Stencil rotated_box (Real slope, Real width, Real thick, Real blot); static Stencil round_filled_polygon (vector const &points, Real blotdiameter); @@ -24,13 +24,13 @@ struct Lookup static Stencil slur (Bezier controls, Real cthick, Real thick); static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve); static Stencil beam (Real slope, Real width, Real thick, Real blot); - static Stencil dashed_slur (Bezier, Real thick, Real dash_period, Real dash_fraction); + static Stencil dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction); static Stencil blank (Box b); static Stencil filled_box (Box b); static Stencil round_filled_box (Box b, Real blotdiameter); static Stencil repeat_slash (Real w, Real slope, Real th); static Stencil horizontal_line (Interval w, Real th); - static Stencil triangle (Interval, Real, Real); + static Stencil triangle (Interval iv, Real thick, Real protrude); static Stencil points_to_line_stencil (Real thick, vector const &points); }; diff --git a/lily/lookup.cc b/lily/lookup.cc index dfda5f73e4..62e0d97317 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -688,7 +688,7 @@ Lookup::repeat_slash (Real w, Real s, Real t) } Stencil -Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) +Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot) { Box b; Axis other = Axis ((a + 1)%2); @@ -698,8 +698,8 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) Stencil m = round_filled_box (b, blot); b[a] = Interval (iv[UP] - thick, iv[UP]); - Interval oi = Interval (-thick / 2, thick / 2 + fabs (protude)); - oi *= sign (protude); + Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude)); + oi *= sign (protrude); b[other] = oi; m.add_stencil (round_filled_box (b, blot)); b[a] = Interval (iv[DOWN], iv[DOWN] + thick); @@ -709,16 +709,16 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) } Stencil -Lookup::triangle (Interval iv, Real thick, Real protude) +Lookup::triangle (Interval iv, Real thick, Real protrude) { Box b; b[X_AXIS] = Interval (0, iv.length ()); - b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude)); + b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude)); vector points; points.push_back (Offset (iv[LEFT], 0)); points.push_back (Offset (iv[RIGHT], 0)); - points.push_back (Offset (iv.center (), protude)); + points.push_back (Offset (iv.center (), protrude)); return points_to_line_stencil (thick, points); diff --git a/lily/output-def.cc b/lily/output-def.cc index 853704c5c9..0e0259f128 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -81,7 +81,7 @@ assign_context_def (Output_def * m, SCM transdef) /* find the translator for NAME. NAME must be a symbol. */ SCM find_context_def (Output_def const *m, SCM name) -{ +{ Context_def *cd = unsmob_context_def (m->lookup_variable (name)); return cd ? cd->self_scm () : SCM_EOL; } diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index a092856a0a..79e76e3dcc 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -270,7 +270,7 @@ LY_DEFINE (ly_bracket, "ly:bracket", 4, 0, 0, (SCM a, SCM iv, SCM t, SCM p), "Make a bracket in direction@tie{}@var{a}. The extent of the" - " bracket is given by @var{iv}. The wings protude by an amount" + " bracket is given by @var{iv}. The wings protrude by an amount" " of@tie{}@var{p}, which may be negative. The thickness is given" " by@tie{}@var{t}.") { diff --git a/ly/property-init.ly b/ly/property-init.ly index 575d5945d7..b7cec45ae2 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -297,3 +297,26 @@ textSpannerDown = \override TextSpanner #'direction = #DOWN textSpannerNeutral = \revert TextSpanner #'direction + +bassFigureExtendersOn = { + \set useBassFigureExtenders = ##t + \set Staff.useBassFigureExtenders = ##t +} + +bassFigureExtendersOff = { + \set useBassFigureExtenders = ##f + \set Staff.useBassFigureExtenders = ##f +} + +bassFigureStaffAlignmentDown = { + \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN +} + +bassFigureStaffAlignmentUp = { + \override Staff.BassFigureAlignmentPositioning #'direction = #UP +} + +bassFigureStaffAlignmentNeutral = { + \revert Staff.BassFigureAlignmentPositioning #'direction +} + diff --git a/mf/feta-din-code.mf b/mf/feta-din-code.mf index 0b757af413..e2cf7bb6da 100644 --- a/mf/feta-din-code.mf +++ b/mf/feta-din-code.mf @@ -356,7 +356,7 @@ fet_beginchar ("dynamic p", "p") save twiddle_thick, stem_thick, cheek_thick, cheek_width; save fill_up, straigh_len; save serif, dishing_angle, p, tmp; - save cheek_medium, left_serif_protude, right_serif_protude; + save cheek_medium, left_serif_protrude, right_serif_protrude; save lower_overshoot; save blot_t, corner_t; path serif, p; @@ -375,8 +375,8 @@ fet_beginchar ("dynamic p", "p") stem_thick = 2/6 ex; cheek_thick = 13/32 ex; cheek_width = 0.72 ex; - left_serif_protude = 18/60 ex; - right_serif_protude = 15/60 ex; + left_serif_protrude = 18/60 ex; + right_serif_protrude = 15/60 ex; currenttransform := currenttransform slanted slant; @@ -453,8 +453,8 @@ fet_beginchar ("dynamic p", "p") pickup pencircle scaled serif_thick; - lft x11 = -left_serif_protude; - rt x10 = stem_thick + right_serif_protude; + lft x11 = -left_serif_protrude; + rt x10 = stem_thick + right_serif_protrude; bot y10 = bot y11 = -descender; z15 = z6l + up * fill_up; diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 66aa9b8d26..efcca040a9 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -195,9 +195,9 @@ enddef; def draw_bass_clef (expr exact_center, reduction) = save reduced_ss, swoosh_width; - save right_thickness, right_offset, tip_protude; + save right_thickness, right_offset, tip_protrude; save dot_diam, bulb_y_offset, bulb_flare; - pair tip_protude; + pair tip_protrude; reduced_ss# = staff_space# * reduction; 2.2 dot_diam# = reduction * (staff_space# - stafflinethickness#); @@ -210,8 +210,8 @@ def draw_bass_clef (expr exact_center, reduction) = right_offset = 0.05 staff_space; bulb_y_offset := 0.075 staff_space; bulb_flare := 2.5 linethickness; -% tip_protude := (-linethickness, -.2 staff_space); - tip_protude := (0, 0); +% tip_protrude := (-linethickness, -.2 staff_space); + tip_protrude := (0, 0); set_char_box (-xpart exact_center, xpart exact_center + swoosh_width# + 7/12 reduced_ss#, @@ -233,7 +233,7 @@ def draw_bass_clef (expr exact_center, reduction) = % optical correction: the top dot seems farther away if y3l = 0. y3l = right_offset; - z4 = -(0, 2.0 reduced_ss) + tip_protude; + z4 = -(0, 2.0 reduced_ss) + tip_protrude; penpos3 (whatever, 185); penpos4 (linethickness, 135); diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf index 4f23566293..fb86e19bdb 100644 --- a/mf/feta-timesig.mf +++ b/mf/feta-timesig.mf @@ -18,7 +18,7 @@ fet_begingroup ("timesig"); % * The inside curve of the C is rather straight. % * The outside curve of the C is rather round. % * Right tips of the C point slightly outward. -% * Lower tip protudes to the right very slightly. +% * Lower tip protrudes to the right very slightly. % def draw_C = diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index c8d603e430..5303e3cbc0 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -162,14 +162,13 @@ whitespace. If negative, no line is drawn at all.") (default-direction ,ly:dir? "Direction determined by note head positions.") (digit-names ,vector "Names for string finger digits.") - (direction ,ly:dir? "If @code{side-axis} is @code{1} (or + (direction ,ly:dir? "If @code{side-axis} is @code{0} (or @code{#X}), then this property determines whether the object is placed @code{#LEFT}, @code{#CENTER} or @code{#RIGHT} with respect to the other object. Otherwise, it determines whether the object is placed @code{#UP}, @code{#CENTER} or @code{#DOWN}. Numerical values may also be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1}, -@code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0} -but also other numerical values are permitted.") +@code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.") (dot-color ,symbol? "Color of dots. Options include @code{black} and @code{white}.") (dot-count ,integer? "The number of dots.") @@ -444,8 +443,8 @@ stem distance.") order a script is within a stack of scripts.") (self-alignment-X ,number? "Specify alignment of an object. The value @code{-1} means left aligned, @code{0}@tie{}centered, and -@code{1}@tie{}right-aligned in X@tie{}direction. Values in-between -may also be specified.") +@code{1}@tie{}right-aligned in X@tie{}direction. Other numerical +values may also be specified.") (self-alignment-Y ,number? "Like @code{self-alignment-X} but for the Y@tie{}axis.") (shorten-pair ,number-pair? "The lengths to shorten a diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 3138b96441..e75c1b4042 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -2144,6 +2144,7 @@ (thickness . 1.6) ;; line-thickness (edge-height . (2.0 . 2.0)) ;; staff-space; (font-size . -4) + (word-space . 0.6) (direction . ,UP) (meta . ((class . Spanner) (interfaces . (volta-bracket-interface diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 3c8d151b4f..36d981b06e 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -52,7 +52,7 @@ A simple line." A circle of radius @var{radius}, thickness @var{thickness} and optionally filled. -@c + @lilypond[verbatim,quote] \\markup { \\draw-circle #2 #0.5 ##f \\hspace #2 \\draw-circle #2 #0 ##t } @end lilypond" @@ -68,9 +68,9 @@ optionally filled. @cindex drawing triangles within text A triangle, either filled or empty. -@c + @lilypond[verbatim,quote] -\\markup { \\triangle ##f \\triangle ##t } +\\markup { \\triangle ##t \\hspace #2 \\triangle ##f } @end lilypond" (let ((ex (* (magstep font-size) 0.8 baseline-skip))) (ly:make-stencil @@ -110,10 +110,11 @@ thickness and padding around the markup." Add a link to URL @var{url} around @var{arg}. This only works in the PDF backend. + @lilypond[verbatim,quote] \\markup { \\with-url #\"http://lilypond.org/web/\" { - LilyPond ... \\italic \"music notation for everyone\" + LilyPond ... \\italic { music notation for everyone } } } @end lilypond" @@ -203,7 +204,16 @@ Draw a box with rounded corners of dimensions @var{xext} and @end verbatim creates a box extending horizontally from -0.3 to 1.8 and vertically from -0.3 up to 1.8, with corners formed from a -circle of diameter@tie{}0 (i.e. sharp corners)." +circle of diameter@tie{}0 (i.e. sharp corners). + +@lilypond[verbatim,quote] +\\markup { + \\filled-box #'(0 . 4) #'(0 . 4) #0 + \\filled-box #'(0 . 2) #'(-4 . 2) #0.4 + \\filled-box #'(1 . 8) #'(0 . 7) #0.2 + \\with-color #white \\filled-box #'(-4.5 . -2.5) #'(3.5 . 5.5) #0.7 +} +@end lilypond" (ly:round-filled-box xext yext blot)) @@ -349,7 +359,16 @@ Use a stencil as markup." @cindex inlining an Encapsulated PostScript image Inline an EPS image. The image is scaled along @var{axis} to -@var{size}." +@var{size}. + +@lilypond[verbatim,quote] +\\markup { + \\general-align #Y #DOWN { + \\epsfile #X #20 #\"context-example.eps\" + \\epsfile #Y #20 #\"context-example.eps\" + } +} +@end lilypond" (if (ly:get-option 'safe) (interpret-markup layout props "not allowed in safe") (eps-file->stencil axis size file-name) @@ -384,7 +403,36 @@ For the postscript backend, use the following gsave /ecrm10 findfont 10.0 output-scale div scalefont setfont 90 rotate (hello) show grestore -@end example" +@end example + +@lilypond[verbatim,quote] +eyeglassesps = #\" + 0.15 setlinewidth + -0.9 0 translate + 1.1 1.1 scale + 1.2 0.7 moveto + 0.7 0.7 0.5 0 361 arc + stroke + 2.20 0.70 0.50 0 361 arc + stroke + 1.45 0.85 0.30 0 180 arc + stroke + 0.20 0.70 moveto + 0.80 2.00 lineto + 0.92 2.26 1.30 2.40 1.15 1.70 curveto + stroke + 2.70 0.70 moveto + 3.30 2.00 lineto + 3.42 2.26 3.80 2.40 3.65 1.70 curveto + stroke\" + +eyeglasses = \\markup { + \\with-dimensions #'(0 . 4.4) #'(0 . 2.5) + \\postscript #eyeglassesps +} + +\\relative c'' { c2^\\eyeglasses a_\\eyeglasses } +@end lilypond" ;; FIXME (ly:make-stencil (list 'embedded-ps @@ -404,7 +452,47 @@ grestore " @cindex inserting music into text -Inline an image of music." +Inline an image of music. + +@lilypond[verbatim,quote] +\\markup { + \\score { + \\new PianoStaff << + \\new Staff \\relative c' { + \\key f \\major + \\time 3/4 + \\mark \\markup { Allegro } + f2\\p( a4) + c2( a4) + bes2( g'4) + f8( e) e4 r + } + \\new Staff \\relative c { + \\clef bass + \\key f \\major + \\time 3/4 + f8( a c a c a + f c' es c es c) + f,( bes d bes d bes) + f( g bes g bes g) + } + >> + \\layout { + indent = 0.0\\cm + \\context { + \\Score + \\override RehearsalMark #'break-align-symbols = + #'(time-signature key-signature) + \\override RehearsalMark #'self-alignment-X = #LEFT + } + \\context { + \\Staff + \\override TimeSignature #'break-align-anchor-alignment = #LEFT + } + } + } +} +@end lilypond" (let* ((output (ly:score-embedded-format score layout))) (if (ly:music-output? output) @@ -763,7 +851,14 @@ the line width, where @var{X} is the number of staff spaces." " @cindex merging text -Print two markups on top of each other." +Print two markups on top of each other. +@lilypond[verbatim,quote] +\\markup { + \\fontsize #5 + \\override #'(thickness . 2) + \\combine \\draw-line #'(0 . 4) \\arrow-head #Y #DOWN ##f +} +@end lilypond" (let* ((s1 (interpret-markup layout props m1)) (s2 (interpret-markup layout props m2))) (ly:stencil-add s1 s2))) @@ -1012,7 +1107,11 @@ any sort of property supported by @rinternals{font-interface} and (string?) other () - "Read the contents of a file, and include it verbatim." + "Read the contents of a file, and include it verbatim. + +@lilypond[verbatim,quote] +\\markup \\verbatim-file #\"simple.ly\" +@end lilypond" (interpret-markup layout props (if (ly:get-option 'safe) "verbatim-file disabled in safe mode" @@ -1050,7 +1149,10 @@ any sort of property supported by @rinternals{font-interface} and (markup?) font () - "Set the argument as small numbers." + "Set the argument as small numbers. +@lilypond[verbatim,quote] +\\markup \\finger { 1 2 3 4 5 } +@end lilypond" (interpret-markup layout (cons '((font-size . -5) (font-encoding . fetaNumber)) props) arg)) @@ -1109,7 +1211,11 @@ Use @code{\\fontsize} otherwise." () "Set font family to @code{number}, which yields the font used for time signatures and fingerings. This font only contains numbers and -some punctuation. It doesn't have any letters." +some punctuation. It doesn't have any letters. + +@lilypond[verbatim,quote] +\\markup \\number { 0 1 2 3 4 5 6 7 8 9 . , + - } +@end lilypond" (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaNumber props) arg)) (define-builtin-markup-command (roman layout props arg) @@ -1224,7 +1330,10 @@ Note: @code{\\smallCaps} does not support accented characters." "Use the dynamic font. This font only contains @b{s}, @b{f}, @b{m}, @b{z}, @b{p}, and @b{r}. When producing phrases, like @q{pi@`{u}@tie{}@b{f}}, the normal words (like @q{pi@`{u}}) should be -done in a different font. The recommended font for this is bold and italic." +done in a different font. The recommended font for this is bold and italic. +@lilypond[verbatim,quote] +\\markup { \\dynamic sfzp } +@end lilypond" (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg)) @@ -1242,7 +1351,11 @@ done in a different font. The recommended font for this is bold and italic." (markup?) font () - "Use italic @code{font-shape} for @var{arg}." + "Use italic @code{font-shape} for @var{arg}. + +@lilypond[verbatim,quote] +\\markup \\italic { scherzando e leggiero } +@end lilypond" (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg)) (define-builtin-markup-command (typewriter layout props arg) @@ -1291,7 +1404,7 @@ normal text font, no matter what font was used earlier." music () "Draw a double sharp symbol. -@c + @lilypond[verbatim,quote] \\markup { \\doublesharp } @end lilypond" @@ -1302,7 +1415,7 @@ normal text font, no matter what font was used earlier." music () "Draw a 3/2 sharp symbol. -@c + @lilypond[verbatim,quote] \\markup { \\sesquisharp } @end lilypond" @@ -1313,7 +1426,7 @@ normal text font, no matter what font was used earlier." music () "Draw a sharp symbol. -@c + @lilypond[verbatim,quote] \\markup { \\sharp } @end lilypond" @@ -1324,7 +1437,7 @@ normal text font, no matter what font was used earlier." music () "Draw a semi sharp symbol. -@c + @lilypond[verbatim,quote] \\markup { \\semisharp } @end lilypond" @@ -1335,7 +1448,7 @@ normal text font, no matter what font was used earlier." music () "Draw a natural symbol. -@c + @lilypond[verbatim,quote] \\markup { \\natural } @end lilypond" @@ -1346,7 +1459,7 @@ normal text font, no matter what font was used earlier." music () "Draw a semiflat symbol. -@c + @lilypond[verbatim,quote] \\markup { \\semiflat } @end lilypond" @@ -1357,7 +1470,7 @@ normal text font, no matter what font was used earlier." music () "Draw a flat symbol. -@c + @lilypond[verbatim,quote] \\markup { \\flat } @end lilypond" @@ -1368,7 +1481,7 @@ normal text font, no matter what font was used earlier." music () "Draw a 3/2 flat symbol. -@c + @lilypond[verbatim,quote] \\markup { \\sesquiflat } @end lilypond" @@ -1379,7 +1492,7 @@ normal text font, no matter what font was used earlier." music () "Draw a double flat symbol. -@c + @lilypond[verbatim,quote] \\markup { \\doubleflat } @end lilypond" @@ -1407,7 +1520,19 @@ Draw @var{arg} in color specified by @var{color}." graphic () "Produce an arrow head in specified direction and axis. -Use the filled head if @var{filled} is specified." +Use the filled head if @var{filled} is specified. +@lilypond[verbatim,quote] +\\markup { + \\fontsize #5 + \\general-align #Y #DOWN { + \\arrow-head #Y #UP ##t + \\arrow-head #Y #DOWN ##f + \\hspace #2 + \\arrow-head #X #RIGHT ##f + \\arrow-head #X #LEFT ##f + } +} +@end lilypond" (let* ((name (format "arrowheads.~a.~a~a" (if filled @@ -1427,7 +1552,15 @@ Use the filled head if @var{filled} is specified." "@var{glyph-name} is converted to a musical symbol; for example, @code{\\musicglyph #\"accidentals.natural\"} selects the natural sign from the music font. See @ruser{The Feta font} for a complete listing of -the possible glyphs." +the possible glyphs. + +@lilypond[verbatim,quote] +\\markup { + \\musicglyph #\"f\" + \\musicglyph #\"rests.2\" + \\musicglyph #\"clefs.G_change\" +} +@end lilypond" (ly:font-get-glyph (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) props)) @@ -1476,7 +1609,11 @@ letter @q{A}." other () "Make a markup letter for @var{num}. The letters start with A to@tie{}Z -(skipping letter@tie{}I), and continue with double letters." +(skipping letter@tie{}I), and continue with double letters. + +@lilypond[verbatim,quote] +\\markup { \\markletter #8 \\hspace #2 \\markletter #26 } +@end lilypond" (ly:text-interface::interpret-markup layout props (number->markletter-string number->mark-letter-vector num))) @@ -1485,7 +1622,11 @@ letter @q{A}." other () "Make a markup letter for @var{num}. The letters start with A to@tie{}Z -and continue with double letters." +and continue with double letters. + +@lilypond[verbatim,quote] +\\markup { \\markalphabet #8 \\hspace #2 \\markalphabet #26 } +@end lilypond" (ly:text-interface::interpret-markup layout props (number->markletter-string number->mark-alphabet-vector num))) @@ -1498,7 +1639,15 @@ and continue with double letters." @cindex slashed digits A feta number, with slash. This is for use in the context of -figured bass notation." +figured bass notation. +@lilypond[verbatim,quote] +\\markup { + \\slashed-digit #5 + \\hspace #2 + \\override #'(thickness . 3) + \\slashed-digit #7 +} +@end lilypond" (let* ((mag (magstep font-size)) (thickness (* mag (ly:output-def-lookup layout 'line-thickness) @@ -1709,9 +1858,9 @@ If the text object itself is positioned above or below the staff, then positions it next to the staff cancels any shift made with @code{\\raise}. For vertical positioning, use the @code{padding} and/or @code{extra-offset} properties. -@c + @lilypond[verbatim,quote] -\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" } } +\\markup { C \\small \\raise #1.0 \\bold 9/7+ } @end lilypond" (ly:stencil-translate-axis (interpret-markup layout props arg) amount Y)) @@ -1722,7 +1871,10 @@ and/or @code{extra-offset} properties. " @cindex creating text fractions -Make a fraction of two markups." +Make a fraction of two markups. +@lilypond[verbatim,quote] +\\markup { π ≈ \\fraction 355 113 } +@end lilypond" (let* ((m1 (interpret-markup layout props arg1)) (m2 (interpret-markup layout props arg2)) (factor (magstep font-size)) @@ -1767,9 +1919,9 @@ Set @var{arg} in superscript with a normal font size." Raising and lowering texts can be done with @code{\\super} and @code{\\sub}: -@c + @lilypond[verbatim,quote] -\\markup { E \"=\" \\concat { \"mc\" \\super \"2\" } } +\\markup { E = \\concat { mc \\super 2 } } @end lilypond" (ly:stencil-translate-axis (interpret-markup @@ -1840,7 +1992,7 @@ Set @var{arg} in subscript, in a normal font size." " @cindex placing horizontal brackets around text -Draw horizontal brackets around @var{arg}." +Draw horizontal brackets around @var{arg}." (let ((th 0.1) ;; todo: take from GROB. (m (interpret-markup layout props arg))) (bracketify-stencil m X th (* 2.5 th) th))) diff --git a/scm/paper.scm b/scm/paper.scm index 8acf4e8d10..04784c11f1 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -93,16 +93,106 @@ size. SZ is in points" ;; don't use decimals. ;; ISO 216 has a tolerance of +- 2mm - - '(("a7" . (cons (* 74 mm) (* 105 mm))) + + '(("a10" . (cons (* 26 mm) (* 37 mm))) + ("a9" . (cons (* 37 mm) (* 52 mm))) + ("a8" . (cons (* 52 mm) (* 74 mm))) + ("a7" . (cons (* 74 mm) (* 105 mm))) ("a6" . (cons (* 105 mm) (* 148 mm))) ("a5" . (cons (* 148 mm) (* 210 mm))) ("a4" . (cons (* 210 mm) (* 297 mm))) ("a3" . (cons (* 297 mm) (* 420 mm))) + ("a2" . (cons (* 420 mm) (* 594 mm))) + ("a1" . (cons (* 594 mm) (* 841 mm))) + ("a0" . (cons (* 841 mm) (* 1189 mm))) + ("b10" . (cons (* 31 mm) (* 44 mm))) + ("b9" . (cons (* 44 mm) (* 62 mm))) + ("b8" . (cons (* 62 mm) (* 88 mm))) + ("b7" . (cons (* 88 mm) (* 125 mm))) + ("b6" . (cons (* 125 mm) (* 176 mm))) + ("b5" . (cons (* 176 mm) (* 250 mm))) + ("b4" . (cons (* 250 mm) (* 353 mm))) + ("b3" . (cons (* 353 mm) (* 500 mm))) + ("b2" . (cons (* 500 mm) (* 707 mm))) + ("b1" . (cons (* 707 mm) (* 1000 mm))) + ("b0" . (cons (* 1000 mm) (* 1414 mm))) + ;; Below are two extended sizes defined in DIn 476 + ("4a0" . (cons (* 1682 mm) (* 2378 mm))) + ("2a0" . (cons (* 1189 mm) (* 1682 mm))) + ;; Below are ISO 269 standard C series + ("c10" . (cons (* 28 mm) (* 40 mm))) + ("c9" . (cons (* 40 mm) (* 57 mm))) + ("c8" . (cons (* 57 mm) (* 81 mm))) + ("c7" . (cons (* 81 mm) (* 114 mm))) + ("c6" . (cons (* 114 mm) (* 162 mm))) + ("c5" . (cons (* 162 mm) (* 229 mm))) + ("c4" . (cons (* 229 mm) (* 324 mm))) + ("c3" . (cons (* 324 mm) (* 458 mm))) + ("c2" . (cons (* 458 mm) (* 648 mm))) + ("c1" . (cons (* 648 mm) (* 917 mm))) + ("c0" . (cons (* 917 mm) (* 1297 mm))) + ;; Below are North American paper sizes ("legal" . (cons (* 8.5 in) (* 14.0 in))) ("letter" . (cons (* 8.5 in) (* 11.0 in))) + ;; Ledger (17x11) is a 90 degree rotation of Tabloid ("11x17" . (cons (* 11.0 in) (* 17.0 in))) - )) + ;; government-letter by IEEE Printer Working Group, for children's writing + ("government-letter" . (cons (* 8 in) (* 10.5 in))) + ("government-legal" . (cons (* 8.5 in) (* 13.0 in))) + ("philippine-legal" . (cons (* 8.5 in) (* 13.0 in))) + ;; ANSI sizes + ("ansi a" . (cons (* 8.5 in) (* 11.0 in))) + ("ansi b" . (cons (* 17.0 in) (* 11.0 in))) + ("ansi c" . (cons (* 17.0 in) (* 22.0 in))) + ("ansi d" . (cons (* 22.0 in) (* 34.0 in))) + ("ansi e" . (cons (* 34.0 in) (* 44.0 in))) + ("engineering f" . (cons (* 28.0 in) (* 40.0 in))) + ;; G and H are very rare, and the lengths are variable up to 90 inches + ;; North American Architectural sizes + ("arch a" . (cons (* 9.0 in) (* 12.0 in))) + ("arch b" . (cons (* 12.0 in) (* 18.0 in))) + ("arch c" . (cons (* 18.0 in) (* 24.0 in))) + ("arch d" . (cons (* 24.0 in) (* 36.0 in))) + ("arch e" . (cons (* 36.0 in) (* 48.0 in))) + ("arch e1" . (cons (* 30.0 in) (* 42.0 in))) + ;; Other sizes + ;; Some are antique sizes which are still using in UK + ("statement" . (cons (* 5.5 in) (* 8.5 in))) + ("half letter" . (cons (* 5.5 in) (* 8.5 in))) + ("quarto" . (cons (* 8.0 in) (* 10.0 in))) + ("executive" . (cons (* 7.25 in) (* 10.5 in))) + ("monarch" . (cons (* 7.25 in) (* 10.5 in))) + ("foolscap" . (cons (* 8.27 in) (* 13.0 in))) + ("folio" . (cons (* 8.27 in) (* 13.0 in))) + ("super-b" . (cons (* 13.0 in) (* 19.0 in))) + ("post" . (cons (* 15.5 in) (* 19.5 in))) + ("crown" . (cons (* 15.0 in) (* 20.0 in))) + ("large post" . (cons (* 16.5 in) (* 21.0 in))) + ("demy" . (cons (* 17.5 in) (* 22.5 in))) + ("medium" . (cons (* 18.0 in) (* 23.0 in))) + ("broadsheet" . (cons (* 18.0 in) (* 24.0 in))) + ("royal" . (cons (* 20.0 in) (* 25.0 in))) + ("elephant" . (cons (* 23.0 in) (* 28.0 in))) + ("double demy" . (cons (* 22.5 in) (* 35.0 in))) + ("quad demy" . (cons (* 35.0 in) (* 45.0 in))) + ("atlas" . (cons (* 26.0 in) (* 34.0 in))) + ("imperial" . (cons (* 22.0 in) (* 30.0 in))) + ("antiquarian" . (cons (* 31.0 in) (* 53.0 in))) + ;; PA4 based sizes + ("pa0" . (cons (* 840 mm) (* 1120 mm))) + ("pa1" . (cons (* 560 mm) (* 840 mm))) + ("pa2" . (cons (* 420 mm) (* 560 mm))) + ("pa3" . (cons (* 280 mm) (* 420 mm))) + ("pa4" . (cons (* 210 mm) (* 280 mm))) + ("pa5" . (cons (* 140 mm) (* 210 mm))) + ("pa6" . (cons (* 105 mm) (* 140 mm))) + ("pa7" . (cons (* 70 mm) (* 105 mm))) + ("pa8" . (cons (* 52 mm) (* 70 mm))) + ("pa9" . (cons (* 35 mm) (* 52 mm))) + ("pa10" . (cons (* 26 mm) (* 35 mm))) + ;; F4 used in southeast Asia and Australia + ("f4" . (cons (* 210 mm) (* 330 mm))) + )) ;; todo: take dimension arguments.