From: Phil Holmes Date: Wed, 15 Apr 2015 09:23:32 +0000 (+0100) Subject: LSR updates X-Git-Tag: release/2.19.19-1~16 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1010f574a85b40fb70e0b31136e7eb788e4946be;p=lilypond.git LSR updates --- diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly index b0fc8eb5e7..514718f9bd 100644 --- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly +++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly @@ -12,7 +12,7 @@ texidoc = " Beat grouping within a measure is controlled by the context property @code{beatStructure}. Values of @code{beatStructure} are established -for many time signatures in @file{scm/time-signature-settings.scm}. +for many time signatures in @@file@{scm/time-signature-settings.scm@}. Values of @code{beatStructure} can be changed or set with @code{\\set}. Alternatively, @code{\\time} can be used to both set the time signature and establish the beat structure. For this, you specify the internal @@ -28,7 +28,7 @@ display contexts, measure grouping signs will be created. Such signs ease reading rhythmically complex modern music. In the example, the 9/8 measure is grouped in two different patterns using the two different methods, while the 5/8 measure is grouped according to the default -setting in @file{scm/time-signature-settings.scm}: +setting in @@file@{scm/time-signature-settings.scm@}: " doctitle = "Conducting signs measure grouping signs" diff --git a/Documentation/snippets/extending-glissandi-across-repeats.ly b/Documentation/snippets/extending-glissandi-across-repeats.ly index 52ec929781..bd18a741f4 100644 --- a/Documentation/snippets/extending-glissandi-across-repeats.ly +++ b/Documentation/snippets/extending-glissandi-across-repeats.ly @@ -54,7 +54,7 @@ music = \relative c' { } \alternative { { d1 } - { \repeatGliss c e1 } + { \repeatGliss c \once \omit StringNumber e1\2 } } } diff --git a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly new file mode 100644 index 0000000000..7f0dcb1686 --- /dev/null +++ b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly @@ -0,0 +1,32 @@ +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" + +\header { + lsrtags = "pitches" + + texidoc = " +When a clef sign has already been displayed and it has not been changed +to a different clef, then repeating the @code{\\clef} command will be +ignored by LilyPond, since it is not a change of clef. It is possible +to force the clef to be redisplayed using the command @code{\\set +Staff.forceClef = ##t}. + +" + doctitle = "Forcing a clef symbol to be displayed" +} % begin verbatim + +\relative c' { + \clef treble + c1 + \clef treble + c1 + \set Staff.forceClef = ##t + c1 + \clef treble + c1 +} diff --git a/Documentation/snippets/keep-change-clefs-full-sized.ly b/Documentation/snippets/keep-change-clefs-full-sized.ly new file mode 100644 index 0000000000..6d6ae87a8e --- /dev/null +++ b/Documentation/snippets/keep-change-clefs-full-sized.ly @@ -0,0 +1,37 @@ +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" + +\header { + lsrtags = "pitches, tweaks-and-overrides" + + texidoc = " +When a clef is changed, the clef sign displayed is smaller than the +initial clef. This can be overridden with @code{full-size-change}. + +" + doctitle = "Keep change clefs full sized" +} % begin verbatim + +\relative c' { + \clef "treble" + c1 + \clef "bass" + c1 + \clef "treble" + c1 + \override Staff.Clef.full-size-change = ##t + \clef "bass" + c1 + \clef "treble" + c1 + \revert Staff.Clef.full-size-change + \clef "bass" + c1 + \clef "treble" + c1 +} diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list index 15750e435d..fb072060bd 100644 --- a/Documentation/snippets/pitches.snippet-list +++ b/Documentation/snippets/pitches.snippet-list @@ -11,8 +11,10 @@ clefs-can-be-transposed-by-arbitrary-amounts.ly coloring-notes-depending-on-their-pitch.ly creating-a-sequence-of-notes-on-various-pitches.ly creating-custom-key-signatures.ly +forcing-a-clef-symbol-to-be-displayed.ly generating-random-notes.ly hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly +keep-change-clefs-full-sized.ly makam-example.ly modifying-the-ottava-spanner-slope.ly non-traditional-key-signatures.ly diff --git a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly deleted file mode 100644 index 7a4bce37a0..0000000000 --- a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly +++ /dev/null @@ -1,26 +0,0 @@ -%% DO NOT EDIT this file manually; it is automatically -%% generated from LSR http://lsr.di.unimi.it -%% Make any changes in LSR itself, or in Documentation/snippets/new/ , -%% and then run scripts/auxiliar/makelsr.py -%% -%% This file is in the public domain. -\version "2.18.0" - -\header { - lsrtags = "repeats, tweaks-and-overrides" - - texidoc = " -A @code{|:} bar line can be printed at the beginning of a piece. - -" - doctitle = "Printing a repeat sign at the beginning of a piece" -} % begin verbatim - -\relative c'' { - \bar ".|:" - \repeat volta 2 { - c1 - d1 - d4 e f g - } -} diff --git a/Documentation/snippets/repeats.snippet-list b/Documentation/snippets/repeats.snippet-list index 3b55be22a8..d3fa46c992 100644 --- a/Documentation/snippets/repeats.snippet-list +++ b/Documentation/snippets/repeats.snippet-list @@ -8,7 +8,6 @@ numbering-groups-of-measures.ly percent-repeat-count-visibility.ly percent-repeat-counter.ly positioning-segno-and-coda-with-line-break.ly -printing-a-repeat-sign-at-the-beginning-of-a-piece.ly setting-the-double-repeat-default-for-volte.ly shortening-volta-brackets.ly volta-below-chords.ly diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index 723710de74..6ca05f41e5 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -52,6 +52,7 @@ how-to-change-fret-diagram-position.ly how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly inserting-a-caesura.ly +keep-change-clefs-full-sized.ly line-arrows.ly making-an-object-invisible-with-the-transparent-property.ly making-glissandi-breakable.ly @@ -66,7 +67,6 @@ percent-repeat-count-visibility.ly positioning-arpeggios.ly positioning-multi-measure-rests.ly positioning-text-markups-inside-slurs.ly -printing-a-repeat-sign-at-the-beginning-of-a-piece.ly printing-bar-numbers-inside-boxes-or-circles.ly printing-metronome-and-rehearsal-marks-below-the-staff.ly printing-note-names-with-and-without-an-octave-marker.ly diff --git a/Documentation/snippets/using-alternative-flag-styles.ly b/Documentation/snippets/using-alternative-flag-styles.ly index 319456cba1..145eab583a 100644 --- a/Documentation/snippets/using-alternative-flag-styles.ly +++ b/Documentation/snippets/using-alternative-flag-styles.ly @@ -12,7 +12,8 @@ texidoc = " Alternative styles of flag on eighth and shorter notes can be displayed by overriding the @code{stencil} property of @code{Flag}. Valid values -are @code{modern-straight-flag} and @code{old-straight-flag}. +are @code{modern-straight-flag}, @code{old-straight-flag} and +@code{flat-flag}. " doctitle = "Using alternative flag styles" @@ -23,16 +24,28 @@ testnotes = { c8 d16 c32 d64 \acciaccatura { c8 } d64 r4 } -\relative c' { - \time 2/4 - \testnotes - - \override Flag.stencil = #modern-straight-flag - \testnotes - - \override Flag.stencil = #old-straight-flag - \testnotes - - \revert Flag.stencil - \testnotes +\score { + \relative c' { + \time 2/4 + \testnotes + + \override Flag.stencil = #modern-straight-flag + \testnotes + + \override Flag.stencil = #old-straight-flag + \testnotes + + \override Flag.stencil = #flat-flag + \testnotes + + \revert Flag.stencil + \testnotes + } + \layout { + indent = 0 + \context { + \Score + \override NonMusicalPaperColumn.line-break-permission = ##f + } + } }