Font changes - added 360DPI font and thinned the baroque font

paul-bayleaf · Jul 25, 2019 · 0bf5099 · 0bf5099
1 parent eb997ed
commit 0bf5099
Show file tree

Hide file tree

Showing 36 changed files with 50 additions and 16 deletions.
diff --git a/args.cc b/args.cc
@@ -240,6 +240,10 @@ void set_6(const char *value, struct file_info *f) {
 void set_300(const char *value, struct file_info *f) {
   f->flags &= ~DPI600;
 }
+void set_360(const char *value, struct file_info *f) {
+  f->flags &= ~DPI600;
+  f->m_flags |= DPI360;
+}
 void set_24(const char *value, struct file_info *f) {
   f->m_flags |= DPI2400;
   f->flags &= ~DPI600;
@@ -550,6 +554,7 @@ void args(int argc, char ** argv, struct file_info *f)
       {(char*)"1200", (void*)set_2},
       {(char*)"2400", (void*)set_24},
       {(char*)"300", (void*)set_300},
+      {(char*)"360", (void*)set_360},
       {(char*)"4", (void*)set_4},
       {(char*)"5", (void*)set_5},
       {(char*)"6", (void*)set_6},

diff --git a/blute.mf b/blute.mf
@@ -14,15 +14,26 @@ define_good_y_pixels(flag_top);
 pickup pencircle scaled 0.5wid;
 tiny_circle := savepen;
 %
-pickup pencircle xscaled 1.8wid yscaled .9 wid rotated 45;
+% pickup pencircle xscaled 1.8wid yscaled .9 wid rotated 45;
+% pickup pencircle xscaled 1.62wid yscaled .81 wid rotated 45;
+% pickup pencircle xscaled 1.44wid yscaled .72 wid rotated 45;
+pickup pencircle xscaled 1.44wid yscaled .62 wid rotated 45;
 lute_pen := savepen;
-pickup pencircle xscaled .9wid yscaled .4 wid rotated 45;
+% pickup pencircle xscaled .9wid yscaled .4 wid rotated 45;
+% pickup pencircle xscaled .81wid yscaled .36 wid rotated 45;
+pickup pencircle xscaled .72wid yscaled .32 wid rotated 45;
 lute_test := savepen;
-pickup pencircle xscaled 2wid yscaled 1wid rotated 50;
+% pickup pencircle xscaled 2wid yscaled 1wid rotated 50;
+% pickup pencircle xscaled 1.8wid yscaled .9wid rotated 50;
+pickup pencircle xscaled 1.6wid yscaled .8wid rotated 50;
 bigger_lute_pen := savepen;
-pickup pencircle xscaled 1.5wid yscaled .7 wid rotated 45;
+% pickup pencircle xscaled 1.5wid yscaled .7 wid rotated 45;
+% pickup pencircle xscaled 1.35wid yscaled .63 wid rotated 45;
+pickup pencircle xscaled 1.20wid yscaled .56 wid rotated 45;
 flag_pen := savepen;
-pickup pencircle xscaled .3wid yscaled .1 rotated 50;
+% pickup pencircle xscaled .3wid yscaled .1 rotated 50;
+% pickup pencircle xscaled .27wid yscaled .09 rotated 50;
+pickup pencircle xscaled .24wid yscaled .08 rotated 50;
 stem_pen := savepen;
 %
 def do_v_bar = 

diff --git a/blute6.1200pk b/blute6.1200pk
diff --git a/blute6.300pk b/blute6.300pk
diff --git a/blute6.600pk b/blute6.600pk
diff --git a/blute7.1200pk b/blute7.1200pk
diff --git a/blute7.300pk b/blute7.300pk
diff --git a/blute7.600pk b/blute7.600pk
diff --git a/blute8.1200pk b/blute8.1200pk
diff --git a/blute8.300pk b/blute8.300pk
diff --git a/blute8.600pk b/blute8.600pk
diff --git a/blute85.1200pk b/blute85.1200pk
diff --git a/blute85.300pk b/blute85.300pk
diff --git a/blute85.600pk b/blute85.600pk
diff --git a/blute9.1200pk b/blute9.1200pk
diff --git a/blute9.300pk b/blute9.300pk
diff --git a/blute9.600pk b/blute9.600pk
diff --git a/blute9.mf b/blute9.mf
@@ -17,6 +17,7 @@ enddef;
 %
 %mode:=MyLaser;
 %mode:=cxnew;
+% mode:=canonex
 mode_setup;
 
 %

diff --git a/dvi_f.cc b/dvi_f.cc
@@ -366,8 +366,9 @@ struct list *l)			/* data */
 
     if (f->flags & NOTES ) {
 
-      if (f->line_flag == ON_LINE) p->movev( -5.5 * d_i_space);
-      else p->movev ( -6.0 * d_i_space);     /* to top of staff */
+//      if (f->line_flag == ON_LINE) p->movev( -5.5 * d_i_space);
+	if (f->line_flag == ON_LINE) p->movev( -.5 * d_i_space);
+// 2019      else p->movev ( -6.0 * d_i_space);     /* to top of staff */
 
       if (f->flags & FIVE) {
 	p->movev(i_space); 
@@ -376,14 +377,14 @@ struct list *l)			/* data */
 	p->movev(2 * i_space); 
       }
 
+// 	printf("dvi_f.cc: st_text %f text_sp %f  f->n_text %d f->c_space %f\n",st_text, text_sp, f->n_text, f->c_space);
       p->movev ( -st_text);
       p->movev ( -text_sp * f->n_text - f->c_space);
-      p->movev ( -3 * m_space - .01 /* fudge */);
-/*
+      p->movev ( -2 * m_space + .004 /* fudge */);  // was -2 July 2019 wbc  was -0.01
       mapchar(p, f_a, 'Z', f);
       p->movev( -m_space);
       mapchar(p, f_a, 'Z', f);
