dvisvgm, lcdf-typetools: Simplify changes for Visual Studio 2010 (from Akira)

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

16 files changed, 138 insertions, 69 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 0c8d6512719..96df73f722b 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* (x)dvipdfm-bkm.test: Additional tests with bookmarks.
+	* tests/bookm.{dvi,tex}: Additional test input files.
+	* Makefile.am: Adapted.
+
 2013-09-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* spc_util.c: This file is identical for dvipdfmx and xdvipdfmx,
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index c0499ff366e..7bd1ce8f42c 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -268,11 +268,11 @@ DISTCLEANFILES = config.force
 ## Tests
 ##
 TESTS =
-dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test dvipdfm-psz.test
+dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test dvipdfm-bkm.test dvipdfm-psz.test
 if DVIPDFMX
 TESTS += $(dvipdfmx_tests)
 endif DVIPDFMX
-xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-psz.test
+xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test
 if XDVIPDFMX
 TESTS += $(xdvipdfmx_tests)
 endif XDVIPDFMX
@@ -284,6 +284,6 @@ EXTRA_DIST += tests/image.pdf tests/imgpdf.bb tests/imgpdf.xbb tests/picpdf.bb t
 EXTRA_DIST += tests/image.png tests/imgpng.bb tests/imgpng.xbb tests/picpng.bb tests/picpng.xbb
 EXTRA_DIST += tests/image.dvi tests/image.tex
 EXTRA_DIST += tests/cmr10.pfb tests/cmr10.tfm tests/annot.dvi tests/annot.tex
-EXTRA_DIST += tests/paper.dvi tests/paper.tex
-DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf paper*.pdf
+EXTRA_DIST += tests/bookm.dvi tests/bookm.tex tests/paper.dvi tests/paper.tex
+DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf
 
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index bbaa4d997dc..d932c3d116c 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -817,10 +817,10 @@ dist_mapdata_DATA = data/cid-x.map
 cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx
 dist_cmapdata_DATA = data/EUC-UCS2
 DISTCLEANFILES = config.force img*.* pic*.* image*.pdf annot*.pdf \
-	paper*.pdf
+	bookm*.pdf paper*.pdf
 TESTS = $(am__append_5) $(am__append_6)
-dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test dvipdfm-psz.test
-xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-psz.test
+dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test dvipdfm-bkm.test dvipdfm-psz.test
+xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test
 EXTRA_DIST = $(dvipdfmx_tests) $(xdvipdfmx_tests) tests/dvipdfmx.cfg \
 	tests/psfonts.map tests/image.jpeg tests/imgjpeg.bb \
 	tests/imgjpeg.xbb tests/picjpeg.bb tests/picjpeg.xbb \
@@ -829,7 +829,8 @@ EXTRA_DIST = $(dvipdfmx_tests) $(xdvipdfmx_tests) tests/dvipdfmx.cfg \
 	tests/imgpng.bb tests/imgpng.xbb tests/picpng.bb \
 	tests/picpng.xbb tests/image.dvi tests/image.tex \
 	tests/cmr10.pfb tests/cmr10.tfm tests/annot.dvi \
