From: Jan Nieuwenhuizen Date: Thu, 13 Jan 2005 11:44:12 +0000 (+0000) Subject: * scm/auto-beam.scm (score-override-auto-beam-setting): New function. X-Git-Tag: release/2.5.14~271 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=acba025b51c3a086d9834e177c50aae3a1d8bc4f;p=lilypond.git * scm/auto-beam.scm (score-override-auto-beam-setting): New function. * lily/main.cc (setup_paths): Add cff. * mf/GNUmakefile (foe): Include actual target %.cff. (INSTALLATION_OUT_SUFFIXES): Install CFF and SVG fonts too. --- diff --git a/ChangeLog b/ChangeLog index cff57e8791..ea7cf85e9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-01-13 Jan Nieuwenhuizen + + * scm/auto-beam.scm (score-override-auto-beam-setting): New function. + + * lily/main.cc (setup_paths): Add cff. + + * mf/GNUmakefile (foe): Include actual target %.cff. + (INSTALLATION_OUT_SUFFIXES): Install CFF and SVG fonts too. + 2005-01-10 Han-Wen Nienhuys * lily/include/lily-lexer.hh (class Lily_lexer): lose hungarian _b diff --git a/lily/main.cc b/lily/main.cc index 1faab1abac..a532fd9eb4 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -226,7 +226,8 @@ setup_paths () /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "otf", "mf/out", "scm", "tfm", "ps", "svg", 0}; + char *suffixes[] = {"ly", "cff", "otf", "mf/out", "scm", "tfm", "ps", "svg", + 0}; for (unsigned i = 0; prefix_directories[i]; i++) for (char **s = suffixes; *s; s++) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index ff226ff955..cf8740ce7a 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -25,6 +25,7 @@ OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES)) $(BRACES:%=$(outdir)/feta-braces-%.otf-table) FETA_FONTS = $(FETA_MF_FILES:.mf=) SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg) +CFF_FILES = $(OTF_FILES:%.otf=%.cff) $(ALL_FONTS:%=$(outdir)/%.cff) $(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table) @@ -56,7 +57,7 @@ foe: echo $(TEXMF) kpsewhich exbase.mf -$(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe +$(outdir)/%.cff $(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe (cd $(outdir) && fontforge -script $(notdir $<)) $(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) @@ -84,11 +85,12 @@ ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source INSTALLATION_FILES=$(MF_FILES) $(AF_FILES) -INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7 +INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7 8 9 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) +# must not be installed with .cff, pango/fontconfig does not like .cff fonts INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/otf INSTALLATION_OUT_FILES2=$(OTF_FILES) @@ -107,8 +109,12 @@ INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/ INSTALLATION_OUT_FILES7=$(ENC_FILES) -INSTALLATION_OUT_DIR8=$(local_lilypond_datadir)/svg -INSTALLATION_OUT_FILES8=$(OTF_FILES) +# install in fonts/cff or ps/ directory? +INSTALLATION_OUT_DIR8=$(local_lilypond_datadir)/cff +INSTALLATION_OUT_FILES8=$(CFF_FILES) + +INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/svg +INSTALLATION_OUT_FILES9=$(SVG_FILES) export MFINPUTS:=.:$(MFINPUTS) diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index eb28993118..f046f81016 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -88,31 +88,24 @@ checking. " (ly:context-set-property! context context-prop (cons (cons setting value) - (ly:context-property context context-prop) - ) - ) - ) + (ly:context-property context context-prop)))) (define (revert-property-setting context setting) "Like the C++ code that executes \revert, but without type checking. " - + (define (revert-assoc alist key) "Return ALIST, with KEY removed. ALIST is not modified, instead a fresh copy of the list-head is made." (cond ((null? alist) '()) ((equal? (caar alist) key) (cdr alist)) - (else (cons (car alist) (revert-assoc alist key))) - )) + (else (cons (car alist) (revert-assoc alist key))))) - - (ly:context-set-property! context context-prop (revert-assoc (ly:context-property context context-prop) - setting)) - ) + setting))) (define-public (override-auto-beam-setting setting num den . rest) (ly:export @@ -120,12 +113,22 @@ a fresh copy of the list-head is made." (make-apply-context (lambda (c) (override-property-setting c 'autoBeamSettings - setting (ly:make-moment num den)) - )) + setting (ly:make-moment num den)))) + (if (and (pair? rest) (symbol? (car rest))) + (car rest) + 'Voice)))) + +;; UGH -- fixme, docme +(define-public (score-override-auto-beam-setting setting num den . rest) + (ly:export + (context-spec-music + (make-apply-context (lambda (c) + (override-property-setting + c 'autoBeamSettings + setting (ly:make-moment num den)))) (if (and (pair? rest) (symbol? (car rest))) (car rest) - 'Voice) - ))) + 'Score)))) (define-public (revert-auto-beam-setting setting . rest) (ly:export @@ -137,4 +140,3 @@ a fresh copy of the list-head is made." (if (and (pair? rest) (symbol? (car rest))) (car rest) 'Voice)))) -