lilypond-0.1.27

diff --git a/bin/make-website.pl b/bin/make-website.pl
index 3ac7f7bf1f1e9fc218497b2bc87250dd71394450..2f177c29b2e97970acff8dd34b5ec9a53247de10 100644 (file)
--- a/bin/make-website.pl
+++ b/bin/make-website.pl
@@ -95,6 +95,7 @@ local @examples=("twinkle-pop",
                 "twinkle", 
                 "collisions",
                 "font",
+                "font20",
                 #"scales", 
                 "rhythm", 
                 "multi" );

diff --git a/input/font.ly b/input/font.ly
index c37ae7c9e498b61310a32f42ce229abfff114b5d..20f072e1fc0308680926d86ecc573d261b705344 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -54,7 +54,7 @@ TestedFeatures =       "This file tests the Feta music-font"
            \paper_twenty
            linewidth = 17.5 \cm;
            gourlay_maxmeasures =5.;
-           \output "lelie20.tex";
+           \output "font20.tex";
        }
 }
 

diff --git a/input/font20.ly b/input/font20.ly
new file mode 100644 (file)
index 0000000..a0c2192
--- /dev/null
+++ b/input/font20.ly
@@ -0,0 +1,7 @@
+\header{
+TestedFeatures =        "This file is a stub to fool make-website"
+       "this will display the 20pt version of the proofsheet";
+}
+
+
+

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 3b5cb72f7e5c91eb70c823ed6955c671f2ad19e8..c2af728860e56bc0d5abc541efe2b063232c94f4 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -6,6 +6,7 @@
   (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "main.hh"
 #include "super-elem.hh"
 #include "debug.hh"
 #include "lookup.hh"
@@ -207,6 +208,8 @@ Paper_score::tex_output ()
     }
 
   tex_out << "\n "<<  paper_l_->lookup_l ()->texsetting << "%(Tex id)\n";
+  if (experimental_features_global_b)
+    tex_out << "\\turnOnExperimentalFeatures%\n";
   super_elem_l_->output_all ();
   tex_out << "\n\\EndLilyPondOutput";
   outputter_l_ = 0;

diff --git a/mf/TODO b/mf/TODO
index 5761f4c81dcdfc6c73e7edd7c1e2de9849be7060..a7ee33cb2c2e60596dbff41020acc04cea1d10dc 100644 (file)
--- a/mf/TODO
+++ b/mf/TODO
@@ -1,8 +1,9 @@
 
        - design macro for penstroke with rounded endings
        - y-refpoint for rests should be the 4th staffline (gclef: b')
+       - versioning    
+       - lo-res fixes.
        - more symbols
-         * ledgerlines
          * stem-notehead attachments.
          * clefs
          * some scripts:
@@ -16,10 +17,6 @@
            - normal(1/5staff) bold
            - large(3/4staff) bold
 
-       - redo flags in a orderly manner; 128th flags
+       - 128th flags
        - include important spacing dims in fetalog 
-       - lilyrules.mf for different rules (lines) ?
-
-       - hack up GS or the mf-gray font to do round pixels
-iso. square pixels.  (Printers don't do square pixels.)
 

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 56000c435e55cf3b6fa0ce5892db0f1b05521bdd..854441bb680e47e3bf11252aa8477f87f6d340fa 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -2,23 +2,27 @@
 % encapsulating tex backend for auto-generated font-en-tja definitions
 
 \def\fetsixteendefs{
-        \font\fontentja=font-en-tja16
-        \font\vetfont=vette-beams16
-       \font\fetanummer=feta-nummer8
+        \font\fontentja=feta16
+        \font\vetfont=feta-beams16
+        \font\fetanummer=feta-nummer8
 }
 \def\fettwentydefs{
-        \font\fontentja=font-en-tja20
-        \font\vetfont=vette-beams20
-       \font\fetanummer=feta-nummer10
+        \font\fontentja=feta20
+        \font\vetfont=feta-beams20
+        \font\fetanummer=feta-nummer10
 }
 
 % \def\fetdef#1#2{\def#1{\fetchar{#2}}}
 % ugh, linewidth, ugh, tablexx.ly balldims not used!
-\def\fetdef#1#2{\def#1{\lower.3884\staffrulethickness\hbox{\fetchar{#2}}}}
+\def\fetdef#1#2{%
+        % what the fuck is this?
+        \def#1{\lower.3884\staffrulethickness
+        \hbox{\fetchar{#2}}}}
+
 \def\fetchar#1{\fontentja\char#1}
 
-%\input font-en-tja16
-\input font-en-tja20
+%\input feta16
+\input feta20
 
 \def\beamslope#1#2{{\count0=#2\advance\count0 by#1
         \advance\count0by128
@@ -27,8 +31,88 @@
 % stacked numbers; overrules def in lilyponddefs
 % oeps: \meter 12/8;
 \def\generalmeter#1#2{%
-       \vbox to 0pt{\vss%
-       \hbox to0.42\balkheight{\hss\fetanummer\char#1\hss}%
-       \nointerlineskip%
-        \hbox to0.42\balkheight{\hss\fetanummer\char#2\hss}%
-       \vss}}
+        \vbox to 0pt{\vss%
+        \hbox to0.42\balkheight{\hss\fetanummer #1\hss}%
+        \nointerlineskip%
+        \hbox to0.42\balkheight{\hss\fetanummer #2\hss}%
+        \vss}}
+
+\newcount\embedcount\embedcount=0
+\newwrite\checkexists
+\newwrite\embedfile
+\def\inputifexists#1{%
+        \openin\checkexists #1
+        \ifeof\checkexists
+                 \closein\checkexists
+                 \relax
+        \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
+}
+\def\turnOnExperimentalFeatures{
+% 
+% yeah.  By far not finished yet. 
+% Don't do this by default.  gs takes a long time to start in xdvi 
+%
+\special{ps: /drawslur {
+        currentpoint  /texoriginy exch def
+        /texoriginx exch def    
+        /dir exch def
+        /lift 30 def
+        /desty exch def
+        /destx exch def
+        /slurfactor .4 def
+        destx slurfactor mul
+        texoriginx add 
+        desty slurfactor mul
+        texoriginy add 
+        lift dir mul add
+        destx 1 slurfactor sub mul
+        texoriginx add 
+        desty 1 slurfactor sub mul
+        texoriginy add 
+        lift dir mul add
+        destx
+        texoriginx add 
+        desty
+        texoriginy add 
+        curveto
+        stroke
+} def
+}
+}
+
+\def\embeddedps#1{
+        \special{ps: #1}
+}
+\def\embeddedmf#1{
+        \edef\embedid{feta-sleur-\number\embedcount}
+        \immediate\openout\embedfile=\embedid.mf
+        \global\advance\embedcount by 1
+        \immediate\write\embedfile{#1}
+        \immediate\closeout\embedfile
+        \font\expandafter\embedid\expandafter=\embedid
+        \hbox{\embedid\char0}
+}
+
+\def\nopostscript{\def\embeddedps##1{}}
+\def\nometafont{\def\embeddedmf##1{}}
+
+\nometafont
+
+\def\EndLilyPondOutput{
+        \storeembedcount
+        \csname bye\endcsname
+}
+
+