]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 25 Mar 2008 03:41:02 +0000 (00:41 -0300)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 25 Mar 2008 03:41:02 +0000 (00:41 -0300)
44 files changed:
buildscripts/add_html_footer.py
buildscripts/generate_intervals.py [deleted file]
buildscripts/generate_keys.py [deleted file]
buildscripts/generate_timesignatures.py [deleted file]
buildscripts/musicxml_generate_intervals.py [new file with mode: 0755]
buildscripts/musicxml_generate_keys.py [new file with mode: 0755]
buildscripts/musicxml_generate_timesignatures.py [new file with mode: 0755]
input/lsr/adding-fingerings-to-a-score-using-markup-objects.ly [deleted file]
input/lsr/adding-fingerings-to-a-score.ly [deleted file]
input/lsr/adding-fingerings-to-chords.ly [deleted file]
input/lsr/anaylsis-brackets.ly [deleted file]
input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
input/lsr/changing-the-default-text-font-family.ly
input/lsr/changing-the-size-of-layout-objects.ly [deleted file]
input/lsr/changing-the-size-of-note-heads.ly [deleted file]
input/lsr/chords.snippet-list
input/lsr/clefs-commonly-tweaked-properties.ly
input/lsr/coloring-elements-of-notation.ly [deleted file]
input/lsr/coloring-objects.ly [deleted file]
input/lsr/contexts-and-engravers.snippet-list
input/lsr/editorial-and-educational-use.snippet-list
input/lsr/expressive-marks.snippet-list
input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
input/lsr/grid-lines-adding-vertical-lines-between-staves.ly [deleted file]
input/lsr/grid-lines-changing-their-appearance.ly
input/lsr/hiding-notes.ly [deleted file]
input/lsr/how-to-add-thumb-fingerings.ly [deleted file]
input/lsr/piano-music.snippet-list
input/lsr/pitches.snippet-list
input/lsr/putting-parentheses-around-a-single-note.ly [deleted file]
input/lsr/putting-parentheses-around-non-note-objects.ly [deleted file]
input/lsr/rgb-colors.ly [deleted file]
input/lsr/rhythms.snippet-list
input/lsr/spacing.snippet-list
input/lsr/square-balloons.ly [deleted file]
input/lsr/staff-notation.snippet-list
input/lsr/strings.snippet-list
input/lsr/template.snippet-list
input/lsr/text.snippet-list
input/lsr/three-sided-box.ly
input/lsr/tweaks-and-overrides.snippet-list
input/lsr/vocal-music.snippet-list
python/musicexp.py
scripts/musicxml2ly.py

