version 2.3.0-final.

diff --git a/src/texsourc/Makefile.linux.gcc b/src/texsourc/Makefile.linux.gcc
index 92c4529..e867526 100644 (file)
--- a/src/texsourc/Makefile.linux.gcc
+++ b/src/texsourc/Makefile.linux.gcc
@@ -8,7 +8,7 @@
 #\r
 \r
 CC = gcc\r
-CFLAGS = -g -c -O2 -Wno-unused-result\r
+CFLAGS = -g -c -O2\r
 LDFLAGS = libdpx.a libpng.a libz.a /home/clerk/dev/extra/lib/libkpathsea.a -lm\r
 \r
 objects = yandytex.o itex.o openinou.o subroute.o local.o \\r

diff --git a/src/texsourc/Makefile.macosx.clang b/src/texsourc/Makefile.macosx.clang
index 3c44789..9f58356 100644 (file)
--- a/src/texsourc/Makefile.macosx.clang
+++ b/src/texsourc/Makefile.macosx.clang
@@ -7,7 +7,7 @@
 #\r
 \r
 CC = clang\r
-CFLAGS = -g -c -O2 -Wno-unused-result -Wno-dangling-else -I/Users/maqiyuan/dev/extra/include\r
+CFLAGS = -g -c -O2 -I/Users/maqiyuan/dev/extra/include\r
 LDFLAGS = /Users/maqiyuan/dev/extra/lib/libkpathsea.a libdpx.a libpng.a libz.a -lm\r
 \r
 objects = yandytex.o itex.o openinou.o subroute.o local.o \\r

diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h
index 2efec95..8622351 100644 (file)
--- a/src/texsourc/coerce.h
+++ b/src/texsourc/coerce.h
@@ -40,8 +40,7 @@ void print_cs_(integer p);
 #define print_cs(p) print_cs_((integer) (p))\r
 void sprint_cs (pointer p);\r
 void print_file_name (integer n, integer a, integer e);\r
-void print_size_(integer s);\r
-#define print_size(s) print_size_((integer) (s))\r
+void print_size (integer s);\r
 void print_write_whatsit_(const char * s, pointer p);\r
 #define print_write_whatsit(s, p) print_write_whatsit_((const char *) (s), (pointer) (p))\r
 void jump_out (void);\r

diff --git a/src/texsourc/dpx.c b/src/texsourc/dpx.c
index 48b64de..00d9555 100644 (file)
--- a/src/texsourc/dpx.c
+++ b/src/texsourc/dpx.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "dpx.h"\r
 #include "yandytex.h"\r
 \r

diff --git a/src/texsourc/itex.c b/src/texsourc/itex.c
index 50b0b52..59269c8 100644 (file)
--- a/src/texsourc/itex.c
+++ b/src/texsourc/itex.c
@@ -20,7 +20,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 #define BEGINFMTCHECKSUM 367403084L\r
@@ -1972,20 +1971,20 @@ void show_frozen (void)
 {\r
   int i;\r
 \r
-  fprintf(log_file, "\n(%lld fonts frozen in format file:\n", font_ptr);\r
+  log_printf("\n(%lld fonts frozen in format file:\n", font_ptr);\r
 \r
   for (i = 1; i <= font_ptr; i++)\r
   {\r
     if (i > 1)\r
-      fprintf(log_file, ", ");\r
+      log_printf(", ");\r
 \r
     if ((i % 8) == 0)\r
-      fprintf(log_file, "\n");\r
+      log_printf("\n");\r
 \r
     fwrite(&str_pool[str_start[font_name[i]]], 1, length(font_name[i]), log_file);\r
   }\r
 \r
-  fprintf(log_file, ") ");\r
+  log_printf(") ");\r
 }\r
 \r
 int main_program (void)\r

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index 5e7d011..1bfec9a 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -39,7 +39,7 @@
 #endif\r
 \r
 #if   defined (__clang__)\r
-const char * compiler = "Clang/LLVM";\r
+const char * compiler = "Clang";\r
 #elif defined (__GNUC__) || defined(__GNUG__)\r
 const char * compiler = "GCC";\r
 #elif defined (_MSC_VER)\r
@@ -93,7 +93,7 @@ boolean reorder_arg_flag  = true;  /* put command line flags/arguments first */
 void show_usage (void)\r
 {\r
   printf("\n"\r
-      "Useage: yandytex [OPTION]... [+format_file] [tex_file]\n\n"\r
+      "Useage: yandytex [OPTION]... [+format_file] [file]\n\n"\r
       "--help       -?  show this usage summary\n"\r
       "--initex     -i  start up as initex (create format file)\n"\r
       "--verbose    -v  be verbose (show implementation version number)\n"\r
@@ -507,7 +507,7 @@ void memory_error (const char * s, int n)
 {\r
   if (log_opened)\r
   {\r
-    fprintf(log_file, "\n! Unable to allocate %d bytes for %s\n", n, s);\r
+    log_printf("\n! Unable to allocate %d bytes for %s\n", n, s);\r
     show_maximums(log_file);\r
   }\r
 \r
@@ -3271,7 +3271,7 @@ void dvi_font_show (internal_font_number f, int suppressname)
 \r
     checksum = (((font_check[f].b0) << 8 | font_check[f].b1) << 8 | font_check[f].b2) << 8 | font_check[f].b3;\r
     decode_fourty(checksum, checksumvector);\r
-    fprintf(log_file, "encoding: %s..", checksumvector);\r
+    log_printf("encoding: %s..", checksumvector);\r
   }\r
 \r
   putc('\n', log_file);\r
@@ -3293,7 +3293,7 @@ void show_font_info (void)
 \r
   fnumtable = (short *) malloc(fcount * sizeof(short));\r
 \r
-  fprintf(log_file, "\nUsed %d font%s:\n", fcount, (fcount == 1) ? "" : "s");\r
+  log_printf("\nUsed %d font%s:\n", fcount, (fcount == 1) ? "" : "s");\r
 \r
   fcount = 0;\r
 \r

diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c
index c9987b0..1da9949 100644 (file)
--- a/src/texsourc/openinou.c
+++ b/src/texsourc/openinou.c
@@ -248,7 +248,7 @@ boolean open_input (FILE ** f, kpse_file_format_type file_fmt, const char * fope
         else\r
           (void) putc(' ', log_file);\r
 \r
-        fprintf(log_file, "(%s)", name_of_file + 1);\r
+        log_printf("(%s)", name_of_file + 1);\r
         file_offset += n + 3;\r
       }\r
     }\r

diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c
index 7436584..a2129ed 100644 (file)
--- a/src/texsourc/tex0.c
+++ b/src/texsourc/tex0.c
@@ -180,12 +180,12 @@ void print_ (integer s)
           }\r
         }\r
 \r
