From 942f957aae58fdc7252d6bc2b548a28e9fadc666 Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Thu, 10 Sep 2015 11:44:10 +0100 Subject: [PATCH] LSR updates --- .../snippets/adding-markups-in-a-tablature.ly | 48 +++++++++++++++++++ ...-of-the-middle-note-based-on-the-melody.ly | 2 +- .../snippets/changing-ottava-text.ly | 34 +++++++++++++ .../changing-the-default-bar-lines.ly | 48 +++++++++++++++++++ .../editorial-annotations.snippet-list | 1 + .../snippets/fretted-strings.snippet-list | 1 + Documentation/snippets/pitches.snippet-list | 1 + Documentation/snippets/repeats.snippet-list | 1 + .../snippets/staff-notation.snippet-list | 1 + Documentation/snippets/text.snippet-list | 2 + .../tweaks-and-overrides.snippet-list | 1 + 11 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 Documentation/snippets/adding-markups-in-a-tablature.ly create mode 100644 Documentation/snippets/changing-ottava-text.ly create mode 100644 Documentation/snippets/changing-the-default-bar-lines.ly diff --git a/Documentation/snippets/adding-markups-in-a-tablature.ly b/Documentation/snippets/adding-markups-in-a-tablature.ly new file mode 100644 index 0000000000..a751f70739 --- /dev/null +++ b/Documentation/snippets/adding-markups-in-a-tablature.ly @@ -0,0 +1,48 @@ +%% 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 = "editorial-annotations, fretted-strings, text, tweaks-and-overrides" + + texidoc = " +By default markups does not show in a tablature. To make them appear, +simply use the command @code{\\revert TabStaff.TextScript.stencil} + +" + doctitle = "Adding markups in a tablature" +} % begin verbatim + +%% http://lsr.di.unimi.it/LSR/Item?id=919 +% by P.P.Schneider on June 2014 + +high = { r4 r8 q r8 r4 } + +low = { c4 r4 c8 r8 g,8 b, } + +pulse = { s8^"1" s^"&" s^"2" s^"&" s^"3" s^"&" s^"4" s^"&" } + +\score { + \new TabStaff { + \repeat unfold 2 << \high \\ \low \\ \pulse >> + } + \layout { + \context { + \TabStaff + \clef moderntab + \revert TextScript.stencil + \override TextScript.font-series = #'bold + \override TextScript.font-size = #-2 + \override TextScript.color = #red + + } + \context { + \Score + proportionalNotationDuration = #(ly:make-moment 1/8) + } + } +} diff --git a/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly b/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly index 4f830f0c8e..4f7a59cae6 100644 --- a/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly +++ b/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly @@ -29,6 +29,6 @@ Voice context and overriding the @code{neutral-direction} of Stem. \Voice \consists "Melody_engraver" \autoBeamOff - \stemNeutral + \override Stem.neutral-direction = #'() } } diff --git a/Documentation/snippets/changing-ottava-text.ly b/Documentation/snippets/changing-ottava-text.ly new file mode 100644 index 0000000000..11101d4f7d --- /dev/null +++ b/Documentation/snippets/changing-ottava-text.ly @@ -0,0 +1,34 @@ +%% 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, text" + + texidoc = " +Internally, @code{\\ottava} sets the properties @code{ottavation} (for +example, to @code{8va} or @code{8vb}) and @code{middleCPosition}. To +override the text of the bracket, set @code{ottavation} after invoking +@code{\\ottava}. + +Short text is especially useful when a brief ottava is used. + +" + doctitle = "Changing ottava text" +} % begin verbatim + +{ + c'2 + \ottava #1 + \set Staff.ottavation = #"8" + c''2 + \ottava #0 + c'1 + \ottava #1 + \set Staff.ottavation = #"Text" + c''1 +} diff --git a/Documentation/snippets/changing-the-default-bar-lines.ly b/Documentation/snippets/changing-the-default-bar-lines.ly new file mode 100644 index 0000000000..c2c04ea6fb --- /dev/null +++ b/Documentation/snippets/changing-the-default-bar-lines.ly @@ -0,0 +1,48 @@ +%% 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, staff-notation" + + texidoc = " +Default bar lines can be changed when re-defined in a score context. + +" + doctitle = "Changing the default bar lines" +} % begin verbatim + +% http://lsr.di.unimi.it/LSR/Item?id=964 +%%=> http://lists.gnu.org/archive/html/lilypond-user/2014-03/msg00126.html +%%=> http://lilypond.1069038.n5.nabble.com/Changing-the-default-end-repeat-bracket-tc169357.html + +\layout { + \context { + \Score + %% Changing the defaults from engraver-init.ly + defaultBarType = #"!" + startRepeatType = #"[|:" + endRepeatType = #":|]" + doubleRepeatType = #":|][|:" + } +} + +%% example: +{ + c'1 + \repeat volta 2 { \repeat unfold 2 c' } + \repeat volta 2 { \repeat unfold 2 c' } + \alternative { + { c' } + { + %% v2.18 workaround + \once\override Score.VoltaBracket.shorten-pair = #'(1 . -1) + c' + } + } + \bar "|." +} diff --git a/Documentation/snippets/editorial-annotations.snippet-list b/Documentation/snippets/editorial-annotations.snippet-list index c8d2a9a51c..bfe4bfffdc 100644 --- a/Documentation/snippets/editorial-annotations.snippet-list +++ b/Documentation/snippets/editorial-annotations.snippet-list @@ -1,5 +1,6 @@ adding-fingerings-to-a-score.ly adding-links-to-objects.ly +adding-markups-in-a-tablature.ly allowing-fingerings-to-be-printed-inside-the-staff.ly alternative-bar-numbering.ly analysis-brackets-above-the-staff.ly diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list index 5f1f9f0cd6..7825781039 100644 --- a/Documentation/snippets/fretted-strings.snippet-list +++ b/Documentation/snippets/fretted-strings.snippet-list @@ -1,5 +1,6 @@ adding-fingerings-to-a-score.ly adding-fingerings-to-tablatures.ly +adding-markups-in-a-tablature.ly allowing-fingerings-to-be-printed-inside-the-staff.ly bar-chords-notation-for-guitar-with-text-spanner.ly changing-fret-orientations.ly diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list index fb072060bd..7410307eb5 100644 --- a/Documentation/snippets/pitches.snippet-list +++ b/Documentation/snippets/pitches.snippet-list @@ -5,6 +5,7 @@ ambitus-with-multiple-voices.ly ambitus.ly applying-note-head-styles-depending-on-the-step-of-the-scale.ly automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly +changing-ottava-text.ly changing-the-ambitus-gap.ly changing-the-interval-of-lines-on-the-stave.ly clefs-can-be-transposed-by-arbitrary-amounts.ly diff --git a/Documentation/snippets/repeats.snippet-list b/Documentation/snippets/repeats.snippet-list index d3fa46c992..2bffa5d033 100644 --- a/Documentation/snippets/repeats.snippet-list +++ b/Documentation/snippets/repeats.snippet-list @@ -1,5 +1,6 @@ adding-volta-brackets-to-additional-staves.ly centered-measure-numbers.ly +changing-the-default-bar-lines.ly cross-staff-tremolos.ly engraving-tremolos-with-floating-beams.ly isolated-percent-repeats.ly diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list index be45c43b67..038ba0bd15 100644 --- a/Documentation/snippets/staff-notation.snippet-list +++ b/Documentation/snippets/staff-notation.snippet-list @@ -6,6 +6,7 @@ adding-orchestral-cues-to-a-vocal-score.ly adding-timing-marks-to-long-glissandi.ly alternative-bar-numbering.ly centered-measure-numbers.ly +changing-the-default-bar-lines.ly changing-the-number-of-lines-in-a-staff.ly changing-the-staff-size.ly creating-blank-staves.ly diff --git a/Documentation/snippets/text.snippet-list b/Documentation/snippets/text.snippet-list index 54ed786ca7..380f092674 100644 --- a/Documentation/snippets/text.snippet-list +++ b/Documentation/snippets/text.snippet-list @@ -1,3 +1,4 @@ +adding-markups-in-a-tablature.ly adding-the-current-date-to-a-score.ly adjusting-lyrics-vertical-spacing.ly aligning-and-centering-instrument-names.ly @@ -6,6 +7,7 @@ aligning-syllables-with-melisma.ly blanking-staff-lines-using-the--whiteout-command.ly center-text-below-hairpin-dynamics.ly centering-markup-on-note-heads-automatically.ly +changing-ottava-text.ly changing-the-default-text-font-family.ly combining-dynamics-with-markup-texts.ly combining-two-parts-on-the-same-staff.ly diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index bbda0d49ca..71a02386c7 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -1,5 +1,6 @@ adding-an-ottava-marking-to-a-single-voice.ly adding-links-to-objects.ly +adding-markups-in-a-tablature.ly adding-timing-marks-to-long-glissandi.ly adjusting-grace-note-spacing.ly adjusting-lyrics-vertical-spacing.ly -- 2.39.2