index 7f30c94edca2ae4555372b7875a9906f6f71926d..47589baeeab4dc0536392a72039c4ff75e416228 100644 (file)
@@ -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 (executable)
index dbde2bc..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-
-notes = "CDEFGAB"
-alterations = [-1, 0, 1]
-
-def print_note (octave, note, alteration):
-    print "      <note>\n        <pitch>\n          <step>%s</step>" % notes[note]
-    if alteration <> 0:
-        print "          <alter>%s</alter>" % alteration
-    print "          <octave>%s</octave>\n        </pitch>\n        <duration>1</duration>\n        <voice>1</voice>\n        <type>quarter</type>\n      </note>" % octave
-
-
-print """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Various piches and interval sizes</movement-title>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-"""
-
-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 """    </measure>
-  </part>
-</score-partwise>
-"""
\ No newline at end of file
diff --git a/buildscripts/generate_keys.py b/buildscripts/generate_keys.py
deleted file mode 100755 (executable)
index cd0f995..0000000
+++ /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 """    <measure number="%s">
-      <attributes>
-%s        <key>
-          <fifths>%s</fifths>
-          <mode>%s</mode>
-        </key>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>4</octave>
-        </pitch>
-        <duration>2</duration>
-        <voice>1</voice>
-        <type>half</type>
-      </note>
-%s    </measure>""" % (nr, atts,  fifth, mode, final)
-
-first_atts = """        <divisions>1</divisions>
-        <time symbol="common">
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-"""
-
-final_barline = """      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-"""
-
-print """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Different Key signatures</movement-title>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-"""
-
-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 """  </part>
-</score-partwise>
-"""
\ No newline at end of file
diff --git a/buildscripts/generate_timesignatures.py b/buildscripts/generate_timesignatures.py
deleted file mode 100755 (executable)
index 9844f3d..0000000
+++ /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 """    <measure number="%s">
-      <attributes>
-%s        <time %s>
-          <beats>%s</beats>
-          <beat-type>%s</beat-type>
-        </time>
-      </attributes>
-      <note>
-        <pitch>
-          <step>C</step>
-          <octave>5</octave>
-        </pitch>
-        <duration>1</duration>
-        <voice>1</voice>
-        <type>quarter</type>
-      </note>
-%s    </measure>""" % (nr, attr, params, beats, type, barline)
-
-first_atts = """        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>2</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-"""
-
-final_barline = """      <barline location="right">
-        <bar-style>light-heavy</bar-style>
-      </barline>
-"""
-
-print """<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Different time signatures</movement-title>
-  <part-list>
-    <score-part id="P1">
-      <part-name>MusicXML Part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-"""
-
-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 """  </part>
-</score-partwise>
-"""
\ No newline at end of file
diff --git a/buildscripts/musicxml_generate_intervals.py b/buildscripts/musicxml_generate_intervals.py
new file mode 100755 (executable)
index 0000000..dbde2bc
--- /dev/null
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+
+notes = "CDEFGAB"
+alterations = [-1, 0, 1]
+
+def print_note (octave, note, alteration):
+    print "      <note>\n        <pitch>\n          <step>%s</step>" % notes[note]
+    if alteration <> 0:
+        print "          <alter>%s</alter>" % alteration
+    print "          <octave>%s</octave>\n        </pitch>\n        <duration>1</duration>\n        <voice>1</voice>\n        <type>quarter</type>\n      </note>" % octave
+
+
+print """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise>
+  <movement-title>Various piches and interval sizes</movement-title>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+"""
+
+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 """    </measure>
+  </part>
+</score-partwise>
+"""
\ No newline at end of file
diff --git a/buildscripts/musicxml_generate_keys.py b/buildscripts/musicxml_generate_keys.py
new file mode 100755 (executable)
index 0000000..cd0f995
--- /dev/null
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+
+notes = "CDEFGAB"
+alterations = [-1, 0, 1]
+
+def print_measure (nr, fifth, mode, atts = "", final = ""):
+    print """    <measure number="%s">
+      <attributes>
+%s        <key>
+          <fifths>%s</fifths>
+          <mode>%s</mode>
+        </key>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+%s    </measure>""" % (nr, atts,  fifth, mode, final)
+
+first_atts = """        <divisions>1</divisions>
+        <time symbol="common">
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+"""
+
+final_barline = """      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+"""
+
+print """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise>
+  <movement-title>Different Key signatures</movement-title>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+"""
+
+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 """  </part>
+</score-partwise>
+"""
\ No newline at end of file
diff --git a/buildscripts/musicxml_generate_timesignatures.py b/buildscripts/musicxml_generate_timesignatures.py
new file mode 100755 (executable)
index 0000000..9844f3d
--- /dev/null
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+
+notes = "CDEFGAB"
+alterations = [-1, 0, 1]
+
+def print_measure (nr, beats, type, params = "", attr = "", barline = ""):
+    print """    <measure number="%s">
+      <attributes>
+%s        <time %s>
+          <beats>%s</beats>
+          <beat-type>%s</beat-type>
+        </time>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+%s    </measure>""" % (nr, attr, params, beats, type, barline)
+
+first_atts = """        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+"""
+
+final_barline = """      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+"""
+
+print """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise>
+  <movement-title>Different time signatures</movement-title>
+  <part-list>
+    <score-part id="P1">
+      <part-name>MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+"""
+
+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 """  </part>
+</score-partwise>
+"""
\ 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 (file)
index c0137ff..0000000
+++ /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 (file)
index 27fbc6f..0000000
+++ /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 (file)
index a30a2d1..0000000
+++ /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 (file)
index 177a005..0000000
+++ /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
-}
index 7dfbd6cce9002805370a1badb1377cd93a376a3c..b737fc83a2cca8420a9974b8d46a251e8a6ab936 100644 (file)
@@ -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.
 
