code clean.

diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c
index fe4ef58..fb09aa1 100644 (file)
--- a/src/texsourc/openinou.c
+++ b/src/texsourc/openinou.c
@@ -26,12 +26,12 @@
 #define PATH_SEP        '/'
 #define PATH_SEP_STRING "/"
 
-#define BUILDNAMEDIRECT         /* avoid malloc for string concat */
+#define BUILDNAMEDIRECT /* avoid malloc for string concat */
 
 extern int shorten_file_name;       /* in local.c bkph */
 
 #ifdef FUNNY_CORE_DUMP
-  extern void funny_core_dump();
+  extern void funny_core_dump(void);
 #endif
 
 
@@ -43,8 +43,8 @@ char * xconcat (char *buffer, char *s1, char *s2)
 
   if (buffer == s2)
   {
-    memmove (buffer + n1, buffer, n2 + 1);
-    strncpy (buffer, s1, n1);
+    memmove(buffer + n1, buffer, n2 + 1);
+    strncpy(buffer, s1, n1);
   }
   else
   {
@@ -62,9 +62,9 @@ char * xconcat3 (char *buffer, char *s1, char *s2, char *s3)
 
   if (buffer == s3)
   {
-    memmove (buffer + n1 + n2, buffer, n3 + 1);
-    strncpy (buffer, s1, n1);
-    strncpy (buffer + n1, s2, n2);
+    memmove(buffer + n1 + n2, buffer, n3 + 1);
+    strncpy(buffer, s1, n1);
+    strncpy(buffer + n1, s2, n2);
   }
   else
   {
@@ -112,7 +112,7 @@ int prepend_path_if (unsigned char *buffer, unsigned char *name, char *ext, unsi
   if (qualified(name))
     return 0;
 
-  if (strstr((char *)name, ext) == NULL)
+  if (strstr((char *) name, ext) == NULL)
     return 0;
 
   patch_in_path(buffer, name, path);
@@ -120,7 +120,6 @@ int prepend_path_if (unsigned char *buffer, unsigned char *name, char *ext, unsi
   return 1;
 }
 
-
 //  Following works on null-terminated strings
 void check_short_name (unsigned char *s)
 {
@@ -162,8 +161,6 @@ void check_short_name (unsigned char *s)
 /* kpathsea/tilde.c */
 void retwiddle (unsigned char *s)
 {
-/* assumes null terminated - 97/June/5 */
-/*  while (*s != '\0' && *s != ' ') { */
   while (*s != '\0')
   {
     if (*s == (unsigned char) pseudo_tilde)
@@ -182,7 +179,7 @@ bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode)
 
 #if defined (FUNNY_CORE_DUMP) && !defined (BibTeX)
   if (path_index == TEXINPUTPATH &&
-    strncmp (name_of_file + 1, "HackyInputFileNameForCoreDump.tex", 33) == 0)
+    strncmp(name_of_file + 1, "HackyInputFileNameForCoreDump.tex", 33) == 0)
     funny_core_dump();
 #endif
 
@@ -194,8 +191,8 @@ bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode)
 
   name_of_file[name_length + 1] = '\0';
 
-/* reinsert '~' and ' ' in file names -  95/June/5 */
-/* done late to prevent problems with  null_terminate / space_terminate */  
+  /* reinsert '~' and ' ' in file names -  95/June/5 */
+  /* done late to prevent problems with  null_terminate / space_terminate */  
   if (pseudo_tilde != 0 || pseudo_space != 0)
     retwiddle(name_of_file + 1);
 
@@ -252,7 +249,7 @@ bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode)
       
     if (path_index == TFMFILEPATH)
     {
-      tfm_temp = getc (*f);
+      tfm_temp = getc(*f);
     } 
 
     if (strstr((char *) name_of_file + 1, ".fmt") != NULL)
@@ -266,7 +263,7 @@ bool open_input (FILE **f, path_constant_type path_index, char *fopen_mode)
       gz_fmt_file = gzdopen(fileno(*f), "rb9");
 #endif
     }
-    else if (strstr((char *)name_of_file+1, ".tfm") != NULL)
+    else if (strstr((char *)name_of_file + 1, ".tfm") != NULL)
     {
       if (show_tfm_flag && log_opened)
       {
@@ -366,17 +363,17 @@ bool open_output (FILE **f, char *fopen_mode)
     retwiddle(name_of_file + 1);
   }
 
-/* 8 + 3 file names on Windows NT 95/Feb/20 */
+  /* 8 + 3 file names on Windows NT 95/Feb/20 */
   if (shorten_file_name)
   {
     check_short_name(name_of_file + 1);
   }
 
-  if (prepend_path_if (name_of_file + 1, name_of_file + 1, ".dvi", (unsigned char *) dvi_directory) ||
-      prepend_path_if (name_of_file + 1, name_of_file + 1, ".log", (unsigned char *) log_directory) ||
-      prepend_path_if (name_of_file + 1, name_of_file + 1, ".aux", (unsigned char *) aux_directory) ||
-      prepend_path_if (name_of_file + 1, name_of_file + 1, ".fmt", (unsigned char *) fmt_directory) ||
-      prepend_path_if (name_of_file + 1, name_of_file + 1, ".pdf", (unsigned char *) pdf_directory))
+  if (prepend_path_if(name_of_file + 1, name_of_file + 1, ".dvi", (unsigned char *) dvi_directory) ||
+      prepend_path_if(name_of_file + 1, name_of_file + 1, ".log", (unsigned char *) log_directory) ||
+      prepend_path_if(name_of_file + 1, name_of_file + 1, ".aux", (unsigned char *) aux_directory) ||
+      prepend_path_if(name_of_file + 1, name_of_file + 1, ".fmt", (unsigned char *) fmt_directory) ||
+      prepend_path_if(name_of_file + 1, name_of_file + 1, ".pdf", (unsigned char *) pdf_directory))
   {
     if (open_trace_flag)
     {

diff --git a/src/texsourc/tex6.c b/src/texsourc/tex6.c
index b661dc7..8d74f06 100644 (file)
--- a/src/texsourc/tex6.c
+++ b/src/texsourc/tex6.c
@@ -108,14 +108,7 @@ void try_break_ (integer pi, small_number break_type)
   prev_r = active;
   old_l = 0;
   do_all_six(copy_to_cur_active);
-/*
-  cur_active_width[1] = active_width[1];
-  cur_active_width[2] = active_width[2];
-  cur_active_width[3] = active_width[3];
-  cur_active_width[4] = active_width[4];
-  cur_active_width[5] = active_width[5];
-  cur_active_width[6] = active_width[6];
-*/
+
   while (true)
   {
 lab22:
@@ -124,14 +117,6 @@ lab22:
     if (type(r) == delta_node)
     {
       do_all_six(update_width);
-/*
-      cur_active_width[1] = cur_active_width[1] + mem[r + 1].cint;
-      cur_active_width[2] = cur_active_width[2] + mem[r + 2].cint;
-      cur_active_width[3] = cur_active_width[3] + mem[r + 3].cint;
-      cur_active_width[4] = cur_active_width[4] + mem[r + 4].cint;
-      cur_active_width[5] = cur_active_width[5] + mem[r + 5].cint;
-      cur_active_width[6] = cur_active_width[6] + mem[r + 6].cint;
-*/
       prev_prev_r = prev_r;
       prev_r = r;
       goto lab22;
@@ -148,14 +133,6 @@ lab22:
           {
             no_break_yet = false;
             do_all_six(set_break_width_to_background);
-/*
-            break_width[1] = background[1];
-            break_width[2] = background[2];
-            break_width[3] = background[3];
-            break_width[4] = background[4];
-            break_width[5] = background[5];
-            break_width[6] = background[6];
-*/
             s = cur_p;
 
             if (break_type > unhyphenated)
@@ -284,26 +261,10 @@ lab30:;
           if (type(prev_r) == delta_node)
           {
             do_all_six(convert_to_break_width);
-/*
-            mem[prev_r + 1].cint = mem[prev_r + 1].cint - cur_active_width[1] + break_width[1];
-            mem[prev_r + 2].cint = mem[prev_r + 2].cint - cur_active_width[2] + break_width[2];
-            mem[prev_r + 3].cint = mem[prev_r + 3].cint - cur_active_width[3] + break_width[3];
-            mem[prev_r + 4].cint = mem[prev_r + 4].cint - cur_active_width[4] + break_width[4];
-            mem[prev_r + 5].cint = mem[prev_r + 5].cint - cur_active_width[5] + break_width[5];
-            mem[prev_r + 6].cint = mem[prev_r + 6].cint - cur_active_width[6] + break_width[6];
-*/
           }
           else if (prev_r == active)
           {
             do_all_six(store_break_width);
-/*
-            active_width[1] = break_width[1];
-            active_width[2] = break_width[2];
-            active_width[3] = break_width[3];
-            active_width[4] = break_width[4];
-            active_width[5] = break_width[5];
-            active_width[6] = break_width[6];
-*/
           }
           else
           {
@@ -312,14 +273,6 @@ lab30:;
             type(q) = delta_node;
             subtype(q) = 0;
             do_all_six(new_delta_to_break_width);
-/*
-            mem[q + 1].cint = break_width[1]- cur_active_width[1];
-            mem[q + 2].cint = break_width[2]- cur_active_width[2];
-            mem[q + 3].cint = break_width[3]- cur_active_width[3];
-            mem[q + 4].cint = break_width[4]- cur_active_width[4];
-            mem[q + 5].cint = break_width[5]- cur_active_width[5];
-            mem[q + 6].cint = break_width[6]- cur_active_width[6];
-*/
             link(prev_r) = q;
             prev_prev_r = prev_r;
             prev_r = q;
@@ -389,14 +342,6 @@ lab30:;
             type(q) = delta_node;
             subtype(q) = 0;
             do_all_six(new_delta_from_break_width);
-/*
-            mem[q + 1].cint = cur_active_width[1] - break_width[1];
-            mem[q + 2].cint = cur_active_width[2] - break_width[2];
-            mem[q + 3].cint = cur_active_width[3] - break_width[3];
-            mem[q + 4].cint = cur_active_width[4] - break_width[4];
-            mem[q + 5].cint = cur_active_width[5] - break_width[5];
-            mem[q + 6].cint = cur_active_width[6] - break_width[6];
-*/
             link(prev_r) = q;
             prev_prev_r = prev_r;
             prev_r = q;
@@ -603,20 +548,6 @@ lab60:
         {
           do_all_six(update_active);
           do_all_six(copy_to_cur_active);
-/*
-          active_width[1] = active_width[1] + mem[r + 1].cint;
-          active_width[2] = active_width[2] + mem[r + 2].cint;
-          active_width[3] = active_width[3] + mem[r + 3].cint;
-          active_width[4] = active_width[4] + mem[r + 4].cint;
-          active_width[5] = active_width[5] + mem[r + 5].cint;
-          active_width[6] = active_width[6] + mem[r + 6].cint;
-          cur_active_width[1] = active_width[1];
-          cur_active_width[2] = active_width[2];
-          cur_active_width[3] = active_width[3];
-          cur_active_width[4] = active_width[4];
-          cur_active_width[5] = active_width[5];
-          cur_active_width[6] = active_width[6];
-*/
           link(active) = link(r);
           free_node(r, delta_node_size);
         }
@@ -628,14 +559,6 @@ lab60:
         if (r == active)
         {
           do_all_six(downdate_width);
-/*
-          cur_active_width[1] = cur_active_width[1] - mem[prev_r + 1].cint;
-          cur_active_width[2] = cur_active_width[2] - mem[prev_r + 2].cint;
-          cur_active_width[3] = cur_active_width[3] - mem[prev_r + 3].cint;
-          cur_active_width[4] = cur_active_width[4] - mem[prev_r + 4].cint;
-          cur_active_width[5] = cur_active_width[5] - mem[prev_r + 5].cint;
-          cur_active_width[6] = cur_active_width[6] - mem[prev_r + 6].cint;
-*/
           link(prev_prev_r) = active;
           free_node(prev_r, delta_node_size);
           prev_r = prev_prev_r;
@@ -644,20 +567,6 @@ lab60:
         {
           do_all_six(update_width);
           do_all_six(combine_two_deltas);
-/*
-          cur_active_width[1] = cur_active_width[1] + mem[r + 1].cint;
-          cur_active_width[2] = cur_active_width[2] + mem[r + 2].cint;
-          cur_active_width[3] = cur_active_width[3] + mem[r + 3].cint;
-          cur_active_width[4] = cur_active_width[4] + mem[r + 4].cint;
-          cur_active_width[5] = cur_active_width[5] + mem[r + 5].cint;
-          cur_active_width[6] = cur_active_width[6] + mem[r + 6].cint;
-          mem[prev_r + 1].cint = mem[prev_r + 1].cint + mem[r + 1].cint;
-          mem[prev_r + 2].cint = mem[prev_r + 2].cint + mem[r + 2].cint;
-          mem[prev_r + 3].cint = mem[prev_r + 3].cint + mem[r + 3].cint;
-          mem[prev_r + 4].cint = mem[prev_r + 4].cint + mem[r + 4].cint;
-          mem[prev_r + 5].cint = mem[prev_r + 5].cint + mem[r + 5].cint;
-          mem[prev_r + 6].cint = mem[prev_r + 6].cint + mem[r + 6].cint;
-*/
           link(prev_r) = link(r);
           free_node(r, delta_node_size);
         }
@@ -680,8 +589,6 @@ lab10:
         }
       }
 #endif /* STAT */
-/*  must exit here, there are no internal return - except for confusion */
-/*  savedbadness = b; */      /* 96/Feb/9 - for test in itex.c */
 }
 /* end of the old tex5.c here */
 /* sec 0877 */
@@ -947,7 +854,7 @@ lab22:
   {
     k = bchar_label[hf];
 
-    if (k == non_address)    /* i.e. 0 ---  96/Jan/15 */
+    if (k == non_address)
       goto lab30;
     else
       q = font_info[k].qqqq;
@@ -968,6 +875,7 @@ lab22:
       q = font_info[k].qqqq;
     }
   }
+
   if (cur_rh < non_char)
     test_char = cur_rh;
   else
@@ -1228,13 +1136,14 @@ void hyphenate (void)
 
       while (s != 0)
       {
-        hyf[mem[s].hh.v.LH] = 1;
-        s = mem[s].hh.v.RH;
+        hyf[info(s)] = 1;
+        s = link(s);
       }
 
       decr(hn);
       goto lab40;
     }
+
 lab30:;
     if (h > 0)
       decr(h);
@@ -1324,7 +1233,7 @@ lab41:;
           init_lig = false;
         }
 
-        free_node(ha, small_node_size);
+      free_node(ha, small_node_size);
     }
   else
   {
@@ -1735,14 +1644,6 @@ halfword vert_break_(halfword p, scaled h, scaled d)
 
   least_cost = awful_bad;
   do_all_six(set_height_zero);
-/*
-  active_width[1] = 0;
-  active_width[2] = 0;
-  active_width[3] = 0;
-  active_width[4] = 0;
-  active_width[5] = 0;
-  active_width[6] = 0;
-*/
   prev_dp = 0;
 
   while (true)
@@ -1810,18 +1711,20 @@ halfword vert_break_(halfword p, scaled h, scaled d)
           b = 0;
         else
           b = badness(h - cur_height, active_width[2]);
-      else if (active_width[1] - h > active_width[6])
-        b = awful_bad;
       else
-        b = badness(cur_height - h, active_width[6]);
+        if (active_width[1] - h > active_width[6])
+          b = awful_bad;
+        else
+          b = badness(cur_height - h, active_width[6]);
 
       if (b < awful_bad)
         if (pi <= eject_penalty)
           b = pi;
-        else if (b < inf_bad)
-          b = b + pi;
         else
-          b = deplorable;
+          if (b < inf_bad)
+            b = b + pi;
+          else
+            b = deplorable;
 
       if (b <= least_cost)
       {
@@ -1873,6 +1776,7 @@ lab45:
     prev_p = p;
     p = link(prev_p);
   }
+
 lab30:
   return best_place;
 }
@@ -1997,15 +1901,8 @@ void freeze_page_specs_(small_number s)
   page_max_depth = max_depth;
   page_depth = 0;
   do_all_six(set_page_so_far_zero);
-/*
-  page_so_far[1] = 0;
-  page_so_far[2] = 0;
-  page_so_far[3] = 0;
-  page_so_far[4] = 0;
-  page_so_far[5] = 0;
-  page_so_far[6] = 0;
-*/
   least_page_cost = awful_bad;
+
 #ifdef STAT
   if (tracing_pages > 0)
   {

diff --git a/src/texsourc/yandytex.c b/src/texsourc/yandytex.c
index 2c914e3..9ad2641 100644 (file)
--- a/src/texsourc/yandytex.c
+++ b/src/texsourc/yandytex.c
@@ -21,22 +21,15 @@
 
 #include "texd.h"
 
-
 #define dump_default_var    TEX_format_default
 #define dump_default        " plain.fmt"
 #define dump_ext_length     4
 #define dump_default_length format_default_length
 #define main_program        texbody
 #define edit_value          tex_edit_value
-#define edit_var            "UFYFEJU"
-
 
 extern char * replacement[];
 
-#ifdef FUNNY_CORE_DUMP
-  void funny_core_dump (void);
-#endif
-
 /* The main program, etc.  */
 
 /* What we were invoked as and with.  */
@@ -143,11 +136,12 @@ void t_open_in (void)
   }
 
   /* Find the end of the buffer.  */
-  for (last = first; buffer[last]; ++last) ;
+  for (last = first; buffer[last]; ++last)
+    ;
+
+  for (--last; last >= first && ISBLANK (buffer[last]) && buffer[last] != '\r'; --last)
+    ;
 
-  for (--last; last >= first
-      && ISBLANK (buffer[last]) && buffer[last] != '\r'; --last)
-      ;
   last++;
 
 /* One more time, this time converting to TeX's internal character
@@ -200,8 +194,8 @@ void get_date_and_time (integer *sys_minutes,
   }
 
   tmptr = localtime (&clock);
-/*  MS C runtime library has trouble for clock >= 2^31 !!! */
-  if (tmptr == NULL)           /* debugging 95/Dec/30*/
+
+  if (tmptr == NULL)
   {
     sprintf(log_line, "Cannot convert time (%0ld)!\n", clock);
     show_line(log_line, 1);
@@ -356,8 +350,10 @@ bool input_line_finish (void)
 /* What about control-Z that gets read in binary mode ? - bkph */
 // #ifdef MYDEBUG
 /*  while (last > first && buffer[last - 1] <= ' ')  --last; */
-  while (last > first) {
+  while (last > first)
+  {
     i = buffer[last - 1];
+
     if (i == ' ' || i == '\t')
       --last;
 /*    else if (trimeof && i == 26) --last;   */   /* 93/Nov/24 */
@@ -619,7 +615,7 @@ void call_edit (ASCII_code *stringpool, pool_pointer fnstart, integer fnlength,
     show_line(log_line, 0);
   }
 
-  s = kpse_var_value(edit_var);  
+  s = kpse_var_value(edit_value);  
 
   if (s != NULL)
     edit_value = s;
@@ -900,7 +896,7 @@ int do_undump (char *p, int item_size, int nitems, FILE *in_file)
    TeX from virtex, and is triggered by a magic file name requested as
    input (see `open_input', above).  */
 
-void funny_core_dump ()
+void funny_core_dump (void)
 {
   int pid, w;
   union wait status;