* lily/scaled-font-metric.cc (design_size): add function.
* lily/font-metric.cc (LY_DEFINE): opps ly:font-design-size is only
partial cut&paste of ly:font-magnification.
+2004-04-05 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * scm/output-ps.scm (define-fonts): fix scaling.
+
+ * lily/scaled-font-metric.cc (design_size): add function.
+
+ * lily/font-metric.cc (LY_DEFINE): opps ly:font-design-size is only
+ partial cut&paste of ly:font-magnification.
+
2004-04-05 Jan Nieuwenhuizen <janneke@gnu.org>
* scm/output-ps.scm (define-fonts):
2004-04-05 Jan Nieuwenhuizen <janneke@gnu.org>
* scm/output-ps.scm (define-fonts):
- * po/nl.po: new po file.
* mf/feta-beugel.mf: document why design size is not fixed.
* mf/feta-beugel.mf: document why design size is not fixed.
{
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
{
Font_metric *fm = unsmob_metrics (font);
SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
- return gh_cdr (fm->description_);
+ return gh_double2scm (fm->design_size ());
virtual Offset get_indexed_wxwy (int) const;
virtual int name_to_index (String) const;
protected:
virtual Offset get_indexed_wxwy (int) const;
virtual int name_to_index (String) const;
protected:
+ virtual Real design_size () const;
virtual Box get_indexed_char (int)const;
virtual Box get_ascii_char (int)const;
Font_metric *orig_;
virtual Box get_indexed_char (int)const;
virtual Box get_ascii_char (int)const;
Font_metric *orig_;
return sfm->self_scm ();
}
return sfm->self_scm ();
}
+Real
+Scaled_font_metric::design_size () const
+{
+ return orig_->design_size ();
+}
+
Stencil
Scaled_font_metric::find_by_name (String s) const
{
Stencil
Scaled_font_metric::find_by_name (String s) const
{
int
Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
{
int
Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
{
- Spring_smob *ss = unsmob_spring (s);
scm_puts ("#<Spring smob>", p);
return 1;
}
scm_puts ("#<Spring smob>", p);
return 1;
}
(else fontname)))
(define (font-load-command paper font)
(else fontname)))
(define (font-load-command paper font)
-
-;; fontname "feta20"
-;; command "magfontGNMWomXVo"
-;; mangled "GNU-LilyPond-feta-20"
-;; designsize 0.569055118110236
-;; foo-design 20
-;; magnification 0.569055118110236
-;; ops 1.75729901757299
-;; scaling 20.0
-
-;; fontname "cmr8"
-;; command "magfontUIJQomTVo"
-;; mangled "cmr8.pfb"
-;; designsize 0.564574183197548
-;; foo-design 8
-;; magnification 0.564574183197548
-;; ops 1.75729901757299
-;; scaling 7.87450656184296
-
(let* ((command (font-command font))
(fontname (ly:font-name font))
(mangled (possibly-mangle-fontname fontname))
(encoding (assoc-get fontname font-encoding-alist))
(designsize (ly:font-design-size font))
(magnification (* (ly:font-magnification font)))
(let* ((command (font-command font))
(fontname (ly:font-name font))
(mangled (possibly-mangle-fontname fontname))
(encoding (assoc-get fontname font-encoding-alist))
(designsize (ly:font-design-size font))
(magnification (* (ly:font-magnification font)))
- (foo-design (fontname->designsize fontname))
(ops (ly:paper-lookup paper 'outputscale))
(ops (ly:paper-lookup paper 'outputscale))
- ;; FIXME this magic is about right ...
- (scaling (* ops ops magnification designsize foo-design)))
+ (scaling (* ops magnification designsize)) )