* Documentation/topdocs/INSTALL.texi (Top): bump GUILE

reqd version to 1.6.4

* lily/font-interface.cc (get_font): bugfix: take font-name from
alist chain too. This fixes font-name override for \markup.

diff --git a/ChangeLog b/ChangeLog
index d7b8ba1dc10155c4cfa29e1dcbce1aecab4d118f..f71366da687de6a9cf1f4be7d4e4cdf74ddb16ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/topdocs/INSTALL.texi (Top): bump GUILE
+       reqd version to 1.6.4 
+
+       * lily/font-interface.cc (get_font): bugfix: take font-name from
+       alist chain too. This fixes font-name override for \markup.
+
 2003-07-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Remove icon.
@@ -17,6 +25,12 @@
 
 2003-07-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/ly2dvi.py (include_path): use preview_resolution for PNG
+       images.
+
+       * scm/music-functions.scm (make-voice-props-set): set Script /
+       TextScript dir for polyphony too.
+
        * scm/define-grobs.scm (all-grob-descriptions): decrease space
        before clef.
 

diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index d058058b0e612ead413d65fb9976ac3148efb17c..fbfa40841247a0fb8de5ca6296db99bd43ec932a 100644 (file)
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -107,17 +107,6 @@ annote =    {This is about engraving, i.e.  professional typesetting.  It contain
   isbn = {ISBN 3-7957-2886-x},
 }
 
-@Book{willemze,
-  note = {A comprehensive overview of music theory;
-the (Dutch) authority on general music theory},
-  year =  {1964-1993},
-  title = {Algemene muziekleer},
-  author = {Theo Willemze},
-  publisher = {Aula, Het Spectrum},
-  address = {Utrecht},
-  isbn = {ISBN 90-274-1817-9},
-}
-
 
 @Book {hader48,
   year =  {1948},
@@ -126,12 +115,14 @@ the (Dutch) authority on general music theory},
   publisher = {Waldheim--Eberle Verlag},
   address ={Vienna},
 
-  note = {Hader was the chief-engraver of the Waldheim-Eberle music
-  publishers.  This beautiful booklet was intended as an introduction
-  for laymen on the art of engraving.  It contains a step by step,
-  in-depth explanation of how to cut and stamp music into zinc plates.
-  It also contains   a few compactly formulated rules on musical
-  orthography. Out of print. }
+  note = {Hader was a chief-engraver in a Viennese engraving
+workshop. This beautiful booklet was intended as an introduction for
+laymen on the art of engraving.  It contains a step by step, in-depth
+explanation of how to cut and stamp music into zinc plates.  It also
+contains a few compactly formulated rules on musical orthography. Out
+of print. }
+
+
 }
 
 @Book{gamble23:_music_engrav,
@@ -265,7 +256,10 @@ It can be ordered from the rental department.
 
 
 @Book {chlapik87,
-  note = {An clearly written book for the casually interested reader. It shows some of the conventions and difficulties in printing music HWN},
+  note = {An clearly written book for the casually interested
+  reader. It shows some of the conventions and difficulties in
+  printing music HWN},
+
   year =  {1987},
   title = {Die Praxis des Notengraphikers},
   author = {Herbert Chlapik},

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 033383227fdf2a97d1418fd8417b573bcd49e366..b011a475eb5fe5a239431f3d61af42acc934f84e 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -103,8 +103,7 @@ There are two options for upgrading sources:
 @item If you have an unpacked source tree of a previous version, you
 may the patches.
 
-@emph{If you upgrade by patching do remember to rerun autoconf after
-applying the patch}.
+@emph{If you upgrade by patching do remember to rerun autoconf after makefilesapplying the patch}.
 
 @item If you have the @code{.tar.gz} file of a previous release, you can
 use
@@ -150,11 +149,11 @@ that generates gcc-3.1.x compliant C++ code.
 @item Python (version 2.1 or newer).
 Check out @uref{http://www.python.org, the python website}.
 
-@item GUILE (version 1.6 or newer).
+@item GUILE (version 1.6.4 or newer).
 Check out
 @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}.
 
-@item GNU Make. 
+@item GNU Make (version 3.78 or newer).  
 Check out
 @uref{ftp://ftp.gnu.org/gnu/make/, the GNU
 make FTP directory}.

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 5a7d6300df5eca55d71f0b0a3b8db67a94db5d64..dc0882e23c9fd65075284e5e2ad814f89e853d80 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -106,7 +106,7 @@ LY_DEFINE(ly_font_interface_get_font,"ly:get-font", 2, 0, 0,
 Font_metric *
 Font_interface::get_font (Grob *me, SCM chain)
 {
-  SCM name = me->get_grob_property ("font-name");
+  SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
   if (!gh_string_p (name))
     {

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ac26282fe39885e7f2c532c967042ef09f2f7ed5..81ce5251a0d1cede65d47d30d1045b4b1b67247c 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -166,7 +166,7 @@ i.e.  this is not an override"
    (append
       (map (lambda (x) (make-grob-property-set x 'direction
                                               (if (odd? n) -1 1)))
-          '(Tie Slur Stem Dots))
+          '(Tie Slur Script TextScript Stem Dots))
       (list
        (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
        (make-grob-property-set 'MultiMeasureRest 'staff-position

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index b65d7ed042cd0ec34a8407c8c7de94a9ef0403bc..c3c44c43746a007bae91a9b63e37d95030ddff26 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -920,7 +920,9 @@ if 1:
                                ly.warning (_("Running LaTeX failed. Rerun with --verbose for a trace."))
                                
        if page_images_p:
-               ly.make_ps_images (outbase + '.ps' )
+               ly.make_ps_images (outbase + '.ps' ,
+                                  resolution = preview_resolution
+                                  )
 
        # add DEP to targets?
        if track_dependencies_p: