pdf_set_rule.

[putex/putex.git] / src / texsourc / tex0.c

diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c
index 0586036..3a0a103 100644 (file)
--- a/src/texsourc/tex0.c
+++ b/src/texsourc/tex0.c
@@ -272,7 +272,7 @@ void print_ (integer s)
 
   if (s >= str_ptr)
     s = 259; /* ??? */
-  else 
+  else
   {
     if (s < 256)
     {
@@ -330,6 +330,7 @@ void print_ (integer s)
               incr(j);
             }
           }
+
           new_line_char = nl; /* restore eol */
           return;
       }
@@ -351,7 +352,6 @@ void print_string_ (unsigned char *s)
     print_char(*s++);
 }
 /* sec 0060 */
-// print string number s from string pool by calling print_
 void slow_print_ (integer s)
 {
   pool_pointer j;
@@ -372,7 +372,6 @@ void slow_print_ (integer s)
   }
 }
 /* sec 0062 */
-// print newline followed by string number s (unless at start of line)
 void print_nl_ (const char * s)
 {
   if (((term_offset > 0) && (odd(selector))) ||
@@ -382,7 +381,6 @@ void print_nl_ (const char * s)
   print_string(s);
 }
 /* sec 0063 */
-// print string number s preceded by escape character
 void print_esc_ (const char * s)
 {
   integer c;
@@ -476,7 +474,8 @@ void print_cs_ (integer p)
     print_esc("NONEXISTENT.");
   else
   {
-    print_esc(""); print(text(p));
+    print_esc("");
+    print(text(p));
     print_char(' ');
   }
 }
@@ -488,7 +487,8 @@ void sprint_cs_(halfword p)
       print(p - active_base);
     else if (p < null_cs)
     {
-      print_esc(""); print(p - single_base);
+      print_esc("");
+      print(p - single_base);
     }
     else
     {
@@ -518,9 +518,11 @@ void print_size_ (integer s)
     print_esc("scriptscriptfont");
 } 
 /* sec 1355 */
-void print_write_whatsit_(str_number s, halfword p)
+void print_write_whatsit_(str_number s, pointer p)
 {
-  print_esc(""); print(s);
+  print_esc("");
+  print(s);
+
   if (write_stream(p) < 16)
     print_int(write_stream(p)); 
   else if (write_stream(p) == 16)
@@ -842,7 +844,7 @@ void confusion_(char * s)
   succumb();
 }
 /* sec 0037 */
-bool init_terminal (void)
+boolean init_terminal (void)
 {
   int flag;
 
@@ -892,7 +894,6 @@ bool init_terminal (void)
   }
 }
 /* sec 0043 */
-// Make string from str_start[str_ptr] to pool_ptr
 str_number make_string (void)
 {
 #ifdef ALLOCATESTRING
@@ -917,11 +918,11 @@ str_number make_string (void)
   return (str_ptr - 1);
 }
 /* sec 0044 */
-bool str_eq_buf_ (str_number s, integer k)
+boolean str_eq_buf_ (str_number s, integer k)
 {
-  register bool Result;
+  register boolean Result;
   pool_pointer j;
-  bool result;
+  boolean result;
 
   j = str_start[s];
 
@@ -942,11 +943,11 @@ lab45:
   return Result;
 }
 /* sec 0045 */
-bool str_eq_str_ (str_number s, str_number t)
+boolean str_eq_str_ (str_number s, str_number t)
 {
-  register bool Result;
+  register boolean Result;
   pool_pointer j, k;
-  bool result;
+  boolean result;
 
   result = false;
 
@@ -1299,7 +1300,6 @@ scaled round_decimals_(small_number k)
   return ((a + 1) / 2);
 }
 /* sec 0103 */
