lilypond-1.5.44

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9c28f6dcc8dac8db4bf628ff6839dce95e1d36ae..c14eb722248ca948b0b7f5b1d8f0d70cfd25a67d 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -114,7 +114,7 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
        }
       else if (gh_number_p (v))
        {
-         output_Real_def (prefix + s, gh_scm2double (v));        
+         output_Real_def (prefix + s, gh_scm2double (v));
        }
     }
 }
@@ -137,9 +137,9 @@ Paper_outputter::output_Real_def (String k, Real v)
 {
   
   SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
-                    ly_str02scm (k.ch_l ()),
-                    ly_str02scm (to_str (v).ch_l ()),
-                    SCM_UNDEFINED);
+                       ly_str02scm (k.ch_l ()),
+                       ly_str02scm (to_str (v).ch_l ()),
+                       SCM_UNDEFINED);
   output_scheme (scm);
 }
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 39dddbf36cf2c8e48d79c0e65650a33dea1e6437..ab77ff12b919fc6e825aa5048ad5c1b7809f9f13 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)
@@ -70,7 +69,8 @@ export MFINPUTS:=.:$(MFINPUTS)
 default: $(ALL_GEN_FILES)
 
 $(outdir)/lilypond.map: 
-       echo $(FONT_FILES:.mf=) | awk -v RS=' ' '{print $$1 " TeX-" $$1 " <" $$1 ".pfa"}' > $@
+       echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \
+               sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
 
 ##
 ## todo: this also depends on .tfm, FIXME.
@@ -81,4 +81,5 @@ local-clean:
        rm -f mfplain.mem mfplain.log 
        rm -f *.tfm *.log
 
+pfa: $(PFA_FILES) 
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d428202869b5eccf511cac581c4c8c2bba2ef0c9..f1c795ba082b3fd4ebf4d0e4e4c28fcf40e25a0b 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -571,10 +571,10 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
        maxlw = max (extra['linewidth'] + [-1])
        if maxlw < 0:
                # who the hell is 597 ?
-               linewidth = '597'
+               linewidth = '597pt'
        else:
                linewidth = maxlw
-       s = s + '\geometry{width=%spt%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+       s = s + '\geometry{width=%smm%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
        if extra['latexoptions']:
                s = s + '\geometry{twosideshift=4mm}\n'