updated with TeX Live 2014.

removed some unused flags.

diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h
index 2e7583c..ce8a1ff 100644 (file)
--- a/src/texsourc/coerce.h
+++ b/src/texsourc/coerce.h
@@ -501,5 +501,7 @@ void close_files_and_terminate(void);
 void final_cleanup(void);
 void init_prim(void);
 void debug_help(void);
+void fix_date_and_time(void);
+
 int main_program(void);
 int main_init(int ac, char ** av);
\ No newline at end of file

diff --git a/src/texsourc/itex.c b/src/texsourc/itex.c
index ea16f32..87c35d0 100644 (file)
--- a/src/texsourc/itex.c
+++ b/src/texsourc/itex.c
@@ -2092,7 +2092,7 @@ int main_program (void)
   history = fatal_error_stop;
 
   if (ready_already == 314159L)
-    goto lab1;
+    goto start_of_TEX;
 
   bad = 0;
 
@@ -2196,27 +2196,39 @@ int main_program (void)
 
   ready_already = 314159L;
 
-lab1:
+start_of_TEX:
   selector = term_only;
   tally = 0;
   term_offset = 0;
   file_offset = 0;
-  show_line(tex_version, 0);
 
+  {
+    char dist_ver[256];
 #ifdef _WIN32
   #ifdef _WIN64
-    printf(" (%s %s/Win64)", application, yandyversion);
+    sprintf(dist_ver, "%s (%s %s/Win64)", tex_version, application, yandyversion);
   #else
-    printf(" (%s %s/Win32)", application, yandyversion);
+    sprintf(dist_ver, "%s (%s %s/Win32)", tex_version, application, yandyversion);
   #endif
 #else
-    printf(" (%s %s/Linux)", application, yandyversion);
+    sprintf(dist_ver, "%s (%s %s/Linux)", tex_version, application, yandyversion);
 #endif
+    prints(dist_ver);
+  }
 
-  if (format_ident > 0)
+  if (format_ident == 0)
+  {
+    prints(" (preloaded format=");
+    prints(format_name);
+    prints(")");
+    print_ln();
+  }
+  else
+  {
     slow_print(format_ident);
+    print_ln();
+  }
 
-  print_ln();
   update_terminal();
   job_name = 0;
   name_in_progress = false;
@@ -2260,16 +2272,15 @@ lab1:
       first = last + 1;
     }
     
