Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / modified-font-metric.cc

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 3001ed89f7023bac38f47f6473e21d0e99a6ed34..6972b44f926b95f6b9487ce3864aade4fb2f9cb6 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -3,17 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include <cctype>
+using namespace std;
 
 #include "modified-font-metric.hh"
 #include "pango-font.hh"
-#include "text-metrics.hh"
 #include "warn.hh"
 #include "stencil.hh"
-#include "lookup.hh"
 #include "main.hh"
+#include "program-option.hh"
 
 Modified_font_metric::Modified_font_metric (Font_metric *fm,
                                            Real magnification)
@@ -43,7 +43,7 @@ Modified_font_metric::design_size () const
 }
 
 Box
-Modified_font_metric::get_indexed_char (int i) const
+Modified_font_metric::get_indexed_char (vsize i) const
 {
   Box b = orig_->get_indexed_char (i);
   b.scale (magnification_);
@@ -51,47 +51,47 @@ Modified_font_metric::get_indexed_char (int i) const
 }
 
 Box
-Modified_font_metric::get_ascii_char (int i) const
+Modified_font_metric::get_ascii_char (vsize i) const
 {
   Box b = orig_->get_ascii_char (i);
   b.scale (magnification_);
   return b;
 }
 
-int
+vsize
 Modified_font_metric::count () const
 {
   return orig_->count ();
 }
 
 Offset
-Modified_font_metric::attachment_point (String s) const
+Modified_font_metric::attachment_point (string s) const
 {
   Offset o = orig_->attachment_point (s);
   return o * magnification_;
 }
 
 Offset
-Modified_font_metric::get_indexed_wxwy (int k) const
+Modified_font_metric::get_indexed_wxwy (vsize k) const
 {
   Offset o = orig_->get_indexed_wxwy (k);
   return o * magnification_;
 }
 
-int
-Modified_font_metric::name_to_index (String s) const
+vsize
+Modified_font_metric::name_to_index (string s) const
 {
   return orig_->name_to_index (s);
 }
 
-unsigned
-Modified_font_metric::index_to_charcode (int i) const
+vsize
+Modified_font_metric::index_to_charcode (vsize i) const
 {
   return orig_->index_to_charcode (i);
 }
 
-int
-Modified_font_metric::index_to_ascii (int k) const
+vsize
+Modified_font_metric::index_to_ascii (vsize k) const
 {
   return orig_->index_to_ascii (k);
 }
@@ -101,74 +101,18 @@ Modified_font_metric::derived_mark () const
 {
 }
 
-/* TODO: put this klutchness behind ly:option switch.  */
-Box
-Modified_font_metric::tex_kludge (String text) const
-{
-  Interval ydims;
-  Real w = 0;
-  for (int i = 0; i < text.length (); i++)
-    {
-      switch (text[i])
-       {
-       case '\\':
-         /* Accent marks use width of base letter */
-         if (i +1 < text.length ())
-           {
-             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 ()) && !isspace (text[i]) 
-                && text[i]!='{' && text[i]!='}'; i++)
-           ;
-         
-         /* Compensate for the auto-increment in the outer loop. */
-         i--;
-         break;
-
-       case '{':  // Skip '{' and '}'
-       case '}':
-         break;
-       
-       default: 
-         Box b = get_ascii_char ((unsigned char)text[i]);
-         
-         /* Use the width of 'x' for unknown characters */
-         if (b[X_AXIS].length () == 0)
-           b = get_ascii_char ((unsigned char)'x');
-         
-         w += b[X_AXIS].length ();
-         ydims.unite (b[Y_AXIS]);
-         break;
-       }
-    }
-  
-  if (ydims.is_empty ())
-    ydims = Interval (0, 0);
-  
-  return Box (Interval (0, w), ydims);
-}
-
 Stencil
-Modified_font_metric::text_stencil (String text) const
+Modified_font_metric::text_stencil (string text) const
 {
-  Box b; 
-  if (Pango_font * pf = dynamic_cast<Pango_font*> (orig_))
+  Box b;
+  if (Pango_font *pf = dynamic_cast<Pango_font *> (orig_))
     {
       Stencil stc = pf->text_stencil (text);
 
       Box b = stc.extent_box ();
 
       b.scale (magnification_);
-      Stencil scaled(b, stc.expr());
+      Stencil scaled (b, stc.expr ());
       return scaled;
     }
 
@@ -176,27 +120,13 @@ Modified_font_metric::text_stencil (String text) const
 }
 
 Box
-Modified_font_metric::text_dimension (String text) const
+Modified_font_metric::text_dimension (string text) const
 {
-  SCM stext = scm_makfrom0str (text.to_str0 ());
-  Box b = lookup_tex_text_dimension (orig_, stext);
-  if (!b[Y_AXIS].is_empty ())
-    {
-      b.scale (magnification_); 
-      return b;
-    }
-
-  if (output_backend_global == "tex")
-    {
-      b = tex_kludge (text);
-      return b;
-    }
-
+  Box b;
   Interval ydims;
-
   Real w = 0.0;
 
-  for (int i = 0; i < text.length (); i++)
+  for (ssize i = 0; i < text.length (); i++)
     {
       Box b = get_ascii_char ((unsigned char)text[i]);
 
@@ -222,7 +152,7 @@ Modified_font_metric::sub_fonts () const
   return orig_->sub_fonts ();
 }
 
-String
+string
 Modified_font_metric::font_name () const
 {
   return original_font ()->font_name ();