From 91668a3a25719ed9f5d665287c6324757cad2546 Mon Sep 17 00:00:00 2001
From: Neil Puttock <n.puttock@gmail.com>
Date: Fri, 12 Sep 2008 23:30:20 +0100
Subject: [PATCH] LSR: update.

---
 input/lsr/dotted-harmonics.ly               | 21 ++++++++++++++
 input/lsr/multi--measure-rest-markup.ly     | 31 +++++++++++++++++++++
 input/lsr/rhythms.snippet-list              |  1 +
 input/lsr/text.snippet-list                 |  1 +
 input/lsr/tweaks-and-overrides.snippet-list |  1 +
 input/lsr/unfretted-strings.snippet-list    |  5 ++--
 6 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 input/lsr/dotted-harmonics.ly
 create mode 100644 input/lsr/multi--measure-rest-markup.ly

diff --git a/input/lsr/dotted-harmonics.ly b/input/lsr/dotted-harmonics.ly
new file mode 100644
index 0000000000..e9bd4e4bb2
--- /dev/null
+++ b/input/lsr/dotted-harmonics.ly
@@ -0,0 +1,21 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.58"
+
+\header {
+  lsrtags = "unfretted-strings,tweaks-and-overrides"
+  texidoc = "Artificial harmonics using @code{\\harmonic} do not show
+dots.  To override this behavior, set the context property
+@code{harmonicDots}."
+  doctitle = "Dotted harmonics"
+} % begin verbatim
+
+\relative c''' {
+  \time 3/4
+  \key f \major
+  \set harmonicDots = ##t
+  <bes f'\harmonic>2. ~
+  <bes f'\harmonic>4. <a e'\harmonic>8( <gis dis'\harmonic> <g d'\harmonic>)
+  <fis cis'\harmonic>2.
+  <bes f'\harmonic>2.
+}
diff --git a/input/lsr/multi--measure-rest-markup.ly b/input/lsr/multi--measure-rest-markup.ly
new file mode 100644
index 0000000000..f688d037a5
--- /dev/null
+++ b/input/lsr/multi--measure-rest-markup.ly
@@ -0,0 +1,31 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.58"
+
+\header {
+  lsrtags = "rhythms, text"
+  texidoc = "Markups attached to a multi-measure rest will be
+centered above or below it.  Long markups attached to multi-measure
+rests do not cause the measure to expand.  To expand a multi-measure
+rest to fit the markup, use a spacer rest with an attached markup
+before the multi-measure rest.
+
+Note that the spacer rest causes a bar line to be inserted.  Text attached
+to a spacer rest in this way is left-aligned to the position where
+the note would be placed in the measure, but if the measure length is
+determined by the length of the text, the text will appear to be
+centered."
+  doctitle = "Multi-measure rest markup"
+} % begin verbatim
+
+\relative c' {
+  \compressFullBarRests
+  \textLengthOn
+  s1*0^\markup { [MAJOR GENERAL] }
+  R1*19
+  s1*0_\markup { \italic { Cue: ... it is yours } }
+  s1*0^\markup { A }
+  R1*30^\markup { [MABEL] }
+  \textLengthOff
+  c4^\markup { CHORUS } d f c
+}
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 83c7b0f107..3280f1f75f 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -1,6 +1,7 @@
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 beams-across-line-breaks.ly
 manually-controlling-beam-positions.ly
+multi--measure-rest-markup.ly
 adding-drum-parts.ly
 rest-styles.ly
 chant-or-psalms-notation.ly
diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list
index 247edae7b3..152958290a 100644
--- a/input/lsr/text.snippet-list
+++ b/input/lsr/text.snippet-list
@@ -17,6 +17,7 @@ aligning-marks-with-various-notation-objects.ly
 markup-lines.ly
 piano-template-with-centered-lyrics.ly
 creating-simultaneous-rehearsal-marks.ly
+multi--measure-rest-markup.ly
 three-sided-box.ly
 utf-8.ly
 blanking-staff-lines-using-the--whiteout-command.ly
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index 12cce7b080..f2d6ce73c1 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -1,3 +1,4 @@
+dotted-harmonics.ly
 forcing-horizontal-shift-of-notes.ly
 display-bracket-with-only-one-staff-in-a-system.ly
 rhythmic-slashes.ly
diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list
index 5ee803315f..0df7e2dca4 100644
--- a/input/lsr/unfretted-strings.snippet-list
+++ b/input/lsr/unfretted-strings.snippet-list
@@ -1,5 +1,6 @@
+dotted-harmonics.ly
 string-quartet-template-with-separate-parts.ly
-string-quartet-template-simple.ly
-changing--flageolet-mark-size.ly
 creating-slurs-across-voices.ly
+changing--flageolet-mark-size.ly
+string-quartet-template-simple.ly
 demo-midiinstruments.ly
-- 
2.39.5