From: Han-Wen Nienhuys Date: Sun, 22 Jul 2007 07:20:17 +0000 (-0700) Subject: Merge branch 'master' of git://git.sv.gnu.org/lilypond X-Git-Tag: release/2.11.28-1 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=06179214e6e296a7befd73b6eb84d09ce5c98a19;hp=0e0469cbc82a2e91bcfab3a94b6a7010750a5a4d;p=lilypond.git Merge branch 'master' of git://git.sv.gnu.org/lilypond --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 00345e39dc..e50686442c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -227,7 +227,7 @@ test: echo -e '\n\n\n' ; \ git diff ; \ fi > input/regression/out-test/tree.gittxt - $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html + $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/ diff --git a/VERSION b/VERSION index 3debdc06bc..d3f66bc47b 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=11 -PATCH_LEVEL=27 +PATCH_LEVEL=28 MY_PATCH_LEVEL= diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py index d52f99879c..cfbd0b4b57 100644 --- a/buildscripts/output-distance.py +++ b/buildscripts/output-distance.py @@ -28,7 +28,7 @@ class TempDirectory: print 'dir is', self.dir def __del__ (self): print 'rm -rf %s' % self.dir - os.system ('rm -rf %s' % self.dir ) + os.system ('rm -rf %s' % self.dir) def __call__ (self): return self.dir @@ -436,7 +436,6 @@ class FileCompareLink (FileLink): return 0.0 else: return 100.0; - def get_content (self, f): print 'reading', f @@ -444,8 +443,6 @@ class FileCompareLink (FileLink): return s - - class GitFileCompareLink (FileCompareLink): def get_cell (self, oldnew): str = self.contents[oldnew] @@ -1129,7 +1126,6 @@ def test_basic_compare (): test_compare_signatures (names) def test_compare_signatures (names, timing=False): - import time times = 1 @@ -1239,22 +1235,22 @@ def main (): help='where to put the test results [tree2/compare-tree1tree2]') global options - (options, a) = p.parse_args () + (options, args) = p.parse_args () if options.run_test: run_tests () sys.exit (0) - if len (a) != 2: + if len (args) != 2: p.print_usage() sys.exit (2) name = options.output_dir if not name: - name = a[0].replace ('/', '') - name = os.path.join (a[1], 'compare-' + shorten_string (name)) + name = args[0].replace ('/', '') + name = os.path.join (args[1], 'compare-' + shorten_string (name)) - compare_trees (a[0], a[1], name, options.threshold) + compare_trees (args[0], args[1], name, options.threshold) if __name__ == '__main__': main() diff --git a/input/regression/augmentum.ly b/input/regression/augmentum.ly index 5a9618cba3..d5b0561c93 100644 --- a/input/regression/augmentum.ly +++ b/input/regression/augmentum.ly @@ -2,10 +2,12 @@ texidoc = "Augmentum dots are accounted for in horizontal spacing." } +\version "2.11.28" + \include "gregorian-init.ly" \score { \new VaticanaVoice { \[ \augmentum a \flexa \augmentum g \] \augmentum g } -} \ No newline at end of file +} diff --git a/make/doclang-targets.make b/make/doclang-targets.make index ec5ac2bd22..e972321f92 100644 --- a/make/doclang-targets.make +++ b/make/doclang-targets.make @@ -29,8 +29,9 @@ $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/user-ln doc-po cd $(outdir); texi2pdf --batch $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi local-WWW: $(outdir)/lilypond.pdf $(outdir)/lilypond/index.html - cd $(outdir); find -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) ../$(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard . $(top-build-dir)/Documentation/user/$(outdir) lilypond.pdf - cd $(outdir); find \( -name 'lily-??????????.png' -o -name 'lily-??????????.ly' \) -a -not -type l | xargs $(PYTHON) ../$(buildscript-dir)/mass-link.py hard . $(top-build-dir)/Documentation/user/$(outdir) + find $(outdir) -name '*.html' | sed 's!$(outdir)/!!g' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard . $(top-build-dir)/Documentation/user/$(outdir) lilypond.pdf + find $(outdir) \( -name 'lily-??????????.png' -o -name 'lily-??????????.ly' \) -a -not -type l | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py hard . $(top-build-dir)/Documentation/user/$(outdir) + # FIXME # ugh, this is not enough to avoid wasting build time, $(outdir)/user-ln should be touched for all languages touch -mr $(top-build-dir)/Documentation/user/$(outdir) $(outdir)/user-ln diff --git a/scm/backend-library.scm b/scm/backend-library.scm index 73c147c159..0f13b6f55a 100644 --- a/scm/backend-library.scm +++ b/scm/backend-library.scm @@ -96,7 +96,9 @@ " (search-gs) (if (ly:get-option 'verbose) "" "-q") - (if (ly:get-option 'gs-load-fonts) + (if (or (ly:get-option 'gs-load-fonts) + (ly:get-option 'gs-load-lily-fonts)) + " -dNOSAFER " " -dSAFER ") paper-size-string diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 7c5669fdb3..1f5860433c 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -246,14 +246,19 @@ (define (write-preamble paper load-fonts? port) - - (define (load-font-via-GS font-name-filename) + (define (internal-font? file-name) + (or (string-startswith file-name "Emmentaler") + (string-startswith file-name "emmentaler") + (string-startswith file-name "aybabtu") + (string-startswith file-name "Aybabtu"))) + (define (load-font-via-GS font-name-filename) (define (ps-load-file file-name) (if (string? file-name) (if (string-contains file-name (ly:get-option 'datadir)) (begin (set! file-name (ly:string-substitute (ly:get-option 'datadir) "" file-name)) (format "lilypond-datadir (~a) concatstrings (r) file .loadfont" file-name)) + (format "(~a) (r) file .loadfont\n" file-name)) (format "% cannot find font file: ~a\n" file-name))) @@ -268,10 +273,7 @@ (if (mac-font? bare-file-name) (handle-mac-font name bare-file-name) (cond - ((or (string-startswith file-name "Emmentaler") - (string-startswith file-name "emmentaler") - (string-startswith file-name "aybabtu") - (string-startswith file-name "Aybabtu")) + ((internal-font? file-name) (ps-load-file (ly:find-file (format "~a.otf" file-name)))) ((string? bare-file-name) @@ -384,6 +386,8 @@ (define (load-fonts paper) (let* ((fonts (ly:paper-fonts paper)) + + ;; todo - doc format of list. (all-font-names (map (lambda (font) @@ -410,9 +414,20 @@ (sort (apply append all-font-names) (lambda (x y) (string