X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=3c29320258d3cc6ac26dea45d9736cf6ff4a658e;hb=f0968255554403de5d86b7e6efff5e644cba7f7a;hp=11f63489e8913c59b32bab6fa37b6a94a0c8cb8c;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 11f63489e8..3c29320258 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -1,88 +1,63 @@
 /*   
-  font-metric.cc --  implement Font_metric
+  font-metric.cc -- implement Font_metric
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
     Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
- */
+*/
+
+#include "font-metric.hh"
 
 #include <math.h>
-#include <ctype.h>
+#include <cctype>
 
+#include "modified-font-metric.hh"
+#include "open-type-font.hh"
+#include "stencil.hh"
+#include "virtual-methods.hh"
 #include "warn.hh"
-#include "molecule.hh"
+
 #include "ly-smobs.icc"
-#include "font-metric.hh"
-#include "string.hh"
 
-Box
-Font_metric::text_dimension (String text) const
+Real
+Font_metric::design_size () const
 {
-  Interval ydims;
-  Real w=0.0;
-  
-  for (int i = 0; i < text.length_i (); i++) 
-    {
-      
-      switch (text[i]) 
-	{
-	case '\\':
-  // accent marks use width of base letter
-         if (i +1 < text.length_i ())
-	   {
-	     if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' ||
-		 text[i+1]=='^')
-	       {
-		 i++;
-		 break;
-	       }
-	     // for string width \\ is a \ and \_ is a _.
-	     if (text[i+1]=='\\' || text[i+1]=='_')        
-	       {
-		 break;
-	       }
-	   }
-	  
-	  for (i++; (i < text.length_i ()) && !isspace (text[i]) 
-		 && text[i]!='{' && text[i]!='}'; i++)
-	    ;
-	  // ugh.
-	  i--; // Compensate for the increment in the outer loop!
-	  break;
-	case '{':  // Skip '{' and '}'
-	case '}':
-	  break;
-	
-	default: 
-	  Box b = get_char ((unsigned char)text[i]);
-	  
-	  // Ugh, use the width of 'x' for unknown characters
-	  if (b[X_AXIS].length () == 0) 
-	    b = get_char ((unsigned char)'x');
-	  
-	  w += b[X_AXIS].length ();
-	  ydims.unite (b[Y_AXIS]);
-	  break;
-	}
-    }
-  if (ydims.empty_b ())
-    ydims = Interval (0,0);
-
-  return Box (Interval (0, w), ydims);
+  return 1.0;
 }
 
+String
+Font_metric::coding_scheme () const
+{
+  return "FontSpecific";
+}
 
-
-Font_metric::~Font_metric ()
+Stencil
+Font_metric::find_by_name (String s) const
 {
+  s.substitute_char ('-', "M");
+  int idx = name_to_index (s);
+  Box b;
+  
+  SCM expr = SCM_EOL;
+  if (idx >= 0)
+    {
+      expr = scm_list_3 (ly_symbol2scm ("named-glyph"),
+			 self_scm (),
+			 scm_makfrom0str (s.to_str0 ())
+			 );
+      b = get_indexed_char (idx);
+    }
+  
+  Stencil q (b, expr);
+  return q;
 }
 
 Font_metric::Font_metric ()
 {
   description_ = SCM_EOL;
-
+  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
@@ -90,6 +65,11 @@ Font_metric::Font_metric (Font_metric const &)
 {
 }
 
+
+Font_metric::~Font_metric ()
+{
+}
+
 int
 Font_metric::count () const
 {
@@ -97,16 +77,39 @@ Font_metric::count () const
 }
 
 Box 
-Font_metric::get_char (int)const
+Font_metric::get_ascii_char (int) const
 {
-  return Box (Interval (0,0),Interval (0,0));
+  return Box (Interval (0, 0), Interval (0, 0));
 }
 
+Box 
+Font_metric::get_indexed_char (int k) const
+{
+  return get_ascii_char (k);
+}
+
+int
+Font_metric::name_to_index (String) const
+{
+  return -1;
+}
+
+Offset
+Font_metric::get_indexed_wxwy (int) const
+{
+  return Offset (0, 0);
+}
+
+void
+Font_metric::derived_mark () const
+{
+}
 
 SCM
 Font_metric::mark_smob (SCM s)
 {
-  Font_metric * m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  Font_metric *m = (Font_metric*) SCM_CELL_WORD_1 (s);
+  m->derived_mark ();
   return m->description_;
 }
 
@@ -114,7 +117,9 @@ int
 Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 {
   Font_metric *m = unsmob_metrics (s);
-  scm_puts ("#<Font_metric ", port);
+  scm_puts ("#<", port);
+  scm_puts (classname (m), port);
+  scm_puts (" ", port);
   scm_write (m->description_, port);
   scm_puts (">", port);
   return 1;
@@ -124,35 +129,201 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state *)
 
 IMPLEMENT_SMOBS (Font_metric);
 IMPLEMENT_DEFAULT_EQUAL_P (Font_metric);
-IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
+IMPLEMENT_TYPE_P (Font_metric, "ly:font-metric?");
 
-Molecule
-Font_metric::find_by_name (String) const
+
+LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
+	   2, 0, 0,
+	  (SCM font, SCM name),
+	   "Return a Stencil from @var{font} for the glyph named @var{name}.  "
+	   "@var{font} must be available as an AFM file.  If the glyph "
+	   "is not available, return @code{#f}.")
 {
-  Molecule m ;
-  return m;
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+
+  Stencil m = fm->find_by_name (ly_scm2string (name));
+
+  /* TODO: make optional argument for default if not found.  */
+  return m.smobbed_copy ();
 }
 
