patch::: 1.3.144.mb1: Re: Patch! Re: lilypond book still don't print beams and slurs

1.3.144.mb1
============

* Fix ps specials to work together with \usepackage[french]{babel}

---
Generated by (address unknown),
>From = lilypond-1.3.144, To = lilypond-1.3.144.mb1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.144.mb1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 9d4124216f5e0c6861b372fe3743bf082f6d2c48..e5a2957d3ad58141f0295b32ff97c9757dade86f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
-1.3.144.jcn3
+--- ../lilypond-1.3.144/CHANGES        Wed Mar 28 01:27:11 2001
+++ b/CHANGES   Thu Mar 29 21:17:09 2001
+@@ -1,3 +1,8 @@
+1.3.144.mb1
+============
+
+* Fix ps specials to work together with \usepackage[french]{babel}
+
+ 1.3.143.jcn3
+ ============
+ 1.3.144.jcn3
 ============
 
 * Bugfixes: refman, changed Ascii to ASCII.

diff --git a/VERSION b/VERSION
index 453fa3bb849e76fc8ffd79cbd60f48a3d2df5f0a..8f3de0af6e2002ae8edfa1cad014c732dcc06178 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/tex.scm b/scm/tex.scm
index 5e358449f90b47f247d427acd6d339c8d175ad37..4ba31ff8b426f32f17fe82b285b5c1d81ab04fc8 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -96,7 +96,7 @@
 
   (define (header-end)
     (string-append
-     "\\special{! "
+     "\\special{\\string! "
 
      ;; URG: ly-gulp-file: now we can't use scm output without Lily
      (if use-regex
@@ -182,7 +182,7 @@
 
   (define (define-origin file line col)
     (if (procedure? point-and-click)
-       (string-append "\\special{src:"
+       (string-append "\\special{src\\string:"
                       (point-and-click line col file)
                       "}" )
        "")

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index bf93221761a445a3f2dc9d1337086c132b79b5b5..c1ff2b18ed2c70ed1740f6d872570b045a4a586b 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -7,12 +7,14 @@
 % header info (macros/defs, etc) should go into a \special{! ... }, 
 % note the ! sign.  See dvips.info for details.
 %
+% escape the colon with \string to avoid problems with french babel
+%
 \def\lilySpace{ }
 \def\turnOnPostScript{%
         % This sets CTM so that you get to the currentpoint
         % by executing a 0 0 moveto
         \def\embeddedps##1{%
-                \special{ps: @beginspecial @setspecial
+                \special{ps\string: @beginspecial @setspecial
                         \lilypondpaperoutputscale\lilySpace 
                         \lilypondpaperoutputscale\lilySpace scale 
                         ##1 @endspecial}%