Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 00345e39dc760f509f46524d42e724aed8d9697f..e50686442cfe3519b7462b84d53eccd2e0fce128 100644 (file)
--- 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 3debdc06bcfadc085cdb38e2b633d9bb1b3b278a..d3f66bc47b7736447ad91cfe2b08ac83d9177778 100644 (file)
--- 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 d52f99879cada1f7b33dccc2b11fc8dfecd103a6..cfbd0b4b5750a6c1b0d9f571bc4bfa9c5e4aefc9 100644 (file)
--- 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 5a9618cba383f16fb839f24c9d505e018f7de993..d5b0561c93cda587a417c5b1a5d03e45bad5ea61 100644 (file)
--- 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 ec5ac2bd229efbcb205330a4d2f0a170db261102..e972321f9201b041b75cfeadea473dd495b0695f 100644 (file)
--- 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 73c147c1599d4dfd1b2acf4108506ff7bc54de77..0f13b6f55aad0f71f50353619d297c0e1c7c8011 100644 (file)
--- 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 7c5669fdb32ecd11b80ded4d137994e30ddfb81c..1f5860433c23e5bcb33843df8f3990d574fae38b 100644 (file)
--- 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<? (cadr x) (cadr y))))))
 
-          (font-loader (if (ly:get-option 'gs-load-fonts)
-                           load-font-via-GS
-                           load-font))
+          ;; slightly spaghetti-ish: deciding what to load where
+          ;; is smeared out.
+          (font-loader (lambda (name)
+                         (cond
+                          ((ly:get-option 'gs-load-fonts) 
+                           (load-font-via-GS name))
+                          ((ly:get-option 'gs-load-lily-fonts)
+                           (if (or
+                                (string-contains (caddr name) (ly:get-option 'datadir))
+                                (internal-font? (caddr name)))
+
+                               (load-font-via-GS name)
+                               (load-font name)))
+                          (else (load-font name)))))
                         
           (pfas (map font-loader font-names)))
       pfas))

diff --git a/scm/lily.scm b/scm/lily.scm
index 645e2c192c7865ad79fe6164f3b3c2503672a0e7..ce1936fd9089a1cb914a06952623f5dae474438c 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -46,6 +46,8 @@ ensure that all refs to parsed objects are dead.  This is an internal option, an
     (eps-box-padding #f "Pad EPS bounding box left edge.  Guarantee alignment between systems in LaTeX.")
     (gs-load-fonts #f
                   "load fonts via Ghostscript.")
+    (gs-load-lily-fonts #f
+                       "load only lilypond fonts via Ghostscript.")
     (gui #f "running from gui; redirect stderr to log file")
     (help #f "show this help.") 
     (include-book-title-preview #t "include book-titles in preview images.")

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 34abb77ed90c1006ef54af2b9eb3fe8d9d5818b1..51302a630905979712051da8bb09bc3092259b0f 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,7 +1,7 @@
 depth = ..
 
 TEX_FILES = $(filter-out texinfo.tex, $(call src-wildcard,*.tex))
-EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex texinfo.cnf quotes.patch
+EXTRA_DIST_FILES = $(TEX_FILES) texinfo.tex quotes.patch
 STEPMAKE_TEMPLATES=install install-out
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/