Import pdftex 1.40.5

git-svn-id: svn://tug.org/texlive/trunk@4685 c570f23f-e606-0410-a88d-b1316a301751

43 files changed, 58 insertions, 122 deletions

diff --git a/Build/source/libs/xpdf/xpdf/Stream.cc b/Build/source/libs/xpdf/xpdf/Stream.cc
index 68abafa7b8d..f96b52488c0 100644
--- a/Build/source/libs/xpdf/xpdf/Stream.cc
+++ b/Build/source/libs/xpdf/xpdf/Stream.cc
@@ -410,15 +410,13 @@ StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
   ok = gFalse;
 
   nVals = width * nComps;
-  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-      nComps >= INT_MAX / nBits ||
-      width >= INT_MAX / nComps / nBits ||
-      nVals * nBits + 7 < 0) {
-    return;
-  }
   pixBytes = (nComps * nBits + 7) >> 3;
   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-  if (rowBytes <= 0) {
+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+      nComps > gfxColorMaxComps ||
+      nBits > 16 ||
+      width >= INT_MAX / nComps ||      // check for overflow in nVals 
+      nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
     return;
   }
   predLine = (Guchar *)gmalloc(rowBytes);
diff --git a/Build/source/libs/xpdf/xpdf/config.h b/Build/source/libs/xpdf/xpdf/config.h
index 81d4dd071b5..2ebb01da228 100644
--- a/Build/source/libs/xpdf/xpdf/config.h
+++ b/Build/source/libs/xpdf/xpdf/config.h
@@ -14,7 +14,7 @@
 //------------------------------------------------------------------------
 
 // xpdf version
-#define xpdfVersion          "3.02"
+#define xpdfVersion          "3.02pl1"
 #define xpdfVersionNum       3.02
 #define xpdfMajorVersion     3
 #define xpdfMinorVersion     2
diff --git a/Build/source/texk/web2c/pdftexdir/Makefile.in b/Build/source/texk/web2c/pdftexdir/Makefile.in
index 7f4aa216d76..9d456e6ad51 100644
--- a/Build/source/texk/web2c/pdftexdir/Makefile.in
+++ b/Build/source/texk/web2c/pdftexdir/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for libpdf - te@dbs.uni-hannover.de
-# $Id: Makefile.in 200 2007-07-11 13:11:12Z oneiros $
+# $Id: Makefile.in 152 2007-06-25 22:19:35Z ms $
 
 kpse_include ../make/common.mk
 kpse_include ../make/programs.mk
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 8cac60b4713..bb960e200df 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,4 +1,12 @@
 -------------------------------------------------
+pdfTeX 3.141592-1.40.5 was released on 2007-07-31
+-------------------------------------------------
+- Bugfixes: 
+  - calling 'pdftex %' would crash (830)
+  - fflush the recorder file
+- pdfTeX uses xpdf 3.02pl1
+
+-------------------------------------------------
 pdfTeX 3.141592-1.40.4 was released on 2007-07-11
 -------------------------------------------------
 - Bugfixes: 
@@ -563,5 +571,5 @@ pdfTeX 3.14159-1.00a-pretest-20010806 was released on 2001-08-06
 pdfTeX 3.14159-1.00a-pretest-20010804 was released on 2001-08-04
 ----------------------------------------------------------------
 
-$Id: NEWS 200 2007-07-11 13:11:12Z oneiros $
+$Id: NEWS 216 2007-07-31 16:49:57Z oneiros $
 // vim: tw=79:ts=2:expandtab:autoindent
diff --git a/Build/source/texk/web2c/pdftexdir/README b/Build/source/texk/web2c/pdftexdir/README
index 2c9cd21eb67..6413755f033 100644
--- a/Build/source/texk/web2c/pdftexdir/README
+++ b/Build/source/texk/web2c/pdftexdir/README
@@ -1,10 +1,10 @@
 pdfTeX
 ======
 