-        new_line_char = nl; /* restore eol */\r
+        new_line_char = nl;\r
         return;\r
       }\r
     }\r
   }\r
-/*  we get here with s > 256 - i.e. not a single character */\r
+\r
   j = str_start[s];\r
 \r
   while (j < str_start[s + 1])\r
@@ -356,7 +356,7 @@ void print_file_name (integer n, integer a, integer e)
   slow_print(e);\r
 }\r
 /* sec 0699 */\r
-void print_size_ (integer s)\r
+void print_size (integer s)\r
 { \r
   if (s == 0)\r
     print_esc("textfont");\r
@@ -391,7 +391,7 @@ void jump_out (void)
     if (trace_flag)\r
       puts("EXITING at JUMPOUT");\r
 \r
-    if ((history != 0) && (history != 1))\r
+    if ((history != spotless) && (history != warning_issued))\r
       code = 1;\r
     else\r
       code = 0;\r
@@ -525,7 +525,7 @@ continu:
             if (last > first + 1)\r
             {\r
               loc = first + 1;\r
-              buffer[first] = 32;\r
+              buffer[first] = ' ';\r
             }\r
             else\r
             {\r
@@ -617,7 +617,7 @@ continu:
   else while (help_ptr > 0)\r
   {\r
     decr(help_ptr);\r
-    print_nl(help_line[help_ptr] == NULL ? "" : help_line[help_ptr]);\r
+    print_nl(help_line[help_ptr]);\r
   }\r
 \r
   print_ln();\r
@@ -884,15 +884,13 @@ void print_current_string (void)
 void term_input (void)\r
 { \r
   integer k;\r
-  boolean flag;\r
   \r
   if (!knuth_flag)\r
     show_line("\n", 0);\r
 \r
   update_terminal();\r
-  flag = input_ln(stdin, true);\r
 \r
-  if (!flag)\r
+  if (!input_ln(stdin, true))\r
   {\r
     fatal_error("End of file on the terminal!");\r
     return;\r
@@ -1049,8 +1047,8 @@ scaled x_over_n_(scaled x, integer n)
     }\r
     else\r
     {\r
-      Result = - (integer) ((- (integer) x)/ n);\r
-      tex_remainder = - (integer) ((- (integer) x)% n);\r
+      Result = - (integer) ((- (integer) x) / n);\r
+      tex_remainder = - (integer) ((- (integer) x) % n);\r
     }\r
   }\r
 \r
@@ -1234,6 +1232,7 @@ void show_token_list_(integer p, integer q, integer l)
           break;\r
       }\r
     }\r
+\r
     p = link(p);\r
   }\r
 \r
