patch::: 0.1.13.jcn1: Re: LilyPond pl 13 released -- tar.gz

pl 12.jcn4
	- fixed dynamic f, magstep bug

diff --git a/NEWS b/NEWS
index 6724d8e86011befefc86d0ae9be638e48450a15f..3fa6da35ec4d71fc7cf14ca3267eb00b6b447fb3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,9 @@ by the parser (mudela 0.1.4)
        - Molecule::add_XXXX -> Molecule::add_at_edge ()
        - doco updeet: why no midi FAQ, index, CodingStyle hungarian
 
+pl 12.jcn4
+       - fixed dynamic f, magstep bug
+
 pl 12.jcn3
        - try at better dynamic font, copied from cmbxti10: mf/*
        - typesetting abbreviation beams; abbreviation-*

diff --git a/VERSION b/VERSION
index df34f2a4ae111f48a2f56b3c2a613c08acb89997..ca27f3dfd2b8d4ac12e2af70903573262138b673 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,4 @@ TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 13
 
 # use to send patches, always empty for released version:
-TOPLEVEL_MY_PATCH_LEVEL = 
+TOPLEVEL_MY_PATCH_LEVEL = .jcn1

diff --git a/input/standchen-16.tex b/input/standchen-16.tex
index ae3ccc33baad12ebef7fd18af0448ceac35eff72..b30bb0031812fdf165c1e663bacb6d790943cc34 100644 (file)
--- a/input/standchen-16.tex
+++ b/input/standchen-16.tex
@@ -1,12 +1,12 @@
 \documentclass{article}         %UGH
 \usepackage{a4}
-\oddsidemargin-1in\advance\oddsidemargin7.5mm
+\oddsidemargin0mm
 \evensidemargin\oddsidemargin
 \hsize210mm\vsize297mm % so what does a4 do, anyway?
-\textwidth\hsize\advance\textwidth-15mm
-\topmargin-1in\advance\topmargin10mm
-\textheight\vsize\advance\textheight-35mm
-\pagestyle{empty}
+\textwidth160mm
+\topmargin0mm%\advance\topmargin10mm
+\textheight\vsize\advance\textheight-50mm
+%\pagestyle{empty}
 \begin{document}
 \input lilyponddefs
 \input titledefs

diff --git a/mf/dyn.tex b/mf/dyn.tex
index 914f005e682747197d1c6b1f9b67259abc41ef39..10b1d534f01b1239820761f72823df008429b375 100644 (file)
--- a/mf/dyn.tex
+++ b/mf/dyn.tex
@@ -2,7 +2,7 @@
 % A tex file to help view dynamic letters
 %
 
-\font\dynfont=dyn10
+\font\dynfont=dyn10 scaled \magstep2
 \def\thefont{\dynfont}
 
 \def\mb#1{{\thefont\char#1}}
@@ -12,36 +12,16 @@
 %        \vbox to12pt{\vfill\hbox to0pt{\qquad\kern-1pt\twvrul\hss}}%
 %        \hbox to50pt{\qquad\twhrul\mb{#1}\hss}%
         \hbox to 30pt{\qquad\mb{#1}\hss}
-        \setbox0=\hbox{\mb{#1}} width \the\wd0\ depth \the\dp0 \ height \the\ht0}
+       \setbox0=\hbox{\mb{#1}} width \the\wd0\ depth \the\dp0 \ height \the\ht0}
 
 \newcount\n
 \def\charn{\n=-1
-        \loop\ifnum\n<4\advance\n by1
+        \loop\ifnum\n<5\advance\n by1
         \doitem{\number\n}\endgraf\repeat}
 
         \charn
 
-%from lilyponddefs
-% dynamics take extra kerning
-\def\dyn{\dynfont}
-\def\kdynf{{\dynfont \char0\kern-.2ex}}
-\def\kdynm{{\dynfont \char1\kern-.18ex}}
-\def\kdynp{{\dynfont \char2\kern-.08ex}}
-\def\kdyns{{\dynfont \char3\kern-.22ex}}
-\def\kdynz{{\dynfont \char4\kern-.2ex}}
-
-\def\dynp{\kdynp}
-\def\dynpp{\dynp\kdynp}
-\def\dynppp{\dynpp\kdynp}
-\def\dynmp{\kdynm\kdynp}
-\def\dynmf{\kdynm\kdynf}
-\def\dynf{\kdynf}
-\def\dynff{\dynf\kdynf}
-\def\dynfff{\dynff\kdynf}
-
-\def\dynfp{\kdynf\kern.35ex\kdynp}
-\def\dynsf{\kdyns\kdynf}
-\def\dynsfz{\dynsf\kern.3ex\kdynz}
+\input dyndefs
 
 \hbox{\dynp}
 \hbox{\dynpp}

diff --git a/mf/dyn10.mf b/mf/dyn10.mf
index 3b49ec253d09f05c6757d8c048e137b47872b5a1..7e2d853f74bdd8d15eb9e8bc04913b84b65f1e92 100644 (file)
--- a/mf/dyn10.mf
+++ b/mf/dyn10.mf
@@ -94,19 +94,32 @@ math_fitting:=false;    % should math-mode spacing be used?
 % "s", "m", and "z".  sometimes the "m" and "z" are a bit fatter than
 % "s".
 
-slant:=.62;      % tilt ratio $(\Delta x/\Delta y)$
+slant:=.68;      % tilt ratio $(\Delta x/\Delta y)$
 crisp#:=19/36pt#;    % diameter of serif corners
 tiny#:=19/36pt#;    % diameter of rounded corners
 fine#:=20/36pt#;    % diameter of sharply rounded corners
 thin_join#:=20/36pt#;    % width of extrafine details
-stem#:=57/36pt#;    % lowercase stem breadth
-curve#:=64/36pt#;    % lowercase curve breadth
-flare#:=64/36pt#;    % diameter of bulbs or breadth of terminals
+stem#:=72/36pt#;    % lowercase stem breadth
+%curve#:=64/36pt#;    % lowercase curve breadth
+flare#:=52/36pt#;    % diameter of bulbs or breadth of terminals
 
-mode_setup; font_setup;
+%  mode_setup; font_setup;
+mode_setup;
+font_setup;
+
+num=-1;
 input ital-f;
+
 slant:=.38;      % tilt ratio $(\Delta x/\Delta y)$
-mode_setup; font_setup;
+stem#:=58/36pt#;    % lowercase stem breadth
+font_setup;
+
+input ital-f;
+stem#:=54/36pt#;    % lowercase stem breadth
+
+% mode_setup; font_setup;
+font_setup;
+
 input ital-p;
 
 slant:=.28;      % tilt ratio $(\Delta x/\Delta y)$
@@ -119,11 +132,12 @@ fine#:=10/36pt#;    % diameter of sharply rounded corners
 thin_join#:=10/36pt#;    % width of extrafine details
 hair#:=20/36pt#;    % lowercase hairline breadth
 % stem#:=38/36pt#;    % lowercase stem breadth
-% curve#:=43/36pt#;    % lowercase curve breadth
+curve#:=43/36pt#;    % lowercase curve breadth
 flare#:=42/36pt#;    % diameter of bulbs or breadth of terminals
 % ess#:=35/36pt#;      % breadth in middle of lowercase s
 
-mode_setup; font_setup;
+% mode_setup; font_setup;
+font_setup;
 
 input ital-m;
 input ital-s;

diff --git a/mf/ital-f.mf b/mf/ital-f.mf
index be97ed02633986672fee32c0e5ea2a4bd8c4916b..027eadaead54e37fdd2f00d55b4c8708d8b42113 100644 (file)
--- a/mf/ital-f.mf
+++ b/mf/ital-f.mf
@@ -12,7 +12,7 @@
 % cmchar "Italic letter f";
 % beginchar("f",max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#);
 \"Dynamic letter f";
-beginchar(0,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#);
+beginchar(incr num,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#);
 italcorr asc_height#*slant+.75u#;
 adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib;
 numeric theta; z88=(.5w-.5u,h); z89=(.5w+.5u,-d); theta=angle(z88-z89);
@@ -22,7 +22,8 @@ pos5(stem,theta-90); pos6(.5[hair,stem],0);
 pos7(vair,-90); pos8(hair,-180); pos9(flare,-180);
 rt x1r=hround(w+.25u); lft x8r=hround-.35u; x2=.6[x1,x4]; x7=.6[x8,x5];
 y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo;
-y4=.25[x_height,h]; y5=.5[-d,y4];
+% y4=.25[x_height,h]; y5=.5[-d,y4];
+y4=x_height-.5bar; y5=y4;
 z4=whatever[z88,z89]; z5=whatever[z88,z89];
 x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7];
 bulb(2,1,0); bulb(7,8,9);  % bulbs

diff --git a/mf/ital-m.mf b/mf/ital-m.mf
index 6f6828d2d2ea00a0462675b4ba8f33770328763e..c3d85636837170aaeba4398bde1e79a16eef3c1b 100644 (file)
--- a/mf/ital-m.mf
+++ b/mf/ital-m.mf
@@ -12,7 +12,7 @@
 % cmchar "Italic letter m";
 % beginchar("m",15u#,x_height#,0);
 \"Dynamic letter m";
-beginchar(1,15u#,x_height#,0);
+beginchar(incr num,15u#,x_height#,0);
 italcorr 1/3x_height#*slant+.5hair#+.5u#;
 adjust_fit(if monospace:-1.5u#,-2u# else: 0,0 fi); pickup fine.nib;
 numeric shaved_stem; shaved_stem=mfudged.stem;

diff --git a/mf/ital-p.mf b/mf/ital-p.mf
index 3c853cc8f2341dd785ed99d7a9ea9ae29f558032..c9e0cdc8889071a4d7ede9a3d81202ed5302a403 100644 (file)
--- a/mf/ital-p.mf
+++ b/mf/ital-p.mf
@@ -12,7 +12,7 @@
 % cmchar "Italic letter p";
 % beginchar("p",9u#,x_height#,desc_depth#);
 \"Dynamic letter p";
-beginchar(2,9u#,x_height#,desc_depth#);
+beginchar(incr num,9u#,x_height#,desc_depth#);
 italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi;
 adjust_fit(0,0); pickup fine.nib;
 x0=0; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2);  % opening hook

diff --git a/mf/ital-s.mf b/mf/ital-s.mf
index 0599a312d874a7fef21569dad870e781eacc3b5d..60af94b6e527ba6c3732bd237f0943fc31ed752a 100644 (file)
--- a/mf/ital-s.mf
+++ b/mf/ital-s.mf
@@ -12,7 +12,7 @@
 % cmchar "Italic letter s";
 % beginchar("s",5.25u#+max(1.75u#,flare#),x_height#,0);
 \"Dynamic letter s";
-beginchar(3,5.25u#+max(1.75u#,flare#),x_height#,0);
+beginchar(incr num,5.25u#+max(1.75u#,flare#),x_height#,0);
 italcorr x_height#*slant-.5u#;
 adjust_fit(0,0); pickup fine.nib;
 numeric theta; theta=90-angle(40u,h); slope:=-h/40u;  % angle at middle

diff --git a/mf/ital-z.mf b/mf/ital-z.mf
index 9e8992878e205531982bf1a9383d7ac6194d8063..6c0f517aed62b5234f3d1080e42716e999a2fee8 100644 (file)
--- a/mf/ital-z.mf
+++ b/mf/ital-z.mf
@@ -12,7 +12,7 @@
 % cmchar "Italic letter z";
 % beginchar("z",5.5u#+max(1.5u#,stem#),x_height#,0);
 \"Dynamic letter z";
-beginchar(4,5.5u#+max(1.5u#,stem#),x_height#,0);
+beginchar(incr num,5.5u#+max(1.5u#,stem#),x_height#,0);
 italcorr x_height#*slant+.5hair#;
 adjust_fit(if monospace:.5u#,.5u# else: 0,0 fi); pickup fine.nib;
 pos1(hair,0); pos2(stem,-90); pos3(vair,-90); pos4(hair,0);

diff --git a/tex/dyndefs.tex b/tex/dyndefs.tex
new file mode 100644 (file)
index 0000000..630cf8e
--- /dev/null
+++ b/tex/dyndefs.tex
@@ -0,0 +1,27 @@
+% dyndefs.tex
+%
+
+\def\dyn{\dynfont}
+\def\dynaf{\dynfont\char0}
+\def\dynnf{\dynfont\char1}
+\def\dynnf{\dynfont\char1}
+\def\dynp{\dynfont\char2}
+\def\dynm{\dynfont\char3}
+\def\dyns{\dynfont\char4}
+\def\dynz{\dynfont\char5}
+
+\def\kdynf{\dynnf}
+\def\kdynp{\dynp\kern-.1ex}
+
+\def\dynf{\dynaf}
+\def\dynpp{\kdynp\dynp}
+\def\dynppp{\kdynp\kdynp\dynp}
+\def\dynmp{\dynm\kern -.2ex\dynp}
+\def\dynmf{\dynfont\raise.08ex\hbox{\dynm}\kern-.3ex\dynnf}
+\def\dynff{\kdynf\dynnf}
+\def\dynfff{\kdynf\kdynf\dynnf}
+
+\def\dynfp{\kdynf\dynp}
+\def\dynsf{\dyns\kern-.3ex\dynnf}
+\def\dynsfz{\dynsf\dynz}
+

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 9a5256e9aa8fe7ef08ca1787eb53aa4074cd7d0c..670a25a644d29e43b643a467e6c9902f038579e0 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -97,24 +97,7 @@
 }
 
 
-\def\kdynf{{\dynfont \char0\kern-.2ex}}
-\def\kdynm{{\dynfont \char1\kern-.18ex}}
-\def\kdynp{{\dynfont \char2\kern-.08ex}}
-\def\kdyns{{\dynfont \char3\kern-.22ex}}
-\def\kdynz{{\dynfont \char4\kern-.2ex}}
-
-\def\dynp{\kdynp}
-\def\dynpp{\dynp\kdynp}
-\def\dynppp{\dynpp\kdynp}
-\def\dynmp{\kdynm\kdynp}
-\def\dynmf{\kdynm\kdynf}
-\def\dynf{\kdynf}
-\def\dynff{\dynf\kdynf}
-\def\dynfff{\dynff\kdynf}
-
-\def\dynfp{\kdynf\kern.35ex\kdynp}
-\def\dynsf{\kdyns\kdynf}
-\def\dynsfz{\dynsf\kern.3ex\kdynz}
+\input dyndefs
 
 \input taupindefs
 
@@ -256,6 +239,13 @@
                 \renewcommand{\@oddfoot}{\ifnum\thepage=1
         {\hfil \LilyIdString
         }\else{foo\hfil\the\pageno\hfil}\fi}}
+        \def\ps@empty{
+                \renewcommand{\@oddhead}{}%
+                \renewcommand{\@evenfoot}{}%
+                \renewcommand{\@evenhead}{}%
+                \renewcommand{\@oddfoot}{\ifnum\thepage=1
+        {\hfil \LilyIdString
+        }\else{foo\hfil\the\pageno\hfil}\fi}}
 \fi