* lily/font-select.cc: new file handle font selection routines.

* lily/parser.yy: add ; (Patrick Atamaniuk)

diff --git a/ChangeLog b/ChangeLog
index cf91d267630e6eb1bbc4a94015d3eba4d4c2316e..c5e97d07a5868be48a8839b4a5dd311e106bbf9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/font-select.cc: new file handle font selection routines.
+
+       * lily/parser.yy: add ; (Patrick Atamaniuk)
+
        * input/test/time-signature-double.ly: use markups for double time
        sigs.
 
@@ -13,8 +17,8 @@
        offsets. Fixes overflow errors in the PFA. 
 
        * scm/new-markup.scm (strut-markup): change calling interface for
-       markup. Pass paper-def, not grob. This would \markup to be used
-       separately from grobs.
+       markup. Pass paper-def, not grob. This would allow \markup to be
+       used separately from grobs.
 
        * lily/paper-def.cc: new function ly:paper-font; this function
        replaces ly:get-font.

diff --git a/lily/font-select.cc b/lily/font-select.cc
new file mode 100644 (file)
index 0000000..2890b62
--- /dev/null
+++ b/lily/font-select.cc
@@ -0,0 +1,139 @@
+#include "paper-def.hh"
+#include "font-interface.hh"
+#include "warn.hh"
+
+
+/*
+  TODO revise font handling.
+
+
+* relative sizes should relate to staff-space, eg.  font-staff-space
+= 1.2 ^ relative-size
+
+* If a relative size is given, lily should magnify the closest
+design size font to match that. (ie. fonts should have variable
+scaling)
+
+(this requires that fonts are stored as (filename , designsize))
+
+
+  
+ */
+
+
+
+
+LY_DEFINE(ly_paper_get_font,"ly:paper-get-font", 2, 0, 0,
+         (SCM paper, SCM chain),
+         "Return a font metric satisfying the font-qualifiers in the alist chain @var{chain}.\n"
+"\n"
+"The font object represents the metric information of a font. Every font\n"
+"that is loaded into LilyPond can be accessed via Scheme. \n"
+"\n"
+"LilyPond only needs to know the dimension of glyph to be able to process\n"
+"them. This information is stored in font metric files. LilyPond can read\n"
+"two types of font-metrics: @TeX{} Font Metric files (TFM files) and\n"
+"Adobe Font Metric files (AFM files).  LilyPond will always try to load\n"
+"AFM files first since they are more versatile.\n"
+"\n"
+"An alist chain is a list of alists, containing grob properties.\n")
+{
+  Paper_def *pap = unsmob_paper (paper);
+  SCM_ASSERT_TYPE(pap, paper, SCM_ARG1, __FUNCTION__, "paper definition");
+  
+  Font_metric*fm = select_font (pap, chain);
+  return fm->self_scm();
+}
+
+
+bool
+wild_compare (SCM field_val, SCM val)
+{
+  return (val == SCM_BOOL_F || field_val == ly_symbol2scm ("*") || field_val == val);
+}
+
+/*
+  We can probably get more efficiency points if we preprocess FONTS
+  to make lookup easier.
+ */
+SCM
+properties_to_font_name (SCM fonts, SCM alist_chain)
+{
+  SCM shape = SCM_BOOL_F;
+  SCM family = SCM_BOOL_F;
+  SCM series = SCM_BOOL_F;
+
+  
+  SCM point_sz = ly_assoc_chain (ly_symbol2scm ("font-design-size"), alist_chain);
+  SCM rel_sz = SCM_BOOL_F;
+
+  shape = ly_assoc_chain (ly_symbol2scm ("font-shape"), alist_chain);
+  family = ly_assoc_chain (ly_symbol2scm ("font-family"), alist_chain);
+  series = ly_assoc_chain (ly_symbol2scm ("font-series"), alist_chain);
+
+  if (gh_pair_p (shape))
+    shape = ly_cdr (shape);
+  if (gh_pair_p (family))
+    family = ly_cdr (family);
+  if (gh_pair_p (series))
+    series = ly_cdr (series);
+
+
+  if (gh_pair_p (point_sz))
+    point_sz = ly_cdr (point_sz);
+  else
+    {
+      rel_sz = ly_assoc_chain (ly_symbol2scm ("font-relative-size"), alist_chain);
+      if (gh_pair_p (rel_sz))
+       rel_sz = ly_cdr (rel_sz);
+    }
+
+  for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s))
+    {
+      SCM qlist = ly_caar (s);
+
+      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (1)), series))
+       continue;
+      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (2)), shape))
+       continue;
+      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (3)), family))
+       continue;
+  
+      if (point_sz == SCM_BOOL_F && !wild_compare (ly_car (qlist), rel_sz))
+       continue;
+          
+      SCM qname = ly_cdar (s);
+      return qname;
+    }
+
+  warning (_ ("couldn't find any font satisfying "));
+  scm_write (scm_list_n (point_sz, shape, series , family, rel_sz,
+                        SCM_UNDEFINED), scm_current_error_port ());
+  scm_flush (scm_current_error_port ());
+ 
+  return scm_makfrom0str ("cmr10");
+  
+}
+
+
+Font_metric *
+select_font (Paper_def *paper, SCM chain)
+{
+  SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
+  
+  if (!gh_pair_p (name) || !gh_string_p (gh_cdr (name)))
+    {
+      SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts"));
+      name = properties_to_font_name (fonts, chain);
+    }
+  else
+    name  = gh_cdr (name);
+  
+  SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain);
+  
+  Real rmag = gh_pair_p (mag) && gh_number_p (gh_cdr (mag))
+    ? gh_scm2double (gh_cdr (mag)) : 1.0;
+  
+  Font_metric *fm = paper->find_font (name, rmag);
+  return fm;
+}

diff --git a/lily/parser.yy b/lily/parser.yy
index 7c1b19c7b573b3b75d8a8a2de7e709d26b7eafb8..5ffd2d308e31a112a854e577ac376f471c700339 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1620,7 +1620,7 @@ configurable, i.e.
        }
        | open_event {
                $$ = $1;
-               dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
+               dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP));
        }
        | EVENT_IDENTIFIER      {
                $$ = unsmob_music ($1);
@@ -1961,7 +1961,7 @@ bass_number:
        | UNSIGNED {
                $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
        }
-       | STRING { $$ =  $1 }
+       | STRING { $$ =  $1; }
        ;
 
 bass_mod:
@@ -2132,7 +2132,7 @@ simple_element:
        ;
 
 lyric_element:
-       full_markup { $$ = $1 }
+       full_markup { $$ = $1; }
        | STRING {  $$ = $1 ; }
        ;
 

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 67c03a8ef31037e8d2d8d2ea3c5e8a99e01796f2..7f50d89f744f496695fac022aad5a7e237b67629 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,5 +1,5 @@
 /*   
-  time-signature.cc --  implement Time_signature
+  time-signature.cc -- implement Time_signature
   
   source file of the GNU LilyPond music typesetter
   
@@ -16,8 +16,16 @@
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 
+
+/*
+  TODO:
+
+  this file should go ; The formatting can completely be done with
+  markups.
+  
+ */
+
 MAKE_SCHEME_CALLBACK (Time_signature, brew_molecule, 1);
-/* TODO: make different functions for special and normal timesigs. */
 SCM
 Time_signature::brew_molecule (SCM smob) 
 {