-	tests/annot.tex tests/paper.dvi tests/paper.tex
+	tests/annot.tex tests/bookm.dvi tests/bookm.tex \
+	tests/paper.dvi tests/paper.tex
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/dvipdfm-x/dvipdfm-bkm.test b/Build/source/texk/dvipdfm-x/dvipdfm-bkm.test
new file mode 100755
index 00000000000..3ccdaba7fd2
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/dvipdfm-bkm.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+TEXMFCNF=$srcdir/../kpathsea
+TFMFONTS="$srcdir/tests;$srcdir/data"
+T1FONTS="$srcdir/tests;$srcdir/data"
+TEXFONTMAPS="$srcdir/tests;$srcdir/data"
+DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
+TEXPICTS=$srcdir/tests
+export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS
+
+failed=
+
+echo "*** dvipdfmx -v -o bookm1.pdf bookm" && echo \
+	&& ./dvipdfmx -v -o bookm1.pdf $srcdir/tests/bookm \
+	&& echo && echo "dvipdfmx-bkm tests OK" && echo \
+	|| failed="$failed dvipdfmx-bkm"	
+
+test -z "$failed" && exit 0
+echo
+echo "failed tests:$failed"
+exit 1
+
diff --git a/Build/source/texk/dvipdfm-x/tests/bookm.dvi b/Build/source/texk/dvipdfm-x/tests/bookm.dvi
new file mode 100644
index 00000000000..7952eaa19fd
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/bookm.dvi
diff --git a/Build/source/texk/dvipdfm-x/tests/bookm.tex b/Build/source/texk/dvipdfm-x/tests/bookm.tex
new file mode 100644
index 00000000000..72745154473
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/bookm.tex
@@ -0,0 +1,60 @@
+%
+\special{papersize=10cm,10cm}
+
+\special{pdf:out 1
+  <</Title(Contents)/A<</S/GoTo/D(contents)>>>>}
+\special{pdf:out 1
+  <</Title(1 First section)/A<</S/GoTo/D(section.1)>>>>}
+\special{pdf:out 2
+  <</Title(1.1 First subsection)/A<</S/GoTo/D(subsection.1.1)>>>>}
+\special{pdf:out 1
+  <</Title(2 Second section)/A<</S/GoTo/D(section.2)>>>>}
+
+\noindent Contents
+\special{pdf:dest (contents) [@thispage /XYZ @xpos @ypos null]}
+
+\vskip 5mm
+
+\hbox to 60mm{%
+\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/C[1 0 0]
+  /A<</S/GoTo/D(section.1)>>>>}1 First section\special{pdf:eann}
+\hfill 2}
+
+\hbox to 60mm{\hskip 5mm%
+\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/C[1 0 0]
+  /A<</S/GoTo/D(subsection.1.1)>>>>}1.1 First subsection\special{pdf:eann}
+\hfill 3}
+
+\hbox to 60mm{%
+\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/C[1 0 0]
+  /A<</S/GoTo/D(section.2)>>>>}2 Second section\special{pdf:eann}
+\hfill 4}
+
+\vfill\break
+
+\noindent 1 First section
+\special{pdf:dest (section.1) [@thispage /XYZ @xpos @ypos null]}
+
+\vskip 5mm
+
+\noindent The first section
+
+\vfill\break
+
+\noindent 1.1 First subsection
+\special{pdf:dest (subsection.1.1) [@thispage /XYZ @xpos @ypos null]}
+
+\vskip 5mm
+
+\noindent The first subsection
+
+\vfill\break
+
+\noindent 2 Second section
+\special{pdf:dest (section.2) [@thispage /XYZ @xpos @ypos null]}
+
+\vskip 5mm
+
+\noindent The second section
+
+\bye
\ No newline at end of file
diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test
new file mode 100755
index 00000000000..92e4460b2c1
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+TEXMFCNF=$srcdir/../kpathsea
+TFMFONTS="$srcdir/tests;$srcdir/data"
+T1FONTS="$srcdir/tests;$srcdir/data"
+TEXFONTMAPS="$srcdir/tests;$srcdir/data"
+DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
+TEXPICTS=$srcdir/tests
+export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS
+
+failed=
+
+echo "*** xdvipdfmx -v -o bookm2.pdf bookm" && echo \
+	&& ./xdvipdfmx -v -o bookm2.pdf $srcdir/tests/bookm \
+	&& echo && echo "xdvipdfmx-bkm tests OK" && echo \
+	|| failed="$failed xdvipdfmx-bkm"	
+
+test -z "$failed" && exit 0
+echo
+echo "failed tests:$failed"
+exit 1
+
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
index 6a6cc1bbf14..1c991bdde84 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-17  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-01-MSVC (removed): Instead compile with -DNOMINMAX.
+
 2013-09-16  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* patch-01-MSVC (new): Build fix for Visual Studio 2010.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC b/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC
