patch::: 1.5.43.jcn1

2002-03-19  Jan Nieuwenhuizen  <janneke@gnu.org>

	* mf/GNUmakefile (depth): Always allow manual access to pfa target.

	* tex/lily-ps-defs.tex: scaletounit using PT/IN==72.

	* lily/slur.cc (get_attachment): Bugfix: correct for stem thickness.

diff --git a/ChangeLog b/ChangeLog
index 462b2c7759f058006e43c1d959ce6fc23c5324b6..d9cb4964fe141c8bd58ce5f11b3a1879ff5f37be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/GNUmakefile (depth): Always allow manual access to pfa target.
+
+       * tex/lily-ps-defs.tex: scaletounit using PT/IN==72.
+
+       * lily/slur.cc (get_attachment): Bugfix: correct for stem thickness.
+
 2002-03-19  Han-Wen  <hanwen@cs.uu.nl>
 
        * VERSION: 1.5.43 released

diff --git a/VERSION b/VERSION
index be33ecbf5219d322379acf82b1c38ab4208b8536..421be982f6bbad55bf54ca1602e21d0cb388c2fa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=43
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/slur.cc b/lily/slur.cc
index f72490f87207165ea5f84f2139e84085aa611ab5..ebf1e2abb1a6a0a5dc26162e675ad987ecde16e4 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -284,6 +284,8 @@ Slur::get_attachment (Grob *me, Direction dir,
   Real hs = staff_space / 2.0;
   Offset o;
   
+  int slurdir = gh_scm2int (me->get_grob_property ("direction"));
+  
   Grob *stem = 0;
   if (Note_column::has_interface (sp->get_bound (dir)))
     {
@@ -323,8 +325,13 @@ Slur::get_attachment (Grob *me, Direction dir,
              /*
                Default position is on stem X, at stem end Y
               */
+             Real stem_thickness =
+               gh_scm2double (stem->get_grob_property ("thickness"))
+               * stem->paper_l ()->get_var ("stafflinethickness");
              o += Offset (0.5 *
-                          x_extent * (1 + Stem::get_direction (stem)),
+                          x_extent * (1 + Stem::get_direction (stem))
+                          - ((dir + 1)/2) * stem_thickness
+                          + ((1 - slurdir)/2) * stem_thickness,
                           0);
            }
        }
@@ -344,7 +351,6 @@ Slur::get_attachment (Grob *me, Direction dir,
 
   SCM alist = me->get_grob_property ("extremity-offset-alist");
   int stemdir = stem ? Stem::get_direction (stem) : 1;
-  int slurdir = gh_scm2int (me->get_grob_property ("direction"));
   SCM l = scm_assoc
     (scm_list_n (a,
                  gh_int2scm (stemdir * dir),

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 39dddbf36cf2c8e48d79c0e65650a33dea1e6437..22d0607ea8e36eb3e47d569ec997a1a1be959007 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -53,8 +53,8 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 # making pfas takes a lot of CPU time. Let's skip it for now.
 #MAKE_PFA_FILES=1
 
-ifdef MAKE_PFA_FILES
 PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+ifdef MAKE_PFA_FILES
 ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
 INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
 INSTALLATION_OUT_FILES4=$(PFA_FILES)
@@ -62,7 +62,6 @@ INSTALLATION_OUT_FILES4=$(PFA_FILES)
 INSTALLATION_OUT_DIR5=$(datadir)/dvips/
 INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
 
-pfa: $(PFA_FILES) 
 endif
 
 export MFINPUTS:=.:$(MFINPUTS)
@@ -81,4 +80,5 @@ local-clean:
        rm -f mfplain.mem mfplain.log 
        rm -f *.tfm *.log
 
+pfa: $(PFA_FILES) 
 

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 30e8d1b992590263b704ca5df783885ef7d23adb..ed2eeb4af890c13a55fd4847d14501930f1b3f4c 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -12,8 +12,8 @@
 \def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\csname #1\endcsname) set_tex_dimen}}
 \def\lilySpace{ }
 
-% for mm: 72.27/25.4
-\def\scaletounit{ 2.845276 mul }
+% PostScript PT/IN: 72/25.4
+\def\scaletounit{ 2.834645 mul }
 
 % for true printers points to postscript points: 
 %\def\scaletounit{1.00375}