@@ -1245,7 +1244,7 @@ void runaway (void)
 {\r
   pointer p;\r
 \r
-  if (scanner_status > 1)\r
+  if (scanner_status > skipping)\r
   {\r
     print_nl("Runaway ");\r
 \r
@@ -1778,9 +1777,6 @@ done2:
   was_lo_max = lo_mem_max;\r
   was_hi_min = hi_mem_min;\r
 }\r
-#endif /* DEBUG */\r
-\r
-#ifdef DEBUG\r
 /* sec 0172 */\r
 void search_mem_(pointer p)\r
 {\r
@@ -1972,11 +1968,11 @@ void print_glue_(scaled d, integer order, const char * s)
 \r
   if ((order < normal) || (order > filll))\r
     prints("foul");\r
-  else if (order > 0)\r
+  else if (order > normal)\r
   {\r
     prints("fil");\r
 \r
-    while (order > 1)\r
+    while (order > fil)\r
     {\r
       print_char('l');\r
       decr(order);\r
@@ -2186,7 +2182,7 @@ void show_node_list_(integer p)
 \r
   if (cur_length > depth_threshold)\r
   {\r
-    if (p != 0)    /* fixed 94/Mar/23 BUG FIX NOTE: still not fixed in 3.14159 ! */\r
+    if (p != 0)\r
       prints(" []");\r
 \r
     return; \r

diff --git a/src/texsourc/tex1.c b/src/texsourc/tex1.c
index 124948f..14d7d9a 100644 (file)
--- a/src/texsourc/tex1.c
+++ b/src/texsourc/tex1.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0198 */\r
@@ -84,12 +83,14 @@ void flush_node_list_(pointer p)
             goto done;\r
           }\r
           break;\r
+\r
         case rule_node:\r
           {\r
             free_node(p, rule_node_size);\r
             goto done;\r
           }\r
           break;\r
+\r
         case ins_node:\r
           {\r
             flush_node_list(ins_ptr(p));\r
@@ -98,6 +99,7 @@ void flush_node_list_(pointer p)
             goto done;\r
           }\r
           break;\r
+\r
         case whatsit_node:\r
           {\r
             switch (subtype(p))\r
@@ -105,6 +107,7 @@ void flush_node_list_(pointer p)
               case open_node:\r
                 free_node(p, open_node_size);\r
                 break;\r
+\r
               case write_node:\r
               case special_node:\r
                 {\r
@@ -113,10 +116,12 @@ void flush_node_list_(pointer p)
                   goto done;\r
                 }\r
                 break;\r
+\r
               case close_node:\r
               case set_language_code:\r
                 free_node(p, small_node_size);\r
                 break;\r
+\r
               default:\r
                 {\r
                   confusion("ext3");\r
@@ -124,6 +129,7 @@ void flush_node_list_(pointer p)
                 }\r
                 break;\r
             }\r
+\r
             goto done;\r
           }\r
           break;\r
@@ -216,6 +222,7 @@ void flush_node_list_(pointer p)
             goto done;\r
           }\r
           break;\r
+\r
         case left_noad:\r
         case right_noad:\r
           {\r
@@ -223,6 +230,7 @@ void flush_node_list_(pointer p)
             goto done;\r
           }\r
           break;\r
+\r
         case fraction_noad:\r
           {\r
             flush_node_list(info(numerator(p)));\r
@@ -231,6 +239,7 @@ void flush_node_list_(pointer p)
             goto done;\r
           }\r
           break;\r
+\r
         default:\r
           {\r
             confusion("flushing");\r
@@ -276,12 +285,14 @@ pointer copy_node_list_(pointer p)
           words = 5;\r
         }\r
         break;\r
+\r
       case rule_node:\r
         {\r
           r = get_node(rule_node_size);\r
           words = rule_node_size;\r
         }\r
         break;\r
+\r
       case ins_node:\r
         {\r
           r = get_node(ins_node_size);\r
@@ -291,6 +302,7 @@ pointer copy_node_list_(pointer p)
           words = ins_node_size - 1;\r
         }\r
         break;\r
+\r
       case whatsit_node:\r
         switch (subtype(p))\r
         {\r
@@ -2299,7 +2311,7 @@ pointer id_lookup_(integer j, integer l)
         if (trace_flag)\r
         {\r
           str_pool[pool_ptr] = '\0';\r
-          printf(" tex1.c incr(cs_count): '%s' ", &str_pool[pool_ptr - l - d]);\r
+          printf(" tex1.c cs_count: '%s' ", &str_pool[pool_ptr - l - d]);\r
         }\r
 #endif\r
       }\r
@@ -2391,7 +2403,7 @@ void eq_define_(pointer p, quarterword t, halfword e)
   else if (cur_level > level_one)\r
     eq_save(p, eq_level(p));\r
 \r
-  eq_level(p) = (quarterword) cur_level;\r
+  eq_level(p) = cur_level;\r
   eq_type(p) = t;\r
   equiv(p) = e;\r
 }\r
@@ -2401,7 +2413,7 @@ void eq_word_define_(pointer p, integer w)
   if (xeq_level[p] != cur_level)\r
   {\r
     eq_save(p, xeq_level[p]);\r
-    xeq_level[p] = (quarterword) cur_level;\r
+    xeq_level[p] = cur_level;\r
   }\r
 \r
   eqtb[p].cint = w;\r

diff --git a/src/texsourc/tex2.c b/src/texsourc/tex2.c
index be0ac25..aa44c94 100644 (file)
--- a/src/texsourc/tex2.c
+++ b/src/texsourc/tex2.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* following bit used to be end of tex1.c */\r
@@ -500,8 +499,7 @@ void back_input (void)
 {\r
   pointer p;\r
 \r
-  while ((state == 0) && (loc == 0) &&\r
-      (index != v_template))\r
+  while ((state == 0) && (loc == 0) && (index != v_template))\r
   {\r
     end_token_list();\r
   }\r
@@ -566,7 +564,7 @@ void begin_file_reading (void)
 \r
   incr(in_open);\r
 \r
-  if (in_open > high_in_open) /* 1999 Jan 17 */\r
+  if (in_open > high_in_open)\r
     high_in_open = in_open;\r
 \r
   push_input();\r
@@ -588,12 +586,10 @@ void end_file_reading (void)
   pop_input();\r
   decr(in_open);\r
 }\r
-/* called only form tex0.c */\r
 /* sec 0330 */\r
 void clear_for_error_prompt (void) \r
 {\r
-  while ((state != 0) && (name == 0) &&\r
-    (input_ptr > 0) && (loc > limit))\r
+  while ((state != 0) && (name == 0) && (input_ptr > 0) && (loc > limit))\r
     end_file_reading();\r
 \r
   print_ln();\r
@@ -1204,7 +1200,7 @@ void expand (void)
 \r
       case fi_or_else:\r
         if (cur_chr > if_limit)\r
-          if (if_limit == 1)\r
+          if (if_limit == if_code)\r
             insert_relax();\r
           else\r
           {\r
@@ -1853,7 +1849,7 @@ void scan_something_internal (small_number level, boolean negative)
   }\r
 \r
   if (negative)\r
-    if (cur_val_level >= 2)\r
+    if (cur_val_level >= glue_val)\r
     {\r
       cur_val = new_spec(cur_val);\r
 \r

diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c
index bb2b733..cd79fe3 100644 (file)
--- a/src/texsourc/tex3.c
+++ b/src/texsourc/tex3.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0440 */\r
@@ -442,7 +441,7 @@ not_found:
 \r
   cur_val = xn_over_d(cur_val, num, denom);\r
   f = (num * f + 65536L * tex_remainder) / denom;\r
-  cur_val = cur_val +(f / 65536L);\r
+  cur_val = cur_val + (f / 65536L);\r
   f = f % 65536L;\r
 \r
 done2:\r
@@ -1511,20 +1510,17 @@ void pack_file_name (str_number n, str_number a, str_number e)
   for (k = name_length + 1; k <= file_name_size; k++)\r
     name_of_file[k] = ' ';\r
 \r
-  name_of_file[file_name_size] = '\0'; /* paranoia */\r
+  name_of_file[file_name_size] = '\0';\r
 \r
   {\r
     name_of_file [name_length + 1] = '\0';\r
 \r
     if (trace_flag)\r
-      printf(" pack_file_name `%s' (%lld) ", name_of_file + 1, name_length);\r
+      printf(" pack_file_name -> `%s' (%lld) ", name_of_file + 1, name_length);\r
 \r
     name_of_file [name_length + 1] = ' ';\r
   }\r
 }\r
-/* Called only from two places tex9.c for format name - specified and default */\r
-/* for specified format name args are 0, a, b name in buffer[a] --- buffer[b] */\r
-/* for default args are format_default_length-4, 1, 0 */\r
 /* sec 0523 */\r
 void pack_buffered_name_(small_number n, integer a, integer b)\r
 {\r
@@ -1757,7 +1753,7 @@ void open_log_file (void)
   log_opened = true;\r
 \r
   {\r
-    fprintf(log_file, "%s (%s %s)", banner, application, yandyversion);\r
+    log_printf("%s (%s %s)", banner, application, yandyversion);\r
 \r
     if (format_ident > 0)\r
       slow_print(format_ident);\r
@@ -1804,7 +1800,7 @@ void open_log_file (void)
   {\r
     if (format_file != NULL)\r
     {\r
-      fprintf(log_file, "(%s)\n", format_file);\r
+      log_printf("(%s)\n", format_file);\r
       free(format_file);\r
       format_file = NULL;\r
     }\r

diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c
index 0500e0c..a34d0af 100644 (file)
--- a/src/texsourc/tex4.c
+++ b/src/texsourc/tex4.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "dpx.h"\r
 #include "yandytex.h"\r
 \r
@@ -1251,19 +1250,8 @@ done:
 #endif\r
 }\r
 void ship_out (pointer p)\r
-{;\r
+{\r
   pdf_ship_out(p);\r
-  /*\r
-  switch (shipout_flag)\r
-  {\r
-    case out_dvi_flag:\r
-    case out_xdv_flag:\r
-      dvi_ship_out_(p);\r
-      break;\r
-    case out_pdf_flag:\r
-      //pdf_ship_out(p);\r
-      break;\r
-  }*/\r
 }\r
 /* sec 0645 */\r
 void scan_spec (group_code c, boolean three_codes)\r

diff --git a/src/texsourc/tex5.c b/src/texsourc/tex5.c
index 9f0a36c..474a339 100644 (file)
--- a/src/texsourc/tex5.c
+++ b/src/texsourc/tex5.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0715 */\r
@@ -298,7 +297,7 @@ void make_radical (pointer q)
   }\r
 \r
   y = var_delimiter(left_delimiter(q), cur_size, height(x) + depth(x) + clr + default_rule_thickness);\r
-  delta = depth(y) -(height(x) + depth(x) + clr);\r
+  delta = depth(y) - (height(x) + depth(x) + clr);\r
 \r
   if (delta > 0)\r
     clr = clr + half(delta);\r

diff --git a/src/texsourc/tex6.c b/src/texsourc/tex6.c
index f09cbb2..46c5b9e 100644 (file)
--- a/src/texsourc/tex6.c
+++ b/src/texsourc/tex6.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0785 */\r

diff --git a/src/texsourc/tex7.c b/src/texsourc/tex7.c
index ac98ec4..1a7a84a 100644 (file)
--- a/src/texsourc/tex7.c
+++ b/src/texsourc/tex7.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0994 */\r
@@ -213,7 +212,6 @@ continu:
 \r
                 q = vert_break(ins_ptr(p), w, depth(p));\r
                 height(r) = height(r) + best_height_plus_depth;\r
-\r
 #ifdef STAT\r
                 if (tracing_pages > 0)\r
                 {\r

diff --git a/src/texsourc/tex8.c b/src/texsourc/tex8.c
index 58405e9..5db0e92 100644 (file)
--- a/src/texsourc/tex8.c
+++ b/src/texsourc/tex8.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 1181 */\r
@@ -1492,6 +1491,7 @@ void handle_right_brace (void)
                 }\r
       }\r
       break;\r
+\r
     default:\r
       {\r
         confusion("rightbrace");\r

diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c
index 2ddd3ce..1635d87 100644 (file)
--- a/src/texsourc/tex9.c
+++ b/src/texsourc/tex9.c
@@ -56,11 +56,9 @@ boolean open_fmt_file (void)
     else\r
     {\r
       name_of_file[name_length + 1] = '\0';\r
-      printf("%s (%s);%s\n", "Sorry, I can't find that format",\r
-        name_of_file + 1, " will try the default."); \r
+      printf("%s (%s);%s\n", "Sorry, I can't find that format", name_of_file + 1, " will try the default.");\r
       name_of_file[name_length + 1] = ' ';\r
-      printf("(Perhaps your %s environment variable is not set correctly)\n",\r
-        "TEXFORMATS");\r
+      printf("(Perhaps your Y&Y TeX's environment variable is not set correctly)\n");\r
     }\r
 \r
     update_terminal();\r
@@ -80,7 +78,7 @@ boolean open_fmt_file (void)
       name_of_file[name_length + 1] = '\0';\r
       printf("%s (%s)!\n", "I can't find the default format file", name_of_file + 1);\r
       name_of_file[name_length + 1] = ' ';\r
-      printf("(Perhaps your %s environment variable is not set correctly)\n", "TEXFORMATS");\r
+      printf("(Perhaps your Y&Y TeX's environment variable is not set correctly)\n");\r
     }\r
 \r
     return false;\r
@@ -107,113 +105,113 @@ void close_files_and_terminate (void)
   if (tracing_stats > 0 || verbose_flag != 0)\r
     if (log_opened)\r
     {\r
-      fprintf(log_file, "%c\n", ' ');\r
-      fprintf(log_file, "\n");\r
-      fprintf(log_file, "%s%s\n", "Here is how much of TeX's memory", " you used:");\r
-      fprintf(log_file, "%c%lld%s", ' ', (integer)(str_ptr - init_str_ptr), " string");\r
+      log_printf("%c\n", ' ');\r
+      log_printf("\n");\r
+      log_printf("%s%s\n", "Here is how much of TeX's memory", " you used:");\r
+      log_printf("%c%lld%s", ' ', (integer)(str_ptr - init_str_ptr), " string");\r
 \r
       if (str_ptr != init_str_ptr + 1)\r
-        putc('s', log_file);\r
+        wlog_cr();\r
 \r
 #ifdef ALLOCATESTRING\r
       if (show_current)\r
-        fprintf(log_file, "%s%d\n", " out of ", (int)(current_max_strings - init_str_ptr));\r
+        log_printf("%s%d\n", " out of ", (int)(current_max_strings - init_str_ptr));\r
       else\r
 #endif\r
-        fprintf(log_file, "%s%d\n", " out of ", (int)(max_strings - init_str_ptr));\r
+        log_printf("%s%d\n", " out of ", (int)(max_strings - init_str_ptr));\r
 \r
 #ifdef ALLOCATESTRING\r
       if (show_current)\r
-        fprintf(log_file, "%c%lld%s%lld\n", ' ', (integer)(pool_ptr - init_pool_ptr), " string characters out of ", current_pool_size - init_pool_ptr);\r
+        log_printf("%c%lld%s%lld\n", ' ', (integer)(pool_ptr - init_pool_ptr), " string characters out of ", current_pool_size - init_pool_ptr);\r
       else\r
 #endif\r
-        fprintf(log_file, "%c%lld%s%lld\n", ' ', (integer)(pool_ptr - init_pool_ptr), " string characters out of ", pool_size - init_pool_ptr);\r
+        log_printf("%c%lld%s%lld\n", ' ', (integer)(pool_ptr - init_pool_ptr), " string characters out of ", pool_size - init_pool_ptr);\r
 \r
 #ifdef ALLOCATEMAIN\r
       if (show_current)\r
-        fprintf(log_file, "%c%lld%s%d\n", ' ', (integer)(lo_mem_max - mem_min + mem_end - hi_mem_min + 2), " words of memory out of ", current_mem_size);\r
+        log_printf("%c%lld%s%d\n", ' ', (integer)(lo_mem_max - mem_min + mem_end - hi_mem_min + 2), " words of memory out of ", current_mem_size);\r
       else\r
 #endif\r
-        fprintf(log_file, "%c%lld%s%lld\n", ' ', (integer)(lo_mem_max - mem_min + mem_end - hi_mem_min + 2), " words of memory out of ", mem_end + 1 - mem_min);\r
+        log_printf("%c%lld%s%lld\n", ' ', (integer)(lo_mem_max - mem_min + mem_end - hi_mem_min + 2), " words of memory out of ", mem_end + 1 - mem_min);\r
 \r
-      fprintf(log_file, "%c%lld%s%d\n", ' ', (cs_count), " multiletter control sequences out of ", (hash_size + hash_extra));\r
-      fprintf(log_file, "%c%lld%s%lld%s", ' ', (fmem_ptr), " words of font info for ", (font_ptr - font_base), " font");\r
+      log_printf("%c%lld%s%d\n", ' ', (cs_count), " multiletter control sequences out of ", (hash_size + hash_extra));\r
+      log_printf("%c%lld%s%lld%s", ' ', (fmem_ptr), " words of font info for ", (font_ptr - font_base), " font");\r
 \r
       if (font_ptr != 1)\r
         wlog('s');\r
 \r
 #ifdef ALLOCATEFONT\r
       if (show_current)\r
-        fprintf(log_file, "%s%d%s%d\n", ", out of ", current_font_mem_size, " for ", font_max - font_base);\r
+        log_printf("%s%d%s%d\n", ", out of ", current_font_mem_size, " for ", font_max - font_base);\r
       else\r
 #endif\r
-        fprintf(log_file, "%s%lu%s%d\n", ", out of ", font_mem_size, " for ", font_max - font_base);\r
+        log_printf("%s%lu%s%d\n", ", out of ", font_mem_size, " for ", font_max - font_base);\r
 \r
-      fprintf(log_file, "%c%lld%s", ' ', hyph_count, " hyphenation exception");\r
+      log_printf("%c%lld%s", ' ', hyph_count, " hyphenation exception");\r
 \r
       if (hyph_count != 1)\r
         wlog('s');\r
 \r
-      fprintf(log_file, "%s%lld\n", " out of ", hyphen_prime);\r
-      fprintf(log_file, " ");\r
-      fprintf(log_file, "%d%s", (int) max_in_stack, "i,");\r
-      fprintf(log_file, "%d%s", (int) max_nest_stack, "n,");\r
-      fprintf(log_file, "%d%s", (int) max_param_stack, "p,");\r
-      fprintf(log_file, "%d%s", (int) max_buf_stack + 1, "b,");\r
-      fprintf(log_file, "%d%s", (int) max_save_stack + 6, "s");\r
-      fprintf(log_file, " stack positions out of ");\r
+      log_printf("%s%lld\n", " out of ", hyphen_prime);\r
+      log_printf(" ");\r
+      log_printf("%d%s", (int) max_in_stack, "i,");\r
+      log_printf("%d%s", (int) max_nest_stack, "n,");\r
+      log_printf("%d%s", (int) max_param_stack, "p,");\r
+      log_printf("%d%s", (int) max_buf_stack + 1, "b,");\r
+      log_printf("%d%s", (int) max_save_stack + 6, "s");\r
+      log_printf(" stack positions out of ");\r
 \r
 #ifdef ALLOCATESAVESTACK\r
       if (show_current)\r
-        fprintf(log_file, "%d%s", current_stack_size, "i,");\r
+        log_printf("%d%s", current_stack_size, "i,");\r
       else\r
 #endif\r
-        fprintf(log_file, "%d%s", stack_size, "i,");\r
+        log_printf("%d%s", stack_size, "i,");\r
 \r
 #ifdef ALLOCATENESTSTACK\r
       if (show_current)\r
-        fprintf(log_file, "%d%s", current_nest_size, "n,");\r
+        log_printf("%d%s", current_nest_size, "n,");\r
       else\r
 #endif\r
-        fprintf(log_file, "%d%s", nest_size, "n,");\r
+        log_printf("%d%s", nest_size, "n,");\r
 \r
 #ifdef ALLOCATEPARAMSTACK\r
       if (show_current)\r
-        fprintf(log_file, "%d%s", current_param_size, "p,");\r
+        log_printf("%d%s", current_param_size, "p,");\r
       else\r
 #endif\r
-        fprintf(log_file, "%d%s", param_size, "p,");\r
+        log_printf("%d%s", param_size, "p,");\r
 \r
 #ifdef ALLOCATEBUFFER\r
       if (show_current)\r
-        fprintf(log_file, "%d%s", current_buf_size, "b,");\r
+        log_printf("%d%s", current_buf_size, "b,");\r
       else\r
 #endif\r
-        fprintf(log_file, "%ld%s", buf_size, "b,");\r
+        log_printf("%ld%s", buf_size, "b,");\r
 \r
 #ifdef ALLOCATESAVESTACK\r
       if (show_current)\r
-        fprintf(log_file, "%d%s", current_save_size, "s");\r
+        log_printf("%d%s", current_save_size, "s");\r
       else\r
 #endif\r
-        fprintf(log_file, "%d%s", save_size, "s");\r
+        log_printf("%d%s", save_size, "s");\r
 \r
-      fprintf(log_file, "\n");\r
+      log_printf("\n");\r
 \r
       if (!knuth_flag)\r
-        fprintf(log_file, " (i = in_stack, n = nest_stack, p = param_stack, b = buf_stack, s = save_stack)\n");\r
-\r
-      if (!knuth_flag)\r
-        fprintf(log_file, " %lld inputs open max out of %d\n", high_in_open, max_in_open);\r
+      {\r
+        log_printf(" (i = in_stack, n = nest_stack, p = param_stack, b = buf_stack, s = save_stack)\n");\r
+        log_printf(" %lld inputs open max out of %d\n", high_in_open, max_in_open);\r
+      }\r
 \r
       if (show_line_break_stats && first_pass_count > 0)\r
       {\r
         int first_count, second_count, third_count;\r
 \r
-        fprintf(log_file, "\nSuccess at breaking %d paragraph%s:", first_pass_count, (first_pass_count == 1) ? "" : "s");\r
+        log_printf("\nSuccess at breaking %d paragraph%s:", first_pass_count, (first_pass_count == 1) ? "" : "s");\r
 \r
         if (single_line > 0)\r
-          fprintf(log_file, "\n %d single line `paragraph%s'", single_line, (single_line == 1) ? "" : "s");\r
+          log_printf("\n %d single line `paragraph%s'", single_line, (single_line == 1) ? "" : "s");\r
 \r
         first_count = first_pass_count - single_line - second_pass_count;\r
 \r
@@ -224,34 +222,34 @@ void close_files_and_terminate (void)
         third_count = final_pass_count - paragraph_failed;\r
 \r
         if (first_pass_count > 0)\r
-          fprintf(log_file, "\n %d first pass (\\pretolerance = %lld)", first_pass_count, pretolerance);\r
+          log_printf("\n %d first pass (\\pretolerance = %lld)", first_pass_count, pretolerance);\r
 \r
         if (second_pass_count > 0)\r
-          fprintf(log_file, "\n %d second pass (\\tolerance = %lld)", second_pass_count, tolerance);\r
+          log_printf("\n %d second pass (\\tolerance = %lld)", second_pass_count, tolerance);\r
 \r
         if (final_pass_count > 0 || emergency_stretch > 0)\r
-          fprintf(log_file, "\n %d third pass (\\emergencystretch = %lgpt)",\r
+          log_printf("\n %d third pass (\\emergencystretch = %lgpt)",\r
             final_pass_count, (double) emergency_stretch / 65536.0);\r
 \r
         if (paragraph_failed > 0)\r
-          fprintf(log_file, "\n %d failed", paragraph_failed);\r
+          log_printf("\n %d failed", paragraph_failed);\r
 \r
-        putc('\n', log_file);\r
+        wlog_cr();\r
 \r
         if (overfull_hbox > 0)\r
-          fprintf(log_file, "\n %d overfull \\hbox%s", overfull_hbox, (overfull_hbox > 1) ? "es" : "");\r
+          log_printf("\n %d overfull \\hbox%s", overfull_hbox, (overfull_hbox > 1) ? "es" : "");\r
 \r
         if (underfull_hbox > 0)\r
-          fprintf(log_file, "\n %d underfull \\hbox%s", underfull_hbox, (underfull_hbox > 1) ? "es" : "");\r
+          log_printf("\n %d underfull \\hbox%s", underfull_hbox, (underfull_hbox > 1) ? "es" : "");\r
 \r
         if (overfull_vbox > 0)\r
-          fprintf(log_file, "\n %d overfull \\vbox%s", overfull_vbox, (overfull_vbox > 1) ? "es" : "");\r
+          log_printf("\n %d overfull \\vbox%s", overfull_vbox, (overfull_vbox > 1) ? "es" : "");\r
 \r
         if (underfull_vbox > 0)\r
-          fprintf(log_file, "\n %d underfull \\vbox%s", underfull_vbox, (underfull_vbox > 1) ? "es" : "");\r
+          log_printf("\n %d underfull \\vbox%s", underfull_vbox, (underfull_vbox > 1) ? "es" : "");\r
 \r
         if (overfull_hbox || underfull_hbox || overfull_vbox || underfull_vbox)\r
-          putc('\n', log_file);\r
+          wlog_cr();\r
       }\r
   }\r
 #endif\r
@@ -288,108 +286,101 @@ void close_files_and_terminate (void)
       b_close(pdf_file);\r
     }\r
   }\r
-\r
 /*\r
-  switch (shipout_flag)\r
   {\r
-    case out_dvi_flag:\r
-    case out_xdv_flag:\r
+    while (cur_s > -1)\r
+    {\r
+      if (cur_s > 0)\r
+        dvi_out(pop);\r
+      else\r
       {\r
-        while (cur_s > -1)\r
-        {\r
-          if (cur_s > 0) \r
-            dvi_out(pop);\r
-          else\r
-          {\r
-            dvi_out(eop);\r
-            incr(total_pages);\r
-          }\r
+        dvi_out(eop);\r
+        incr(total_pages);\r
+      }\r
 \r
-          decr(cur_s);\r
-        }\r
-\r
-        if (total_pages == 0)\r
-          print_nl("No pages of output.");\r
-        else\r
-        {\r
-          dvi_out(post);\r
-          dvi_four(last_bop);\r
-          last_bop = dvi_offset + dvi_ptr - 5;\r
-          dvi_four(25400000L);\r
-          dvi_four(473628672L);\r
-          prepare_mag();\r
-          dvi_four(mag);\r
-          dvi_four(max_v);\r
-          dvi_four(max_h);\r
-          dvi_out(max_push / 256);\r
-          dvi_out(max_push % 256);\r
-\r
-          if (total_pages >= 65536)\r
-          {\r
-            sprintf(log_line, "\nWARNING: page count (dvi_t) in DVI file will be %lld not %lld\n",\r
-              (total_pages % 65536), total_pages);\r
+      decr(cur_s);\r
+    }\r
 \r
-            if (log_opened)\r
-              fputs(log_line, log_file);\r
+    if (total_pages == 0)\r
+      print_nl("No pages of output.");\r
+    else\r
+    {\r
+      dvi_out(post);\r
+      dvi_four(last_bop);\r
+      last_bop = dvi_offset + dvi_ptr - 5;\r
+      dvi_four(25400000L);\r
+      dvi_four(473628672L);\r
+      prepare_mag();\r
+      dvi_four(mag);\r
+      dvi_four(max_v);\r
+      dvi_four(max_h);\r
+      dvi_out(max_push / 256);\r
+      dvi_out(max_push % 256);\r
+\r
+      if (total_pages >= 65536)\r
+      {\r
+        sprintf(log_line, "\nWARNING: page count (dvi_t) in DVI file will be %lld not %lld\n",\r
+          (total_pages % 65536), total_pages);\r
 \r
-            show_line(log_line, 1);\r
-          }\r
+        if (log_opened)\r
+          fputs(log_line, log_file);\r
 \r
-          dvi_out((total_pages / 256) % 256);\r
-          dvi_out(total_pages % 256);\r
+        show_line(log_line, 1);\r
+      }\r
 \r
-          if (show_fonts_used && log_opened)\r
-            show_font_info();\r
+      dvi_out((total_pages / 256) % 256);\r
+      dvi_out(total_pages % 256);\r
 \r
-          while (font_ptr > 0)\r
-          {\r
-            if (font_used[font_ptr])\r
-              dvi_font_def(font_ptr);\r
+      if (show_fonts_used && log_opened)\r
+        show_font_info();\r
 \r
-            decr(font_ptr);\r
-          }\r
+      while (font_ptr > 0)\r
+      {\r
+        if (font_used[font_ptr])\r
+          dvi_font_def(font_ptr);\r
 \r
-          dvi_out(post_post);\r
-          dvi_four(last_bop);\r
-          dvi_out(id_byte);\r
-          k = 4 + ((dvi_buf_size - dvi_ptr) % 4);\r
+        decr(font_ptr);\r
+      }\r
 \r
-          while (k > 0)\r
-          {\r
-            dvi_out(223);\r
-            decr(k);\r
-          }\r
+      dvi_out(post_post);\r
+      dvi_four(last_bop);\r
+      dvi_out(id_byte);\r
+      k = 4 + ((dvi_buf_size - dvi_ptr) % 4);\r
 \r
-          if (trace_flag)\r
-            printf("\ndvi_write %lld", dvi_gone);\r
+      while (k > 0)\r
+      {\r
+        dvi_out(223);\r
+        decr(k);\r
+      }\r
 \r
-          if (dvi_limit == half_buf)\r
-            write_dvi(half_buf, dvi_buf_size - 1);\r
+      if (trace_flag)\r
+        printf("\ndvi_write %lld", dvi_gone);\r
 \r
-          if (dvi_ptr > 0)\r
-            write_dvi(0, dvi_ptr - 1); \r
+      if (dvi_limit == half_buf)\r
+        write_dvi(half_buf, dvi_buf_size - 1);\r
 \r
-          print_nl("Output written on ");\r
+      if (dvi_ptr > 0)\r
+        write_dvi(0, dvi_ptr - 1);\r
+      \r
+      print_nl("Output written on ");\r
 \r
-          if (full_file_name_flag && dvi_file_name != NULL)\r
-            prints(dvi_file_name);\r
-          else\r
-            slow_print(output_file_name);\r
+      if (full_file_name_flag && dvi_file_name != NULL)\r
+        prints(dvi_file_name);\r
+      else\r
+        slow_print(output_file_name);\r
 \r
-          prints(" (");\r
-          print_int(total_pages);\r
-          prints(" page");\r
+      prints(" (");\r
+      print_int(total_pages);\r
+      prints(" page");\r
 \r
-          if (total_pages != 1)\r
-            print_char('s');\r
+      if (total_pages != 1)\r
+        print_char('s');\r
 \r
-          prints(", ");\r
-          print_int(dvi_offset + dvi_ptr);\r
-          prints(" bytes).");\r
-          b_close(dvi_file);\r
-        }\r
-      }\r
-      break;\r
+      prints(", ");\r
+      print_int(dvi_offset + dvi_ptr);\r
+      prints(" bytes).");\r
+      b_close(dvi_file);\r
+    }\r
   }\r
 */\r
   if (log_opened)\r
@@ -459,19 +450,7 @@ void debug_help (void)
           break;\r
 \r
         case 5:\r
-#ifdef SHORTFONTINFO\r
-          print_scaled(font_info[n].sc);\r
-          print_char(' ');\r
-          print_int(font_info[n].b0);\r
-          print_char(':');\r
-          print_int(font_info[n].b1);\r
-          print_char(':');\r
-          print_int(font_info[n].b2);\r
-          print_char(':');\r
-          print_int(font_info[n].b3);\r
-#else\r
-          print_word(font_info[n]); \r
-#endif\r
+          print_word(font_info[n]);\r
           break;\r
         \r
         case 6:\r
@@ -488,8 +467,7 @@ void debug_help (void)
 #ifdef ALLOCATESTRING\r
             if (pool_ptr + 32000 > current_pool_size)\r
               str_pool = realloc_str_pool (increment_pool_size);\r
-#endif\r
-#ifdef ALLOCATESTRING\r
+\r
             depth_threshold = current_pool_size - pool_ptr - 10;\r
 #else\r
             depth_threshold = pool_size - pool_ptr - 10;\r

diff --git a/src/texsourc/texd.h b/src/texsourc/texd.h
index 334b579..e4b4067 100644 (file)
--- a/src/texsourc/texd.h
+++ b/src/texsourc/texd.h
@@ -28,6 +28,9 @@
   #pragma warning(disable:4701) // potentially uninitialized local variable 'name' used\r
   #pragma warning(disable:4135) // conversion between different integral types\r
   #pragma warning(disable:4127) // conditional expression is constant\r
+#else\r
+  #pragma GCC diagnostic ignored "-Wunused-result"\r
+  #pragma GCC diagnostic ignored "-Wdangling-else"\r
 #endif\r
 \r
 #include <stdarg.h>\r
@@ -100,14 +103,6 @@ EXTERN int check_fclose    (FILE * f);
 #define wterm_cr()  (void) putc('\n', stdout);\r
 #define wlog_cr()   (void) putc('\n', log_file);\r
 \r
-enum\r
-{\r
-  out_dvi_flag = (1 << 0),\r
-  out_pdf_flag = (1 << 1),\r
-  out_xdv_flag = (1 << 2),\r
-  out_dpx_flag = (1 << 3),\r
-};\r
-\r
 EXTERN boolean input_line (FILE * f);\r
 #define input_ln(stream, flag) input_line(stream)\r
 /* sec 0027 */\r

diff --git a/src/texsourc/utils.c b/src/texsourc/utils.c
index 165661c..a619141 100644 (file)
--- a/src/texsourc/utils.c
+++ b/src/texsourc/utils.c
@@ -18,7 +18,6 @@
 */\r
 \r
 #define EXTERN extern\r
-\r
 #include "yandytex.h"\r
 \r
 /* sec 0016 */\r

diff --git a/src/texsourc/yandytex.c b/src/texsourc/yandytex.c
index 2006236..9a0400a 100644 (file)
--- a/src/texsourc/yandytex.c
+++ b/src/texsourc/yandytex.c
@@ -103,13 +103,11 @@ void t_open_in (void)
   for (last = first; buffer[last]; ++last)\r
     do_nothing();\r
 \r
-  for (--last; last >= first && ISBLANK (buffer[last]) && buffer[last] != '\r'; --last)\r
+  for (--last; last >= first && ISBLANK(buffer[last]) && buffer[last] != '\r'; --last)\r
     do_nothing();\r
 \r
   last++;\r
 \r
-/* One more time, this time converting to TeX's internal character\r
-   representation.  */ /* for command line input in this case */\r
   if (non_ascii)\r
   {\r
     for (i = first; i < last; i++)\r
@@ -312,13 +310,7 @@ boolean input_line_finish (void)
 \r
   return true;\r
 }\r
-\r
-/* Read a line of input into buffer as efficiently as possible (ha ha)\r
-   while still looking like Pascal.\r
-   We set `last' to `first' and return `false' if we get to eof.\r
-   Otherwise, we return `true' and set last = first +\r
-   length(line except trailing whitespace).  */\r
-\r
+/* sec 0031 */\r
 boolean input_line (FILE * f)\r
 {\r
   char * u;        /* 1994/July/3 for key_replace */\r
@@ -416,15 +408,15 @@ boolean input_line (FILE * f)
     }\r
   }\r
 \r
-  if (return_flag)    /* let return terminate line as well as newline */\r
+  if (return_flag)  /* let return terminate line as well as newline */\r
   {\r
-    if (i == '\r')      /* see whether return followed by newline */\r
+    if (i == '\r')  /* see whether return followed by newline */\r
     {\r
-      i = getc (f);       /* in which case throw away the newline */\r
+      i = getc(f);  /* in which case throw away the newline */\r
 \r
       if (i != '\n')\r
       {\r
-        ungetc (i, f);\r
+        ungetc(i, f);\r
         i = '\r';\r
       }\r
 /*      else  buffer[last-1] = (ASCII_code) i; */\r
@@ -468,10 +460,12 @@ boolean input_line (FILE * f)
 \r
 static char * edit_value = "c:\\yandy\\WinEdt\\WinEdt.exe [Open('%s');SelLine(%d,7)]";\r
 \r
+#ifdef WIN32\r
 static inline int Isspace (char c)\r
 {\r
   return (c == ' ' || c == '\t');\r
 }\r
+#endif\r
 \r
 void call_edit (ASCII_code * filename, pool_pointer fnstart, integer fnlength, integer linenumber)\r
 {\r
@@ -488,12 +482,12 @@ void call_edit (ASCII_code * filename, pool_pointer fnstart, integer fnlength, i
   sdone = ddone = 0;\r
   filename += fnstart;\r
 \r
-  /* Close any open input files, since we're going to kill the job.  */\r
+  /* Close any open input files, since we're going to kill the job. */\r
   for (i = 1; i <= in_open; i++)\r
 #ifdef XeTeX\r
-    xfclose (input_file[i]->f, "inputfile");\r
+    xfclose(input_file[i]->f, "inputfile");\r
 #else\r
-    xfclose (input_file[i], "inputfile");\r
+    xfclose(input_file[i], "inputfile");\r
 #endif\r
 \r
   /* Replace the default with the value of the appropriate environment\r
@@ -621,15 +615,6 @@ void call_edit (ASCII_code * filename, pool_pointer fnstart, integer fnlength, i
 \r
 \r
 #if !defined (WORDS_BIGENDIAN) && !defined (NO_FMTBASE_SWAP)\r
-\r
-/* We don't REALLY care what `endian' the machine is after all ! */\r
-\r
-// #ifdef MYDEBUG\r
-// char swapmarkerstring="ERROR: SWAPPING - NOT BigEndian AND NOT NoFmtBaseSwap";\r
-// #endif\r
-\r
-/* This macro is always invoked as a statement.  It assumes a variable\r
-   `temp'.  */\r
    \r
 #define SWAP(x, y) temp = (x); (x) = (y); (y) = temp;\r
 \r

diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h
index aadf27c..0b8cc22 100644 (file)
--- a/src/texsourc/yandytex.h
+++ b/src/texsourc/yandytex.h
@@ -851,4 +851,5 @@ extern void print_plus (int i, const char * s);
 extern void fget (void);\r
 extern str_number get_job_name (str_number job);\r
 extern void show_font_info (void);\r
+#define log_printf(...) fprintf(log_file, __VA_ARGS__)\r
 #endif
\ No newline at end of file