X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tex%2Ffetdefs.tex;h=54afa936fba3343cab5ccf907bed552c343e3da6;hb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;hp=ef2c5d39650cc3b203ebaa9143614f9a2ad8da71;hpb=c337dc477ec95837cecdeda2eceaa788832e9bef;p=lilypond.git

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index ef2c5d3965..54afa936fb 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,207 +1,17 @@
 % fetdefs.tex
-% encapsulating tex backend for auto-generated font-en-tja definitions
-
-\def\fetsixteendefs{
-        \font\fontentja=feta16
-        \font\vetfont=feta-beams16
-        \font\fetanummer=feta-nummer8
-        \font\dynfont=feta-din10 scaled \magstep1
-        \font\bracefont=feta-braces16
-        \font\fingerfont=feta-nummer5
-}
-\def\fettwentydefs{
-        \font\fontentja=feta20
-        \font\vetfont=feta-beams20
-        \font\fetanummer=feta-nummer10
-        \font\dynfont=feta-din10 scaled \magstep2
-        \font\bracefont=feta-braces20
-        \font\fingerfont=feta-nummer6
-}
-
-\def\fetdef#1#2{\def#1{%
-        \hbox{\fetchar{#2}}}}
-
-\def\fetchar#1{\fontentja\char#1}
-
-%\input feta16
-\input feta20
-
-\def\beamslope#1#2{{\count0=#2\advance\count0 by#1
-        \advance\count0by128
-        {\vetfont\char\count0}}}
-
-% stacked numbers; overrules def in lilyponddefs
-% widest num should be .40 balkheight
-% oeps: \meter 12/8;
-\def\generalmeter#1#2{%
-        \vbox to 0pt{\vss%
-        \hbox to0.45\balkheight{\hss\fetanummer #1\hss}%
-        \nointerlineskip%
-        \hbox to0.45\balkheight{\hss\fetanummer #2\hss}%
-        \vss}}
-
-\def\pianobrace#1{{\bracefont\char #1}}
-
-\newcount\embedcount\embedcount=0
-\newwrite\checkexists
-\newwrite\embedfile
-\def\inputifexists#1{%
-        \openin\checkexists #1
-        \ifeof\checkexists
-                 \closein\checkexists
-        \else
-                \closein\checkexists
-                \input #1
-        \fi
-}
-\def\embedcountid{feta-embed}
-\inputifexists{\embedcountid.aux}
-%
-% let's not overwrite -- and be sure to create new
-\def\storeembedcount{%
-        \immediate\openout\embedfile=\embedcountid.aux
-        \immediate\write\embedfile{\embedcount=\the\embedcount}
-        \immediate\closeout\embedfile
-}
-
-
-
-
-%
-% WARNING: don't leave blank lines in the PS-code; they are
-% transformed into \par 
-%
-
-
-\def\turnOnPostScript{
-\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}       
-}
-\special{ps:
-/draw_decresc
-        {
-                /ht exch def
-                /wd exch def
-%
-                0 ht moveto
-                wd ht neg rlineto
-                wd neg ht neg rlineto 
-                stroke
-        }
-        def
-        /draw_cresc
-        {
-                /ht exch def
-                /wd exch def
-%
-                0 0 moveto
-                wd ht rmoveto
-                wd neg ht neg rlineto 
-                wd ht neg rlineto
-                stroke
-        }
-        def
-}
-}
-
-\def\turnOnExperimentalFeatures{
-% draw a slur in embedded postscript
-\special{ps:
-/xbow 1 3 div def
-/ybow 1 4 div def
-/thin 0.2 def
-/thick thin 5 mul def
-/draw_slur { 
-        % up or down?
-        /dir exch def
-%       
-%       for mo*tex shift
-%       exch
-%       1 copy /dx exch def
-%       exch
-%
-        % calc angle alpha
-        2 copy exch atan /alpha exch def
-        % calc len(gth)
-        2 exp exch 2 exp add sqrt /len exch def
-%
-        % add and calc z2, z3
-        len xbow mul
-        len ybow mul dir mul
-        1 xbow sub len mul
-        len ybow mul dir mul
-%       
-        % add z4, z1
-        len 0 
-        0 0
-%
-        % add and calc z5..z8 
-        8 copy
-        thin dir mul sub
-        8 2 roll
-        thin dir mul sub
-        8 2 roll
-        thick dir mul sub
-        8 2 roll
-        thick dir mul sub
-%
-        % reverse order, must be cycle
-        8 6 roll
-        6 2 roll
-        4 2 roll
-        8 6 roll
-%       
-        % set z1..z4
-        16 8 roll
-%
-        alpha rotate
-%       silly mo*tex convention
-%       dx 2 div -1 mul 0 translate
-        % draw z1..z4
-        moveto curveto
-        % draw z5..z8
-        lineto curveto
-        % cycle
-        0 0 lineto
-        fill
-} def }
-}
-
-\def\embeddedtex#1{#1}
-
-\def\embeddedmf#1{
-        \edef\embedid{feta-sleur-\number\embedcount}
-        \immediate\openout\embedfile=\embedid.mf
-        \global\advance\embedcount by 1
-
-% should write ``automatically generated.''
-%        \immediate\write\embedfile{\def\
-%       
-%      }
-
-        \immediate\write\embedfile{#1}
-
-        \immediate\closeout\embedfile
-        \font\expandafter\embedid\expandafter=\embedid
-        \embedid\char0
-}
-
-\def\notex{\def\embeddedtex##1{}}
-\def\nopostscript{\def\embeddedps##1{}}
-\def\nometafont{\def\embeddedmf##1{}}
-
-% dat heb je handig gedaan, lieverd!
-\nometafont
-%\nopostscript
-%\notex
-
-\def\EndLilyPondOutput{
-        \storeembedcount
-        \csname bye\endcsname
-}
-
-
-
+% encapsulating tex backend for auto-generated feta definitions
+
+% fix chord.cc::banter_str before removing these
+\def\fetdef#1#2{%
+  \def#1{\hbox{\char#2}}}
+
+\fetdef\sharp{16}
+\fetdef\natural{17}
+\fetdef\flat{18}
+\font\fetasixteenfont=feta16
+\def\fetafont{\fetasixteenfont}
+\def\textflat{{\fetafont\raise 1ex\hbox{\flat}}}
+\def\textnatural{{\fetafont\raise 1ex\hbox{\natural}}}
+\def\textsharp{{\fetafont\raise1ex\hbox{\sharp}}}
+
+\endinput