index 14b684a713be74eb83e299612efbe8105b2b8219..1d2fa5803a9ebc37f81a470c4543fcfecdd21ed3 100644 (file)
@@ -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 (file)
index 3fca937..0000000
+++ /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 (file)
index 62e27e0..0000000
+++ /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
-}
index be81952a4e52a9bf26fc665d8a339af94671a1eb..3eb5fd7a861a3728abc2ab2a9693e353ea6051fb 100644 (file)
@@ -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
index 3a6983181c6416b2ebbb52257a654e378e4daf3a..fe0a4ea9eb2c03ab847b505597564ef2410a69f0 100644 (file)
@@ -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 (file)
index 93dccdc..0000000
+++ /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 (file)
index 48ab991..0000000
+++ /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
-}
index abd1093a8168d188dcb47ffeefa12dc356bd61b9..0205e5c88f399615378e065388e1316ac9ec551d 100644 (file)
@@ -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
index 0bcda7f31a5a967382d567fcfffdf78a8ac88edd..b276b55f7252f512f004927ef97a28b41b66d5c3 100644 (file)
@@ -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
index 31278914d3c5e22352b20619ab7773b872f7cbb9..9c8d90af6ba02c9351c4da09219868b947ec3ed5 100644 (file)
@@ -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
index bb895aba3712e3cd81a3c25d7a97f3adf6177ef6..667acf3fb10239d806fd8bf87ee7cac0a928d07b 100644 (file)
@@ -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 (file)
index 2540365..0000000
+++ /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
-   }
- }
->>
index 4bfc039009b8d31f6e64d1982f0af2ca6ebef6e7..035ff40451e18ea4cb45e245253566d46cadc347 100644 (file)
@@ -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 (file)
index abd116a..0000000
+++ /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 (file)
index cddb30a..0000000
+++ /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
-  <b_\thumb b'-3>
-}
index a748489e7462d3eef12f1ad1c43160c2ed4c1d7a..453ee8122be8fb06fd5f25ac9a1699884a9ebee5 100644 (file)
@@ -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
index 3c0c7d9105092047d876d55dc49359c0b721c3a7..9f3eea8056b107784753fd55928b442fd49b0737 100644 (file)
@@ -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 (file)
index ec706f9..0000000
+++ /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 (file)
index 33d8019..0000000
+++ /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 (file)
index 3bfad3a..0000000
+++ /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
-}
index 9f01dad3d5561e607c961467cf07d4ebddf57dc5..962b6a240fb98daea6452ae5d016467cdaba2841 100644 (file)
@@ -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
index 1162bcea96a33f8b50c4731fb261a3190842fb48..682482ccac2152041257113830e180173f5d4f87 100644 (file)
@@ -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 (file)
index fe98385..0000000
+++ /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
-   <c, g'-\balloonText #'(-2 . -2) \markup { "I'm a note head" } c>2.
-}
-
index 5e49716177237fc12147a816df765309c4d87e2a..72f0b3a74e931a613bcda1a4c2bccaf88bc7d383 100644 (file)
@@ -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
index ad0a0dce0a3a57fffa655fe290014fd5d92df586..a0795b5bcf71d2991c4d430eaabea0b211e62fdc 100644 (file)
@@ -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
index 59b06c613003f94fdd4a141e68e2a39f338babca..8af6644e5a99342e8f7792020acffb241f94ab88 100644 (file)
@@ -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
index 9699027b38645ccbb8fb3917511729bd74e5e97c..e724cc45ff51570448e83d08a75dd41fe84e37c2 100644 (file)
@@ -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
index 77a3baf57b63a278cc9e021f5793d627650e40b2..102c02b0fdcb91fd5da6f6b0284f939ebca5a494 100644 (file)
@@ -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).
index eaf6e5ffca008c2b909f34963170d93aa36e95ea..d0dca8d4dde43b0a77ed35cc61512db029e2bf92 100644 (file)
@@ -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
index b581d4eae0e529de22a026bd1dcc10f8381cf2ce..398c1df27aac64972a8f247ace8500759cb67977 100644 (file)
@@ -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
index 862b5d8c4f70f5148c0a5b1899588b1859014c59..2ae8a6784f3ea480f3343d6539323fd79ec706d0 100644 (file)
@@ -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):
index f808a8325b5a67655ac0cd3ffce223258a332150..a429b752510dbcb104937f080be03548f4493572 100644 (file)
@@ -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 <notation>!
+            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 |