T2026: Use new (scm markup-facility-defs) scheme module for markup commands.

scm/framework-ps.scm

 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
 ;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
 ;;;; the Free Software Foundation, either version 3 of the License, or
 ;;;; (at your option) any later version.
 ;;;;
 ;;;; LilyPond is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;;; GNU General Public License for more details.
 ;;;;
 ;;;; You should have received a copy of the GNU General Public License
 ;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (scm framework-ps))
+(define-module (scm framework-ps)
+  #:use-module (scm markup-facility-defs)
+  #:duplicates (replace))

[dak, 2012/01/02 14:04:39]

What is with the duplicate?  Should this be fixed?

[Ian Hulin (gmail), 2012/01/02 21:19:24]

Some modules occasionally need to re-import (lily) via a (use-modules (lily)). 
The #:duplicates (replace) stops guile throwing out warnings during
initialization, particularly about us over-riding the guile base interface
definition for (format). This works round that. If you feel the whole issue
about modules needing to re-import (lily) needs looking at, lets look at it as a
separate issue. 

 
 ;;; this is still too big a mess.
 
 (use-modules (ice-9 string-fun)
              (guile)
              (scm page)
              (scm paper-system)
              (srfi srfi-1)
              (srfi srfi-13)
              (scm clip-region)
@@ skipping 388 matching lines @@
     ;; First, call ly:encode-string-for-pdf to encode the string (latin1 or
     ;; utf-16be), then escape all parentheses and backslashes
     ;; FIXME guile-2.0: use (string->utf16 str 'big) instead
 
     (ps-quote (ly:encode-string-for-pdf val)))
   (define (metadata-lookup-output overridevar fallbackvar field)
     (let* ((overrideval (ly:modules-lookup (list header) overridevar))
            (fallbackval (ly:modules-lookup (list header) fallbackvar))
            (val (if overrideval overrideval fallbackval)))
       (if val
-          (format port "/~a (~a)\n" field (metadata-encode (markup->string val))))))
+          (fancy-format port "/~a (~a)\n" field (metadata-encode (markup->string val))))))

[dak, 2012/01/02 14:04:39]

Why would we need fancy-format here?  The format codes are usual?

[Ian Hulin (gmail), 2012/01/02 21:19:24]

Another weirdo. Also reverted on my local repository.  Maybe git-cl upload isn't
doing what I think it does.

   (display "[ " port)
   (metadata-lookup-output 'pdfcomposer 'composer "Author")
   (format port "/Creator (LilyPond ~a)\n" (lilypond-version))
   (metadata-lookup-output 'pdftitle 'title "Title")
   (metadata-lookup-output 'pdfsubject 'subject "Subject")
   (metadata-lookup-output 'pdfkeywords 'keywords "Keywords")
   (metadata-lookup-output 'pdfmodDate 'modDate "ModDate")
   (metadata-lookup-output 'pdfsubtitle 'subtitle "Subtitle")
   (metadata-lookup-output 'pdfcomposer 'composer "Composer")
   (metadata-lookup-output 'pdfarranger 'arranger "Arranger")
@@ skipping 250 matching lines @@
 
   lilypond -dbackend=eps FILE
 
 If have cut & pasted a lilypond fragment from a webpage, be sure
 to only remove anything before
 
   %% ****************************************************************
   %% Start cut-&-pastable-section
   %% ****************************************************************
 ")))