Module on MD5 checksum.

diff --git a/src/texsourc/libmd5/md5.c b/src/texsourc/libmd5/md5.c
new file mode 100644 (file)
index 0000000..c35d96c
--- /dev/null
+++ b/src/texsourc/libmd5/md5.c
@@ -0,0 +1,381 @@
+/*
+  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+       http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+       either statically or dynamically; added missing #include <string.h>
+       in library.
+  2002-03-11 lpd Corrected argument list for main(), and added int return
+       type, in test program and T value program.
+  2002-02-21 lpd Added missing #include <stdio.h> in test program.
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+       unsigned in ANSI C, signed in traditional"; made test program
+       self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+#include <string.h>
+
+#undef BYTE_ORDER      /* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+    md5_word_t
+       a = pms->abcd[0], b = pms->abcd[1],
+       c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    const md5_word_t *X;
+#endif
+
+    {
+#if BYTE_ORDER == 0
+       /*
+        * Determine dynamically whether this is a big-endian or
+        * little-endian machine, since we can use a more efficient
+        * algorithm on the latter.
+        */
+       static const int w = 1;
+
+       if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0            /* little-endian */
+       {
+           /*
+            * On little-endian machines, we can process properly aligned
+            * data without copying it.
+            */
+           if (!((data - (const md5_byte_t *)0) & 3)) {
+               /* data are properly aligned */
+               X = (const md5_word_t *)data;
+           } else {
+               /* not aligned */
+               memcpy(xbuf, data, 64);
+               X = xbuf;
+           }
+       }
+#endif
+#if BYTE_ORDER == 0
+       else                    /* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0            /* big-endian */
+       {
+           /*
+            * On big-endian machines, we must arrange the bytes in the
+            * right order.
+            */
+           const md5_byte_t *xp = data;
+           int i;
+
+#  if BYTE_ORDER == 0
+           X = xbuf;           /* (dynamic only) */
+#  else
+#    define xbuf X             /* (static only) */
+#  endif
+           for (i = 0; i < 16; ++i, xp += 4)
+               xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+       }
+#endif
+    }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+    const md5_byte_t *p = data;
+    int left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+       return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+       pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+       int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+       memcpy(pms->buf + offset, p, copy);
+       if (offset + copy < 64)
+           return;
+       p += copy;
+       left -= copy;
+       md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+       md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+       memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+    static const md5_byte_t pad[64] = {
+       0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+       data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+       digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}

diff --git a/src/texsourc/libmd5/md5.h b/src/texsourc/libmd5/md5.h
new file mode 100644 (file)
index 0000000..698c995
--- /dev/null
+++ b/src/texsourc/libmd5/md5.h
@@ -0,0 +1,91 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+       http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+       references to Ghostscript; clarified derivation from RFC 1321;
+       now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+       added conditionalization for C++ compilation from Martin
+       Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+#  define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];       /* message length in bits, lsw first */
+    md5_word_t abcd[4];                /* digest buffer */
+    md5_byte_t buf[64];                /* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+}  /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */

diff --git a/src/texsourc/libmd5/md5main.c b/src/texsourc/libmd5/md5main.c
new file mode 100644 (file)
index 0000000..625a619
--- /dev/null
+++ b/src/texsourc/libmd5/md5main.c
@@ -0,0 +1,139 @@
+/*
+  Copyright (C) 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5main.c,v 1.1 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+       http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Splits off main program into a separate file, md5main.c.
+ */
+
+#include "md5.h"
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * This file builds an executable that performs various functions related
+ * to the MD5 library.  Typical compilation:
+ *     gcc -o md5main -lm md5main.c md5.c
+ */
+static const char *const usage = "\
+Usage:\n\
+    md5main --test             # run the self-test (A.5 of RFC 1321)\n\
+    md5main --t-values         # print the T values for the library\n\
+    md5main --version          # print the version of the package\n\
+";
+static const char *const version = "2002-04-13";
+
+/* Run the self-test. */
+static int
+do_test(void)
+{
+    static const char *const test[7*2] = {
+       "", "d41d8cd98f00b204e9800998ecf8427e",
+       "a", "0cc175b9c0f1b6a831c399e269772661",
+       "abc", "900150983cd24fb0d6963f7d28e17f72",
+       "message digest", "f96b697d7cb7938d525a2f31aaf161d0",
+       "abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b",
+       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+                               "d174ab98d277d9f5a5611c2c9f419d9f",
+       "12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"
+    };
+    int i;
+    int status = 0;
+
+    for (i = 0; i < 7*2; i += 2) {
+       md5_state_t state;
+       md5_byte_t digest[16];
+       char hex_output[16*2 + 1];
+       int di;
+
+       md5_init(&state);
+       md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
+       md5_finish(&state, digest);
+       for (di = 0; di < 16; ++di)
+           sprintf(hex_output + di * 2, "%02x", digest[di]);
+       if (strcmp(hex_output, test[i + 1])) {
+           printf("MD5 (\"%s\") = ", test[i]);
+           puts(hex_output);
+           printf("**** ERROR, should be: %s\n", test[i + 1]);
+           status = 1;
+       }
+    }
+    if (status == 0)
+       puts("md5 self-test completed successfully.");
+    return status;
+}
+
+/* Print the T values. */
+static int
+do_t_values(void)
+{
+    int i;
+    for (i = 1; i <= 64; ++i) {
+       unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
+
+       /*
+        * The following nonsense is only to avoid compiler warnings about
+        * "integer constant is unsigned in ANSI C, signed with -traditional".
+        */
+       if (v >> 31) {
+           printf("#define T%d /* 0x%08lx */ (T_MASK ^ 0x%08lx)\n", i,
+                  v, (unsigned long)(unsigned int)(~v));
+       } else {
+           printf("#define T%d    0x%08lx\n", i, v);
+       }
+    }
+    return 0;
+}
+
+/* Main program */
+int
+main(int argc, char *argv[])
+{
+    if (argc == 2) {
+       if (!strcmp(argv[1], "--test"))
+           return do_test();
+       if (!strcmp(argv[1], "--t-values"))
+           return do_t_values();
+       if (!strcmp(argv[1], "--version")) {
+           puts(version);
+           return 0;
+       }
+    }
+    puts(usage);
+    return 0;
+}

diff --git a/src/texsourc/makefile b/src/texsourc/makefile
index 656dd07..adc0d11 100644 (file)
--- a/src/texsourc/makefile
+++ b/src/texsourc/makefile
@@ -41,7 +41,8 @@ LFLAGS=/MAP /MACHINE:X86
 
 objs = texmf.obj itex.obj openinou.obj subroute.obj local.obj \
        tex0.obj tex1.obj tex2.obj tex3.obj tex4.obj \
-       tex5.obj tex6.obj tex7.obj tex8.obj tex9.obj yandy_pool.obj yandytex.res
+       tex5.obj tex6.obj tex7.obj tex8.obj tex9.obj \
+       yandy_pool.obj yandytex.res md5.obj md5file.obj
 
 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
 # # LIBHARU
@@ -49,11 +50,18 @@ objs = texmf.obj itex.obj openinou.obj subroute.obj local.obj \
 
 texmf.exe: $(objs) 
        $(LINK) $(LFLAGS) texmf itex openinou subroute local \
-       tex0 tex1 tex2 tex3 tex4 tex5 tex6 tex7 tex8 tex9 yandy_pool yandytex.res
+       tex0 tex1 tex2 tex3 tex4 tex5 tex6 tex7 tex8 tex9 \
+       yandy_pool yandytex.res md5 md5file
        copy texmf.exe yandytex.exe
        del ..\yandy\bin\texmf.exe
        copy texmf.exe ..\yandy\bin\texmf.exe
 # ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
+md5.obj: libmd5\md5.c
+       $(CC) -Ilibmd5 $(CFLAGS) libmd5\md5.c
+
+md5file.obj: md5file.c
+       $(CC) -Ilibmd5 $(CFLAGS) md5file.c
+
 yandytex.res: yandytex.rc
        rc yandytex.rc
 