+LY_DEFINE (ly_get_glyph, "ly:get-glyph",
+	   2, 0, 0,
+	  (SCM font, SCM index),
+	   "Retrieve a Stencil for the glyph numbered @var{index} "
+	   "in @var{font}.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE (scm_is_number (index), index, SCM_ARG2, __FUNCTION__, "number");
 
-SCM
-ly_find_glyph_by_name (SCM font, SCM name)
+  return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy ();
+}
+
+LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
+	   2, 0, 0,
+	  (SCM font, SCM name),
+	   "Return the index for @var{name} in @var{font}.")
 {
-  if (!unsmob_metrics (font) || !gh_string_p (name))
-    {
-      warning ("ly-find-glyph-by-name: invalid argument.");
-      Molecule m;
-      return m.smobbed_copy ();
-    }
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+
+  return scm_from_int (fm->name_to_index (ly_scm2string (name)));
+}
 
-  return unsmob_metrics (font)->find_by_name (ly_scm2string (name)).smobbed_copy ();
+LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
+	   2, 0, 0,
+	  (SCM font, SCM index),
+	   "Return the character code for @var{index} @var{font}.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE (scm_is_integer (index), index, SCM_ARG2, __FUNCTION__, "index");
+
+  return scm_from_unsigned_integer (fm->index_to_charcode (scm_to_int (index)));
+}
+
+LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
+	   2, 0, 0,
+	  (SCM font, SCM name),
+	   "Return the character code for glyph @var{name} in @var{font}.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG2, __FUNCTION__, "string");
+#if 1
+  return scm_from_unsigned_integer (fm->index_to_charcode (fm->name_to_index (ly_scm2string (name))));
+#else
+  return scm_from_unsigned_integer (fm->glyph_name_to_charcode (ly_scm2string (name)));
+#endif
+}
+
+LY_DEFINE (ly_text_dimension, "ly:text-dimension",
+	   2, 0, 0,
+	  (SCM font, SCM text),
+	  "Given the font metric in @var{font} and the string @var{text}, "
+	   "compute the extents of that text in that font.  "
+	   "The return value is a pair of number-pairs.")
+{
+  Box b;
+  Modified_font_metric*fm = dynamic_cast<Modified_font_metric*>
+    (unsmob_metrics (font));
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "modified font metric");
+  SCM_ASSERT_TYPE (scm_is_string (text), text, SCM_ARG2, __FUNCTION__, "string");
+  
+  b = fm->text_dimension (ly_scm2string (text));
+  
+  return scm_cons (ly_interval2scm (b[X_AXIS]), ly_interval2scm (b[Y_AXIS]));
+}
+
+LY_DEFINE (ly_font_file_name, "ly:font-file-name",
+	   1, 0, 0,
+	   (SCM font),
+	   "Given the font metric @var{font}, "
+	   "return the corresponding file name.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  return scm_car (fm->description_);
+}
+
+
+#include "afm.hh"
+
+LY_DEFINE (ly_font_name, "ly:font-name",
+	   1, 0, 0,
+	   (SCM font),
+	   "Given the font metric @var{font}, "
+	   "return the corresponding name.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+      
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+
+  if (Modified_font_metric* mfm = dynamic_cast<Modified_font_metric*> (fm))
+    return ly_font_name (mfm->original_font ()->self_scm ());
+  else if (Adobe_font_metric* afm = dynamic_cast<Adobe_font_metric*> (fm))
+    return scm_makfrom0str (afm->font_info_->gfi->fontName);
+  return SCM_BOOL_F;
 }
 
+LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
+	  (SCM font),
+	   "Given the font metric @var{font}, return the "
+	   "magnification, relative to the current outputscale.")
+{
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  return scm_cdr (fm->description_);
+}
 
-static void
-font_metric_init ()
+LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
+	  (SCM font),
+	   "Given the font metric @var{font}, return the "
+	   "design size, relative to the current outputscale.")
 {
-   scm_c_define_gsubr ("ly-find-glyph-by-name", 2 , 0, 0,
-		       (Scheme_function_unknown) ly_find_glyph_by_name);
+  Font_metric *fm = unsmob_metrics (font);
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
+  return scm_make_real (fm->design_size ());
 }
 
-ADD_SCM_INIT_FUNC (font_metric_init, font_metric_init);
+
+
+int
+Font_metric::index_to_ascii (int i) const
+{
+  return i;
+}
+
+unsigned
+Font_metric::index_to_charcode (int i) const
+{
+  return (unsigned) index_to_ascii (i);
+}
+
+Stencil
+Font_metric::get_ascii_char_stencil (int code) const
+{
+  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (),
+		       scm_int2num (code));
+  Box b = get_ascii_char (code);
+  return Stencil (b, at);
+}
+
+Stencil
+Font_metric::get_indexed_char_stencil (int code) const
+{
+  int idx = index_to_ascii (code);
+  SCM at = scm_list_3 (ly_symbol2scm ("char"), self_scm (), scm_int2num (idx));
+  Box b = get_indexed_char (code);
+  return Stencil (b, at);
+}
+
+int
+/*Font_metric::*/
+get_encoded_index (Font_metric *m, String input_coding, int code)
+{
+  String font_coding = m->coding_scheme ();
+  if (font_coding == input_coding)
+    return code;
+  SCM s = scm_call_3 (ly_scheme_function ("encoded-index"),
+		      scm_makfrom0str (input_coding.to_str0 ()),
+		      scm_makfrom0str (font_coding.to_str0 ()),
+		      scm_int2num (code));
+  return scm_to_int (s);
+}
+
+Offset
+Font_metric::attachment_point (String) const
+{
+  return Offset (0, 0);
+}
+
+SCM
+Font_metric::sub_fonts () const
+{
+  return SCM_EOL;
+}