* Documentation/user/music-glossary.tely (G clef): fix clef alignments.

* scm/framework-ps.scm (embed-document): new function. Use to
embed PFA files.

diff --git a/ChangeLog b/ChangeLog
index fa639f25454b38db3419b9b02f8472886e27f230..915e3051961127465b24994434b1cf45044e99b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-03-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/music-glossary.tely (G clef): fix clef alignments.
+
+       * scm/framework-ps.scm (embed-document): new function. Use to
+       embed PFA files.
+
        * ly/engraver-init.ly: init rehearsalMarkAlignSymbol to staff-bar.
 
 2006-03-12  Mats Bengtsson  <mabe@drongo.s3.kth.se>

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 0f25a843993be1de1bc6512f2d88f1e80c4c168f..879016f0fdb6834d6da1ec9b7dfff7ec47909c3d 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -2400,28 +2400,30 @@ the notes must be played an octave higher while 8 below the clef symbol
 indicates playing or singing an octave lower (most tenor parts in choral
 scores are notated like that).
 
-@lilypond[fragment,notime,line-width=13.0\cm]
-\set Score.automaticBars = ##f
-\override Staff.Clef #'full-size-change = ##t
-%\override Score.LyricText #'font-style = #'large
-\oldaddlyrics
-\relative c'' {
-  \clef french
-  g1 s s
-  \clef treble
-  g s s
-  \clef "G^8"
-  g s s
-  \clef "G_8"
-  g s s
-}
-\context Lyrics \lyrics {
-  \override Lyrics .LyricText #'self-alignment-X = #-1
-  "french violin clef  "
-  "violin clef  "
-  "octaved up  "
-  "octaved down"
-}
+@lilypond[fragment,notime,ragged-right]
+<<
+  \set Score.automaticBars = ##f
+  \override Staff.Clef #'full-size-change = ##t
+
+  \relative c'' {
+    \set Score.proportionalNotationDuration = #(ly:make-moment 1 8)
+    \clef french
+    g1
+    \clef treble
+    g
+    \clef "G^8"
+    g
+    \clef "G_8"
+    g
+  }
+  \context Lyrics \lyrics {
+    \override Lyrics . LyricText #'X-offset = #-5
+    "french violin clef"
+    "violin clef"
+    "octaved up"
+    "octaved down"
+  }
+>>
 @end lilypond
 
 @node glissando

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 3998d0f0b7c4b2aa385c72b90385afd043425f59..fa9d5310a8e9aa1f1a9bc5ea3c9df655f006e651 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -188,13 +188,19 @@
                 "%%EndComments\n"))
 
 (define (procset file-name)
-  (string-append
-   (format
+  (format
     "%%BeginResource: procset (~a) 1 0
 ~a
 %%EndResource
 "
-    file-name (cached-file-contents file-name))))
+    file-name (cached-file-contents file-name)))
+
+(define (embed-document file-name)
+  (format "%%BeginDocument: ~a
+~a
+%%EndDocument
+" 
+    file-name (cached-file-contents file-name)))
 
 (define (setup-variables paper)
   (string-append
@@ -323,7 +329,7 @@
        
       (cond
        ((and file-name (string-match "\\.pfa" downcase-file-name))
-       (cached-file-contents file-name))
+       (embed-document file-name))
        ((and file-name (string-match "\\.pfb" downcase-file-name))
        (ly:pfb->pfa file-name))
        ((and file-name (string-match "\\.ttf" downcase-file-name))