-README for version 3.14159-1.40.4
+README for version 3.14159-1.40.5
 =================================
 
-This directory contains the version 1.40.4 of pdfTeX, an extended version
+This directory contains the version 1.40.5 of pdfTeX, an extended version
 of eTeX that can create PDF directly from TeX source files and enhance the
 result of TeX typesetting with the help of PDF. When PDF output is not
 selected, pdfTeX produces normal DVI output, otherwise it produces PDF
@@ -37,8 +37,8 @@ pdfTeX is copyright (c) 1996-2007 Han The Thanh, <thanh@pdftex.org>
 
 pdfTeX 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.1 of the License, or (at your option) any
-later version.
+Foundation; either version 2 of the License, or (at your option) any later
+version.
 
 pdfTeX is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -84,5 +84,5 @@ paragraph optimization is inspired by the work of Hermann Zapf.
 
 Please send bug reports, offers of help, etc. to martin@pdftex.org
 
-$Id: README 200 2007-07-11 13:11:12Z oneiros $
+$Id: README 216 2007-07-31 16:49:57Z oneiros $
 // vim: tw=75
diff --git a/Build/source/texk/web2c/pdftexdir/avlstuff.c b/Build/source/texk/web2c/pdftexdir/avlstuff.c
index 8b0ae737477..059ed047235 100644
--- a/Build/source/texk/web2c/pdftexdir/avlstuff.c
+++ b/Build/source/texk/web2c/pdftexdir/avlstuff.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: avlstuff.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: avlstuff.c 114 2007-05-23 18:23:49Z ms $
 
 */
 
diff --git a/Build/source/texk/web2c/pdftexdir/avlstuff.h b/Build/source/texk/web2c/pdftexdir/avlstuff.h
index 2dc4d8c277b..9db70a13225 100644
--- a/Build/source/texk/web2c/pdftexdir/avlstuff.h
+++ b/Build/source/texk/web2c/pdftexdir/avlstuff.h
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: avlstuff.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: avlstuff.h 114 2007-05-23 18:23:49Z ms $
 */
 
 #include "avl.h"
