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

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index f639c5859d83840c420127ea9d4088ad8b263c34..69443c7a8f834e99b445efefee6aae8997f4d59e 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -7,7 +7,7 @@ STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 README_TOP_FILES= DEDICATION THANKS 
-EXTRA_DIST_FILES= texinfo.css TRANSLATION
+EXTRA_DIST_FILES= texinfo.css TRANSLATION translations.template.html
 
 include $(depth)/make/stepmake.make
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index a5b0b864b536cc70c6b3519c2839a68db7c7cee8..5994526b73e71ae9fcf2d94c0aa09ada0072c0d5 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -4,7 +4,7 @@ LATEX_FILES =$(call src-wildcard,*.latex)
 
 
 EXTRA_DIST_FILES = $(LATEX_FILES) $(IMAGES) $(EPS_ILLUSTRATIONS)
-EXTRA_DIST_FILES += README.txt writing-texinfo.txt policy.txt
+EXTRA_DIST_FILES += README.txt writing-texinfo.txt policy.txt writing-sections.txt
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps

diff --git a/VERSION b/VERSION
index 77ea76be6d62a7b5e1f5e93b219e70fc7dfe59a7..98b24a855e44f53310b56195f1a2f85d869071cf 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=39
+PATCH_LEVEL=40
 MY_PATCH_LEVEL=
 

diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly
new file mode 100644 (file)
index 0000000..c108cb6
--- /dev/null
+++ b/input/regression/spacing-packed.ly
@@ -0,0 +1,23 @@
+\header {
+  texidoc = "
+       In packed mode, pack notes as tight as possible.  This makes
+       sense mostly in combination with raggedright mode: the notes
+       are then printed at minimum distance.  This is mostly useful
+       for ancient notation, but may also be useful for some flavours
+       of contemporary music.  If not in raggedright mode, lily will
+       pack as much bars of music as possible into a line, but the
+       line will then be stretched to fill the whole linewidth.
+"
+  }
+
+\version "2.11.40"
+
+\layout {
+  ragged-right = ##t
+}
+
+
+\relative {
+  \override Score.SpacingSpanner #'packed-spacing = ##t
+  c2 d4 f8[ g]
+}