removed DOS-related codes.

diff --git a/src/texsourc/dpx.c b/src/texsourc/dpx.c
index 3a866dc..b950946 100644 (file)
--- a/src/texsourc/dpx.c
+++ b/src/texsourc/dpx.c
@@ -15,8 +15,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\r
    02110-1301 USA.  */\r
 \r
-/* Y&Y TeX's DVIPDFMX backend. */\r
-\r
 #define EXTERN extern\r
 \r
 #include "dpx.h"\r
@@ -42,8 +40,6 @@ void pdf_ship_out (pointer p)
 {\r
   integer page_loc;\r
   char j, k;\r
-  pool_pointer s;\r
-  char old_setting;\r
 \r
   if (tracing_output > 0)\r
   {\r
@@ -82,8 +78,8 @@ void pdf_ship_out (pointer p)
   }\r
 \r
   if ((height(p) > max_dimen) || (depth(p) > max_dimen) ||\r
-    (height(p) + depth(p) + v_offset > max_dimen) ||\r
-    (width(p) + h_offset > max_dimen))\r
+      (height(p) + depth(p) + v_offset > max_dimen) ||\r
+      (width(p) + h_offset > max_dimen))\r
   {\r
     print_err("Huge page cannot be shipped out");\r
     help2("The page just created is more than 18 feet tall or",\r
@@ -266,7 +262,7 @@ reswitch:
       pdf_dev_set_string(cur_h, -cur_v, cbuf, 1, char_width(f, char_info(f, c)), font_id[dvi_f], 1);\r
       {\r
         pdf_rect rect;\r
-        pdf_dev_set_rect(&rect, cur_h, -dvi_v,\r
+        pdf_dev_set_rect(&rect, cur_h, -cur_v,\r
           char_width (f, char_info(f, c)),\r
           char_height(f, height_depth(char_info(f, c))),\r
           char_depth (f, height_depth(char_info(f, c))));\r
@@ -307,12 +303,12 @@ reswitch:
         break;\r
 \r
       case rule_node:\r
-      {\r
-        rule_ht = height(p);\r
-        rule_dp = depth(p);\r
-        rule_wd = width(p);\r
-        goto fin_rule;\r
-      }\r
+        {\r
+          rule_ht = height(p);\r
+          rule_dp = depth(p);\r
+          rule_wd = width(p);\r
+          goto fin_rule;\r
+        }\r
         break;\r
 \r
       case whatsit_node:\r
@@ -320,102 +316,102 @@ reswitch:
         break;\r
 \r
       case glue_node:\r
-      {\r
-        g = glue_ptr(p);\r
-        rule_wd = width(g) - cur_g;\r
-\r
-        if (g_sign != normal)\r
         {\r
-          if (g_sign == stretching)\r
+          g = glue_ptr(p);\r
+          rule_wd = width(g) - cur_g;\r
+\r
+          if (g_sign != normal)\r
           {\r
-            if (stretch_order(g) == g_order)\r
+            if (g_sign == stretching)\r
+            {\r
+              if (stretch_order(g) == g_order)\r
+              {\r
+                cur_glue = cur_glue + stretch(g);\r
+                vet_glue(glue_set(this_box) * cur_glue);\r
+                cur_g = round(glue_temp);\r
+              }\r
+            }\r
+            else if (shrink_order(g) == g_order)\r
             {\r
-              cur_glue = cur_glue + stretch(g);\r
+              cur_glue = cur_glue - shrink(g);\r
               vet_glue(glue_set(this_box) * cur_glue);\r
               cur_g = round(glue_temp);\r
             }\r
           }\r
-          else if (shrink_order(g) == g_order)\r
-          {\r
-            cur_glue = cur_glue - shrink(g);\r
-            vet_glue(glue_set(this_box) * cur_glue);\r
-            cur_g = round(glue_temp);\r
-          }\r
-        }\r
-\r
-        rule_wd = rule_wd + cur_g;\r
 \r
-        if (subtype(p) >= a_leaders)\r
-        {\r
-          leader_box = leader_ptr(p);\r
+          rule_wd = rule_wd + cur_g;\r
 \r
-          if (type(leader_box) == rule_node)\r
+          if (subtype(p) >= a_leaders)\r
           {\r
-            rule_ht = height(leader_box);\r
-            rule_dp = depth(leader_box);\r
-            goto fin_rule;\r
-          }\r
+            leader_box = leader_ptr(p);\r
 \r
-          leader_wd = width(leader_box);\r
+            if (type(leader_box) == rule_node)\r
+            {\r
+              rule_ht = height(leader_box);\r
+              rule_dp = depth(leader_box);\r
+              goto fin_rule;\r
+            }\r
 \r
-          if ((leader_wd > 0) && (rule_wd > 0))\r
-          {\r
-            rule_wd = rule_wd + 10;\r
-            edge = cur_h + rule_wd;\r
-            lx = 0;\r
+            leader_wd = width(leader_box);\r
 \r
-            if (subtype(p) == a_leaders)\r
+            if ((leader_wd > 0) && (rule_wd > 0))\r
             {\r
-              save_h = cur_h;\r
-              cur_h = left_edge + leader_wd * ((cur_h - left_edge) / leader_wd);\r
+              rule_wd = rule_wd + 10;\r
+              edge = cur_h + rule_wd;\r
+              lx = 0;\r
 \r
-              if (cur_h < save_h)\r
-                cur_h = cur_h + leader_wd;\r
-            }\r
-            else\r
-            {\r
-              lq = rule_wd / leader_wd;\r
-              lr = rule_wd % leader_wd;\r
+              if (subtype(p) == a_leaders)\r
+              {\r
+                save_h = cur_h;\r
+                cur_h = left_edge + leader_wd * ((cur_h - left_edge) / leader_wd);\r
 \r
-              if (subtype(p) == c_leaders)\r
-                cur_h = cur_h + (lr / 2);\r
+                if (cur_h < save_h)\r
+                  cur_h = cur_h + leader_wd;\r
+              }\r
               else\r
               {\r
-                lx = (2 * lr + lq + 1) / (2 * lq + 2);\r
-                cur_h = cur_h + ((lr - (lq - 1)* lx) / 2);\r
+                lq = rule_wd / leader_wd;\r
+                lr = rule_wd % leader_wd;\r
+\r
+                if (subtype(p) == c_leaders)\r
+                  cur_h = cur_h + (lr / 2);\r
+                else\r
+                {\r
+                  lx = (2 * lr + lq + 1) / (2 * lq + 2);\r
+                  cur_h = cur_h + ((lr - (lq - 1)* lx) / 2);\r
+                }\r
               }\r
-            }\r
 \r
-            while (cur_h + leader_wd <= edge)\r
-            {\r
-              cur_v = base_line + shift_amount(leader_box);\r
-              pdf_synch_v();\r
-              save_v = dvi_v;\r
-              pdf_synch_h();\r
-              save_h = dvi_h;\r
-              temp_ptr = leader_box;\r
-              outer_doing_leaders = doing_leaders;\r
-              doing_leaders = true;\r
-\r
-              if (type(leader_box) == vlist_node)\r
-                pdf_vlist_out();\r
-              else\r
-                pdf_hlist_out();\r
+              while (cur_h + leader_wd <= edge)\r
+              {\r
+                cur_v = base_line + shift_amount(leader_box);\r
+                pdf_synch_v();\r
+                save_v = dvi_v;\r
+                pdf_synch_h();\r
+                save_h = dvi_h;\r
+                temp_ptr = leader_box;\r
+                outer_doing_leaders = doing_leaders;\r
+                doing_leaders = true;\r
+\r
+                if (type(leader_box) == vlist_node)\r
+                  pdf_vlist_out();\r
+                else\r
+                  pdf_hlist_out();\r
 \r
-              doing_leaders = outer_doing_leaders;\r
-              dvi_v = save_v;\r
-              dvi_h = save_h;\r
-              cur_v = base_line;\r
-              cur_h = save_h + leader_wd + lx;\r
-            }\r
+                doing_leaders = outer_doing_leaders;\r
+                dvi_v = save_v;\r
+                dvi_h = save_h;\r
+                cur_v = base_line;\r
+                cur_h = save_h + leader_wd + lx;\r
+              }\r
 \r
-            cur_h = edge - 10;\r
-            goto next_p;\r
+              cur_h = edge - 10;\r
+              goto next_p;\r
+            }\r
           }\r
-        }\r
 \r
-        goto move_past;\r
-      }\r
+          goto move_past;\r
+        }\r
         break;\r
 \r
       case kern_node:\r
@@ -424,12 +420,12 @@ reswitch:
         break;\r
 \r
       case ligature_node:\r
-      {\r
-        mem[lig_trick] = mem[lig_char(p)];\r
-        link(lig_trick) = link(p);\r
-        p = lig_trick;\r
-        goto reswitch;\r
-      }\r
+        {\r
+          mem[lig_trick] = mem[lig_char(p)];\r
+          link(lig_trick) = link(p);\r
+          p = lig_trick;\r
+          goto reswitch;\r
+        }\r
         break;\r
 \r
       default:\r

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index 8da8af4..29116ba 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -85,28 +85,6 @@ boolean mem_spec_flag     = false;
 boolean format_spec       = false;\r
 boolean reorder_arg_flag  = true;  /* put command line flags/arguments first */\r
 \r
-/* Mapping from Windows ANSI to DOS code page 850 96/Jan/20 */\r
-\r
-unsigned char wintodos[128] =\r
-{\r
-    0,   0,   0, 159,   0,   0,   0,   0,\r
-   94,   0,   0,   0,   0,   0,   0,   0,\r
-    0,  96,  39,   0,   0,   7,   0,   0,\r
-  126,   0,   0,   0,   0,   0,   0,   0,\r
-   32, 173, 189, 156, 207, 190, 221,  21,\r
-    0, 184, 166, 174, 170,  45, 169,   0,\r
-  248, 241, 253, 252,   0, 230,  20, 250,\r
-    0, 251, 167, 175, 172, 171, 243, 168,\r
-  183, 181, 182, 199, 142, 143, 146, 128,\r
-  212, 144, 210, 211, 222, 214, 215, 216,\r
-  209, 165, 227, 224, 226, 229, 153, 158,\r
-  157, 235, 233, 234, 154, 237, 232, 225,\r
-  133, 160, 131, 198, 132, 134, 145, 135,\r
-  138, 130, 136, 137, 141, 161, 140, 139,\r
-  208, 164, 149, 162, 147, 228, 148, 246,\r
-  155, 151, 163, 150, 129, 236, 231, 152\r
-};\r
-\r
 void show_usage (void)\r
 {\r
   printf("\n"\r
@@ -2189,7 +2167,6 @@ void knuthify (void)
   restrict_to_ascii     = false; /* don't complain non ASCII */\r
   allow_patterns        = false; /* don't allow pattern redefinition */\r
   show_in_hex           = true;  /* show character code in hex */\r
-  show_in_dos           = false; /* redundant with previous */\r
   show_numeric          = false; /* don't show character code decimal */\r
   show_missing          = false; /* don't show missing characters */\r
   civilize_flag         = false; /* don't reorder date fields */\r
@@ -2294,9 +2271,6 @@ int analyze_flag (int c, char * optarg)
     case 'w':\r
       show_in_hex = true;\r
       break;\r
-    case 'j':\r
-      show_in_dos = true;\r
-      break;\r
     case 'n':\r
       restrict_to_ascii = true; /* 0 - 127 1994/Jan/21 */\r
       break;\r
@@ -2578,7 +2552,6 @@ int read_command_line (int ac, char **av)
 \r
 int init_commands (int ac, char **av)\r
 {\r
-  shipout_flag          = out_dvi_flag;\r
   is_initex             = false; \r
   allow_patterns        = false;\r
   reset_exceptions      = false;\r
@@ -2589,7 +2562,6 @@ int init_commands (int ac, char **av)
   verbose_flag          = false;\r
   restrict_to_ascii     = false;\r
   show_in_hex           = false; /* default is not to show as hex code ^^ 00/Jun/18 */\r
-  show_in_dos           = false; /* default is not to translate to DOS 850 */ \r
   return_flag           = true;  // hard wired now\r
   trimeof               = true;  // hard wired now\r
   deslash               = true;\r

diff --git a/src/texsourc/macros.h b/src/texsourc/macros.h
index b10dd3f..35b9d39 100644 (file)
--- a/src/texsourc/macros.h
+++ b/src/texsourc/macros.h
@@ -55,6 +55,14 @@ enum
   error_message_issued = 2,\r
   fatal_error_stop     = 3,\r
 };\r
+/* sec 0079 */\r
+#define help0()     tex_help(0)\r
+#define help1(...)  tex_help(1, __VA_ARGS__)\r
+#define help2(...)  tex_help(2, __VA_ARGS__)\r
+#define help3(...)  tex_help(3, __VA_ARGS__)\r
+#define help4(...)  tex_help(4, __VA_ARGS__)\r
+#define help5(...)  tex_help(5, __VA_ARGS__)\r
+#define help6(...)  tex_help(6, __VA_ARGS__)\r
 /* sec 0096 */\r
 #define check_interrupt()     \\r
 do                            \\r

diff --git a/src/texsourc/makefile.txt b/src/texsourc/makefile.txt
deleted file mode 100644 (file)
index 82b8b63..0000000
--- a/src/texsourc/makefile.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright 2007 TeX Users Group.\r
-Copyright 2014 Clerk Ma.\r
-You may freely use, modify and/or distribute this file.\r
-\r
-  makefile         9945   1-09-95   8:20a current selected \r
-  makefile.ms      9843   1-09-95   7:42a MS LINK\r
-  makefile.dbg    10449   1-09-95   8:11a debugging version MS LINK WINICE\r
-  makefile.tnt     9262   1-08-95   9:49a 386 | LINK\r
-\r
-Note: WINICE DBG2MAP only works on NT style PE files\r
-\r
-Note: WINICE MSYM needs loads of memory\r
-\r
-Note: MS LINK needs /DEBUG and /DEBUGSTYLE{CV|COFF|BOTH} for debugging info\r
-\r
-Note: Can't run as NT style because if INT 21h calls (_dos_find...)\r
-      or maybe other reasons also... (pharlap.h, pldos32.h)\r

diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c
index 6974cc0..afeb00b 100644 (file)
--- a/src/texsourc/tex0.c
+++ b/src/texsourc/tex0.c
@@ -162,31 +162,10 @@ void print_ (integer s)
           \r
         nl = new_line_char;\r
         new_line_char = -1;\r
-          \r
-        /* translate ansi to dos 850 */\r
+\r
         if (!show_in_hex && s < 256 && s >= 32)\r
         {\r
-          if (show_in_dos && s > 127)\r
-          {\r
-            if (wintodos[s - 128] > 0)\r
-            {\r
-              print_char(wintodos[s - 128]);\r
-            }\r
-            else\r
-            {\r
-              j = str_start[s];\r
-\r
-              while (j < str_start[s + 1])\r
-              {\r
-                print_char(str_pool[j]);\r
-                incr(j);\r
-              }\r
-            }\r
-          }\r
-          else\r
-          {\r
-            print_char(s);       /* don't translate to hex */\r
-          }\r
+          print_char(s);       /* don't translate to hex */\r
         }\r
         else\r
         {                       /* not just a character */\r

diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c
index 7f9e501..b931fe0 100644 (file)
--- a/src/texsourc/tex4.c
+++ b/src/texsourc/tex4.c
@@ -410,7 +410,7 @@ done:
 void special_out (pointer p)\r
 {\r
   char old_setting;\r
-  pool_pointer k;\r
+  //pool_pointer k;\r
 \r
   pdf_synch_h();//synch_h();\r
   pdf_synch_h();//synch_v();\r
@@ -429,7 +429,7 @@ void special_out (pointer p)
   selector = old_setting;\r
   str_room(1);\r
   graphics_mode();\r
-  spc_exec_special(str_pool + str_start[str_ptr], cur_length, cur_h * 0.000015202, -cur_v * 0.000015202, 1.0);\r
+  spc_exec_special((const char *)str_pool + str_start[str_ptr], cur_length, cur_h * 0.000015202, -cur_v * 0.000015202, 1.0);\r
 /*\r
   if (cur_length < 256)\r
   {\r

diff --git a/src/texsourc/yandytex.c b/src/texsourc/yandytex.c
index fefec3e..60dd334 100644 (file)
--- a/src/texsourc/yandytex.c
+++ b/src/texsourc/yandytex.c
@@ -21,8 +21,8 @@
 \r
 #include "yandytex.h"\r
 \r
-#define dump_ext_length     4\r
-#define edit_value          tex_edit_value\r
+#define dump_ext_length 4\r
+#define edit_value      tex_edit_value\r
 \r
 extern char * replacement[];\r
 int    gargc;\r

diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h
index ae073cd..0bc133b 100644 (file)
--- a/src/texsourc/yandytex.h
+++ b/src/texsourc/yandytex.h
@@ -30,10 +30,11 @@
 \r
 #define block_size 1000 /* block_size for variable length node alloc */\r
 \r
-#define min_quarterword 0\r
 #ifdef INCREASEFONTS\r
+  #define min_quarterword 0\r
   #define max_quarterword 65535L\r
 #else\r
+  #define min_quarterword 0\r
   #define max_quarterword 255\r
 #endif\r
 \r
@@ -121,7 +122,6 @@ EXTERN integer max_buf_stack;
   #define max_trie_op       500\r
 #endif\r
 \r
-\r
 #define dvi_buf_size 16384\r
 \r
 #define hash_extra (255 - font_max)\r
@@ -136,7 +136,7 @@ EXTERN integer max_buf_stack;
 #ifdef INCREASEFONTS\r
   typedef unsigned short quarterword;\r
 #else\r
-  typedef unsigned char quarterword;\r
+  typedef unsigned char  quarterword;\r
 #endif\r
 \r
 /* typedef unsigned long halfword; NO NO: since mem_min may be < 0 */\r
@@ -485,7 +485,6 @@ EXTERN dvi_index half_buf;
 EXTERN dvi_index dvi_limit;\r
 EXTERN dvi_index dvi_ptr;\r
 EXTERN integer dvi_offset;\r
-EXTERN integer pdf_offset;\r
 EXTERN integer dvi_gone;\r
 EXTERN pointer down_ptr, right_ptr;\r
 EXTERN scaled dvi_h, dvi_v;\r
@@ -744,7 +743,6 @@ EXTERN int mem_extra_low;
 EXTERN int new_hyphen_prime;\r
 EXTERN int missing_characters;\r
 EXTERN boolean show_in_hex;\r
-EXTERN boolean show_in_dos;\r
 EXTERN boolean show_fmt_flag;\r
 EXTERN boolean show_tfm_flag;\r
 EXTERN boolean truncate_long_lines;\r
@@ -784,7 +782,6 @@ extern int current_buf_size;
 extern const char * banner;\r
 extern const char * application;\r
 extern const char * yandyversion;\r
-extern unsigned char wintodos[128];\r
 extern char log_line[256];\r
 extern char * dvi_directory;\r
 extern char * log_directory;\r
@@ -850,17 +847,7 @@ extern void flush_string (void);
 extern str_number load_pool_strings (integer spare_size);\r
 extern str_number make_string_pool (const char * s);\r
 extern void print_plus (int i, const char * s);\r
-#define help0()     tex_help(0)\r
-#define help1(...)  tex_help(1, __VA_ARGS__)\r
-#define help2(...)  tex_help(2, __VA_ARGS__)\r
-#define help3(...)  tex_help(3, __VA_ARGS__)\r
-#define help4(...)  tex_help(4, __VA_ARGS__)\r
-#define help5(...)  tex_help(5, __VA_ARGS__)\r
-#define help6(...)  tex_help(6, __VA_ARGS__)\r
-extern char * md5_file_name(const char * file_name);\r
 extern void fget (void);\r
 extern str_number get_job_name (str_number job);\r
 extern void show_font_info (void);\r
-\r
-EXTERN int shipout_flag;\r
-#endif\r
+#endif
\ No newline at end of file