* Merge from stable:

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

diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index ed2eeb4af890c13a55fd4847d14501930f1b3f4c..71e31e8aabc6aadcf9f58ddc710e51b82a66d6d2 100644 (file)
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -1,33 +1,38 @@
+% lily-ps-defs.tex
 %
-% WARNING: don't leave blank lines in the PS-code; they are
-% transformed into \par 
-%
+\edef\lilypsdefsELC{\the\endlinechar}%
+\endlinechar -1\relax
 
-%
-% header info (macros/defs, etc) should go into a \special{! ... }, 
+% 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\PSsetTeXdimen#1{\expandafter\special{! /#1 (\csname #1\endcsname) set_tex_dimen}}
-\def\lilySpace{ }
+% Escape the colon with \string to avoid problems with French while using
+% the Babel package.
 
-% PostScript PT/IN: 72/25.4
-\def\scaletounit{ 2.834645 mul }
+\gdef\lilypondsetdimen#1{
+  \expandafter\special{
+    ! /#1 (\csname #1\endcsname) set_tex_dimen
+  }
+}
+
+\gdef\lilypondspace{ }
 
-% for true printers points to postscript points: 
-%\def\scaletounit{1.00375}
-\def\turnOnPostScript{%
-        % This sets CTM so that you get to the currentpoint
-        % by executing a 0 0 moveto
-        \def\embeddedps##1{%
-                \special{ps\string: @beginspecial @setspecial
-                        \lilypondpaperoutputscale\lilySpace\scaletounit
-                        \lilypondpaperoutputscale\lilySpace\scaletounit
-                        % FUCKING REDHAT XDVI -- ARG!
-                        skeel ##1 @endspecial}%
-        }
-        \PSsetTeXdimen{lilypondpaperblotdiameter}
+\gdef\lilypondpostscript{
+  % This sets CTM so that you get to the currentpoint
+  % by executing a 0 0 moveto
+  \def\embeddedps##1{
+    \special{
+      ps\string: @beginspecial @setspecial %
+                 \lilypondpaperoutputscale\lilypondspace\scaletounit %
+                 \lilypondpaperoutputscale\lilypondspace\scaletounit %
+                 % FUCKING REDHAT XDVI -- ARG!
+                 skeel ##1 @endspecial
+    }
+  }
+  \lilypondsetdimen{lilypondpaperblotdiameter}
 }
-\def\turnOnExperimentalFeatures{}
 
+\gdef\lilypondexperimentalfeatures{}
+
+\endlinechar \lilypsdefsELC
+\endinput