(transform_heads): replace

. with - in add.stem.

diff --git a/ChangeLog b/ChangeLog
index 720f78cbbc8fe73466e5e4c55cc26123383d67db..ab0ea7a7ecf569ae87c3d0b5d910c06d26d94408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/vaticana-ligature-engraver.cc (transform_heads): replace
+       . with - in add.stem.
+       
 2004-12-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/encoding.scm (coding-alist): Fix encodings for fetaNumber

diff --git a/VERSION b/VERSION
index 49dba83996c7b41bbcbda2bf2eb03f223d1d4a84..509cbde46e451402b1cdbe8667deb657b2b89cc7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=3
+PATCH_LEVEL=4
 MY_PATCH_LEVEL=
 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 6f5e83c392fba2fd2f5d8aa01ca5fa4df21415aa..163f48d111a0f8640dd88283992cc9281b04d06e 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -103,7 +103,7 @@ def parse_logfile (fn):
                        tags = tags[:-1]
                        name = tags[1:]
                        global_info['DesignSize'] = string.atof (tags[4])
-                       global_info['FontName'] = string.join (name,'-')
+                       global_info['FontName'] = string.join (name, '-')
                        global_info['FullName'] = string.join (name,' ')
                        global_info['FamilyName'] = string.join (name[1:-1],
                                                                 '-')
@@ -153,6 +153,7 @@ def write_afm_metric (file, global_info, charmetrics):
 
 
 def write_tex_defs (file, global_info, charmetrics):
+       nm = global_info['font
        ## nm = global_info['FontFamily']
        nm = font_family
        for m in charmetrics:

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 7d9b0e952dc3d168c1c9f693ae605c79ff13cd48..4c5c9e24f1069520c9b510a81f0fb5e7e09e1432 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -136,6 +136,17 @@ Open_type_font::make_otf (String str)
   return otf->self_scm ();
 }
 
+Open_type_font::Open_type_font(FT_Face face)
+{
+  face_ = face;
+  lily_character_table_ = SCM_EOL;
+  lily_global_table_ = SCM_EOL;
+  
+  lily_character_table_ = load_scheme_table ("LILC", face_);
+  lily_global_table_ = load_scheme_table ("LILY", face_);
+  index_to_charcode_map_ = make_index_to_charcode_map (face_);  
+}
+
 void
 Open_type_font::derived_mark () const
 {
@@ -155,9 +166,10 @@ Open_type_font::attachment_point (String glyph_name) const
 
   SCM char_alist = entry;
 
-  SCM att_scm =scm_cdr (scm_assq (ly_symbol2scm ("attachment"), char_alist));
-
-  return ly_scm2offset (att_scm);
+  
+  SCM att_scm = scm_cdr (scm_assq (ly_symbol2scm ("attachment"), char_alist));
+  
+  return point_constant * ly_scm2offset (att_scm);
 }
 
 Box
@@ -204,7 +216,7 @@ Open_type_font::glyph_name_to_charcode (String glyph_name) const
 Real
 Open_type_font::design_size () const
 {
-  return point_constant
-    * scm_to_double (scm_hashq_ref (lily_global_table_,
-                                   ly_symbol2scm ("staffsize"), SCM_BOOL_F));
+  SCM entry = scm_hashq_ref (lily_global_table_,
+                            ly_symbol2scm ("staffsize"), SCM_BOOL_F);
+  return scm_to_double (entry);
 }

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index d40e1abc389eeaec9445742d351ff6f8dddb99cb..401b824f285efa9b3ca32a15fcda36e13ea59e04 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -36,7 +36,6 @@ find_scaled_font (Output_def *mod, Font_metric *f, Real m,
       font_table = scm_c_make_hash_table (11);
       mod->set_variable (ly_symbol2scm ("scaled-fonts"), font_table);
     }
-
   
   SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F);
   if (sizes != SCM_BOOL_F)

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 27bc2bb05e7394f2eb3db10b9537c21ffde0a0a3..13dd9237f1415fda9e5a02876d14d00304ce3941 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -396,7 +396,7 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
     if (prefix_set & VIRGA)
       {
        glyph_name = "vaticana.punctum";
-       primitive->set_property ("add.stem", ly_bool2scm (true));
+       primitive->set_property ("add-stem", ly_bool2scm (true));
       }
     else if (prefix_set & QUILISMA)
       glyph_name = "vaticana.quilisma";

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index b78dcd6f49ae469c2c8fed283d7c11f0b1fb9b22..ba5840bfbeea5ab17188227912cb041ccfcf5df1 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -15,14 +15,6 @@ staffsize# := 20 pt#;   %% arbitrary.
 input feta-params;
 
 
-def abc_encode_int (expr i) =
-       if i > 0:
-               abc_encode_int (i div 26) & char (65 + i mod 26)
-       else:
-               "A"
-       fi
-enddef ;
-
 % we must let the design increase for each
 % font to make sure that mftrace doesn't jack up the resolution too highly
 % for the longer braces.