Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman2

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 25a1d9c043a7a9ba389da1413f56117d6ba6a1db..f6e1c42629d1b72a87ee8a4376b3e8aa8e86d082 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -14,15 +14,9 @@ except:
        print "Please specify input_file."
        sys.exit()
 
-def copyWithWarning(src, dest):
-       readFile = open(src, 'r')
-       readFileLines = readFile.readlines()
-       readFile.close()
-       writeFile = open(dest, 'w')
-       writeFile.write('%%  Do not edit this file; it is auto-generated from LSR!\n')
-       for line in readFileLines:
-               writeFile.write(line)
-       writeFile.close()
+def copy_with_warning(src, dest):
+       msg = '%%  Do not edit this file; it is auto-generated from LSR!\n'
+       open (dest, 'w').write( msg + open (src).read() )
 
 for dir in dirs:
        srcdir = os.path.join (in_dir, dir)
@@ -42,7 +36,7 @@ for dir in dirs:
        for file in file_names:
                src = os.path.join (srcdir, file)
                dest = os.path.join (destdir, file)
-               copyWithWarning(src, dest)
+               copy_with_warning(src, dest)
 #              shutil.copyfile (src, dest)
                s = os.system('lilypond -dsafe -dbackend=svg -o /tmp/lsrtest ' + dest)
                if s:

diff --git a/input/lsr/connecting/beam-across-line-breaks.ly b/input/lsr/connecting/beam-across-line-breaks.ly
new file mode 100644 (file)
index 0000000..d4113ed
--- /dev/null
+++ b/input/lsr/connecting/beam-across-line-breaks.ly
@@ -0,0 +1,15 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.12"
+
+\header { texidoc = "
+By default, beams can't be printed across line breaks. Here's a way to
+force the line break, by setting the @code{#'breakable} property. See
+also in the manual the \"Line Breaking\" and \"Manual beams\" sections.
+" }
+
+\layout { ragged-right= ##t }
+
+\relative c''  {
+  \override Score.Beam #'breakable = ##t
+  \time 3/16 c16-[ d e \break f-] 
+}

diff --git a/input/lsr/connecting/short-tremolos.ly b/input/lsr/connecting/short-tremolos.ly
new file mode 100644 (file)
index 0000000..b409f1c
--- /dev/null
+++ b/input/lsr/connecting/short-tremolos.ly
@@ -0,0 +1,16 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.12"
+
+\header { texidoc = "
+Short (smaller than 1/4) tremolos can be obtained; in such a case only
+one beam is connected to the stems.
+" }
+
+\layout { ragged-right = ##t }
+
+\context Staff  \relative c' {
+  \repeat "tremolo"  2 { c32 e32 }
+  \stemDown
+  \repeat "tremolo"  2 { c32 e32 }
+}
+

diff --git a/input/lsr/contemporary/feathered-beams.ly b/input/lsr/contemporary/feathered-beams.ly
new file mode 100644 (file)
index 0000000..ceaff8e
--- /dev/null
+++ b/input/lsr/contemporary/feathered-beams.ly
@@ -0,0 +1,20 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.12"
+
+\header { texidoc = "
+Feathered beams can be obtained by setting the #'grow-direction
+property; you may also want to use \featherDurations to adjust note
+durations. (See also in tha manual : \"Feathered beams\")
+" }
+
+\paper {
+  ragged-right = ##t
+  indent = #0.0
+}
+
+\featherDurations #(ly:make-moment 3 4) \relative c'' {
+  \override Beam #'grow-direction = #LEFT
+  c16[
+    c c c
+    c c c c ] 
+}

diff --git a/input/lsr/spacing/alignment-order.ly b/input/lsr/spacing/alignment-order.ly
new file mode 100644 (file)
index 0000000..f479639
--- /dev/null
+++ b/input/lsr/spacing/alignment-order.ly
@@ -0,0 +1,44 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.10.12"
+
+\header { texidoc = "
+This snippet shows of to use the @code{alignBelowContext} and
+@code{alignAboveContext} properties, which may be needed for text
+elements (e.g. lyrics) positioning, but also for musical contents such
+as ossias.
+" }
+
+% ****************************************************************
+% ly snippet:
+% ****************************************************************
+
+\paper {
+  ragged-right = ##t
+}
+
+\relative <<
+  \new Staff = "1" { c4 c s2 }
+  \new Staff = "2" { c4  c s2 }
+  \new Staff = "3" { c4  c s2 }
+  { \skip 2
+    <<
+      \lyrics {
+       \set alignBelowContext = #"1"
+       below8 first staff
+      }
+      \new Staff {
+       \set Staff.alignAboveContext = #"3"
+       \times 4/6 {
+         \override TextScript #'padding = #3
+         c8^"this" d_"staff" e^"above" d_"last" e^"staff" f
+       }
+      }
+    >> }
+>>
+
+
+
+% ****************************************************************
+% end ly snippet
+% ****************************************************************
+

diff --git a/input/lsr/spacing/alignment-vertical-spacing.ly b/input/lsr/spacing/alignment-vertical-spacing.ly
index 9da4e584107f3686be11b241a654b1d3d0a8fa76..0a9eaca9cebe2bebb9b6b4dfcf0677106d7b0d26 100644 (file)
--- a/input/lsr/spacing/alignment-vertical-spacing.ly
+++ b/input/lsr/spacing/alignment-vertical-spacing.ly
@@ -11,8 +11,8 @@ By setting @code{alignment-extra-space} or
 stretched vertically.
 
 
-For technical reasons, @code{overrideProperty} has to be used for
-setting properties on individual objects. @code{override} in a
+For technical reasons, @code{\overrideProperty} has to be used for
+setting properties on individual objects. @code{\override} in a
 @code{\context} block may still be used for global overrides. 
 " }