* GNUmakefile.in:

* SConstruct (symlink): Replace afm by otf.

diff --git a/ChangeLog b/ChangeLog
index 98978de9964382a169cb716f7ef0e0623242da0c..45faa1b756b785b41a48426f6a1657b089ae632d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * GNUmakefile.in: 
+       * SConstruct (symlink): Replace afm by otf.
+
        * scm/framework-gnome.scm (gnome-main): Remove invocation of
        ly:pango-add-afm-decoder.
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 345bdf02f8365ebfba722dafce7b5eb8db5c8b32..1f1dbcc82dfc2fd944e085313febd0530dae8d04 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -111,7 +111,7 @@ $(builddir)/share/lilypond-force:
        cd $(builddir)/share/$(package) && \
                ln -s $(abs-srcdir)/ly ly && \
                ln -s ../../mf/$(outconfbase) dvips && \
-               ln -s ../../mf/$(outconfbase) afm && \
+               ln -s ../../mf/$(outconfbase) otf && \
                ln -s ../../mf/$(outconfbase) tfm && \
                ln -s $(abs-srcdir)/mf && \
                ln -s $(abs-srcdir)/ps && \
@@ -123,7 +123,7 @@ $(builddir)/share/lilypond-force:
                ln -s ../../../mf/$(outconfbase) mf-out
        cd $(builddir)/share/$(package)/fonts && \
                ln -s $(abs-srcdir)/mf source && \
-               ln -s ../../../mf/$(outconfbase) afm && \
+               ln -s ../../../mf/$(outconfbase) otf && \
                ln -s ../../../mf/$(outconfbase) tfm && \
                ln -s ../../../mf/$(outconfbase) type1
        cd $(builddir)/share/$(package)/elisp && \

diff --git a/SConstruct b/SConstruct
index f3067fd56f0a80bc87a11df3f50d9bab8c840020..124797edaa7f3d8cb5a7cb6c758472d8e4972a7c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -669,10 +669,10 @@ def symlink_tree (target, source, env):
              ('scripts/',   'bin/lilypond-book'),
              ('mf',         'share/lilypond/dvips'),
              ('#ps',        'share/lilypond/tex/music-drawing-routines.ps'),
-             ('mf',         'share/lilypond/afm'),
+             ('mf',         'share/lilypond/otf'),
              ('mf',         'share/lilypond/tfm'),
              ('#mf',        'share/lilypond/fonts/mf'),
-             ('mf',         'share/lilypond/fonts/afm'),
+             ('mf',         'share/lilypond/fonts/otf'),
              ('mf',         'share/lilypond/fonts/tfm'),
              ('mf',         'share/lilypond/fonts/type1'),
              ('#tex',       'share/lilypond/tex/source'),

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 51226d2bb14e9c8766ebde4ce3a63c1cd6d229b3..a29fc395a1fef8d868df0e4e9f53f9db7a82725a 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -144,12 +144,15 @@ lilypond -fgnome input/simple-song.ly
        (string=? (substring family 0 (min (string-length family) 9))
                  "bigcheese"))))
 
+;; FIXME
 (define-public (otf-name-mangling font family)
   ;; Hmm, family is bigcheese20/26?
   (if (string=? (substring family 0 (min (string-length family) 9))
                "bigcheese")
       (string-append "LilyPond " (substring family 9))
-      family))
+      (if (string=? family "aybabtu")
+         "LilyPondBraces"
+         family)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Wrappers from guile-gnome TLA

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 46df231a1f415b563bf72bf1cb73634846372ffd..068b69d28a11e9b8e0f1bc82ccb2e312e06ba31a 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -116,12 +116,15 @@
 (define (fontify font expr)
    (tagify "text" expr (cons 'style (svg-font font))))
 
+;; FIXME
 (define-public (otf-name-mangling font family)
   ;; Hmm, family is bigcheese20/26?
   (if (string=? (substring family 0 (min (string-length family) 9))
                "bigcheese")
       "LilyPond"
-      family))
+      (if (string=? family "aybabtu")
+         "LilyPondBraces"
+         family)))
 
 (define-public (otf-weight-mangling font family)
   ;; Hmm, family is bigcheese20/26?