+2004-03-21 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * buildscripts/mf-to-table.py (base): use %d for TfmCheckSum
+
+ * stepmake/stepmake/generic-targets.make: rewrite hack so no
+ warning is issued about dummy.dep.
+
+ * scm/new-font.scm: fix design sizes of nummer
+
2004-03-21 Werner Lemberg <wl@gnu.org>
* stepmake/bin/install-sh: Updated (from gnulib). This removes
shift = 24
cs = 0
for b in cs_bytes:
- cs = cs + (ord (b) << shift)
+ cs = cs + (long (ord (b)) << shift)
shift = shift - 8
return cs
afm = open (afmfile_nm, 'w')
write_afm_header (afm)
- afm.write ("Comment TfmCheckSum %u\n" % cs)
+ afm.write ("Comment TfmCheckSum %d\n" % cs)
write_afm_metric (afm, g, m)
write_tex_defs (open (texfile_nm, 'w'), g, m)
#include "ly-smobs.icc"
#include "score-context.hh"
+#include "performer.hh"
+#include "engraver.hh"
+
int
Context_def::print_smob (SCM smob, SCM port, scm_print_state*)
{
}
+SCM
+filter_performers (SCM l)
+{
+ for (SCM *tail = &l; gh_pair_p (*tail); tail = SCM_CDRLOC (tail))
+ {
+ if (dynamic_cast<Performer*> (unsmob_translator (gh_car (*tail))))
+ {
+ *tail = gh_cdr (*tail);
+ }
+ }
+ return l;
+}
+
+
+SCM
+filter_engravers (SCM l)
+{
+ for (SCM *tail = &l; gh_pair_p (*tail) ; tail = SCM_CDRLOC (tail))
+ {
+ if (dynamic_cast<Engraver*> (unsmob_translator (gh_car (*tail))))
+ {
+ *tail = gh_cdr (*tail);
+ }
+ }
+ return l;
+}
+
+
Context *
Context_def::instantiate (SCM ops)
{
g->simple_trans_list_ = names_to_translators (trans_names, tg);
tg->implementation_ = g->self_scm ();
+ if (dynamic_cast<Engraver*> (g))
+ g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
+ else if (dynamic_cast<Performer*> (g))
+ g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
+
g->daddy_context_ = tg;
tg->aliases_ = context_aliases_ ;
staff
time-signature custos)
(instrument-name left-edge ambitus breathing-sign
- clef key-signature staff-bar
+ clef staff-bar key-signature
time-signature custos)
))
+++ /dev/null
-;;;; font.scm -- implement Font stuff
-;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
-(define-public (magstep x)
- (exp (* (/ x 6) (log 2))))
-
-;; Should separate default sizes
-;; into separate list/alist ?
-
-;; FIXME docstring for paper20-font-vector
- """ Entries have the following format
-
- ( #(SERIES SHAPE FAMILY) .
- (DEFAULT-SIZE . #(SIZE-FONT-ENTRY... ) ))
-
-where SIZE-FONT-ENTRY is
-
- (DESIGN-SIZE FONT-NAME)
-
-or
-
- (DESIGN-SIZE (FONT-NAME1 FONT-NAME2 ... ))"""
-
-(define-public paper20-font-vector
- '((#(medium upright number) .
- (10 . #((4.0 . "feta-nummer4")
- (6.0 . "feta-nummer6")
- (8.0 . "feta-nummer8")
- (10.0 . "feta-nummer10")
- (12.0 . "feta-nummer12")
- (16.0 . "feta-nummer16"))))
- (#(medium upright roman) .
- (10.0 . #((6.0 . "cmr6")
- (8.0 . "cmr8")
- (10.0 . "cmr10")
- (17.0 . "cmr17")
- )))
- (#(* * music).
- (20.0 . #((11.22 . ("feta11" "parmesan11"))
- (12.60 . ("feta13" "parmesan13"))
- (14.14 . ("feta14" "parmesan14"))
- (15.87 . ("feta16" "parmesan16"))
- (17.82 . ("feta18" "parmesan18"))
- (20.0 . ("feta20" "parmesan20"))
- (22.45 . ("feta23" "parmesan23"))
- (25.20 . ("feta26" "parmesan26"))
- )))
- (#(medium upright sans) .
- (10.0 . #((8.0 . "cmss8")
- (10.0 . "cmss10")
- (12.0 . "cmss12")
- (17.0 . "cmss17")
- )))
- (#(medium upright typewriter) .
- (10.0 . #((8.0 . "cmtt8")
- (10.0 . "cmtt10")
- (12.0 . "cmtt12")
- )))
- (#(bold italic roman) .
- (10.0 . #((8.0 . "cmbxti8")
- (10.0 . "cmbxti10")
- (14.0 . "cmbxti14")
- )))
- (#(medium italic roman) .
- (10.0 . #((7.0 . "cmti7")
- (10.0 . "cmti10")
- (12.0 . "cmti12")
- )))
- (#(bold upright roman) .
- (10.0 . #((6.0 . "cmbx6")
- (8.0 . "cmbx8")
- (10.0 . "cmbx10")
- (12.0 . "cmbx12")
- )))
- (#(bold-narrow upright roman) .
- (10.0 . #((10.0 . "cmb10")
- )))
- (#(medium caps roman) .
- (10.0 . #((10.0 . "cmcsc10"))))
- (#(* * dynamic) .
- (14.0 . #((6.0 . "feta-din6")
- (8.0 . "feta-din8")
- (10.0 . "feta-din10")
- (12.0 . "feta-din12")
- (14.0 . "feta-din14")
- (17.0 . "feta-din17")
- )))
- (#(* * math) .
- (10.0 . #((10.0 . "msam10"))))
- ;; testing ps-encoding
- (#(medium latin1 roman) .
- (10.0 . #((12.0 . "ecrm12"))))
- (#(bold latin1 roman) .
- (10.0 . #((14.0 . "ecbm14"))))))
-
-(define (scale-font-entry entry factor)
- (cons
- (car entry)
- (cons (* (cadr entry) factor)
- (cddr entry))))
-
-(define size-independent-fonts
- '((#(* * braces) .
- (10 . #((10.0 . ("feta-braces00"
- "feta-braces10"
- "feta-braces20"
- "feta-braces30"
- "feta-braces40"
- "feta-braces50"
- "feta-braces60"
- "feta-braces70"
- "feta-braces80")))))))
-
-(define-public (scale-font-list factor)
- (append size-independent-fonts
- (map (lambda (y) (scale-font-entry y factor)) paper20-font-vector)))
-
-
"beam.scm"
"clef.scm"
"slur.scm"
-; "font.scm"
- "new-font.scm"
+ "font.scm"
"define-markup-commands.scm"
"define-grob-properties.scm"
;;
;; should dump tree to .texi as internal documentation
;;
-
+;; * should extract design sizes from fonts.
(define font-tree-record
(make-record-type
def) alist-chain)))
)
font))
- (else node))
- )
+ (else node)))
(define-public (make-font-tree factor)
(let*
(list (cons 'font-encoding (car x)))
(cons (* factor (cadr x))
(caddr x))))
- '((number 10 #((4.0 . "feta-nummer4")
- (6.0 . "feta-nummer6")
- (8.0 . "feta-nummer8")
- (10.0 . "feta-nummer10")
- (12.0 . "feta-nummer12")
- (16.0 . "feta-nummer16")))
+ '((number 10
+ #((3.82 . "feta-nummer4")
+ (5.5 . "feta-nummer6")
+ (8.0 . "feta-nummer8")
+ (10.0 . "feta-nummer10")
+ (12.0 . "feta-nummer12")
+ (16.0 . "feta-nummer16")))
(dynamic 14.0 #((6.0 . "feta-din6")
(8.0 . "feta-din8")
(10.0 . "feta-din10")
(25.20 . ("feta26" "parmesan26"))
))
(braces 10 #((10.0 . ("feta-braces00"
- "feta-braces10"
- "feta-braces20"
- "feta-braces30"
- "feta-braces40"
- "feta-braces50"
- "feta-braces60"
- "feta-braces70"
- "feta-braces80"))
- ))))
+ "feta-braces10"
+ "feta-braces20"
+ "feta-braces30"
+ "feta-braces40"
+ "feta-braces50"
+ "feta-braces60"
+ "feta-braces70"
+ "feta-braces80"))
+ ))))
(for-each
(lambda (x)
(font-family . ,(vector-ref (car x) 0)))
(cons (* factor (cadr x))
(cddr x))
- ))
+ ))
'((#(roman upright medium) .
(10.0 . #((6.0 . "cmr6")
(8.0 . "cmr8")
$(foreach i, $(EXTRA_DOC_FILES),\
cp -r $(i) $(prefix)/doc/$(package) &&) true
-include $(outdir)/dummy.dep $(DEP_FILES) # expect a warning here
-
-$(outdir)/dummy.dep:
- -mkdir -p $(outdir)
- touch $(outdir)/dummy.dep
+# force $(outdir) and dummy.dep into existence
+ifeq ($(strip $(wildcard $(outdir)/dummy.dep)),)
+unused-var:=$(shell mkdir -p $(outdir); touch $(outdir)/dummy.dep)
+endif
+include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep)
check: local-check
$(LOOP)
makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
-DEP_FILES := $(wildcard $(outdir)/*.dep)
-
IN_FILES := $(wildcard *.in)
SOURCE_FILES += $(IN_FILES)
projects / lilypond.git / commitdiff