patch::: 1.4.4.jcn4

diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh
index 3a559ca47c649d54cab98248eeb8c49949e0844c..5ae3acbad1c26922d034d67de55cb9e7ec160b86 100644 (file)
--- a/Documentation/windows/lily-gs.sh
+++ b/Documentation/windows/lily-gs.sh
@@ -3,7 +3,7 @@
 
 
 gs550="/usr/windows/gstools/gs5.50"
-gs650="/usr/windows/gs/gs6.50"
+gs650="/usr/windows/gs/gs6.50/bin"
 
 gsview26="/usr/windows/gstools/gsview"
 gsview36="/usr/windows/Ghostgum/GSview"

diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh
index c2c1480dd89aecf4b5ccb62e0f1c4371a7d2bdf2..eb14f1679100e07155fd26a205ec84f86d3d067f 100644 (file)
--- a/Documentation/windows/lily-miktex.sh
+++ b/Documentation/windows/lily-miktex.sh
@@ -10,7 +10,7 @@ reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Ro
 b="$(cygpath -u ""$reg"")"
 
 # Where we installed it
-c=texmf="/usr/windows/MiKTeX"
+c="/usr/windows/MiKTeX"
 
 for i in "$a" "$b" "$c"; do
        if [ -d "$i" ]; then

diff --git a/Documentation/windows/zlily-profile.sh b/Documentation/windows/zlily-profile.sh
index 23832a5574dca7950d7eb06fc3e1d9539102fdd1..214219902f0a0e9a6c66ca297d98a595379c0466 100644 (file)
--- a/Documentation/windows/zlily-profile.sh
+++ b/Documentation/windows/zlily-profile.sh
@@ -22,6 +22,9 @@ WINDOWS_MFINPUTS="$(cygpath -apw ""$POSIX_MFINPUTS"")"
 export POSIX_TEXINPUTS POSIX_TFMFONTS POSIX_TFMFONTS
 export WINDOWS_TEXINPUTS WINDOWS_TFMFONTS WINDOWS_MFINPUTS
 
+GS_FONTPATH="$WINDOWS_GS_FONTPATH"
+GS_LIB="$WINDOWS_GS_LIB"
+
 PATH="/usr/lilypond/bin:$PATH"
 PATH="@prefix@/bin:$PATH"
 

diff --git a/VERSION b/VERSION
index 9da0ef98d4996036c98cdc932ea2c20d297e5af6..3d99896e43e69759d151b75cdd7283cc754132e6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=4
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/beam.cc b/lily/beam.cc
index 2f314fa422b4e2bad640ae5ea1bae309ab7d7505..80866325146b3537eff9fbda1e91fcf18f5bb50a 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -825,7 +825,7 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev,
       if (lhalfs)              // generates warnings if not
        a =  Lookup::beam (dydx, w + stem_w, thick);
       a.translate (Offset (-w, -w * dydx));
-      //a.translate_axis (stem_w/2, X_AXIS);
+      a.translate_axis (-stem_w/2, X_AXIS);
       for (int j = 0; j  < lhalfs; j++)
        {
          Molecule b (a);

diff --git a/scm/tex.scm b/scm/tex.scm
index c002a22b3f3dea5eb4445d47818e04e3a851167f..fb5b8df7dbbebd5e092382bc3a4c267f5d3fc80c 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -165,13 +165,7 @@
     "}\\vss}\\interscoreline\n")
   (define (stop-last-line)
     "}\\vss}")
-  (define (xfilledbox breapth width depth height) 
-    (string-append 
-     "\\kern" (number->dim (- breapth))
-     "\\vrule width " (number->dim (+ breapth width))
-     "depth " (number->dim depth)
-     "height " (number->dim height) " "))
-
+  
   (define (filledbox breapth width depth height) 
     (embedded-ps
      (string-append (numbers->string (list breapth width depth height))