diff --git a/src/texsourc/md5file.c b/src/texsourc/md5file.c
new file mode 100644 (file)
index 0000000..5afc449
--- /dev/null
+++ b/src/texsourc/md5file.c
@@ -0,0 +1,57 @@
+/* Copyright 2014 Clerk Ma
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
+
+#pragma warning(disable:4996)
+
+#include <stdio.h>
+#include "md5.h"
+
+char * md5_file(const char * file_name)
+{
+  md5_state_t md5_ship;
+  md5_byte_t  md5_data[1024];
+  md5_byte_t  md5_digest[16];
+  static char md5_hex[33];
+  int         md5_len;
+  FILE * ship_file;
+  int i;
+
+  ship_file = fopen(file_name, "rb");
+
+  md5_init(&md5_ship);
+
+  while ((md5_len = fread(md5_data, 1, 1024, ship_file)) != 0)
+    md5_append(&md5_ship, md5_data, md5_len);
+
+  md5_finish(&md5_ship, md5_digest);
+
+  fclose(ship_file);
+
+  for (i = 0; i < 16; ++i)
+    sprintf(md5_hex + i * 2, "%02x", md5_digest[i]);
+
+  return md5_hex;
+}
+
+#ifdef MD5TEST
+int main(void)
+{
+  printf("%s", md5_file("md5.c"));
+
+  return 0;
+}
+#endif

diff --git a/src/texsourc/tex3.c b/src/texsourc/tex3.c
index e9d6726..5370392 100644 (file)
--- a/src/texsourc/tex3.c
+++ b/src/texsourc/tex3.c
@@ -87,12 +87,13 @@ void scan_int (void)
   }
   else if ((cur_cmd >= min_internal) && (cur_cmd <= max_internal))
   {
-    scan_something_internal(0, false);
+    scan_something_internal(int_val, false);
   }
   else
   {
     radix = 10;
     m = 214748364L;   /* 7FFFFFFF hex */
+
     if (cur_tok == octal_token)
     {
       radix = 8;
@@ -105,29 +106,33 @@ void scan_int (void)
       m = 134217728L;   /* 2^27 8000000 hex */
       get_x_token();
     }
+
     vacuous = true;
     cur_val = 0;
 
