From dd0b074a72ac95ad56ea611c027781c91737fd17 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 3 Oct 1997 08:54:38 +0200 Subject: [PATCH] patch::: 0.1.18.jcn2: patsje --- VERSION | 2 +- lily/keyword.cc | 17 +---------------- mf/dyn10.mf | 10 ++++++++-- mf/ital-m.mf | 2 +- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index 48f91a7a72..1e754bd1e5 100644 --- 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 0274d1653f..ebedc63b2b 100644 --- a/lily/keyword.cc +++ b/lily/keyword.cc @@ -5,22 +5,7 @@ #include #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 2eb10e628c..a657e63443 100644 --- 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 d132ad31c1..5c39492c75 100644 --- 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; -- 2.39.2