From 818013132a9b4d3b82bf4e756076c06747fa7b63 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Thu, 29 Mar 2001 21:33:21 +0200 Subject: [PATCH] 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 --- CHANGES | 12 +++++++++++- VERSION | 2 +- scm/tex.scm | 4 ++-- tex/lily-ps-defs.tex | 4 +++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 9d4124216f..e5a2957d3a 100644 --- 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 453fa3bb84..8f3de0af6e 100644 --- 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 5e358449f9..4ba31ff8b4 100644 --- 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 bf93221761..c1ff2b18ed 100644 --- 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}% -- 2.39.2