* mf/GNUmakefile (NCSB_PATH): add vars for NCSB.

(install-ncsb-ttf): new target.

* scm/define-grobs.scm (all-grob-descriptions): add font-interface
to LyricHyphen.

* lily/lyric-hyphen.cc (print): multiply hyphen height by
font-size

diff --git a/ChangeLog b/ChangeLog
index 3bd3023df7f6c07073bf59d7a8e78cc0dbf8d432..52276ebd1be90d4ab579056c4987ebe2c1b959e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
+2006-01-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * mf/GNUmakefile (NCSB_PATH): add vars for NCSB.
+       (install-ncsb-ttf): new target.
+
+       * scm/define-grobs.scm (all-grob-descriptions): add font-interface
+       to LyricHyphen.
+
+       * lily/lyric-hyphen.cc (print): multiply hyphen height by
+       font-size
+
 2005-12-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * VERSION: release 2.7.26
+       
        * mf/GNUmakefile (install-fc-cache): remove old font.cache-1 files.
 
 2005-12-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>

diff --git a/VERSION b/VERSION
index f7539f89a254e6399925fd929dbedc7732848e6e..14c743e705f7cab92d2d12e55547c70eb764bc54 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=26
+PATCH_LEVEL=27
 MY_PATCH_LEVEL=
 

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 6f39a4507e6f93fe43b2f511f4d9b7208dd7ee57..25304bc713207d5725e8bc1e76f5ec4623802f7d 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -52,7 +52,7 @@ Font_size_engraver::acknowledge_font (Grob_info gi)
 
 ADD_ACKNOWLEDGER (Font_size_engraver, font);
 ADD_TRANSLATOR (Font_size_engraver,
-               /* doc */ "Puts fontSize into font-relative-size grob property.",
+               /* doc */ "Puts fontSize into font-size grob property.",
                /* create */ "",
                /* accept */ "",
                /* read */ "fontSize",

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 6988209c748275f60d16076cfd6438aad0e878c0..19f27a766d6877e2b221c390e06b0fe1dd6745b5 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -49,7 +49,10 @@ Hyphen_spanner::print (SCM smob)
 
   Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
-  Real h = robust_scm2double (me->get_property ("height"), 0.5);
+  Real font_size_step = robust_scm2double (ly_chain_assoc_get (ly_symbol2scm ("font-size"), chain, SCM_BOOL_F),
+                                0.0);
+  Real h = robust_scm2double (me->get_property ("height"), 0.5)
+    * pow (2.0, font_size_step / 6.0);
 
   // interval?
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 6c613432fa15b0a2270669d525969dd74aef8de4..4ecf99019047c6d5517c6c41df71b280250a2407 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -34,11 +34,10 @@ FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
 
 
-$(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
-       cat $^ > $@
-
-$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
-       echo '(design_size . 20)' > $@
+NCSB_FILES=c059013l c059016l c059033l c059036l
+NCSB_TTFS=$(addprefix $(outdir)/,$(addsuffix .ttf, $(NCSB_FILES)))
+NCSB_PATH=/usr/share/fonts/default/Type1
+NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
@@ -52,6 +51,16 @@ FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 ENCODING_FILE=$(findstring $(<F:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) --no-afm
 
+
+
+
+$(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+       cat $^ > $@
+
+$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
+       echo '(design_size . 20)' > $@
+
+
 # only for fonts which
 #
 # 1. are mentioned in font.scm
@@ -245,5 +254,13 @@ local-uninstall:
        -rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/map
        -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
 
-foe:
-       @echo mf:$(FETA_MF_FILES)
+
+$(outdir)/%.ttf: $(NCSB_PATH)/%.pfb
+       $(foreach i,$(NCSB_FILES), \
+               $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
+                       $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm \
+                       $(outdir)/$(i).ttf && ) true
+
+install-ncsb-ttf: $(NCSB_TTFS)
+       $(INSTALL) -d $(DESTDIR)$(NCSB_INSTALL_DIR)
+       $(INSTALL) $(NCSB_TTFS) $(DESTDIR)$(NCSB_INSTALL_DIR)

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3970b861a25fbc2a1139864bf9353e6732fadf6e..96a7cc87a127c4bb0b8dd54f47eaa844b9a2b0d2 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -886,6 +886,7 @@
        (Y-extent . (0 . 0))
        (meta . ((class . Spanner)
                 (interfaces . (lyric-interface
+                               font-interface
                                lyric-hyphen-interface
                                spanner-interface))))))