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

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

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index fa1d9be03b9683ad16661939756071f6f8fcba87..18edb7513a060344de7036c85cb641ae29376493 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "stencil.hh"
 #include "font-metric.hh"
+
+#include "warn.hh"
+#include "stencil.hh"
 #include "modified-font-metric.hh"
 
 LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
           2, 0, 0,
-         (SCM font, SCM name),
+          (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}.")
@@ -30,7 +31,7 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
 
 LY_DEFINE (ly_get_glyph, "ly:get-glyph",
           2, 0, 0,
-         (SCM font, SCM index),
+          (SCM font, SCM index),
           "Retrieve a Stencil for the glyph numbered @var{index} "
           "in @var{font}.")
 {
@@ -43,7 +44,7 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
 
 LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           2, 0, 0,
-         (SCM font, SCM name),
+          (SCM font, SCM name),
           "Return the index for @var{name} in @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
@@ -55,7 +56,7 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
 
 LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
           2, 0, 0,
-         (SCM font, SCM index),
+          (SCM font, SCM index),
           "Return the character code for @var{index} @var{font}.")
 {
   Font_metric *fm = unsmob_metrics (font);
@@ -67,30 +68,27 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
 
 LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           2, 0, 0,
-         (SCM font, SCM name),
+          (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}, "
+          (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*>
+  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");
   Stencil stc (fm->text_stencil (ly_scm2string (text)));
@@ -98,6 +96,10 @@ LY_DEFINE (ly_text_dimension, "ly:text-dimension",
                   ly_interval2scm (stc.extent (Y_AXIS)));
 }
 
+
+/*
+  TODO: when are non string retvals allowed?
+ */
 LY_DEFINE (ly_font_file_name, "ly:font-file-name",
           1, 0, 0,
           (SCM font),
@@ -106,9 +108,10 @@ LY_DEFINE (ly_font_file_name, "ly:font-file-name",
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return fm->font_file_name();
-}
+  SCM name = fm->font_file_name ();
 
+  return name;
+}
 
 LY_DEFINE (ly_font_name, "ly:font-name",
           1, 0, 0,
@@ -117,15 +120,15 @@ LY_DEFINE (ly_font_name, "ly:font-name",
           "return the corresponding name.")
 {
   Font_metric *fm = unsmob_metrics (font);
-      
+
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return scm_makfrom0str (fm->font_name().to_str0 ());
+  return ly_string2scm (fm->font_name ());
 }
 
 LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
-         (SCM font),
+          (SCM font),
           "Given the font metric @var{font}, return the "
-          "magnification, relative to the current outputscale.")
+          "magnification, relative to the current outputs-cale.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
@@ -133,12 +136,12 @@ LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
 }
 
 LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
-         (SCM font),
+          (SCM font),
           "Given the font metric @var{font}, return the "
-          "design size, relative to the current outputscale.")
+          "design size, relative to the current output-scale.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return scm_make_real (fm->design_size ());
+  return scm_from_double (fm->design_size ());
 }