-  */ 
+
       if (f->m_flags & TWOSTAFF ) {
 	p->movev( -5 * m_space );
 	p->movev( -text_sp * f->n_text );

diff --git a/lute.mf b/lute.mf
@@ -837,7 +837,7 @@ endchar;enddef;
 %
  if unknown dw: dw# = 1.5wid#;fi;
  define_blacker_pixels(dw);  
-%  define_pixels(dw);  %%% wbc Jult 2019
+%  define_pixels(dw);  %%% wbc July 2019
  def my_dot(suffix $)(expr wid)(expr hi) = 
  fill fullcircle scaled dw shifted (wid, hi);
 enddef;

diff --git a/lute6.1200pk b/lute6.1200pk
diff --git a/lute6.300pk b/lute6.300pk
diff --git a/lute6.600pk b/lute6.600pk
diff --git a/lute7.1200pk b/lute7.1200pk
diff --git a/lute7.300pk b/lute7.300pk
diff --git a/lute7.600pk b/lute7.600pk
diff --git a/lute8.1200pk b/lute8.1200pk
diff --git a/lute8.600pk b/lute8.600pk
diff --git a/lute85.1200pk b/lute85.1200pk
diff --git a/lute9.1200pk b/lute9.1200pk
diff --git a/lute9.300pk b/lute9.300pk
diff --git a/lute9.600pk b/lute9.600pk
diff --git a/mk_600 b/mk_600
@@ -17,6 +17,7 @@
 set MODE=docutech
 # set MODE=canonex
 # set MODE=cxnew
+# set MODE=MyLaser
 #
 # if using precompiled modes set here, otherwise in lute9
 #
@@ -43,7 +44,7 @@ if ($#argv == 0  ) then
   rm ./lute6.600gf
   rm lute*log lute*600gf
 else  
-  if ( $1 == 'b' ) then
+  if ( $1 == 'b'  || $1 == '-b') then
     echo baroque font
     mf "\mode:=$MODE; \mag:=1.0; input blute9; bye;"
     gftopk ./blute9.600gf > ./blute9.600pk

diff --git a/ps_print.cc b/ps_print.cc
@@ -176,12 +176,16 @@ void ps_print::file_head()
     ps_header.PutString("%%BeginSetup\n");
     if (f_i->flags & DPI600)  {
 	ps_header.PutString("%%Feature: *Resolution 600\n");
-        //printf ("ps_print.cc: 1386: 600 \n");
+        printf ("ps_print.cc: 179: 600 \n");
     }
     else if (f_i->m_flags & DPI1200) 
 	ps_header.PutString("%%Feature: *Resolution 1200\n");
     else if (f_i->m_flags & DPI2400) 
 	ps_header.PutString("%%Feature: *Resolution 2400\n");
+    else if (f_i->m_flags & DPI360) {
+	ps_header.PutString("%%Feature: *Resolution 360\n");
+        printf ("ps_print.cc: 187: 360 \n"); 
+    }
     else ps_header.PutString("%%Feature: *Resolution 300\n");
 
 #ifdef MAC
@@ -265,6 +269,8 @@ void ps_print::file_head()
 	strcat (pk_name, ".2400pk");
     else if (f_i->flags & DPI600)
 	strcat (pk_name, ".600pk");
+    else if (f_i->flags & DPI360)
+	strcat (pk_name, ".360pk");
     else
 	strcat (pk_name, ".300pk");
 
@@ -846,7 +852,7 @@ void ps_print::put_med_slant(int bloc, int eloc)
 void ps_print::put_slant(int bloc, int eloc) 
 {
     saveloc(REGS-1);
-
+    // printf("put_slant \n");
     ps_command(LINE, save_h[bloc], save_v[bloc], save_h[eloc], save_v[eloc]);
 
     getloc(REGS-1);
@@ -1083,8 +1089,8 @@ void ps_print::ps_command(int com, int h_n, int v_n, int hh_n, int vv_n)
     pr_out->PutString(" RM\n");
     break;
 
-  case LINE:
-    pr_out->PutString("0.2 setlinewidth ");
+  case LINE:  // the default line thickness set here July 2019 wbc
+    pr_out->PutString("0.27 setlinewidth ");
     pr_out->PutF(d_to_p(h), places);
     pr_out->PutF(d_to_p(v), places);
     pr_out->PutString("MT ");

diff --git a/t.tab b/t.tab
@@ -10,6 +10,14 @@
 % a / is 47 
 $slur_depth=-6.0
 
+b
+0 c    (
+x c  )
+0 c    (
+x c    )
+b
+e
+
 b
 0. e/e/e!/a
 0. E/E/E!/a

diff --git a/tab.h b/tab.h
@@ -253,5 +253,6 @@ struct list {
  #define NOSPACE		0x8000000
  #define NOSPACEBEFORE		0x10000000
  #define COUNT_DOTS		0x20000000
+ #define DPI360			0x40000000
  /* variables defined in sizes.c */