deleted file mode 100644
index 966e17022af..00000000000
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5-PATCHES/patch-01-MSVC
+++ /dev/null
@@ -1,31 +0,0 @@
-	Visual Studio 2010 defines min and max somewhere and it fails
-	to compile numeric_limits<int>::max() etc. (from Akira).
-
-diff -ur dvisvgm-1.5.orig/src/FontMap.cpp dvisvgm-1.5/src/FontMap.cpp
---- dvisvgm-1.5.orig/src/FontMap.cpp	2013-09-01 15:08:01.000000000 +0200
-+++ dvisvgm-1.5/src/FontMap.cpp	2013-09-16 09:42:49.000000000 +0200
-@@ -33,6 +33,10 @@
- #include "Message.h"
- #include "Subfont.h"
- 
-+#ifdef _MSC_VER
-+#undef max
-+#endif
-+
- using namespace std;
- 
- 
-diff -ur dvisvgm-1.5.orig/src/Message.h dvisvgm-1.5/src/Message.h
---- dvisvgm-1.5.orig/src/Message.h	2013-08-25 20:25:32.000000000 +0200
-+++ dvisvgm-1.5/src/Message.h	2013-09-16 09:42:49.000000000 +0200
-@@ -29,6 +29,10 @@
- #include "types.h"
- 
- 
-+#ifdef _MSC_VER
-+#undef max
-+#endif
-+
- class Message;
- 
- class MessageStream
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
index 85ce89f3325..d7f32808e26 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/FontMap.cpp
@@ -33,10 +33,6 @@
 #include "Message.h"
 #include "Subfont.h"
 
-#ifdef _MSC_VER
-#undef max
-#endif
-
 using namespace std;
 
 
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
index 50e5232eefa..bc4a9ed016c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.5/src/Message.h
@@ -29,10 +29,6 @@
 #include "types.h"
 
 
-#ifdef _MSC_VER
-#undef max
-#endif
-
 class Message;
 
 class MessageStream
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
index cc6289f933c..9b7df496aee 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-17  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-30-W32TeX: No need to #undefine max/min, instead
+	compile with -DNOMINMAX.
+
 2013-09-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-10-SELFAUTO (new): Prepare for SELFAUTOGRANDPARENT.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX
index 26c6df2aca7..7ff58fa02db 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99-PATCHES/patch-30-W32TeX
@@ -87,29 +87,14 @@ diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetoo
  #endif
 diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc lcdf-typetools-2.99/otftotfm/otftotfm.cc
 --- lcdf-typetools-2.99.orig/otftotfm/otftotfm.cc	2013-09-10 11:00:57.000000000 +0200
-+++ lcdf-typetools-2.99/otftotfm/otftotfm.cc	2013-09-10 19:13:50.000000000 +0200
-@@ -63,6 +63,10 @@
++++ lcdf-typetools-2.99/otftotfm/otftotfm.cc	2013-09-17 09:24:09.000000000 +0200
+@@ -63,6 +63,9 @@
  #ifdef HAVE_FCNTL_H
  # include <fcntl.h>
  #endif
 +#ifdef _MSC_VER
 +# include <io.h>
-+#undef max
 +#endif
  
  using namespace Efont;
  
-diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.99.orig/otftotfm/secondary.cc lcdf-typetools-2.99/otftotfm/secondary.cc
---- lcdf-typetools-2.99.orig/otftotfm/secondary.cc	2013-08-13 22:18:57.000000000 +0200
-+++ lcdf-typetools-2.99/otftotfm/secondary.cc	2013-09-10 19:13:50.000000000 +0200
-@@ -31,6 +31,10 @@
- #include <errno.h>
- #include <limits.h>
- #include <algorithm>
-+#ifdef _MSC_VER
-+#undef max
-+#undef min
-+#endif
- 
- enum {
-     U_EXCLAMDOWN = 0x00A1,	// U+00A1 INVERTED EXCLAMATION MARK
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
index ce3290dd3d8..b1d7132e935 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/otftotfm.cc
@@ -65,7 +65,6 @@
 #endif
 #ifdef _MSC_VER
 # include <io.h>
-#undef max
 #endif
 
 using namespace Efont;
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
index 3483f6704f8..a951bc7d304 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.99/otftotfm/secondary.cc
@@ -31,10 +31,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <algorithm>
-#ifdef _MSC_VER
-#undef max
-#undef min
-#endif
 
 enum {
     U_EXCLAMDOWN = 0x00A1,	// U+00A1 INVERTED EXCLAMATION MARK
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index ce111b549d0..92a4c5d6e36 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -85,6 +85,8 @@ pmx/pmx2pdf.lua
 pst2pdf/pst2pdf.pl
 ptex2pdf/ptex2pdf.lua
 purifyeps/purifyeps
+pythontex/pythontex.py
+pythontex/depythontex.py
 splitindex/splitindex.pl
 sty2dtx/sty2dtx.pl
 svn-multi/svn-multi.pl