From c9d20c3e6743941d5744c6fe7bf163cf7df72213 Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Wed, 4 Jan 2012 18:19:03 +0000 Subject: [PATCH] LSR updates --- ...-modern-transcription-of-mensural-music.ly | 23 ++++------ .../automatically-change-durations.ly | 42 +++++++++++++++++++ .../snippets/formatting-lyrics-syllables.ly | 1 + Documentation/snippets/hymn-template.ly | 1 + .../snippets/partcombine-and-autobeamoff.ly | 2 + Documentation/snippets/rhythms.snippet-list | 1 + ...ng-quartet-template-with-separate-parts.ly | 4 +- ...rics-aligned-below-and-above-the-staves.ly | 16 ++++--- 8 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 Documentation/snippets/automatically-change-durations.ly diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly index 818a1873b2..d072072b29 100644 --- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -84,7 +84,8 @@ global = { % incipit \once \override Score.SystemStartBracket #'transparent = ##t - \override Score.SpacingSpanner #'spacing-increment = #1.0 % tight spacing + % Set tight spacing + \override Score.SpacingSpanner #'spacing-increment = #1.0 \key f \major \time 2/2 \once \override Staff.TimeSignature #'style = #'neomensural @@ -100,7 +101,6 @@ global = { \bar "" % main - \revert Score.SpacingSpanner #'spacing-increment % CHECK: no effect? \cadenzaOff % turn bar lines on again \once \override Staff.Clef #'full-size-change = ##t \set Staff.forceClef = ##t @@ -109,7 +109,7 @@ global = { \override Voice.NoteHead #'style = #'default \override Voice.Rest #'style = #'default - % FIXME: setting printKeyCancellation back to #t must not + % Setting printKeyCancellation back to #t must not % occur in the first bar after the incipit. Dto. for forceClef. % Therefore, we need an extra \skip. \skip 1*1 @@ -296,17 +296,12 @@ bassusLyrics = \lyricmode { % no slurs \override Slur #'transparent = ##t - % Comment in the below "\remove" command to allow line - % breaking also at those barlines where a note overlaps - % into the next bar. The command is commented out in this - % short example score, but especially for large scores, you - % will typically yield better line breaking and thus improve - % overall spacing if you comment in the following command. - %\remove "Forbid_line_break_engraver" + % The command below can be commented out in + % short scores, but especially for large scores you + % will typically yield better line breaking and improve + % overall spacing if you do not comment the command out. + + \remove "Forbid_line_break_engraver" } } } - - - - diff --git a/Documentation/snippets/automatically-change-durations.ly b/Documentation/snippets/automatically-change-durations.ly new file mode 100644 index 0000000000..72f05c0337 --- /dev/null +++ b/Documentation/snippets/automatically-change-durations.ly @@ -0,0 +1,42 @@ +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.dsi.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.14.0" + +\header { + lsrtags = "rhythms" + + texidoc = " +shiftDurations can be used to change the note lengths of a +piece of music. It takes two arguments - the scaling factor as a power +of two, and the number of dots to be added as a positive integer. + +" + doctitle = "Automatically change durations" +} % begin verbatim + +\paper { indent = 0 } + +music = \relative c'' { a1 b2 c4 d8 r } + +\score { + \new Voice { + \time 4/2 + \music + \time 4/4 + \shiftDurations #1 #0 { \music } + \time 2/4 + \shiftDurations #2 #0 { \music } + \time 4/1 + \shiftDurations #-1 #0 { \music } + \time 8/1 + \shiftDurations #-2 #0 { \music } + \time 6/2 + \shiftDurations #0 #1 { \music } + \time 7/2 + \shiftDurations #0 #2 { \music } + } +} diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly index f64e9f012a..fa99151b8e 100644 --- a/Documentation/snippets/formatting-lyrics-syllables.ly +++ b/Documentation/snippets/formatting-lyrics-syllables.ly @@ -16,6 +16,7 @@ zu formatieren. " doctitlede = "Silben im Gesangstext formatieren" + %% Translation of GIT committish: d9d1da30361a0bcaea1ae058eb1bc8dd3a5b2e4c texidocfr = " Le mode markup permet d'individualiser la mise en forme de certaines syllabes. diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly index 00ddc15638..c121eed510 100644 --- a/Documentation/snippets/hymn-template.ly +++ b/Documentation/snippets/hymn-template.ly @@ -27,6 +27,7 @@ strofe come testo separato sotto la musica. " doctitleit = "Modello per inno" + %% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 texidocde = " diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly index d5b3340110..bb6f54ba50 100644 --- a/Documentation/snippets/partcombine-and-autobeamoff.ly +++ b/Documentation/snippets/partcombine-and-autobeamoff.ly @@ -47,6 +47,7 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}. " doctitlees = "Partcombine y autoBeamOff" + %% Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506 texidocde = " @@ -78,6 +79,7 @@ wenn man es mit @code{\\partcombine} verwendet, muss @code{\\autoBeamOff} " doctitlede = "Partcombine und autoBeamOff" + %% Translation of GIT committish: e1a149d0cc60b02e86209387958f4028567dd366 texidocfr = " Le fonction @code{@bs{}autoBeamOff} dans le cadre d'un diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list index f67d4b7a1e..ac62483cda 100644 --- a/Documentation/snippets/rhythms.snippet-list +++ b/Documentation/snippets/rhythms.snippet-list @@ -4,6 +4,7 @@ adjusting-grace-note-spacing.ly aligning-bar-numbers.ly alternative-breve-note.ly automatic-beam-subdivisions.ly +automatically-change-durations.ly avoiding-collisions-with-chord-fingerings.ly beam-endings-in-score-context.ly beam-grouping-in-7-8-time.ly diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly index 579f1f3dbf..abc2d89182 100644 --- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly +++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly @@ -174,8 +174,8 @@ music = { %%%%% score.ly %%%%% (This is the main file) - -%\include "piece.ly" %%% uncomment this line when using a separate file +%%% uncomment the line below when using a separate file +%\include "piece.ly" #(set-global-staff-size 14) \score { \new StaffGroup \keepWithTag #'score \music diff --git a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index 794a2c1fb0..27677e0c11 100644 --- a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -102,10 +102,12 @@ bassWords = \lyricmode { \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> } \new Voice = "altos" { \voiceTwo << \global \altoMusic >> } >> - \new Lyrics \with { alignAboveContext = #"women" } \lyricsto "sopranos" \sopWords - \new Lyrics \with { alignBelowContext = #"women" } \lyricsto "altos" \altoWords - % we could remove the line about this with the line below, since we want - % the alto lyrics to be below the alto Voice anyway. + \new Lyrics \with { alignAboveContext = #"women" } + \lyricsto "sopranos" \sopWords + \new Lyrics \with { alignBelowContext = #"women" } + \lyricsto "altos" \altoWords + % we could remove the line about this with the line below, since + % we want the alto lyrics to be below the alto Voice anyway. % \new Lyrics \lyricsto "altos" \altoWords \new Staff = "men" << @@ -113,8 +115,10 @@ bassWords = \lyricmode { \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> } \new Voice = "basses" { \voiceTwo << \global \bassMusic >> } >> - \new Lyrics \with { alignAboveContext = #"men" } \lyricsto "tenors" \tenorWords - \new Lyrics \with { alignBelowContext = #"men" } \lyricsto "basses" \bassWords + \new Lyrics \with { alignAboveContext = #"men" } + \lyricsto "tenors" \tenorWords + \new Lyrics \with { alignBelowContext = #"men" } + \lyricsto "basses" \bassWords % again, we could replace the line above this with the line below. % \new Lyrics \lyricsto "basses" \bassWords >> -- 2.39.2