From: Graham Percival Date: Sat, 5 May 2007 01:40:47 +0000 (-0700) Subject: Update from LSR. X-Git-Tag: release/2.11.24-1~24 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6db956dc0774c67177b9b38bc4980aac4e44c904;p=lilypond.git Update from LSR. --- diff --git a/input/lsr/ancient/AAA-intro-advanced.ly b/input/lsr/ancient/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/ancient/AAA-intro-advanced.ly +++ b/input/lsr/ancient/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/ancient/GNUmakefile b/input/lsr/ancient/GNUmakefile index 43325ab698..3819fda13a 100644 --- a/input/lsr/ancient/GNUmakefile +++ b/input/lsr/ancient/GNUmakefile @@ -1,4 +1,3 @@ - depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex diff --git a/input/lsr/ancient/ancient-fonts.ly b/input/lsr/ancient/ancient-fonts.ly index 5347e731cc..f2b29cb7ed 100644 --- a/input/lsr/ancient/ancient-fonts.ly +++ b/input/lsr/ancient/ancient-fonts.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" +\version "2.11.23" \header { texidoc = " Here are shown many (all?) of the symbols that are included in @@ -16,8 +16,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override Staff.StaffSymbol #'line-count = #4 \transpose c c { - \override Staff.KeySignature #'style = #'vaticana - \override Staff.Accidental #'style = #'vaticana + \override Staff.KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist + \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override NoteHead #'style = #'vaticana.punctum \key es \major \clef "vaticana-fa2" @@ -57,8 +57,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override NoteHead #'style = #'vaticana.cephalicus es f - \override Staff.KeySignature #'style = #'medicaea - \override Staff.Accidental #'style = #'medicaea + \override Staff.KeySignature #'glyph-name-alist = #alteration-medicaea-glyph-name-alist + \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist \override Staff.Custos #'style = #'medicaea \override NoteHead #'style = #'medicaea.punctum \clef "medicaea-fa2" @@ -80,8 +80,8 @@ upperStaff = \context GregorianStaff = "upperStaff" << \override NoteHead #'style = #'medicaea.rvirga e! des! ces! - \override Staff.KeySignature #'style = #'hufnagel - \override Staff.Accidental #'style = #'hufnagel + \override Staff.KeySignature #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist + \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist \override Staff.Custos #'style = #'hufnagel \override NoteHead #'style = #'hufnagel.punctum \clef "hufnagel-fa2" @@ -257,8 +257,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \accepts MensuralVoice \consists Custos_engraver \override TimeSignature #'style = #'mensural - \override KeySignature #'style = #'mensural - \override Accidental #'style = #'mensural + \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist + \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist \override Custos #'style = #'mensural \override Custos #'neutral-position = #3 \override Custos #'neutral-direction = #-1 @@ -275,8 +275,8 @@ lowerStaff = \context MensuralStaff = "lowerStaff" << \remove Time_signature_engraver \override StaffSymbol #'thickness = #2.0 \override StaffSymbol #'line-count = #4 - \override KeySignature #'style = #'vaticana - \override Accidental #'style = #'vaticana + \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist + \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist \override Custos #'style = #'vaticana \override Custos #'neutral-position = #4 \override Custos #'neutral-direction = #-1 diff --git a/input/lsr/chords/AAA-intro-chords.ly b/input/lsr/chords/AAA-intro-chords.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/chords/AAA-intro-chords.ly +++ b/input/lsr/chords/AAA-intro-chords.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/connecting/AAA-intro-connecting.ly b/input/lsr/connecting/AAA-intro-connecting.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/connecting/AAA-intro-connecting.ly +++ b/input/lsr/connecting/AAA-intro-connecting.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/contemporary/AAA-intro-contemporary.ly b/input/lsr/contemporary/AAA-intro-contemporary.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/contemporary/AAA-intro-contemporary.ly +++ b/input/lsr/contemporary/AAA-intro-contemporary.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly b/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly new file mode 100644 index 0000000000..d1d30f331e --- /dev/null +++ b/input/lsr/contemporary/non-traditional-key-signatures-scordatura.ly @@ -0,0 +1,15 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +You can get any key signature you want by manually setting the +Staff.keySignature property. +" } + +\relative c' +\new Staff { + \set Staff.keySignature = #`(((1 . 2) . ,SHARP) ((0 . 3) . ,FLAT)) + f8 a c e + \set Staff.keySignature = #`(((1 . 2) . ,FLAT) ((0 . 4) . ,DOUBLE-SHARP)) + e a, g a +} diff --git a/input/lsr/expressive/AAA-intro-advanced.ly b/input/lsr/expressive/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/expressive/AAA-intro-advanced.ly +++ b/input/lsr/expressive/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/expressive/GNUmakefile b/input/lsr/expressive/GNUmakefile index 43325ab698..3819fda13a 100644 --- a/input/lsr/expressive/GNUmakefile +++ b/input/lsr/expressive/GNUmakefile @@ -1,4 +1,3 @@ - depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex diff --git a/input/lsr/expressive/line-arrows.ly b/input/lsr/expressive/line-arrows.ly index 7a5e573fe2..94f3ecfff4 100644 --- a/input/lsr/expressive/line-arrows.ly +++ b/input/lsr/expressive/line-arrows.ly @@ -1,6 +1,4 @@ %% Do not edit this file; it is auto-generated from LSR! -% contemporary - \header { texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)" } diff --git a/input/lsr/expressive/tempo-mark-scheme-function.ly b/input/lsr/expressive/tempo-mark-scheme-function.ly deleted file mode 100644 index 93bb50408b..0000000000 --- a/input/lsr/expressive/tempo-mark-scheme-function.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR! -\version "2.10.12" - -\header { texidoc = " -This is a Scheme function which prints a tempo mark such as - Fast (♩= 222) -" } - -tempoMark = - #(define-music-function (parser location prependText notevalue appendText) (string? string? string?) - #{ - \mark \markup - { \line { $prependText " (" \fontsize #-2 \general-align #Y #DOWN \note #$notevalue #1 $appendText ) } } - #}) - -theMusic = -{ - \once \override Score.RehearsalMark #'self-alignment-X = #-1 - \time 4/4 \tempoMark "Fast" "4" "= 220-222" s1 -} - -\score -{ - \theMusic -} diff --git a/input/lsr/guitar/AAA-intro-advanced.ly b/input/lsr/guitar/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/guitar/AAA-intro-advanced.ly +++ b/input/lsr/guitar/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/guitar/fret-diagrams.ly b/input/lsr/guitar/fret-diagrams.ly index 63cdd24814..bd181f5793 100644 --- a/input/lsr/guitar/fret-diagrams.ly +++ b/input/lsr/guitar/fret-diagrams.ly @@ -2,53 +2,58 @@ \version "2.10.12" \header { texidoc = " -Frets are supported as markup commands. +This snippets shows many possibilities for obtaining and tweaking fret +diagrams. " } -\score { - << - \chords {d2 d d s fis fis fis s c c c} - - - \context Voice = "mel" { -% simple D chord - - d'2 ^\markup \fret-diagram-verbose #'((mute 6) (mute 5) (open 4) (place-fret 3 2) (place-fret 2 3) (place-fret 1 2)) - d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;" - d' ^\markup \fret-diagram-terse #"x;x;o;2;3;2;" - r -% fis major chord, 3/4 size, fingering labeled below string - - fis' ^\markup \override #'(size . 0.75) {\override #'(finger-code . below-string){\fret-diagram-verbose #'((place-fret 6 2 1) (barre 6 1 2) (place-fret 5 4 3) (place-fret 4 4 4) (place-fret 3 3 2) (place-fret 2 2 1) (place-fret 1 2 1))}} - fis' ^\markup \override #'(finger-code . below-string) {\fret-diagram #"s:0.75;c:6-1-2;6-2-1;5-4-3;4-4-4;3-3-2;2-2-1;1-2-1;"} - fis' ^\markup \override #'(size . 0.75) {\override #'(finger-code . below-string){\fret-diagram-terse #"2-1-(;4-3;4-4;3-2;2-1;2-1-);"}} - r - -% c major barre chord, fingering labeled on frets - c' ^\markup \override #'(dot-color . white) { - \override #'(finger-code . in-dot) - \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) } - c' ^\markup \override #'(barre-type . straight) \fret-diagram #"f:1;c:5-1-3;6-x;5-3-1;4-5-2;3-5-3;2-5-4;1-3-1;" - c' ^\markup \override #'(dot-radius . 0.35) { - \override #'(finger-code . in-dot) { - \override #'(dot-color . white) { - \fret-diagram-terse #"x;3-1-(;5-2;5-3;5-4;3-1-);"}}} - r - -% c major scale using open strings - c' ^\markup \fret-diagram-verbose #'((mute 6) (place-fret 5 3) (open 4) (place-fret 4 2) (place-fret 4 3) (open 3) (place-fret 3 2) (open 2) (place-fret 2 1) (mute 1)) - c' ^\markup \fret-diagram #'"6-x;5-3;4-o;4-2;4-3;3-o;3-2;2-o;2-1;1-x;" - c' ^\markup \fret-diagram-terse #'"x;3;2 3;o 2;o 1;x;" - -% c major scale using no open strings - c' ^\markup \fret-diagram-verbose #'((mute 6) (place-fret 5 3) (place-fret 5 5) (place-fret 4 2) (place-fret 4 3) (place-fret 4 5) (place-fret 3 2) (place-fret 3 4) (place-fret 3 5) (mute 2) (mute 1)) - c' ^\markup \fret-diagram #'"6-x;5-3;5-5;4-2;4-3;4-5;3-2;3-4;3-5;2-x;1-x;" - c' ^\markup \fret-diagram-terse #'"x;3 5;2 3 5;2 4 5;x;x;" - - -% g major scale, no open strings, two octaves on six strings, white dots - g' ^\markup \override #'(dot-color . white) {\fret-diagram-terse #'"3 5;2 3 5;2 4 5;2 4 5;3 5;2 3;" } - r r r} - >> - +\paper { + + %% stretch to prevent diagrams from colliding. + line-width = 18.0 \cm } + + +<< + \chords {s2 c c c d} + + \new Voice =mel { + + %% A chord for ukelele + a'2 ^\markup + \override #'(string-count . 4) { + \override #'(dot-color . white) { + \fret-diagram #"4-2-2;3-1-1;2-o;1-o;"}} + + %% C major for guitar, barred on third fret + c' ^\markup + \override #'(number-type . roman-lower) { % lower-case roman numeral fret label + \override #'(size . 1.1) { % 110% of default size + \override #'(finger-code . below-string) { % string labels below strings + \override #'(barre-type . straight) { % straight barre + \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} + %% C major for guitar, barred on third fret + c' ^\markup + \override #'(number-type . arabic) { % lower-case roman numeral fret label + \override #'(dot-color . white) { % white dots + \override #'(finger-code . in-dot) { % string labels in dots + \override #'(barre-type . curved) { % straight barre + \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} + %% C major for guitar, barred on third fret + c' ^\markup + \override #'(number-type . roman-upper) { % upper-case roman numeral fret label + \override #'(label-dir . -1) { % label fret at left side of diagram + \override #'(finger-code . in-dot) { % string labels in dots + \override #'(barre-type . curved) { % curved barre + \fret-diagram-verbose #'((mute 6) (place-fret 5 3 1) (place-fret 4 5 2) (place-fret 3 5 3) (place-fret 2 5 4) (place-fret 1 3 1) (barre 5 1 3)) }}}} + + %% simple D chord + + d' ^\markup + \override #'(finger-code . below-string) { + \override #'(dot-radius . 0.35) { + \override #'(dot-position . 0.5) { + \override #'(fret-count . 5) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" }}}} + + } +>> diff --git a/input/lsr/parts/AAA-intro-advanced.ly b/input/lsr/parts/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/parts/AAA-intro-advanced.ly +++ b/input/lsr/parts/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/parts/GNUmakefile b/input/lsr/parts/GNUmakefile index 43325ab698..3819fda13a 100644 --- a/input/lsr/parts/GNUmakefile +++ b/input/lsr/parts/GNUmakefile @@ -1,4 +1,3 @@ - depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex diff --git a/input/lsr/parts/quote-transposition.ly b/input/lsr/parts/quote-transposition.ly index ff3aa5cd7d..d3e078b081 100644 --- a/input/lsr/parts/quote-transposition.ly +++ b/input/lsr/parts/quote-transposition.ly @@ -1,6 +1,4 @@ %% Do not edit this file; it is auto-generated from LSR! -%preparing - \header { diff --git a/input/lsr/parts/quote.ly b/input/lsr/parts/quote.ly index 4f98e24112..b7b918f3a3 100644 --- a/input/lsr/parts/quote.ly +++ b/input/lsr/parts/quote.ly @@ -1,6 +1,4 @@ %% Do not edit this file; it is auto-generated from LSR! -%preparing - \header { diff --git a/input/lsr/parts/tempo-mark-scheme-function.ly b/input/lsr/parts/tempo-mark-scheme-function.ly new file mode 100644 index 0000000000..93bb50408b --- /dev/null +++ b/input/lsr/parts/tempo-mark-scheme-function.ly @@ -0,0 +1,25 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +This is a Scheme function which prints a tempo mark such as + Fast (♩= 222) +" } + +tempoMark = + #(define-music-function (parser location prependText notevalue appendText) (string? string? string?) + #{ + \mark \markup + { \line { $prependText " (" \fontsize #-2 \general-align #Y #DOWN \note #$notevalue #1 $appendText ) } } + #}) + +theMusic = +{ + \once \override Score.RehearsalMark #'self-alignment-X = #-1 + \time 4/4 \tempoMark "Fast" "4" "= 220-222" s1 +} + +\score +{ + \theMusic +} diff --git a/input/lsr/repeats/AAA-intro-advanced.ly b/input/lsr/repeats/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/repeats/AAA-intro-advanced.ly +++ b/input/lsr/repeats/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/scheme/AAA-intro-advanced.ly b/input/lsr/scheme/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/scheme/AAA-intro-advanced.ly +++ b/input/lsr/scheme/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly b/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly new file mode 100644 index 0000000000..4485954f11 --- /dev/null +++ b/input/lsr/scheme/integrating-lilypond-expressions-inside-scheme-functions.ly @@ -0,0 +1,39 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +It is possible to use fragments of LilyPond syntax inside Scheme, by +putting them between #@{ and #@}. In this example, three functions are +defined to apply different paddings on the TextScript markups, using +native LilyPond commands such as \"\override TextScript #'padding\". +" } + +\layout { ragged-right = ##t } + +withPaddingA = #(define-music-function (parser location padding music) (number? ly:music?) + #{ \override TextScript #'padding = #$padding + $music + \revert TextScript #'padding #}) + +withPaddingB = #(define-music-function (parser location padding music) (number? ly:music?) + #{ \override TextScript #'padding = #$(* padding 2) + $music + \revert TextScript #'padding #}) + +withPaddingC = #(define-music-function (parser location padding music) (number? ly:music?) + #{ \override TextScript #'padding = #(+ 1 $(* padding 2)) + $music + \revert TextScript #'padding #}) + +{ + c'^"1" + \withPaddingA #2 + { c'^"2" c'^"3"} + c'^"4" + \withPaddingB #2 + { c'^"5" c'^"6"} + c'^"7" + \withPaddingC #2 + { c'^"8" c'^"9"} + c'^"10" +} diff --git a/input/lsr/spacing/AAA-intro-advanced.ly b/input/lsr/spacing/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/spacing/AAA-intro-advanced.ly +++ b/input/lsr/spacing/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/staff/AAA-intro-advanced.ly b/input/lsr/staff/AAA-intro-advanced.ly index 48fe478494..cf025b6604 100644 --- a/input/lsr/staff/AAA-intro-advanced.ly +++ b/input/lsr/staff/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.11.15" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/staff/adding-an-extra-staff.ly b/input/lsr/staff/adding-an-extra-staff.ly index 2cc8caa162..38d41f1391 100644 --- a/input/lsr/staff/adding-an-extra-staff.ly +++ b/input/lsr/staff/adding-an-extra-staff.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " You can add (possibly temporarily) an extra staff after the beginning diff --git a/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly b/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly index f4149b4596..416e87d2fc 100644 --- a/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly +++ b/input/lsr/staff/changing-the-number-of-lines-in-a-staff.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " The number of lines in a staff may changed by overriding diff --git a/input/lsr/staff/displaying-bar-numbers-on-all-measures.ly b/input/lsr/staff/displaying-bar-numbers-on-all-measures.ly index 226ebb3b0d..430cdd4284 100644 --- a/input/lsr/staff/displaying-bar-numbers-on-all-measures.ly +++ b/input/lsr/staff/displaying-bar-numbers-on-all-measures.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " By default, bar numbers are printed only in the first measure. This diff --git a/input/lsr/staff/inserting-bar-lines-everywhere.ly b/input/lsr/staff/inserting-bar-lines-everywhere.ly index 7148fb5da4..a23e297235 100644 --- a/input/lsr/staff/inserting-bar-lines-everywhere.ly +++ b/input/lsr/staff/inserting-bar-lines-everywhere.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " By setting @code{barAlways} and @code{defaultBarType}, barlines may be diff --git a/input/lsr/staff/making-bar-numbers-appear-at-regular-intervals.ly b/input/lsr/staff/making-bar-numbers-appear-at-regular-intervals.ly index 1084a0b45d..f870af2df6 100644 --- a/input/lsr/staff/making-bar-numbers-appear-at-regular-intervals.ly +++ b/input/lsr/staff/making-bar-numbers-appear-at-regular-intervals.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " If you would like the bar numbers to appear at regular intervals, but diff --git a/input/lsr/staff/naming-a-whole-grandstaff.ly b/input/lsr/staff/naming-a-whole-grandstaff.ly index 355878ef82..5f755806c3 100644 --- a/input/lsr/staff/naming-a-whole-grandstaff.ly +++ b/input/lsr/staff/naming-a-whole-grandstaff.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " You can have a name for the whole @code{GrandStaff} in addition to diff --git a/input/lsr/staff/removing-the-key-signature-at-the-end-of-a-line.ly b/input/lsr/staff/removing-the-key-signature-at-the-end-of-a-line.ly index 88abeade96..7688dc6210 100644 --- a/input/lsr/staff/removing-the-key-signature-at-the-end-of-a-line.ly +++ b/input/lsr/staff/removing-the-key-signature-at-the-end-of-a-line.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " According to normal typesetting conventions, LilyPond typesets key diff --git a/input/lsr/staff/staff-line-positions.ly b/input/lsr/staff/staff-line-positions.ly index 5e1b486d31..a33e356662 100644 --- a/input/lsr/staff/staff-line-positions.ly +++ b/input/lsr/staff/staff-line-positions.ly @@ -1,5 +1,5 @@ %% Do not edit this file; it is auto-generated from LSR! -\version "2.11.15" +\version "2.10.12" \header { texidoc = " The vertical positions of staff lines may be specified individually, by diff --git a/input/lsr/text/AAA-intro-advanced.ly b/input/lsr/text/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/text/AAA-intro-advanced.ly +++ b/input/lsr/text/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/text/GNUmakefile b/input/lsr/text/GNUmakefile index 43325ab698..3819fda13a 100644 --- a/input/lsr/text/GNUmakefile +++ b/input/lsr/text/GNUmakefile @@ -1,4 +1,3 @@ - depth = ../../../ STEPMAKE_TEMPLATES=documentation texinfo tex diff --git a/input/lsr/text/the--fill-line-command.ly b/input/lsr/text/the--fill-line-command.ly new file mode 100644 index 0000000000..1c8504c52d --- /dev/null +++ b/input/lsr/text/the--fill-line-command.ly @@ -0,0 +1,153 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +The \fill-line command aligns and justifies markup text by setting as +many columns as required, in a given space. +" } + +\paper { + line-width = 15\cm + bookTitleMarkup = \markup { + \column { + \fill-line { + 1 + } + \fill-line { + 1 + 2 + } + \fill-line { + 1 + 2 + 3 + } + \fill-line { + 1 + 2 + 3 + 4 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + } + \fill-line { + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + } + } + } +} + + \score { \new Staff \relative c''{ + \repeat unfold 4 c1 + } +} diff --git a/input/lsr/text/utf-8.ly b/input/lsr/text/utf-8.ly index c491bed775..d1bc933e78 100644 --- a/input/lsr/text/utf-8.ly +++ b/input/lsr/text/utf-8.ly @@ -1,6 +1,4 @@ %% Do not edit this file; it is auto-generated from LSR! -% text - \version "2.10.0" %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs diff --git a/input/lsr/vocal/AAA-intro-advanced.ly b/input/lsr/vocal/AAA-intro-advanced.ly index b907dd0d52..4f00239efd 100644 --- a/input/lsr/vocal/AAA-intro-advanced.ly +++ b/input/lsr/vocal/AAA-intro-advanced.ly @@ -1,3 +1,4 @@ +%% Do not edit this file; it is auto-generated from LSR! \version "2.10.0" %% +.ly: Be the first .ly file for lys-to-tely.py. %% Better to make lys-to-tely.py include "introduction.texi" or diff --git a/input/lsr/vocal/adding-ambiti-per-voice.ly b/input/lsr/vocal/adding-ambiti-per-voice.ly new file mode 100644 index 0000000000..014475bb20 --- /dev/null +++ b/input/lsr/vocal/adding-ambiti-per-voice.ly @@ -0,0 +1,24 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +Ambits can be added per voice. In that case, the ambitus must be moved +manually to prevent collisions. +" } + +\new Staff << + \new Voice \with { + \consists "Ambitus_engraver" + } \relative c'' { + \override Ambitus #'X-offset = # 1.0 + \voiceOne + c4 a d e f2 + } + \new Voice \with { + \consists "Ambitus_engraver" + } \relative c' { + \voiceTwo + es4 f g as b2 + } +>> + diff --git a/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly b/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly new file mode 100644 index 0000000000..80895a4423 --- /dev/null +++ b/input/lsr/vocal/how-to-put-ties-between-syllables-in-lyrics.ly @@ -0,0 +1,10 @@ +%% Do not edit this file; it is auto-generated from LSR! +\version "2.10.12" + +\header { texidoc = " +This can be achieved by separating those syllables by tildes. +" } + +\lyrics { + wa~o~a +}