-    if ((format_ident == 0) || (buffer[loc] == '&') ||
-      (buffer[loc] == '+'))
+    if ((format_ident == 0) || (buffer[loc] == '&') || (buffer[loc] == '+'))
     {
       if (format_ident != 0)
         initialize();
 
-      if (!open_fmt_file ())
+      if (!open_fmt_file())
         goto final_end;
 
-      if (!load_fmt_file ())
+      if (!load_fmt_file())
       {
 #ifdef COMPACTFORMAT
         gzclose(gz_fmt_file);
@@ -2601,8 +2612,8 @@ void do_initex (void)
 
   reset_trie();
   text(frozen_protection) = 1184; /* "inaccessible" */
-  format_ident = 1251;
-  text(end_write) = 1290;
+  format_ident = 1251;            /* " (INITEX)" */
+  text(end_write) = 1290;         /* "endwrite" */
   eq_level(end_write) = level_one;
   eq_type(end_write) = outer_call;
   equiv(end_write) = 0;

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index 758e69f..7e8c0f4 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -1860,7 +1860,6 @@ boolean prime (int x)
 
 int quitflag  = 0;
 boolean show_use = false;
-boolean floating = false;
 
 void complainarg (int c, char *s)
 {
@@ -2146,7 +2145,6 @@ void check_alloc_align (int flag)
 
 boolean backwardflag       = false; /* don't cripple all advanced features */
 boolean shorten_file_name  = false; /* don't shorten file names to 8+3 for DOS */
-boolean usesourcedirectory = true;  /* use source file directory as local when WorkingDirectory is set */
 
 /* cache to prevent allocating twice in a row */
 
@@ -2155,7 +2153,7 @@ char * lastvalue = NULL;
 
 /* returns allocated string -- these strings are not freed again */
 /* is it safe to do that now ? 98/Jan/31 */
-char * grabenv (char * varname)
+char * grabenv (const char * varname)
 {
   char *s;
 
@@ -2193,9 +2191,9 @@ char * grabenv (char * varname)
     return NULL;
 }
 
-void flush_trailing_slash (char *directory)
+void flush_trailing_slash(char * directory)
 {
-  char *s;
+  char * s;
 
   if (strcmp(directory, "") != 0)
   {
@@ -2224,11 +2222,9 @@ void knuthify (void)
   default_rule          = 26214; /* revert to default rule thickness */
   pseudo_tilde          = false;
   pseudo_space          = false;
-  show_texinput_flag    = false;
   truncate_long_lines   = false;
   allow_quoted_names    = false;
   show_cs_names         = false;
-  font_dimen_zero       = false;
   ignore_frozen         = false;
   suppress_f_ligs       = false;
   full_file_name_flag   = false;
@@ -2240,34 +2236,35 @@ void knuthify (void)
 char * xchr_file = NULL;
 char * repl_file = NULL;
 
-char * short_options = "m:e:h:0:H:g:P:o:l:a:wvpiKLZMdp2t?u";
+const char * short_options = "m:e:h:0:H:g:P:o:l:a:k:wvpiKLZMdp2t?u";
 
 static struct option long_options[] =
 {
-  {"main-memory",   1, 0, 'm'},
-  {"hyph-size",     1, 0, 'e'},
-  {"trie-size",     1, 0, 'h'},
-  {"backend",       1, 0, '0'},
-  {"tab-step",      1, 0, 'H'},
-  {"percent-grow",  1, 0, 'g'},
-  {"default-rule",  1, 0, 'P'},
-  {"dvi-dir",       1, 0, 'o'},
-  {"log-dir",       1, 0, 'l'},
-  {"aux-dir",       1, 0, 'a'},
-  {"showhex",       0, 0, 'w'},
-  {"verbose",       0, 0, 'v'},
-  {"patterns",      0, 0, 'p'},
-  {"initex",        0, 0, 'i'},
-  {"knuthify",      0, 0, 'K'},
-  {"cstyle",        0, 0, 'L'},
-  {"showtfm",       0, 0, 'Z'},
-  {"showmissing",   0, 0, 'M'},
-  {"deslash",       0, 0, 'd'},
-  {"patterns",      0, 0, 'p'},
-  {"suppressflig",  0, 0, '2'},
-  {"trace",         0, 0, 't'},
-  {"help",          0, 0, '?'},
-  {"usage",         0, 0, 'u'},
+  {"main-memory",   required_argument, NULL, 'm'},
+  {"hyph-size",     required_argument, NULL, 'e'},
+  {"trie-size",     required_argument, NULL, 'h'},
+  {"backend",       required_argument, NULL, '0'},
+  {"tab-step",      required_argument, NULL, 'H'},
+  {"percent-grow",  required_argument, NULL, 'g'},
+  {"default-rule",  required_argument, NULL, 'P'},
+  {"dvi-dir",       required_argument, NULL, 'o'},
+  {"log-dir",       required_argument, NULL, 'l'},
+  {"aux-dir",       required_argument, NULL, 'a'},
+  {"key-file",      required_argument, NULL, 'k'},
+  {"showhex",       no_argument,       NULL, 'w'},
+  {"verbose",       no_argument,       NULL, 'v'},
+  {"patterns",      no_argument,       NULL, 'p'},
+  {"initex",        no_argument,       NULL, 'i'},
+  {"knuthify",      no_argument,       NULL, 'K'},
+  {"cstyle",        no_argument,       NULL, 'L'},
+  {"showtfm",       no_argument,       NULL, 'Z'},
+  {"showmissing",   no_argument,       NULL, 'M'},
+  {"deslash",       no_argument,       NULL, 'd'},
+  {"patterns",      no_argument,       NULL, 'p'},
+  {"suppressflig",  no_argument,       NULL, '2'},
+  {"trace",         no_argument,       NULL, 't'},
+  {"help",          no_argument,       NULL, '?'},
+  {"usage",         no_argument,       NULL, 'u'},
   {NULL,            0, 0, 0}
 };
 
@@ -2282,29 +2279,29 @@ int analyze_flag (int c, char *optarg)
       is_initex = true;
       break;
     case 'Q':
-      interaction = batch_mode; /* quiet mode */
+      interaction = batch_mode;
       break;
     case 'R':
-      interaction = nonstop_mode; /* run mode */
+      interaction = nonstop_mode;
       break;
     case 'S':
-      interaction = scroll_mode; /* scroll mode */
+      interaction = scroll_mode;
       break;
     case 'T':
-      interaction = error_stop_mode; /* tex mode */
+      interaction = error_stop_mode;
       break;
     case 'K':
       backwardflag = true;
       knuthify(); /* revert to `standard' Knuth TeX */
       break;
     case 'L':
-      c_style_flag = true; /* C style error msg 94/Mar/21 */
+      c_style_flag = true;
       break;
     case 'Z':
-      show_tfm_flag = true; /* show TFM in log file 94/Jun/21 */
+      show_tfm_flag = true;
       break;
     case 'M':
-      show_missing = false; /* do not show missing 94/June/10 */
+      show_missing = false;
       break;
     case 'd':
       deslash = false; /* flipped 93/Nov/18 */
@@ -2324,9 +2321,6 @@ int analyze_flag (int c, char *optarg)
     case 'n':
       restrict_to_ascii = true; /* 0 - 127 1994/Jan/21 */
       break;
-    case '7':
-      usesourcedirectory = false; /* use working dir 98/Sep/29 */
-      break;
     case 'f':
       show_fonts_used = false; /* 97/Dec/24 */
       break;
@@ -2339,14 +2333,6 @@ int analyze_flag (int c, char *optarg)
     case '4':
       ignore_frozen = true; /* 98/Oct/5 */
       break;
-    case '5':
-      font_dimen_zero = false; /* 98/Oct/5 */
-      break;
-    case 'F':
-      show_texinput_flag = false; /* 98/Jan/28 */
-      break;
-/*  case 'X':  truncate_long_lines = false; */ /* 98/Feb/2 */
-              /* break; */
     case 'J':
       show_line_break_stats = false; /* 96/Feb/8 */
       break;
@@ -2450,6 +2436,7 @@ int analyze_flag (int c, char *optarg)
       if (tab_step == 0)
         complainarg(c, optarg);
       break;
+
     case 'x':
       if (optarg == 0)
         xchr_file = xstrdup("xchr.map");
@@ -2459,6 +2446,7 @@ int analyze_flag (int c, char *optarg)
       if (xchr_file == NULL || *xchr_file == '\0')
         complainarg(c, optarg);
       break;
+
     case 'k':
       if (optarg == 0)
         repl_file = xstrdup("repl.key");
@@ -2468,6 +2456,7 @@ int analyze_flag (int c, char *optarg)
       if (repl_file == NULL || *repl_file == '\0')
         complainarg(c, optarg);
       break;
+
     case 'P':
       if (optarg == 0)
         default_rule = 26214;
@@ -2477,12 +2466,14 @@ int analyze_flag (int c, char *optarg)
       if (default_rule == 0)
         complainarg(c, optarg);
       break;
+
     case 'E':
       if (optarg != 0)
         putenv(optarg);
       else
         complainarg(c, optarg);
       break;
+
     case 'o':
       if (optarg == 0)
         dvi_directory = "";
@@ -2493,6 +2484,7 @@ int analyze_flag (int c, char *optarg)
         complainarg(c, optarg);
 
       break;
+
     case '0':
       {
         char * format_spec = NULL;
@@ -2510,6 +2502,7 @@ int analyze_flag (int c, char *optarg)
           printf("ERROR: Do not understand shipout flag `%s'\n", format_spec);
       }
       break;
+
     case 'l':
       if (optarg == 0)
         log_directory = "";
@@ -2574,7 +2567,7 @@ int read_command_line (int ac, char **av)
     else
       optargnew = optarg;
 
-    analyze_flag (c, optargnew);
+    analyze_flag(c, optargnew);
   }
 
   if (show_use || quitflag == 3)
@@ -2582,9 +2575,6 @@ int read_command_line (int ac, char **av)
     stamp_it(log_line);
     strcat(log_line, "\n");
     show_line(log_line, 0);
-    //stampcopy(log_line);
-    //strcat(log_line, "\n");
-    //show_line(log_line, 0);
 
     if (show_use)
       show_usage();
@@ -2602,7 +2592,7 @@ int read_command_line (int ac, char **av)
     if (read_xchr_file(repl_file, 1, av))
     {
       if (trace_flag)
-        puts("KEY REPLACE ON\n");
+        puts("KEY REPLACE ON");
 
       key_replace = true;
     }
@@ -2613,7 +2603,7 @@ int read_command_line (int ac, char **av)
     if (read_xchr_file(xchr_file, 0, av))
     {
       if (trace_flag)
-        puts("NON ASCII ON\n");
+        puts("NON ASCII ON");
 
       non_ascii = true;
     }
@@ -2650,7 +2640,6 @@ int init_commands (int ac, char **av)
   show_fmt_flag         = true;  /* show format file in log */
   show_tfm_flag         = false; /* don't show metric file in log */
   shorten_file_name     = false; /* don't shorten file names to 8+3 */
-  show_texinput_flag    = true;  /* show TEXINPUTS and TEXFONTS */
   truncate_long_lines   = true;  /* truncate long lines */
   tab_step              = 0;     /* do not replace tabs with spaces */
   show_line_break_stats = true;  /* show line break statistics 96/Feb/8 */
@@ -2671,7 +2660,6 @@ int init_commands (int ac, char **av)
   mem_extra_low  = 0;
   mem_initex     = 0;
   format_name    = "plain";
-  encoding_name  = "";
 
   if (read_command_line(ac, av) < 0)
     return -1;
@@ -2699,8 +2687,9 @@ void initial_memory (void)
  #if defined(ALLOCATEHIGH) || defined(ALLOCATELOW)
     if (mem_extra_high != 0 || mem_extra_low != 0)
     {
-      puts("ERROR: Cannot extend main memory in iniTeX\n");
-      mem_extra_high = 0;   mem_extra_low = 0;
+      puts("ERROR: Cannot extend main memory in iniTeX");
+      mem_extra_high = 0;
+      mem_extra_low = 0;
     }
 #endif
   }
@@ -2708,13 +2697,13 @@ void initial_memory (void)
   {
     if (mem_initex != 0)
     {
-      puts("ERROR: Can only set initial main memory size in iniTeX\n");
+      puts("ERROR: Can only set initial main memory size in iniTeX");
       mem_initex = 0;
     }
 
     if (trie_size != 0)
     {
-      puts("ERROR: Need only set hyphenation trie size in iniTeX\n");
+      puts("ERROR: Need only set hyphenation trie size in iniTeX");
 /* trie_size = 0; */
     }
   }
@@ -2723,6 +2712,7 @@ void initial_memory (void)
 
   if (trie_size == 0)
     trie_size = default_trie_size;
+
 /* Just in case user mistakenly specified words instead of kilo words */
   if (mem_extra_high > 10000L * 1024L)
     mem_extra_high = mem_extra_high / 1024;
@@ -2735,7 +2725,7 @@ void initial_memory (void)
 
   if (mem_initex > 2048L * 1024L) /* extend main memory by 16 mega byte! */
   {
-    puts("WARNING: There may be no benefit to asking for so much memory\n");
+    puts("WARNING: There may be no benefit to asking for so much memory");
 /* mem_initex = 2048 * 1024; */
   }
 
@@ -2745,7 +2735,7 @@ void initial_memory (void)
   if (new_hyphen_prime > 0)
   {
     if (! is_initex)
-      puts("ERROR: Can only set hyphen prime in iniTeX\n");
+      puts("ERROR: Can only set hyphen prime in iniTeX");
     else
     {
       if (new_hyphen_prime % 2 == 0)
@@ -2769,15 +2759,11 @@ void initial_memory (void)
     percent_grow = 10;   /* lower limit - 10% */
 }
 
-/**********************************************************************/
-
-void perrormod (char *s)
+void perrormod (const char * s)
 {
   printf("`%s': %s\n", s, strerror(errno));
 }
 
-/*************************************************************************/
-
 /* convert tilde to pseudo_tilde to hide it from TeX --- 95/Sep/26 */
 /* convert space to pseudo_space to hide it from TeX --- 97/Jun/5 */
 /* called only if pseudo_tilde != 0 or pseudo_space != 0 */
@@ -2881,14 +2867,14 @@ void deslash_all (int ac, char **av)
   {
     if (deslash)
     {
-      if (trace_flag || debug_flag)
+      if (trace_flag)
         printf("deslash: k %d argv[k] %s (argc %d)\n", optind, av[optind], ac);
 
       unixify(av[optind]);
     }
 
     if (pseudo_tilde != 0 || pseudo_space != 0)
-      hidetwiddle (av[optind]);
+      hidetwiddle(av[optind]);
 
     if (*av[optind] == '&' || *av[optind] == '+')
     {
@@ -2899,14 +2885,14 @@ void deslash_all (int ac, char **av)
       {
         if (deslash)
         {
-          if (trace_flag || debug_flag)
+          if (trace_flag)
             printf("deslash: k %d argv[k] %s (argc %d)\n", optind + 1, av[optind + 1], ac);
 
           unixify(av[optind + 1]);
         }
 
         if (pseudo_tilde != 0 || pseudo_space != 0)
-          hidetwiddle (av[optind + 1]);
+          hidetwiddle(av[optind + 1]);
       }
     }         
   }
@@ -2939,7 +2925,7 @@ int main_init (int ac, char **av)
 #ifdef ALLOCATEBUFFER
   buffer           = NULL;
   current_buf_size = 0;
-  buffer           = realloc_buffer (initial_buf_size);
+  buffer           = realloc_buffer(initial_buf_size);
 #endif
 
   hyph_list  = NULL;
@@ -2957,7 +2943,6 @@ int main_init (int ac, char **av)
   log_opened          = false;  /* so can tell whether opened */
   interaction         = -1;     /* default state => 3 */
   missing_characters  = 0;      /* none yet! */
-  font_dimen_zero     = true;   /* \fontdimen0 for checksum 98/Oct/5 */
   ignore_frozen       = false;  /* default is not to ignore 98/Oct/5 */
   suppress_f_ligs     = false;  /* default is not to ignore f-ligs */
 

diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c
index 1b50d62..ab958a9 100644 (file)
--- a/src/texsourc/tex3.c
+++ b/src/texsourc/tex3.c
@@ -982,14 +982,14 @@ void read_toks_(integer n, pointer r)
           read_open[m] = normal;
         else
         {
-          (void) a_close(read_file[m]);
+          a_close(read_file[m]);
           read_open[m] = closed;
         }
       else
       {
         if (!input_ln(read_file[m], true))
         {
-          (void) a_close(read_file[m]);
+          a_close(read_file[m]);
           read_open[m] = closed;
 
           if (align_state != 1000000L)

diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c
index ca6d86c..09c5597 100644 (file)
--- a/src/texsourc/tex9.c
+++ b/src/texsourc/tex9.c
@@ -120,7 +120,7 @@ void close_files_and_terminate (void)
   for (k = 0; k <= 15; k++)
     if (write_open[k])
     {
-      (void) a_close(write_file[k]);
+      a_close(write_file[k]);
     }
 
 #ifdef STAT

diff --git a/src/texsourc/texd.h b/src/texsourc/texd.h
index b9aaaac..faecb0c 100644 (file)
--- a/src/texsourc/texd.h
+++ b/src/texsourc/texd.h
@@ -732,12 +732,10 @@ EXTERN pointer write_loc;
 EXTERN pool_pointer edit_name_start;
 EXTERN integer edit_name_length, edit_line;
 EXTERN int tfm_temp;
-
 /* new variables defined in local.c */
 EXTERN boolean is_initex;
 EXTERN boolean verbose_flag;
 EXTERN boolean trace_flag;
-EXTERN boolean debug_flag;
 EXTERN boolean open_trace_flag;
 EXTERN boolean knuth_flag;
 EXTERN boolean no_interrupts;
@@ -765,18 +763,16 @@ EXTERN int show_in_hex;
 EXTERN int show_in_dos;
 EXTERN int show_fmt_flag;
 EXTERN int show_tfm_flag;
-EXTERN boolean show_texinput_flag;
 EXTERN boolean truncate_long_lines;
 EXTERN boolean show_cs_names;
 EXTERN int tab_step;
 EXTERN int pseudo_tilde;
 EXTERN int pseudo_space;
-EXTERN int allow_quoted_names;
+EXTERN boolean allow_quoted_names;
 EXTERN int default_rule;
 EXTERN char * format_file;
 EXTERN char * source_direct;
 EXTERN char * format_name;
-EXTERN char * encoding_name;
 EXTERN boolean show_line_break_stats;
 EXTERN int first_pass_count;
 EXTERN int second_pass_count;
@@ -788,7 +784,6 @@ EXTERN int overfull_vbox;
 EXTERN int paragraph_failed;
 EXTERN int single_line;
 EXTERN FILE * errout;
-EXTERN int font_dimen_zero;
 EXTERN int ignore_frozen;
 EXTERN boolean suppress_f_ligs;
 EXTERN int jump_used;
@@ -823,8 +818,9 @@ int realloc_hyphen(int hyphen_prime);
 int allocate_tries(int trie_max);
 void probe_memory(void);
 void print_cs_names (FILE * output, int pass);
-void perrormod(char * s);
-char * grabenv(char * varname);
+void perrormod(const char * s);
+char * grabenv(const char * varname);
+void flush_trailing_slash(char * directory);
 boolean prime(int x);
 int endit(int flag);
 

diff --git a/src/texsourc/texmf.h b/src/texsourc/texmf.h
index b4c8954..152d7c0 100644 (file)
--- a/src/texsourc/texmf.h
+++ b/src/texsourc/texmf.h
@@ -32,19 +32,19 @@ enum
 };
 
 /* Read a line of input as quickly as possible.  */
-extern boolean input_line (FILE *);
+extern boolean input_line (FILE * f);
 #define input_ln(stream, flag) input_line(stream)
-
-#define b_open_in(f)  open_input  (&(f), TFMFILEPATH,   FOPEN_RBIN_MODE)
-#define w_open_in(f)  open_input  (&(f), TEXFORMATPATH, FOPEN_RBIN_MODE)
-#define b_open_out(f) open_output (&(f), FOPEN_WBIN_MODE)
-#define w_open_out    b_open_out
-#define b_close       a_close
-#define w_close       a_close
-#define gz_w_close    gzclose
-
-/* sec 0241 */
-extern void fix_date_and_time(void);
+/* sec 0027 */
+#define a_open_in(f, p) open_input  (&(f), p, FOPEN_R_MODE)
+#define a_open_out(f)   open_output (&(f), FOPEN_W_MODE)
+#define b_open_in(f)    open_input  (&(f), TFMFILEPATH, FOPEN_RBIN_MODE)
+#define b_open_out(f)   open_output (&(f), FOPEN_WBIN_MODE)
+#define w_open_in(f)    open_input  (&(f), TEXFORMATPATH, FOPEN_RBIN_MODE)
+#define w_open_out      b_open_out
+#define a_close(f)         (void) check_fclose(f)
+#define b_close         a_close
+#define w_close         a_close
+#define gz_w_close      gzclose
 
 /* If we're running under Unix, use system calls instead of standard I/O
    to read and write the output files; also, be able to make a core dump. */ 
@@ -55,12 +55,12 @@ extern void fix_date_and_time(void);
 #endif
 
 #ifdef COMPACTFORMAT
-extern int do_dump   (char *, int, int, gzFile);
-extern int do_undump (char *, int, int, gzFile);
+extern int do_dump   (char * p, int item_size, int nitems, gzFile out_file);
+extern int do_undump (char * p, int item_size, int nitems, gzFile out_file);
 #define dump_file gz_fmt_file
 #else
-extern int do_dump   (char *, int, int, FILE *);
-extern int do_undump (char *, int, int, FILE *);
+extern int do_dump   (char * p, int item_size, int nitems, FILE * out_file);
+extern int do_undump (char * p, int item_size, int nitems, FILE * out_file);
 #define dump_file fmt_file
 #endif
 
@@ -70,7 +70,7 @@ extern int do_undump (char *, int, int, FILE *);
 #define undumpthings(base, len)         \
   do_undump ((char *) &(base), sizeof (base), (int) (len), dump_file)
 
-/* Use the above for all the other dumping and undumping.  */
+/* Use the above for all the other dumping and undumping. */
 #define generic_dump(x)   dumpthings(x, 1)
 #define generic_undump(x) undumpthings(x, 1)
 

diff --git a/src/texsourc/yandy_pool.c b/src/texsourc/yandy_pool.c
index ca0e77a..668e9d9 100644 (file)
--- a/src/texsourc/yandy_pool.c
+++ b/src/texsourc/yandy_pool.c
@@ -561,7 +561,7 @@ static const char *pool_file_arr[] =
 /* 0793 */  "", //"transcript file name",
 /* 0794 */  "  ",
 /* 0795 */  "nullfont",
-/* 0796 */  "Font ",
+/* 0796 */  "", //"Font ",
 /* 0797 */  "", //" scaled ",
 /* 0798 */  "", //" not loadable: Bad metric (TFM) file",
 /* 0799 */  "", //" not loadable: Metric (TFM) file not found",

diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h
index 4d14193..3286b65 100644 (file)
--- a/src/texsourc/yandytex.h
+++ b/src/texsourc/yandytex.h
@@ -93,20 +93,16 @@ typedef enum
 #define incr(x)  ++(x)
 #define fabs(x)  ((x) >= 0.0 ? (x) : -(x))
 #define toint(x) ((integer) (x))
-#define a_open_in(f, p) open_input (&(f), p, FOPEN_R_MODE)
-#define a_open_out(f)   open_output (&(f), FOPEN_W_MODE)
-#define a_close(f)         check_fclose (f)
 
 #define MAXLINE 256
 
-extern integer web2c_round (double);
-extern boolean eoln (FILE * file);
-extern boolean open_input (FILE **f, path_constant_type path_index, char *fopen_mode);
-extern boolean open_output (FILE **f, char *fopen_mode);
-extern int check_fclose (FILE * f);
+extern integer web2c_round (double r);
+extern boolean open_input  (FILE ** f, path_constant_type path_index, char * fopen_mode);
+extern boolean open_output (FILE ** f, char * fopen_mode);
+extern int check_fclose    (FILE * f);
 
 #define show_line(str, flag) fputs(str, stdout)
-#define show_char(chr) putc(chr, stdout)
+#define show_char(chr)       putc(chr, stdout)
 extern char log_line[];
 
 #endif