patch::: 1.5.7.jcn2

[lilypond.git] / tex / lily-ps-defs.tex

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 99a7e13c2cc83c882feb389c0f39d6d01b4421d6..ab5ad6b4345fa92dd222b8859a09e66a07f77345 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -7,60 +7,20 @@
 % header info (macros/defs, etc) should go into a \special{! ... }, 
 % note the ! sign.  See dvips.info for details.
 %
-
-% Use of 
-% /foo { operatorname } bind def
+% escape the colon with \string to avoid problems with french babel
 %
-% ``compiles'' operatorname binding in the body of foo, making
-% the code faster, and more reliable (less flexible)
-
-% transplant a TeX dimension into the PS output.
-\def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\the\csname #1\endcsname) deftexdimen}}
-
+\def\lilySpace{ }
 \def\turnOnPostScript{%
-\special{!
-% PS helper: convert (0.2pt) to the token 0.2
-/settexdimen
-{
-       /thestring exch def
-        thestring 0 thestring length 2 sub
-        getinterval
-        token
-        pop exch pop 
-} def
-%
-/deftexdimen
-{
-        settexdimen
-        def     
-} def
-}
-\PSsetTeXdimen{staffrulethickness}
-\PSsetTeXdimen{staffheight}
-% urg, no dvips.info over here...
-%\special{! \input lily.ps }
-\special{!
-(lily.ps) findlibfile 
-{
-       exch pop //systemdict /run get exec
-} 
-{ 
-       /undefinedfilename signalerror 
-} ifelse
-}
-%
-\def\embeddedps##1{%
         % This sets CTM so that you get to the currentpoint
         % by executing a 0 0 moveto
-        \special{ps: @beginspecial @setspecial ##1 @endspecial}       
+        \def\embeddedps##1{%
+                \special{ps\string: @beginspecial @setspecial
+                        \lilypondpaperoutputscale\lilySpace 
+                        \lilypondpaperoutputscale\lilySpace scale 
+                        ##1 @endspecial}%
+        }
 }
-%
-%
-%\PSsetTeXdimen{staffrulethickness}
-%\PSsetTeXdimen{staffheight}
-}
-
-\def\turnOnExperimentalFeatures{%
-\special{ps:
-}}
+\def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\csname #1\endcsname) set_tex_dimen}}
+\PSsetTeXdimen{lilypondpaperblotdiameter}
+\def\turnOnExperimentalFeatures{}