patch::: 0.1.18.jcn2: patsje

diff --git a/VERSION b/VERSION
index 48f91a7a72494ea4adc1709e9d1dd73cd991c957..1e754bd1e5bb7b2969a648b4ae4e42db7473c7bb 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 18
-TOPLEVEL_MY_PATCH_LEVEL = .jcn1
+TOPLEVEL_MY_PATCH_LEVEL = .jcn2
 
 # use the above to send patches, always empty for released version:

diff --git a/lily/keyword.cc b/lily/keyword.cc
index 0274d1653fc2bdd5a8bcc75749e8e48cf6c27343..ebedc63b2ba61d1507910e79457d46b5f628b581 100644 (file)
--- a/lily/keyword.cc
+++ b/lily/keyword.cc
@@ -5,22 +5,7 @@
 #include <stdlib.h>
 
 #include "my-lily-lexer.hh"
-
-/* for the keyword table */
-struct Keyword_ent
-{
-  char const *name;
-  int     tokcode;
-};
-
-struct Keyword_table
-{
-  Keyword_ent *table;
-  int     maxkey;
-  Keyword_table (Keyword_ent *);
-  int     lookup (char const *s) const;
-};
-
+#include "keyword.hh"
 
 /* for qsort */
 int

diff --git a/mf/dyn10.mf b/mf/dyn10.mf
index 2eb10e628c14cc083f2db1b4a704d3be027b87bc..a657e6344302923e603b9c41a1530a4a8aa05eba 100644 (file)
--- a/mf/dyn10.mf
+++ b/mf/dyn10.mf
@@ -124,6 +124,8 @@ font_setup;
 
 input ital-f;
 stem#:=54/36pt#;    % lowercase stem breadth
+hair#:=12/36pt#;    % lowercase hairline breadth
+vair#:=7/36pt#;    % vertical diameter of hairlines
 
 % mode_setup; font_setup;
 font_setup;
@@ -133,16 +135,20 @@ input ital-p;
 slant:=.28;      % tilt ratio $(\Delta x/\Delta y)$
 stem#:=26/36pt#;    % lowercase stem breadth
 ess#:=24/36pt#;      % breadth in middle of lowercase s
+hair#:=9/36pt#;    % lowercase hairline breadth
+vair#:=6/36pt#;    % vertical diameter of hairlines
+flare#:=32/36pt#;    % diameter of bulbs or breadth of terminals
 
 crisp#:=13/36pt#;    % diameter of serif corners
 tiny#:=13/36pt#;    % diameter of rounded corners
 fine#:=10/36pt#;    % diameter of sharply rounded corners
 thin_join#:=10/36pt#;    % width of extrafine details
-hair#:=20/36pt#;    % lowercase hairline breadth
+% hair#:=20/36pt#;    % lowercase hairline breadth
 % stem#:=38/36pt#;    % lowercase stem breadth
 curve#:=43/36pt#;    % lowercase curve breadth
-flare#:=42/36pt#;    % diameter of bulbs or breadth of terminals
+% flare#:=42/36pt#;    % diameter of bulbs or breadth of terminals
 % ess#:=35/36pt#;      % breadth in middle of lowercase s
+% vair#:=13/36pt#;    % vertical diameter of hairlines
 
 % mode_setup; font_setup;
 font_setup;

diff --git a/mf/ital-m.mf b/mf/ital-m.mf
index d132ad31c18781e36b9d0f684c6c54d8702ed7e3..5c39492c7592f6d2381e16978cd5e69943219fcc 100644 (file)
--- a/mf/ital-m.mf
+++ b/mf/ital-m.mf
@@ -13,7 +13,7 @@
 % beginchar("m",15u#,x_height#,0);
 \"Dynamic letter m";
 % beginchar(incr num,15u#,x_height#,0);
-beginchar(incr num,10u#,x_height#,0);
+beginchar(incr num,12u#,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;