-    while (true) {
-      if ((cur_tok < 3120 + radix) && (cur_tok >= 3120) && (cur_tok <= 3129))
-        d = cur_tok - 3120;
+    while (true)
+    {
+      if ((cur_tok < zero_token + radix) && (cur_tok >= zero_token) && (cur_tok <= zero_token + 9))
+        d = cur_tok - zero_token;
       else if (radix == 16)
-        if ((cur_tok <= 2886) && (cur_tok >= 2881))
-          d = cur_tok - 2871;
-        else if ((cur_tok <= 3142) && (cur_tok >= 3137))
-          d = cur_tok - 3127;
+        if ((cur_tok <= A_token + 5) && (cur_tok >= A_token))
+          d = cur_tok - A_token + 10;
+        else if ((cur_tok <= other_A_token + 5) && (cur_tok >= other_A_token))
+          d = cur_tok - other_A_token;
         else
           goto lab30;
       else
         goto lab30;
+
       vacuous = false;
+
       if ((cur_val >= m) && ((cur_val > m) || (d > 7) || (radix != 10)))
       {
         if (OKsofar)
         {
           print_err("Number too big");
           help2("I can only go up to 2147483647='17777777777=\"7FFFFFFF,",
-              "so I'm using that number instead of yours.");
+            "so I'm using that number instead of yours.");
           error();
           cur_val = 2147483647L;    /* 7FFFFFFF hex */
           OKsofar = false;
@@ -138,6 +143,7 @@ void scan_int (void)
       get_x_token();
     }
 lab30:;
+
     if (vacuous)
     {
       print_err("Missing number, treated as zero");
@@ -149,6 +155,7 @@ lab30:;
     else if (cur_cmd != spacer)
       back_input();
   }
+
   if (negative)
     cur_val = - (integer) cur_val;
 }
@@ -162,54 +169,64 @@ void scan_dimen_(bool mu, bool inf, bool shortcut)
   halfword p, q;
   scaled v;
   integer savecurval;
+
   f = 0;
   arith_error = false;
   cur_order = 0;
   negative = false;
+
   if (!shortcut)
   {
     negative = false;
     do {
-      do {
-        get_x_token();
-      } while (!(cur_cmd != spacer));
+      do
+        {
+          get_x_token();
+        }
+      while (!(cur_cmd != spacer));
 
-      if (cur_tok == 3117)
+      if (cur_tok == other_token + '-')
       {
         negative = ! negative;
-        cur_tok = 3115;
+        cur_tok = other_token + '+';
       }
-    } while (!(cur_tok != 3115));
+    } while (!(cur_tok != other_token + '+'));
 
     if ((cur_cmd >= min_internal) && (cur_cmd <= max_internal))
+    {
       if (mu)
       {
         scan_something_internal(mu_val, false);
+
         if (cur_val_level >= glue_val)
         {
           v = width(cur_val);
           delete_glue_ref(cur_val);
           cur_val = v;
         }
+
         if (cur_val_level == mu_val)
           goto lab89;
+
         if (cur_val_level != int_val)
-        {
           mu_error();
-        }
       }
       else
       {
         scan_something_internal(dimen_val, false);
+
         if (cur_val_level == dimen_val)
           goto lab89;
       }
+    }
     else
     {
       back_input();
-      if (cur_tok == 3116)
-        cur_tok = 3118;
-      if (cur_tok != 3118)
+
+      if (cur_tok == continental_point_token)
+        cur_tok = point_token;
+
+      if (cur_tok != point_token)
       {
         scan_int();
       }
@@ -218,22 +235,28 @@ void scan_dimen_(bool mu, bool inf, bool shortcut)
         radix = 10;
         cur_val = 0;
       }
-      if (cur_tok == 3116)
-        cur_tok = 3118;
-      if ((radix == 10) && (cur_tok == 3118))
+
+      if (cur_tok == continental_point_token)
+        cur_tok = point_token;
+
+      if ((radix == 10) && (cur_tok == point_token))
       {
         k = 0;
         p = 0;      /* p:=null l.8883 */
         get_token();
 
-        while (true) {
+        while (true)
+        {
           get_x_token();
-          if ((cur_tok > 3129) || (cur_tok < 3120))
+
+          if ((cur_tok > zero_token + 9) || (cur_tok < zero_token))
             goto lab31;
-          if (k < 17) {
+
+          if (k < 17)
+          {
             q = get_avail();
             link(q) = p;
-            info(q) = cur_tok - 3120;
+            info(q) = cur_tok - zero_token;
             p = q;
             incr(k);
           }
@@ -246,21 +269,29 @@ lab31:
           p = link(p);
           free_avail(q);
         }
+
         f = round_decimals(k);
+
         if (cur_cmd != spacer)
           back_input();
         }
       }
   }
+
   if (cur_val < 0)
   {
     negative = !negative;
     cur_val = - (integer) cur_val;
   }
+
   if (inf)
-    if (scan_keyword("fil")) {
+  {
+    if (scan_keyword("fil"))
+    {
       cur_order = fil;
-      while (scan_keyword("l")) {
+
+      while (scan_keyword("l"))
+      {
         if (cur_order == filll)
         {
           print_err("Illegal unit of measure(");
@@ -273,10 +304,15 @@ lab31:
       }
       goto lab88;
     }
+  }
+
   savecurval = cur_val;
-  do {
-    get_x_token();
-  } while (!(cur_cmd != spacer));
+
+  do
+    {
+      get_x_token();
+    }
+  while (!(cur_cmd != spacer));
 
   if ((cur_cmd < min_internal) || (cur_cmd > max_internal))
     back_input();
@@ -285,12 +321,14 @@ lab31:
     if (mu)
     {
       scan_something_internal(mu_val, false);
+
       if (cur_val_level >= glue_val)
       {
         v = width(cur_val);
         delete_glue_ref(cur_val);
         cur_val = v;
       }
+
       if (cur_val_level != mu_val)
       {
         mu_error();
@@ -303,14 +341,17 @@ lab31:
     v = cur_val;
     goto lab40;
   }
+
   if (mu)
     goto lab45;
+
   if (scan_keyword("em"))
     v = quad(cur_font);
   else if (scan_keyword("ex"))
     v = x_height(cur_font);
   else
     goto lab45;
+
   {
     get_x_token();
 
@@ -321,8 +362,8 @@ lab40:
   cur_val = mult_and_add(savecurval, v, xn_over_d(v, f, 65536L), 1073741823L);   /* 2^30 - 1 */
   goto lab89;
 lab45:
-  ;
   if (mu)
+  {
     if (scan_keyword("mu"))
       goto lab88;
     else
@@ -336,9 +377,12 @@ lab45:
       error();
       goto lab88;
     }
+  }
+
   if (scan_keyword("true"))
   {
     prepare_mag();
+
     if (mag != 1000)
     {
       cur_val = xn_over_d(cur_val, 1000, mag);
@@ -347,8 +391,10 @@ lab45:
       f = f % 65536L;
     }
   }
+
   if (scan_keyword("pt"))
     goto lab88;
+
   if (scan_keyword("in"))
   {
     num = 7227;
@@ -409,6 +455,7 @@ lab45:
     error();
     goto lab32;
   }
+
   cur_val = xn_over_d(cur_val, num, denom);
   f = (num * f + 65536L * tex_remainder) / denom;
   cur_val = cur_val +(f / 65536L);
@@ -422,11 +469,12 @@ lab88:
 lab30:;
   {
     get_x_token();
+
     if (cur_cmd != spacer)
       back_input();
   }
 lab89:
-  if (arith_error || (abs(cur_val)>= 1073741824L)) /* 2^30 */
+  if (arith_error || (abs(cur_val) >= 1073741824L)) /* 2^30 */
   {
     print_err("Dimension too large");
     help2("I can't work with sizes bigger than about 19 feet.",
@@ -435,6 +483,7 @@ lab89:
     cur_val = 1073741823L;  /* 2^30 - 1 */
     arith_error = false;
   }
+
   if (negative)
     cur_val = - (integer) cur_val;
 }
@@ -447,21 +496,26 @@ void scan_glue_(small_number level)
 
   mu = (level == mu_val);
   negative = false;
-  do {
-    do {
-      get_x_token();
-    } while (!(cur_cmd != spacer));
 
-    if (cur_tok == 3117)
+  do
     {
-      negative = !negative;
-      cur_tok = 3115;
+      do {
+          get_x_token();
+      }
+      while (!(cur_cmd != spacer));
+
+      if (cur_tok == other_token + '-')
+      {
+        negative = !negative;
+        cur_tok = other_token + '+';
+      }
     }
-  } while (!(cur_tok != 3115));
+  while (!(cur_tok != other_token + '+'));
 
   if ((cur_cmd >= min_internal) && (cur_cmd <= max_internal))
   {
     scan_something_internal(level, negative);
+
     if (cur_val_level >= glue_val)
     {
       if (cur_val_level != level)
@@ -470,6 +524,7 @@ void scan_glue_(small_number level)
       }
       return;
     }
+
     if (cur_val_level == int_val)
     {
       scan_dimen(mu, false, true);
@@ -483,29 +538,34 @@ void scan_glue_(small_number level)
   {
     back_input();
     scan_dimen(mu, false, false);
+
     if (negative)
       cur_val = - (integer) cur_val;
   }
-  q = new_spec(0);
+  q = new_spec(zero_glue);
   width(q) = cur_val;
+
   if (scan_keyword("plus"))
   {
     scan_dimen(mu, true, false);
     stretch(q) = cur_val;
     stretch_order(q) = cur_order;
   }
+
   if (scan_keyword("minus"))
   {
     scan_dimen(mu, true, false);
     shrink(q) = cur_val;
     shrink_order(q) = cur_order;
   }
+
   cur_val = q;
 }
 /* sec 0463 */
 halfword scan_rule_spec (void)
 {
   halfword q;
+
   q = new_rule();
   if (cur_cmd == vrule)
     width(q) = default_rule;
@@ -514,25 +574,30 @@ halfword scan_rule_spec (void)
     height(q) = default_rule;
     depth(q) = 0;
   }
+
 lab21:
+
   if (scan_keyword("width"))
   {
     scan_dimen(false, false, false);
     width(q) = cur_val;
     goto lab21;
   }
+
   if (scan_keyword("height"))
   {
     scan_dimen(false, false, false);
     height(q) = cur_val;
     goto lab21;
   }
+
   if (scan_keyword("depth"))
   {
     scan_dimen(false, false, false);
     depth(q) = cur_val;
     goto lab21;
   }
+
   return q;
 }
 /* sec 0464 */
@@ -548,12 +613,14 @@ halfword str_toks_(pool_pointer b)
   link(p) = 0;
   k = b;
 
-  while (k < pool_ptr) {
+  while (k < pool_ptr)
+  {
     t = str_pool[k];
+
     if (t == ' ')
-      t = 2592;
+      t = space_token;
     else
-      t = 3072 + t;
+      t = other_token + t;
     {
       {
         q = avail;
@@ -574,6 +641,7 @@ halfword str_toks_(pool_pointer b)
     incr(k);
   }
   pool_ptr = b;
+
   return p;
 }
 /* sec 0465 */
@@ -590,17 +658,19 @@ halfword the_toks (void)
   if (cur_val_level >= ident_val)
   {
     p = temp_head; 
-    link(p) = 0; 
+    link(p) = 0;
+
     if (cur_val_level == ident_val)
     {
       q = get_avail();
       mem[p].hh.v.RH = q;
-      mem[q].hh.v.LH = 4095 + cur_val;
+      mem[q].hh.v.LH = cs_token_flag + cur_val;
       p = q;
     }
     else if (cur_val != 0)
     {
       r = link(cur_val);
+
       while (r != 0) { /*   while r<>null do l.9178 */
         {
           {
@@ -630,6 +700,7 @@ halfword the_toks (void)
     old_setting = selector;
     selector = new_string;
     b = pool_ptr;
+
     switch (cur_val_level)
     {
       case int_val:
@@ -657,6 +728,7 @@ halfword the_toks (void)
     selector = old_setting;
     Result = str_toks(b);
   }
+
   return Result;
 }
 /* sec 0467 */
@@ -698,6 +770,7 @@ void conv_toks (void)
   old_setting = selector;
   selector = new_string;
   b = pool_ptr;
+
   switch (c)
   {
     case number_code:
@@ -717,6 +790,7 @@ void conv_toks (void)
       break;
     case font_name_code:
       print(font_name[cur_val]);
+
       if (font_size[cur_val] != font_dsize[cur_val])
       {
         print_string(" at ");
@@ -728,7 +802,7 @@ void conv_toks (void)
       print(job_name);
       break;
   }
-  selector = old_setting; 
+  selector = old_setting;
   link(garbage) = str_toks(b);
   begin_token_list(link(temp_head), 4);
 }
@@ -747,23 +821,28 @@ halfword scan_toks_(bool macrodef, bool xpand)
     scanner_status = defining;
   else
     scanner_status = absorbing;
+
   warning_index = cur_cs;
   def_ref = get_avail();
   token_ref_count(def_ref) = 0;
   p = def_ref;
   hashbrace = 0;
-  t = 3120;
+  t = zero_token;
 
   if (macrodef)
   {
-    while (true) {
+    while (true)
+    {
       get_token();
-      if (cur_tok < 768)
+
+      if (cur_tok < right_brace_limit)
         goto lab31;
+
       if (cur_cmd == mac_param)
       {
-        s = 3328 + cur_chr;
+        s = match_token + cur_chr;
         get_token();
+
         if (cur_cmd == left_brace)
         {
           hashbrace = cur_tok;
@@ -776,12 +855,13 @@ halfword scan_toks_(bool macrodef, bool xpand)
           {
             q = get_avail();
             mem[p].hh.v.RH = q;
-            mem[q].hh.v.LH = 3584;
+            mem[q].hh.v.LH = end_match_token;
             p = q;
           }
           goto lab30;
         }
-        if (t == 3129)
+
+        if (t == zero_token + 9)
         {
           print_err("You already have nine parameters");
           help1("I'm going to ignore the # sign you just used.");
@@ -790,6 +870,7 @@ halfword scan_toks_(bool macrodef, bool xpand)
         else
         {
           incr(t);
+
           if (cur_tok != t)
           {
             print_err("Parameters must be numbered consecutively");
@@ -830,14 +911,20 @@ lab30:;
   {
     scan_left_brace();
   }
+
   unbalance = 1;
-  while (true) {
+
+  while (true)
+  {
     if (xpand)
     {
-      while (true) {
+      while (true)
+      {
         get_next();
+
         if (cur_cmd <= max_command)
           goto lab32;
+
         if (cur_cmd != the)
         {
           expand();
@@ -845,6 +932,7 @@ lab30:;
         else
         {
           q = the_toks();
+
           if (link(temp_head) != 0)
           {
             link(p) = link(temp_head);
@@ -858,12 +946,13 @@ lab32:
     else
       get_token();
 
-    if (cur_tok < 768)
+    if (cur_tok < right_brace_limit)
       if (cur_cmd < right_brace)
         incr(unbalance);
       else
       {
         decr(unbalance);
+
         if (unbalance == 0)
           goto lab40;
       }
@@ -871,12 +960,14 @@ lab32:
       if (macrodef)
       {
         s = cur_tok;
+
         if (xpand)
           get_x_token();
         else
           get_token();
+
         if (cur_cmd != mac_param)
-          if ((cur_tok <= 3120) || (cur_tok > t))
+          if ((cur_tok <= zero_token) || (cur_tok > t))
           {
             print_err("Illegal parameter number in definition of");
             sprint_cs(warning_index);
@@ -887,7 +978,7 @@ lab32:
             cur_tok = s;
           }
           else
-            cur_tok = 1232 + cur_chr;
+            cur_tok = out_param_token - '0' + cur_chr;
       }
     {
       q = get_avail();
@@ -897,7 +988,8 @@ lab32:
     }
   }
 lab40:
-  scanner_status = 0; 
+  scanner_status = 0;
+
   if (hashbrace != 0)
   {
     q = get_avail();
@@ -916,7 +1008,7 @@ void read_toks_(integer n, halfword r)
   halfword q;
   integer s;
 /*  small_number m;  */
-  int m;            /* 95/Jan/7 */
+  int m; /* 95/Jan/7 */
 
   scanner_status = defining;
   warning_index = r;

diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c
index 3fd2226..8fbb9cd 100644 (file)
--- a/src/texsourc/tex9.c
+++ b/src/texsourc/tex9.c
@@ -401,6 +401,13 @@ void close_files_and_terminate (void)
     print_int(dvi_offset + dvi_ptr);
     print_string(" bytes).");
     b_close(dvi_file);
+    /* BEGIN-MD5 */
+    print_nl("The MD5 checksum on ");
+    print_char_string((unsigned char *) dvi_file_name);
+    print_string(": ");
+    print_char_string((unsigned char *) md5_file(dvi_file_name));
+    print_string(".");
+    /* END  -MD5 */
   }
 
   if (log_opened)

diff --git a/src/texsourc/texd.h b/src/texsourc/texd.h
index 876f2bd..12eb9bd 100644 (file)
--- a/src/texsourc/texd.h
+++ b/src/texsourc/texd.h
@@ -1983,15 +1983,18 @@ EXTERN int tfm_temp;        /* only used in tex3.c 95/Jan/7 */
 #define ident_val 4
 #define tok_val   5
 /* sec 0416 */
-#define input_line_no_code glue_val + 1
-#define badness_code       glue_val + 2
+#define input_line_no_code (glue_val + 1)
+#define badness_code       (glue_val + 2)
 /* sec 0438 */
-#define octal_token             other_token + '\'' // 3111
-#define hex_token               other_token + '"'  // 3106
-#define alpha_token             other_token + '`'  // 3168
-#define point_token             other_token + '.'  // 3118
-#define continental_point_token other_token + ','  // 3116
+#define octal_token             (other_token + '\'') // 3111
+#define hex_token               (other_token + '"' ) // 3106
+#define alpha_token             (other_token + '`' ) // 3168
+#define point_token             (other_token + '.' ) // 3118
+#define continental_point_token (other_token + ',' ) // 3116
 /* sec 0445 */
+#define zero_token    (other_token + '0')  // 3120
+#define A_token       (letter_token + 'A') // 2881
+#define other_A_token (other_token + 'A')  // 3137
 /* sec 0468 */
 #define number_code        0
 #define roman_numeral_code 1
@@ -2102,14 +2105,14 @@ EXTERN int tfm_temp;        /* only used in tex3.c 95/Jan/7 */
 #define sub_mlist      3
 #define math_text_char 4
 /* sec 0682 */
-#define ord_noad   unset_node + 3 // 16
-#define op_noad    ord_noad + 1   // 17
-#define bin_noad   ord_noad + 2   // 18
-#define rel_noad   ord_noad + 3   // 19
-#define open_noad  ord_noad + 4   // 20
-#define close_noad ord_noad + 5   // 21
-#define punct_noad ord_noad + 6   // 22
-#define inner_noad ord_noad + 7   // 23
+#define ord_noad   (unset_node + 3) // 16
+#define op_noad    (ord_noad + 1  ) // 17
+#define bin_noad   (ord_noad + 2  ) // 18
+#define rel_noad   (ord_noad + 3  ) // 19
+#define open_noad  (ord_noad + 4  ) // 20
+#define close_noad (ord_noad + 5  ) // 21
+#define punct_noad (ord_noad + 6  ) // 22
+#define inner_noad (ord_noad + 7  ) // 23
 #define limits    1
 #define no_limits 2
 /* sec 0683 */
@@ -2322,6 +2325,7 @@ EXTERN int tfm_temp;        /* only used in tex3.c 95/Jan/7 */
 #define set_language_code 5
 /* sec 79 */
 
+extern char * md5_file(const char * file_name);
 extern INLINE void str_room_ (int val);
 #define str_room(a) str_room_((int) a)
 extern INLINE void tail_append_ (pointer val);

diff --git a/src/texsourc/texmf.c b/src/texsourc/texmf.c
index 13a925c..69cf581 100644 (file)
--- a/src/texsourc/texmf.c
+++ b/src/texsourc/texmf.c
@@ -288,7 +288,7 @@ void t_open_in (void)
 static RETSIGTYPE
 /* catch_interrupt () */
 catch_interrupt (int err)
-{     /* NOTE: err is unreferenced - bkph */
+{
   (void) signal (SIGINT, SIG_IGN);  /* turn off interrupts for now */
 /*  interrupt = 1; */       /* make sure interrupt declared volatile */
 //  if (interrupt++ >= 3) uexit(1); /* emergency exit -- bkph */

diff --git a/src/texsourc/yandytex.rc b/src/texsourc/yandytex.rc
index ab75a4f..602e829 100644 (file)
--- a/src/texsourc/yandytex.rc
+++ b/src/texsourc/yandytex.rc
@@ -30,7 +30,7 @@ VS_VERSION_INFO VERSIONINFO
       VALUE "CompanyName",        "Project Fandol.\0"
       VALUE "FileDescription",    "Y&Y TeX 2.2.3 (WIN32)\0"
       VALUE "FileVersion",        "0.3.0.0\0"
-      VALUE "LegalCopyright",     "(C) 2014 Clerk Ma & Jie Su.\0"
+      VALUE "LegalCopyright",     "(C) 2014 Clerk Ma.\0"
       VALUE "OriginalFilename",   "yandytex.exe\0"
       VALUE "ProductName",        "Y&Y TeX\0"
       VALUE "ProductVersion",     "2.2.3.0\0"