updated Windows build.

diff --git a/src/texsourc/Makefile.win.msvc b/src/texsourc/Makefile.win.msvc
index 888f241..93a8ec9 100644 (file)
--- a/src/texsourc/Makefile.win.msvc
+++ b/src/texsourc/Makefile.win.msvc
@@ -17,19 +17,23 @@ LFLAGS=/NOLOGO /MAP
 objs = yandytex.obj itex.obj openinou.obj subroute.obj local.obj \\r
        tex0.obj tex1.obj tex2.obj tex3.obj tex4.obj \\r
        tex5.obj tex6.obj tex7.obj tex8.obj tex9.obj \\r
-       pool.obj yandytex.res utils.obj\r
+       pool.obj yandytex.res utils.obj dpx.obj\r
 \r
 yandytex.exe: $(objs)\r
        $(LINK) $(LFLAGS) yandytex itex openinou subroute local \\r
        tex0 tex1 tex2 tex3 tex4 tex5 tex6 tex7 tex8 tex9 \\r
-       pool yandytex.res utils \\r
-       kpathsea\kpathsea.lib zlib\zlib.lib\r
+       pool yandytex.res utils dpx\\r
+       kpathsea\kpathsea.lib dvipdfmx\libdpx.lib libpng\libpng.lib zlib\zlib.lib\r
        del ..\yandy\bin\yandytex.exe\r
        copy yandytex.exe ..\yandy\bin\yandytex.exe\r
 \r
 yandytex.res: yandytex.rc\r
        $(RC) /nologo yandytex.rc\r
 \r
+dpx.obj: dpx.c \\r
+       texd.h yandytex.h dpx.h memory.h coerce.h macros.h\r
+       $(CC) $(CFLAGS) dpx.c\r
+\r
 yandytex.obj: yandytex.c \\r
        texd.h yandytex.h memory.h coerce.h macros.h\r
        $(CC) $(CFLAGS) yandytex.c\r

diff --git a/src/texsourc/README b/src/texsourc/README
deleted file mode 100644 (file)
index e7bbcd3..0000000
--- a/src/texsourc/README
+++ /dev/null
@@ -1,2 +0,0 @@
-In this directory, you can found sources of Y&Y TeX which is under\r
-developing in MS-Windows (a Linux port is working now).\r

diff --git a/src/texsourc/dpx.c b/src/texsourc/dpx.c
index 8318f0e..ce69246 100644 (file)
--- a/src/texsourc/dpx.c
+++ b/src/texsourc/dpx.c
@@ -19,8 +19,8 @@
 \r
 #define EXTERN extern\r
 \r
-#include "yandytex.h"\r
 #include "dpx.h"\r
+#include "yandytex.h"\r
 \r
 void ensure_pdf_open(void)\r
 {\r
@@ -115,10 +115,6 @@ void pdf_ship_out (pointer p)
 \r
   if (total_pages == 0)\r
   {\r
-    //kpse_init_prog("", 600, NULL, NULL);\r
-    //kpse_set_program_enabled(kpse_pk_format, true, kpse_src_texmf_cnf);\r
-    //pdf_font_set_dpi(600);\r
-    //dpx_delete_old_cache(image_cache_life);\r
     pdf_set_version(5);\r
     pdf_set_compression(9);\r
     pdf_init_fontmaps();\r

diff --git a/src/texsourc/dpx.h b/src/texsourc/dpx.h
index 3377e57..d4a4cbd 100644 (file)
--- a/src/texsourc/dpx.h
+++ b/src/texsourc/dpx.h
@@ -1,10 +1,13 @@
 extern void pdf_init_fontmaps(void);\r
 extern void pdf_close_fontmaps(void);\r
 extern void pdf_doc_set_creator(const char * creator);\r
+extern void pdf_doc_set_producer(const char * producer);\r
 extern void pdf_set_version(unsigned version);\r
 extern void pdf_set_compression(int level);\r
 extern void pdf_files_init(void);\r
 extern void pdf_files_close(void);\r
+extern void graphics_mode (void);\r
+extern long pdf_output_stats (void);\r
 extern void pdf_init_device(double dvi2pts, int precision, int black_and_white);\r
 extern void pdf_close_device(void);\r
 extern void pdf_open_document(const char *filename,\r
@@ -22,6 +25,7 @@ extern int spc_exec_at_end_document(void);
 extern int spc_exec_at_begin_page(void);\r
 extern int spc_exec_at_end_page(void);\r
 typedef signed long spt_t;\r
+extern int dvi_locate_font (const char * name, spt_t ptsize);\r
 extern int spc_exec_special (const char *buffer, long size, double x_user, double y_user, double dpx_mag);\r
 extern int  pdf_dev_locate_font(const char *font_name, spt_t ptsize);\r
 extern void pdf_dev_set_rule(spt_t xpos, spt_t ypos, spt_t width, spt_t height);\r

diff --git a/src/texsourc/notes.txt b/src/texsourc/notes.txt
deleted file mode 100644 (file)
index 99ef573..0000000
--- a/src/texsourc/notes.txt
+++ /dev/null
@@ -1,39 +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
-use \write18{...} to execute system commmands?\r
-\r
-use openany_out to allow opening `special' files that should\r
-otherwise be prohibited (on Unix, files starting with .)?\r
-\r
-**********************************************************************\r
-\r
-Notes:  Making adjustable hash-table version:\r
-\r
-win web2c twice with different hash_size and hash_prime\r
-\r
-collection the *.c and *.h files in each case\r
-\r
-run comaptex.exe on these files to mark all uses of hash_size and hash_prime\r
-\r
-reconcile difference with existing *.c and *.h files\r
-\r
-**********************************************************************\r
-\r
-Notes:  there are still a few places where we may be able to \r
-go from 256 to (maxquarterword + 1) (or 255 to maxquarterword):\r
-itex.c (info(end_span) <- null p.797)\r
-tex1.c (overflow of grouping levels p.274), \r
-tex5.c (confusion(256 spans) p.798), \r
-tex7.c (replace_count(tail) p.1120)\r
-\r
-**********************************************************************\r
-\r
-internal_font_number --> true name --> HPDF_Font\r
-1                     |  cmr10      |  1\r
-2                     |  cmr10      |  1\r
-3                     |  cmmi10     |  2\r
-\r
-BOX -> BOX -> BOX -> BOX\r
-BT -> FONT -> CUR_XY -> ET\r

diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c
index cf15785..7f9e501 100644 (file)
--- a/src/texsourc/tex4.c
+++ b/src/texsourc/tex4.c
@@ -17,8 +17,8 @@
 \r
 #define EXTERN extern\r
 \r
-#include "yandytex.h"\r
 #include "dpx.h"\r
+#include "yandytex.h"\r
 \r
 /* sec 0581 */\r
 void char_warning_(internal_font_number f, eight_bits c)\r
@@ -2164,4 +2164,4 @@ found:
   shift_amount(b) = half(height(b) - depth(b)) - axis_height(s);\r
 \r
   return b;\r
-}
\ No newline at end of file
+}\r

diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c
index 33053d7..8864c97 100644 (file)
--- a/src/texsourc/tex9.c
+++ b/src/texsourc/tex9.c
@@ -17,8 +17,8 @@
 \r
 #define EXTERN extern\r
 \r
-#include "yandytex.h"\r
 #include "dpx.h"\r
+#include "yandytex.h"\r
 \r
 /* sec 1284 */\r
 void give_err_help (void)\r