2005-01-07 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * lily/general-scheme.cc: new file.
+
+ * lily/font-select.cc (get_font_by_design_size): retrieve
+ PangoFont for (designsize . "pango-descr") entries.
+
* lily/lily-parser-scheme.cc: new file.
* lily/output-def-scheme.cc: new file.
#include "output-def.hh"
#include "font-interface.hh"
#include "warn.hh"
+#include "pango-font.hh"
LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
(SCM paper_smob, SCM chain),
Real last_size = -1e6;
int i = 0;
+ String pango_description_string;
for (; i < n; i++)
{
SCM entry = SCM_VECTOR_REF (font_vector, i);
- Font_metric *fm = unsmob_metrics (scm_force (entry));
- size = fm->design_size ();
-
+
+ if (scm_promise_p (entry) == SCM_BOOL_T)
+ {
+ Font_metric *fm = unsmob_metrics (scm_force (entry));
+ size = fm->design_size ();
+ }
+#if HAVE_PANGO_FT2
+ else if (scm_is_pair (entry)
+ && scm_is_number (scm_car (entry))
+ && scm_is_string (scm_cdr (entry)))
+ {
+ size = scm_to_double (scm_car (entry));
+ pango_description_string
+ = ly_scm2string (scm_cdr (entry));
+ }
+#endif
+
if (size > requested)
break;
last_size = size;
size = last_size;
}
}
+
+ Font_metric *fm = 0;
+ if (pango_description_string != "")
+ {
+#if HAVE_PANGO_FT2
+ PangoFontDescription *description
+ = pango_font_description_from_string (pango_description_string.to_str0 ());
+ fm = all_fonts_global->find_pango_font (description);
+#else
+ error ("Trying to retrieve pango font without HAVE_PANGO_FT2.");
+#endif
+ }
+ else
+ {
+ fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector, i)));
+ }
- Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector,
- i)));
return find_scaled_font (layout, fm, requested / size);
}
--- /dev/null
+/*
+ lily-guile.cc -- implement assorted Guile bindings
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include <math.h> /* isinf */
+
+#include "lily-guile.hh"
+#include "string.hh"
+#include "misc.hh"
+#include "warn.hh"
+#include "version.hh"
+#include "dimensions.hh"
+#include "main.hh"
+
+/* MacOS S fix:
+ source-file.hh includes cmath which undefines isinf and isnan
+*/
+#ifdef __APPLE__
+inline int my_isinf (Real r) { return isinf (r); }
+inline int my_isnan (Real r) { return isnan (r); }
+#endif
+
+
+LY_DEFINE (ly_gulp_file, "ly:gulp-file",
+ 1, 0, 0, (SCM name),
+ "Read the file @var{name}, and return its contents in a string. "
+ "The file is looked up using the search path.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+ String contents = gulp_file_to_string (ly_scm2string (name), true);
+ return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
+}
+
+LY_DEFINE (ly_warn, "ly:warn",
+ 1, 0, 1, (SCM str, SCM rest),
+ "Scheme callable function to issue the warning @code{msg}. "
+ "The message is formatted with @code{format} and @code{rest}.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+ progress_indication ("\n");
+
+ str = scm_simple_format (SCM_BOOL_F, str, rest);
+ warning (ly_scm2string (str));
+ return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_programming_error, "ly:programming-error",
+ 1, 0, 1, (SCM str, SCM rest),
+ "Scheme callable function to issue the warning @code{msg}. "
+ "The message is formatted with @code{format} and @code{rest}.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+ progress_indication ("\n");
+
+ str = scm_simple_format (SCM_BOOL_F, str, rest);
+ programming_error (ly_scm2string (str));
+ return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_dir_p, "ly:dir?",
+ 1, 0, 0, (SCM s),
+ "type predicate. A direction is @code{-1}, @code{0} or "
+ "@code{1}, where @code{-1} represents "
+ "left or down and @code{1} represents right or up.")
+{
+ if (scm_is_number (s))
+ {
+ int i = scm_to_int (s);
+ return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
+ }
+ return SCM_BOOL_F;
+}
+
+LY_DEFINE (ly_assoc_get, "ly:assoc-get",
+ 2, 1, 0,
+ (SCM key, SCM alist, SCM default_value),
+ "Return value if KEY in ALIST, else DEFAULT-VALUE "
+ "(or #f if not specified).")
+{
+ SCM handle = scm_assoc (key, alist);
+
+ if (default_value == SCM_UNDEFINED)
+ default_value = SCM_BOOL_F;
+
+ if (scm_is_pair (handle))
+ return scm_cdr (handle);
+ else
+ return default_value;
+}
+
+
+LY_DEFINE (ly_number2string, "ly:number->string",
+ 1, 0, 0, (SCM s),
+ "Convert @var{num} to a string without generating many decimals.")
+{
+ SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number");
+
+ char str[400]; // ugh.
+
+ if (scm_exact_p (s) == SCM_BOOL_F)
+ {
+ Real r (scm_to_double (s));
+#ifdef __APPLE__
+ if (my_isinf (r) || my_isnan (r))
+#else
+ if (isinf (r) || isnan (r))
+#endif
+ {
+ programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
+ r = 0.0;
+ }
+
+ sprintf (str, "%08.4f", r);
+ }
+ else
+ sprintf (str, "%d", scm_to_int (s));
+
+ return scm_makfrom0str (str);
+}
+
+
+
+LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
+ "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
+{
+ char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
+
+ return scm_c_eval_string ((char*)vs);
+}
+
+LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
+ "Return the unit used for lengths as a string.")
+{
+ return scm_makfrom0str (INTERNAL_UNIT);
+}
+
+
+
+LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
+ "Return @var{d} is a number. Used to distinguish length "
+ "variables from normal numbers.")
+{
+ return scm_number_p (d);
+}
+
+/*
+ Debugging mem leaks:
+ */
+LY_DEFINE (ly_protects, "ly:protects",
+ 0, 0, 0, (),
+ "Return hash of protected objects.")
+{
+ return scm_protects;
+}
+
+LY_DEFINE (ly_gettext, "ly:gettext",
+ 1, 0, 0, (SCM string),
+ "Gettext wrapper.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1,
+ __FUNCTION__, "string");
+ return scm_makfrom0str (gettext (scm_i_string_chars (string)));
+}
+
+
+
+
+LY_DEFINE (ly_output_backend, "ly:output-backend",
+ 0, 0, 0, (),
+ "Return name of output backend.")
+{
+ return scm_makfrom0str (output_backend_global.to_str0 ());
+}
+
+
+LY_DEFINE (ly_output_formats, "ly:output-formats",
+ 0, 0, 0, (),
+ "Formats passed to --format as a list of strings, "
+ "used for the output.")
+{
+ Array<String> output_formats = split_string (output_format_global, ',');
+
+ SCM lst = SCM_EOL;
+ int output_formats_count = output_formats.size ();
+ for (int i = 0; i < output_formats_count; i ++)
+ lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
+
+ return lst;
+}
/*
- lily-guile.cc -- implement assorted guile functions
+ lily-guile.cc -- implement assorted SCM interface functions
source file of the GNU LilyPond music typesetter
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "lily-guile.hh"
#include <cstdio>
#include <cstdlib>
-#include <math.h> /* isinf */
#include <cstring> /* strdup, strchr */
#include <cctype>
-
#include <libintl.h> // gettext on macos x
#include "version.hh"
-
-/* MacOS S fix:
- source-file.hh includes cmath which undefines isinf and isnan
-*/
-#ifdef __APPLE__
-inline int my_isinf (Real r) { return isinf (r); }
-inline int my_isnan (Real r) { return isnan (r); }
-#endif
-
+#include "lily-guile.hh"
#include "libc-extension.hh"
#include "main.hh"
#include "file-path.hh"
return result;
}
-LY_DEFINE (ly_gulp_file, "ly:gulp-file",
- 1, 0, 0, (SCM name),
- "Read the file @var{name}, and return its contents in a string. "
- "The file is looked up using the search path.")
-{
- SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
- String contents = gulp_file_to_string (ly_scm2string (name), true);
- return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
-}
extern "C" {
return s;
}
-LY_DEFINE (ly_warn, "ly:warn",
- 1, 0, 1, (SCM str, SCM rest),
- "Scheme callable function to issue the warning @code{msg}. "
- "The message is formatted with @code{format} and @code{rest}.")
-{
- SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
- progress_indication ("\n");
-
- str = scm_simple_format (SCM_BOOL_F, str, rest);
- warning (ly_scm2string (str));
- return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE (ly_programming_error, "ly:programming-error",
- 1, 0, 1, (SCM str, SCM rest),
- "Scheme callable function to issue the warning @code{msg}. "
- "The message is formatted with @code{format} and @code{rest}.")
-{
- SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
- progress_indication ("\n");
-
- str = scm_simple_format (SCM_BOOL_F, str, rest);
- programming_error (ly_scm2string (str));
- return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE (ly_dir_p, "ly:dir?",
- 1, 0, 0, (SCM s),
- "type predicate. A direction is @code{-1}, @code{0} or "
- "@code{1}, where @code{-1} represents "
- "left or down and @code{1} represents right or up.")
-{
- if (scm_is_number (s))
- {
- int i = scm_to_int (s);
- return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
- }
- return SCM_BOOL_F;
-}
-
bool
is_number_pair (SCM p)
{
return false;
}
-LY_DEFINE (ly_assoc_get, "ly:assoc-get",
- 2, 1, 0,
- (SCM key, SCM alist, SCM default_value),
- "Return value if KEY in ALIST, else DEFAULT-VALUE "
- "(or #f if not specified).")
-{
- SCM handle = scm_assoc (key, alist);
-
- if (default_value == SCM_UNDEFINED)
- default_value = SCM_BOOL_F;
-
- if (scm_is_pair (handle))
- return scm_cdr (handle);
- else
- return default_value;
-}
-
bool
is_axis (SCM s)
{
scm_to_double (scm_cdr (s)));
}
-LY_DEFINE (ly_number2string, "ly:number->string",
- 1, 0, 0, (SCM s),
- "Convert @var{num} to a string without generating many decimals.")
-{
- SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number");
-
- char str[400]; // ugh.
-
- if (scm_exact_p (s) == SCM_BOOL_F)
- {
- Real r (scm_to_double (s));
-#ifdef __APPLE__
- if (my_isinf (r) || my_isnan (r))
-#else
- if (isinf (r) || isnan (r))
-#endif
- {
- programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
- r = 0.0;
- }
-
- sprintf (str, "%08.4f", r);
- }
- else
- sprintf (str, "%d", scm_to_int (s));
-
- return scm_makfrom0str (str);
-}
-
-
-
-LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
- "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
-{
- char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
-
- return scm_c_eval_string ((char*)vs);
-}
-
-LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
- "Return the unit used for lengths as a string.")
-{
- return scm_makfrom0str (INTERNAL_UNIT);
-}
-
-
-
-LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
- "Return @var{d} is a number. Used to distinguish length "
- "variables from normal numbers.")
-{
- return scm_number_p (d);
-}
-
SCM
ly_deep_copy (SCM src)
{
}
return tab;
}
-
-/*
- Debugging mem leaks:
- */
-LY_DEFINE (ly_protects, "ly:protects",
- 0, 0, 0, (),
- "Return hash of protected objects.")
-{
- return scm_protects;
-}
-
-LY_DEFINE (ly_gettext, "ly:gettext",
- 1, 0, 0, (SCM string),
- "Gettext wrapper.")
-{
- SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1,
- __FUNCTION__, "string");
- return scm_makfrom0str (gettext (scm_i_string_chars (string)));
-}
-
-
-
-
-LY_DEFINE (ly_output_backend, "ly:output-backend",
- 0, 0, 0, (),
- "Return name of output backend.")
-{
- return scm_makfrom0str (output_backend_global.to_str0 ());
-}
-
-
-LY_DEFINE (ly_output_formats, "ly:output-formats",
- 0, 0, 0, (),
- "Formats passed to --format as a list of strings, "
- "used for the output.")
-{
- Array<String> output_formats = split_string (output_format_global, ',');
-
- SCM lst = SCM_EOL;
- int output_formats_count = output_formats.size ();
- for (int i = 0; i < output_formats_count; i ++)
- lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
-
- return lst;
-}
(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "lily-guile.hh"
#include "warn.hh"
#include "main.hh"
#include "string.hh"
projects / lilypond.git / commitdiff