diff --git a/Build/source/texk/web2c/pdftexdir/epdf.c b/Build/source/texk/web2c/pdftexdir/epdf.c
index 53164e66ae2..9f4387badc4 100644
--- a/Build/source/texk/web2c/pdftexdir/epdf.c
+++ b/Build/source/texk/web2c/pdftexdir/epdf.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: epdf.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: epdf.c 114 2007-05-23 18:23:49Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/epdf.h b/Build/source/texk/web2c/pdftexdir/epdf.h
index 3a6265cf679..4f4abab82f6 100644
--- a/Build/source/texk/web2c/pdftexdir/epdf.h
+++ b/Build/source/texk/web2c/pdftexdir/epdf.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: epdf.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: epdf.h 181 2007-07-09 10:10:07Z oneiros $
 */
 
 extern "C" {
diff --git a/Build/source/texk/web2c/pdftexdir/image.h b/Build/source/texk/web2c/pdftexdir/image.h
index b8468af5dd2..07361aa8a94 100644
--- a/Build/source/texk/web2c/pdftexdir/image.h
+++ b/Build/source/texk/web2c/pdftexdir/image.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: image.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: image.h 114 2007-05-23 18:23:49Z ms $
 */
 
 #include <png.h>
diff --git a/Build/source/texk/web2c/pdftexdir/macnames.c b/Build/source/texk/web2c/pdftexdir/macnames.c
index 20a4d2b5381..1561f728bfa 100644
--- a/Build/source/texk/web2c/pdftexdir/macnames.c
+++ b/Build/source/texk/web2c/pdftexdir/macnames.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: macnames.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: macnames.c 114 2007-05-23 18:23:49Z ms $
 */
 
 const char notdef[] = ".notdef";
diff --git a/Build/source/texk/web2c/pdftexdir/mapfile.c b/Build/source/texk/web2c/pdftexdir/mapfile.c
index 87d56f8ea7c..a51a77988a0 100644
--- a/Build/source/texk/web2c/pdftexdir/mapfile.c
+++ b/Build/source/texk/web2c/pdftexdir/mapfile.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: mapfile.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: mapfile.c 116 2007-05-25 18:11:08Z ms $
 */
 
 #include <math.h>
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.ch b/Build/source/texk/web2c/pdftexdir/pdftex.ch
index 975559f01b9..e17291480c1 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.ch
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.ch
@@ -17,7 +17,7 @@
 % pdfTeX; if not, write to the Free Software Foundation, Inc., 51 Franklin
 % Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %
-% $Id: pdftex.ch 200 2007-07-11 13:11:12Z oneiros $
+% $Id: pdftex.ch 114 2007-05-23 18:23:49Z ms $
 %
 @x [0.0] l.83 - WEAVE: we want the whole file
   \def\?##1]{\hbox{Changes to \hbox to 1em{\hfil##1}.\ }}
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.defines b/Build/source/texk/web2c/pdftexdir/pdftex.defines
index 7b5a52b4c69..19b9bc758de 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.defines
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.defines
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pdftex.defines 200 2007-07-11 13:11:12Z oneiros $
+$Id: pdftex.defines 170 2007-07-06 21:00:55Z oneiros $
 }
 
 { pdftex.defines: additions for pdfTeX }
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.h b/Build/source/texk/web2c/pdftexdir/pdftex.h
index f9c7c30e315..e34f6b979da 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pdftex.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: pdftex.h 114 2007-05-23 18:23:49Z ms $
 */
 
 /* Additions to texmfmp.h for pdfTeX */
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.mk b/Build/source/texk/web2c/pdftexdir/pdftex.mk
index 2c485ed6874..59f6a197bb2 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.mk
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.mk
@@ -1,6 +1,7 @@
 # Makefile fragment for pdfeTeX and web2c. --infovore@xs4all.nl. Public domain.
 # This fragment contains the parts of the makefile that are most likely to
 # differ between releases of pdfeTeX.
+# $Id: pdftex.mk 215 2007-07-31 16:32:04Z oneiros $
 
 # We build pdftex
 pdftex = @PETEX@ pdftex
@@ -12,8 +13,7 @@ XCPPFLAGS=-I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATFSRCDI
 
 Makefile: $(srcdir)/$(pdftexdir)/pdftex.mk
 
