From 628042b4a0d2c3a12c54f2684e417f4cfe95af72 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 21 Mar 2004 14:39:46 +0000 Subject: [PATCH] * 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 --- ChangeLog | 9 ++ buildscripts/mf-to-table.py | 4 +- lily/context-def.cc | 36 ++++++++ scm/define-grobs.scm | 2 +- scm/font.scm | 122 ------------------------- scm/lily.scm | 3 +- scm/new-font.scm | 38 ++++---- stepmake/stepmake/generic-targets.make | 10 +- stepmake/stepmake/generic-vars.make | 2 - 9 files changed, 73 insertions(+), 153 deletions(-) delete mode 100644 scm/font.scm diff --git a/ChangeLog b/ChangeLog index ad148eb039..41116182ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-03-21 Han-Wen Nienhuys + + * 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 * stepmake/bin/install-sh: Updated (from gnulib). This removes diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index 58f0ebe103..1818062972 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -52,7 +52,7 @@ def tfm_checksum (fn): 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 @@ -277,7 +277,7 @@ for filenm in files: 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) diff --git a/lily/context-def.cc b/lily/context-def.cc index fe7924f234..eded15dd5f 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -20,6 +20,9 @@ #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*) { @@ -259,6 +262,34 @@ Context_def::get_translator_names (SCM user_mod) const } +SCM +filter_performers (SCM l) +{ + for (SCM *tail = &l; gh_pair_p (*tail); tail = SCM_CDRLOC (tail)) + { + if (dynamic_cast (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 (unsmob_translator (gh_car (*tail)))) + { + *tail = gh_cdr (*tail); + } + } + return l; +} + + Context * Context_def::instantiate (SCM ops) { @@ -278,6 +309,11 @@ Context_def::instantiate (SCM ops) g->simple_trans_list_ = names_to_translators (trans_names, tg); tg->implementation_ = g->self_scm (); + if (dynamic_cast (g)) + g->simple_trans_list_ = filter_performers (g->simple_trans_list_); + else if (dynamic_cast (g)) + g->simple_trans_list_ = filter_engravers (g->simple_trans_list_); + g->daddy_context_ = tg; tg->aliases_ = context_aliases_ ; diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 5b9f029167..683f28fc65 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -197,7 +197,7 @@ staff time-signature custos) (instrument-name left-edge ambitus breathing-sign - clef key-signature staff-bar + clef staff-bar key-signature time-signature custos) )) diff --git a/scm/font.scm b/scm/font.scm deleted file mode 100644 index 6e9d409c05..0000000000 --- a/scm/font.scm +++ /dev/null @@ -1,122 +0,0 @@ -;;;; font.scm -- implement Font stuff -;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2000--2004 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys - -(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))) - - diff --git a/scm/lily.scm b/scm/lily.scm index 29c6f8d07d..1cd2fc684b 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -436,8 +436,7 @@ L1 is copied, L2 not. "beam.scm" "clef.scm" "slur.scm" -; "font.scm" - "new-font.scm" + "font.scm" "define-markup-commands.scm" "define-grob-properties.scm" diff --git a/scm/new-font.scm b/scm/new-font.scm index cf8470cae0..15c48da40e 100644 --- a/scm/new-font.scm +++ b/scm/new-font.scm @@ -7,7 +7,7 @@ ;; ;; should dump tree to .texi as internal documentation ;; - +;; * should extract design sizes from fonts. (define font-tree-record (make-record-type @@ -123,8 +123,7 @@ def) alist-chain))) ) font)) - (else node)) - ) + (else node))) (define-public (make-font-tree factor) (let* @@ -137,12 +136,13 @@ (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") @@ -162,15 +162,15 @@ (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) @@ -182,7 +182,7 @@ (font-family . ,(vector-ref (car x) 0))) (cons (* factor (cadr x)) (cddr x)) - )) + )) '((#(roman upright medium) . (10.0 . #((6.0 . "cmr6") (8.0 . "cmr8") diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index deb74de3db..3f81f31449 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -139,12 +139,12 @@ installextradoc: $(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) diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index 01f32a6256..e35a064f43 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -101,8 +101,6 @@ CTAGS_FLAGS = makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%)))) -DEP_FILES := $(wildcard $(outdir)/*.dep) - IN_FILES := $(wildcard *.in) SOURCE_FILES += $(IN_FILES) -- 2.39.5