* scm/framework-tex.scm (output-preview-framework)

        (output-classic-framework):
        * scm/framework-ps.scm (output-preview-framework):
        s/ly:paper-book-lines/ly:paper-book-systems/g

        * scm/fret-diagrams.scm (ss-font-encoding):
        s/my-font-encoding/ss-font-encoding

diff --git a/ChangeLog b/ChangeLog
index 23ec6bc2ab6ba91222f22284361a8f6bf30b5b42..9e5b07758943f3a291be7046b02b3d3732ff59ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-18  Nicolas Sceaux  <nicolas.sceaux@free.fr>
+
+       * scm/framework-tex.scm (output-preview-framework) 
+       (output-classic-framework): 
+       * scm/framework-ps.scm (output-preview-framework):
+       s/ly:paper-book-lines/ly:paper-book-systems/g
+
+       * scm/fret-diagrams.scm (ss-font-encoding):
+       s/my-font-encoding/ss-font-encoding
+
 2004-08-18  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * scm/music-functions.scm (direction-polyphonic-grobs): Set

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5edbb4be20879b0437474d4d8f02908bb38db710..fd2134f5bd151d658fef230e6743fea2a9615828 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -213,7 +213,7 @@
 
 (define-public (output-preview-framework outputter book scopes fields basename)
   (let* ((bookpaper (ly:paper-book-book-paper book))
-        (systems (ly:paper-book-lines book))
+        (systems (ly:paper-book-systems book))
         (scale  (ly:output-def-lookup bookpaper 'outputscale ))
         (titles (take-while ly:paper-system-title? systems))
         (non-title (find (lambda (x)

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index a63f6cf1108afd5970cc9ded25eea18d46d601ff..7c535f49ded94b45eb2b3a1ed8b7a5712dec4b7c 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -185,7 +185,7 @@
 (define-public (output-classic-framework
                outputter book scopes fields basename)
   (let* ((bookpaper (ly:paper-book-book-paper book))
-        (lines (ly:paper-book-lines book))
+        (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
     (for-each
      (lambda (x)
@@ -206,7 +206,7 @@
 (define-public (output-preview-framework
                outputter book scopes fields basename )
   (let* ((bookpaper (ly:paper-book-book-paper book))
-        (lines (ly:paper-book-lines book)))
+        (lines (ly:paper-book-systems book)))
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 39b31d8cacdd12babb232be5cc25e694c579e800..e8fac5518e934c48d58f2a6c915a8ba873a9c267 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -5,7 +5,7 @@
 ;;;; (c) 2004 Carl D. Sorensen <c_sorensen@byu.edu>
 
 (define ly:paper-lookup ly:output-def-lookup) ; compat for 2.3, remove  when using 2.2
-(define my-font-encoding 'ec )
+(define ss-font-encoding 'ec )
 
 (define (fret-parse-marking-list marking-list fret-count)
    (let* ((fret-range (list 1 fret-count))