(ps-font-command): fix parmesan coding too.

diff --git a/ChangeLog b/ChangeLog
index 84f32149ae57456351a87421f05880cc2f358650..261a1a871c021bd5384bb94669ddcc092ec503de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-04  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/output-ps.scm (ps-font-command): fix parmesan coding too.
+
 2004-06-04  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * scripts/lilypond-book.py (output): Bug fix so preLilyPondExample

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ad2247c9f66a860ee865f9090ba3174cc7565be4..7b220f89be17629e4e1652a25976839aab701fcf 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -154,8 +154,8 @@ local-clean:
 $(builddir)/mf/$(outconfbase)/feta16list.ly:
        $(MAKE) -C $(topdir)/mf
 
-$(outdir)/lilypond.texi: $(ITELY_FILES) macros.itexi 
-$(outdir)/lilypond.nexi: $(ITELY_FILES) macros.itexi 
+$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
+$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 3fdebf1ae0d2a553e2825a08c3dbd9efaa37f509..459bea18ff7cab1277a0f6bf34f26dc70d9eded8 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -30,6 +30,8 @@ format.
 To have @code{lilypond} read from stdin, use a dash @code{-} for
 @var{file}.  The program supports the following options.
 
+@cindex stdin, reading
+
 @table @code
 @item -k,--keep
     Keep the temporary directory with all output

diff --git a/VERSION b/VERSION
index 09ea3c7f9efd655964e600b61de44683f1223868..b139ad6d99ebb5cd47b510a37c5d8c9afe1ccf3a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 

diff --git a/lily/score.cc b/lily/score.cc
index 8f0b5d98f29dd1fc111eb5b56859094cfdd6e505..05d976d1b53e60b3413fc5f625b35901b0b3ce99 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -316,6 +316,13 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
   SCM prot = score_def->self_scm ();
   scm_gc_unprotect_object (prot);
 
+  /*
+
+  TODO: SCORE_DEF should be scaled according to OD->parent_ or OD
+  itself.
+  
+   */
+  
   score_def->parent_ = od;
   
   SCM context = ly_run_translator (sc->music_, score_def->self_scm ());

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 575c96d8fb1771549bdab9bfda953c2cf77b60d8..ba9cdef0a264287347c65f32091e480d531f9b90 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -154,7 +154,12 @@
     ;; FIXME:  now feta stuff has feta* input-encoding (again?)
     ;;(format (current-error-port) "FONT: ~S, ~S\n" name font-encoding)
     ;;(format (current-error-port) "INPUT: ~S\n" input-encoding)
-    (if (and coding-command (equal? (substring coding-command 0 4) "feta"))
+    (if (and coding-command
+            (or
+             (equal? (substring coding-command 0 4) "feta")
+             (equal? (substring coding-command 0 8) "parmesan")
+
+            ))
        (set! coding-command #f))
 
     (string-append