-# pdftex_bin = pdftex ttf2afm pdftosrc
-pdftex_bin = pdftex
+pdftex_bin = pdftex ttf2afm pdftosrc
 linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
 
 # Extract pdftex version
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index b005393e757..68122be619f 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -287,7 +287,7 @@ known as `\eTeX'.
 @#
 @d pdftex_version==140 { \.{\\pdftexversion} }
 @d pdftex_revision=="4" { \.{\\pdftexrevision} }
-@d pdftex_version_string=='-1.40.4' {current \pdfTeX\ version}
+@d pdftex_version_string=='-1.40.5' {current \pdfTeX\ version}
 @#
 @d pdfeTeX_banner=='This is pdfeTeX, Version 3.141592',pdftex_version_string,eTeX_version_string
    {printed when \pdfeTeX\ starts}
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.in b/Build/source/texk/web2c/pdftexdir/pdftexextra.in
index 1af7e0628da..6d7e9e67972 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftexextra.in
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.in
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pdftexextra.in 200 2007-07-11 13:11:12Z oneiros $
+$Id: pdftexextra.in 114 2007-05-23 18:23:49Z ms $
 */
 
 /* pdftexextra.in: banner etc. for pdfTeX.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index ae770e2e6bf..0addc85e425 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pdftoepdf.cc 200 2007-07-11 13:11:12Z oneiros $
+$Id: pdftoepdf.cc 181 2007-07-09 10:10:07Z oneiros $
 */
 
 #include <stdlib.h>
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
index 8b63daed92b..8e78fcf14cf 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pdftosrc.cc 200 2007-07-11 13:11:12Z oneiros $
+$Id: pdftosrc.cc 114 2007-05-23 18:23:49Z ms $
 */
 
 #include <stdlib.h>
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.rc b/Build/source/texk/web2c/pdftexdir/pdftosrc.rc
deleted file mode 100644
index 6929fbade24..00000000000
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* pdftosrc.rc: pdftosrc resources				-*- C++ -*-
-
-   Copyright (C) 1996-2003 Fabrice Popineau <fabrice.popineau@supelec.fr>
-
-   This file 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, or (at your
-   option) any later version.
-
-   This file 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 file; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA. */
-
-#include <texlive-version.h>
-
-#define VER_FILEVERSION TEXLIVE_MAJOR_VERSION,TEXLIVE_MINOR_VERSION,TEXLIVE_BETA_NUMBER,TEXLIVE_ALPHA_NUMBER
-#define VER_FILEVERSION_STR TEXLIVE_PRODUCTVERSION_STR " pdftosrc 2.01"
-
-#define VER_INTERNALNAME_STR "pdftosrc"
-#define VER_ORIGINALFILENAME_STR "pdftosrc.exe"
-
-#define VER_FILEDESCRIPTION_STR "PDF Source Extractor"
-
-#define VER_COMPANYNAME_STR ""
-#define VER_LEGALCOPYRIGHT_STR ""
-
-#include <texlive.version>
-
-/* pdftosrc.rc ends here */
diff --git a/Build/source/texk/web2c/pdftexdir/pkin.c b/Build/source/texk/web2c/pdftexdir/pkin.c
index a25b9bec7a7..2d387c9d78c 100644
--- a/Build/source/texk/web2c/pdftexdir/pkin.c
+++ b/Build/source/texk/web2c/pdftexdir/pkin.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: pkin.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: pkin.c 114 2007-05-23 18:23:49Z ms $
 */
 
 /*
diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h
index b3633cdb63e..47978a1003a 100644
--- a/Build/source/texk/web2c/pdftexdir/ptexlib.h
+++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: ptexlib.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: ptexlib.h 185 2007-07-09 10:43:44Z oneiros $
 */
 
 #ifndef PDFTEXLIB
diff --git a/Build/source/texk/web2c/pdftexdir/ptexmac.h b/Build/source/texk/web2c/pdftexdir/ptexmac.h
index 3a82fc99b35..ff34c0cff90 100644
--- a/Build/source/texk/web2c/pdftexdir/ptexmac.h
+++ b/Build/source/texk/web2c/pdftexdir/ptexmac.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: ptexmac.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: ptexmac.h 114 2007-05-23 18:23:49Z ms $
 */
 
 #ifndef PDFTEXMAC
diff --git a/Build/source/texk/web2c/pdftexdir/subfont.c b/Build/source/texk/web2c/pdftexdir/subfont.c
index 24c6aab87da..0aab3abd92f 100644
--- a/Build/source/texk/web2c/pdftexdir/subfont.c
+++ b/Build/source/texk/web2c/pdftexdir/subfont.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: subfont.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: subfont.c 114 2007-05-23 18:23:49Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/tex.ch0 b/Build/source/texk/web2c/pdftexdir/tex.ch0
index c63a9780604..696fe8ec21e 100644
--- a/Build/source/texk/web2c/pdftexdir/tex.ch0
+++ b/Build/source/texk/web2c/pdftexdir/tex.ch0
@@ -17,7 +17,7 @@
 % pdfTeX; if not, write to the Free Software Foundation, Inc., 51 Franklin
 % Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %
-% $Id: tex.ch0 200 2007-07-11 13:11:12Z oneiros $
+% $Id: tex.ch0 114 2007-05-23 18:23:49Z ms $
 %
 % Change file to assist in creating the web2c-specific change file.
 % This one comes first, resolves inconsistencies between the generated
diff --git a/Build/source/texk/web2c/pdftexdir/tounicode.c b/Build/source/texk/web2c/pdftexdir/tounicode.c
index b2126a7890a..52903f73cc9 100644
--- a/Build/source/texk/web2c/pdftexdir/tounicode.c
+++ b/Build/source/texk/web2c/pdftexdir/tounicode.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: tounicode.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: tounicode.c 114 2007-05-23 18:23:49Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index 4b8d2ddec80..8fce9368ca0 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: ttf2afm.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: ttf2afm.c 114 2007-05-23 18:23:49Z ms $
 */
 
 /*
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.rc b/Build/source/texk/web2c/pdftexdir/ttf2afm.rc
deleted file mode 100644
index a63881df7d1..00000000000
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ttf2afm.rc: ttf2afm				-*- C++ -*-
-
-   Copyright (C) 1996-2003 Fabrice Popineau <fabrice.popineau@supelec.fr>
-
-   This file 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, or (at your
-   option) any later version.
-
-   This file 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 file; if not, write to the Free Software
-   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA. */
-
-#include <texlive-version.h>
-
-#define VER_FILEVERSION TEXLIVE_MAJOR_VERSION,TEXLIVE_MINOR_VERSION,TEXLIVE_BETA_NUMBER,TEXLIVE_ALPHA_NUMBER
-#define VER_FILEVERSION_STR TEXLIVE_PRODUCTVERSION_STR " ttf2afm 1.10a"
-
-#define VER_INTERNALNAME_STR "ttf2afm"
-#define VER_ORIGINALFILENAME_STR "ttf2afm.exe"
-
-#define VER_FILEDESCRIPTION_STR "TTF-to-AFM Converter"
-
-#define VER_COMPANYNAME_STR         ""
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) 1996-2002 Han The Thanh, <thanh@pdftex.org>"
-
-#include "texlive.version"
-
-/* ttf2afm.rc ends here */
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index b8f63d52201..636e4fe74d4 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: utils.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: utils.c 168 2007-07-06 20:38:42Z oneiros $
 */
 
 #include "openbsd-compat.h"
diff --git a/Build/source/texk/web2c/pdftexdir/vfpacket.c b/Build/source/texk/web2c/pdftexdir/vfpacket.c
index 70accdcf13a..7b2e630d7b4 100644
--- a/Build/source/texk/web2c/pdftexdir/vfpacket.c
+++ b/Build/source/texk/web2c/pdftexdir/vfpacket.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: vfpacket.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: vfpacket.c 136 2007-06-24 21:30:09Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writeenc.c b/Build/source/texk/web2c/pdftexdir/writeenc.c
index e420cf70d29..e38cd8ef9de 100644
--- a/Build/source/texk/web2c/pdftexdir/writeenc.c
+++ b/Build/source/texk/web2c/pdftexdir/writeenc.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writeenc.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writeenc.c 152 2007-06-25 22:19:35Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writefont.c b/Build/source/texk/web2c/pdftexdir/writefont.c
index 76e2a3a43ef..d03ece7c1a7 100644
--- a/Build/source/texk/web2c/pdftexdir/writefont.c
+++ b/Build/source/texk/web2c/pdftexdir/writefont.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writefont.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writefont.c 165 2007-07-06 18:54:49Z oneiros $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writeimg.c b/Build/source/texk/web2c/pdftexdir/writeimg.c
index 8bd1227c6df..982eca48a40 100644
--- a/Build/source/texk/web2c/pdftexdir/writeimg.c
+++ b/Build/source/texk/web2c/pdftexdir/writeimg.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writeimg.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writeimg.c 170 2007-07-06 21:00:55Z oneiros $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writejbig2.c b/Build/source/texk/web2c/pdftexdir/writejbig2.c
index 2f21e320771..1103f8280e2 100644
--- a/Build/source/texk/web2c/pdftexdir/writejbig2.c
+++ b/Build/source/texk/web2c/pdftexdir/writejbig2.c
@@ -75,7 +75,7 @@ object exists, reference it. Else create fresh one.
 
 09 Dec. 2002: JBIG2 seg. page numbers > 0 are now set to 1, see PDF Ref.
 
-$Id: writejbig2.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writejbig2.c 114 2007-05-23 18:23:49Z ms $
 ***********************************************************************/
 
 #include "writejbig2.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writejbig2.h b/Build/source/texk/web2c/pdftexdir/writejbig2.h
index 91ebe759d3e..9b9ab78e373 100644
--- a/Build/source/texk/web2c/pdftexdir/writejbig2.h
+++ b/Build/source/texk/web2c/pdftexdir/writejbig2.h
@@ -20,7 +20,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 This is experimental JBIG2 image support to pdfTeX. JBIG2 image decoding
 is part of Adobe PDF-1.4, and requires Acroread 5.0 or later.
 
-$Id: writejbig2.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: writejbig2.h 114 2007-05-23 18:23:49Z ms $
 ***********************************************************************/
 
 #include <stdlib.h>
diff --git a/Build/source/texk/web2c/pdftexdir/writejpg.c b/Build/source/texk/web2c/pdftexdir/writejpg.c
index e7d5a9ee0a3..7a2e5248723 100644
--- a/Build/source/texk/web2c/pdftexdir/writejpg.c
+++ b/Build/source/texk/web2c/pdftexdir/writejpg.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writejpg.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writejpg.c 114 2007-05-23 18:23:49Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writepng.c b/Build/source/texk/web2c/pdftexdir/writepng.c
index 85b93003271..c8f9eb6fb9e 100644
--- a/Build/source/texk/web2c/pdftexdir/writepng.c
+++ b/Build/source/texk/web2c/pdftexdir/writepng.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writepng.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writepng.c 152 2007-06-25 22:19:35Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c
index 923a0ca4ed2..879ba183d36 100644
--- a/Build/source/texk/web2c/pdftexdir/writet1.c
+++ b/Build/source/texk/web2c/pdftexdir/writet1.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writet1.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writet1.c 164 2007-07-06 18:31:11Z oneiros $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writet3.c b/Build/source/texk/web2c/pdftexdir/writet3.c
index b5ad919c709..13e2a380fda 100644
--- a/Build/source/texk/web2c/pdftexdir/writet3.c
+++ b/Build/source/texk/web2c/pdftexdir/writet3.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writet3.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writet3.c 164 2007-07-06 18:31:11Z oneiros $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c
index 971b0b1c7e7..824da2888af 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.c
+++ b/Build/source/texk/web2c/pdftexdir/writettf.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writettf.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writettf.c 134 2007-06-24 21:18:47Z ms $
 */
 
 #include "ptexlib.h"
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.h b/Build/source/texk/web2c/pdftexdir/writettf.h
index 33a0a215806..63358b09b23 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.h
+++ b/Build/source/texk/web2c/pdftexdir/writettf.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writettf.h 200 2007-07-11 13:11:12Z oneiros $
+$Id: writettf.h 114 2007-05-23 18:23:49Z ms $
 */
 
 typedef signed char TTF_CHAR;
diff --git a/Build/source/texk/web2c/pdftexdir/writezip.c b/Build/source/texk/web2c/pdftexdir/writezip.c
index 0ae328dd316..ec98bc03649 100644
--- a/Build/source/texk/web2c/pdftexdir/writezip.c
+++ b/Build/source/texk/web2c/pdftexdir/writezip.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along
 with pdfTeX; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Id: writezip.c 200 2007-07-11 13:11:12Z oneiros $
+$Id: writezip.c 168 2007-07-06 20:38:42Z oneiros $
 */
 
 #include "ptexlib.h"