* scm/output-ps.scm (new-text): don't access t glyph for getting

space dimension.

* ly/init.ly: warn about \version

* lily/lexer.ll: set version-seen?

diff --git a/ChangeLog b/ChangeLog
index 3351f0ba0ddc93d8b3ecb39692e39b7c3ea75b12..58de9d7ab91282f52be4019962f16686dc3dc3dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/output-ps.scm (new-text): don't access t glyph for getting
+       space dimension.
+
+       * ly/init.ly: warn about \version
+
+       * lily/lexer.ll: set version-seen?
+
 2004-12-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-svg.scm (string->entities): Update.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index c4015e1368f54a7174f6300db60508c5bbb70e34..87965ea67143b3822510eaf0b5ea05887b34019d 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -69,7 +69,11 @@ You need the following packages to compile LilyPond:
 
 @itemize
 
-@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.0.17 or
+@item @uref{http://www.freetype.org/,Freetype} version 2.
+
+@item @uref{http://fontforge.sf.net/,FontForge} 20041211 or newer.
+
+@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.0.33 or
 newer),
 
   You will need to install some additional packages to get mftrace to

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 6c3ec3bd8b0979e2e1470e7412a02663d7b531f4..fa3d95d221f30b37265059b1166b4fe71a771c6f 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1003,12 +1003,12 @@ possibilities when setting properties manually.
 
 @lilypond[quote,raggedright,verbatim]
 {
-  \set Staff.clefGlyph = #"clefs-F"
+  \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
   c'4
-  \set Staff.clefGlyph = #"clefs-G"
+  \set Staff.clefGlyph = #"clefs.G"
   c'4
-  \set Staff.clefGlyph = #"clefs-C"
+  \set Staff.clefGlyph = #"clefs.C"
   c'4
   \set Staff.clefOctavation = #7
   c'4

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 29e4d6367d0cd70557aa4964c90b6a2889d2710d..081dd002215078bc6996579bf418db57d648b2c8 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -186,6 +186,10 @@ HYPHEN             --
        yy_pop_state ();
        if (!is_valid_version (s))
                return INVALID;
+
+       SCM top_scope = scm_car (scm_last_pair (scopes_));
+       scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
+
 }
 <renameinput>\"[^"]*\"     {
        String s (YYText () + 1);

diff --git a/ly/init.ly b/ly/init.ly
index 8e94170d0d96f6ae5aa4bfb7b39e17ca71feed39..b5471de7c5758acedb0256010240e1d0de05e530 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -13,6 +13,7 @@
 #(ly:set-point-and-click #f)
 #(define toplevel-scores '())
 #(define $globalheader #f)
+#(define version-seen? #f)
 
 \maininput
 %% there is a problem at the end of the input file
@@ -29,6 +30,11 @@
            input-file-name ": old relative compatibility was not used."
        )))%% there is a problem at the end of the input file
 
+#(if (not version-seen?)
+  (ly:warn "No \\version included in input file.\nAdd\n\n\t\\version \"~a\"\n\nfor future compatibility" (lilypond-version)))
+  
+
+
 #(if (pair? toplevel-scores)
   (ly:parser-print-book parser
    (apply ly:make-book $defaultpaper $globalheader (reverse toplevel-scores))))

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 1347c415d1b61a4e0d894caa93b0cf7ee15ada93..014d7b1d710e824aae18baf487606a7b69e8acce 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -58,7 +58,7 @@ $(outdir)/%.otf: $(outdir)/%.pe
        (cd $(outdir) && fontforge -script $(notdir $<)) 
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
-       cat $< $(subst parmesan,feta,$<) $(subst feta-alphabet,feta,$<) > $@
+       cat $< $(wildcard $(subst feta,parmesan,$<)) $(wildcard $(subst feta,feta-alphabet,$<)) > $@
 
 $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2adda3e4c4d101724cc9935a69abcc0a7be26abe..9999ced85826c478f373989ae6510fc5a0fd847a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -266,7 +266,7 @@
                        (right-edge . (extra-space . 0.1))
                        ))
        (print-function . ,Text_interface::print)
-       (text . ,(make-musicglyph-markup "scripts-rcomma"))
+       (text . ,(make-musicglyph-markup "scripts.rcomma"))
        (Y-offset-callbacks . (,Breathing_sign::offset_callback))
        (break-visibility . ,begin-of-line-invisible)
        (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface item-interface ))))
@@ -1186,7 +1186,7 @@
     (TrillSpanner
      . (
        (print-function . ,Dynamic_text_spanner::print)
-       (edge-text . ,(cons (make-musicglyph-markup "scripts-trill")
+       (edge-text . ,(cons (make-musicglyph-markup "scripts.trill")
                            ""))
        (style . trill)
        (staff-padding . 1.0)

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 75251dcbfa0b081bb8d9bafdfda2e7514d20f868..a6b13dc07912a56ba67ed3037b454ef5ccb142c0 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -221,7 +221,7 @@
       ;; ugh, we should find a better way to
       ;; extract the hsbw for /space from the font.
       
-      ((space-length (cdar (ly:text-dimension font "t"))) 
+      ((space-length (cdar (ly:text-dimension font " "))) 
        (commands '())
        (add-command (lambda (x) (set! commands (cons x commands)))) )
 
@@ -249,7 +249,7 @@
 
 (define (new-text font s)
   (let*
-      ((space-length (cdar (ly:text-dimension font "t")))
+      ((space-length (cdar (ly:text-dimension font " ")))
        (space-move (string-append (number->string space-length) " 0.0 rmoveto "))
        
        (input-enc (assoc-get 'input-name

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 47a324c042fb747ef780b941d071fd4e84d558f3..de067edc25dca0906a1669f6ef4a9054078c4da7 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -514,6 +514,7 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
                               (ly:parser-print-score
                                p (ly:music-scorify m p))))
 
+#(define version-seen? #t)
 %(preamble_string)s
 
 \paper {