From fcbd36bc678e5bf5fee02c6e02297f94fc321bb3 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 4 Jun 2004 10:04:54 +0000
Subject: [PATCH] (ps-font-command): fix parmesan coding too.

---
 ChangeLog                         | 4 ++++
 Documentation/user/GNUmakefile    | 4 ++--
 Documentation/user/invoking.itexi | 2 ++
 VERSION                           | 2 +-
 lily/score.cc                     | 7 +++++++
 scm/output-ps.scm                 | 7 ++++++-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84f32149ae..261a1a871c 100644
--- 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 ad2247c9f6..7b220f89be 100644
--- 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 3fdebf1ae0..459bea18ff 100644
--- 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 09ea3c7f9e..b139ad6d99 100644
--- 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 8f0b5d98f2..05d976d1b5 100644
--- 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 575c96d8fb..ba9cdef0a2 100644
--- 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
-- 
2.39.5