-/* This has some minor speedup changes - no real advantage probably ... */
 void print_scaled_(scaled s)
 {
   scaled delta;
@@ -1348,7 +1348,7 @@ scaled mult_and_add_(integer n, scaled x, scaled y, scaled maxanswer)
 scaled x_over_n_(scaled x, integer n)
 {
   register scaled Result;
-  bool negative;
+  boolean negative;
 
   negative = false;
 
@@ -1388,7 +1388,7 @@ scaled x_over_n_(scaled x, integer n)
 scaled xn_over_d_(scaled x, integer n, integer d)
 {
   register scaled Result;
-  bool positive;
+  boolean positive;
   nonnegative_integer t, u, v;
 
   if (x >= 0)
@@ -1455,13 +1455,13 @@ void print_word_(memory_word w)
   print_char(' ');
   print_scaled(round(65536L * w.gr));
   print_ln();
-  print_int(w.hh.v.LH);
+  print_int(w.hh.lh);
   print_char('=');
   print_int(w.hh.b0);
   print_char(':');
   print_int(w.hh.b1);
   print_char(';');
-  print_int(w.hh.v.RH);
+  print_int(w.hh.rh);
   print_char(' ');
   print_int(w.qqqq.b0); 
   print_char(':');
@@ -1472,7 +1472,7 @@ void print_word_(memory_word w)
   print_int(w.qqqq.b3);
 } 
 /* need this version only if SHORTFONTINFO defined */
-void zprintfword(fmemoryword w)
+void zprintfword(memory_word w)
 {
   print_int(w.cint);
   print_char(' ');
@@ -1480,13 +1480,13 @@ void zprintfword(fmemoryword w)
   print_char(' ');
   print_scaled(round(65536L * w.gr));
   print_ln();
-  print_int(w.hh.v.LH);
+  print_int(w.hh.lh);
   print_char('=');
   print_int(w.hh.b0);
   print_char(':');
   print_int(w .hh.b1);
   print_char(';');
-  print_int(w.hh.v.RH);
+  print_int(w.hh.rh);
   print_char(' ');
   print_int(w.qqqq.b0);
   print_char(':');
@@ -1721,7 +1721,7 @@ lab20:
     {
       q = p + node_size(p);
 
-      while ((mem[q].hh.v.RH == empty_flag))
+      while ((mem[q].hh.rh == empty_flag))
       {
         t = rlink(q);
 
@@ -1821,7 +1821,7 @@ lab20:
     overflow("main memory size", mem_max + 1 - mem_min); /* darn: allocation failed ! */
     return 0;     // abort_flag set
   }
-/* avoid function call in following ? */
+
   add_variable_space (block_size); /* now to be found in itex.c */
   goto lab20;         /* go try get_node again */
 
@@ -2017,10 +2017,10 @@ halfword new_penalty_(integer m)
 
 #ifdef DEBUG
 /* sec 0167 */
-void check_mem_(bool printlocs)
+void check_mem_(boolean printlocs)
 {
   halfword p, q;
-  bool clobbered;
+  boolean clobbered;
 
   for (p = mem_min; p <= lo_mem_max; p++) freearr[p] = false;
   for (p = hi_mem_min; p <= mem_end; p++) freearr[p] = false;
@@ -2272,7 +2272,7 @@ void print_mark_ (integer p)
 { 
   print_char('{');
 
-  if ((p < hi_mem_min)||(p > mem_end))
+  if ((p < hi_mem_min) || (p > mem_end))
     print_esc("CLOBBERED.");
   else
     show_token_list(link(p), 0, max_print_line - 10);
@@ -2308,7 +2308,7 @@ void print_glue_(scaled d, integer order, char * s)
 /* sec 0178 */
 void print_spec_(integer p, char * s)
 {
-  if ((p < mem_min)||(p >= lo_mem_max)) 
+  if ((p < mem_min) || (p >= lo_mem_max)) 
     print_char('*');
   else
   {
@@ -2344,7 +2344,7 @@ void print_delimiter_(halfword p)
   integer a;
 
   a = small_fam(p) * 256 + small_char(p);
-  a = a * 4096 + large_fam(p) * 256 + large_char(p);
+  a = a * 0x1000 + large_fam(p) * 256 + large_char(p);
 
   if (a < 0)
     print_int(a);
@@ -2506,9 +2506,9 @@ void show_node_list_(integer p)
 
   if (cur_length > depth_threshold)
   {
-/*  if (p > 0) */  /* was p>null !!! line 3662 in tex.web */
     if (p != 0)    /* fixed 94/Mar/23 BUG FIX NOTE: still not fixed in 3.14159 ! */
-    print_string(" []");
+      print_string(" []");
+
     return; 
   }
 
@@ -2610,7 +2610,7 @@ void show_node_list_(integer p)
               str_pool[pool_ptr] = 46;
               incr(pool_ptr);
             }
-            show_node_list(mem[p + 5].hh.v.RH);
+            show_node_list(mem[p + 5].hh.rh);
             decr(pool_ptr);
           }
         }
@@ -2644,7 +2644,7 @@ void show_node_list_(integer p)
               str_pool[pool_ptr] = 46;
               incr(pool_ptr);
             }
-            show_node_list(mem[p + 4].hh.v.LH);
+            show_node_list(mem[p + 4].hh.lh);
             decr(pool_ptr);
           }
         }
@@ -2714,7 +2714,7 @@ void show_node_list_(integer p)
               str_pool[pool_ptr] = 46;
               incr(pool_ptr);
             }
-            show_node_list(mem[p + 1].hh.v.RH);
+            show_node_list(mem[p + 1].hh.rh);
             decr(pool_ptr);
           }
         }
@@ -2825,14 +2825,14 @@ void show_node_list_(integer p)
               str_pool[pool_ptr] = 46;
               incr(pool_ptr);
             }
-            show_node_list(mem[p + 1].hh.v.LH);
+            show_node_list(mem[p + 1].hh.lh);
             decr(pool_ptr);
           }
           {
             str_pool[pool_ptr]= 124;
             incr(pool_ptr);
           }
-          show_node_list(mem[p + 1].hh.v.RH);
+          show_node_list(mem[p + 1].hh.rh);
           decr(pool_ptr);
         }
         break;
@@ -3002,7 +3002,7 @@ void show_node_list_(integer p)
           }
 
           if ((small_fam(right_delimiter(p)) != 0) || (small_char(right_delimiter(p)) != 0) ||
-              (large_fam(right_delimiter(p)) != 0)||(large_char(right_delimiter(p)) != 0))
+              (large_fam(right_delimiter(p)) != 0) || (large_char(right_delimiter(p)) != 0))
           {
             print_string(", right-delimiter ");
             print_delimiter(right_delimiter(p));
@@ -3019,4 +3019,4 @@ void show_node_list_(integer p)
     }
     p = link(p);
   }
-}
+}
\ No newline at end of file