diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-17 07:43:40 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-17 07:43:40 +0000 |
commit | f45847453d43449bfd1a646be4d88066f92a25a4 (patch) | |
tree | 3c14fbebdaeb891f36ef1292f66994f51f1977ab /Build/source/texk/dvipdfm-x | |
parent | 67c10b5134717c5242a9e51b853c8b8c37c6219a (diff) |
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
Diffstat (limited to 'Build/source/texk/dvipdfm-x')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.in | 9 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/dvipdfm-bkm.test | 25 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/bookm.dvi | bin | 0 -> 1508 bytes | |||
-rw-r--r-- | Build/source/texk/dvipdfm-x/tests/bookm.tex | 60 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfm-x/xdvipdfm-bkm.test | 25 |
7 files changed, 125 insertions, 8 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 Binary files differnew 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 + |