/*
- scaled-font-metric.cc -- declare Modified_font_metric
+ modified-font-metric.cc -- declare Modified_font_metric
source file of the GNU LilyPond music typesetter
(c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+*/
#include <ctype.h>
#include "warn.hh"
-#include "scaled-font-metric.hh"
+#include "modified-font-metric.hh"
#include "string.hh"
#include "stencil.hh"
-Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real magn)
+Modified_font_metric::Modified_font_metric (String input_encoding,
+ Font_metric *m, Real magn)
{
+ /* UGR, FIXME:
+
+ THIS.coding_scheme == input encoding.
+ ORIG.coding_scheme () == font_encoding.
+
+ encoding is hairy enough by itself, should fix treacherous naming. */
+
+ coding_scheme_ = input_encoding;
+
coding_vector_ = SCM_EOL;
coding_mapping_ = SCM_EOL;
coding_table_ = SCM_EOL;
coding_description_ = SCM_EOL;
- coding_scheme_ = coding;
magnification_ = magn;
SCM desc = m->description_;
- Real total_mag = magn * ly_scm2double (ly_cdr (desc));
+ Real total_mag = magn * scm_to_double (scm_cdr (desc));
assert (total_mag);
- description_ = scm_cons (ly_car (desc), scm_make_real (total_mag));
+ description_ = scm_cons (scm_car (desc), scm_make_real (total_mag));
orig_ = m;
-
- if (coding_scheme_ != "TeX"
+
+ if (coding_scheme_ != ""
+ && coding_scheme_ != "TeX"
&& coding_scheme_ != "ASCII"
&& coding_scheme_ != orig_->coding_scheme ())
{
- coding_vector_ = scm_call_1 (ly_scheme_function ("get-coding-vector"),
- scm_makfrom0str (coding_scheme_.to_str0 ()));
+ coding_vector_
+ = scm_call_1 (ly_scheme_function ("get-coding-vector"),
+ scm_makfrom0str (coding_scheme_.to_str0 ()));
if (!ly_c_vector_p (coding_vector_))
{
coding_vector_ = scm_c_make_vector (256, ly_symbol2scm (".notdef"));
}
-
- coding_table_ = scm_call_1 (ly_scheme_function ("get-coding-table"),
- scm_makfrom0str (orig_->coding_scheme ().to_str0 ()));
-
- coding_mapping_ = scm_call_2 (ly_scheme_function ("make-encoding-mapping"),
- coding_vector_,
- coding_table_);
-
- coding_description_= SCM_EOL;
-
- coding_description_ = scm_acons (ly_symbol2scm ("input-name"),
- scm_makfrom0str (coding_scheme_.to_str0 ()),
- coding_description_);
-
- coding_description_ = scm_acons (ly_symbol2scm ("input-vector"),
- coding_vector_, coding_description_);
- coding_description_ = scm_acons (ly_symbol2scm ("output-name"),
- scm_makfrom0str (orig_->coding_scheme ().to_str0 ()),
- coding_description_);
- coding_description_ = scm_acons (ly_symbol2scm ("output-table"),
- coding_table_,
- coding_description_);
-
- coding_description_ = scm_acons (ly_symbol2scm ("char-mapping"),
- coding_mapping_,
- coding_description_);
+ coding_table_
+ = scm_call_1 (ly_scheme_function ("get-coding-table"),
+ scm_makfrom0str (orig_->coding_scheme ().to_str0 ()));
+
+ coding_mapping_
+ = scm_call_2 (ly_scheme_function ("make-encoding-mapping"),
+ coding_vector_,
+ coding_table_);
+
+ coding_description_ = SCM_EOL;
+ coding_description_
+ = scm_acons (ly_symbol2scm ("input-name"),
+ scm_makfrom0str (coding_scheme_.to_str0 ()),
+ coding_description_);
+ coding_description_
+ = scm_acons (ly_symbol2scm ("input-vector"),
+ coding_vector_, coding_description_);
+ coding_description_
+ = scm_acons (ly_symbol2scm ("output-name"),
+ scm_makfrom0str (orig_->coding_scheme ().to_str0 ()),
+ coding_description_);
+ coding_description_
+ = scm_acons (ly_symbol2scm ("output-table"),
+ coding_table_,
+ coding_description_);
+ coding_description_
+ = scm_acons (ly_symbol2scm ("char-mapping"),
+ coding_mapping_,
+ coding_description_);
}
}
}
SCM
-Modified_font_metric::make_scaled_font_metric (SCM coding, Font_metric *m, Real s)
+Modified_font_metric::make_scaled_font_metric (SCM coding,
+ Font_metric *m, Real s)
{
/*
- UGOHR.
+ UGH.
*/
- if (ly_c_symbol_p (coding))
+ if (scm_is_symbol (coding))
coding = scm_symbol_to_string (coding);
- String scheme = ly_scm2string (coding);
+ String scheme = scm_is_string (coding) ? ly_scm2string (coding) : "";
Modified_font_metric *sfm = new Modified_font_metric (scheme, m, s);
scm_gc_mark (coding_mapping_);
}
+/* TODO: put this klutchness behind ly:option switch. */
Box
Modified_font_metric::tex_kludge (String text) const
{
Interval ydims;
- Real w=0.0;
-
- /*
- TODO: put this klutchness behind ly:option switch.
- */
+ Real w = 0;
for (int i = 0; i < text.length (); i++)
{
switch (text[i])
{
case '\\':
- // accent marks use width of base letter
+ /* 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]=='^')
+ if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"'
+ || text[i+1]=='^')
{
i++;
break;
}
- // for string width \\ is a \ and \_ is a _.
+ /* 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++)
;
- // ugh.
- i--; // Compensate for the increment in the outer loop!
+ /* 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]);
- // Ugh, use the width of 'x' for unknown characters
+ /* Use the width of 'x' for unknown characters */
if (b[X_AXIS].length () == 0)
b = get_ascii_char ((unsigned char)'x');
{
Box b;
if (coding_scheme_ == "TeX")
- {
- b = tex_kludge (text);
- }
+ b = tex_kludge (text);
else if (coding_scheme_ == "ASCII"
+ || coding_scheme_ == ""
|| coding_scheme_ == orig_->coding_scheme ())
{
Interval ydims;
for (int i = 0; i < text.length (); i++)
{
SCM sym = scm_vector_ref (coding_vector_,
- SCM_MAKINUM((unsigned char) text[i]));
+ scm_from_int((unsigned char) text[i]));
Box char_box;
- if (!ly_c_symbol_p (sym))
+ if (!scm_is_symbol (sym))
continue;
- char const * chars = SCM_SYMBOL_CHARS(sym);
+ char const * chars = scm_i_string_chars (scm_symbol_to_string(sym));
int idx = orig_->name_to_index (chars);
if (idx >= 0)
- {
- char_box = orig_->get_indexed_char (idx);
- }
+ char_box = orig_->get_indexed_char (idx);
char_box.scale (magnification_);
if (!char_box[X_AXIS].is_empty ())
- w += char_box[X_AXIS][RIGHT]; // length ?
+ /* length ? */
+ w += char_box[X_AXIS][RIGHT];
ydims.unite (char_box[Y_AXIS]);
}
if (ydims.is_empty ())
ydims = Interval (0, 0);
-
b = Box (Interval (0, w), ydims);
}
projects / lilypond.git / blobdiff