Don't ignore padding for markup blocks

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

diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index bcb034174e6561ee1e7e840fe948bb303dffb3c6..aa49a29e23ee333607ae290880c0f69165469579 100644 (file)
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -3,11 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 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",
@@ -18,8 +20,8 @@ LY_DEFINE (ly_font_get_glyph, "ly:font-get-glyph",
           "is not available, return @code{#f}.")
 {
   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");
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_string, name, 2);
 
   Stencil m = fm->find_by_name (ly_scm2string (name));
 
@@ -34,8 +36,8 @@ LY_DEFINE (ly_get_glyph, "ly:get-glyph",
           "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");
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_number, index,2);
 
   return fm->get_ascii_char_stencil (scm_to_int (index)).smobbed_copy ();
 }
@@ -46,8 +48,8 @@ LY_DEFINE (ly_font_glyph_name_to_index, "ly:font-glyph-name-to-index",
           "Return the index for @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");
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_string, name, 2);
 
   return scm_from_int (fm->name_to_index (ly_scm2string (name)));
 }
@@ -58,8 +60,8 @@ LY_DEFINE (ly_font_index_to_charcode, "ly:font-index-to-charcode",
           "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");
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_integer, index, 2);
 
   return scm_from_unsigned_integer (fm->index_to_charcode (scm_to_int (index)));
 }
@@ -70,13 +72,10 @@ LY_DEFINE (ly_font_glyph_name_to_charcode, "ly:font-glyph-name-to-charcode",
           "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
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_string, name, 2);
+
   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",
@@ -90,22 +89,29 @@ LY_DEFINE (ly_text_dimension, "ly:text-dimension",
   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");
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+  LY_ASSERT_TYPE (scm_is_string, text, 2);
   Stencil stc (fm->text_stencil (ly_scm2string (text)));
   return scm_cons (ly_interval2scm (stc.extent (X_AXIS)),
                   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),
           "Given the font metric @var{font}, "
           "return the corresponding file name.")
 {
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+
   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",
@@ -114,19 +120,20 @@ LY_DEFINE (ly_font_name, "ly:font-name",
           "Given the font metric @var{font}, "
           "return the corresponding name.")
 {
+  LY_ASSERT_SMOB (Font_metric, font, 1);
   Font_metric *fm = unsmob_metrics (font);
 
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
-  return scm_makfrom0str (fm->font_name ().c_str ());
+  return ly_string2scm (fm->font_name ());
 }
 
 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 outputs-cale.")
+          "magnification, relative to the current output-scale.")
 {
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return scm_cdr (fm->description_);
 }
 
@@ -135,8 +142,9 @@ LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
           "Given the font metric @var{font}, return the "
           "design size, relative to the current output-scale.")
 {
+  LY_ASSERT_SMOB (Font_metric, font, 1);
+
   Font_metric *fm = unsmob_metrics (font);
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
   return scm_from_double (fm->design_size ());
 }