]> git.donarmstrong.com Git - lilypond.git/commitdiff
'embed-source-code should disregard Scheme-generated input
authorValentin Villenave <valentin@villenave.net>
Thu, 21 Apr 2016 15:35:35 +0000 (17:35 +0200)
committerValentin Villenave <valentin@villenave.net>
Thu, 28 Apr 2016 08:30:37 +0000 (10:30 +0200)
(... for now at least).

This fixes the include-string.ly regtest, and a few others,
that previously could not be compiled when enabling
the -dembed-source-code switch.

scm/framework-ps.scm

index d3234b332913e0fcbaade4d3b525dc7a21838711..ca3372ca92557b2d32129ea705f692f2e8977be0 100644 (file)
   (if (ly:get-option 'embed-source-code)
       (let ((source-list (delete-duplicates
                           (remove (lambda (str)
-                                    (string-contains str
-                                      (ly:get-option 'datadir)))
+                                    (or
+                                     (string-contains str
+                                       (ly:get-option 'datadir))
+                                     (string=? str
+                                       "<included string>")))
                             (ly:source-files)))))
          (display "\n/pdfmark where
 {pop} {userdict /pdfmark /cleartomark load put} ifelse" port)