From 5bdfc2aecb6e67ca8398b2b25b0edb0c56a9f75a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 15 Oct 2006 11:43:22 +0000 Subject: [PATCH] (ALL_GEN_FILES): remove fonts.cache-1 --- ChangeLog | 7 ++++++- mf/GNUmakefile | 2 +- scm/output-lib.scm | 21 ++++++++++++--------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2928a2aa46..7c774d226b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-10-15 Han-Wen Nienhuys + + * mf/GNUmakefile (ALL_GEN_FILES): remove fonts.cache-1 + 2006-10-15 Erik Sandberg * lily/*.cc, lily/include/*.hh: eliminate dummy arguments from @@ -9,7 +13,8 @@ * Doxyfile: remove file. - * scm/define-grob-interfaces.scm (string-finger-interface): add string-finger-interface + * scm/define-grob-interfaces.scm (string-finger-interface): add + string-finger-interface * lily/general-scheme.cc (LY_DEFINE): move ly_camel_case_to_lisp_identifier to here. Use vector iso. char[] diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 392fa049e2..56a2c46cd7 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -91,7 +91,7 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) # Make tfm files first, log files last, # so that normally log files aren't made twice -ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 +ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" diff --git a/scm/output-lib.scm b/scm/output-lib.scm index f6ff77c558..c67c89df90 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -317,8 +317,6 @@ centered, X==1 is at the right, X == -1 is at the left." (ly:grob-relative-coordinate me y-ref Y)))) )) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -345,10 +343,14 @@ centered, X==1 is at the right, X == -1 is at the left." (padding (ly:grob-property spanner 'padding 0.5)) (common (ly:grob-common-refpoint right-span (ly:grob-common-refpoint spanner - left-span X) + left-span X) X)) - (left-x (+ padding (interval-end (ly:grob-robust-relative-extent left-span common X)))) - (right-x (- (interval-start (ly:grob-robust-relative-extent right-span common X)) padding)) + (left-x (+ padding + (interval-end (ly:grob-robust-relative-extent + left-span common X)))) + (right-x (- (interval-start + (ly:grob-robust-relative-extent right-span common X)) + padding)) (self-x (ly:grob-relative-coordinate spanner common X)) (dx (- right-x left-x)) (exp (list 'path thickness @@ -379,8 +381,10 @@ centered, X==1 is at the right, X == -1 is at the left." ((cols (ly:grob-object grob 'columns)) (get-difference (lambda (idx) - (ly:moment-sub (ly:grob-property (ly:grob-array-ref cols (1+ idx)) 'when) - (ly:grob-property (ly:grob-array-ref cols idx) 'when)))) + (ly:moment-sub (ly:grob-property + (ly:grob-array-ref cols (1+ idx)) 'when) + (ly:grob-property + (ly:grob-array-ref cols idx) 'when)))) (moment-min (lambda (x y) (cond @@ -421,8 +425,7 @@ centered, X==1 is at the right, X == -1 is at the left." (define-public (string-finger::calc-text grob) (let* ((digit (ly:event-property (event-cause grob) 'digit)) - (texts (ly:grob-property grob 'digit-names)) - ) + (texts (ly:grob-property grob 'digit-names))) (vector-ref texts (1- (max (min 5 digit) 1))) )) -- 2.39.2