patch::: 1.5.19.jcn3

1.5.19.jcn3

diff --git a/CHANGES b/CHANGES
index 2e13ccb0af115aedff0885e62ed17c1745c6a852..24ccbb7f7226ed555b807418066f6f1e3e5c8774 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,15 @@
-1.5.19.jcn2
+1.5.19.jcn3
 ===========
 
 * Sketch output:
 
+  - Sketch uses feta font.
+  - Fix to linewidth and feta fontsize.
   - mf-to-table: write dummy values in afm to make sketch happy.
-  - Fixes to glyphs: rectangles and beziers work now.
+  - Fixes to glyphs: rectangles beziers work now.
   - Bugfix: sketch.scm: use primitive-eval.
 
-* Sketch and feta Type1 fonts (disabled in sketch output for now):
+* Sketch and feta Type1 fonts:
   - textrace:
      wget http://www.inf.bme.hu/~pts/textrace-latest.tar.gz
      tar xzf textrace-latest.tar.gz
@@ -15,18 +17,23 @@
      (cd autotrace-0.27ap; ./configure; make)
      ./traceall.sh feta20 feta20.pfb $HOME/usr/src/lilypond/mf/out
 
-  - copy mf/out/feta20.afm to sketch/Resources/Fontmetrics
+  - copy mf/out/feta20.* to sketch/Resources/Fontmetrics
 
   - append to sketch/Resources/Fontmetrics/std.sfd:
-      feta20,feta20,Roman,-gnu-feta20-medium-r-normal,iso8859-1,feta20
+      echo 'TeX-feta20,feta20,Roman,-gnu-feta20-medium-r-normal,adobe-fontspecific,feta20' > $HOME/usr/src/sketch/sketch/Resources/Fontmetrics/std.sfd
 
   - Hmm, then find that
 
     + Sketch accesses characters by name, ie, the
-      name characters have in default text fonts.  We'll have to fix
-      Sketch's font handling.
-    + textrace mangles font name by prepending `TeX-'.  Is this a
-      problem?
+      name characters have in default text fonts.  Luckily, textrace
+      mangles the feta names too.  Sadly, textrace chooses different names
+      for characters > 128.
+
+    + Textrace mangles font name by prepending `TeX-'.  Doesn't seem to
+      pose a big problem; we'll have to pefix `TeX-' to feta fonts.
+
+    + Sadly, only the sketch-0.7.x is happy with the feta type1 font, but
+      printing is not yet implemented?
 
 * Remove modules directory (again?).
 

diff --git a/VERSION b/VERSION
index ce555652ff764a6c93ce5c831c4879976ea929de..74a4795817805b81a2c6853cae386c265288cd86 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=19
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/sketch.ly b/input/test/sketch.ly
new file mode 100644 (file)
index 0000000..22594c5
--- /dev/null
+++ b/input/test/sketch.ly
@@ -0,0 +1,12 @@
+\header {
+texidoc="sketch output supported features"
+}
+\score {
+  \notes\relative c''' {
+    a4( a a a )a
+    \stemDown
+    a,8( b c )d
+    \stemUp
+    \slurDown d16( c b )a
+  }
+}
\ No newline at end of file

diff --git a/scm/sketch.scm b/scm/sketch.scm
index ddae66dae45598a97a7b10f0614b869801fb34b1..5e1f893dfc536971ac4c19945924b5bf30238866 100644 (file)
--- a/scm/sketch.scm
+++ b/scm/sketch.scm
@@ -30,7 +30,7 @@
 (define (global-filledbox width dy dx height x y)
   (string-append
    "fp((0,0,0))\n"
-   "lw(0.5)\n"
+   "lw(0.1)\n"
    "r("
    (sk-numbers->string
     (map global-mul-scale (list width dy dx height x y)))
@@ -55,7 +55,7 @@
                 )
     (string-append
      "fp((0,0,0))\n"
-     "lw(0.5)\n"
+     "lw(0.1)\n"
      "b()\n"
      (global-bezier first)
      (global-bezier second)
@@ -109,12 +109,14 @@
          `(string-append
            "fp((0,0,0))\n"
            "le()\n"
-           "lw(0.5)\n"
-;; urg, Sketch can't handle non-text fonts
+           "lw(0.1)\n"
 ;;         "Fn('" global-font "')\n"
-           "Fn('Times-Roman')\n"
-           "Fs(12)\n"
-           "txt('" ,(ascii->string i) "',("
+;;         "Fn('Times-Roman')\n"
+           "Fn('TeX-feta20')\n"
+           "Fs(20)\n"
+           ;; chars > 128 don't work yet
+           "txt('" ,(ascii->string (modulo i 128)) "',("
+;;         "char(" ,(number->string i)  ",("
            (sk-numbers->string (list (* global-scale global-x)
                                      (* global-scale global-y)))
            "))\n")))