From b58a17a6b0b6f624cee7858a74092265e0791fe2 Mon Sep 17 00:00:00 2001 From: James Lowe Date: Fri, 12 Sep 2014 09:25:40 +0100 Subject: [PATCH] Makelsr.py run For commit ID a1c9c3d285a2f3e59cf79a375b67cfb58ceca7ba --- .../contexts-and-engravers.snippet-list | 1 + .../creating-custom-key-signatures.ly | 44 ++++++++++++++ .../modifying-the-ottava-spanner-slope.ly | 39 +++++++++++++ Documentation/snippets/pitches.snippet-list | 4 +- .../snippets/staff-notation.snippet-list | 2 + ...sing-warnings-for-clashing-note-columns.ly | 27 +++++---- .../snippets/tweaking-clef-properties.ly | 57 +++++++------------ .../tweaks-and-overrides.snippet-list | 3 +- 8 files changed, 125 insertions(+), 52 deletions(-) create mode 100644 Documentation/snippets/creating-custom-key-signatures.ly create mode 100644 Documentation/snippets/modifying-the-ottava-spanner-slope.ly diff --git a/Documentation/snippets/contexts-and-engravers.snippet-list b/Documentation/snippets/contexts-and-engravers.snippet-list index c752cf87ed..66b3139c7a 100644 --- a/Documentation/snippets/contexts-and-engravers.snippet-list +++ b/Documentation/snippets/contexts-and-engravers.snippet-list @@ -8,6 +8,7 @@ changing-midi-output-to-one-channel-per-voice.ly changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly chant-or-psalms-notation.ly creating-blank-staves.ly +creating-custom-key-signatures.ly cross-staff-stems.ly defining-an-engraver-in-scheme--ambitus-engraver.ly displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly diff --git a/Documentation/snippets/creating-custom-key-signatures.ly b/Documentation/snippets/creating-custom-key-signatures.ly new file mode 100644 index 0000000000..78de0a0705 --- /dev/null +++ b/Documentation/snippets/creating-custom-key-signatures.ly @@ -0,0 +1,44 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.18.0 +\version "2.18.0" + +\header { + lsrtags = "tweaks-and-overrides, pitches, staff-notation, contexts-and-engravers" + + texidoc = " +LilyPond supports custom key signatures. In this example, print for D +minor with an extended range of printed flats. +" + doctitle = "Creating custom key signatures" +} % begin verbatim + + +\new Staff \with { + \override StaffSymbol.line-count = #8 + \override KeySignature.flat-positions = #'((-7 . 6)) + \override KeyCancellation.flat-positions = #'((-7 . 6)) + % presumably sharps are also printed in both octaves + \override KeySignature.sharp-positions = #'((-6 . 7)) + \override KeyCancellation.sharp-positions = #'((-6 . 7)) + + \override Clef.stencil = # + (lambda (grob)(grob-interpret-markup grob + #{ \markup\combine + \musicglyph #"clefs.C" + \translate #'(-3 . -2) + \musicglyph #"clefs.F" + #})) + clefPosition = #3 + middleCPosition = #3 + middleCClefPosition = #3 +} + +{ + \key d\minor + f bes, f bes, +} diff --git a/Documentation/snippets/modifying-the-ottava-spanner-slope.ly b/Documentation/snippets/modifying-the-ottava-spanner-slope.ly new file mode 100644 index 0000000000..dea97c455e --- /dev/null +++ b/Documentation/snippets/modifying-the-ottava-spanner-slope.ly @@ -0,0 +1,39 @@ +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.18.0 +\version "2.18.0" + +\header { + lsrtags = "tweaks-and-overrides, pitches, staff-notation" + + texidoc = " +It is possible to change the slope of the Ottava spanner. + +" + doctitle = "Modifying the Ottava spanner slope" +} % begin verbatim + + +\relative c'' { + \override Staff.OttavaBracket.stencil = #ly:line-spanner::print + \override Staff.OttavaBracket.bound-details = + #`((left . ((Y . 0) ; Change the integer here + (attach-dir . ,LEFT) + (padding . 0) + (stencil-align-dir-y . ,CENTER))) + (right . ((Y . 5) ; Change the integer here + (padding . 0) + (attach-dir . ,RIGHT) + (text . ,(make-draw-dashed-line-markup (cons 0 -1.2)))))) + \override Staff.OttavaBracket.left-bound-info = + #ly:line-spanner::calc-left-bound-info-and-text + \override Staff.OttavaBracket.right-bound-info = + #ly:line-spanner::calc-right-bound-info + \ottava #1 + c1 + c'''1 +} diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list index 87368cd7cf..15750e435d 100644 --- a/Documentation/snippets/pitches.snippet-list +++ b/Documentation/snippets/pitches.snippet-list @@ -10,11 +10,11 @@ changing-the-interval-of-lines-on-the-stave.ly clefs-can-be-transposed-by-arbitrary-amounts.ly coloring-notes-depending-on-their-pitch.ly creating-a-sequence-of-notes-on-various-pitches.ly -forcing-a-clef-symbol-to-be-displayed.ly +creating-custom-key-signatures.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 numbers-as-easy-note-heads.ly orchestra,-choir-and-piano-template.ly diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list index 40af5a2ff7..be45c43b67 100644 --- a/Documentation/snippets/staff-notation.snippet-list +++ b/Documentation/snippets/staff-notation.snippet-list @@ -9,6 +9,7 @@ centered-measure-numbers.ly changing-the-number-of-lines-in-a-staff.ly changing-the-staff-size.ly creating-blank-staves.ly +creating-custom-key-signatures.ly creating-double-digit-fingerings.ly cross-staff-stems.ly display-bracket-with-only-one-staff-in-a-system.ly @@ -25,6 +26,7 @@ making-glissandi-breakable.ly making-some-staff-lines-thicker-than-the-others.ly measure-counter.ly mensurstriche-layout-bar-lines-between-the-staves.ly +modifying-the-ottava-spanner-slope.ly nesting-staves.ly non-traditional-key-signatures.ly numbering-groups-of-measures.ly diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly index 726b2978d3..ec7f763945 100644 --- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly +++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly @@ -1,17 +1,18 @@ -%% 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" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.19.14 +\version "2.19.14" \header { lsrtags = "simultaneous-notes, tweaks-and-overrides" texidoc = " If notes from two voices with stems in the same direction are placed at -the same position, and both voices have no shift or the same shift +the same position, but the voices have no voice-specific shifts specified, the error message @samp{warning: ignoring too many clashing note columns} will appear when compiling the LilyPond file. This message can be suppressed by setting the @code{'ignore-collision} @@ -19,18 +20,16 @@ property of the @code{NoteColumn} object to @code{#t}. Please note that this does not just suppress warnings but stops LilyPond trying to resolve collisions at all and so may have unintended results unless used with care. - " doctitle = "Suppressing warnings for clashing note columns" } % begin verbatim + ignore = \override NoteColumn.ignore-collision = ##t \relative c' { - << - \ignore - { \stemDown f2 g } - \\ - { c2 c, } + \new Staff << + \new Voice{ \ignore \stemDown f2 g } + \new Voice{ c2 \stemDown c, } >> } diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly index 645530ea2b..2a30cfa8e8 100644 --- a/Documentation/snippets/tweaking-clef-properties.ly +++ b/Documentation/snippets/tweaking-clef-properties.ly @@ -1,40 +1,29 @@ -%% 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" +% DO NOT EDIT this file manually; it is automatically +% generated from Documentation/snippets/new +% Make any changes in Documentation/snippets/new/ +% and then run scripts/auxiliar/makelsr.py +% +% This file is in the public domain. +%% Note: this file works from version 2.17.18 +\version "2.17.18" \header { lsrtags = "pitches, staff-notation, tweaks-and-overrides" texidoc = " -The command @code{\\clef \"treble_8\"} is equivalent to setting -@code{clefGlyph}, @code{clefPosition} (which controls the vertical -position of the clef), @code{middleCPosition} and -@code{clefOctavation}. A clef is printed when any of the properties -except @code{middleCPosition} are changed. +Changing the Clef glyph, its position, or the ottavation does not +change the position of subsequent notes on the staff. To get key +signatures on their correct staff lines @code{middleCClefPosition} +must also be specified, with positive or negative values moving +@emph{middle C} up or down respectively, relative to the staff's +center line. - -Note that changing the glyph, the position of the clef, or the -octavation does not in itself change the position of subsequent notes -on the staff: the position of middle C must also be specified to do -this. In order to get key signatures on the correct staff lines, -@code{middleCClefPosition} must also be set. The positional parameters -are relative to the staff center line, positive numbers displacing -upwards, counting one for each line and space. The -@code{clefOctavation} value would normally be set to 7, -7, 15 or -15, -but other values are valid. - - -When a clef change takes place at a line break the new clef symbol is -printed at both the end of the previous line and the beginning of the -new line by default. If the warning clef at the end of the previous -line is not required it can be suppressed by setting the @code{Staff} -property @code{explicitClefVisibility} to the value -@code{end-of-line-invisible}. The default behavior can be recovered -with @code{\\unset Staff.explicitClefVisibility}. +For example, @code{\\clef \"treble_8\"} is equivalent to setting +the @code{clefGlyph}, @code{clefPosition} (the vertical position +of the clef itself on the staff), @code{middleCPosition} and +@code{clefTransposition}. Note that when any of these properties +(except @code{middleCPosition}) are changed a new clef symbol is +printed. The following examples show the possibilities when setting these properties manually. On the first line, the manual changes preserve the @@ -45,10 +34,8 @@ line, they do not. doctitle = "Tweaking clef properties" } % begin verbatim -\layout { - indent = 0 - ragged-right = ##t -} +\layout { ragged-right = ##t } % begin verbatim + { % The default treble clef \key f \major diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list index 35cacb18c3..723710de74 100644 --- a/Documentation/snippets/tweaks-and-overrides.snippet-list +++ b/Documentation/snippets/tweaks-and-overrides.snippet-list @@ -23,6 +23,7 @@ controlling-spanner-visibility-after-a-line-break.ly controlling-the-vertical-ordering-of-scripts.ly controlling-tuplet-bracket-visibility.ly creating-a-delayed-turn.ly +creating-custom-key-signatures.ly creating-double-digit-fingerings.ly creating-simultaneous-rehearsal-marks.ly creating-text-spanners.ly @@ -51,12 +52,12 @@ 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 manually-controlling-beam-positions.ly mensurstriche-layout-bar-lines-between-the-staves.ly +modifying-the-ottava-spanner-slope.ly moving-dotted-notes-in-polyphony.ly moving-slur-positions-vertically.ly nesting-staves.ly -- 2.39.2