From: Han-Wen Nienhuys Date: Tue, 25 Mar 2008 03:41:02 +0000 (-0300) Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond X-Git-Tag: release/2.11.43-2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8190076d2ab3fcb8b0eac2cdbf3057232cd35e11;hp=07224653a0e65c7b7ec0b2d4dd212351db26fb7d;p=lilypond.git Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond --- diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index 7f30c94edc..47589baeea 100644 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@ -69,7 +69,7 @@ html_re = re.compile ('(.*?)(?:[.]([^/.]*))?[.]html$') pages_dict = {} def build_pages_dict (filelist): - """Build dictionnary of available translations of each page""" + """Build dictionary of available translations of each page""" global pages_dict for f in filelist: m = html_re.match (f) diff --git a/buildscripts/generate_intervals.py b/buildscripts/generate_intervals.py deleted file mode 100755 index dbde2bcee7..0000000000 --- a/buildscripts/generate_intervals.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python - -notes = "CDEFGAB" -alterations = [-1, 0, 1] - -def print_note (octave, note, alteration): - print " \n \n %s" % notes[note] - if alteration <> 0: - print " %s" % alteration - print " %s\n \n 1\n 1\n quarter\n " % octave - - -print """ - - - Various piches and interval sizes - - - MusicXML Part - - - - - - - 1 - - 0 - major - - - - G - 2 - - -""" - -start_octave = 5 - -for octave in (start_octave, start_octave+1): - for note in (0,1,2,3,4,5,6): - for alteration in alterations: - if octave == start_octave and note == 0 and alteration == -1: - continue - print_note (octave, note, alteration) -# if octave == start_octave and note == 0 and alteration == 0: -# continue - print_note (start_octave-(octave-start_octave)-(1-(7-note)/7), (7-note)%7, -alteration) - -print """ - - -""" \ No newline at end of file diff --git a/buildscripts/generate_keys.py b/buildscripts/generate_keys.py deleted file mode 100755 index cd0f99529f..0000000000 --- a/buildscripts/generate_keys.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -notes = "CDEFGAB" -alterations = [-1, 0, 1] - -def print_measure (nr, fifth, mode, atts = "", final = ""): - print """ - -%s - %s - %s - - - - - C - 4 - - 2 - 1 - half - -%s """ % (nr, atts, fifth, mode, final) - -first_atts = """ 1 - - - G - 2 - -""" - -final_barline = """ - light-heavy - -""" - -print """ - - - Different Key signatures - - - MusicXML Part - - - - -""" - -max_range = 11 -measure = 0 -for fifth in range(-max_range, max_range+1): - measure += 1 - if fifth == -max_range: - print_measure (measure, fifth, "major", first_atts) - else: - print_measure (measure, fifth, "major") - measure += 1 - if fifth == max_range: - print_measure (measure, fifth, "minor", "", final_barline) - else: - print_measure (measure, fifth, "minor") - - -print """ - -""" \ No newline at end of file diff --git a/buildscripts/generate_timesignatures.py b/buildscripts/generate_timesignatures.py deleted file mode 100755 index 9844f3d0f6..0000000000 --- a/buildscripts/generate_timesignatures.py +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env python - -notes = "CDEFGAB" -alterations = [-1, 0, 1] - -def print_measure (nr, beats, type, params = "", attr = "", barline = ""): - print """ - -%s - - - - C - 5 - - 1 - 1 - quarter - -%s """ % (nr, attr, params, beats, type, barline) - -first_atts = """ 1 - - 0 - major - - - - G - 2 - -""" - -final_barline = """ - light-heavy - -""" - -print """ - - - Different time signatures - - - MusicXML Part - - - - -""" - -measure = 1 - -print_measure (measure, 2, 2, " symbol=\"common\"", first_atts) -measure += 1 - -print_measure (measure, 4, 4, " symbol=\"common\"") -measure += 1 - -print_measure (measure, 2, 2) -measure += 1 - -print_measure (measure, 3, 2) -measure += 1 - -print_measure (measure, 2, 4) -measure += 1 - -print_measure (measure, 3, 4) -measure += 1 - -print_measure (measure, 4, 4) -measure += 1 - -print_measure (measure, 5, 4) -measure += 1 - -print_measure (measure, 3, 8) -measure += 1 - -print_measure (measure, 6, 8) -measure += 1 - -print_measure (measure, 12, 8, "", "", final_barline) -measure += 1 - -print """ - -""" \ No newline at end of file diff --git a/buildscripts/musicxml_generate_intervals.py b/buildscripts/musicxml_generate_intervals.py new file mode 100755 index 0000000000..dbde2bcee7 --- /dev/null +++ b/buildscripts/musicxml_generate_intervals.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python + +notes = "CDEFGAB" +alterations = [-1, 0, 1] + +def print_note (octave, note, alteration): + print " \n \n %s" % notes[note] + if alteration <> 0: + print " %s" % alteration + print " %s\n \n 1\n 1\n quarter\n " % octave + + +print """ + + + Various piches and interval sizes + + + MusicXML Part + + + + + + + 1 + + 0 + major + + + + G + 2 + + +""" + +start_octave = 5 + +for octave in (start_octave, start_octave+1): + for note in (0,1,2,3,4,5,6): + for alteration in alterations: + if octave == start_octave and note == 0 and alteration == -1: + continue + print_note (octave, note, alteration) +# if octave == start_octave and note == 0 and alteration == 0: +# continue + print_note (start_octave-(octave-start_octave)-(1-(7-note)/7), (7-note)%7, -alteration) + +print """ + + +""" \ No newline at end of file diff --git a/buildscripts/musicxml_generate_keys.py b/buildscripts/musicxml_generate_keys.py new file mode 100755 index 0000000000..cd0f99529f --- /dev/null +++ b/buildscripts/musicxml_generate_keys.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python + +notes = "CDEFGAB" +alterations = [-1, 0, 1] + +def print_measure (nr, fifth, mode, atts = "", final = ""): + print """ + +%s + %s + %s + + + + + C + 4 + + 2 + 1 + half + +%s """ % (nr, atts, fifth, mode, final) + +first_atts = """ 1 + + + G + 2 + +""" + +final_barline = """ + light-heavy + +""" + +print """ + + + Different Key signatures + + + MusicXML Part + + + + +""" + +max_range = 11 +measure = 0 +for fifth in range(-max_range, max_range+1): + measure += 1 + if fifth == -max_range: + print_measure (measure, fifth, "major", first_atts) + else: + print_measure (measure, fifth, "major") + measure += 1 + if fifth == max_range: + print_measure (measure, fifth, "minor", "", final_barline) + else: + print_measure (measure, fifth, "minor") + + +print """ + +""" \ No newline at end of file diff --git a/buildscripts/musicxml_generate_timesignatures.py b/buildscripts/musicxml_generate_timesignatures.py new file mode 100755 index 0000000000..9844f3d0f6 --- /dev/null +++ b/buildscripts/musicxml_generate_timesignatures.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python + +notes = "CDEFGAB" +alterations = [-1, 0, 1] + +def print_measure (nr, beats, type, params = "", attr = "", barline = ""): + print """ + +%s + + + + C + 5 + + 1 + 1 + quarter + +%s """ % (nr, attr, params, beats, type, barline) + +first_atts = """ 1 + + 0 + major + + + + G + 2 + +""" + +final_barline = """ + light-heavy + +""" + +print """ + + + Different time signatures + + + MusicXML Part + + + + +""" + +measure = 1 + +print_measure (measure, 2, 2, " symbol=\"common\"", first_atts) +measure += 1 + +print_measure (measure, 4, 4, " symbol=\"common\"") +measure += 1 + +print_measure (measure, 2, 2) +measure += 1 + +print_measure (measure, 3, 2) +measure += 1 + +print_measure (measure, 2, 4) +measure += 1 + +print_measure (measure, 3, 4) +measure += 1 + +print_measure (measure, 4, 4) +measure += 1 + +print_measure (measure, 5, 4) +measure += 1 + +print_measure (measure, 3, 8) +measure += 1 + +print_measure (measure, 6, 8) +measure += 1 + +print_measure (measure, 12, 8, "", "", final_barline) +measure += 1 + +print """ + +""" \ No newline at end of file diff --git a/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly b/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly deleted file mode 100644 index c0137ff812..0000000000 --- a/input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Fingerings can be entered as markup objects, for example to specify -fingering changes on a single note. -" } -% begin verbatim -\relative c'' { - c4-1 d-2 f-4 - c^\markup { \finger "2 - 3" } -} diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/input/lsr/adding-fingerings-to-a-score.ly deleted file mode 100644 index 27fbc6f01a..0000000000 --- a/input/lsr/adding-fingerings-to-a-score.ly +++ /dev/null @@ -1,13 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Fingering instructions can be entered using a simple syntax. -" } -% begin verbatim -\relative c'' { - c4-1 d-2 f-4 e-3 -} diff --git a/input/lsr/adding-fingerings-to-chords.ly b/input/lsr/adding-fingerings-to-chords.ly deleted file mode 100644 index a30a2d147c..0000000000 --- a/input/lsr/adding-fingerings-to-chords.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, chords, piano-music" - texidoc = " -Fingerings for chords can be obtained by adding them to individual -pitches. -" } -% begin verbatim -\relative c'{ - < c-1 e-2 g-3 b-5 >2 - < d-1 f-2 a-3 c-5 > -} diff --git a/input/lsr/anaylsis-brackets.ly b/input/lsr/anaylsis-brackets.ly deleted file mode 100644 index 177a005887..0000000000 --- a/input/lsr/anaylsis-brackets.ly +++ /dev/null @@ -1,25 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Brackets can be used in musical analysis to indicate the structure of -the pieces. As demonstrated in the second measure, such analysis -brackets can be nested. -" } -% begin verbatim -\layout { - \context { - \Staff \consists "Horizontal_bracket_engraver" - } -} -\relative c'' { - c2\startGroup - d\stopGroup - c4\startGroup\startGroup - d4\stopGroup - e4\startGroup - d4\stopGroup\stopGroup -} diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly index 7dfbd6cce9..b737fc83a2 100644 --- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly +++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly @@ -3,7 +3,7 @@ \version "2.11.38" \header { - lsrtags = "expressive-marks, editorial-and-educational-use" + lsrtags = "expressive-marks" texidoc = " The appearance of slurs may be changed from solid to dotted or dashed. diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly index 14b684a713..1d2fa5803a 100644 --- a/input/lsr/changing-the-default-text-font-family.ly +++ b/input/lsr/changing-the-default-text-font-family.ly @@ -3,7 +3,7 @@ \version "2.11.38" \header { - lsrtags = "editorial-and-educational-use, text, tweaks-and-overrides" + lsrtags = "text, tweaks-and-overrides" texidoc = " The default font families for text can be overridden with @code{make-pango-font-tree}. diff --git a/input/lsr/changing-the-size-of-layout-objects.ly b/input/lsr/changing-the-size-of-layout-objects.ly deleted file mode 100644 index 3fca93714a..0000000000 --- a/input/lsr/changing-the-size-of-layout-objects.ly +++ /dev/null @@ -1,19 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, tweaks-and-overrides" - texidoc = " -The @code{font-size} property can be set directly, so that only certain -layout objects are affected. -" } -% begin verbatim -\relative c'' { - \set fontSize = #3 - c4.-> d8---3 - \override NoteHead #'font-size = #-4 - c4.-> d8---3 - \override Script #'font-size = #3 - c4.-> d8---3 -} diff --git a/input/lsr/changing-the-size-of-note-heads.ly b/input/lsr/changing-the-size-of-note-heads.ly deleted file mode 100644 index 62e27e0cd7..0000000000 --- a/input/lsr/changing-the-size-of-note-heads.ly +++ /dev/null @@ -1,24 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -It is possible to change the fontsize of noteheads. -" } -% begin verbatim -\relative c'' { -% \huge - c4.-> d8---3 -% \large - c4.-> d8---3 -% \normalsize - c4.-> d8---3 -% \small - c4.-> d8---3 -% \tiny - c4.-> d8---3 -% \normalsize - c2 -} diff --git a/input/lsr/chords.snippet-list b/input/lsr/chords.snippet-list index be81952a4e..3eb5fd7a86 100644 --- a/input/lsr/chords.snippet-list +++ b/input/lsr/chords.snippet-list @@ -1,4 +1,3 @@ -adding-fingerings-to-chords.ly changing-the-chord-names-to-german-or-semi-german-notation.ly adding-a-figured-bass-above-or-below-the-notes.ly single-staff-template-with-notes-and-chords.ly diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly index 3a6983181c..fe0a4ea9eb 100644 --- a/input/lsr/clefs-commonly-tweaked-properties.ly +++ b/input/lsr/clefs-commonly-tweaked-properties.ly @@ -3,7 +3,7 @@ \version "2.11.38" \header { - lsrtags = "pitches, staff-notation, editorial-and-educational-use, tweaks-and-overrides" + 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 Y-position of diff --git a/input/lsr/coloring-elements-of-notation.ly b/input/lsr/coloring-elements-of-notation.ly deleted file mode 100644 index 93dccdc03b..0000000000 --- a/input/lsr/coloring-elements-of-notation.ly +++ /dev/null @@ -1,19 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Individual objects may be assigned colors. Several pre-defined colors -are available; they are exhaustively listed in the Notation Reference. -" } -% begin verbatim -\relative c'' { - \override NoteHead #'color = #red - c4 c - \override NoteHead #'color = #(x11-color 'LimeGreen) - d - \override Stem #'color = #blue - e -} diff --git a/input/lsr/coloring-objects.ly b/input/lsr/coloring-objects.ly deleted file mode 100644 index 48ab991661..0000000000 --- a/input/lsr/coloring-objects.ly +++ /dev/null @@ -1,29 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, tweaks-and-overrides" - texidoc = " -LilyPond gives you the ability to assign different colors to any grob -in your score, such as NoteHeads, Alterations, Beams and so on, by -simply overriding the #'color property and choosing your color (over -200 colors are available, see the \"List of Colors\" Appendix in the -Manual). -" } -% begin verbatim -\relative { - \override Accidental #'color = #darkgreen - \override Beam #'color = #cyan - \override NoteHead #'color = #darkyellow - c4 - \override NoteHead #'color = #red - f - \override NoteHead #'color = #darkmagenta - g - \override NoteHead #'color = #darkblue - b - \override NoteHead #'color = #green - \override Stem #'color = #blue - e8 es d dis e4 r -} diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list index abd1093a81..0205e5c88f 100644 --- a/input/lsr/contexts-and-engravers.snippet-list +++ b/input/lsr/contexts-and-engravers.snippet-list @@ -1,10 +1,9 @@ creating-blank-staves.ly chant-or-psalms-notation.ly -adding-a-figured-bass-above-or-below-the-notes.ly -square-balloons.ly +adding-and-extra-staff-at-a-line-break.ly adding-an-extra-staff.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly engravers-one-by-one.ly -adding-and-extra-staff-at-a-line-break.ly +adding-a-figured-bass-above-or-below-the-notes.ly nesting-staves.ly diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list index 0bcda7f31a..b276b55f72 100644 --- a/input/lsr/editorial-and-educational-use.snippet-list +++ b/input/lsr/editorial-and-educational-use.snippet-list @@ -1,29 +1,9 @@ -adding-fingerings-to-chords.ly -changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly -putting-parentheses-around-a-single-note.ly -changing-the-default-text-font-family.ly -changing-the-size-of-note-heads.ly -grid-lines-adding-vertical-lines-between-staves.ly creating-blank-staves.ly -grid-lines-changing-their-appearance.ly -coloring-objects.ly -allowing-fingerings-to-be-printed-inside-the-staff.ly default-direction-of-stems-on-the-center-line-of-the-staff.ly -clefs-commonly-tweaked-properties.ly -blanking-staff-lines-using-the--whiteout-command.ly -forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly -changing-the-size-of-layout-objects.ly -adding-fingerings-to-a-score-using-markup-objects.ly -controlling-the-placement-of-chord-fingerings.ly -rgb-colors.ly -applying-notehead-styles-depending-on-the-step-of-the-scale.ly -adding-fingerings-to-a-score.ly -anaylsis-brackets.ly -how-to-add-thumb-fingerings.ly -square-balloons.ly changing-a-single-notes-size-in-a-chord.ly -putting-parentheses-around-non-note-objects.ly -three-sided-box.ly -hiding-notes.ly grid-lines-emphasizing-rhythms-and-notes-synchronization.ly -coloring-elements-of-notation.ly +controlling-the-placement-of-chord-fingerings.ly +allowing-fingerings-to-be-printed-inside-the-staff.ly +blanking-staff-lines-using-the--whiteout-command.ly +applying-notehead-styles-depending-on-the-step-of-the-scale.ly +grid-lines-changing-their-appearance.ly diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index 31278914d3..9c8d90af6b 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -1,11 +1,10 @@ combining-dynamics-with-markup-texts.ly creating-text-spanners.ly -breathing-sign.ly +adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly caesura-railtracks-with-fermata.ly -adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly +breathing-sign.ly creating-real-parenthesized-dynamics.ly -putting-parentheses-around-non-note-objects.ly center-text-below-hairpin-dynamics.ly contemporary-glissando.ly adding-parentheses-around-an-expressive-mark-or-chordal-note.ly diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly index bb895aba37..667acf3fb1 100644 --- a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly +++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly @@ -3,7 +3,7 @@ \version "2.11.38" \header { - lsrtags = "rhythms, editorial-and-educational-use" + lsrtags = "rhythms" texidoc = " This snippet demonstrates how to obtain automatic ordered rehearsal marks, but from the letter or number you want. diff --git a/input/lsr/grid-lines-adding-vertical-lines-between-staves.ly b/input/lsr/grid-lines-adding-vertical-lines-between-staves.ly deleted file mode 100644 index 2540365daf..0000000000 --- a/input/lsr/grid-lines-adding-vertical-lines-between-staves.ly +++ /dev/null @@ -1,42 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Vertical lines can be drawn between staves synchronized with the notes. -" } -% begin verbatim -\layout { - \context { - \Staff - \consists "Grid_point_engraver" - % sets up grids - gridInterval = #(ly:make-moment 1 4) - % this sets the grid interval to 1 quarternote (crotchet) - } -} - -\new Score \with { - \consists "Grid_line_span_engraver" - %% by default this centers grid lines horizontally below and to the - % left side of the notehead, the grid lines extend from - % the middle lines of each staff -} - -\new ChoirStaff << - \new Staff { - \relative c'' { - \stemUp - c4. d8 e8 f g4 - } - } - \new Staff { - \clef bass - \relative c { - \stemDown - c4 g' f e - } - } ->> diff --git a/input/lsr/grid-lines-changing-their-appearance.ly b/input/lsr/grid-lines-changing-their-appearance.ly index 4bfc039009..035ff40451 100644 --- a/input/lsr/grid-lines-changing-their-appearance.ly +++ b/input/lsr/grid-lines-changing-their-appearance.ly @@ -12,33 +12,33 @@ using the @code{\\override} command. \layout { \context { \Staff - \consists "Grid_point_engraver" % sets up grids - gridInterval = #(ly:make-moment 1 4) + \consists "Grid_point_engraver" % this sets the grid interval to 1 quarternote (crotchet) - } + gridInterval = #(ly:make-moment 1 4) + } } \new Score \with { \consists "Grid_line_span_engraver" - \override NoteColumn #'X-offset = #-0.5 % this moves them to the right half a staff space + \override NoteColumn #'X-offset = #-0.5 } \new ChoirStaff << - \new Staff { - \relative c'' { - \stemUp - c'4. d8 e8 f g4 + \new Staff { + \relative c'' { + \stemUp + c'4. d8 e8 f g4 + } } - } - \new Staff { - \relative c { - \override Score.GridLine #'extra-offset = #'( 0.0 . 1.0 ) - % this moves them up one staff space from the default position - \stemDown - \clef bass - \once \override Score.GridLine #'thickness = #5.0 + \new Staff { + \relative c { + % this moves them up one staff space from the default position + \override Score.GridLine #'extra-offset = #'( 0.0 . 1.0 ) + \stemDown + \clef bass + \once \override Score.GridLine #'thickness = #5.0 c4 \once \override Score.GridLine #'thickness = #1.0 g' @@ -46,6 +46,6 @@ using the @code{\\override} command. f \once \override Score.GridLine #'thickness = #5.0 e - } - } + } + } >> diff --git a/input/lsr/hiding-notes.ly b/input/lsr/hiding-notes.ly deleted file mode 100644 index abd116aa18..0000000000 --- a/input/lsr/hiding-notes.ly +++ /dev/null @@ -1,22 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, spacing" - texidoc = " -In the following examples, some notes are hidden: although they are -made transparent, they still take vertical and horizontal space. -" } -% begin verbatim -\relative c'' { - c4 d - \hideNotes - e f - \unHideNotes - g a - \hideNotes - b - \unHideNotes - c -} diff --git a/input/lsr/how-to-add-thumb-fingerings.ly b/input/lsr/how-to-add-thumb-fingerings.ly deleted file mode 100644 index cddb30a769..0000000000 --- a/input/lsr/how-to-add-thumb-fingerings.ly +++ /dev/null @@ -1,15 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, strings" - texidoc = " -Special scripts can be entered for thumb fingerings (for example in -cello music). -" } -% begin verbatim -\relative c'' { - a2_\thumb - -} diff --git a/input/lsr/piano-music.snippet-list b/input/lsr/piano-music.snippet-list index a748489e74..453ee8122b 100644 --- a/input/lsr/piano-music.snippet-list +++ b/input/lsr/piano-music.snippet-list @@ -1,10 +1,9 @@ piano-template-with-centered-dynamics.ly clusters.ly -piano-template-with-centered-lyrics.ly +jazz-combo-template.ly vocal-ensemble-template-with-automatic-piano-reduction.ly piano-template-simple.ly controlling-the-placement-of-chord-fingerings.ly -adding-fingerings-to-chords.ly piano-template-with-melody-and-lyrics.ly -jazz-combo-template.ly +piano-template-with-centered-lyrics.ly demo-midiinstruments.ly diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list index 3c0c7d9105..9f3eea8056 100644 --- a/input/lsr/pitches.snippet-list +++ b/input/lsr/pitches.snippet-list @@ -1,6 +1,6 @@ makam.ly ambiti-multiple-voices.ly -dodecaphonic-style-accidentals-for-each-note-including-naturals.ly +applying-notehead-styles-depending-on-the-step-of-the-scale.ly transposing-pitches-with-minimum-accidentals-smart-transpose.ly ottava-text.ly preventing-extra-naturals-from-being-automatically-added.ly @@ -8,7 +8,7 @@ generating-random-notes.ly quoting-another-voice-with-transposition.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly -applying-notehead-styles-depending-on-the-step-of-the-scale.ly +dodecaphonic-style-accidentals-for-each-note-including-naturals.ly preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly creating-a-sequence-of-notes-on-various-pitches.ly non-traditional-key-signatures.ly diff --git a/input/lsr/putting-parentheses-around-a-single-note.ly b/input/lsr/putting-parentheses-around-a-single-note.ly deleted file mode 100644 index ec706f9613..0000000000 --- a/input/lsr/putting-parentheses-around-a-single-note.ly +++ /dev/null @@ -1,20 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -Objects may be parenthesized by prefixing @code{\\parenthesize} to the -music event: in other words, the note has to be put after the -@code{\\parenthesize} command. - -This only functions inside chords; to parenthesize a single note it -must be enclosed with @code{ as if it is a chord.} -" } -% begin verbatim -\relative c'' { - a4 - < \parenthesize b > - c d -} diff --git a/input/lsr/putting-parentheses-around-non-note-objects.ly b/input/lsr/putting-parentheses-around-non-note-objects.ly deleted file mode 100644 index 33d8019195..0000000000 --- a/input/lsr/putting-parentheses-around-non-note-objects.ly +++ /dev/null @@ -1,14 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "expressive-marks, editorial-and-educational-use" - texidoc = " -Various objects may be parenthesized as well as notes: in this example, -the articulation mark is printed between parentheses. -" } -% begin verbatim -\relative c' { - < c d g >2-\parenthesize -. d -} diff --git a/input/lsr/rgb-colors.ly b/input/lsr/rgb-colors.ly deleted file mode 100644 index 3bfad3ae53..0000000000 --- a/input/lsr/rgb-colors.ly +++ /dev/null @@ -1,27 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use" - texidoc = " -In addition to the built-in x11-color system, it is possible to get -exact RGB colors by specifying the amounts of red, green and blue. -" } -% begin verbatim -\relative c''{ - \override Staff.StaffSymbol #'color = #(x11-color 'SlateBlue2) - \set Staff.instrumentName = \markup { - \with-color #(x11-color 'navy) "Clarinet" - } - - %black -% \override Stem #'color = #(rgb-color 0 0 0) - gis8 a - % white -% \override Stem #'color = #(rgb-color 1 1 1) - gis8 a - % dark blue -% \override Stem #'color = #(rgb-color 0 0 0.5) - gis4 a -} diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index 9f01dad3d5..962b6a240f 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -21,6 +21,7 @@ conducting-signs,-measure-grouping-signs.ly changing-form-of-multi--measure-rests.ly rhythmic-slashes.ly automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +three-sided-box.ly permitting-line-breaks-within-beamed-tuplets.ly skips-in-lyric-mode.ly engraving-ties-manually.ly diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list index 1162bcea96..682482ccac 100644 --- a/input/lsr/spacing.snippet-list +++ b/input/lsr/spacing.snippet-list @@ -2,7 +2,6 @@ vertically-centered-dynamics-and-textscripts.ly proportional-strict-notespacing.ly vertically-aligning-ossias-and-lyrics.ly allowing-fingerings-to-be-printed-inside-the-staff.ly -hiding-notes.ly page-label.ly alignment-vertical-spacing.ly adjusting-lyrics-vertical-spacing.ly diff --git a/input/lsr/square-balloons.ly b/input/lsr/square-balloons.ly deleted file mode 100644 index fe98385d03..0000000000 --- a/input/lsr/square-balloons.ly +++ /dev/null @@ -1,18 +0,0 @@ -%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it -%% This file is in the public domain. -\version "2.11.38" - -\header { - lsrtags = "editorial-and-educational-use, text, contexts-and-engravers" - texidoc = " -Elements of notation can be marked and named with the help of a square -balloon. The primary purpose of this feature is to explain notation. -" } -% begin verbatim -\new Voice \with { \consists "Balloon_engraver" } - \relative c''{ - \balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" } - a4 - 2. -} - diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index 5e49716177..72f0b3a74e 100644 --- a/input/lsr/staff-notation.snippet-list +++ b/input/lsr/staff-notation.snippet-list @@ -1,15 +1,15 @@ creating-blank-staves.ly -incipit.ly +time-signature-in-parentheses.ly adding-and-extra-staff-at-a-line-break.ly changing-the-number-of-lines-in-a-staff.ly -time-signature-in-parentheses.ly +incipit.ly +inserting-score-fragments-above-the-staff,-as-markups.ly adding-an-extra-staff.ly changing-the-staff-size.ly -quoting-another-voice.ly +quoting-another-voice-with-transposition.ly adding-ambiti-per-voice.ly clefs-commonly-tweaked-properties.ly +quoting-another-voice.ly volta-multi-staff.ly -inserting-score-fragments-above-the-staff,-as-markups.ly -quoting-another-voice-with-transposition.ly non-traditional-key-signatures.ly nesting-staves.ly diff --git a/input/lsr/strings.snippet-list b/input/lsr/strings.snippet-list index ad0a0dce0a..a0795b5bcf 100644 --- a/input/lsr/strings.snippet-list +++ b/input/lsr/strings.snippet-list @@ -1,4 +1,3 @@ string-quartet-template-simple.ly -how-to-add-thumb-fingerings.ly string-quartet-template-with-separate-parts.ly demo-midiinstruments.ly diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 59b06c6130..8af6644e5a 100644 --- a/input/lsr/template.snippet-list +++ b/input/lsr/template.snippet-list @@ -1,17 +1,17 @@ piano-template-with-centered-dynamics.ly single-staff-template-with-notes-and-lyrics.ly single-staff-template-with-only-notes.ly -piano-template-with-centered-lyrics.ly +jazz-combo-template.ly score-for-diatonic-accordion.ly piano-template-simple.ly -string-quartet-template-with-separate-parts.ly -ancient-notation-template----modern-transcription-of-gregorian-music.ly ancient-notation-template----modern-transcription-of-mensural-music.ly -piano-template-with-melody-and-lyrics.ly +ancient-notation-template----modern-transcription-of-gregorian-music.ly +single-staff-template-with-notes-and-chords.ly string-quartet-template-simple.ly single-staff-template-with-notes,-lyrics,-and-chords.ly -single-staff-template-with-notes-and-chords.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly -jazz-combo-template.ly +piano-template-with-melody-and-lyrics.ly +string-quartet-template-with-separate-parts.ly vocal-ensemble-template.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +piano-template-with-centered-lyrics.ly vocal-ensemble-template-with-automatic-piano-reduction.ly diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index 9699027b38..e724cc45ff 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -1,20 +1,20 @@ combining-dynamics-with-markup-texts.ly creating-text-spanners.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +creating-real-parenthesized-dynamics.ly markup-lines.ly -square-balloons.ly +three-sided-box.ly center-text-below-hairpin-dynamics.ly -piano-template-with-centered-lyrics.ly +ottava-text.ly demonstrating-all-headers.ly +utf-8.ly changing-the-default-text-font-family.ly -creating-real-parenthesized-dynamics.ly -how-to-put-ties-between-syllables-in-lyrics.ly +combining-two-parts-on-the-same-staff.ly aligning-and-centering-instrument-names.ly -utf-8.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly outputting-the-version-number.ly blanking-staff-lines-using-the--whiteout-command.ly formatting-lyrics-syllables.ly -combining-two-parts-on-the-same-staff.ly -ottava-text.ly +how-to-put-ties-between-syllables-in-lyrics.ly +piano-template-with-centered-lyrics.ly adjusting-lyrics-vertical-spacing.ly aligning-lyrics.ly diff --git a/input/lsr/three-sided-box.ly b/input/lsr/three-sided-box.ly index 77a3baf57b..102c02b0fd 100644 --- a/input/lsr/three-sided-box.ly +++ b/input/lsr/three-sided-box.ly @@ -3,7 +3,7 @@ \version "2.11.38" \header { - lsrtags = "editorial-and-educational-use" + lsrtags = "rhythms, text" texidoc = " This example shows how to add a markup command to get a three sided box around some text (or other markup). diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index eaf6e5ffca..d0dca8d4dd 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -1,29 +1,27 @@ +altering-the-number-of-stems-in-a-beam.ly time-signature-in-parentheses.ly +vertically-centered-dynamics-and-textscripts.ly +proportional-strict-notespacing.ly changing-the-default-text-font-family.ly -drawing-boxes-around-grobs.ly +transcription-of-ancient-music-with-incipit.ly +alignment-vertical-spacing.ly manually-controlling-beam-positions.ly custodes.ly +drawing-boxes-around-grobs.ly move-specific-text.ly +drawing-circles-around-various-objects.ly +making-an-object-invisible-with-the-transparent-property.ly rest-styles.ly +creating-text-spanners.ly using-the--tweak-command-to-tweak-individual-grobs.ly controlling-tuplet-bracket-visibility.ly positioning-multi--measure-rests.ly -coloring-objects.ly -changing-the-staff-size.ly -clefs-commonly-tweaked-properties.ly -vertically-aligning-ossias-and-lyrics.ly -changing-the-size-of-layout-objects.ly -changing-properties-for-individual-grobs.ly -altering-the-number-of-stems-in-a-beam.ly -vertically-centered-dynamics-and-textscripts.ly -proportional-strict-notespacing.ly -making-an-object-invisible-with-the-transparent-property.ly -transcription-of-ancient-music-with-incipit.ly -alignment-vertical-spacing.ly -drawing-circles-around-various-objects.ly -creating-text-spanners.ly caesura-railtracks-with-fermata.ly changing-form-of-multi--measure-rests.ly rhythmic-slashes.ly +changing-the-staff-size.ly changing-a-single-notes-size-in-a-chord.ly +clefs-commonly-tweaked-properties.ly +vertically-aligning-ossias-and-lyrics.ly +changing-properties-for-individual-grobs.ly nesting-staves.ly diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index b581d4eae0..398c1df27a 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -1,17 +1,17 @@ chant-or-psalms-notation.ly single-staff-template-with-notes-and-lyrics.ly skips-in-lyric-mode-2.ly -ambiti-multiple-voices.ly -vocal-ensemble-template-with-automatic-piano-reduction.ly +skips-in-lyric-mode.ly +aligning-lyrics.ly vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly how-to-put-ties-between-syllables-in-lyrics.ly adding-ambiti-per-voice.ly -piano-template-with-melody-and-lyrics.ly +vertically-aligning-ossias-and-lyrics.ly single-staff-template-with-notes,-lyrics,-and-chords.ly -demo-midiinstruments.ly +vocal-ensemble-template-with-automatic-piano-reduction.ly formatting-lyrics-syllables.ly -vertically-aligning-ossias-and-lyrics.ly -aligning-lyrics.ly +piano-template-with-melody-and-lyrics.ly +ambiti-multiple-voices.ly vocal-ensemble-template.ly adjusting-lyrics-vertical-spacing.ly -skips-in-lyric-mode.ly +demo-midiinstruments.ly diff --git a/python/musicexp.py b/python/musicexp.py index 862b5d8c4f..2ae8a6784f 100644 --- a/python/musicexp.py +++ b/python/musicexp.py @@ -859,9 +859,17 @@ class TextSpannerEvent (SpanEvent): 1:'\\stopTextSpan'}.get (self.span_direction, '') class BracketSpannerEvent (SpanEvent): + # Ligature brackets use prefix-notation!!! + def print_before_note (self, printer): + if self.span_direction == -1: + printer.dump ('\[') + # the the bracket after the last note + def print_after_note (self, printer): + if self.span_direction == 1: + printer.dump ('\]') + # we're printing everything in print_(before|after)_note... def ly_expression (self): - return {-1: '\\startGroup', - 1:'\\stopGroup'}.get (self.span_direction, '') + return ''; class OctaveShiftEvent (SpanEvent): diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index f808a8325b..a429b75251 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -727,15 +727,10 @@ def musicxml_barline_to_lily (barline): return retval.values () -# Brackets need a special engraver added the Staff context! -def musicxml_bracket_to_ly (): - layout_information.set_context_item ('Staff', '\consists "Horizontal_bracket_engraver" % for \\startGroup and \\stopGroup brackets') - return musicexp.BracketSpannerEvent () - spanner_event_dict = { 'beam' : musicexp.BeamEvent, 'dashes' : musicexp.TextSpannerEvent, - 'bracket' : musicxml_bracket_to_ly, + 'bracket' : musicexp.BracketSpannerEvent, 'glissando' : musicexp.GlissandoEvent, 'octave-shift' : musicexp.OctaveShiftEvent, 'pedal' : musicexp.PedalEvent, @@ -1653,7 +1648,13 @@ def musicxml_voice_to_lily_voice (voice): ev = musicxml_spanner_to_lily_event (a) if ev: ev_chord.append (ev) - + + # accidental-marks are direct children of ! + for a in notations.get_named_children ('accidental-mark'): + ev = musicxml_articulation_to_lily_event (a) + if ev: + ev_chord.append (ev) + # Articulations can contain the following child elements: # accent | strong-accent | staccato | tenuto | # detached-legato | staccatissimo | spiccato |