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

diff --git a/input/regression/midi-partial.ly b/input/regression/midi-partial.ly
new file mode 100644 (file)
index 0000000..951ce51
--- /dev/null
+++ b/input/regression/midi-partial.ly
@@ -0,0 +1,14 @@
+\header {
+  texidoc = "MIDI and partial measures work together."
+}
+\version "2.11.24"
+  
+\score {
+  { \partial 4
+    c4 c1
+  }
+
+  \midi {
+
+  }
+}

diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index 7220ec4cff892494044dc3b7c3841fcf396d3578..1ca99ac56734201ffd94b47c40b5a97cf6027dc7 100644 (file)
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -9,7 +9,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
 ## examples = font20 ancient-font
 ## LOCALSTEPMAKE_TEMPLATES += ly mutopia
 
-EXTRA_DIST_FILES= README
+EXTRA_DIST_FILES= 
 
 include $(depth)/make/stepmake.make
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 9df1034d165a2fbabb5b4c052cf917d8698dcbd3..eea08ee94c567d9fe7b598cd15da2537ebdf8bc8 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1443,7 +1443,7 @@ command_element:
        | PARTIAL duration_length       {
                Moment m = - unsmob_duration ($2)->get_length ();
                $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ());
-               $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Timing"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F);
+               $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F);
        }
 
        | TIME_T fraction  {

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index fd821eddcb8b7d17b174963f1d3df47c293fa2a6..ae8cc39dd42608676a772c73378c8f30a9d05990 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -22,7 +22,9 @@ the-script-dir=$(wildcard $(script-dir))
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/ -I $(input-dir)/test/ 
+
+## ugh : fix me, input/new/pitch
+LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/ -I $(input-dir)/test/  -I $(input-dir)/new/pitch
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index fe17642c43d99f732641a28da1bbd137412ab759..7b7e3eb157deb3f3d49475a53f8faa13f6edc656 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -125,6 +125,7 @@
  ~a\
  -dGraphicsAlphaBits=4\
  -dTextAlphaBits=4\
+ -q
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\