Hello community,
here is the log from the commit of package texlive-specs-q for openSUSE:Factory checked in at 2016-07-26 12:57:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-q (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-q.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-q"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.changes 2016-04-22 16:20:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-q.new/texlive-specs-q.changes 2016-07-26 12:59:13.000000000 +0200
@@ -1,0 +2,38 @@
+Fri Jul 15 10:02:40 UTC 2016 - werner@suse.de
+
+- Avoid missing dependencies due upstream package splits
+
+-------------------------------------------------------------------
+Mon Jun 20 15:00:31 UTC 2016 - werner@suse.de
+
+- Avoid extend spec sciptlets for changing language hyphen file
+ but write out the pieces of the hyphen entries into seperate
+ files to be able to generate the final language hyphen files (boo#984878)
+
+-------------------------------------------------------------------
+Mon Jun 20 07:47:44 UTC 2016 - werner@suse.de
+
+- Move spectra.data.tex from doc to main package of pgf-spectra (boo#985578)
+
+-------------------------------------------------------------------
+Wed Jun 8 07:08:27 UTC 2016 - werner@suse.de
+
+- Update to TeXLive 2016
+- Delete dvipdfmx.post and xetex.post and use the upstream perl scripts
+- Modify the patches
+ kpathsea_cnf.dif
+ latex2man_tmphandling.dif
+ luaotfload_varfonts.dif
+ musixtex_various.dif
+ tetex_scripts.dif
+ texconfig_scripts.dif
+ texdoc_cnf.dif
+ texdraw_info.dif
+ texlive-specs.changes
+
+-------------------------------------------------------------------
+Mon Apr 11 14:04:41 UTC 2016 - werner@suse.de
+
+- There is no texlive-misc with null.tex anymore but texlive-knuth-lib
+
+-------------------------------------------------------------------
Old:
----
pdfslide.doc.tar.xz
pdfslide.tar.xz
pdfsync.doc.tar.xz
pdfsync.tar.xz
pdftex-def.tar.xz
pdftex.doc.tar.xz
pdftex.tar.xz
pdftools.doc.tar.xz
pdftools.tar.xz
pdftricks.doc.tar.xz
pdftricks.tar.xz
pdftricks2.doc.tar.xz
pdftricks2.tar.xz
pdfwin.doc.tar.xz
pdfwin.tar.xz
New:
----
nmbib.doc.tar.xz
nmbib.tar.xz
noconflict.doc.tar.xz
noconflict.tar.xz
noindentafter.doc.tar.xz
noindentafter.tar.xz
noitcrul.doc.tar.xz
noitcrul.tar.xz
nolbreaks.doc.tar.xz
nolbreaks.tar.xz
nomencl.doc.tar.xz
nomencl.tar.xz
normalcolor.doc.tar.xz
normalcolor.tar.xz
noto.doc.tar.xz
noto.tar.xz
nucleardata.doc.tar.xz
nucleardata.tar.xz
nwejm.doc.tar.xz
nwejm.tar.xz
old-arrows.doc.tar.xz
old-arrows.tar.xz
options.doc.tar.xz
options.tar.xz
parades.doc.tar.xz
parades.tar.xz
pbibtex-base.doc.tar.xz
pbibtex-base.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-q.spec ++++++
++++ 9805 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-q.new/texlive-specs-q.spec
++++++ nomentbl.doc.tar.xz ++++++
++++++ nomentbl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomentbl.tlpobj new/tlpkg/tlpobj/nomentbl.tlpobj
--- old/tlpkg/tlpobj/nomentbl.tlpobj 2015-04-13 02:06:51.000000000 +0200
+++ new/tlpkg/tlpobj/nomentbl.tlpobj 2016-04-14 19:30:19.000000000 +0200
@@ -10,6 +10,7 @@
RELOC/makeindex/nomentbl/nomentbl.ist
RELOC/tex/latex/nomentbl/nomentbl.sty
catalogue-ctan /macros/latex/contrib/nomentbl
-catalogue-date 2012-05-21 18:33:03 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics glossary
catalogue-version 0.4
++++++ nonfloat.doc.tar.xz ++++++
++++++ nonfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nonfloat.tlpobj new/tlpkg/tlpobj/nonfloat.tlpobj
--- old/tlpkg/tlpobj/nonfloat.tlpobj 2015-04-13 02:06:51.000000000 +0200
+++ new/tlpkg/tlpobj/nonfloat.tlpobj 2016-04-14 19:30:20.000000000 +0200
@@ -1,7 +1,7 @@
name nonfloat
category Package
revision 17598
-shortdesc Non-floating table and figure captions.
+shortdesc Non-floating table and figure captions
relocated 1
longdesc Adjusts the figure and table environments to ensure that
longdesc centered objects as one line captions are centered as well.
@@ -10,6 +10,7 @@
runfiles size=1
RELOC/tex/latex/nonfloat/nonfloat.sty
catalogue-ctan /macros/latex/contrib/nonfloat
-catalogue-date 2012-05-21 18:33:03 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license pd
+catalogue-topics float
catalogue-version 1.0
++++++ nonumonpart.doc.tar.xz ++++++
++++++ nonumonpart.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nonumonpart.tlpobj new/tlpkg/tlpobj/nonumonpart.tlpobj
--- old/tlpkg/tlpobj/nonumonpart.tlpobj 2015-04-13 02:06:52.000000000 +0200
+++ new/tlpkg/tlpobj/nonumonpart.tlpobj 2016-04-14 19:30:20.000000000 +0200
@@ -1,7 +1,7 @@
name nonumonpart
category Package
revision 22114
-shortdesc Prevent page numbers on part pages.
+shortdesc Prevent page numbers on part pages
relocated 1
longdesc The package bundles the answer to the long-standing FAQ about
longdesc removing page numbers on \part pages. The package accepts no
@@ -10,6 +10,7 @@
runfiles size=1
RELOC/tex/latex/nonumonpart/nonumonpart.sty
catalogue-ctan /macros/latex/contrib/nonumonpart
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.2
+catalogue-topics page-nos
catalogue-version 1
++++++ nopageno.doc.tar.xz ++++++
++++++ nopageno.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nopageno.tlpobj new/tlpkg/tlpobj/nopageno.tlpobj
--- old/tlpkg/tlpobj/nopageno.tlpobj 2015-04-13 02:06:52.000000000 +0200
+++ new/tlpkg/tlpobj/nopageno.tlpobj 2016-04-14 19:30:20.000000000 +0200
@@ -1,7 +1,7 @@
name nopageno
category Package
revision 18128
-shortdesc No page numbers in LaTeX documents.
+shortdesc No page numbers in LaTeX documents
relocated 1
longdesc LaTeX's standard styles use two page styles, one on normal
longdesc pages and one on 'opening' pages with \maketitle or \chapter,
@@ -14,5 +14,6 @@
runfiles size=1
RELOC/tex/latex/nopageno/nopageno.sty
catalogue-ctan /macros/latex/contrib/nopageno
-catalogue-date 2012-06-09 12:09:52 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics page-nos
++++++ norasi-c90.tar.xz ++++++
++++++ nostarch.doc.tar.xz ++++++
++++++ nostarch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nostarch.tlpobj new/tlpkg/tlpobj/nostarch.tlpobj
--- old/tlpkg/tlpobj/nostarch.tlpobj 2015-04-13 02:06:53.000000000 +0200
+++ new/tlpkg/tlpobj/nostarch.tlpobj 2016-04-14 19:30:21.000000000 +0200
@@ -1,7 +1,7 @@
name nostarch
category Package
revision 15878
-shortdesc LaTeX class for No Starch Press.
+shortdesc LaTeX class for No Starch Press
relocated 1
longdesc The package provides the "official" LaTeX style for No Starch
longdesc Press. Provided are a class, a package for interfacing to
@@ -13,6 +13,7 @@
RELOC/tex/latex/nostarch/nostarch.cls
RELOC/tex/latex/nostarch/nshyper.sty
catalogue-ctan /macros/latex/contrib/nostarch
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics book-pub class
catalogue-version 1.3
++++++ notes.doc.tar.xz ++++++
++++++ notes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes.tlpobj new/tlpkg/tlpobj/notes.tlpobj
--- old/tlpkg/tlpobj/notes.tlpobj 2015-07-30 03:21:07.000000000 +0200
+++ new/tlpkg/tlpobj/notes.tlpobj 2016-04-14 19:30:22.000000000 +0200
@@ -1,7 +1,7 @@
name notes
category Package
revision 37998
-shortdesc Mark sections of a document.
+shortdesc Mark sections of a document
relocated 1
longdesc The package provides environments to highlight significant
longdesc portions of text within a document, by putting the text in a
@@ -19,7 +19,7 @@
RELOC/tex/latex/notes/warn.pdf
RELOC/tex/latex/notes/warn.png
catalogue-ctan /macros/latex/contrib/notes
-catalogue-date 2015-07-07 21:00:22 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
catalogue-topics decoration
catalogue-version 1.0.1
++++++ notes2bib.doc.tar.xz ++++++
++++++ notes2bib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes2bib.tlpobj new/tlpkg/tlpobj/notes2bib.tlpobj
--- old/tlpkg/tlpobj/notes2bib.tlpobj 2015-04-13 02:06:54.000000000 +0200
+++ new/tlpkg/tlpobj/notes2bib.tlpobj 2016-04-14 19:30:22.000000000 +0200
@@ -1,12 +1,12 @@
name notes2bib
category Package
revision 31162
-shortdesc Integrating notes into the bibliography.
+shortdesc Integrating notes into the bibliography
relocated 1
longdesc The package defines a new type of note, bibnote, which will
longdesc always be added to the bibliography. The package allows
longdesc footnotes and endnotes to be moved into the bibliography in the
-longdesc same way. The package can be used with natbib and biblatex as
+longdesc same way. The package can be used with natbib and BibLaTeX as
longdesc well as plain LaTeX citations. Both sorted and unsorted
longdesc bibliography styles are supported. The package uses the LaTeX 3
longdesc macros and the associated xpackages bundle. It also makes use
@@ -17,6 +17,7 @@
runfiles size=5
RELOC/tex/latex/notes2bib/notes2bib.sty
catalogue-ctan /macros/latex/contrib/notes2bib
-catalogue-date 2014-08-08 18:24:57 +0200
+catalogue-date 2015-08-08 19:53:23 +0200
catalogue-license lppl
+catalogue-topics notes bib-use expl3
catalogue-version 2.0k
++++++ notoccite.doc.tar.xz ++++++
++++++ notoccite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notoccite.tlpobj new/tlpkg/tlpobj/notoccite.tlpobj
--- old/tlpkg/tlpobj/notoccite.tlpobj 2015-04-13 02:06:54.000000000 +0200
+++ new/tlpkg/tlpobj/notoccite.tlpobj 2016-04-14 19:30:32.000000000 +0200
@@ -1,7 +1,7 @@
name notoccite
category Package
revision 18129
-shortdesc Prevent trouble from citations in table of contents, etc.
+shortdesc Prevent trouble from citations in table of contents, etc
relocated 1
longdesc If you have \cite commands in \section-like commands, or in
longdesc \caption, the citation will also appear in the table of
@@ -12,5 +12,6 @@
runfiles size=1
RELOC/tex/latex/notoccite/notoccite.sty
catalogue-ctan /macros/latex/contrib/notoccite
-catalogue-date 2012-06-09 12:09:52 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license pd
+catalogue-topics headings cite-supp
++++++ nowidow.doc.tar.xz ++++++
++++++ nowidow.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nowidow.tlpobj new/tlpkg/tlpobj/nowidow.tlpobj
--- old/tlpkg/tlpobj/nowidow.tlpobj 2015-04-13 02:06:55.000000000 +0200
+++ new/tlpkg/tlpobj/nowidow.tlpobj 2016-04-14 19:30:32.000000000 +0200
@@ -1,12 +1,13 @@
name nowidow
category Package
revision 24066
-shortdesc Avoid widows.
+shortdesc Avoid widows
relocated 1
longdesc This package provides a useful macro to manage widow lines.
runfiles size=1
RELOC/tex/latex/nowidow/nowidow.sty
catalogue-ctan /macros/latex/contrib/nowidow
-catalogue-date 2012-06-09 12:09:52 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics layout
catalogue-version 1.0
++++++ nox.doc.tar.xz ++++++
++++++ nox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nox.tlpobj new/tlpkg/tlpobj/nox.tlpobj
--- old/tlpkg/tlpobj/nox.tlpobj 2015-04-13 02:06:57.000000000 +0200
+++ new/tlpkg/tlpobj/nox.tlpobj 2016-04-14 19:30:32.000000000 +0200
@@ -1,13 +1,14 @@
name nox
category Package
revision 30991
-shortdesc Adaptable tables.
+shortdesc Adaptable tables
relocated 1
longdesc The package allows data, text (including (La)TeX commands or
longdesc environments) to be formatted into a array which may be split.
runfiles size=4
RELOC/tex/latex/nox/nox.sty
catalogue-ctan /macros/latex/contrib/nox
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics table-long table
catalogue-version 1.0
++++++ nrc.doc.tar.xz ++++++
++++++ nrc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nrc.tlpobj new/tlpkg/tlpobj/nrc.tlpobj
--- old/tlpkg/tlpobj/nrc.tlpobj 2015-04-13 02:06:58.000000000 +0200
+++ new/tlpkg/tlpobj/nrc.tlpobj 2016-04-14 19:30:33.000000000 +0200
@@ -1,7 +1,7 @@
name nrc
category Package
revision 29027
-shortdesc Class for the NRC technical journals.
+shortdesc Class for the NRC technical journals
relocated 1
longdesc Macros, and some documentation, for typesetting papers for
longdesc submission to journals published by the National Research
@@ -13,6 +13,7 @@
RELOC/tex/latex/nrc/nrc2.cls
RELOC/tex/latex/nrc/nrc2.sty
catalogue-ctan /macros/latex/contrib/nrc
-catalogue-date 2013-02-05 15:37:49 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics journalpub physics
catalogue-version 2.01a
++++++ ntgclass.doc.tar.xz ++++++
++++++ ntgclass.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ntgclass.tlpobj new/tlpkg/tlpobj/ntgclass.tlpobj
--- old/tlpkg/tlpobj/ntgclass.tlpobj 2015-04-13 02:06:59.000000000 +0200
+++ new/tlpkg/tlpobj/ntgclass.tlpobj 2016-04-14 19:30:34.000000000 +0200
@@ -1,7 +1,7 @@
name ntgclass
category Package
revision 15878
-shortdesc "European" versions of standard classes.
+shortdesc "European" versions of standard classes
relocated 1
longdesc The bundle offers versions of the standard LaTeX article and
longdesc report classes, rewritten to reflect a more European design,
@@ -24,6 +24,7 @@
RELOC/tex/latex/ntgclass/rapport1.cls
RELOC/tex/latex/ntgclass/rapport3.cls
catalogue-ctan /macros/latex/contrib/ntgclass
-catalogue-date 2012-07-17 11:53:13 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics class letter
catalogue-version 2.1a
++++++ ntheorem-vn.doc.tar.xz ++++++
++++++ ntheorem.doc.tar.xz ++++++
++++++ ntheorem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ntheorem.tlpobj new/tlpkg/tlpobj/ntheorem.tlpobj
--- old/tlpkg/tlpobj/ntheorem.tlpobj 2015-04-13 02:07:00.000000000 +0200
+++ new/tlpkg/tlpobj/ntheorem.tlpobj 2016-04-14 19:30:35.000000000 +0200
@@ -1,7 +1,7 @@
name ntheorem
category Package
revision 27609
-shortdesc Enhanced theorem environment.
+shortdesc Enhanced theorem environment
relocated 1
longdesc The package offers enhancements for theorem-like environments:
longdesc easier control of layout; proper placement of endmarks even
@@ -12,7 +12,9 @@
runfiles size=12
RELOC/tex/latex/ntheorem/ntheorem.std
RELOC/tex/latex/ntheorem/ntheorem.sty
+catalogue-also amsthm thmtools empheq
catalogue-ctan /macros/latex/contrib/ntheorem
-catalogue-date 2014-10-15 23:31:15 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics maths-theorem
catalogue-version 1.33
++++++ nuc.doc.tar.xz ++++++
++++++ nuc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nuc.tlpobj new/tlpkg/tlpobj/nuc.tlpobj
--- old/tlpkg/tlpobj/nuc.tlpobj 2015-04-13 02:07:01.000000000 +0200
+++ new/tlpkg/tlpobj/nuc.tlpobj 2016-04-14 19:30:35.000000000 +0200
@@ -1,7 +1,7 @@
name nuc
category Package
revision 22256
-shortdesc Notation for nuclear isotopes.
+shortdesc Notation for nuclear isotopes
relocated 1
longdesc A simple package providing nuclear sub- and superscripts as
longdesc commonly used in radiochemistry, radiation science, and nuclear
@@ -11,6 +11,7 @@
runfiles size=3
RELOC/tex/latex/nuc/nuc.sty
catalogue-ctan /macros/latex/contrib/nuc
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics physics subsup-pos
catalogue-version 0.1
++++++ numberedblock.doc.tar.xz ++++++
++++++ numberedblock.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/numberedblock.tlpobj new/tlpkg/tlpobj/numberedblock.tlpobj
--- old/tlpkg/tlpobj/numberedblock.tlpobj 2015-04-13 02:07:01.000000000 +0200
+++ new/tlpkg/tlpobj/numberedblock.tlpobj 2016-04-14 19:30:37.000000000 +0200
@@ -1,7 +1,7 @@
name numberedblock
category Package
revision 33109
-shortdesc Print a block of code, with unique index number.
+shortdesc Print a block of code, with unique index number
relocated 1
longdesc The package has been created for the convenience of the report
longdesc writer; it provides the means to number, and label, code-block
@@ -10,6 +10,7 @@
runfiles size=2
RELOC/tex/latex/numberedblock/numberedblock.sty
catalogue-ctan /macros/latex/contrib/numberedblock
-catalogue-date 2014-03-06 18:55:44 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics listing label-ref
catalogue-version 1.10
++++++ numericplots.doc.tar.xz ++++++
++++++ numericplots.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/numericplots.tlpobj new/tlpkg/tlpobj/numericplots.tlpobj
--- old/tlpkg/tlpobj/numericplots.tlpobj 2015-04-13 02:07:03.000000000 +0200
+++ new/tlpkg/tlpobj/numericplots.tlpobj 2016-04-14 19:30:38.000000000 +0200
@@ -1,7 +1,7 @@
name numericplots
category Package
revision 31729
-shortdesc Plot numeric data (including Matlab export) using PSTricks.
+shortdesc Plot numeric data (including Matlab export) using PSTricks
relocated 1
longdesc Plotting numeric data is a task which has often to be done for
longdesc scientific papers. LaTeX itself provides no facilities for
@@ -16,7 +16,9 @@
RELOC/tex/latex/numericplots/NumericPlots_legend.tex
RELOC/tex/latex/numericplots/NumericPlots_macros.tex
RELOC/tex/latex/numericplots/NumericPlots_styles.tex
+catalogue-also pst-plot pgfplots
catalogue-ctan /graphics/pstricks/contrib/numericplots
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl3
+catalogue-topics graphics-plot
catalogue-version 2.0.2
++++++ numname.doc.tar.xz ++++++
++++++ numname.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/numname.tlpobj new/tlpkg/tlpobj/numname.tlpobj
--- old/tlpkg/tlpobj/numname.tlpobj 2015-04-13 02:07:03.000000000 +0200
+++ new/tlpkg/tlpobj/numname.tlpobj 2016-04-14 19:30:38.000000000 +0200
@@ -1,7 +1,7 @@
name numname
category Package
revision 18130
-shortdesc Convert a number to its English expression.
+shortdesc Convert a number to its English expression
relocated 1
longdesc The package can generate cardinal (one, two, ...) and ordinal
longdesc (first, second, ...) numbers. The code derives from the memoir
@@ -10,5 +10,6 @@
runfiles size=5
RELOC/tex/latex/numname/numname.sty
catalogue-ctan /macros/latex/contrib/numname
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics numbers
++++++ numprint.doc.tar.xz ++++++
++++++ numprint.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/numprint.tlpobj new/tlpkg/tlpobj/numprint.tlpobj
--- old/tlpkg/tlpobj/numprint.tlpobj 2015-04-13 02:07:05.000000000 +0200
+++ new/tlpkg/tlpobj/numprint.tlpobj 2016-04-14 19:30:40.000000000 +0200
@@ -1,7 +1,7 @@
name numprint
category Package
revision 27498
-shortdesc Print numbers with separators and exponent if necessary.
+shortdesc Print numbers with separators and exponent if necessary
relocated 1
longdesc The package numprint prints numbers with a separator every
longdesc three digits and converts numbers given as 12345.6e789 to
@@ -22,6 +22,7 @@
RELOC/tex/latex/numprint/numprint.sty
RELOC/tex/latex/numprint/numprint032.sty
catalogue-ctan /macros/latex/contrib/numprint
-catalogue-date 2012-08-22 15:46:20 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics numbers
catalogue-version 1.39
++++++ oberdiek.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-q/oberdiek.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-q.new/oberdiek.doc.tar.xz differ: char 26, line 1
++++++ oberdiek.tar.xz ++++++
++++ 6204 lines of diff (skipped)
++++++ objectz.doc.tar.xz ++++++
++++++ objectz.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/objectz.tlpobj new/tlpkg/tlpobj/objectz.tlpobj
--- old/tlpkg/tlpobj/objectz.tlpobj 2015-04-13 02:07:37.000000000 +0200
+++ new/tlpkg/tlpobj/objectz.tlpobj 2016-04-14 19:31:02.000000000 +0200
@@ -1,12 +1,14 @@
name objectz
category Package
revision 19389
-shortdesc Macros for typesetting Object Z.
+shortdesc Macros for typesetting Object Z
relocated 1
longdesc The package will typeset both Z and Object-Z specifications; it
longdesc develops the original zed package
runfiles size=10
RELOC/tex/latex/objectz/oz.sty
+catalogue-also zed-csp
catalogue-ctan /macros/latex/contrib/objectz
-catalogue-date 2012-03-30 15:19:52 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics formal-spec
++++++ obnov.doc.tar.xz ++++++
++++++ obnov.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/obnov.tlpobj new/tlpkg/tlpobj/obnov.tlpobj
--- old/tlpkg/tlpobj/obnov.tlpobj 2015-04-13 02:07:38.000000000 +0200
+++ new/tlpkg/tlpobj/obnov.tlpobj 2016-04-14 19:31:03.000000000 +0200
@@ -1,7 +1,7 @@
name obnov
category Package
revision 33355
-shortdesc Obyknovennaya Novaya fonts.
+shortdesc Obyknovennaya Novaya fonts
relocated 1
longdesc The Obyknovennaya Novaya (Ordinary New Face) typeface was
longdesc widely used in the USSR for scientific and technical
@@ -60,6 +60,7 @@
RELOC/tex/latex/obnov/lcyw.cmap
RELOC/tex/latex/obnov/lcywobn.fd
catalogue-ctan /fonts/obnov
-catalogue-date 2015-03-30 22:55:45 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics font font-mf font-cyrillic cyrillic
catalogue-version 0.11
++++++ ocg-p.doc.tar.xz ++++++
++++++ ocg-p.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocg-p.tlpobj new/tlpkg/tlpobj/ocg-p.tlpobj
--- old/tlpkg/tlpobj/ocg-p.tlpobj 2015-04-13 02:07:41.000000000 +0200
+++ new/tlpkg/tlpobj/ocg-p.tlpobj 2016-04-14 19:31:05.000000000 +0200
@@ -1,15 +1,16 @@
name ocg-p
category Package
revision 28803
-shortdesc PDF OCG support in LaTeX.
+shortdesc PDF OCG support in LaTeX
relocated 1
longdesc The package provides OCG (Optional Content Groups) support
longdesc within a PDF document, replacing the ocg.sty distributed with
longdesc asymptote. Nested OCGs are supported. The package may be used
-longdesc with PDFLatex and XeLaTeX.
+longdesc with pdfLaTeX and XeLaTeX.
runfiles size=4
RELOC/tex/latex/ocg-p/ocg-p.sty
catalogue-ctan /macros/latex/contrib/ocg-p
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-09 10:51:45 +0200
catalogue-license lppl
+catalogue-topics pdf-feat
catalogue-version 0.4
++++++ ocgx.doc.tar.xz ++++++
++++++ ocgx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx.tlpobj new/tlpkg/tlpobj/ocgx.tlpobj
--- old/tlpkg/tlpobj/ocgx.tlpobj 2015-04-13 02:07:42.000000000 +0200
+++ new/tlpkg/tlpobj/ocgx.tlpobj 2016-04-14 19:31:06.000000000 +0200
@@ -1,7 +1,7 @@
name ocgx
category Package
revision 28492
-shortdesc Use OCGs within a PDF document without JavaScript.
+shortdesc Use OCGs within a PDF document without JavaScript
relocated 1
longdesc The package extends the ocg package, which allows you to create
longdesc OCGs (Optional Content Groups) in PDF documents. (The ocg
@@ -14,7 +14,9 @@
runfiles size=2
RELOC/tex/latex/ocgx/ocgx.sty
RELOC/tex/latex/ocgx/tikzlibraryocgx.code.tex
+catalogue-also asymptote
catalogue-ctan /macros/latex/contrib/ocgx
-catalogue-date 2012-12-10 10:44:43 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics pdf-feat
catalogue-version 0.5
++++++ ocgx2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/ChangeLog new/doc/latex/ocgx2/ChangeLog
--- old/doc/latex/ocgx2/ChangeLog 2015-07-21 00:09:02.000000000 +0200
+++ new/doc/latex/ocgx2/ChangeLog 2016-03-24 23:28:05.000000000 +0100
@@ -1,3 +1,58 @@
+2016-03-22
+ * v0.17 : ocgx2.sty
+ * new: option `ocgcolorlinks', enables OCG colour links for hyperref package
+
+2016-03-11
+ * v0.16 : ocgx2.sty
+ * v0.6 : ocgbase.sty
+ * fix: minor adjustments
+
+2016-01-29
+ * v0.15 : ocgx2.sty
+ * fix: adjusted `atendvi'-related warning message
+
+2015-12-07
+ * v0.14 : ocgx2.sty
+ * v0.5 : ocgbase.sty
+ * fix: `0' and `1' could not be used for setting initial
+ visibility; \actionsocg macro caused compilation error when used
+ without optional argument
+
+2015-12-03
+ * v0.13 : ocgx2.sty
+ * fix: bug occasionally creating wrong OCG listing in the layers
+ tab of the pdf viewer in connection with nested OCGs
+ * new: parameter `opts' added to TikZ style `ocg'
+
+2015-11-26
+ * v0.12 : ocgx2.sty
+ * v0.4 : ocgbase.sty
+ * fix: last argument of `ocg' environment (initial visibility)
+ had no effect when re-opening an OCG
+
+2015-11-23
+ * v0.11 : ocgx2.sty
+ * v0.3 : ocgbase.sty
+ * new: PDF layers spanning multiple pages
+
+2015-11-02
+ * v0.10 : ocgx2.sty
+ * v0.2 : ocgbase.sty
+ * new: commands \ocgbase@oc@bdc, \ocgbase_oc_bdc:n and \ocgbase@oc@emc,
+ \ocgbase_oc_emc: for marking optional content in content streams
+
+2015-10-28
+ * v0.9 : ocgx2.sty
+ * v0.1 : ocgbase.sty
+ * new: Environment option `radiobtngrp' (adding layers to Radio Button
+ Groups), option `showingui' as a synonym for `listintoolbar';
+ code restructured for better maintenance (new file ocgbase.sty)
+
+2015-09-11
+ * v0.8
+ * fix: missing option processing for ocg-p command replacements
+ (\toggleocgs, \showocgs etc.)
+
2015-07-20
* v0.7
* fix: expl3-related adjustments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/README new/doc/latex/ocgx2/README
--- old/doc/latex/ocgx2/README 2015-07-21 00:09:02.000000000 +0200
+++ new/doc/latex/ocgx2/README 2016-03-24 23:28:05.000000000 +0100
@@ -1,7 +1,7 @@
==================================
The `ocgx2' LaTeX Package
- Version 0.7 [2015/07/20]
+ Version 0.17 [2016/03/22]
(C) 2015--\today Alexander Grahn
==================================
@@ -10,11 +10,12 @@
1. Introduction
===============
-The intent of this package is to be a drop-in replacement for the already
-existing package `ocgx' by Paul Gaborit.
+This package serves as a drop-in replacement for the already existing
+packages `ocgx' by Paul Gaborit and `ocg-p' by Werner Moshammer for the
+creation of PDF Layers.
-It re-implements the functionality of the `ocg', `ocgx' and `ocg-p' packages
-and adds support for all known engines and back-ends including:
+It re-implements the functionality of the `ocg', `ocgx' and `ocg-p'
+packages and adds support for all known engines and back-ends including:
* LaTeX --> dvips --> ps2pdf/Distiller
* (Xe)LaTeX --> (x)dvipdfmx
@@ -22,11 +23,24 @@
To enable dvipdfmx support, pass `dvipdfmx' globally as a class option.
-Also, it adds some minor improvements, such as package options,
-remembering option settings of re-opened ocgs, correct behaviour of ocg
-switching links that were themselves placed on layers, compatibility
+ * New features:
+
+ + layers extending across page breaks
+ + grouping layers into Radio Button Groups
+ + OCG coloured links for hyperref
+
+Also, it adds some minor improvements and bug fixes, such as package
+options, remembering option settings of re-opened ocgs, correct behaviour
+of layer switching links that were themselves placed on layers, correct
+listing of (nested) ocgs in the layers tab of PDF viewers, compatibility
with the `animate' and `media9' packages.
+Coloured links in the PDF viewer that are printed on paper in the default text
+colour are enabled with
+
+ \usepackage{hyperref} % do NOT set [ocgcolorlinks] here!
+ \usepackage[ocgcolorlinks]{ocgx2}
+
`ocgx2' uses code from file `tikzlibraryocgx.code.tex' by P. Gaborit to
enable TikZ styles for creating PDF Layers and clickable layer switching
links in the `tikzpicture' context.
@@ -40,10 +54,15 @@
\usepackage{tikz}
\usetikzlibrary{ocgx}
-to enable these TikZ styles and read the `ocgx' documentation about their usage:
+to enable these TikZ styles and read the `ocgx' documentation about
+their usage:
texdoc ocgx
+The /tikz/ocg/opts=<ocg options> parameter adds to the list in section
+`How to add TikZ scopes into OCGs' in the `ocgx' manual. It allows
+passing ocg environment options (see below) to the TikZ scope.
+
2. Usage
========
@@ -54,18 +73,35 @@
... material to be put on a PDF layer ...
\end{ocg}
-With <options> : viewocg = always | never | ifvisible
- printocg = always | never | ifvisible
- exportocg = always | never | ifvisible
- listintoolbar= always | never | iffirstuse
+With <initial visibility> = ( on | true | 1 ) | ( off | false | 0 )
+
+and <options> : viewocg = always | never | ifvisible
+ printocg = always | never | ifvisible
+ exportocg = always | never | ifvisible
+ listintoolbar= always | never | iffirstuse
- tikz (package-only option, see above)
+ not in ocgx, ocg-p:
+
+ showingui (same as `listintoolbar')
+ radiobtngrp = <group name> (string; environment-only option)
+
+ tikz (package-only option, see above)
+ ocgcolorlinks (package-only option, see above)
Package options have global scope. Environment options override package
-options locally. `ocg' environments can be nested.
+options locally.
+
+Layers can be added to one or several Radio Button Groups using the new
+option `radiobtngrp'. From all layers within a Radio Button Group only
+one can be enabled at a time. Enabling a layer, e. g. in the Layers tab
+of the PDF viewer, automatically hides the previously visible layer.
+Option `radiobtngrp' can be used repeatedly for the same OCG in order
+to add the layer to more than one Radio Button Group.
+
+`ocg' environments can be nested and span multiple pages.
See the `ocg-p' manual about the environment usage and the meaning of
-the available options:
+the remaining options:
texdoc ocg-p
@@ -80,13 +116,15 @@
texdoc ocgx
-For compatibility with the `ocg-p' package, the following aliases for
-the above commands have been provided:
+For compatibility with the `ocg-p' package, the following commands have
+been provided:
+
+ \toggleocgs[triggerocg=...]{}{<link text>}
+ \showocgs[triggerocg=...]{}{<link text>}
+ \hideocgs[triggerocg=...]{}{<link text>}
+ \setocgs[triggerocg=...]{<IDs to toggle>}{<IDs to switch ON>}{<IDs to switch OFF>}{<link text>}
- \toggleocgs
- \showocgs
- \hideocgs
- \setocgs
+See the `ocg-p' package manual for the meaning of `triggerocg=...'.
* * *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.doc.tlpobj new/tlpkg/tlpobj/ocgx2.doc.tlpobj
--- old/tlpkg/tlpobj/ocgx2.doc.tlpobj 2015-07-21 03:20:56.000000000 +0200
+++ new/tlpkg/tlpobj/ocgx2.doc.tlpobj 2016-04-14 19:31:06.000000000 +0200
@@ -1,8 +1,8 @@
name ocgx2.doc
category Package
-revision 37910
+revision 40126
shortdesc doc files of ocgx2
relocated 1
-docfiles size=2
+docfiles size=3
RELOC/doc/latex/ocgx2/ChangeLog
RELOC/doc/latex/ocgx2/README
++++++ ocgx2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgbase.sty new/tex/latex/ocgx2/ocgbase.sty
--- old/tex/latex/ocgx2/ocgbase.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/ocgx2/ocgbase.sty 2016-03-12 00:41:22.000000000 +0100
@@ -0,0 +1,293 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ocgbase.sty
+%
+% low-level macros for OCG creation, marking optional content and
+% for managment of global (document-wide) OCG related lists;
+%
+% (automatic) OCG configuration in the PDF catalog
+%
+% Copyright 2015--\today, Alexander Grahn
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Support package for ocgx2.sty, media9.sty, animate.sty
+%
+% Supported workflows:
+%
+% pdflatex, lualatex
+% latex-->dvips-->ps2pdf or Distiller
+% latex-->dvipdfmx
+% xelatex
+%
+% for `dvipdfmx', set it as document class option
+%
+%
+% Commands defined:
+%
+% \ocgbase_new_ocg:nnn
+% \ocgbase@new@ocg (LaTeX2e version)
+% #1: name (as shown in the Layers Tab of the Reader GUI)
+% #2: usage dict (may be empty), see PDF reference:
+% http://wwwimages.adobe.com/content/dam/Adobe/en/devnet/pdf/pdfs/
+% pdf_reference_1-7.pdf#G9.3858276
+% #3: initial visibility (1|0|true|false|on|off)
+%
+% \ocgbase_last_ocg:
+% \ocgbase@last@ocg (LaTeX2e version)
+% inserts ID of PDF object created during most recent call of
+% \ocgbase_new_ocg:nnn
+%
+% --------
+%
+% \ocgbase_add_to_order_list:n
+% \ocgbase@add@to@order@list (LaTeX2e version)
+% #1: PDF object ID of OCG
+% Only OCGs added to the global `Order' list using this command will show
+% up in the Layers Tab
+%
+% --------
+%
+% \ocgbase_add_to_off_list:n
+% \ocgbase@add@to@off@list (LaTeX2e version)
+% #1: PDF object ID of OCG
+% macro for setting initial visibility to `off'
+%
+% --------
+%
+% \ocgbase_del_from_off_list:n
+% \ocgbase@del@from@off@list (LaTeX2e version)
+% #1: PDF object ID of OCG
+% macro for setting initial visibility to `on'
+%
+% --------
+%
+% \ocgbase_add_ocg_to_radiobtn_grp:nnn
+% \ocgbase@add@ocg@to@radiobtn@grp
+% add OCG #2 (obj ref) to radio button group `#1' (string),
+% #3: (0|1|false|true) list OCG as part of group `#1' in the Layers Tab)
+%
+% --------
+%
+% \ocgbase_oc_bdc:n
+% \ocgbase@oc@bdc
+% #1: OCG obj ref
+% mark begin of optional content belonging to OCG #1 in the current
+% content stream
+%
+% \ocgbase_oc_emc:
+% \ocgbase@oc@emc
+% mark end of optional content in the current content stream
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is A. Grahn.
+
+\RequirePackage{expl3}
+\RequirePackage{atenddvi}
+\RequirePackage{pdfbase}
+
+\ProvidesExplPackage{ocgbase}{2016/03/11}{0.6}
+{support package for ocgx2.sty}
+
+\tl_new:N\g_ocgbase_ocgs_tl %takes ocg object refs
+\seq_new:N\g_ocgbase_ocgorder_seq
+\seq_new:N\g_ocgbase_offocgs_seq
+
+\AtEndDvi{
+ \tl_if_empty:NF\g_ocgbase_ocgs_tl{
+ %global OCG array
+ \pbs_pdfobj:nnn{}{array}{\g_ocgbase_ocgs_tl}
+ \tl_set:Nx\l_ocgbase_ocgarray_tl{\pbs_pdflastobj:}
+ \tl_new:N\l_ocgbase_offocgentry_tl
+ %global OFF list
+ \seq_if_empty:NF\g_ocgbase_offocgs_seq{
+ \pbs_pdfobj:nnn{}{array}{\seq_use:Nn\g_ocgbase_offocgs_seq{~}}
+ \tl_set:Nx\l_ocgbase_offocgentry_tl{/OFF~\pbs_pdflastobj:}
+ }
+ %global Order list
+ \tl_new:N\l_ocgbase_ocgorderentry_tl
+ \seq_if_empty:NF\g_ocgbase_ocgorder_seq{
+ %process radio button groups in the Order array
+ \seq_map_inline:Nn\g_ocgbase_ocgorder_seq{
+ \cs_if_exist:cT{g_ocgbase_#1_rbtn_order_seq}{
+ \int_compare:nTF{\seq_count:c{g_ocgbase_#1_rbtn_groups_seq}>\c_one}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_#1_rbtn_order_seq}>\c_zero}{
+ %remove all occurrences in Order array outside current rbtn group
+ \seq_map_inline:cn{g_ocgbase_#1_rbtn_order_seq}{
+ \seq_gremove_all:Nn\g_ocgbase_ocgorder_seq{##1}
+ }
+ }
+ }{
+ %ignore single-item radio button groups
+ \seq_gremove_all:Nn\g_ocgbase_ocgorder_seq{#1}
+ }
+ }
+ }
+ %second sweep on Order array to generate the final Order entry
+ \tl_new:N\l_ocgbase_ocgorder_tl
+ \tl_set:Nn\l_ocgbase_order_item_count_tl{0}
+ \seq_map_inline:Nn\g_ocgbase_ocgorder_seq{
+ \tl_set:Nx\l_ocgbase_order_item_count_tl{
+ \int_eval:n{\l_ocgbase_order_item_count_tl+\c_one}
+ }
+ \cs_if_exist:cTF{g_ocgbase_#1_rbtn_order_seq}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_#1_rbtn_order_seq}>\c_zero}{
+ \tl_put_right:Nx\l_ocgbase_ocgorder_tl{
+ ~[(#1)~\seq_use:cn{g_ocgbase_#1_rbtn_order_seq}{~}]
+ }
+ }
+ }{
+ %ordinary (non-radiobutton group) item (ocg obj ref, `[' or `]'),
+ \tl_set:Nx\l_ocgbase_current_order_item_tl{#1}
+ \tl_set:Nx\l_ocgbase_next_order_item_tl{
+ \seq_item:Nn\g_ocgbase_ocgorder_seq{
+ \l_ocgbase_order_item_count_tl+\c_one
+ }
+ }
+ \tl_set:Nx\l_ocgbase_prev_order_item_tl{
+ \seq_item:Nn\g_ocgbase_ocgorder_seq{
+ \l_ocgbase_order_item_count_tl-\c_one
+ }
+ }
+ \bool_if:nF{ %avoid empty nesting groups
+ \str_if_eq_p:Vn\l_ocgbase_current_order_item_tl{[} &&
+ \str_if_eq_p:Vn\l_ocgbase_next_order_item_tl{]}
+ ||
+ \str_if_eq_p:Vn\l_ocgbase_current_order_item_tl{]} &&
+ \str_if_eq_p:Vn\l_ocgbase_prev_order_item_tl{[}
+ }{\tl_put_right:Nn\l_ocgbase_ocgorder_tl{~#1}}
+ }
+ }
+ \tl_if_empty:NF\l_ocgbase_ocgorder_tl{
+ \pbs_pdfobj:nnn{}{array}{\l_ocgbase_ocgorder_tl}
+ \tl_set:Nx\l_ocgbase_ocgorderentry_tl{/Order~\pbs_pdflastobj:}
+ }
+ }
+ %generate RBGroups entry (radio button groups)
+ \tl_new:N\l_ocgbase_rbgroups_tl
+ \seq_map_inline:Nn\g_ocgbase_ocgorder_seq{
+ \cs_if_exist:cT{g_ocgbase_#1_rbtn_groups_seq}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_#1_rbtn_groups_seq}>\c_one}{
+ \tl_put_right:Nx\l_ocgbase_rbgroups_tl{
+ ~[\seq_use:cn{g_ocgbase_#1_rbtn_groups_seq}{~}]
+ }
+ }
+ }
+ }
+ \tl_new:N\l_ocgbase_rbgroupsentry_tl
+ \tl_if_empty:NF\l_ocgbase_rbgroups_tl{
+ \pbs_pdfobj:nnn{}{array}{\l_ocgbase_rbgroups_tl}
+ \tl_set:Nx\l_ocgbase_rbgroupsentry_tl{/RBGroups~\pbs_pdflastobj:}
+ }
+ \pbs_pdfcatalog:n{
+ /OCProperties~<<
+ /OCGs~\l_ocgbase_ocgarray_tl
+ /D~<<
+ /AS~[
+ <>
+ <>
+ <>
+ ]
+ /BaseState/ON~\l_ocgbase_offocgentry_tl
+ \l_ocgbase_ocgorderentry_tl
+ \l_ocgbase_rbgroupsentry_tl
+ /ListMode/VisiblePages
+ >>
+ >>
+ }
+ }
+}
+
+%macro for inserting new OCG object
+\cs_new_nopar:Nn\ocgbase_new_ocg:nnn{
+ \pbs_pdfobj:nnn{}{dict}{
+ /Type/OCG/Name~(#1)~\tl_if_blank:oF{#2}{/Usage<<#2>>}
+ }
+ \tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pbs_pdflastobj:}
+ \bool_if:nT{
+ \str_if_eq_x_p:nn{#3}{0} ||
+ \str_if_eq_x_p:nn{#3}{off} ||
+ \str_if_eq_x_p:nn{#3}{false}
+ }{
+ \ocgbase_add_to_off_list:n{\pbs_pdflastobj:}
+ }
+ \tl_gset:Nx\g_ocgbase_last_ocg_tl{\pbs_pdflastobj:}
+}
+
+\cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl}
+
+%macro for appending OCG object to global `Order' list
+% in Layers Tab of the GUI
+\cs_new_nopar:Nn\ocgbase_add_to_order_list:n{
+ \seq_gput_right:Nx\g_ocgbase_ocgorder_seq{#1}
+}
+
+%macro for appending an OCG object to the global `OFF' list
+%(initial non-visibility)
+\cs_new_nopar:Nn\ocgbase_add_to_off_list:n{
+ \seq_if_in:NxF\g_ocgbase_offocgs_seq{#1}{
+ \seq_gput_right:Nx\g_ocgbase_offocgs_seq{#1}
+ }
+}
+
+%macro for removing an OCG object from global `OFF' list
+%(initial non-visibility)
+\cs_new_nopar:Nn\ocgbase_del_from_off_list:n{
+ \seq_if_in:NxT\g_ocgbase_offocgs_seq{#1}{
+ \ocgbase_seq_gremove_all:Nx\g_ocgbase_offocgs_seq{#1}
+ }
+}
+\cs_set_eq:NN\ocgbase_seq_gremove_all:Nn\seq_gremove_all:Nn
+\cs_generate_variant:Nn\ocgbase_seq_gremove_all:Nn{Nx}
+
+\cs_new_nopar:Nn\ocgbase_add_ocg_to_radiobtn_grp:nnn{
+ % #1: rbtn group name,
+ % #2: OCG obj ref,
+ % #3: visible in Layers Tab
+ \seq_if_in:NxF\g_ocgbase_ocgorder_seq{#1}{
+ \seq_gput_right:Nx\g_ocgbase_ocgorder_seq{#1}
+ \seq_new:c{g_ocgbase_#1_rbtn_order_seq}
+ \seq_new:c{g_ocgbase_#1_rbtn_groups_seq}
+ }
+ \seq_if_in:cxTF{g_ocgbase_#1_rbtn_order_seq}{#2}{
+ \bool_if:nT{
+ \str_if_eq_x_p:nn{#3}{0} ||
+ \str_if_eq_x_p:nn{#3}{false}
+ }{
+ \ocgbase_seq_gremove_all:cx{g_ocgbase_#1_rbtn_order_seq}{#2}
+ }
+ }{
+ \bool_if:nF{
+ \str_if_eq_x_p:nn{#3}{0} ||
+ \str_if_eq_x_p:nn{#3}{false}
+ }{
+ \seq_gput_right:cx{g_ocgbase_#1_rbtn_order_seq}{#2}
+ }
+ }
+ \seq_gput_right:cx{g_ocgbase_#1_rbtn_groups_seq}{#2}
+}
+
+% OC-marked content
+\cs_new_nopar:Nn\ocgbase_oc_bdc:n{\pbs_pdfbdc:nn{/OC}{#1}}
+\cs_new_nopar:Nn\ocgbase_oc_emc:{\pbs_pdfemc:}
+
+%l2e versions
+\cs_gset_eq:NN\ocgbase@new@ocg\ocgbase_new_ocg:nnn
+\cs_gset_eq:NN\ocgbase@last@ocg\ocgbase_last_ocg:
+\cs_gset_eq:NN\ocgbase@add@to@order@list\ocgbase_add_to_order_list:n
+\cs_gset_eq:NN\ocgbase@add@to@off@list\ocgbase_add_to_off_list:n
+\cs_gset_eq:NN\ocgbase@del@from@off@list\ocgbase_del_from_off_list:n
+\cs_gset_eq:NN\ocgbase@add@ocg@to@radiobtn@grp\ocgbase_add_ocg_to_radiobtn_grp:nnn
+\cs_gset_eq:NN\ocgbase@oc@bdc\ocgbase_oc_bdc:n
+\cs_gset_eq:NN\ocgbase@oc@emc\ocgbase_oc_emc:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgx2.sty new/tex/latex/ocgx2/ocgx2.sty
--- old/tex/latex/ocgx2/ocgx2.sty 2015-07-21 00:09:02.000000000 +0200
+++ new/tex/latex/ocgx2/ocgx2.sty 2016-03-24 23:28:05.000000000 +0100
@@ -7,11 +7,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% The intent of this package is to be a drop-in replacement for the already
-% existing CTAN package `ocgx' by Paul Gaborit.
+% existing CTAN package `ocgx' by Paul Gaborit, and also for `ocg-p' and `ocg'.
%
% It re-implements the functionality of the ocg, ocgx and ocg-p packages
% and adds support for all known engines and backends including
-% latex+dvips+ps2pdf, xelatex, latex+dvipdfm, lualatex.
+% latex+dvips+ps2pdf, xelatex, latex+dvipdfmx, lualatex.
+%
+% With ocgx2, PDF layers may extend across page breaks.
%
% Adds some minor improvements, such as package options, remembering option
% settings of reopened ocgs, correct behaviour of ocg switching links that were
@@ -33,176 +35,561 @@
% The Current Maintainer of this work is A. Grahn.
\RequirePackage{xparse}
-\RequirePackage{atenddvi}
-\RequirePackage{ifpdf}
\RequirePackage{l3keys2e}
-\AtBeginDocument{
- \@ifpackageloaded{media9}{}{\RequirePackage{media9}}
- \@ifpackagelater{media9}{2015/01/21}{}{
- \PackageError{ocgx2}{%
- Requires package `media9' v0.49 [2015/01/21] or\MessageBreak
- newer, but only v\g@mix@version@tl\space[\g@mix@date@tl] is available
- }{}%
+\ProvidesExplPackage{ocgx2}{2016/03/22}{0.17}
+{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
+
+%creating global definitions
+\cs_new:Npn\ocgxii@newkey#1#2{\tl_gset:cx{#1}{#2}}
+
+%package opts
+%unknown package option error message
+\msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{
+ Package option~'#1'~is~unknown;\\
+ perhaps~it~is~spelled~incorrectly.
+}
+
+\bool_new:N\g_ocgxii_dvipdfmx_bool
+\bool_new:N\l_ocgxii_tikz_bool
+\bool_new:N\l_ocgxii_ocgcolorlinks_bool
+
+\keys_define:nn{ocgx2}{
+ xetex .code:n = {
+ \PassOptionsToPackage{xetex}{pdfbase}
+ },
+
+ dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
+ },
+
+ viewocg .choice:,
+ viewocg / always .code:n={
+ \tl_gset:Nn\g_ocgxii_view_tl{/View<>}},
+ viewocg / never .code:n={
+ \tl_gset:Nn\g_ocgxii_view_tl{/View<>}},
+ viewocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_view_tl},
+ viewocg .default:n={ifvisible},
+
+ printocg .choice:,
+ printocg / always .code:n={
+ \tl_gset:Nn\g_ocgxii_print_tl{/Print<>}},
+ printocg / never .code:n={
+ \tl_gset:Nn\g_ocgxii_print_tl{/Print<>}},
+ printocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_print_tl},
+ printocg .default:n={ifvisible},
+
+ exportocg .choice:,
+ exportocg / always .code:n={
+ \tl_gset:Nn\g_ocgxii_export_tl{/Export<>}},
+ exportocg / never .code:n={
+ \tl_gset:Nn\g_ocgxii_export_tl{/Export<>}},
+ exportocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_export_tl},
+ exportocg .default:n={ifvisible},
+
+ listintoolbar .choices:nn = {always,never,iffirstuse}{
+ \tl_gset:Nx\g_ocgxii_listno_tl{\int_eval:n{\l_keys_choice_int-\c_one}}
+ },
+ listintoolbar .default:n={iffirstuse},
+
+ showingui .meta:n = {listintoolbar=#1},
+ showingui .default:n={iffirstuse},
+
+ tikz .bool_set:N = \l_ocgxii_tikz_bool,
+ tikz .default:n = true,
+
+ ocgcolorlinks .bool_set:N = \l_ocgxii_ocgcolorlinks_bool,
+ ocgcolorlinks .default:n = true,
+
+ unknown .code:n = {
+ \msg_error:nnx{ocgx2}{unknown~package~option}{\l_keys_key_tl}
}
}
-\ProvidesExplPackage{ocgx2}{2015/07/20}{0.7}
-{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
+%package options preset
+\keys_set:nn{ocgx2}{viewocg,printocg,exportocg,showingui,tikz=false}
+
+%process package options
+\ProcessKeysOptions{ocgx2}
+\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
+
+\RequirePackage{ocgbase} %also loads pdfbase.sty
+\msg_set:nnnn{ocgx2}{support~outdated}{
+ Support~package~`#1'~too~old.
+}{
+ Get~an~up~to~date~version~of~`#1'.\\
+ Aborting.
+}
+\@ifpackagelater{pdfbase}{2016/03/11}{}{
+ \msg_error:nnn{xsavebox}{support~outdated}{pdfbase.sty}
+ \tex_endinput:D
+}
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
- \bool_if:NT\g_ocgxii_nestedB_bool{\tl_gput_right:Nx\@ocgbase@ocgorder{~[}}
+ \ocgxii_beginocg:nnnn{#1}{#2}{#3}{#4}
+}{
+ \ocgxii_endocg:
+}
+
+\cs_new_nopar:Nn\ocgxii_beginocg:nnnn{
+ \bool_if:NT\g_ocgxii_nestedB_bool{
+ \seq_gput_left:Nx\g_ocgxii_nested_seq{
+ \seq_item:Nn\g_ocgxii_ocgstack_seq{\c_one}
+ }
+ \ocgbase_add_to_order_list:n{[}
+ }
\bool_gset_true:N\g_ocgxii_nestedB_bool
\bool_gset_false:N\g_ocgxii_nestedE_bool
\group_begin:
\ocgxii_reset_cmd_opts: % ... to the user-set package options
\tl_if_exist:cTF{ocgxii@#3}{ %re-open existing layer
\tl_set:Nx\l_tempa_tl{\tl_use:c{ocgxii@#3.opts},#1}
- \keys_set:nV{ocgxii/user}\l_tempa_tl
- \int_compare:nT{\l_ocgxii_listno_tl=\c_zero}{
- \tl_gput_right:Nx\@ocgbase@ocgorder{~\tl_use:c{ocgxii@#3}}
+ \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl} %new options appended
+ \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \int_compare:nTF{\l_ocgxii_listno_tl=\c_zero}{
+ \ocgbase_add_to_order_list:n{\tl_use:c{ocgxii@#3}}
+ }{
+ \bool_gset_false:N\g_ocgxii_nestedB_bool
}
- }{
- \tl_gset:cn{ocgxii@#3.opts}{#1}
- \keys_set:nn{ocgxii/user}{#1}
- \mix_pdfobj:nnn{}{dict}{
- /Type/OCG/Name~(#2)/Usage<<
- \l_ocgxii_view_tl\l_ocgxii_print_tl\l_ocgxii_export_tl>>
+ \bool_if:nTF{ %initial visibility
+ \str_if_eq_x_p:nn{#4}{1} ||
+ \str_if_eq_x_p:nn{#4}{on} ||
+ \str_if_eq_x_p:nn{#4}{true}
+ }{
+ \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii@#3}}
+ }{
+ \ocgbase_add_to_off_list:n{\tl_use:c{ocgxii@#3}}
}
- \tl_gput_right:Nx\@ocgbase@ocgs{\space\g_mix_pdflastobj_tl}
- \int_compare:nT{#4==\c_zero}{
- \tl_gput_right:Nx\@ocgbase@offocgs{\space\g_mix_pdflastobj_tl}
+ }{
+ \tl_set:Nx\l_tempa_tl{#1}
+ \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl}
+ \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \ocgbase_new_ocg:nnn{#2}{
+ \l_ocgxii_view_tl\l_ocgxii_print_tl\l_ocgxii_export_tl
+ }{#4}
+ \tl_gset:cx{ocgxii@#3}{\ocgbase_last_ocg:}
+ \int_compare:nTF{\l_ocgxii_listno_tl=\c_one}{
+ \bool_gset_false:N\g_ocgxii_nestedB_bool
+ }{
+ \ocgbase_add_to_order_list:n{\ocgbase_last_ocg:}
}
- \tl_gset:cx{ocgxii@#3}{\g_mix_pdflastobj_tl}
- \int_compare:nF{\l_ocgxii_listno_tl=\c_one}{
- \tl_gput_right:Nx\@ocgbase@ocgorder{~\g_mix_pdflastobj_tl}
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.#3}{\ocgbase_last_ocg:}
}
- \iow_now:Nx\@auxout{
- \token_to_str:N\expandafter\xdef\token_to_str:N\csname
- \space OCGpdfobj#3\endcsname{\g_mix_pdflastobj_tl}
+ }
+ \seq_map_inline:Nn\l_ocgxii_rbgrps_seq{% process list of radio btn groups
+ \ocgbase_add_ocg_to_radiobtn_grp:nnn{##1}{\tl_use:c{ocgxii@#3}}{
+ \int_compare:nTF{\l_ocgxii_listno_tl=\c_one}{false}{true}
}
}
\bool_if:nT{
-% !\cs_if_exist_p:c{OCGpdfobj#3} || %lazy evaluation may cease to work
-% !\str_if_eq_x_p:nn{\use:c{OCGpdfobj#3}}{\tl_use:c{ocgxii@#3}}
- !\cs_if_exist:cTF{OCGpdfobj#3}{
- \str_if_eq_x_p:nn{\tl_use:c{OCGpdfobj#3}}{\tl_use:c{ocgxii@#3}}
+ !\cs_if_exist:cTF{ocgx2.ocg.#3}{
+ \str_if_eq_x_p:nn{\tl_use:c{ocgx2.ocg.#3}}{\tl_use:c{ocgxii@#3}}
}{
\c_false_bool
}
}{
- \cs_if_exist:NF\g_ocgxii_rerunwarned_tl{
+ \tl_if_exist:NF\g_ocgxii_rerunwarned_tl{
\tl_new:N\g_ocgxii_rerunwarned_tl
\AtEndDocument{\msg_warning:nn{ocgx2}{rerun}}
}
}
- \tl_gset:cx{OCGpdfobj#3}{\tl_use:c{ocgxii@#3}}
- \seq_gput_left:Nx\g_fixocg_ocgstack_seq{\tl_use:c{ocgxii@#3}}
+ \tl_gset:cx{ocgx2.ocg.#3}{\tl_use:c{ocgxii@#3}}
+ \seq_gput_left:Nx\g_ocgxii_ocgstack_seq{\tl_use:c{ocgxii@#3}}
+ \ocgxii_ocgstack_shipout:N\g_ocgxii_ocgstack_seq
\group_end:
- \mix_pdfbdc:nn{/OC}{\tl_use:c{ocgxii@#3}}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii@#3}}
\ignorespaces
-}{
+}
+
+\cs_new_nopar:Nn\ocgxii_endocg:{
\unskip
- \mix_pdfemc:
- \seq_gpop_left:NN\g_fixocg_ocgstack_seq\l_tempa_tl
- \bool_if:NT\g_ocgxii_nestedE_bool{\tl_gput_right:Nx\@ocgbase@ocgorder{~]}}
- \bool_gset_true:N\g_ocgxii_nestedE_bool
+ \ocgbase_oc_emc:
+ \bool_if:nT{
+ \g_ocgxii_nestedE_bool &&
+ \str_if_eq_x_p:nn{
+ \seq_item:Nn\g_ocgxii_nested_seq{\c_one}
+ }{
+ \seq_item:Nn\g_ocgxii_ocgstack_seq{\c_one}
+ }
+ }{
+ \ocgbase_add_to_order_list:n{]}
+ \seq_gpop_left:NN\g_ocgxii_nested_seq\l_trash_tl
+ }
+ \seq_gpop_left:NN\g_ocgxii_ocgstack_seq\l_trash_tl
+ \ocgxii_ocgstack_shipout:N\g_ocgxii_ocgstack_seq
\bool_gset_false:N\g_ocgxii_nestedB_bool
+ \bool_gset_true:N\g_ocgxii_nestedE_bool
}
+
\bool_new:N\g_ocgxii_nestedB_bool % nested OCG begin
\bool_new:N\g_ocgxii_nestedE_bool % nested OCG end
+\seq_new:N\g_ocgxii_nested_seq % for keeping track of parent OCGs
+
+\cs_new_nopar:Nn\ocgxii_ocgstack_shipout:N{
+ \iow_shipout_x:Nx\@mainaux{
+ \token_to_str:N\ocgxii@stack@on@page{
+ \exp_not:N\int_use:N\g_ocgxii_page_int
+ }{\seq_use:Nn#1{,}}
+ }
+}
+\cs_new_nopar:Npn\ocgxii@stack@on@page#1#2{
+ \seq_gset_from_clist:cn{g_pending_ocgs_on_#1_seq}{#2}
+ %re-add braces around items for dvips
+ \bool_if:nT{\sys_if_output_dvi_p: && !\g_ocgxii_dvipdfmx_bool}{
+ \seq_map_inline:cn{g_pending_ocgs_on_#1_seq}{
+ \seq_gpop_left:cN{g_pending_ocgs_on_#1_seq}\l_trash_tl
+ \seq_gput_right:cn{g_pending_ocgs_on_#1_seq}{{##1}}
+ }
+ }
+}
+\ocgxii@stack@on@page{0}{} %initialize
+
+%end-of-page action in output routine
+\cs_new_nopar:Nn\ocgxii_at_end_page:{
+ %check whether end-of-page ocg stack has settled
+ \iow_shipout:Nx\@mainaux{
+ \token_to_str:N\ocgxii@newkey{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}{
+ \seq_use:cn{g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
+ }
+ }
+ \bool_if:nT{
+ !\cs_if_exist:cTF{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}{
+ \str_if_eq_x_p:nn{
+ \tl_use:c{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}
+ }{
+ \seq_use:cn{g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
+ }
+ }{
+ \c_false_bool
+ }
+ }{
+ \tl_if_exist:NF\g_ocgxii_rerunwarned_tl{
+ \tl_new:N\g_ocgxii_rerunwarned_tl
+ \AtEndDocument{\msg_warning:nn{ocgx2}{rerun}}
+ }
+ }
+ %now close pending ocgs
+ \seq_map_variable:cNn{
+ g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq
+ }\l_ocgxii_arg_tl{
+ \ocgbase_oc_emc:
+ }
+}
+
+%begin-of-page action in output routine
+\cs_new_nopar:Nn\ocgxii_at_begin_page:{
+ % re-open pending ocgs
+ \seq_set_eq:Nc\l_ocgxii_temp_seq{
+ g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq
+ }
+ \seq_reverse:N\l_ocgxii_temp_seq
+ \seq_map_variable:NNn\l_ocgxii_temp_seq\l_ocgxii_arg_tl{
+ \ocgbase_oc_bdc:n{\l_ocgxii_arg_tl}
+ }
+ \int_gincr:N\g_ocgxii_page_int
+ % copy pending ocg stack from previous page, if it has not been initialized
+ % yet from aux file
+ \seq_if_exist:cF{g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq}{
+ \seq_gset_eq:cc{
+ g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq
+ }{
+ g_pending_ocgs_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq
+ }
+ }
+}
+\int_new:N\g_ocgxii_page_int %abs. page counter
+
+%modify output routine to manage ocgs spanning multiple pages
+\cs_set_eq:NN\ocgxii_outputpage_orig:\@outputpage
+\cs_set_nopar:Npn\@outputpage{
+ \vbox_set:Nn\@outputbox{
+ \ocgxii_at_begin_page:
+ \box_use_clear:N\@outputbox
+ \ocgxii_at_end_page:
+ }
+ \ocgxii_outputpage_orig:
+}
%stack of PDF obj references of currently open OCGs
-\seq_new:N\g_fixocg_ocgstack_seq
+\seq_new:N\g_ocgxii_ocgstack_seq
+
%macro that inserts /OC <<OCMD with currently open OCGs>> entry;
%for use within annotation dicts
-\tl_set:Nn\ocgxii@insert@OC{
- \seq_if_empty:NF\g_fixocg_ocgstack_seq{
- /OC~<>
+\cs_new_nopar:Npn\ocgxii@insert@OC{
+ \seq_if_empty:NF\g_ocgxii_ocgstack_seq{
+ /OC~<>
}
}
-%re-implement commands from ocgx.sty (all engines including ps2pdf [gs>=9.15])
-\DeclareDocumentCommand\switchocg{m +m}{
- \tl_set:Nn\l_ocgxii_ocglist_tl{}
- \tl_set:Nx\l_ocglistarg_tl{#1}\tl_trim_spaces:N\l_ocglistarg_tl
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
- \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_ocglist_tl\l_tempa_tl
- }
- \leavevmode
- \ocgxii_pdflink:nn{
- /Subtype/Link\ocgxii@insert@OC
- /A <>
- /Border [0~0~0]
- }{#2}
+\cs_new_nopar:Nn\ocgxii_ocglist_reset:{
+ \tl_clear_new:N\l_ocgxii_u_list_tl
+ \tl_clear_new:N\l_ocgxii_d_list_tl
+ \tl_clear_new:N\l_ocgxii_e_list_tl
+ \tl_clear_new:N\l_ocgxii_x_list_tl
}
-\DeclareDocumentCommand\showocg{m +m}{
- \tl_set:Nn\l_ocgxii_ocglist_tl{}
- \tl_set:Nx\l_ocglistarg_tl{#1}\tl_trim_spaces:N\l_ocglistarg_tl
+\cs_new_nopar:Nn\ocgxii_ocglist_build:Nn{
+ \tl_set:Nx\l_ocglistarg_tl{#2}\tl_trim_spaces:N\l_ocglistarg_tl
\seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
\seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_ocglist_tl\l_tempa_tl
+ \ocgxii_process_ocgref:NN#1\l_tempa_tl
}
- \leavevmode
- \ocgxii_pdflink:nn{
- /Subtype/Link\ocgxii@insert@OC
- /A <>
- /Border [0~0~0]
- }{#2}
}
-\DeclareDocumentCommand\hideocg{m +m}{
- \tl_set:Nn\l_ocgxii_ocglist_tl{}
- \tl_set:Nx\l_ocglistarg_tl{#1}\tl_trim_spaces:N\l_ocglistarg_tl
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
- \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_ocglist_tl\l_tempa_tl
+\cs_new:Nn\ocgxii_commalist_process:n{
+ \seq_set_split:Nnn\l_tmpa_seq{,}{#1}
+ \ocgxii_ocglist_build:Nn\l_ocgxii_e_list_tl{\seq_item:Nn\l_tmpa_seq{1}}
+ \ocgxii_ocglist_build:Nn\l_ocgxii_x_list_tl{\seq_item:Nn\l_tmpa_seq{2}}
+ \ocgxii_ocglist_build:Nn\l_ocgxii_d_list_tl{\seq_item:Nn\l_tmpa_seq{3}}
+ \ocgxii_ocglist_build:Nn\l_ocgxii_u_list_tl{\seq_item:Nn\l_tmpa_seq{4}}
+}
+
+\cs_new_nopar:Nn\ocgxii_ocglist_process_idlist:nn{
+ \ocgxii_ocglist_reset:
+ \tl_set:Nx\l_ocgxii_opt_tl{#1}\tl_remove_all:Nn\l_ocgxii_opt_tl{~}
+ \str_case_x:nnF{\l_ocgxii_opt_tl}{
+ {triggerocg=onmouseup}{
+ \ocgxii_ocglist_build:Nn\l_ocgxii_u_list_tl{#2}
+ }
+ {triggerocg=onmousedown}{
+ \ocgxii_ocglist_build:Nn\l_ocgxii_d_list_tl{#2}
+ }
+ {triggerocg=onmouseenter}{
+ \ocgxii_ocglist_build:Nn\l_ocgxii_e_list_tl{#2}
+ }
+ {triggerocg=onmouseexit}{
+ \ocgxii_ocglist_build:Nn\l_ocgxii_x_list_tl{#2}
+ }
+ {triggerocg=allactions}{
+ \ocgxii_commalist_process:n{#2}
+ }
+ }{
+ \msg_error:nnx{ocgx2}{unknown~option}{\l_ocgxii_opt_tl}
}
- \leavevmode
- \ocgxii_pdflink:nn{
- /Subtype/Link\ocgxii@insert@OC
- /A <>
- /Border [0~0~0]
- }{#2}
}
-\DeclareDocumentCommand\actionsocg{m m m +m}{
- \tl_set:Nx\l_ocglistarg_tl{#1}\tl_trim_spaces:N\l_ocglistarg_tl
- \tl_set:Nn\l_ocgxii_toswitch_tl{}
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
- \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_toswitch_tl\l_tempa_tl
+\int_new:N\g_ocgxii_widcount_int% widget counter
+
+%re-implement commands from ocg-p.sty / ocgx.sty (all engines including
+%ps2pdf [gs>=9.15])
+\DeclareDocumentCommand\switchocg{o m +m}{
+ \leavevmode
+ \IfNoValueTF{#1}{
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Link\ocgxii@insert@OC
+ /A <>
+ /Border [0~0~0]
+ }{#3}
+ }{
+ \ocgxii_ocglist_process_idlist:nn{#1}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Widget/Ff~65536/FT/Btn/H/I
+ /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
+ \ocgxii@insert@OC
+ /AA <<
+ \str_if_eq:VnF\l_ocgxii_u_list_tl{}{
+ /U <>
+ }
+ \str_if_eq:VnF\l_ocgxii_d_list_tl{}{
+ /D <>
+ }
+ \str_if_eq:VnF\l_ocgxii_e_list_tl{}{
+ /E <>
+ }
+ \str_if_eq:VnF\l_ocgxii_x_list_tl{}{
+ /X <>
+ }
+ >>
+ }{\mbox{#3}} %Widget annots should not be broken across lines
+ \pbs_appendtofields:n{\pbs_pdflastann:}
+ \int_gincr:N\g_ocgxii_widcount_int
}
- \tl_set:Nx\l_ocglistarg_tl{#2}\tl_trim_spaces:N\l_ocglistarg_tl
- \tl_set:Nn\l_ocgxii_toshow_tl{}
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
- \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_toshow_tl\l_tempa_tl
+}
+
+\DeclareDocumentCommand\showocg{o m +m}{
+ \leavevmode
+ \IfNoValueTF{#1}{
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Link\ocgxii@insert@OC
+ /A <>
+ /Border [0~0~0]
+ }{#3}
+ }{
+ \ocgxii_ocglist_process_idlist:nn{#1}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Widget/Ff~65536/FT/Btn/H/I
+ /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
+ \ocgxii@insert@OC
+ /AA <<
+ \str_if_eq:VnF\l_ocgxii_u_list_tl{}{
+ /U <>
+ }
+ \str_if_eq:VnF\l_ocgxii_d_list_tl{}{
+ /D <>
+ }
+ \str_if_eq:VnF\l_ocgxii_e_list_tl{}{
+ /E <>
+ }
+ \str_if_eq:VnF\l_ocgxii_x_list_tl{}{
+ /X <>
+ }
+ >>
+ }{\mbox{#3}} %Widget annots should not be broken across lines
+ \pbs_appendtofields:n{\pbs_pdflastann:}
+ \int_gincr:N\g_ocgxii_widcount_int
}
- \tl_set:Nx\l_ocglistarg_tl{#3}\tl_trim_spaces:N\l_ocglistarg_tl
- \tl_set:Nn\l_ocgxii_tohide_tl{}
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
- \seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
- \ocgxii_process_ocgref:NN\l_ocgxii_tohide_tl\l_tempa_tl
+}
+
+\DeclareDocumentCommand\hideocg{o m +m}{
+ \leavevmode
+ \IfNoValueTF{#1}{
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Link\ocgxii@insert@OC
+ /A <>
+ /Border [0~0~0]
+ }{#3}
+ }{
+ \ocgxii_ocglist_process_idlist:nn{#1}{#2}
+ \ocgxii_pdflink:nn{
+ /Subtype/Widget/Ff~65536/FT/Btn/H/I
+ /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
+ \ocgxii@insert@OC
+ /AA <<
+ \str_if_eq:VnF\l_ocgxii_u_list_tl{}{
+ /U <>
+ }
+ \str_if_eq:VnF\l_ocgxii_d_list_tl{}{
+ /D <>
+ }
+ \str_if_eq:VnF\l_ocgxii_e_list_tl{}{
+ /E <>
+ }
+ \str_if_eq:VnF\l_ocgxii_x_list_tl{}{
+ /X <>
+ }
+ >>
+ }{\mbox{#3}} %Widget annots should not be broken across lines
+ \pbs_appendtofields:n{\pbs_pdflastann:}
+ \int_gincr:N\g_ocgxii_widcount_int
}
+}
+
+\DeclareDocumentCommand\actionsocg{o m m m +m}{
\leavevmode
- \ocgxii_pdflink:nn{
- /Subtype/Link\ocgxii@insert@OC
- /A <>
- /Border [0~0~0]
- }{#4}
+ \IfNoValueTF{#1}{
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#2}
+ \tl_set_eq:NN\l_ocgxii_toswitch_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#3}
+ \tl_set_eq:NN\l_ocgxii_toshow_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#4}
+ \tl_set_eq:NN\l_ocgxii_tohide_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_pdflink:nn{
+ /Subtype/Link\ocgxii@insert@OC
+ /A <>
+ /Border [0~0~0]
+ }{#5}
+ }{
+ \ocgxii_ocglist_process_idlist:nn{#1}{#2}
+ \tl_set_eq:NN\l_ocgxii_toswitch_e_tl\l_ocgxii_e_list_tl
+ \tl_set_eq:NN\l_ocgxii_toswitch_x_tl\l_ocgxii_x_list_tl
+ \tl_set_eq:NN\l_ocgxii_toswitch_d_tl\l_ocgxii_d_list_tl
+ \tl_set_eq:NN\l_ocgxii_toswitch_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_ocglist_process_idlist:nn{#1}{#3}
+ \tl_set_eq:NN\l_ocgxii_toshow_e_tl\l_ocgxii_e_list_tl
+ \tl_set_eq:NN\l_ocgxii_toshow_x_tl\l_ocgxii_x_list_tl
+ \tl_set_eq:NN\l_ocgxii_toshow_d_tl\l_ocgxii_d_list_tl
+ \tl_set_eq:NN\l_ocgxii_toshow_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_ocglist_process_idlist:nn{#1}{#4}
+ \tl_set_eq:NN\l_ocgxii_tohide_e_tl\l_ocgxii_e_list_tl
+ \tl_set_eq:NN\l_ocgxii_tohide_x_tl\l_ocgxii_x_list_tl
+ \tl_set_eq:NN\l_ocgxii_tohide_d_tl\l_ocgxii_d_list_tl
+ \tl_set_eq:NN\l_ocgxii_tohide_u_tl\l_ocgxii_u_list_tl
+ \ocgxii_pdflink:nn{
+ /Subtype/Widget/Ff~65536/FT/Btn/H/I
+ /T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
+ \ocgxii@insert@OC
+ /AA <<
+ \str_if_eq_x:nnF{}{
+ \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
+ }{
+ /U <>
+ }
+ \str_if_eq_x:nnF{}{
+ \l_ocgxii_toswitch_d_tl\l_ocgxii_toshow_d_tl\l_ocgxii_tohide_d_tl
+ }{
+ /D <>
+ }
+ \str_if_eq_x:nnF{}{
+ \l_ocgxii_toswitch_e_tl\l_ocgxii_toshow_e_tl\l_ocgxii_tohide_e_tl
+ }{
+ /E <>
+ }
+ \str_if_eq_x:nnF{}{
+ \l_ocgxii_toswitch_x_tl\l_ocgxii_toshow_x_tl\l_ocgxii_tohide_x_tl
+ }{
+ /X <>
+ }
+ >>
+ }{\mbox{#5}} %Widget annots should not be broken across lines
+ \pbs_appendtofields:n{\pbs_pdflastann:}
+ \int_gincr:N\g_ocgxii_widcount_int
+ }
}
% mimic commands from ocg-p
@@ -213,9 +600,11 @@
\cs_new:Nn\ocgxii_process_ocgref:NN{
\str_if_eq_x:nnF{#2}{}{
- \tl_if_exist:cTF{OCGpdfobj#2}{\tl_put_right:Nx#1{~\tl_use:c{OCGpdfobj#2}}}{
+ \tl_if_exist:cTF{ocgx2.ocg.#2}{
+ \tl_put_right:Nx#1{~\tl_use:c{ocgx2.ocg.#2}}
+ }{
\msg_warning:nnx{ocgx2}{undefined~OCG}{#2}
- \cs_if_exist:NF\g_ocgxii_refundefwarned_tl{
+ \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
\tl_new:N\g_ocgxii_refundefwarned_tl
\AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
}
@@ -223,47 +612,8 @@
}
}
-%package opts
-\keys_define:nn{ocgxii}{
- viewocg .choice:,
- viewocg / always .code:n={
- \tl_gset:Nn\g_ocgxii_view_tl{/View<>}},
- viewocg / never .code:n={
- \tl_gset:Nn\g_ocgxii_view_tl{/View<>}},
- viewocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_view_tl},
- viewocg .default:n={ifvisible},
-
- printocg .choice:,
- printocg / always .code:n={
- \tl_gset:Nn\g_ocgxii_print_tl{/Print<>}},
- printocg / never .code:n={
- \tl_gset:Nn\g_ocgxii_print_tl{/Print<>}},
- printocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_print_tl},
- printocg .default:n={ifvisible},
-
- exportocg .choice:,
- exportocg / always .code:n={
- \tl_gset:Nn\g_ocgxii_export_tl{/Export<>}},
- exportocg / never .code:n={
- \tl_gset:Nn\g_ocgxii_export_tl{/Export<>}},
- exportocg / ifvisible .code:n={\tl_gclear_new:N\g_ocgxii_export_tl},
- exportocg .default:n={ifvisible},
-
- listintoolbar .choices:nn = {always,never,iffirstuse}{
- \tl_gset:Nx\g_ocgxii_listno_tl{\int_eval:n{\l_keys_choice_int-\c_one}}
- },
- listintoolbar .default:n={iffirstuse},
-
- tikz .bool_set:N = \l_ocgxii_tikz_bool,
- tikz .default:n = true
-}
-
-%package options preset
-\keys_set:nn{ocgxii}{viewocg,printocg,exportocg,listintoolbar,tikz=false}
-\ProcessKeysOptions{ocgxii} %process package options
-
%command opts
-\keys_define:nn{ocgxii/user}{
+\keys_define:nn{ocgx2/user}{
viewocg .choice:,
viewocg / always .code:n={
\tl_set:Nn\l_ocgxii_view_tl{/View<>}},
@@ -293,7 +643,15 @@
listintoolbar .choices:nn = {always,never,iffirstuse}{
\tl_set:Nx\l_ocgxii_listno_tl{\int_eval:n{\l_keys_choice_int-\c_one}}
},
- listintoolbar .default:n={iffirstuse}
+ listintoolbar .default:n={iffirstuse},
+
+ showingui .meta:n = {listintoolbar=#1},
+ showingui .default:n={iffirstuse},
+
+ radiobtngrp .code:n = {
+ \seq_put_right:Nx\l_ocgxii_rbgrps_seq{#1}
+ },
+ radiobtngrp .value_required:n = {true}
}
\cs_new:Nn\ocgxii_reset_cmd_opts:{
@@ -301,35 +659,8 @@
\tl_set_eq:NN\l_ocgxii_print_tl\g_ocgxii_print_tl
\tl_set_eq:NN\l_ocgxii_export_tl\g_ocgxii_export_tl
\tl_set_eq:NN\l_ocgxii_listno_tl\g_ocgxii_listno_tl
-}
-
-\group_begin:
-\char_set_catcode_active:N\+\let+\space
-\tl_gset:Nx\g_ocgxii_gsoldwarning_tl{
- {product~(Ghostscript)~search~{pop~pop~pop~true}{pop~false}ifelse~
- revision~915~lt~and~{
- (\token_to_str:N\n
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\token_to_str:N\n
- @@++++++++++++Warning:+Ghostscript+too+old!++++++++++++++@@\token_to_str:N\n
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\token_to_str:N\n
- @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n
- @@+Package+`ocgx2'+requires+Ghostscript+version+>=+9.15.+@@\token_to_str:N\n
- @@+Otherwise,+PDF+layers+will+not+work.++++++++++++++++++@@\token_to_str:N\n
- @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n
- @@+Get+current+version+from++++++++++++++++++++++++++++++@@\token_to_str:N\n
- @@+http://www.ghostscript.com/download+++++++++++++++++++@@\token_to_str:N\n
- @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\token_to_str:N\n)
- print}~if}~?pdfmark
-}
-\group_end:
-
-\AtBeginDocument{
- \ifpdf\else
- \bool_if:NF\g_mix_dvipdfmx_bool{
- \AtEndDvi{\special{ps::[nobreak]\g_ocgxii_gsoldwarning_tl}}
- }
- \fi
+ %stack of radio button group names the current ocg belongs to
+ \seq_clear_new:N\l_ocgxii_rbgrps_seq
}
\msg_set:nnn{ocgx2}{rerun}{Rerun~to~get~OCG~references~right!}
@@ -337,25 +668,89 @@
Line~\msg_line_number: :~OCG~`#1'~is~not~defined.
}
\msg_set:nnn{ocgx2}{undefined~OCGs}{There~were~undefined~OCGs!}
+\msg_set:nnn{ocgx2}{unknown~option}{
+ Line~\msg_line_number: :~unknown~option~`#1'.
+}
% dvipdfmx and xelatex workaround for ocg buttons within `tikzpicture' context
-\cs_set:Nn\ocgxii_pdflink:nn{
+\cs_new:Nn\ocgxii_pdflink:nn{
\bool_if:nTF{
- \g_mix_dvipdfmx_bool && \cs_if_exist_p:N\pgfpictureid
+ \g_ocgxii_dvipdfmx_bool && \cs_if_exist_p:N\pgfpictureid
}{
\hbox_set:Nn\l_tmpa_box{#2}
- \mix_pdfannot:nnnn{
+ \pbs_pdfannot:nnnn{
\dim_use:N\box_wd:N\l_tmpa_box}{
\dim_use:N\box_ht:N\l_tmpa_box}{
\dim_use:N\box_dp:N\l_tmpa_box
}{#1}
\box_use_clear:N\l_tmpa_box
}{
- \mix_pdflink:nn{#1}{#2}
+ \pbs_pdflink:nn{#1}{#2}
+ }
+}
+
+\cs_gset_eq:NN\ocgxii_atenddvi_checkimpl_orig:\AtEndDvi@CheckImpl%
+\def\AtEndDvi@CheckImpl{
+ \ocgxii_atenddvi_checkimpl_orig:
+ \cs_if_exist:NTF\AtEndDvi@LastPage{
+ \int_compare:nF{\AtEndDvi@LastPage=\value{abspage}}{
+ \cs_if_exist:NF\g_ocgxii_rerunwarned_tl{
+ \tl_new:N\g_ocgxii_rerunwarned_tl
+ \msg_warning:nn{ocgx2}{rerun}
+ }
+ }
+ }{
+ \cs_if_exist:NF\g_ocgxii_rerunwarned_tl{
+ \tl_new:N\g_ocgxii_rerunwarned_tl
+ \msg_warning:nn{ocgx2}{rerun}
+ }
+ }
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% patch hyperref to ensure compatibility with our `ocgcolorlinks' option
+% similar to http://tex.stackexchange.com/a/104227;
+% add `ocgcolorlinks' support to all drivers
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\cs_new_nopar:Nn\ocgxii_enable_ocglinks:{
+ \def\Hy@colorlink##1{
+ \begingroup
+ \def\Hy@ocgcolor{##1}
+ \setbox0=\hbox\bgroup\color@begingroup\let\color@setgroup\begingroup
+ }
+ \def\Hy@endcolorlink{
+ \color@endgroup\egroup
+ \mbox{
+ \ocgbase@oc@bdc{\OBJ@OCG@print}
+ \rlap{\copy0}
+ \ocgbase@oc@emc\ocgbase@oc@bdc{\OBJ@OCG@view}
+ \begingroup
+ \expandafter\HyColor@UseColor\Hy@ocgcolor
+ \box0
+ \endgroup
+ \ocgbase@oc@emc
+ }
+ \endgroup
+ }
+}
+
+\RequirePackage{scrlfile}
+\bool_if:NT\l_ocgxii_ocgcolorlinks_bool{
+ \PassOptionsToPackage{colorlinks}{hyperref}
+ \AfterPackage*{hyperref}{
+ \Hy@colorlinkstrue
+ \Hy@AtBeginDocument{
+ \ocgbase_new_ocg:nnn{OCView}{/Print<>}{on}
+ \tl_gset:Nx\OBJ@OCG@view{\ocgbase_last_ocg:}
+ \ocgbase_new_ocg:nnn{OCPrint}{/Print<>}{off}
+ \tl_gset:Nx\OBJ@OCG@print{\ocgbase_last_ocg:}
+ \ocgxii_enable_ocglinks:
+ }
}
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tikz related code follows (enabled with package option `tikz')
+% tikz related code follows (to be enabled with package option `tikz')
\bool_if:NF\l_ocgxii_tikz_bool{\endinput}
\ExplSyntaxOff
@@ -363,23 +758,30 @@
\usetikzlibrary{calc}
% Copyright notice: The code that follows until the end of the file was
-% copied from Paul Gaborit's `tikzlibraryocgx.code.tex' without modification
+% taken from Paul Gaborit's `tikzlibraryocgx.code.tex' with minor modification.
\tikzset{
ocg/.style={ocg/.cd,#1,/tikz/.cd},
ocg={
% parameters
- name/.store in=\ocgx@name,
- visibity/.store in=\ocgx@visibility,
+ name/.store in=\ocgxii@name,
+ opts/.store in=\ocgxii@opts,
+ visibility/.store in=\ocgxii@visibility,
status/.is choice,
- status/visible/.style={visibity=1},
- status/invisible/.style={visibity=0},
+ status/visible/.style={visibility=1},
+ status/invisible/.style={visibility=0},
+ status/true/.style={visibility=1},
+ status/false/.style={visibility=0},
+ status/on/.style={visibility=1},
+ status/off/.style={visibility=0},
% default values
name=,
+ opts=,
status=visible,
% ref
ref/.style={
- /tikz/execute at begin scope={\ocg{\ocgx@name}{#1}{\ocgx@visibility}},
- /tikz/execute at end scope={\endocg},
+ /tikz/execute at begin scope={%
+ \begin{ocg}[\ocgxii@opts]{\ocgxii@name}{#1}{\ocgxii@visibility}},
+ /tikz/execute at end scope={\end{ocg}},
},
},
switch ocg/.style={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.tlpobj new/tlpkg/tlpobj/ocgx2.tlpobj
--- old/tlpkg/tlpobj/ocgx2.tlpobj 2015-07-21 03:20:56.000000000 +0200
+++ new/tlpkg/tlpobj/ocgx2.tlpobj 2016-04-14 19:31:06.000000000 +0200
@@ -1,21 +1,21 @@
name ocgx2
category Package
-revision 37910
-shortdesc Drop-in replacement for the `ocgx' package; adds support for dvips+ps2pdf, XeLaTeX, dvipdfmx
+revision 40126
+shortdesc Drop-in replacement for the 'ocgx' package; adds support for dvips+ps2pdf, XeLaTeX, dvipdfmx
relocated 1
longdesc This package is a drop-in replacement for the ocgx package by
-longdesc Paul Gaborit It re-implements the functionality of the 'ocg',
-longdesc 'ocgx' and 'ocg-p' packages and adds support for all known
-longdesc engines and back-ends including: LaTeX -> dvips ->
-longdesc ps2pdf/Distiller (Xe)LaTeX(x) -> dvipdfmx PdfLaTeX and LuaLaTeX
-longdesc It also ensures compatibility with the media9 and animate
-longdesc packages.
-runfiles size=5
+longdesc Paul Gaborit. It re-implements the functionality of the ocg,
+longdesc ocgx, and ocg-p packages and adds support for all known engines
+longdesc and back-ends including: LaTeX - dvips - ps2pdf/Distiller
+longdesc (Xe)LaTeX(x) - dvipdfmx PdfLaTeX and LuaLaTeX . It also ensures
+longdesc compatibility with the media9 and animate packages.
+runfiles size=11
RELOC/tex/latex/ocgx2/fixocgx.sty
+ RELOC/tex/latex/ocgx2/ocgbase.sty
RELOC/tex/latex/ocgx2/ocgx2.sty
catalogue-also ocgx ocg-p
catalogue-ctan /macros/latex/contrib/ocgx2
-catalogue-date 2015-07-20 12:42:47 +0200
+catalogue-date 2016-03-22 13:44:20 +0100
catalogue-license lppl1.3
catalogue-topics pdf-feat
-catalogue-version 0.7
+catalogue-version 0.17
++++++ ocherokee.doc.tar.xz ++++++
++++++ ocherokee.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocherokee.tlpobj new/tlpkg/tlpobj/ocherokee.tlpobj
--- old/tlpkg/tlpobj/ocherokee.tlpobj 2015-04-13 02:07:42.000000000 +0200
+++ new/tlpkg/tlpobj/ocherokee.tlpobj 2016-04-14 19:31:06.000000000 +0200
@@ -1,7 +1,7 @@
name ocherokee
category Package
revision 25689
-shortdesc LaTeX Support for the Cherokee language.
+shortdesc LaTeX Support for the Cherokee language
relocated 1
longdesc Macros and Type 1 fonts for Typesetting the Cherokee language
longdesc with the Omega version of LaTeX (known as Lambda).
@@ -33,6 +33,8 @@
RELOC/tex/lambda/ocherokee/lchcmr.fd
RELOC/tex/lambda/ocherokee/lchenc.def
RELOC/tex/lambda/ocherokee/ocherokee.sty
+catalogue-also omega
catalogue-ctan /language/cherokee/ocherokee
-catalogue-date 2012-12-31 10:40:46 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics cherokee omega
++++++ ocr-b-outline.doc.tar.xz ++++++
++++++ ocr-b-outline.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocr-b-outline.tlpobj new/tlpkg/tlpobj/ocr-b-outline.tlpobj
--- old/tlpkg/tlpobj/ocr-b-outline.tlpobj 2015-04-13 02:07:43.000000000 +0200
+++ new/tlpkg/tlpobj/ocr-b-outline.tlpobj 2016-04-14 19:31:07.000000000 +0200
@@ -1,7 +1,7 @@
name ocr-b-outline
category Package
revision 20969
-shortdesc OCR-B fonts in Type 1 and OpenType.
+shortdesc OCR-B fonts in Type 1 and OpenType
relocated 1
longdesc The package contains OCR-B fonts in Type1 and OpenType formats.
longdesc They were generated from the Metafont sources of the OCR-B
@@ -23,5 +23,6 @@
RELOC/fonts/type1/public/ocr-b-outline/ocrb8.pfb
RELOC/fonts/type1/public/ocr-b-outline/ocrb9.pfb
catalogue-ctan /fonts/ocr-b-outline
-catalogue-date 2014-05-17 10:36:54 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics font font-specialist font-type1 font-otf
++++++ ocr-b.doc.tar.xz ++++++
++++++ ocr-b.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocr-b.tlpobj new/tlpkg/tlpobj/ocr-b.tlpobj
--- old/tlpkg/tlpobj/ocr-b.tlpobj 2015-04-13 02:07:43.000000000 +0200
+++ new/tlpkg/tlpobj/ocr-b.tlpobj 2016-04-14 19:31:06.000000000 +0200
@@ -1,7 +1,7 @@
name ocr-b
category Package
revision 20852
-shortdesc Fonts for OCR-B.
+shortdesc Fonts for OCR-B
relocated 1
longdesc Metafont source for OCR-B at several sizes.
runfiles size=28
@@ -26,5 +26,6 @@
RELOC/fonts/tfm/public/ocr-b/ocrb8.tfm
RELOC/fonts/tfm/public/ocr-b/ocrb9.tfm
catalogue-ctan /fonts/ocr-b
-catalogue-date 2014-05-17 10:36:54 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics font font-specialist font-mf
++++++ ocr-latex.doc.tar.xz ++++++
++++++ ocr-latex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocr-latex.tlpobj new/tlpkg/tlpobj/ocr-latex.tlpobj
--- old/tlpkg/tlpobj/ocr-latex.tlpobj 2015-04-13 02:07:44.000000000 +0200
+++ new/tlpkg/tlpobj/ocr-latex.tlpobj 2016-04-14 19:31:07.000000000 +0200
@@ -1,7 +1,7 @@
name ocr-latex
category Package
revision 15878
-shortdesc LaTeX support for ocr fonts.
+shortdesc LaTeX support for ocr fonts
relocated 1
longdesc The package supports use of both ocr-a and ocr-b fonts in LaTeX
longdesc documents.
@@ -15,5 +15,6 @@
RELOC/tex/latex/ocr-latex/ot1ocrbo.fd
RELOC/tex/latex/ocr-latex/ot1ocrbs.fd
catalogue-ctan /macros/latex/contrib/ocr-latex
-catalogue-date 2012-11-14 11:48:39 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics font-supp
++++++ octavo.doc.tar.xz ++++++
++++++ octavo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/octavo.tlpobj new/tlpkg/tlpobj/octavo.tlpobj
--- old/tlpkg/tlpobj/octavo.tlpobj 2015-04-13 02:07:44.000000000 +0200
+++ new/tlpkg/tlpobj/octavo.tlpobj 2016-04-14 19:31:08.000000000 +0200
@@ -1,7 +1,7 @@
name octavo
category Package
revision 15878
-shortdesc Typeset books following classical design and layout.
+shortdesc Typeset books following classical design and layout
relocated 1
longdesc The octavo class is a modification of the standard LaTeX book
longdesc class. Its purpose is to typeset books following classical
@@ -20,6 +20,7 @@
RELOC/tex/latex/octavo/oct12.clo
RELOC/tex/latex/octavo/octavo.cls
catalogue-ctan /macros/latex/contrib/octavo
-catalogue-date 2013-10-30 13:49:16 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics book-pub class
catalogue-version 1.2
++++++ odsfile.doc.tar.xz ++++++
Files old/doc/lualatex/odsfile/odsfile.pdf and new/doc/lualatex/odsfile/odsfile.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/odsfile/odsfile.tex new/doc/lualatex/odsfile/odsfile.tex
--- old/doc/lualatex/odsfile/odsfile.tex 2014-12-13 00:11:23.000000000 +0100
+++ new/doc/lualatex/odsfile/odsfile.tex 2015-09-24 01:36:30.000000000 +0200
@@ -5,7 +5,7 @@
\author{Michal Hoftich (\url{michal.h21@gmail.com})}
\title{The \textsf{odsfile} package:\\
accessing of the \textsf{opendocument spreadsheet} from \LaTeX{}
-documents\thanks{Version 0.4, last revisited 2014-12-11.}
+documents\thanks{Version 0.6, last revisited 2015-09-20.}
}
\usepackage[english]{babel}
\lstloadlanguages{[LaTeX]Tex}
@@ -63,13 +63,22 @@
\begin{description}
\item[file] Filename of file to be loaded. You should specify this only on first use of \cmd{\includespread}.
-\item[sheet] Name of sheet to be loaded. If it's not specified on first use of \cmd{\includespread}, then first sheet from the file is loaded. The sheet remains selected until another use of |sheet|.
+\item[sheet] Name of sheet to be loaded. If it's not specified on first use of
+ \cmd{\includespread}, then first sheet from the file is loaded. The sheet
+ remains selected until another use of |sheet|.
+
\begin{LTXexample}
\begin{tabular}{l l}
\includespread[file=pokus.ods,sheet=List2]
\end{tabular}
\end{LTXexample}
-\item[range] Selects range from table to be inserted. Range is specified in format similar to spreadsheet processors, like |a2:c4|, selecting cells starting at first column, second row and ending and third column, fourth row.
+
+\item[range] Selects range from table to be inserted. Range is specified in
+ format similar to spreadsheet processors, like |a2:c4|, selecting cells
+ starting at first column, second row and ending and third column, fourth row.
+ Other variant of supported ranges are \textit{named ranges}, which can be
+ saved in the |ods file|.
+
\begin{LTXexample}
\begin{tabular}{lll}
\includespread[sheet=List1,range=a2:c4]
@@ -162,8 +171,19 @@
\begin{LTXexample}
\includespread[range=a2:b,rowseparator={,\ },rowtemplate={\textit{-{1}}:-{2}}]
\end{LTXexample}
+
+\item[multicoltemplate]
+supports merged cells. Default template uses left aligned \verb|\multicolumn|
+command
+\begin{LTXexample}
+ \begin{tabular}{lll}
+ \includespread[sheet=Sheet3, multicoltemplate={\multicolumn{-{count}}{r}{-{value}}}]
+ \end{tabular}
+\end{LTXexample}
+
\end{description}
+
\section{Templates}\label{sec:tpl}
If you don't want to specify tabular environment by hand, you can use simple templating mechanism to insert tabular environment by hand.
@@ -339,6 +359,22 @@
\section{Changes}
\begin{description}
+
+\item[v0.6]
+ \begin{itemize}
+ \item Fixed bug in handling of rows with only one cell\footnote{Thanks to Ulrike Fisher}
+ \item Added support for named ranges
+ \item Fixed text:s handling. Beware that using multiple formatting styles
+ in one cell may result in discarding whole cell, or wrong order. This is
+ caused by underlying LuaXML library and it is likely to remain.
+\end{itemize}
+\item[v0.5]
+\begin{itemize}
+ \item Fixed bug: cell attributes weren't saved
+ \item Added support for merged cells
+ \item Added \texttt{multicoltemplate} option
+\end{itemize}
+
\item[v0.4]
\begin{itemize}
\item Fixed bugs in loading sheets without ranges
Files old/doc/lualatex/odsfile/pokus.ods and new/doc/lualatex/odsfile/pokus.ods differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/odsfile.doc.tlpobj new/tlpkg/tlpobj/odsfile.doc.tlpobj
--- old/tlpkg/tlpobj/odsfile.doc.tlpobj 2015-04-13 02:07:44.000000000 +0200
+++ new/tlpkg/tlpobj/odsfile.doc.tlpobj 2016-04-14 19:31:08.000000000 +0200
@@ -1,9 +1,9 @@
name odsfile.doc
category Package
-revision 35808
+revision 38449
shortdesc doc files of odsfile
relocated 1
-docfiles size=69
+docfiles size=71
RELOC/doc/lualatex/odsfile/README
RELOC/doc/lualatex/odsfile/odsfile.pdf
RELOC/doc/lualatex/odsfile/odsfile.tex
++++++ odsfile.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/odsfile/odsfile.lua new/tex/lualatex/odsfile/odsfile.lua
--- old/tex/lualatex/odsfile/odsfile.lua 2014-12-13 00:11:23.000000000 +0100
+++ new/tex/lualatex/odsfile/odsfile.lua 2015-09-24 01:36:30.000000000 +0200
@@ -1,8 +1,9 @@
module(...,package.seeall)
require "zip"
-xmlparser = require ("luaxml-mod-xml")
-handler = require("luaxml-mod-handler")
+local xmlparser = require ("luaxml-mod-xml")
+local handler = require("luaxml-mod-handler")
+local namedRanges = {}
function load(filename)
local p = {
@@ -36,6 +37,9 @@
row = {}
row["_attr"] = r["_attr"]
local cc = r["table:table-cell"] or {}
+ if #cc == 0 then
+ cc = {cc}
+ end
local columns = {}
--for j = 1, #cc do
@@ -65,6 +69,7 @@
function getTable0(x,table_name)
local tables = x.root["office:document-content"]["office:body"]["office:spreadsheet"]["table:table"]
+ namedRanges = loadNameRanges(x, table_name)
if #tables > 1 then
if type(tables) == "table" and table_name ~= nil then
for k,v in pairs(tables) do
@@ -93,6 +98,32 @@
return x
end
+function loadNameRanges(root, tblname)
+ local tblname = tblname or ""
+ local t = {}
+ local ranges = root.root["office:document-content"]["office:body"]["office:spreadsheet"]["table:named-expressions"]
+ if not ranges then return {} end
+ ranges = ranges["table:named-range"] or {}
+ if #ranges == 0 then
+ ranges = {ranges}
+ end
+ for _,r in ipairs(ranges) do
+ local a = r["_attr"] or {}
+ local range = a["table:cell-range-address"] or ""
+ local name = a["table:name"]
+ if name and range:match("^"..tblname) then
+ range = range:gsub("^[^%.]*",""):gsub("[%$%.]","")
+ print("named range", name, range)
+ t[name] = range
+ end
+ end
+ return t
+end
+
+
+
+
+
function tableValues(tbl,x1,y1,x2,y2)
local t= {}
local x1 = x1 or 1
@@ -106,8 +137,9 @@
if #v["table:table-cell"] > 1 then
local r = table_slice(v["table:table-cell"],x1,x2)
for p,n in pairs(r) do
+ local attr = n["_attr"]
local cellValue = n["text:p"] or ""
- table.insert(j,{value=cellValue,attr=att})
+ table.insert(j,{value=cellValue,attr=attr})
end
else
local p = {value=v["table:table-cell"]["text:p"],attr=v["table:table-cell"]["_attr"]}
@@ -120,6 +152,7 @@
end
function getRange(range)
+ local range = namedRanges[range] or range
local r = range:lower()
local function getNumber(s)
if s == "" or s == nil then return nil end
@@ -179,7 +212,6 @@
return string.gsub(s, "([#%%$&])", "\\%1")
end
-
function get_cell(val, delim)
local val = val or ""
local typ = type(val)
@@ -191,7 +223,8 @@
elseif val["text:span"] then
return get_cell(val["text:span"], delim)
elseif val["text:s"] then
- return get_cell(val["text:s"], delim)
+ -- return get_cell(val["text:s"], delim)
+ return table.concat(val, " ")
else
local t = {}
for _,v in ipairs(val) do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/odsfile/odsfile.sty new/tex/lualatex/odsfile/odsfile.sty
--- old/tex/lualatex/odsfile/odsfile.sty 2014-12-13 00:11:23.000000000 +0100
+++ new/tex/lualatex/odsfile/odsfile.sty 2015-09-24 01:36:30.000000000 +0200
@@ -3,14 +3,15 @@
%keyval keys
-\define@key{includespread}{file}{\loadodsfile{#1}}
-\define@key{includespread}{sheet}{\luaexec{sheetname = "\luatexluaescapestring{#1}"}}
+\define@key{includespread}{file}{\loadodsfile{#1}}%
+\define@key{includespread}{sheet}{\luaexec{sheetname = "\luatexluaescapestring{#1}"}}%
\define@key{includespread}{range}{\luaexec{%
local x1,y1,x2,y2 = odsreader.getRange("\luatexluaescapestring{#1}")%
range = {x1,y1,x2,y2}%
}}
\define@key{includespread}{template}{\luaexec{currenttemplate="\luatexluaescapestring{#1}"}}%
\define@key{includespread}{rowtemplate}{\luaexec{rowtemplate="\luatexluaescapestring{\unexpanded{#1}}"}}%
+\define@key{includespread}{multicoltemplate}{\luaexec{multicoltpl="\luatexluaescapestring{\unexpanded{#1}}"}}%
\define@choicekey*+{includespread}{rowseparator}[\val\nr]{tableline,hline,newline}[tableline]%
{%
@@ -27,10 +28,10 @@
\luaexec{rowseparator="\luatexluaescapestring{#1}"}
}
\define@key{includespread}{columnbreak}{%
- \luaexec{columnbreak="\luatexluaescapestring{\unexpanded{#1}}{}"}
+ \luaexec{columnbreak="\luatexluaescapestring{\unexpanded{#1}}{}"}%
}
\define@key{includespread}{coltypes}{%
- \luaexec{coltypes="\luatexluaescapestring{\unexpanded{#1}}"}
+ \luaexec{coltypes="\luatexluaescapestring{\unexpanded{#1}}"}%
}
\define@choicekey*+{includespread}{columns}[\val\nr]{head,top,none}{%
\ifcase\nr\relax%
@@ -64,7 +65,8 @@
body = nil
odsfilename = ""
currenttemplate = nil
-rowtemplate=nil
+rowtemplate = nil
+multicoltpl = "\\multicolumn{-{count}}{l}{-{value}}"
\end{luacode*}
\newcommand\loadodsfile[2][]{%
@@ -78,7 +80,7 @@
\newcommand\tabletemplate[2]{%
\luaexec{%
- templates["#1"]="\luatexluaescapestring{\unexpanded{#2}}"
+ templates["#1"]="\luatexluaescapestring{\unexpanded{#2}}"%
}
}
@@ -110,11 +112,17 @@
local t={}
local i = 1
for _,column in pairs(row) do
+ local attr = column.attr or {}
local value, br = concatParagraphs(column.value)
value = value or ""
+ local x = attr["table:number-columns-spanned"] or "1"
+ x = tonumber(x)
+ if x > 1 then
+ value = odsreader.interp(multicoltpl, {value = value, count = x})
+ end
table.insert(t,value)
headings[i] = br
- i = i + 1
+ i = i + x
end
return t, headings
end
@@ -177,10 +185,12 @@
table.insert(content,odsreader.interp(rowtemplate,rowValues(row)))
end
content = table.concat(content,rowseparator)
- tex.sprint(odsreader.interp(templates[currenttemplate],{content=content}))
+ local result = odsreader.interp(templates[currenttemplate],{content=content,coltypes=coltypes,colheading=colheading,rowsep=rowseparator})
+ print(result)
+ tex.sprint(result)
end
- }
-}
+ }%
+}%
\tabletemplate{empty}{-{content}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/odsfile.tlpobj new/tlpkg/tlpobj/odsfile.tlpobj
--- old/tlpkg/tlpobj/odsfile.tlpobj 2015-04-13 02:07:45.000000000 +0200
+++ new/tlpkg/tlpobj/odsfile.tlpobj 2016-04-14 19:31:08.000000000 +0200
@@ -1,7 +1,7 @@
name odsfile
category Package
-revision 35808
-shortdesc Read OpenDocument Spreadsheet documents as LaTeX tables.
+revision 38449
+shortdesc Read OpenDocument Spreadsheet documents as LaTeX tables
relocated 1
longdesc The distribution includes a package and a lua library that can
longdesc together read OpenDocument spreadsheet documents as LaTeX
@@ -12,6 +12,7 @@
RELOC/tex/lualatex/odsfile/odsfile.lua
RELOC/tex/lualatex/odsfile/odsfile.sty
catalogue-ctan /macros/luatex/latex/odsfile
-catalogue-date 2014-12-11 14:29:14 +0100
+catalogue-date 2015-09-23 16:15:56 +0200
catalogue-license lppl1.3
-catalogue-version 0.4
+catalogue-topics foreign-import table luatex
+catalogue-version 0.6
++++++ ofs.doc.tar.xz ++++++
++++++ ofs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ofs.tlpobj new/tlpkg/tlpobj/ofs.tlpobj
--- old/tlpkg/tlpobj/ofs.tlpobj 2015-04-13 02:07:46.000000000 +0200
+++ new/tlpkg/tlpobj/ofs.tlpobj 2016-04-14 19:31:09.000000000 +0200
@@ -1,7 +1,7 @@
name ofs
category Package
revision 16991
-shortdesc Macros for managing large font collections.
+shortdesc Macros for managing large font collections
relocated 1
longdesc OFS (Olsak's Font System) is a set of Plain TeX and LaTeX
longdesc macros for managing large font collections; it has been used by
@@ -47,6 +47,8 @@
RELOC/tex/generic/ofs/ofsdef.tex
RELOC/tex/generic/ofs/pantyk.tex
RELOC/tex/generic/ofs/txfn.tex
+catalogue-also plnfss font-selection fontch
catalogue-ctan /macros/generic/ofs
-catalogue-date 2014-05-23 15:55:46 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license knuth
+catalogue-topics font-sel plain-ext
++++++ ogham.doc.tar.xz ++++++
++++++ ogham.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ogham.tlpobj new/tlpkg/tlpobj/ogham.tlpobj
--- old/tlpkg/tlpobj/ogham.tlpobj 2015-04-13 02:07:46.000000000 +0200
+++ new/tlpkg/tlpobj/ogham.tlpobj 2016-04-14 19:31:09.000000000 +0200
@@ -1,7 +1,7 @@
name ogham
category Package
revision 24876
-shortdesc Fonts for typesetting Ogham script.
+shortdesc Fonts for typesetting Ogham script
relocated 1
longdesc The font provides the Ogham alphabet, which is found on a
longdesc number of Irish and Pictish carvings dating from the 4th
@@ -13,5 +13,6 @@
RELOC/fonts/source/public/ogham/ogham.mf
RELOC/fonts/tfm/public/ogham/ogham.tfm
catalogue-ctan /fonts/ogham
-catalogue-date 2014-05-17 10:36:54 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license pd
+catalogue-topics font font-mf font-archaic
++++++ oinuit.doc.tar.xz ++++++
++++++ oinuit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oinuit.tlpobj new/tlpkg/tlpobj/oinuit.tlpobj
--- old/tlpkg/tlpobj/oinuit.tlpobj 2015-04-13 02:07:47.000000000 +0200
+++ new/tlpkg/tlpobj/oinuit.tlpobj 2016-04-14 19:31:10.000000000 +0200
@@ -1,7 +1,7 @@
name oinuit
category Package
revision 28668
-shortdesc LaTeX Support for the Inuktitut Language.
+shortdesc LaTeX Support for the Inuktitut Language
relocated 1
longdesc The package provides a set of Lambda (Omega LaTeX) typesetting
longdesc tools for the Inuktitut language. Five different input methods
@@ -36,5 +36,6 @@
RELOC/tex/lambda/oinuit/litenc.def
RELOC/tex/lambda/oinuit/oinuit.sty
catalogue-ctan /language/inuktitut/oinuit
-catalogue-date 2012-12-31 10:40:46 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics other-lang omega
++++++ oldlatin.doc.tar.xz ++++++
++++++ oldlatin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oldlatin.tlpobj new/tlpkg/tlpobj/oldlatin.tlpobj
--- old/tlpkg/tlpobj/oldlatin.tlpobj 2015-04-13 02:07:49.000000000 +0200
+++ new/tlpkg/tlpobj/oldlatin.tlpobj 2016-04-14 19:31:12.000000000 +0200
@@ -1,7 +1,7 @@
name oldlatin
category Package
revision 17932
-shortdesc Compute Modern-like font with long s.
+shortdesc Compute Modern-like font with long s
relocated 1
longdesc Metafont sources modified from Computer Modern in order to
longdesc generate "long s" which was used in old text.
@@ -100,6 +100,7 @@
RELOC/fonts/tfm/public/oldlatin/oltt9.tfm
RELOC/fonts/tfm/public/oldlatin/olvtt10.tfm
catalogue-ctan /fonts/gothic/oldlatin
-catalogue-date 2014-05-17 15:44:21 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics font font-mf font-historical
catalogue-version 1.00
++++++ oldstandard.doc.tar.xz ++++++
++++++ oldstandard.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oldstandard.tlpobj new/tlpkg/tlpobj/oldstandard.tlpobj
--- old/tlpkg/tlpobj/oldstandard.tlpobj 2015-04-13 02:08:04.000000000 +0200
+++ new/tlpkg/tlpobj/oldstandard.tlpobj 2016-04-14 19:31:23.000000000 +0200
@@ -1,7 +1,7 @@
name oldstandard
category Package
revision 29349
-shortdesc Old Standard: A Unicode Font for Classical and Medieval Studies.
+shortdesc Old Standard: A Unicode Font for Classical and Medieval Studies
relocated 1
longdesc Old Standard is designed to reproduce the actual printing style
longdesc of the early 20th century, reviving a specific type of Modern
@@ -19,6 +19,7 @@
RELOC/fonts/opentype/public/oldstandard/OldStandard-Italic.otf
RELOC/fonts/opentype/public/oldstandard/OldStandard-Regular.otf
catalogue-ctan /fonts/oldstandard
-catalogue-date 2014-05-17 15:44:21 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license ofl
+catalogue-topics font font-serif font-ttf font-otf
catalogue-version 2.0.2
++++++ oldstyle.doc.tar.xz ++++++
++++++ oldstyle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oldstyle.tlpobj new/tlpkg/tlpobj/oldstyle.tlpobj
--- old/tlpkg/tlpobj/oldstyle.tlpobj 2015-04-13 02:08:05.000000000 +0200
+++ new/tlpkg/tlpobj/oldstyle.tlpobj 2016-04-14 19:31:23.000000000 +0200
@@ -1,14 +1,16 @@
name oldstyle
category Package
revision 15878
-shortdesc Old style numbers in OT1 encoding.
+shortdesc Old style numbers in OT1 encoding
relocated 1
longdesc Font information needed to load the cmmi and cmmib fonts for
longdesc use to produce oldstyle numbers.
runfiles size=2
RELOC/tex/latex/oldstyle/Ucmm.fd
RELOC/tex/latex/oldstyle/oldstyle.sty
+catalogue-also eco
catalogue-ctan /macros/latex/contrib/oldstyle
-catalogue-date 2012-06-16 10:52:26 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics font-supp
catalogue-version 0.2
++++++ omega.doc.tar.xz ++++++
++++++ omega.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/omega.tlpobj new/tlpkg/tlpobj/omega.tlpobj
--- old/tlpkg/tlpobj/omega.tlpobj 2015-04-13 02:08:06.000000000 +0200
+++ new/tlpkg/tlpobj/omega.tlpobj 2016-04-14 19:31:24.000000000 +0200
@@ -1,7 +1,7 @@
name omega
category Package
revision 33046
-shortdesc A wide-character-set extension of TeX.
+shortdesc A wide-character-set extension of TeX
relocated 1
longdesc A development of TeX, which deals in multi-octet Unicode
longdesc characters, to enable native treatment of a wide range of
@@ -360,5 +360,6 @@
RELOC/tex/generic/omegahyph/srhyph.tex
RELOC/tex/plain/omega/grlccode.tex
RELOC/tex/plain/omega/omega.tex
-catalogue-date 2015-04-03 14:52:14 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics engine omega obsolete
++++++ omegaware.doc.tar.xz ++++++
Files old/texmf-dist/doc/man/man1/odvicopy.man1.pdf and new/texmf-dist/doc/man/man1/odvicopy.man1.pdf differ
Files old/texmf-dist/doc/man/man1/odvitype.man1.pdf and new/texmf-dist/doc/man/man1/odvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ofm2opl.1 new/texmf-dist/doc/man/man1/ofm2opl.1
--- old/texmf-dist/doc/man/man1/ofm2opl.1 2015-04-27 20:34:09.000000000 +0200
+++ new/texmf-dist/doc/man/man1/ofm2opl.1 2016-04-26 19:41:35.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "OFM2OPL" "27 April 2015" "Web2C 2015"
+.TH OFM2OPL "14 April 2016" "Web2C 2016"
.PP
.SH "NAME"
ofm2opl \- convert Omega and TeX font-metric files to property-list files
@@ -6,33 +6,39 @@
.SH "SYNOPSIS"
.PP
.B ofm2opl
-.RI [ OPTIONS ]
-.IR OFMNAME [ \fB.ofm\fP ]
-.RI [ OPLFILE [ \fB.opl\fP ]]
+.RI [ options ]
+.IR ofmname [ \fB.ofm\fP ]
+.RI [ oplfile [ \fB.opl\fP ]]
.PP
.SH "DESCRIPTION"
.PP
\fBofm2opl\fP translates a binary Omega Font Metrics file,
-\fIOFMNAME\fP, into a human-readable property-list form\&. The
+\fIofmname\fP, into a human-readable property-list form\&. The
program writes to standard output (by default) or to a file specified
-as \fIOPLFILE\fP\&.
+as \fIoplfile\fP\&.
.PP
The program also works with TeX TFM files, producing TeX PL files\&.
-(\fBofm2opl\fP is based on the WEB source code for \fBtftopl\fP(1)\&.)
.PP
.SH "OPTIONS"
.PP
+(Same as \fBovf2ovp\fP).
.IP
-.IP "\fB-charcode-format=\fP\fITYPE\fP"
-output character codes
-according to \fITYPE\fP,
-which can be either `hex\&'
-or `ascii\&'\&. Default is
-`hex\&'\&. ascii specifes all
-ASCII letters and digits;
-hex gets you everything
-else\&.
-.IP
+.IP "\fB-charcode-format=\fP\fItype\fP"
+output character codes according to \fItype\fP,
+either `hex\&', `octal\&' or `ascii\&'\&. Default is
+`hex\&'\&; `ascii' says to use
+ASCII for letters and digits, hex for all else\&.
+.IP "\fB-char-format=\fP\fIstype\fP"
+output character codes according to \fIstype\fP,
+either `num\&' or `ascii\&'\&. Default is `num'; `ascii' as in
+-charcode-format. (These two redundant options both exist only for
+historical compatibility.)
+.IP "\fB-num-format=\fP\fIntype\fP"
+output numbers according to \fIntype\fP,
+either `hex' or `octal'; default is hex.
+.IP "\fB-text-format=\fP\fIttype\fP"
+output coding scheme and family according to \fIttype\fP,
+either `mixed' or `upper' case; default is mixed.
.IP "\fB-help\fP"
display a brief summary of syntax and options
.IP "\fB-verbose\fP"
@@ -50,18 +56,16 @@
.PP
.SH "BUGS"
.PP
-None known, but report any found to (mailing list)\&. You may also want to
-check to see if the same bug is present in \fBpltotf\fP(1)\&.
+Send bug reports to http://lists.tug.org/tex-k
+(mailing list); may also check if the same bug is present in
+\fBtftopl\fP(1)\&. General discussion of Omega (and Aleph) can take place
+on the http://lists.tug.org/omega mailing list.
.PP
.SH "SEE ALSO"
.PP
-\fBomega\fP(1), \fBopl2ofm\fP(1), \fBpltotf\fP(1),
+\fBomega\fP(1), \fBaleph\fP(1), \fBopl2ofm\fP(1), \fBpltotf\fP(1),
\fBtftopl\fP(1)\&.
.PP
-\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&.
-.PP
-Web page: http://www\&.gutenberg\&.eu\&.org/omega/
-.PP
.SH "AUTHOR"
.PP
According to the WEB documentation:
@@ -79,10 +83,13 @@
by John Plaice in December 1995 and January 1996, resulting in the new
program \fBOFM2OPL\fP\&.
.RE
+.PP
+\fBofm2opl\fP is based on the WEB source code for \fBtftopl\fP(1),
+although nowadays it is a link to \fBomfonts\fP, implemented entirely in
+C.
.PP
-The primary authors of Omega are John Plaice
- and Yannis Haralambous
-\&.
+The primary authors of Omega are John Plaice and Yannis Haralambous.
+Omega (and Aleph) are now maintained as part of TeX Live.
.PP
This manual page was written by C\&.M\&. Connelly
, for
Files old/texmf-dist/doc/man/man1/ofm2opl.man1.pdf and new/texmf-dist/doc/man/man1/ofm2opl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/opl2ofm.1 new/texmf-dist/doc/man/man1/opl2ofm.1
--- old/texmf-dist/doc/man/man1/opl2ofm.1 2015-04-27 20:34:09.000000000 +0200
+++ new/texmf-dist/doc/man/man1/opl2ofm.1 2016-04-26 19:41:35.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "OPL2OFM" "27 April 2015" "Web2C 2015"
+.TH OPL2OFM "16 June 2015" "Web2C 2016"
.PP
.SH "NAME"
opl2ofm \- convert Omega and TeX property-list files to font-metric files
Files old/texmf-dist/doc/man/man1/opl2ofm.man1.pdf and new/texmf-dist/doc/man/man1/opl2ofm.man1.pdf differ
Files old/texmf-dist/doc/man/man1/otangle.man1.pdf and new/texmf-dist/doc/man/man1/otangle.man1.pdf differ
Files old/texmf-dist/doc/man/man1/otp2ocp.man1.pdf and new/texmf-dist/doc/man/man1/otp2ocp.man1.pdf differ
Files old/texmf-dist/doc/man/man1/outocp.man1.pdf and new/texmf-dist/doc/man/man1/outocp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovf2ovp.1 new/texmf-dist/doc/man/man1/ovf2ovp.1
--- old/texmf-dist/doc/man/man1/ovf2ovp.1 2015-04-27 20:34:09.000000000 +0200
+++ new/texmf-dist/doc/man/man1/ovf2ovp.1 2016-04-26 19:41:35.000000000 +0200
@@ -1,36 +1,46 @@
-.TH "OVF2OVP" "27 April 2015" "Web2C 2015"
+.TH OVF2OVP "14 April 2016" "Web2C 2016"
.PP
.SH "NAME"
-ovf2ovp \- convert a virtual font file and its associated font metric file into property-list format
+ovf2ovp \- convert virtual font file and associated font metrics to property-list format
.PP
.SH "SYNOPSIS"
.PP
.B ovf2ovp
-.RI [ OPTIONS ]
-.IR OVFNAME [ \fB.ovf\fP ]
-.RI [ OFMNAME [ \fB.ofm\fP ]
-.RI [ OVPFILE [ \fB.ovp\fP ]]]
+.RI [ options ]
+.IR ovfname [ \fB.ovf\fP ]
+.RI [ ofmname [ \fB.ofm\fP ]
+.RI [ ovpfile [ \fB.ovp\fP ]]]
.PP
.SH "DESCRIPTION"
.PP
-\fBovf2ovp\fP translates a virtual font (OVF) file, \fIOVFNAME\fP,
-and its companion font metric (OFM) file, \fIOFMNAME\fP, into a
+\fBovf2ovp\fP translates a virtual font (OVF) file, \fIovfname\fP,
+and its companion font metric (OFM) file, \fIofmname\fP, into a
human-readable property-list format\&. The program writes to standard
-output (by default) or to a file specified as \fIOVPNAME\fP\&.
+output (by default) or to a file specified as \fIovpname\fP\&.
.PP
-The program also works with TeX VF and TFM files, producing TeX VP
-files\&. (\fBovf2ovp\fP is based on the WEB source code for
-\fBvftovp\fP(1)\&.)
+The program also works with TeX VF and TFM files, producing TeX VPL
+files\&.
.PP
.SH "OPTIONS"
-.PP
-.IP
-.IP "\fB-charcode-format=\fP\fITYPE\fP"
-output character codes
-according to \fITYPE\fP, which can be either `hex\&' or `ascii\&'\&.
-Default is `hex\&'\&. ascii specifes all ASCII letters and digits; hex
-gets you everything else\&.
-.IP
+.PP
+(Same as \fBofm2opl\fP).
+.IP
+.IP "\fB-charcode-format=\fP\fItype\fP"
+output character codes according to \fItype\fP,
+either `hex\&', `octal\&' or `ascii\&'\&. Default is
+`hex\&'\&; `ascii' says to use
+ASCII for letters and digits, hex for all else\&.
+.IP "\fB-char-format=\fP\fIstype\fP"
+output character codes according to \fIstype\fP,
+either `num\&' or `ascii\&'\&. Default is `num'; `ascii' as in
+-charcode-format. (These two redundant options both exist only for
+historical compatibility.)
+.IP "\fB-num-format=\fP\fIntype\fP"
+output numbers according to \fIntype\fP,
+either `hex' or `octal'; default is hex.
+.IP "\fB-text-format=\fP\fIttype\fP"
+output coding scheme and family according to \fIttype\fP,
+either `mixed' or `upper' case; default is mixed.
.IP "\fB-help\fP"
display a brief summary of syntax and options
.IP "\fB-verbose\fP"
@@ -41,44 +51,45 @@
.PP
.SH "FILES"
.PP
-.IP "\fIOVPFILE\fP"
+.IP "\fIovpfile\fP"
Omega Virtual Property List file
-.IP "\fIOFMNAME\fP"
+.IP "\fIofmname\fP"
Omega Font Metric file
-.IP "\fIOVFNAME\fP"
+.IP "\fIovfname\fP"
Omega Virtual Font file
.PP
.SH "BUGS"
.PP
-None known, but report any found to (mailing list)\&. You should also
-check to see if the bug is also in \fBvftovp\fP(1)\&.
+Send bug reports to http://lists.tug.org/tex-k
+(mailing list); may also check if the same bug is present in
+\fBvftovp\fP(1)\&. General discussion of Omega (and Aleph) can take place
+on the http://lists.tug.org/omega mailing list.
.PP
.SH "SEE ALSO"
.PP
-\fBomega\fP(1), \fBofm2opl\fP(1), \fBovp2ovf\fP(1),
+\fBomega\fP(1), \fBaleph\fP(1), \fBofm2opl\fP(1), \fBovp2ovf\fP(1),
\fBpltotf\fP(1), \fBtftopl\fP(1), \fBvftovp\fP(1),
\fBvptovf\fP(1)
.PP
-\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&.
-.PP
-Web page: http://www\&.gutenberg\&.eu\&.org/omega/
-.PP
.SH "AUTHOR"
.PP
According to the WEB documentation:
.PP
.RS
\fBVFtoVP\fP is an extended version of the program \fBTFtoPL\fP,
-which is part of the standard tex()ware library\&. The idea of a
+which is part of the standard TeXware library\&. The idea of a
virtual font was inspired by the work of David R\&. Fuchs who designed a
similar set of conventions in 1984 while developing a device driver
for ArborText, Inc\&. He wrote a somewhat similar program called
\fBAMFtoXPL\fP\&.
.RE
+.PP
+Thus, \fBovf2ovp\fP is based on the WEB source code for \fBvftovp\fP(1),
+although nowadays it is a link to \fBomfonts\fP, implemented entirely in
+C.
.PP
-The primary authors of Omega are John Plaice
- and Yannis Haralambous
-\&.
+The primary authors of Omega are John Plaice and Yannis Haralambous.
+Omega (and Aleph) are now maintained as part of TeX Live.
.PP
This manual page was written by C\&.M\&. Connelly
, for
@@ -86,4 +97,3 @@
without contacting the author\&. Any mistakes or omissions in the
manual page are my fault; inquiries about or corrections to this
manual page should be directed to me (and not to the primary author)\&.
-.PP
Files old/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf and new/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovp2ovf.1 new/texmf-dist/doc/man/man1/ovp2ovf.1
--- old/texmf-dist/doc/man/man1/ovp2ovf.1 2015-04-27 20:34:09.000000000 +0200
+++ new/texmf-dist/doc/man/man1/ovp2ovf.1 2016-04-26 19:41:35.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "OVP2OVF" "27 April 2015" "Web2C 2015"
+.TH OVP2OVF "16 June 2015" "Web2C 2016"
.PP
.SH "NAME"
ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
Files old/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf and new/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/omegaware.doc.tlpobj new/tlpkg/tlpobj/omegaware.doc.tlpobj
--- old/tlpkg/tlpobj/omegaware.doc.tlpobj 2015-04-28 03:28:49.000000000 +0200
+++ new/tlpkg/tlpobj/omegaware.doc.tlpobj 2016-04-27 03:21:30.000000000 +0200
@@ -1,8 +1,8 @@
name omegaware.doc
category TLCore
-revision 37078
+revision 40768
shortdesc doc files of omegaware
-docfiles size=27
+docfiles size=62
texmf-dist/doc/man/man1/odvicopy.1
texmf-dist/doc/man/man1/odvicopy.man1.pdf
texmf-dist/doc/man/man1/odvitype.1
++++++ onlyamsmath.doc.tar.xz ++++++
++++++ onlyamsmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onlyamsmath.tlpobj new/tlpkg/tlpobj/onlyamsmath.tlpobj
--- old/tlpkg/tlpobj/onlyamsmath.tlpobj 2015-04-13 02:08:41.000000000 +0200
+++ new/tlpkg/tlpobj/onlyamsmath.tlpobj 2016-04-14 19:31:48.000000000 +0200
@@ -1,7 +1,7 @@
name onlyamsmath
category Package
revision 25006
-shortdesc Inhibit use of non-amsmath mathematics markup when using amsmath.
+shortdesc Inhibit use of non-amsmath mathematics markup when using amsmath
relocated 1
longdesc This package inhibits the usage of plain TeX and (on demand) of
longdesc standard LaTeX mathematics environments. This is useful for
@@ -9,7 +9,9 @@
longdesc environments provided by the amsmath package.
runfiles size=1
RELOC/tex/latex/onlyamsmath/onlyamsmath.sty
+catalogue-also nag
catalogue-ctan /macros/latex/contrib/onlyamsmath
-catalogue-date 2012-06-16 14:32:26 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics maths latex-qual
catalogue-version 0.10
++++++ onrannual.doc.tar.xz ++++++
++++++ onrannual.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onrannual.tlpobj new/tlpkg/tlpobj/onrannual.tlpobj
--- old/tlpkg/tlpobj/onrannual.tlpobj 2015-04-13 02:08:42.000000000 +0200
+++ new/tlpkg/tlpobj/onrannual.tlpobj 2016-04-14 19:31:48.000000000 +0200
@@ -1,7 +1,7 @@
name onrannual
category Package
revision 17474
-shortdesc Class for Office of Naval Research Ocean Battlespace Sensing annual report.
+shortdesc Class for Office of Naval Research Ocean Battlespace Sensing annual report
relocated 1
longdesc This is an unofficial document class for writing ONR annual
longdesc reports using LaTeX; as ONR has had numerous problems with
@@ -10,6 +10,7 @@
runfiles size=2
RELOC/tex/latex/onrannual/onrannual.cls
catalogue-ctan /macros/latex/contrib/onrannual
-catalogue-date 2014-09-12 12:10:58 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics report-like
catalogue-version 1.1
++++++ opcit.doc.tar.xz ++++++
++++++ opcit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/opcit.tlpobj new/tlpkg/tlpobj/opcit.tlpobj
--- old/tlpkg/tlpobj/opcit.tlpobj 2015-04-13 02:08:42.000000000 +0200
+++ new/tlpkg/tlpobj/opcit.tlpobj 2016-04-14 19:31:48.000000000 +0200
@@ -1,7 +1,7 @@
name opcit
category Package
revision 15878
-shortdesc Footnote-style bibliographical references.
+shortdesc Footnote-style bibliographical references
relocated 1
longdesc This package addresses the problem of expressing citations in a
longdesc style that is natural for humanities studies, yet does not
@@ -15,6 +15,7 @@
RELOC/bibtex/bst/opcit/opcit.bst
RELOC/tex/latex/opcit/opcit.sty
catalogue-ctan /macros/latex/contrib/opcit
-catalogue-date 2012-06-16 14:32:26 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics bibtex-supp footnote
catalogue-version 1.1
++++++ opensans.doc.tar.xz ++++++
++++++ opensans.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/opensans.tlpobj new/tlpkg/tlpobj/opensans.tlpobj
--- old/tlpkg/tlpobj/opensans.tlpobj 2015-04-13 02:08:45.000000000 +0200
+++ new/tlpkg/tlpobj/opensans.tlpobj 2016-04-14 19:31:49.000000000 +0200
@@ -1,7 +1,7 @@
name opensans
category Package
revision 24706
-shortdesc The Open Sans font family, and LaTeX support.
+shortdesc The Open Sans font family, and LaTeX support
relocated 1
longdesc Open Sans is a humanist sans serif typeface designed by Steve
longdesc Matteson; the font is available from the Google Font Directory
@@ -815,6 +815,7 @@
RELOC/tex/latex/opensans/x2fos.fd
RELOC/tex/latex/opensans/x2fosj.fd
catalogue-ctan /fonts/opensans
-catalogue-date 2014-05-17 15:44:21 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics font font-type1 font-ttf font-sans
catalogue-version 1.2
++++++ opteng.doc.tar.xz ++++++
++++++ opteng.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/opteng.tlpobj new/tlpkg/tlpobj/opteng.tlpobj
--- old/tlpkg/tlpobj/opteng.tlpobj 2015-04-13 02:08:58.000000000 +0200
+++ new/tlpkg/tlpobj/opteng.tlpobj 2016-04-14 19:31:58.000000000 +0200
@@ -1,7 +1,7 @@
name opteng
category Package
revision 27331
-shortdesc SPIE Optical Engineering and OE Letters manuscript template.
+shortdesc SPIE Optical Engineering and OE Letters manuscript template
relocated 1
longdesc With this template, and associated style and LaTeX packages, it
longdesc is possible to estimate the page length of manuscripts for
@@ -11,7 +11,9 @@
longdesc gives simple instructions on how to prepare the manuscript.
runfiles size=5
RELOC/tex/latex/opteng/opteng.sty
+catalogue-also spie
catalogue-ctan /macros/latex/contrib/opteng
-catalogue-date 2012-08-13 12:34:19 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics journalpub
catalogue-version 1.0
++++++ optional.doc.tar.xz ++++++
++++++ optional.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/optional.tlpobj new/tlpkg/tlpobj/optional.tlpobj
--- old/tlpkg/tlpobj/optional.tlpobj 2015-04-13 02:08:58.000000000 +0200
+++ new/tlpkg/tlpobj/optional.tlpobj 2016-04-14 19:31:58.000000000 +0200
@@ -1,7 +1,7 @@
name optional
category Package
revision 18131
-shortdesc Facilitate optional printing of parts of a document.
+shortdesc Facilitate optional printing of parts of a document
relocated 1
longdesc Optional provides simple, flexible, optional compilation of
longdesc LaTeX documents. Option switches may be given via package
@@ -14,6 +14,7 @@
runfiles size=2
RELOC/tex/latex/optional/optional.sty
catalogue-ctan /macros/latex/contrib/optional
-catalogue-date 2011-09-30 22:42:57 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics cond-comp editorial
catalogue-version 2.2b
++++++ ordinalpt.doc.tar.xz ++++++
++++++ ordinalpt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ordinalpt.tlpobj new/tlpkg/tlpobj/ordinalpt.tlpobj
--- old/tlpkg/tlpobj/ordinalpt.tlpobj 2015-04-13 02:08:59.000000000 +0200
+++ new/tlpkg/tlpobj/ordinalpt.tlpobj 2016-04-14 19:31:59.000000000 +0200
@@ -1,7 +1,7 @@
name ordinalpt
category Package
revision 15878
-shortdesc Counters as ordinal numbers in Portuguese.
+shortdesc Counters as ordinal numbers in Portuguese
relocated 1
longdesc The package provides a counter style (like \arabic, \alph and
longdesc others) which produces as output strings like "primeiro"
@@ -12,6 +12,7 @@
runfiles size=2
RELOC/tex/latex/ordinalpt/ordinalpt.sty
catalogue-ctan /macros/latex/contrib/ordinalpt
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics numbers portuguese
catalogue-version 2.1
++++++ orkhun.doc.tar.xz ++++++
++++++ orkhun.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/orkhun.tlpobj new/tlpkg/tlpobj/orkhun.tlpobj
--- old/tlpkg/tlpobj/orkhun.tlpobj 2015-04-13 02:08:59.000000000 +0200
+++ new/tlpkg/tlpobj/orkhun.tlpobj 2016-04-14 19:31:59.000000000 +0200
@@ -1,7 +1,7 @@
name orkhun
category Package
revision 15878
-shortdesc A font for orkhun script.
+shortdesc A font for orkhun script
relocated 1
longdesc The font covers an old Turkic script. It is provided as
longdesc Metafont source.
@@ -18,5 +18,6 @@
RELOC/fonts/tfm/public/orkhun/orhant20.tfm
RELOC/fonts/tfm/public/orkhun/orhant25.tfm
catalogue-ctan /fonts/orkhun
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics turkish
++++++ oscola.doc.tar.xz ++++++
++++++ oscola.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oscola.tlpobj new/tlpkg/tlpobj/oscola.tlpobj
--- old/tlpkg/tlpobj/oscola.tlpobj 2015-04-13 02:09:00.000000000 +0200
+++ new/tlpkg/tlpobj/oscola.tlpobj 2016-04-14 19:32:00.000000000 +0200
@@ -1,9 +1,9 @@
name oscola
category Package
revision 34207
-shortdesc BibLaTeX style for the Oxford Standard for the Citation of Legal Authorities.
+shortdesc BibLaTeX style for the Oxford Standard for the Citation of Legal Authorities
relocated 1
-longdesc The package provides a set of style files for use with Biblatex
+longdesc The package provides a set of style files for use with BibLaTeX
longdesc (v 2+) and Biber (v 1+) to produce citations and bibliographies
longdesc in accordance with the widely-used Oxford Standard for the
longdesc Citation of Legal Authorities. It also includes facilities for
@@ -15,6 +15,7 @@
RELOC/tex/latex/oscola/oscola.bbx
RELOC/tex/latex/oscola/oscola.cbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/oscola
-catalogue-date 2014-05-22 17:35:02 +0200
+catalogue-date 2015-08-08 19:53:23 +0200
catalogue-license lppl1.3
+catalogue-topics legal biblatex
catalogue-version 1.4
++++++ ot-tableau.doc.tar.xz ++++++
++++++ ot-tableau.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ot-tableau.tlpobj new/tlpkg/tlpobj/ot-tableau.tlpobj
--- old/tlpkg/tlpobj/ot-tableau.tlpobj 2015-04-13 02:09:01.000000000 +0200
+++ new/tlpkg/tlpobj/ot-tableau.tlpobj 2016-04-14 19:32:01.000000000 +0200
@@ -1,7 +1,7 @@
name ot-tableau
category Package
revision 35095
-shortdesc Optimality Theory tableaux in LaTeX.
+shortdesc Optimality Theory tableaux in LaTeX
relocated 1
longdesc The package makes it easy to create beautiful optimality-
longdesc theoretic tableaux. The LaTeX source is visually very similar
@@ -11,5 +11,6 @@
runfiles size=1
RELOC/tex/latex/ot-tableau/ot-tableau.sty
catalogue-ctan /macros/latex/contrib/ot-tableau
-catalogue-date 2014-09-02 18:44:09 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics linguistic
++++++ othello.doc.tar.xz ++++++
++++++ othello.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/othello.tlpobj new/tlpkg/tlpobj/othello.tlpobj
--- old/tlpkg/tlpobj/othello.tlpobj 2015-04-13 02:09:01.000000000 +0200
+++ new/tlpkg/tlpobj/othello.tlpobj 2016-04-14 19:32:01.000000000 +0200
@@ -1,7 +1,7 @@
name othello
category Package
revision 15878
-shortdesc Modification of a Go package to create othello boards.
+shortdesc Modification of a Go package to create othello boards
relocated 1
longdesc A package (based on Kolodziejska's go), and fonts (as Metafont
longdesc source) are provided.
@@ -34,5 +34,6 @@
RELOC/fonts/tfm/public/othello/ot1whi20.tfm
RELOC/tex/latex/othello/othello.sty
catalogue-ctan /macros/latex/contrib/othello
-catalogue-date 2014-05-22 01:06:35 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics games font font-mf font-specialist
++++++ othelloboard.doc.tar.xz ++++++
++++++ othelloboard.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/othelloboard.tlpobj new/tlpkg/tlpobj/othelloboard.tlpobj
--- old/tlpkg/tlpobj/othelloboard.tlpobj 2015-04-13 02:09:01.000000000 +0200
+++ new/tlpkg/tlpobj/othelloboard.tlpobj 2016-04-14 19:32:01.000000000 +0200
@@ -1,7 +1,7 @@
name othelloboard
category Package
revision 23714
-shortdesc Typeset Othello (Reversi) diagrams of any size, with annotations.
+shortdesc Typeset Othello (Reversi) diagrams of any size, with annotations
relocated 1
longdesc The package enables the user to generate high-quality Othello
longdesc (also known as Reversi) board diagrams of any size. The
@@ -10,7 +10,9 @@
longdesc standard to WZebra (and other programs) is also supported.
runfiles size=18
RELOC/tex/latex/othelloboard/othelloboard.sty
+catalogue-also othello
catalogue-ctan /macros/latex/contrib/othelloboard
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics games
catalogue-version 1.2
++++++ otibet.doc.tar.xz ++++++
++++++ otibet.tar.xz ++++++
++++++ oubraces.doc.tar.xz ++++++
++++++ oubraces.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oubraces.tlpobj new/tlpkg/tlpobj/oubraces.tlpobj
--- old/tlpkg/tlpobj/oubraces.tlpobj 2015-04-13 02:09:03.000000000 +0200
+++ new/tlpkg/tlpobj/oubraces.tlpobj 2016-04-14 19:32:03.000000000 +0200
@@ -1,12 +1,13 @@
name oubraces
category Package
revision 21833
-shortdesc Braces over and under a formula.
+shortdesc Braces over and under a formula
relocated 1
longdesc Provides a means to interleave \overbrace and \underbrace in
longdesc the same formula.
runfiles size=1
RELOC/tex/latex/oubraces/oubraces.sty
catalogue-ctan /macros/latex/contrib/oubraces
-catalogue-date 2012-06-12 22:20:47 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics maths
++++++ outline.doc.tar.xz ++++++
++++++ outline.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/outline.tlpobj new/tlpkg/tlpobj/outline.tlpobj
--- old/tlpkg/tlpobj/outline.tlpobj 2015-04-13 02:09:03.000000000 +0200
+++ new/tlpkg/tlpobj/outline.tlpobj 2016-04-14 19:32:03.000000000 +0200
@@ -1,12 +1,13 @@
name outline
category Package
revision 18360
-shortdesc List environment for making outlines.
+shortdesc List environment for making outlines
relocated 1
longdesc The package defines an outline environment, which provides
longdesc facilities similar to enumerate, but up to 6 levels deep.
runfiles size=1
RELOC/tex/latex/outline/outline.sty
catalogue-ctan /macros/latex/contrib/outline
-catalogue-date 2012-01-23 15:07:56 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics list list-enum
++++++ outliner.doc.tar.xz ++++++
++++++ outliner.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/outliner.tlpobj new/tlpkg/tlpobj/outliner.tlpobj
--- old/tlpkg/tlpobj/outliner.tlpobj 2015-04-13 02:09:04.000000000 +0200
+++ new/tlpkg/tlpobj/outliner.tlpobj 2016-04-14 19:32:03.000000000 +0200
@@ -1,7 +1,7 @@
name outliner
category Package
revision 21095
-shortdesc Change section levels easily.
+shortdesc Change section levels easily
relocated 1
longdesc Allows you to write "\Level 2 {Some heading}" instead of the
longdesc usual \section stuff; the definitions of the levels can then
@@ -11,6 +11,7 @@
runfiles size=3
RELOC/tex/latex/outliner/outliner.sty
catalogue-ctan /macros/latex/contrib/outliner
-catalogue-date 2012-06-09 18:05:07 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics headings
catalogue-version 0.94
++++++ outlines.doc.tar.xz ++++++
++++++ outlines.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/outlines.tlpobj new/tlpkg/tlpobj/outlines.tlpobj
--- old/tlpkg/tlpobj/outlines.tlpobj 2015-04-13 02:09:04.000000000 +0200
+++ new/tlpkg/tlpobj/outlines.tlpobj 2016-04-14 19:32:03.000000000 +0200
@@ -1,7 +1,7 @@
name outlines
category Package
revision 25192
-shortdesc Produce "outline" lists.
+shortdesc Produce "outline" lists
relocated 1
longdesc Defines an outline environment, which allows outline-style
longdesc indented lists with freely mixed levels up to four levels deep.
@@ -12,6 +12,7 @@
runfiles size=2
RELOC/tex/latex/outlines/outlines.sty
catalogue-ctan /macros/latex/contrib/outlines
-catalogue-date 2012-01-25 23:35:10 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics list
catalogue-version 1.1
++++++ overlock.doc.tar.xz ++++++
++++++ overlock.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/overlock.tlpobj new/tlpkg/tlpobj/overlock.tlpobj
--- old/tlpkg/tlpobj/overlock.tlpobj 2015-04-13 02:09:04.000000000 +0200
+++ new/tlpkg/tlpobj/overlock.tlpobj 2016-04-14 19:32:03.000000000 +0200
@@ -1,7 +1,7 @@
name overlock
category Package
revision 34409
-shortdesc Overlook sans fonts with LaTeX support.
+shortdesc Overlook sans fonts with LaTeX support
relocated 1
longdesc The package provides the Overlock and OverlockSC families of
longdesc fonts, designed by Dario Manuel Muhafara of the TIPO foundry
@@ -114,5 +114,6 @@
RELOC/tex/latex/overlock/TS1OverlockSC-LF.fd
RELOC/tex/latex/overlock/overlock.sty
catalogue-ctan /fonts/overlock
-catalogue-date 2015-01-20 21:01:15 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license ofl
+catalogue-topics font font-sans font-ttf font-type1
++++++ overpic.doc.tar.xz ++++++
++++++ overpic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/overpic.tlpobj new/tlpkg/tlpobj/overpic.tlpobj
--- old/tlpkg/tlpobj/overpic.tlpobj 2015-04-13 02:09:06.000000000 +0200
+++ new/tlpkg/tlpobj/overpic.tlpobj 2016-04-14 19:32:05.000000000 +0200
@@ -1,7 +1,7 @@
name overpic
category Package
revision 19712
-shortdesc Combine LaTeX commands over included graphics.
+shortdesc Combine LaTeX commands over included graphics
relocated 1
longdesc The overpic environment is a cross between the LaTeX picture
longdesc environment and the \includegraphics command of graphicx. The
@@ -11,6 +11,7 @@
runfiles size=1
RELOC/tex/latex/overpic/overpic.sty
catalogue-ctan /macros/latex/contrib/overpic
-catalogue-date 2012-06-08 15:42:15 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1
+catalogue-topics graphics-text
catalogue-version 0.53
++++++ pacioli.doc.tar.xz ++++++
++++++ pacioli.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pacioli.tlpobj new/tlpkg/tlpobj/pacioli.tlpobj
--- old/tlpkg/tlpobj/pacioli.tlpobj 2015-04-13 02:09:06.000000000 +0200
+++ new/tlpkg/tlpobj/pacioli.tlpobj 2016-04-14 19:32:05.000000000 +0200
@@ -1,7 +1,7 @@
name pacioli
category Package
revision 24947
-shortdesc Fonts designed by Fra Luca de Pacioli in 1497.
+shortdesc Fonts designed by Fra Luca de Pacioli in 1497
relocated 1
longdesc Pacioli was a c.15 mathematician, and his font was designed
longdesc according to 'the divine proportion'. The font is uppercase
@@ -22,5 +22,6 @@
RELOC/tex/latex/pacioli/pacioli.sty
RELOC/tex/latex/pacioli/t1cpc.fd
catalogue-ctan /fonts/pacioli
-catalogue-date 2014-05-22 01:06:35 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics font font-mf font-historical
++++++ pagecolor.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pagecolor/README new/doc/latex/pagecolor/README
--- old/doc/latex/pagecolor/README 2015-06-23 20:18:51.000000000 +0200
+++ new/doc/latex/pagecolor/README 2015-08-30 22:50:26.000000000 +0200
@@ -1,4 +1,4 @@
-README for pagecolor package, 2015/06/22, v1.0g
+README for pagecolor package, 2015/08/30, v1.0h
TABLE OF CONTENTS
Files old/doc/latex/pagecolor/pagecolor-example.pdf and new/doc/latex/pagecolor/pagecolor-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pagecolor/pagecolor-example.tex new/doc/latex/pagecolor/pagecolor-example.tex
--- old/doc/latex/pagecolor/pagecolor-example.tex 2015-06-23 20:18:51.000000000 +0200
+++ new/doc/latex/pagecolor/pagecolor-example.tex 2015-08-30 22:50:26.000000000 +0200
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pagecolor
-%% Version: 2015/06/22 v1.0g
+%% Version: 2015/08/30 v1.0h
%%
%% Copyright (C) 2011 - 2015 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -64,7 +64,7 @@
% The xcolor package would not be needed for just using
% the base colours. The color package would be sufficient for that.
\usepackage[pagecolor={LightGoldenrod1},%
- nopagecolor={none}]{pagecolor}[2015/06/22]% v1.0g
+ nopagecolor={none}]{pagecolor}[2015/08/30]% v1.0h
\usepackage{afterpage}[2014/10/28]% v1.08
% The afterpage package is generally not needed,
@@ -86,7 +86,7 @@
\section*{Example for pagecolor}
This example demonstrates the use of package\newline
-\textsf{pagecolor}, v1.0g as of 2015/06/22 (HMM).\newline
+\textsf{pagecolor}, v1.0h as of 2015/08/30 (HMM).\newline
The used options were\newline
\verb|pagecolor={LightGoldenrod1}| (\verb|pagecolor={none}|
would be the default), and
Files old/doc/latex/pagecolor/pagecolor.pdf and new/doc/latex/pagecolor/pagecolor.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pagecolor.doc.tlpobj new/tlpkg/tlpobj/pagecolor.doc.tlpobj
--- old/tlpkg/tlpobj/pagecolor.doc.tlpobj 2015-06-24 03:20:30.000000000 +0200
+++ new/tlpkg/tlpobj/pagecolor.doc.tlpobj 2016-04-14 19:32:06.000000000 +0200
@@ -1,9 +1,9 @@
name pagecolor.doc
category Package
-revision 37646
+revision 38249
shortdesc doc files of pagecolor
relocated 1
-docfiles size=103
+docfiles size=104
RELOC/doc/latex/pagecolor/README
RELOC/doc/latex/pagecolor/pagecolor-example.pdf
RELOC/doc/latex/pagecolor/pagecolor-example.tex
++++++ pagecolor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pagecolor/pagecolor.sty new/tex/latex/pagecolor/pagecolor.sty
--- old/tex/latex/pagecolor/pagecolor.sty 2015-06-23 20:18:51.000000000 +0200
+++ new/tex/latex/pagecolor/pagecolor.sty 2015-08-30 22:50:26.000000000 +0200
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pagecolor
-%% Version: 2015/06/22 v1.0g
+%% Version: 2015/08/30 v1.0h
%%
%% Copyright (C) 2011 - 2015 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -45,7 +45,7 @@
%% Hans-Klaus Muench + 2014/08/24
%%
\NeedsTeXFormat{LaTeX2e}[2014/05/01]
-\ProvidesPackage{pagecolor}[2015/06/20 v1.0g
+\ProvidesPackage{pagecolor}[2015/06/20 v1.0h
Provides thepagecolor (HMM)]
%% Provides the \thepagecolor, \thepagecolornone, \newpagecolor{...},
%% and \restorepagecolor commands and the a replacement for the
@@ -150,11 +150,10 @@
}%
\xdef\thepagecolor{\pagecolor@nopagecolor}%
\xdef\thepagecolornone{\pagecolor@nopagecolor}%
- % although it should be "none"
+ % although it should be "none"
\origpagecolour{\pagecolor@nopagecolor}%
- }{%
- \nopagecolor%
- }%
+ }{\nopagecolor%
+ }%
\else%
\xdef\thepagecolor{#1}%
\xdef\thepagecolornone{#1}%
@@ -163,67 +162,67 @@
\@esphack%
}
+\let\orignopagecolour\nopagecolor\relax%
-\AtBeginDocument{%
- \let\orignopagecolour\nopagecolor\relax%
- \@ifpackageloaded{crop}{% crop loaded
- \@ifpackagelater{crop}{2003/05/21}{%
- % later than 2003/05/20 v1.9 might be OK
- \PackageWarning{pagecolor}{%
- \string\nopagecolor\space did not work with package\MessageBreak%
- crop 2003/05/20 v1.9. A newer version is used, \MessageBreak%
- which the pagecolor package does not know how to handle.\MessageBreak%
- Please contact the maintainer of the pagecolor package!\MessageBreak%
- }%
- % Let us just hope everything got fixed:
- \renewcommand{\nopagecolor}{%
- \xdef\thepagecolor{white}%
- \xdef\thepagecolornone{none}%
- \orignopagecolour%
- % That will not have any effect except when things got fixed!
- }%
- }{% else: older package version
- \PackageWarning{pagecolor}{%
- \string\nopagecolor\space does not work with\MessageBreak%
- the used crop package. Using\MessageBreak%
- \pagecolor@nopagecolor\MessageBreak%
- as nopagecolor now\MessageBreak%
- }%
- \def\pagecolourtmpb{none}%
- \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
- \ifx\pagecolourtmpa\pagecolourtmpb%
- \PackageWarning{pagecolor}{%
- Option nopagecolor=none requested \MessageBreak%
- but this does not work with the crop package.\MessageBreak%
- By option nopagecolor the "colour" to be used with %
- \string\nopagecolor\MessageBreak%
- is set. The current value is "none" (maybe by default),%
- \MessageBreak%
- but the crop package broke \string\nopagecolor .\MessageBreak%
- Therefore the colour cannot be "none".\MessageBreak%
- Please change the option accordingly!\MessageBreak%
- As first aid nopagecolor is now set to white\MessageBreak%
- }%
- \setkeys{pagecolor}{nopagecolor=white}%
- \fi%
- \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+\gdef\pagecolor@cl{0}%
+\@ifpackageloaded{crop}{% crop loaded
+ \gdef\pagecolor@cl{1}%
+ \@ifpackagelater{crop}{2003/05/21}{%
+ % later than 2003/05/20 v1.9 might be OK
+ \PackageWarning{pagecolor}{%
+ \string\nopagecolor\space did not work with package\MessageBreak%
+ crop 2003/05/20 v1.9. A newer version is used, \MessageBreak%
+ which the pagecolor package does not know how to handle.\MessageBreak%
+ Please contact the maintainer of the pagecolor package!\MessageBreak%
}%
- }{% crop not loaded
- \def\pagecolourtmpa{0}
- \ifluatex\def\pagecolourtmpa{1}\fi
- \ifpdf\def\pagecolourtmpa{1}\fi
- \def\pagecolourtmpb{1}
- \ifx\pagecolourtmpa\pagecolourtmpb\relax%
- \def\pagecolourtmpa{none}%
- \else%
- \def\pagecolourtmpa{\pagecolor@nopagecolor}%
- \fi%
+ % Let us just hope everything got fixed:
\renewcommand{\nopagecolor}{%
\xdef\thepagecolor{white}%
- \xdef\thepagecolornone{\pagecolourtmpa}%
+ \xdef\thepagecolornone{none}%
\orignopagecolour%
+ % That will not have any effect except when things got fixed!
}%
- }%
+ }{% else: older package version
+ \PackageWarning{pagecolor}{%
+ \string\nopagecolor\space does not work with\MessageBreak%
+ the used crop package. Using\MessageBreak%
+ \pagecolor@nopagecolor\MessageBreak%
+ as nopagecolor now\MessageBreak%
+ }%
+ \def\pagecolourtmpb{none}%
+ \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+ \ifx\pagecolourtmpa\pagecolourtmpb%
+ \PackageWarning{pagecolor}{%
+ Option nopagecolor=none requested \MessageBreak%
+ but this does not work with the crop package.\MessageBreak%
+ By option nopagecolor the "colour" to be used with %
+ \string\nopagecolor\MessageBreak%
+ is set. The current value is "none" (maybe by default),%
+ \MessageBreak%
+ but the crop package broke \string\nopagecolor .\MessageBreak%
+ Therefore the colour cannot be "none".\MessageBreak%
+ Please change the option accordingly!\MessageBreak%
+ As first aid nopagecolor is now set to white\MessageBreak%
+ }%
+ \setkeys{pagecolor}{nopagecolor=white}%
+ \fi%
+ \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+ }%
+ }{% crop not loaded
+ \def\pagecolourtmpa{0}%
+ \ifluatex\def\pagecolourtmpa{1}\fi%
+ \ifpdf\def\pagecolourtmpa{1}\fi%
+ \def\pagecolourtmpb{1}%
+ \ifx\pagecolourtmpa\pagecolourtmpb\relax%
+ \gdef\pagecolourtmpa{none}%
+ \else%
+ \gdef\pagecolourtmpa{\pagecolor@nopagecolor}%
+ \fi%
+ \renewcommand{\nopagecolor}{%
+ \xdef\thepagecolor{white}%
+ \xdef\thepagecolornone{\pagecolourtmpa}%
+ \orignopagecolour%
+ }%
}
\pagecolor{\pagecolor@pagecolor}
@@ -237,6 +236,58 @@
\gdef\pagecolourtmpc{\thepagecolor}
+\AtBeginDocument{%
+ \def\pagecolourtmpb{0}%
+ \ifx\pagecolor@cl\pagecolourtmpb\relax%
+ % crop not loaded before pagecolor, but maybe afterwards:
+ \@ifpackageloaded{crop}{% crop indeed loaded afterwards.
+ \gdef\pagecolor@cl{1}%
+ \@ifpackagelater{crop}{2003/05/21}{%
+ % later than 2003/05/20 v1.9 might be OK
+ \PackageWarning{pagecolor}{%
+ \string\nopagecolor\space did not work with package\MessageBreak%
+ crop 2003/05/20 v1.9. A newer version is used, \MessageBreak%
+ which the pagecolor package does not know how to handle.\MessageBreak%
+ Please contact the maintainer of the pagecolor package!\MessageBreak%
+ }%
+ % Let us just hope everything got fixed:
+ \renewcommand{\nopagecolor}{%
+ \xdef\thepagecolor{white}%
+ \xdef\thepagecolornone{none}%
+ \orignopagecolour%
+ % That will not have any effect except when things got fixed!
+ }%
+ }{% else: older package version
+ \PackageWarning{pagecolor}{%
+ \string\nopagecolor\space does not work with\MessageBreak%
+ the used crop package. Using\MessageBreak%
+ \pagecolor@nopagecolor\MessageBreak%
+ as nopagecolor now\MessageBreak%
+ }%
+ \def\pagecolourtmpb{none}%
+ \edef\pagecolourtmpa{\pagecolor@nopagecolor}%
+ \ifx\pagecolourtmpa\pagecolourtmpb%
+ \PackageWarning{pagecolor}{%
+ Option nopagecolor=none requested \MessageBreak%
+ but this does not work with the crop package.\MessageBreak%
+ By option nopagecolor the "colour" to be used with %
+ \string\nopagecolor\MessageBreak%
+ is set. The current value is "none" (maybe by default),%
+ \MessageBreak%
+ but the crop package broke \string\nopagecolor .\MessageBreak%
+ Therefore the colour cannot be "none".\MessageBreak%
+ Please change the option accordingly!\MessageBreak%
+ As first aid nopagecolor is now set to white\MessageBreak%
+ }%
+ \setkeys{pagecolor}{nopagecolor=white}%
+ \fi%
+ \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+ }%
+ }{% crop neither loaded afterwards.
+ }%
+ \fi%
+ }
+
\endinput
%%
%% End of file `pagecolor.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pagecolor.tlpobj new/tlpkg/tlpobj/pagecolor.tlpobj
--- old/tlpkg/tlpobj/pagecolor.tlpobj 2015-06-24 03:20:31.000000000 +0200
+++ new/tlpkg/tlpobj/pagecolor.tlpobj 2016-04-14 19:32:06.000000000 +0200
@@ -1,7 +1,7 @@
name pagecolor
category Package
-revision 37646
-shortdesc Interrogate page colour.
+revision 38249
+shortdesc Interrogate page colour
relocated 1
longdesc This package provides the command \thepagecolor, which gives
longdesc the current page (background) colour, i. e. the argument used
@@ -13,7 +13,7 @@
runfiles size=3
RELOC/tex/latex/pagecolor/pagecolor.sty
catalogue-ctan /macros/latex/contrib/pagecolor
-catalogue-date 2015-06-22 19:09:16 +0200
+catalogue-date 2015-08-30 17:27:39 +0200
catalogue-license lppl1.3
catalogue-topics colour
-catalogue-version 1.0g
+catalogue-version 1.0h
++++++ pagecont.doc.tar.xz ++++++
++++++ pagecont.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pagecont.tlpobj new/tlpkg/tlpobj/pagecont.tlpobj
--- old/tlpkg/tlpobj/pagecont.tlpobj 2015-04-13 02:09:07.000000000 +0200
+++ new/tlpkg/tlpobj/pagecont.tlpobj 2016-04-14 19:32:06.000000000 +0200
@@ -1,7 +1,7 @@
name pagecont
category Package
revision 15878
-shortdesc Page numbering that continues between documents.
+shortdesc Page numbering that continues between documents
relocated 1
longdesc The package provides the facility that several documents can be
longdesc typeset independently with page numbers in sequence, as if they
@@ -9,6 +9,7 @@
runfiles size=1
RELOC/tex/latex/pagecont/pagecont.sty
catalogue-ctan /macros/latex/contrib/pagecont
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics page-nos
catalogue-version 1.0
++++++ pagenote.doc.tar.xz ++++++
++++++ pagenote.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pagenote.tlpobj new/tlpkg/tlpobj/pagenote.tlpobj
--- old/tlpkg/tlpobj/pagenote.tlpobj 2015-04-13 02:09:07.000000000 +0200
+++ new/tlpkg/tlpobj/pagenote.tlpobj 2016-04-14 19:32:06.000000000 +0200
@@ -1,14 +1,16 @@
name pagenote
category Package
revision 15878
-shortdesc Notes at end of document.
+shortdesc Notes at end of document
relocated 1
longdesc The pagenote package provides tagged notes on a separate page
longdesc (also known as 'end notes'). Unless the memoir class is used,
longdesc the package requires the ifmtarg package.
runfiles size=2
RELOC/tex/latex/pagenote/pagenote.sty
+catalogue-also endnote
catalogue-ctan /macros/latex/contrib/pagenote
-catalogue-date 2011-11-22 17:27:41 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics notes
catalogue-version 1.1a
++++++ pagerange.doc.tar.xz ++++++
++++++ pagerange.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pagerange.tlpobj new/tlpkg/tlpobj/pagerange.tlpobj
--- old/tlpkg/tlpobj/pagerange.tlpobj 2015-04-13 02:09:08.000000000 +0200
+++ new/tlpkg/tlpobj/pagerange.tlpobj 2016-04-14 19:32:06.000000000 +0200
@@ -1,7 +1,7 @@
name pagerange
category Package
revision 16915
-shortdesc Flexible and configurable page range typesetting.
+shortdesc Flexible and configurable page range typesetting
relocated 1
longdesc The package defines a command \pagerange that typesets ranges
longdesc of page numbers, expanding them (e.g., adding first or last
@@ -10,6 +10,7 @@
RELOC/tex/latex/pagerange/pagerange-guide.cfg
RELOC/tex/latex/pagerange/pagerange.sty
catalogue-ctan /macros/latex/contrib/pagerange
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics label-ref macro-supp
catalogue-version 0.5
++++++ pageslts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pageslts/README new/doc/latex/pageslts/README
--- old/doc/latex/pageslts/README 2015-08-02 23:30:38.000000000 +0200
+++ new/doc/latex/pageslts/README 2015-12-22 00:28:45.000000000 +0100
@@ -1,4 +1,4 @@
-README for pageslts package, 2015/08/02, v1.2d
+README for pageslts package, 2015/12/21, v1.2f
TABLE OF CONTENTS
@@ -134,7 +134,7 @@
=====================
The pageslts.sty for LaTeX2e (i. e. all documents using the
- pageslts package) requires:
+pageslts package) requires:
- TeXFormat LaTeX2e, 2015/01/01
- package atveryend, 2011/06/30, v1.8, https://www.ctan.org/pkg/atveryend
- package everyshi, 2001/05/15, v3.00, https://www.ctan.org/pkg/everyshi
@@ -145,13 +145,13 @@
- package undolabl, 2015/03/29, v1.0l, https://www.ctan.org/pkg/undolabl
The pageslts-example.tex requires the same files as all
- documents using the pageslts package, and additionally:
+documents using the pageslts package, and additionally:
- class article, 2014/09/29, v1.4h, from classes.dtx: https://www.ctan.org/pkg/classes
- package alphalph, 2011/05/13, v2.4, https://www.ctan.org/pkg/alphalph
- package lipsum, 2014/07/27, v1.3, https://www.ctan.org/pkg/lipsum
- package showkeys, 2014/10/28, v3.17, https://www.ctan.org/pkg/showkeys
- package hyperref, 2012/11/06, v6.83m, https://www.ctan.org/pkg/hyperref
-- package pageslts, 2015/08/02, v1.2d, https://www.ctan.org/pkg/pageslts
+- package pageslts, 2015/12/21, v1.2f, https://www.ctan.org/pkg/pageslts
(Well, it is the example file for this package, and
because you are reading the README for the pageslts
package, it can be assumed that you already have some
Files old/doc/latex/pageslts/pageslts-example.pdf and new/doc/latex/pageslts/pageslts-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pageslts/pageslts-example.tex new/doc/latex/pageslts/pageslts-example.tex
--- old/doc/latex/pageslts/pageslts-example.tex 2015-08-02 23:30:38.000000000 +0200
+++ new/doc/latex/pageslts/pageslts-example.tex 2015-12-22 00:28:45.000000000 +0100
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pageslts
-%% Version: 2015/08/02 v1.2d
+%% Version: 2015/12/21 v1.2f
%%
%% Copyright (C) 2010 - 2015 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -87,7 +87,7 @@
bookmarksopen=true%
}
\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,%
- romanMult=true,RomanMulti=true]{pageslts}[2015/08/02]% v1.2d
+ romanMult=true,RomanMulti=true]{pageslts}[2015/12/21]% v1.2f
%% These are the default options. %%
\makeatletter
@@ -119,7 +119,7 @@
\markboth{Example for pageslts}{Example for pageslts}
This example demonstrates the most common uses of package\\
-\textsf{pageslts}, v1.2d as of 2015/08/02 (HMM).\\
+\textsf{pageslts}, v1.2f as of 2015/12/21 (HMM).\\
The used options were \texttt{pagecontinue=true},
\texttt{alphMult=ab}, \texttt{AlphMulti=AB}, \linebreak
\texttt{fnsymbolmult=true},
Files old/doc/latex/pageslts/pageslts.pdf and new/doc/latex/pageslts/pageslts.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pageslts.doc.tlpobj new/tlpkg/tlpobj/pageslts.doc.tlpobj
--- old/tlpkg/tlpobj/pageslts.doc.tlpobj 2015-08-03 03:20:19.000000000 +0200
+++ new/tlpkg/tlpobj/pageslts.doc.tlpobj 2016-04-14 19:32:07.000000000 +0200
@@ -1,9 +1,9 @@
name pageslts.doc
category Package
-revision 38025
+revision 39164
shortdesc doc files of pageslts
relocated 1
-docfiles size=243
+docfiles size=244
RELOC/doc/latex/pageslts/README
RELOC/doc/latex/pageslts/pageslts-example.pdf
RELOC/doc/latex/pageslts/pageslts-example.tex
++++++ pageslts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pageslts/pageslts.sty new/tex/latex/pageslts/pageslts.sty
--- old/tex/latex/pageslts/pageslts.sty 2015-08-02 23:30:38.000000000 +0200
+++ new/tex/latex/pageslts/pageslts.sty 2015-12-22 00:28:45.000000000 +0100
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pageslts
-%% Version: 2015/08/02 v1.2d
+%% Version: 2015/12/21 v1.2f
%%
%% Copyright (C) 2010 - 2015 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -67,7 +67,7 @@
%% Hans-Klaus Muench + 2014/08/24
%%
\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-\ProvidesPackage{pageslts}[2015/08/02 v1.2d
+\ProvidesPackage{pageslts}[2015/12/21 v1.2f
Refers to special pages' numbers/names (HMM)]
%% Allows for things like\\
@@ -108,15 +108,16 @@
\RequirePackage{ltxcmds}[2011/11/09]% v1.22
\RequirePackage{atveryend}[2011/06/30]% v1.8
-\listfiles
-\AtBeginDocument{% https://tex.stackexchange.com/a/45654/6865
+\AtBeginDocument{%
+ %% https://tex.stackexchange.com/a/45654/6865
+ %% and https://tex.stackexchange.com/q/261445/6865
\def\pagesLTS@etb{etoolbox.sty}%
\let\pagesLTS@ave\@empty%
- \@for\@currname:=\@filelist\do{%
- \ifx\@currname\pagesLTS@etb\relax%
+ \@for\@pageslts@currname:=\@filelist\do{%
+ \ifx\@pageslts@currname\pagesLTS@etb\relax%
\def\pagesLTS@ave{atveryend.sty}%
\fi%
- \ifx\@currname\pagesLTS@ave%
+ \ifx\@pageslts@currname\pagesLTS@ave%
\@ifpackagelater{atveryend}{2015/08/01}{%\relax
\PackageInfo{pageslts}{etoolbox package loaded before atveryend package\MessageBreak%
With atveryend version 1.8 of 2011/06/30 this caused a problem,\MessageBreak%
@@ -144,11 +145,10 @@
%% pageslts package uses Prelim@EveryShipout code from the
%% prelim2e package [2009/05/29 v1.3] by Martin Schr\"{o}der, thanks!
-%% pageslts may work with earlier versions of those packages,
-%% but this was not tested. Please consider updating your packages
-%% to the most recent version (if they are not already the most
-%% recent version).
-
+%% pageslts may work with earlier versions of LaTeX2e and those packages,
+%% but this was not tested. Please consider updating your LaTeX
+%% and packages to the most recent version (if they are not already
+%% the most recent version).
%% The recent version of the endfloat package is v2.5d as of 2011/12/25.
%% The pageslts package is not fully compatible with version 2.0
%% (and earlier) of the endfloat package, because those versions
@@ -264,7 +264,7 @@
\fi
\ifpagesLTS@fnsymbolmult%
-\RequirePackage{alphalph}[2011/05/13]% v2.4
+ \RequirePackage{alphalph}[2011/05/13]% v2.4
\fi
\ifpagesLTS@romanMult%
@@ -997,7 +997,7 @@
your current endfloat package.\MessageBreak%
}%
}%
- {\PackageError{pageslts}{Incompatible, very old endfloat package detected.}%
+ }{\PackageError{pageslts}{Incompatible, very old endfloat package detected.}%
{The very old version 2.0 (and earlier) of the\MessageBreak%
endfloat package actually redefined the \string\enddocument ,\MessageBreak%
and so interfered drastically with the LaTeX2e commands\MessageBreak%
@@ -1010,7 +1010,6 @@
for use with the pageslts package.\MessageBreak %
}%
}%
- }%
}{}%
\@ifpackageloaded{lastpage}%
{\@ifpackagelater{lastpage}{2010/07/28}% 2010/07/29 v1.2a
@@ -1050,7 +1049,7 @@
{\PackageWarningNoLine{pageslts}{Package pdfpages detected.\MessageBreak%
Using hyperref with pdfpages can cause problems. See\MessageBreak%
https://www.ctan.org/pkg/pax\MessageBreak%
- for the Pdf Annotations eXtractor, pax.\MessageBreak%
+ for the Pdf Annotations eXtractor, pax%
}%
}{% \relax
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pageslts.tlpobj new/tlpkg/tlpobj/pageslts.tlpobj
--- old/tlpkg/tlpobj/pageslts.tlpobj 2015-08-03 03:20:20.000000000 +0200
+++ new/tlpkg/tlpobj/pageslts.tlpobj 2016-04-14 19:32:07.000000000 +0200
@@ -1,7 +1,7 @@
name pageslts
category Package
-revision 38025
-shortdesc Variants of last page labels.
+revision 39164
+shortdesc Variants of last page labels
relocated 1
longdesc The package was designed as an extension of the lastpage
longdesc package -- as well as that package's LastPage label (created
@@ -15,7 +15,7 @@
runfiles size=12
RELOC/tex/latex/pageslts/pageslts.sty
catalogue-ctan /macros/latex/contrib/pageslts
-catalogue-date 2015-08-02 20:19:27 +0200
+catalogue-date 2015-12-21 20:12:41 +0100
catalogue-license lppl1.3
catalogue-topics label-ref
-catalogue-version 1.2d
+catalogue-version 1.2f
++++++ palatino.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/palatino.tlpobj new/tlpkg/tlpobj/palatino.tlpobj
--- old/tlpkg/tlpobj/palatino.tlpobj 2015-04-13 02:09:09.000000000 +0200
+++ new/tlpkg/tlpobj/palatino.tlpobj 2016-04-14 19:32:07.000000000 +0200
@@ -2,7 +2,7 @@
category Package
revision 31835
catalogue urw-base35
-shortdesc URW "Base 35" font pack for LaTeX.
+shortdesc URW "Base 35" font pack for LaTeX
relocated 1
longdesc A set of fonts for use as "drop-in" replacements for Adobe's
longdesc basic set, comprising: Century Schoolbook (substituting for
@@ -236,6 +236,8 @@
RELOC/tex/latex/palatino/ot1upl.fd
RELOC/tex/latex/palatino/t1upl.fd
RELOC/tex/latex/palatino/ts1upl.fd
+catalogue-also tex-gyre
catalogue-ctan /fonts/urw/base35
-catalogue-date 2014-06-07 20:47:53 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics font font-type1 font-collection
++++++ paper.doc.tar.xz ++++++
++++++ paper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paper.tlpobj new/tlpkg/tlpobj/paper.tlpobj
--- old/tlpkg/tlpobj/paper.tlpobj 2015-04-13 02:09:11.000000000 +0200
+++ new/tlpkg/tlpobj/paper.tlpobj 2016-04-14 19:32:09.000000000 +0200
@@ -1,7 +1,7 @@
name paper
category Package
revision 34521
-shortdesc Versions of article class, tuned for scholarly publications.
+shortdesc Versions of article class, tuned for scholarly publications
relocated 1
longdesc A pair of classes derived from article, tuned for producing
longdesc papers for journals. The classes introduce new layout options
@@ -14,6 +14,7 @@
RELOC/tex/latex/paper/paper.cls
RELOC/tex/latex/paper/paper.sty
catalogue-ctan /macros/latex/contrib/paper
-catalogue-date 2012-01-13 09:08:17 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics journalpub
catalogue-version 1.0l
++++++ papercdcase.doc.tar.xz ++++++
++++++ papercdcase.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/papercdcase.tlpobj new/tlpkg/tlpobj/papercdcase.tlpobj
--- old/tlpkg/tlpobj/papercdcase.tlpobj 2015-04-13 02:09:11.000000000 +0200
+++ new/tlpkg/tlpobj/papercdcase.tlpobj 2016-04-14 19:32:09.000000000 +0200
@@ -1,12 +1,13 @@
name papercdcase
category Package
revision 15878
-shortdesc Origami-style folding paper CD case.
+shortdesc Origami-style folding paper CD case
relocated 1
longdesc This package implements a LaTeX style file to produce origami-
longdesc style folding paper CD cases.
runfiles size=6
RELOC/tex/latex/papercdcase/papercdcase.sty
catalogue-ctan /macros/latex/contrib/papercdcase
-catalogue-date 2012-06-11 12:09:17 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics covers
++++++ papermas.doc.tar.xz ++++++
++++++ papermas.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/papermas.tlpobj new/tlpkg/tlpobj/papermas.tlpobj
--- old/tlpkg/tlpobj/papermas.tlpobj 2015-04-13 02:09:12.000000000 +0200
+++ new/tlpkg/tlpobj/papermas.tlpobj 2016-04-14 19:32:09.000000000 +0200
@@ -1,7 +1,7 @@
name papermas
category Package
revision 23667
-shortdesc Compute the mass of a printed version of a document.
+shortdesc Compute the mass of a printed version of a document
relocated 1
longdesc The package computes the number of sheets of paper used by, and
longdesc hence the mass of a document. This is useful (for example) when
@@ -9,6 +9,7 @@
runfiles size=3
RELOC/tex/latex/papermas/papermas.sty
catalogue-ctan /macros/latex/contrib/papermas
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics calculation
catalogue-version 1.0h
++++++ papertex.doc.tar.xz ++++++
++++++ papertex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/papertex.tlpobj new/tlpkg/tlpobj/papertex.tlpobj
--- old/tlpkg/tlpobj/papertex.tlpobj 2015-04-13 02:09:12.000000000 +0200
+++ new/tlpkg/tlpobj/papertex.tlpobj 2016-04-14 19:32:10.000000000 +0200
@@ -1,7 +1,7 @@
name papertex
category Package
revision 19230
-shortdesc Class for newspapers, etc.
+shortdesc Class for newspapers, etc
relocated 1
longdesc This class allows LaTeX users to create a paperTeX newspaper.
longdesc The final document has a front page and as many inner pages as
@@ -11,6 +11,7 @@
runfiles size=6
RELOC/tex/latex/papertex/papertex.cls
catalogue-ctan /macros/latex/contrib/papertex
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics magazine
catalogue-version 1.2b
++++++ paracol.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/README new/doc/latex/paracol/README
--- old/doc/latex/paracol/README 2013-11-09 00:43:59.000000000 +0100
+++ new/doc/latex/paracol/README 2015-10-13 00:17:41.000000000 +0200
@@ -1,4 +1,4 @@
-paracol (v1.31): a multi-column package to typeset columns in "parallel".
+paracol (v1.32): a multi-column package to typeset columns in "parallel".
===
Copyright (C) 2005-2013
Hiroshi Nakashima
@@ -102,7 +102,12 @@
- \backgroundcolor{<regino>}{<color>}[<mode>] to paint the background of a
<region> by <color> (*NEW* for v1.3).
-- A few bugs found in v1.22 have been fixed.
+- \globalcounter* to make all counters global (*NEW* for v1.32).
+
+- Compatible with the new implemenatation of LaTeX (2015/01/10 or
+ later) now (*NEW* for v 1.32).
+
+- A bug found in v1.31 has been fixed.
Enjoy!
Files old/doc/latex/paracol/paracol-man.pdf and new/doc/latex/paracol/paracol-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/paracol-man.tex new/doc/latex/paracol/paracol-man.tex
--- old/doc/latex/paracol/paracol-man.tex 2013-11-09 00:43:59.000000000 +0100
+++ new/doc/latex/paracol/paracol-man.tex 2015-10-13 00:17:41.000000000 +0200
@@ -1,5 +1,5 @@
%% LaTeX file 'paracol-man'.
-%% Copyright (C) 2005-2013
+%% Copyright (C) 2005-2015
%% Hiroshi Nakashima
%% (Kyoto University)
%% This program can be redistributed and/or modified under the terms
@@ -8,7 +8,7 @@
%% version 1 of the License, or any later version.
\ProvidesFile{paracol-man.tex}
-[2013/10/10 v1.31 ]
+[2015/10/10 v1.32 ]
\documentclass{ltxdoc}\normalmarginpar
\usepackage{color}
\usepackage{paracol}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paracol.doc.tlpobj new/tlpkg/tlpobj/paracol.doc.tlpobj
--- old/tlpkg/tlpobj/paracol.doc.tlpobj 2015-04-13 02:09:14.000000000 +0200
+++ new/tlpkg/tlpobj/paracol.doc.tlpobj 2016-04-14 19:32:11.000000000 +0200
@@ -1,9 +1,9 @@
name paracol.doc
category Package
-revision 32099
+revision 38621
shortdesc doc files of paracol
relocated 1
-docfiles size=81
+docfiles size=154
RELOC/doc/latex/paracol/README
RELOC/doc/latex/paracol/paracol-man.pdf
RELOC/doc/latex/paracol/paracol-man.tex
++++++ paracol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paracol/paracol.sty new/tex/latex/paracol/paracol.sty
--- old/tex/latex/paracol/paracol.sty 2013-11-09 00:43:59.000000000 +0100
+++ new/tex/latex/paracol/paracol.sty 2015-10-13 00:17:41.000000000 +0200
@@ -1,5 +1,5 @@
%% Style file `paracol'.
-%% Copyright (C) 2005-2013
+%% Copyright (C) 2005-2015
%% Hiroshi Nakashima
%% (Kyoto University)
%% This program can be redistributed and/or modified under the terms
@@ -9,7 +9,7 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{paracol}
-[2013/10/10 v1.31 ]
+[2015/10/10 v1.32 ]
%% Register Declaration
@@ -88,6 +88,23 @@
\def\pcol@Logfn@i#1{}
\pcol@LogLevel111
+\iffalse
+\newwrite\pcol@F@write
+\immediate\openout\pcol@F@write\jobname.fls
+\fi
+\def\pcol@F#1{\pcol@FF{#1}{}}
+\def\pcol@FF#1#2{\pcol@F@count
+ \immediate\write\pcol@F@write{#1(\number\pcol@page:\number\pcol@currcol/%
+ \number\pcol@toppage:\number\c@page)=\pcol@F@n #2}}
+\def\pcol@F@count{{\@tempcnta\z@
+ \def\@elt##1{\advance\@tempcnta\@ne}\@freelist
+ \xdef\pcol@F@n{\number\@tempcnta}}}
+\let\pcol@Fb\pcol@F@count
+\def\pcol@Fe#1{{\let\reserved@a\pcol@F@n \pcol@FF{#1}{<=\reserved@a}}}
+\let\pcol@F\@gobble
+\let\pcol@Fb\relax
+\let\pcol@Fe\@gobble
+
%% \output Routine
\def\pcol@ovf{%
@@ -160,7 +177,9 @@
\setbox\@cclv\vbox{\pcol@unvbox@cclv\footins}%
\ifnum\pcol@page=\pcol@toppage
\pcol@Log\pcol@makecol{save}\footins
+ \pcol@Fb
\pcol@savefootins\pcol@currfoot
+ \pcol@Fe{makecol(pagefn)}%
\else
\pcol@Log\pcol@makecol{discard}\footins
\setbox\@tempboxa\box\footins
@@ -205,13 +224,17 @@
\vskip\pcol@textfloatsep
\unvbox\@outputbox}%
\let\@elt\relax
+ \pcol@Fb
\xdef\@freelist{\@freelist\@toplist}%
+ \pcol@Fe{cflt}%
\global\let\@toplist\@empty}
\def\pcol@opcol{%
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox to\@colht{
\boxmaxdepth\@maxdepth
\pcol@clearcst@unvbox\@outputbox}}\pcol@ovf
+ \pcol@Fe{opcol}%
\expandafter\@cons\csname pcol@shipped\number\pcol@currcol\endcsname\@currbox
\ifnum\pcol@currcol=\z@ \pcol@setpageno \fi
\pcol@nextpage
@@ -300,11 +323,13 @@
\fi
\global\@colht\textheight
\global\topskip\pcol@topskip
- \@dblfloatplacement
+ \@dblfloatplacement \let\f@depth\z@
\@tryfcolumn\@dbldeferlist
\@whilesw\if@fcolmade\fi{%
+ \pcol@Fb
\@next\@currbox\@freelist{%
\global\setbox\@currbox\box\@outputbox}\pcol@ovf
+ \pcol@Fe{startpage(fcol)}%
\global\dimen\@currbox-\maxdimen
\global\skip\@currbox\pcol@topskip
\@cons\pcol@pages{{\number\c@page}\@currbox\voidb@x{}{}}%
@@ -312,10 +337,12 @@
\global\advance\pcol@page\@ne \global\pcol@toppage\pcol@page
\@tryfcolumn\@dbldeferlist}%
\begingroup
- \let\reserved@b\@dbldeferlist
- \global\let\@dbldeferlist\@empty
+ \let\reserved@b\@dbldeferlist \let\reserved@c\@deferlist
+ \global\let\@dbldeferlist\@empty \global\let\@deferlist\@empty
\let\@elt\@sdblcolelt
\reserved@b
+ \let\@elt\relax \xdef\@dbldeferlist{\@dbldeferlist\@deferlist}%
+ \global\let\@deferlist\reserved@c
\endgroup
\ifx\@dbltoplist\@empty
\pcol@defcurrpage{\number\c@page}\voidb@x\voidb@x{}{}%
@@ -325,11 +352,15 @@
\let\@elt\@comdblflelt
\@dbltoplist
\let\@elt\relax
+ \pcol@Fb
\xdef\@freelist{\@freelist\@dbltoplist}%
+ \pcol@Fe{startpage(dbltop)}%
\global\let\@dbltoplist\@empty
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{%
\unvbox\@tempboxa \vskip-\dblfloatsep \dblfigrule
\vskip\dbltextfloatsep}}\pcol@ovf
+ \pcol@Fe{startpage(spanning)}%
\global\dimen\@currbox\@colht
\global\skip\@currbox\pcol@topskip
\pcol@defcurrpage{\number\c@page}\@currbox\voidb@x{}{}%
@@ -352,7 +383,9 @@
\def\pcol@bg@floatheight{\pcol@bg@textheight}%
\setbox\@outputbox\vbox to\textheight{%
\pcol@bg@paintbox{Ff}\unvbox\pcol@spanning}%
+ \pcol@Fb
\@cons\@freelist\pcol@spanning
+ \pcol@Fe{outputelt(spanning)}%
\ifnum\pcol@ncolleft<\pcol@ncol
\setbox\pcol@rightpage\vbox to\textheight{%
\ifpcol@paired\else \advance\c@page\@ne \fi
@@ -393,7 +426,9 @@
\@tempdimb\ht\pcol@spanning \advance\@tempdimb\dp\pcol@spanning
\ifnum#1=\z@
\ifpcol@firstpage\else \pcol@bg@paintbox{Ff}\fi
+ \pcol@Fb
\@cons\@freelist\pcol@spanning \unvbox\pcol@spanning
+ \pcol@Fe{ioutputelt(spanning)}%
\else\ifpcol@firstpage
\ht\pcol@rightpage\ht\pcol@spanning
\dp\pcol@rightpage\dp\pcol@spanning
@@ -411,7 +446,11 @@
\expandafter\@next\expandafter\@currbox
\csname pcol@shipped\number\@tempcntb\endcsname
\relax{\let\@currbox\voidb@x}%
- \ifvoid\@currbox\else \@cons\@freelist\@currbox \fi
+ \ifvoid\@currbox\else
+ \pcol@Fb
+ \@cons\@freelist\@currbox
+ \pcol@Fe{ioutputelt(page)}%
+ \fi
\expandafter\@tempdima
\csname pcol@columnwidth\number\@tempcntb \endcsname
\pcol@@hfil \hb@xt@\@tempdima{\box\@currbox\hss}%
@@ -421,7 +460,9 @@
\ifnum#1=\z@
\pcol@Log\pcol@outputelt{output}\pcol@footins
\pcol@putfootins\pcol@footins
+ \pcol@Fb
\@cons\@freelist\pcol@footins
+ \pcol@Fe{ioutputelt(footins)}%
\else
\vskip\skip\pcol@footins \nointerlineskip
\pcol@phantom\pcol@footins \vskip\z@
@@ -577,6 +618,11 @@
\pcol@getcurrfoot\copy
\pcol@Log\pcol@startcolumn{insert}\footins
\insert\footins{\unvbox\footins}%
+ \ifnum\pcol@page=\pcol@toppage
+ \pcol@Fb
+ \@cons\@freelist\pcol@footins
+ \pcol@Fe{startcolumn(pagefn)}%
+ \fi
\fi
\ifnum\pcol@page=\pcol@toppage
\pcol@deferredfootins\pcol@startcolumn \fi
@@ -834,6 +880,7 @@
\global\pcol@page\z@ \global\pcol@toppage\z@ \global\pcol@basepage\z@
\global\let\pcol@pages\@empty
\global\let\@dbldeferlist\@deferlist \global\let\@deferlist\@empty
+ {\def\@elt##1{\global\dp##1\z@}\@dbldeferlist}%
\setbox\z@\box\pcol@topfnotes
\@tempdima\@colroom
\advance\@tempdima-\ht\@holdpg \advance\@tempdima-\dp\@holdpg
@@ -862,9 +909,11 @@
\let\pcol@bg@preposttop\pcol@bg@preposttop@right
\reserved@a \unvbox\pcol@rightpage}%
\fi
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{%
\let\pcol@bg@preposttop\pcol@bg@preposttop@left
\reserved@a \unvbox\@outputbox}}\pcol@ovf
+ \pcol@Fe{output@start(preenv)}%
\global\dimen\@currbox\@colht
\ifdim\@tempdima=\z@ \@tempskipa\topskip \else \@tempskipa\z@ \fi
\global\skip\@currbox\@tempskipa \global\topskip\@tempskipa
@@ -878,8 +927,10 @@
\fi
\global\@colroom\@colht \pcol@floatplacement
\pcol@currcol\z@ \@whilenum\pcol@currcol<\pcol@ncol\do{%
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{%
\ifdim\topskip=\z@ \hrule\@height\z@\@width\z@ \fi}}\pcol@ovf
+ \pcol@Fe{output@start(col)}%
\pcol@setcurrcolnf
\global\count\@currbox\z@
\global\dimen\@currbox\@colroom
@@ -888,7 +939,9 @@
\global\pcol@currcol\z@
\pcol@getcurrcol
\pcol@savecolorstack
+ \pcol@Fb
\@cons\@freelist\@currbox \unvbox\@currbox
+ \pcol@Fe{output@start(col)}%
\ifvoid\footins\else
\pcol@Log\pcol@output@start{insert}\footins
\insert\footins{\box\footins\penalty\interlinepenalty}%
@@ -901,7 +954,9 @@
\ifvoid\footins \setbox\@outputbox\box\@holdpg
\else \pcol@combinefootins\@holdpg\footins
\fi
+ \pcol@Fb
\let\@elt\relax \xdef\@freelist{\@freelist\@midlist}%
+ \pcol@Fe{makenormalcol}%
\global\let\@midlist\@empty
\pcol@combinefloats
\else
@@ -927,15 +982,19 @@
\pcol@shiftspanning\@holdpg
\setbox\@holdpg\vbox{\unvbox\pcol@prespan \unvbox\@holdpg}%
\fi\fi
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{
\pcol@clearcst@unvbox\@holdpg}}\pcol@ovf
+ \pcol@Fe{output@switch}%
\def\pcol@currfoot{\voidb@x}%
\ifvoid\footins\else
\ifpcol@scfnote
\ifnum\pcol@page=\pcol@toppage
\pcol@getcurrpinfo\@tempcnta\@tempdima\@tempskipa
\pcol@Log\pcol@output@switch{save}\footins
+ \pcol@Fb
\pcol@savefootins\pcol@footins
+ \pcol@Fe{output@switch(pagefn)}%
\pcol@defcurrpage{\number\@tempcnta}\pcol@spanning\pcol@footins
{\pcol@sptextlist}{\pcol@mparbottom}%
\else
@@ -944,7 +1003,9 @@
\fi
\else
\pcol@Log\pcol@output@switch{save}\footins
+ \pcol@Fb
\pcol@savefootins\pcol@currfoot
+ \pcol@Fe{output@switch(colfn)}%
\fi
\fi
\ifnum\pcol@currcol=\z@ \pcol@setpageno \fi
@@ -980,7 +1041,9 @@
\pcol@getcurrcol
\global\pcol@page\count\@currbox
\global\@colroom\dimen\@currbox
+ \pcol@Fb
\@cons\@freelist\@currbox
+ \pcol@Fe{restartcolumn(col)}%
\pcol@getcurrpage
\ifpcol@scfnote
\edef\pcol@currfoot{\pcol@footins}%
@@ -989,7 +1052,9 @@
\pcol@putbackmvl
\if@nobreak \nobreak \else \addpenalty\interlinepenalty \fi
\ifvoid\pcol@footins\else
+ \pcol@Fb
\pcol@getcurrfoot\box \@cons\@freelist\pcol@currfoot
+ \pcol@Fe{restartcolumn(pagefn)}%
\pcol@Log\pcol@restartcolumn{insert}\footins
\pcol@shrinkcolbyfn\@colht\footins\@tempdimb
\insert\footins{\unvbox\footins}%
@@ -1008,9 +1073,11 @@
\else
\pcol@putbackmvl
\ifvoid\pcol@currfoot\else
- \pcol@getcurrfoot\box \@cons\@freelist\pcol@currfoot
- \pcol@Log\pcol@restartcolumn{insert}\footins
- \insert\footins{\unvbox\footins}%
+ \pcol@Fb
+ \pcol@getcurrfoot\box \@cons\@freelist\pcol@currfoot
+ \pcol@Fe{restartcolumn(colfn)}%
+ \pcol@Log\pcol@restartcolumn{insert}\footins
+ \insert\footins{\unvbox\footins}%
\fi
\if@nobreak \nobreak \else \addpenalty\interlinepenalty \fi
\fi}
@@ -1394,7 +1461,11 @@
\pcol@lastpagefalse
\pcol@page\count\@currbox
\setbox\@cclv\vbox{\unvbox\@currbox \vfil}%
- \ifvoid\pcol@currfoot\else \@cons\@freelist\pcol@currfoot \fi
+ \ifvoid\pcol@currfoot\else
+ \pcol@Fb
+ \@cons\@freelist\pcol@currfoot
+ \pcol@Fe{flushcolumn(colfn)}%
+ \fi
\pcol@getcurrfoot\box
\pcol@getcurrpage
\ifvoid\pcol@footins
@@ -1424,15 +1495,19 @@
\fi
\@makefcolumn\@deferlist
\if@fcolmade
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\box\@outputbox}%
\pcol@ovf
+ \pcol@Fe{flushcolumn(fcol)}%
\expandafter\@cons
\csname pcol@shipped\number\pcol@currcol\endcsname\@currbox
\fi
\advance\pcol@page\@ne}%
\fi
\ifpcol@lastpagesave \pcol@lastpagetrue \fi
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\vbox{}}\pcol@ovf
+ \pcol@Fe{flushcolumn(col)}%
\pcol@getcurrpinfo\@tempcnta{\global\@colht}\@tempskipa
\@pageht\@colht
\ifvoid\pcol@footins\else \pcol@shrinkcolbyfn\@colht\pcol@footins\relax \fi
@@ -1476,7 +1551,10 @@
\def\pcol@makefcolpage{\vbox to\@colht{
\vskip\@fptop \vskip-\@fpsep
\def\@elt##1{\vskip\@fpsep\box##1}\@toplist \vskip\@fpbot}%
- \xdef\@freelist{\@freelist\@toplist}\global\let\@toplist\@empty}
+ \pcol@Fb
+ \xdef\@freelist{\@freelist\@toplist}\global\let\@toplist\@empty
+ \pcol@Fe{makefcolpage}%
+}
\def\pcol@measurecolumn{%
\pcol@getcurrcol
@@ -1545,9 +1623,11 @@
\ifx\@toplist\@empty
\textfloatsep\z@ \floatsep\z@ \let\topfigrule\relax
\fi
+ \pcol@Fb
\@next\pcol@float\@freelist{\global\setbox\pcol@float\vbox to\z@{
\vskip-\floatsep \topfigrule \vskip\textfloatsep
\unvbox\@currbox \vss}}\pcol@ovf
+ \pcol@Fe{synccolumn(topfloat)}%
\@cons\@toplist\pcol@float
\advance\@tempdimb\textfloatsep \advance\@tempdimb-\floatsep
\advance\@tempdimb\@M\p@
@@ -1599,7 +1679,7 @@
\pcol@flushfloats
\begingroup
\setbox\pcol@rightpage\box\voidb@x
- \@dblfloatplacement
+ \@dblfloatplacement \let\f@depth\z@
\@makefcolumn\@dbldeferlist
\@whilesw\if@fcolmade\fi{%
\def\pcol@bg@floatheight{\pcol@bg@textheight}%
@@ -1635,7 +1715,9 @@
\reserved@a \unvbox\pcol@spanning
\ifpcol@firstpage\else \if@tempswa\else \unskip \fi\fi}%
\global\setbox\@outputbox\vbox{\box\@outputbox}%
+ \pcol@Fb
\@cons\@freelist\pcol@spanning
+ \pcol@Fe{makeflushedpage(spanning)}%
\ifnum\pcol@ncolleft<\pcol@ncol
\global\setbox\pcol@rightpage\vbox{%
\ifpcol@paired\else \advance\c@page\@ne \fi
@@ -1678,7 +1760,9 @@
\fi
\global\setbox\@outputbox\vbox{%
\unvbox\@outputbox \pcol@putfootins\pcol@footins}%
+ \pcol@Fb
\@cons\@freelist\pcol@footins \gdef\pcol@footins{\voidb@x}%
+ \pcol@Fe{makeflushedpage(pagefn)}%
\ifdim\pcol@colht=-\maxdimen \global\pcol@colht\z@ \fi
\fi
\fi
@@ -1701,7 +1785,11 @@
\pcol@swapcolumn\@tempcntb\pcol@currcol#1#2\relax
\pcol@getcurrcol
\setbox\@cclv\box\@currbox
- \ifvoid\pcol@currfoot\else \@cons\@freelist\pcol@currfoot \fi
+ \ifvoid\pcol@currfoot\else
+ \pcol@Fb
+ \@cons\@freelist\pcol@currfoot
+ \pcol@Fe{imakeflushedpage(colfn)}%
+ \fi
\pcol@getcurrfoot\box
\@tempswafalse
\begingroup
@@ -1796,8 +1884,10 @@
\@tempswatrue \@pagedp\@m\p@ \global\@mparbottom\z@
\global\let\pcol@mparbottom@out\pcol@mparbottom@zero
\ifpcol@nospan\else
+ \pcol@Fb
\@next\@currbox\@freelist{\global\setbox\@currbox\box\@outputbox}%
\pcol@ovf
+ \pcol@Fe{output@end(spanning)}%
\count\@currbox10\relax
{\let\@elt\relax \xdef\@dbldeferlist{\@elt\@currbox\@dbldeferlist}}%
\global\setbox\pcol@rightpage\box\voidb@x
@@ -1827,13 +1917,17 @@
\fi
\ifvoid\pcol@footins\else
\pcol@Log\pcol@output@end{insert}\pcol@footins
+ \pcol@Fb
\insert\footins{\unvbox\pcol@footins}\@cons\@freelist\pcol@footins
+ \pcol@Fe{output@end(pagefn)}%
\fi
\ifvoid\pcol@topfnotes\else \insert\footins{\unvbox\pcol@topfnotes}\fi
\expandafter\let\csname pcol@columncolor\number\z@\endcsname\relax
\pcol@currcol\z@ \pcol@restorecolorstack
\@whilenum\pcol@currcol<\pcol@ncol\do{%
+ \pcol@Fb
\pcol@getcurrcol \@cons\@freelist\@currbox
+ \pcol@Fe{output@end(col)}%
\advance\pcol@currcol\@ne}%
\pcol@currcol\pcol@lastcol\relax \pcol@getcurrcol
\global\pcol@prevdepth\@pagedp
@@ -1902,6 +1996,7 @@
\pcol@lastpagefalse \xdef\pcol@firstprevdepth{\number\prevdepth}%
\let\pcol@@combinefloats\@combinefloats \let\@combinefloats\pcol@combinefloats
\let\pcol@@addmarginpar\@addmarginpar \let\@addmarginpar\pcol@addmarginpar
+ \let\end@dblfloat\pcol@end@dblfloat
\global\let\pcol@set@color\set@color
\ifx\set@color\relax
\let\pcol@bg@paintpage\relax \let\pcol@bg@paintbox\@gobble
@@ -1970,6 +2065,19 @@
\expandafter\let\expandafter\reserved@a\csname pcol@com@#1\endcsname
\expandafter\let\csname #1\endcsname\reserved@a}
+\gdef\@dbldeferlist{}
+\def\pcol@end@dblfloat{%
+ \if@twocolumn
+ \@endfloatbox
+ \ifnum\@floatpenalty <\z@
+ \@largefloatcheck
+ \@cons\@dbldeferlist\@currbox
+ \fi
+ \ifnum \@floatpenalty =-\@Mii \@Esphack\fi
+ \else
+ \end@float
+ \fi
+}
%% Column Width Setting
\def\columnratio#1{\global\let\pcol@colwidthspecleft\relax
@@ -2130,7 +2238,9 @@
%% Counter Operations
-\def\globalcounter#1{{%
+\def\globalcounter{\@ifstar\pcol@globalcounter@s\pcol@globalcounter}
+\def\pcol@globalcounter@s{\global\let\pcol@gcounters\cl@@ckpt}
+\def\pcol@globalcounter#1{{%
\@tempswafalse \def\reserved@a{#1}%
\def\@elt##1{\def\reserved@b{##1}%
\ifx\reserved@a\reserved@b \@tempswatrue \fi}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paracol.tlpobj new/tlpkg/tlpobj/paracol.tlpobj
--- old/tlpkg/tlpobj/paracol.tlpobj 2015-04-13 02:09:14.000000000 +0200
+++ new/tlpkg/tlpobj/paracol.tlpobj 2016-04-14 19:32:12.000000000 +0200
@@ -1,15 +1,17 @@
name paracol
category Package
-revision 32099
-shortdesc Multiple columns with texts "in parallel".
+revision 38621
+shortdesc Multiple columns with texts "in parallel"
relocated 1
longdesc The package provides yet another multi-column typesetting
longdesc mechanism by which you produce multi-column (e.g., bilingual)
longdesc document switching and sychronizing each corresponding part in
longdesc "parallel".
-runfiles size=25
+runfiles size=26
RELOC/tex/latex/paracol/paracol.sty
+catalogue-also parallel parcolumns
catalogue-ctan /macros/latex/contrib/paracol
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-10-12 07:57:16 +0200
catalogue-license lppl
-catalogue-version 1.31
+catalogue-topics parallel linguistic
+catalogue-version 1.32
++++++ pdftricks.doc.tar.xz -> parades.doc.tar.xz ++++++
++++ 7459 lines of diff (skipped)
++++++ pdftricks.tar.xz -> parades.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/parades/paravesp.sty new/tex/latex/parades/paravesp.sty
--- old/tex/latex/parades/paravesp.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/parades/paravesp.sty 2016-03-15 19:11:08.000000000 +0100
@@ -0,0 +1,58 @@
+\ProvidesPackage{paravesp}[2016/02/05 space above and below paragraphs]
+
+\newcount\pd@lastpenalty
+
+\newcommand\pd@remember@penalty{\pd@lastpenalty=\lastpenalty\relax}
+
+\newcommand\pd@restore@penalty{\ifnum 0=\pd@lastpenalty \else
+ \penalty\pd@lastpenalty\relax \fi}
+
+\newcommand\ParaSpaceAbove[1]{\relax % Mask \ifdim from possible expansion
+\ifvmode
+ \skip0=#1\relax
+ \ifdim\parskip<0pt\relax
+ \skip0=0pt\relax
+ \fi
+ \ifdim\skip0=0pt\relax
+ \IssueParaSpace
+ \else
+ \ifdim\prevdepth>-1000pt\relax
+ \advance\parskip by \prevdepth\relax % assumed: was set by SpaceBelow
+ \pd@remember@penalty
+ \vskip-\prevdepth\relax
+ \pd@restore@penalty
+ \prevdepth=-1000pt\relax
+ \fi
+ \ifdim\skip0>\parskip\relax
+ \parskip=#1\relax
+ \fi
+ \fi
+\fi
+}
+
+\newcommand\ParaSpaceBelow[1]{\relax
+\parskip=#1\relax
+\advance\parskip by -\prevdepth\relax
+\ifdim\parskip<0pt\relax
+ \ifdim#1<0pt\relax \parskip=#1\relax \else \parskip=0pt\relax \fi
+ \nointerlineskip
+\else% >=10000pt
+ \ifdim\parskip>999pt\relax \parskip=#1\relax\fi
+\fi}
+
+\newcommand\IssueParaSpace{\relax
+\ifhmode \typeout{! LaTeX warning: IssueParaSpace in horizontal mode.}\par \fi
+\ifdim\parskip>0pt\relax
+ \pd@remember@penalty
+ \vskip\parskip\relax
+ \pd@restore@penalty
+ \prevdepth=-1000pt\relax
+ \parskip=0pt\relax
+\fi
+}
+
+\newcommand\IgnoreSpaceAboveNextPara{%
+\ParaSpaceBelow{-0.01pt}}
+
+\newcommand\CancelIgnoreSpaceAboveNextPara{%
+\relax\ifdim\parskip<0pt\relax \parskip=0pt\relax \fi}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdftricks/pdftricks.sty new/tex/latex/pdftricks/pdftricks.sty
--- old/tex/latex/pdftricks/pdftricks.sty 2008-11-25 02:30:33.000000000 +0100
+++ new/tex/latex/pdftricks/pdftricks.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,364 +0,0 @@
-%
-% pdftricks.sty
-%
-% Copyright (c) 2001-3, Radhakrishnan CV
-% Rajagopal CV
-% http://www.river-valley.com
-%
-% River Valley Technologies, Floor III, SJP Buildings, Cotton Hills
-% Trivandrum, India 695014
-%
-% Tel: +91 471 233 7501
-%
-% Antoine Chambert-Loir
-%
-% http://www.math.polytechnique.fr/~chambert
-%
-% Ecole polytechnique, Palaiseau Cedex, France
-%
-%
-% 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 (gpl.txt); if not, write to the Free
-% Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-% MA 02111-1307, USA.
-%
-% $Id: pdftricks.sty,v 1.16 2003/08/10 04:29:20 cvr Exp cvr $
-%
-
-\NeedsTeXFormat{LaTeX2e}
-\def\Fileversion$#1: #2 ${\gdef\fileversion{#2}}
-\def\Filedate$#1: #2 #3 ${\gdef\filedate{#2}}
-\Fileversion$Revision: 1.16 $
-\Filedate$Date: 2003/08/10 04:29:20 $
-\ProvidesPackage{pdftricks}
- [\filedate\space\fileversion\space psTricks support in PDF (CVR/ACL)]
-\PackageWarningNoLine{pdftricks}
- {****************************************\MessageBreak
- Package pdftricks v,\fileversion\space loaded\MessageBreak
- [psTricks support in PDF (CVR, ACL)]\MessageBreak
- ****************************************}
-\RequirePackage{graphicx,color}
-\newif\if@debug\@debugfalse
-\newif\ifPDFTshell
-\newif\ifPDFTnopdf
-\newif\ifnoprocess \noprocessfalse
-\newif\ifmiktex \miktexfalse
-\DeclareOption{debug}{\@debugtrue}
-\DeclareOption{noshell}{\PDFTshellfalse}
-\DeclareOption{shell}{\PDFTshelltrue}
-\DeclareOption{miktex}{\global\miktextrue}
-\ExecuteOptions{shell}
-\ProcessOptions\relax
-\ifPDFTshell
-% we must set it to false if \write18 doesn't work.
-% Hack given by Thierry Bouche (Thanks !)
-\def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time}
-\ifmiktex%
- \immediate\write18{rem >"\tmpfile"}%%%%%% LDL-2
-\else
- \immediate\write18{touch \tmpfile} %%%%%% LDL-1
-\fi
-\ifmiktex
- \IfFileExists{\tmpfile.}{\PDFTshelltrue}{\PDFTshellfalse} %%%%%% LDL-4
-\else
- \IfFileExists{\tmpfile}{\PDFTshelltrue}{\PDFTshellfalse} %%%%%% LDL-3
-\fi
-\fi
-\ifPDFTshell
- \PackageWarningNoLine{pdftricks}
- {****************************************\MessageBreak
- Using \csname write\endcsname18 capability \MessageBreak
- for producing PDF-figures. \MessageBreak
- ****************************************}
-\else
- \PackageWarningNoLine{pdftricks}
- {****************************************\MessageBreak
- No \csname write\endcsname18 capability.\MessageBreak
- You'll have to run a script by yourself!\MessageBreak
- ****************************************}
-\fi
-
-% warning! the definition of FIGURES if pst2pdf must be set accordingly !!
-\def\PDFTfigname{\jobname-fig\thepsfig}
-\def\PDFTWarning#1#2{\if@debug\PackageWarning{#1}{#2}\fi}
-\def\PDFTWarningNoLine#1#2{\if@debug\PackageWarningNoLine{#1}{#2}\fi}
-
-%%
-%% The real meat of psfile manipulation starts here.
-%%
-%%
-\RequirePackage{moreverb}
-\def\pdfverbatimwrite#1{%
- \@bsphack
- \immediate\openout \verbatim@out #1
- \BeforeStream%
- \let\do\@makeother\dospecials
- \catcode`\^^M\active \catcode`\^^I=12
- \def\verbatim@processline{%
- \immediate\write\verbatim@out
- {\the\verbatim@line}}%
- \verbatim@start}
-\def\endpdfverbatimwrite{%
- \immediate\write\verbatim@out{\string\end{document}}
- \immediate\closeout\verbatim@out
- \@esphack}
-
-\def\BeforeStream
- {\message{Opening PDFStream=\PDFTfigname.tex}%
- \immediate\write\verbatim@out{\string\documentclass{article}}
- \immediate\write\verbatim@out{\string\input\space tmp.inputs}
- \immediate\write\verbatim@out{\string\pagestyle{empty}}
- \immediate\write\verbatim@out{\string\begin{document}}
- }
-\newenvironment{pdfdisplay}{\stepcounter{psfig}%
- \xdef\PDFCutFile{\PDFTfigname.tex}
- \pdfverbatimwrite{\PDFCutFile}}
- {\endpdfverbatimwrite%
- \psgraphicsinclude%
- \global\noprocessfalse\noindent}
-\newenvironment{pdfpic}{\stepcounter{psfig}%
- \xdef\PDFCutFile{\PDFTfigname.tex}
- \pdfverbatimwrite{\PDFCutFile}}
- {\endpdfverbatimwrite%
- \psgraphicsinclude%
- \global\noprocessfalse\noindent}
-\newenvironment{pdfinline}{\stepcounter{psfig}%
- \xdef\PDFCutFile{\PDFTfigname.tex}
- \pdfverbatimwrite{\PDFCutFile}}
- {\endpdfverbatimwrite%
- \psinlinegraphicsinclude%
- \global\noprocessfalse\noindent}
-\AtEndDocument{\endPShook%
- \ifPDFTnopdf
- \PackageWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- Some PDF files of images were not found.\MessageBreak
- Run the script `pst2pdf' before the next\MessageBreak
- run of pdfLaTeX\MessageBreak
- ******************************************}
- \fi
-}
-\gdef\endPShook{}
-\def\noprocess{\global\noprocesstrue
- \PackageWarning{pdftricks}
- {******************************************\MessageBreak
- Figure Number: \PDFTfigname\space is not processed \MessageBreak
- ******************************************\MessageBreak}
-}
-
-\newcounter{psfig}
-\newif\if@pdfGINwidth
-\newif\if@pdfGINheight
-\newif\if@pdfGINscale
-\long\gdef\psgraphicsProcess{%
- \@ifundefined{Fig\thepsfig}
- {\PDFTWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- ************ Processing Fig: \thepsfig\space**********\MessageBreak
- ******************************************}
- }
- {\noprocess}
- \ifPDFTshell\ifnoprocess\relax\else
- \IfFileExists{\PDFTfigname.tex}{%
- \immediate\write18{latex -interaction=batchmode \PDFTfigname}
- \PDFTWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- \PDFTfigname.tex converted to \PDFTfigname.dvi\MessageBreak
- ******************************************}
- }{}
- \IfFileExists{\PDFTfigname.dvi}{%
- \immediate\write18{dvips -o \PDFTfigname.ps \PDFTfigname}
- \PDFTWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- \PDFTfigname.ps generated\MessageBreak
- ******************************************}
- }{}
- \IfFileExists{\PDFTfigname.ps}{%
- \immediate\write18{ps2eps -f \PDFTfigname.ps}
- \PDFTWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- \PDFTfigname.eps generated\MessageBreak
- ******************************************}
- }{}
- \IfFileExists{\PDFTfigname.eps}{%
- \immediate\write18{epstopdf \PDFTfigname.eps}
- \PDFTWarningNoLine{pdftricks}
- {******************************************\MessageBreak
- \PDFTfigname.eps converted to \PDFTfigname.pdf\MessageBreak
- ******************************************}
- }{}
- \ifmiktex%
- \immediate\write18{del \PDFTfigname.aux \PDFTfigname.dvi
- \PDFTfigname.log \PDFTfigname.eps} %%%%%% LDL-6
- \else
- \immediate\write18{rm \PDFTfigname.aux \PDFTfigname.dvi
- \PDFTfigname.log \PDFTfigname.eps} %%%%%% LDL-5
- \fi\fi
- \fi
-}
-\long\gdef\psgraphicsinclude{\psgraphicsProcess%
- \IfFileExists{\PDFTfigname.pdf}%
- {\begin{center}
- \bgroup\fboxsep\@PDFboxsep\fboxrule\@PDFboxrule%
- \color{\@PDFgraphiccolor}%
- \fcolorbox{\@PDFgraphiclinecolor}{\@PDFgraphicbackground}%
- {\if@pdfGINwidth%
- \includegraphics[width=\@PDFgraphicwidth]{\PDFTfigname}\else%
- \if@pdfGINheight%
- \includegraphics[height=\@PDFgraphicheight]{\PDFTfigname}\else%
- \if@pdfGINscale%
- \includegraphics[scale=\@PDFgraphicscale]{\PDFTfigname}\else%
- \includegraphics{\PDFTfigname}\fi\fi\fi%
- }\egroup\end{center}%
- \global\@pdfGINwidthfalse\let\@PDFgraphicwidth\relax
- \global\@pdfGINheightfalse\let\@PDFgraphicheight\relax
- \global\@pdfGINscalefalse\let\@PDFgraphicscale\relax
- }{\PDFTnopdftrue}
- \gdef\@PDFgraphiclinecolor{white}
- \gdef\@PDFgraphicbackground{white}
- \gdef\@PDFboxsep{0pt}
- \gdef\@PDFboxrule{0pt}
-}
-
-\long\gdef\psinlinegraphicsinclude{%
- \psgraphicsProcess%
- \IfFileExists{\PDFTfigname.pdf}%
- {\bgroup\fboxrule0pt%
- \normalcolor\fbox{\includegraphics{\PDFTfigname.pdf}}%
- \egroup}%
- {\PDFTnopdftrue}%
-}
-
-\definecolor{gray30}{gray}{.70}
-\definecolor{gray10}{gray}{.90}
-\RequirePackage{keyval}
-\def\configure[#1][#2]{\setkeys{#1}{#2}
- \PDFTWarning{pdftricks}{Reconfigured #1 parameter(s)\MessageBreak
- #2\MessageBreak}}
-\define@key{pdfgraphic}{width} {\gdef\@PDFgraphicwidth{#1}%
- \global\@pdfGINwidthtrue}
-\define@key{pdfgraphic}{height} {\gdef\@PDFgraphicheight{#1}%
- \global\@pdfGINheighttrue}
-\define@key{pdfgraphic}{scale} {\gdef\@PDFgraphicscale{#1}%
- \global\@pdfGINscaletrue}
-\define@key{pdfgraphic}{color} {\gdef\@PDFgraphiccolor{#1}}
-\define@key{pdfgraphic}{linecolor} {\gdef\@PDFgraphiclinecolor{#1}}
-\define@key{pdfgraphic}{background}{\gdef\@PDFgraphicbackground{#1}}
-\define@key{pdfgraphic}{linewidth} {\gdef\@PDFboxrule{#1}}
-\define@key{pdfgraphic}{rulesep} {\gdef\@PDFboxsep{#1}}
-\gdef\@PDFgraphiccolor{black}
-\gdef\@PDFgraphiclinecolor{white}
-\gdef\@PDFgraphicbackground{white}
-\gdef\@PDFboxrule{0pt}
-\gdef\@PDFboxsep{0pt}
-
-%%
-%% Environment to grab all the packages used in the master doc.
-%% This forces you to load pdftricks as the first package.
-%%
-\newenvironment{psinputs}{\verbatimwrite{tmp.inputs}}
- {\endverbatimwrite}
-
-%%
-%% Arrays to keep the fig numbers
-%%
-\@ifundefined{c@arraylength}{\newcounter{arraylength}}{}%
-\@ifundefined{c@ArrayIndex}{\newcounter{ArrayIndex}}{}%
-\@ifundefined{c@zeroCtr}{\newcounter{zeroCtr}}{}%
-\@ifundefined{c@recordCtr}{\newcounter{recordCtr}}{}
-\setcounter{recordCtr}{1}
-\@ifundefined{c@Ctr}{\newcounter{Ctr}}{}
-\def\DeclareArray#1{\Array{#1}[0]{}}%
-%
-\def\Array#1[#2]#3{%
- \expandafter\gdef\csname #1#2\endcsname{#3}%
- \expandafter\gdef\csname #1\endcsname[##1]{\csname #1##1\endcsname}}%
-%
-\def\getArraylength#1{\setcounter{arraylength}{0}%
- \loop\expandafter\ifx\csname #1\thearraylength\endcsname\relax%
- \else\stepcounter{arraylength}\repeat}%
-%
-\def\addToArray#1#2{\setcounter{arraylength}{0}%
- \loop\expandafter\ifx\csname #1\thearraylength\endcsname\relax%
- \else\stepcounter{arraylength}\repeat%
- \Array{#1}[\thearraylength]{#2}}%
-%
-\def\clearArray#1{\getArraylength{#1}%
- \loop\ifnum\c@arraylength >0%
- \global\expandafter\let\csname #1\thearraylength\endcsname\relax%
- \addtocounter{arraylength}{-1}\repeat}%
-%
-\long\def\ArrayIterator#1#2{%
- \setcounter{ArrayIndex}{1}\getArraylength{#1}%
- \setcounter{zeroCtr}{\c@arraylength}%
- \loop\ifnum\c@ArrayIndex<\c@zeroCtr{#2}%
- \stepcounter{ArrayIndex}\repeat%
-}%
-\def\@nnil{\@nil}
-\def\@empty{}
-\def\@cvrstop#1\@@#2{}
-%%
-%% Equivalent of \@tfor and \@for where any delimiter can be
-%% provided instead of LaTeX's default comma character
-%%
-\long\def\cvr@delimfor#1#2#3{\DeclareArray{#1}\clearArray{#1}%
- \long\def\@icvrloop##1#2##2\@@##3{\def##3{##1}\ifx ##3\@nnil%
- \expandafter\@cvrstop \else\addToArray{#1}{##1}%
- \relax\expandafter\@icvrloop\fi##2\@@##3}%
- \long\def\@cvrloop##1#2##2#2##3\@@##4{\addToArray{#1}{##1}%
- \def##4{##1}\ifx ##4\@nnil \else%
- \def##4{##2}\def\y@y{##2}\ifx\y@y\@nnil\else%
- \addToArray{#1}{##2}\fi\ifx ##4\@nnil \else%
- \@icvrloop ##3\@@##4\fi\fi}%
- \expandafter\def\expandafter\@fortmp\expandafter{#3}%
- \ifx\@fortmp\@empty \else%
- \expandafter\@cvrloop#3#2\@nil#2\@nil\@@\@ee@\fi}%
-%
-% Dont look into the following code. It is harmful
-% for your eyes and brain as well.
-%
-\newcounter{f@irstCtr}
-\newcounter{s@econdCtr}
-\long\gdef\NoProcess[#1]{%
- \long\def\@i@@noprocess##1,##2\@@##3{\def##3{##1}\ifx ##3\@nnil%
- \expandafter\@cvrstop \else
- \expandafter\hyphencheck##1-@-*[*]
- \relax\expandafter\@i@@noprocess\fi##2\@@##3}%
- \long\def\@@@noprocess##1,##2,##3\@@##4{
- \expandafter\hyphencheck##1-@-*[*]
- \def##4{##1}\ifx ##4\@nnil \else%
- \def##4{##2}\def\y@y{##2}\ifx\y@y\@nnil\else%
- \expandafter\hyphencheck##2-@-*[*]
- \fi\ifx ##4\@nnil \else%
- \@i@@noprocess ##3\@@##4\fi\fi}%
- \expandafter\def\expandafter\@fortmp\expandafter{#1}%
- \ifx\@fortmp\@empty \else%
- \expandafter\@@@noprocess#1,\@nil,\@nil\@@\@ee@\fi}%
-\def\d@d#1[*]{}
-\def\hyphencheck#1-#2-#3{\def\r@r{@}\def\s@s{*}\edef\c@c{#3}
- \ifx\c@c\r@r
- \setcounter{f@irstCtr}{#1}
- \setcounter{s@econdCtr}{#2}
- \stepcounter{s@econdCtr}
- \loop\ifnum\thes@econdCtr > \thef@irstCtr%
- \expandafter\edef\csname Fig\thef@irstCtr\endcsname{TRUE}
- \stepcounter{f@irstCtr}
- \repeat%
- \else\ifx\c@c\s@s%
- \expandafter\edef\csname Fig#1\endcsname{TRUE}
- \fi\fi\d@d}
-
-%%
-%%
-%% End of file `pdftricks.sty'
-%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parades.tlpobj new/tlpkg/tlpobj/parades.tlpobj
--- old/tlpkg/tlpobj/parades.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/parades.tlpobj 2016-04-14 19:32:12.000000000 +0200
@@ -0,0 +1,15 @@
+name parades
+category Package
+revision 40042
+shortdesc Tabulators and space between paragraphs in galley approach
+relocated 1
+longdesc The LaTeX package paravesp controls the spaces above and below
+longdesc paragraphs. The python script parades.py generates paragraph
+longdesc styles with support of space above, space below and tabulators.
+longdesc The system imposes the galley approach on the document.
+runfiles size=1
+ RELOC/tex/latex/parades/paravesp.sty
+catalogue-ctan /macros/latex/contrib/parades
+catalogue-date 2016-03-17 05:57:48 +0100
+catalogue-license lppl1.3
+catalogue-topics parshape
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftricks.tlpobj new/tlpkg/tlpobj/pdftricks.tlpobj
--- old/tlpkg/tlpobj/pdftricks.tlpobj 2015-04-13 02:11:39.000000000 +0200
+++ new/tlpkg/tlpobj/pdftricks.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-name pdftricks
-category Package
-revision 15878
-shortdesc Support for pstricks in pdfTeX.
-relocated 1
-longdesc The PSTricks macros cannot be used (directly) with pdfTeX,
-longdesc since pstricks uses PostScript arithmetic, which isn't part of
-longdesc PDF. This package circumvents this limitation so that the
-longdesc extensive facilities offered by the powerful PSTricks package
-longdesc can be made use of in a pdfTeX document. This is done using the
-longdesc shell escape function available in current TeX implementations.
-longdesc The package may also be used in support of other 'PostScript-
-longdesc output-only' packages, such as PSfrag. For alternatives, users
-longdesc may care to review the discussion in the PSTricks online
-longdesc documentation.
-runfiles size=4
- RELOC/tex/latex/pdftricks/pdftricks.sty
-catalogue-ctan /graphics/pdftricks
-catalogue-date 2013-12-17 14:12:28 +0100
-catalogue-license gpl
-catalogue-version 1.16
++++++ paralist.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paralist/README new/doc/latex/paralist/README
--- old/doc/latex/paralist/README 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/paralist/README 2015-12-31 23:39:16.000000000 +0100
@@ -60,7 +60,8 @@
COPYING AND MODIFICATION
-Copyright 1998-2002 Bernd Schandl
+Copyright 1998-2015 Bernd Schandl
+Copyright 2013 Julian Gilbey (modifications in v2.4)
The paralist package consists of the following files:
@@ -81,6 +82,5 @@
HELP
Bernd Schandl
-email schandl@gmx.net
-www http://schandl.gmxhome.de/paralist
+email schandl@gmx.com
Files old/doc/latex/paralist/paralist.pdf and new/doc/latex/paralist/paralist.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paralist.doc.tlpobj new/tlpkg/tlpobj/paralist.doc.tlpobj
--- old/tlpkg/tlpobj/paralist.doc.tlpobj 2015-04-13 02:09:14.000000000 +0200
+++ new/tlpkg/tlpobj/paralist.doc.tlpobj 2016-04-14 19:32:12.000000000 +0200
@@ -1,8 +1,8 @@
name paralist.doc
category Package
-revision 30992
+revision 39247
shortdesc doc files of paralist
relocated 1
-docfiles size=52
+docfiles size=56
RELOC/doc/latex/paralist/README
RELOC/doc/latex/paralist/paralist.pdf
++++++ paralist.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paralist/paralist.sty new/tex/latex/paralist/paralist.sty
--- old/tex/latex/paralist/paralist.sty 2013-06-28 01:35:29.000000000 +0200
+++ new/tex/latex/paralist/paralist.sty 2015-12-31 23:39:16.000000000 +0100
@@ -6,9 +6,9 @@
%%
%% paralist.dtx (with options: `package')
%%
-%% Copyright 1998-2002 Bernd Schandl
-%% email schandl@gmx.net
-%% www http://schandl.gmxhome.de/paralist
+%% Copyright 1998-2015 Bernd Schandl
+%% Copyright 2013 Julian Gilbey (modifications in v2.4)
+%% email schandl@gmx.com
%%
%% This file can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License distributed from CTAN
@@ -32,7 +32,7 @@
%% Right brace \} Tilde \~}
%%
\ProvidesPackage{paralist}%
- [2013/06/09 v2.4 Extended list environments]
+ [2015/12/30 v2.5 Extended list environments]
\NeedsTeXFormat{LaTeX2e}
\newif\if@plnewitem\@plnewitemtrue
\newif\if@plnewenum\@plnewenumtrue
@@ -189,7 +189,7 @@
\@ifnextchar[{\@enumwidestlabel@{#1}}{\@enumwidestlabel@{#1}[7]}%
}
\def\@enumwidestlabel@#1[#2]{%
- \def\@enum@widestlabel{#2}
+ \def\@enum@widestlabel{#2}%
#1}
\def\@itemlabel@#1[#2]{%
\@plmylabeltrue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paralist.tlpobj new/tlpkg/tlpobj/paralist.tlpobj
--- old/tlpkg/tlpobj/paralist.tlpobj 2015-04-13 02:09:15.000000000 +0200
+++ new/tlpkg/tlpobj/paralist.tlpobj 2016-04-14 19:32:13.000000000 +0200
@@ -1,7 +1,7 @@
name paralist
category Package
-revision 30992
-shortdesc Enumerate and itemize within paragraphs.
+revision 39247
+shortdesc Enumerate and itemize within paragraphs
relocated 1
longdesc Provides enumerate and itemize environments that can be used
longdesc within paragraphs to format the items either as running text or
@@ -9,7 +9,9 @@
longdesc provides compacted versions of enumerate and itemize.
runfiles size=4
RELOC/tex/latex/paralist/paralist.sty
+catalogue-also shortlst multenum
catalogue-ctan /macros/latex/contrib/paralist
-catalogue-date 2013-06-13 19:52:23 +0200
+catalogue-date 2016-01-04 06:18:17 +0100
catalogue-license lppl
-catalogue-version 2.4
+catalogue-topics list list-bull list-enum
+catalogue-version 2.5
++++++ parallel.doc.tar.xz ++++++
++++++ parallel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parallel.tlpobj new/tlpkg/tlpobj/parallel.tlpobj
--- old/tlpkg/tlpobj/parallel.tlpobj 2015-04-13 02:09:15.000000000 +0200
+++ new/tlpkg/tlpobj/parallel.tlpobj 2016-04-14 19:32:13.000000000 +0200
@@ -1,7 +1,7 @@
name parallel
category Package
revision 15878
-shortdesc Typeset parallel texts.
+shortdesc Typeset parallel texts
relocated 1
longdesc Provides a parallel environment which allows two potentially
longdesc different texts to be typeset in two columns, while maintaining
@@ -11,6 +11,8 @@
longdesc any two texts.
runfiles size=4
RELOC/tex/latex/parallel/parallel.sty
+catalogue-also parcolumns paracol
catalogue-ctan /macros/latex/contrib/parallel
-catalogue-date 2011-09-22 15:24:20 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics parallel
++++++ paratype.doc.tar.xz ++++++
++++++ paratype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paratype.tlpobj new/tlpkg/tlpobj/paratype.tlpobj
--- old/tlpkg/tlpobj/paratype.tlpobj 2015-04-13 02:09:16.000000000 +0200
+++ new/tlpkg/tlpobj/paratype.tlpobj 2016-04-14 19:32:14.000000000 +0200
@@ -1,7 +1,7 @@
name paratype
category Package
revision 32859
-shortdesc LaTeX support for free fonts by ParaType.
+shortdesc LaTeX support for free fonts by ParaType
relocated 1
longdesc The package offers LaTeX support for the fonts PT Sans, PT
longdesc Serif and PT Mono developed by ParaType for the project "Public
@@ -777,5 +777,6 @@
RELOC/tex/latex/paratype/X2PTSerifCaption-TLF.fd
RELOC/tex/latex/paratype/paratype.sty
catalogue-ctan /fonts/paratype
-catalogue-date 2014-05-17 21:41:14 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics font font-sans font-mono font-type1 font-ttf
++++++ paresse.doc.tar.xz ++++++
++++++ paresse.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paresse.tlpobj new/tlpkg/tlpobj/paresse.tlpobj
--- old/tlpkg/tlpobj/paresse.tlpobj 2015-04-13 02:09:52.000000000 +0200
+++ new/tlpkg/tlpobj/paresse.tlpobj 2016-04-14 19:32:38.000000000 +0200
@@ -1,7 +1,7 @@
name paresse
category Package
revision 29803
-shortdesc Define simple macros for greek letters.
+shortdesc Define simple macros for greek letters
relocated 1
longdesc The package defines macros using SS to type greek letters. so
longdesc that the user may (for example) type SSa to get the effect of
@@ -11,6 +11,7 @@
RELOC/tex/latex/paresse/paresseold.sto
RELOC/tex/latex/paresse/paresseutf8.sto
catalogue-ctan /macros/latex/contrib/paresse
-catalogue-date 2013-02-16 13:58:07 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics shortcut
catalogue-version 4.1
++++++ parnotes.doc.tar.xz ++++++
++++++ parnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parnotes.tlpobj new/tlpkg/tlpobj/parnotes.tlpobj
--- old/tlpkg/tlpobj/parnotes.tlpobj 2015-04-13 02:09:52.000000000 +0200
+++ new/tlpkg/tlpobj/parnotes.tlpobj 2016-04-14 19:32:38.000000000 +0200
@@ -1,7 +1,7 @@
name parnotes
category Package
revision 25032
-shortdesc Notes after every paragraph (or elsewhere).
+shortdesc Notes after every paragraph (or elsewhere)
relocated 1
longdesc The package provides the \parnote command. The notes are set as
longdesc (normal) running paragraphs; placement is at the end of each
@@ -9,6 +9,7 @@
runfiles size=2
RELOC/tex/latex/parnotes/parnotes.sty
catalogue-ctan /macros/latex/contrib/parnotes
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics notes
catalogue-version 1
++++++ parrun.doc.tar.xz ++++++
++++++ parrun.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parrun.tlpobj new/tlpkg/tlpobj/parrun.tlpobj
--- old/tlpkg/tlpobj/parrun.tlpobj 2015-04-13 02:09:52.000000000 +0200
+++ new/tlpkg/tlpobj/parrun.tlpobj 2016-04-14 19:32:38.000000000 +0200
@@ -1,12 +1,14 @@
name parrun
category Package
revision 15878
-shortdesc Typesets (two) streams of text running parallel.
+shortdesc Typesets (two) streams of text running parallel
relocated 1
longdesc For typesetting translated text and the original source,
longdesc parallel on the same page, one above the other.
runfiles size=3
RELOC/tex/latex/parrun/parrun.sty
+catalogue-also parallel
catalogue-ctan /macros/latex/contrib/parrun
-catalogue-date 2012-06-09 20:15:34 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics parallel
++++++ parselines.doc.tar.xz ++++++
++++++ parselines.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parselines.tlpobj new/tlpkg/tlpobj/parselines.tlpobj
--- old/tlpkg/tlpobj/parselines.tlpobj 2015-04-13 02:09:52.000000000 +0200
+++ new/tlpkg/tlpobj/parselines.tlpobj 2016-04-14 19:32:38.000000000 +0200
@@ -1,7 +1,7 @@
name parselines
category Package
revision 21475
-shortdesc Apply a macro to each line of an environment.
+shortdesc Apply a macro to each line of an environment
relocated 1
longdesc The package defines an environment "parse lines" which
longdesc processes each line of an environment with a macro. An example
@@ -9,6 +9,7 @@
runfiles size=1
RELOC/tex/latex/parselines/parselines.sty
catalogue-ctan /macros/latex/contrib/parselines
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics decoration macro-supp
catalogue-version 1.4
++++++ parskip.doc.tar.xz ++++++
++++++ parskip.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parskip.tlpobj new/tlpkg/tlpobj/parskip.tlpobj
--- old/tlpkg/tlpobj/parskip.tlpobj 2015-04-13 02:09:52.000000000 +0200
+++ new/tlpkg/tlpobj/parskip.tlpobj 2016-04-14 19:32:38.000000000 +0200
@@ -1,7 +1,7 @@
name parskip
category Package
revision 19963
-shortdesc Layout with zero \parindent, non-zero \parskip.
+shortdesc Layout with zero \parindent, non-zero \parskip
relocated 1
longdesc Simply changing \parskip and \parindent leaves a layout that is
longdesc untidy; this package (though it is no substitute for a properly-
@@ -9,6 +9,7 @@
runfiles size=1
RELOC/tex/latex/parskip/parskip.sty
catalogue-ctan /macros/latex/contrib/parskip
-catalogue-date 2013-09-30 14:43:32 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics layout parshape
catalogue-version 2.0
++++++ pas-cours.doc.tar.xz ++++++
++++++ pas-cours.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pas-cours.tlpobj new/tlpkg/tlpobj/pas-cours.tlpobj
--- old/tlpkg/tlpobj/pas-cours.tlpobj 2015-04-13 02:09:53.000000000 +0200
+++ new/tlpkg/tlpobj/pas-cours.tlpobj 2016-04-14 19:32:39.000000000 +0200
@@ -1,13 +1,14 @@
name pas-cours
category Package
revision 35842
-shortdesc Macros useful in preparing teaching material.
+shortdesc Macros useful in preparing teaching material
relocated 1
longdesc Several groups of macros cover different branches of
longdesc mathematics.
runfiles size=1
RELOC/tex/latex/pas-cours/pas-cours.sty
catalogue-ctan /macros/latex/contrib/pas-cours
-catalogue-date 2014-12-16 15:38:50 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics teaching
catalogue-version 1.09d
++++++ pas-crosswords.doc.tar.xz ++++++
++++++ pas-crosswords.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pas-crosswords.tlpobj new/tlpkg/tlpobj/pas-crosswords.tlpobj
--- old/tlpkg/tlpobj/pas-crosswords.tlpobj 2015-04-13 02:09:53.000000000 +0200
+++ new/tlpkg/tlpobj/pas-crosswords.tlpobj 2016-04-14 19:32:39.000000000 +0200
@@ -1,14 +1,16 @@
name pas-crosswords
category Package
revision 32313
-shortdesc Creating crossword grids, using TikZ.
+shortdesc Creating crossword grids, using TikZ
relocated 1
longdesc The package produces crossword grids, using a wide variety of
longdesc colours and decorations of the grids and the text in them. The
longdesc package uses TikZ for its graphical output.
runfiles size=2
RELOC/tex/latex/pas-crosswords/pas-crosswords.sty
+catalogue-also crosswrd crossword
catalogue-ctan /macros/latex/contrib/pas-crosswords
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2016-01-22 18:15:03 +0100
catalogue-license lppl
+catalogue-topics games pgf-tikz
catalogue-version 1.03
++++++ pas-cv.doc.tar.xz ++++++
++++++ pas-cv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pas-cv.tlpobj new/tlpkg/tlpobj/pas-cv.tlpobj
--- old/tlpkg/tlpobj/pas-cv.tlpobj 2015-04-13 02:09:54.000000000 +0200
+++ new/tlpkg/tlpobj/pas-cv.tlpobj 2016-04-14 19:32:40.000000000 +0200
@@ -1,7 +1,7 @@
name pas-cv
category Package
revision 32263
-shortdesc Flexible typesetting of Curricula Vitae.
+shortdesc Flexible typesetting of Curricula Vitae
relocated 1
longdesc The package provides the framework for typesetting a Curriculum
longdesc Vitae (composed in French), together with a number of "themes"
@@ -27,6 +27,7 @@
RELOC/tex/latex/pas-cv/macro-venus.tex
RELOC/tex/latex/pas-cv/pas-cv.sty
catalogue-ctan /macros/latex/contrib/pas-cv
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics cv
catalogue-version 2.01
++++++ pas-tableur.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pas-tableur/README new/doc/latex/pas-tableur/README
--- old/doc/latex/pas-tableur/README 2013-12-11 00:19:40.000000000 +0100
+++ new/doc/latex/pas-tableur/README 2016-02-02 00:06:34.000000000 +0100
@@ -1,4 +1,4 @@
-********* README file for pas-crosswords ******************
+********* README file for pas-tableur ******************
********************* ENGLISH *****************************
This package uses TikZ to imitate spreadsheet.
@@ -18,7 +18,7 @@
Thanks to use pas-tableur.sty.
-********* Fichier README pour pas-crosswords ******************
+********* Fichier README pour pas-tableur ******************
********************** FRANCAIS *******************************
Cette extension utilise TikZ pour imiter les feuilles de calculs sous tableur.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pas-tableur/doc.codes.tex new/doc/latex/pas-tableur/doc.codes.tex
--- old/doc/latex/pas-tableur/doc.codes.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pas-tableur/doc.codes.tex 2016-02-02 00:06:34.000000000 +0100
@@ -0,0 +1,144 @@
+\tcbuselibrary{listings}
+\usetikzlibrary{decorations.pathmorphing}
+
+% Couleurs utilisées dans la documentation
+
+\definecolor{codeTitleFont}{cmyk}{0.04,0,0.03,0.16}
+\definecolor{codeTitleBackLeft}{cmyk}{0.08,0,0.06,0.76}
+\definecolor{codeTitleBackRight}{cmyk}{0.07,0,0.05,0.42}
+\definecolor{listingTitleFont}{cmyk}{0,0.31,0.91,0.38}
+\definecolor{listingTitleBackLeft}{cmyk}{0,0.05,0.64,0}
+\definecolor{listingTitleBackRight}{cmyk}{0,0.03,0.31,0.02}
+
+
+% Code LaTeX
+
+\tcbset{codeTEX/.style={
+ sharp corners=all,
+ before skip=1em,
+ after skip=1em,
+ enhanced,
+ frame style={
+ left color=codeTitleBackLeft,
+ right color=codeTitleBackRight},
+ interior style={
+ top color=codeTitleBackLeft!50,
+ bottom color=codeTitleBackRight!20},
+ boxrule=0.7pt,
+ fonttitle={\sffamily\bfseries\color{codeTitleFont}},
+ colback=codeTitleFont,
+ listing only,
+ left=6mm,
+ listing options={
+ basicstyle=\ttfamily\fontsize{7}{9}\selectfont,
+ keywordstyle=\color{blue},
+ numbers=left,
+ language=TeX,
+ breaklines=true,
+ morekeywords={definecolor,tcbset,begin, newtcbtheorem,newenvironment,newcommand,bfseries,color, sffamily,tcblower,ttfamily,setlength},
+ numberstyle=\tiny\color{red!75!black}},
+ breakable
+ }
+}
+
+% Listing exemples
+
+\tcbset{listing/.style={
+ sharp corners=all,
+ before skip=1em,
+ after skip=1em,
+ enhanced,
+ frame style={
+ left color=listingTitleBackLeft,
+ right color=listingTitleBackRight},
+ boxrule=0.7pt,
+ fonttitle={\sffamily\bfseries\color{listingTitleFont}},
+ colback=listingTitleBackRight,
+ breakable,
+ listing options={
+ basicstyle=\ttfamily\fontsize{7}{9}\selectfont,
+ keywordstyle=\color{listingTitleFont},
+ numbers=left,
+ language=TeX,
+ breaklines=true,
+ numbersep=5pt,
+ morekeywords={ifelse,begin,definecolor,tcbset},
+ numberstyle=\tiny\color{red!75!black}},
+ },
+ interior style={
+ draw=listingTitleBackLeft,
+ top color=listingTitleBackLeft!50,
+ bottom color=listingTitleBackRight!20},
+ segmentation style={
+ draw=listingTitleFont,
+ solid,
+ decorate,
+ decoration={random steps,segment length=2mm}
+ }
+}
+
+% Titre de la documentation
+
+\tcbset{head/.style={
+ enhanced,
+ hbox,
+ tikznode,
+ left=8mm,
+ right=8mm,
+ boxrule=0.4pt,
+ colback=white,
+ colframe=gray,
+ drop lifted shadow=black!50!yellow,
+ before=\par\vspace*{5mm},
+ after=\par\bigskip,
+ interior style={
+ draw=white,
+ top color=white,
+ bottom color=white}
+ }
+}
+
+% TOC
+
+\tcbset{toc/.style={
+ breakable,
+ enhanced jigsaw,
+ title={\color{red!50!black}Sommaire},
+ fonttitle=\bfseries\Large,
+ colback=yellow!10!white,
+ colframe=red!50!black,
+ before=\par\bigskip\noindent,
+ interior style={
+ fill overzoom image=goldshade.png,
+ fill image opacity=0.25},
+ colbacktitle=yellow!20,
+ enlargepage flexible=\baselineskip,
+ pad at break*=3mm,
+ attach boxed title to top center={
+ yshift=-0.25mm-\tcboxedtitleheight/2,
+ yshifttext=2mm-\tcboxedtitleheight/2},
+ boxed title style={
+ enhanced,
+ boxrule=0.5mm,
+ frame code={
+ \path[tcb fill frame] ([xshift=-4mm]frame.west) -- (frame.north west)
+ -- (frame.north east) -- ([xshift=4mm]frame.east)
+ -- (frame.south east) -- (frame.south west) -- cycle; },
+ interior code={
+ \path[tcb fill interior] ([xshift=-2mm]interior.west)
+ -- (interior.north west) -- (interior.north east)
+ -- ([xshift=2mm]interior.east) -- (interior.south east) -- (interior.south west)
+ -- cycle;} },
+ drop fuzzy shadow
+ }
+}
+
+% Historique de l'extension
+
+\tcbset{histo/.style={
+ enhanced,
+ breakable,
+ sidebyside,
+ lefthand width=1.5cm
+ }
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pas-tableur/doc.styles.tex new/doc/latex/pas-tableur/doc.styles.tex
--- old/doc/latex/pas-tableur/doc.styles.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pas-tableur/doc.styles.tex 2016-02-02 00:06:34.000000000 +0100
@@ -0,0 +1,73 @@
+\makeatletter
+
+\def\@dottedtocline#1#2#3#4#5{%
+ \ifnum #1>\c@tocdepth \else
+ \vskip \z@ \@plus.2\p@
+ {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+ \parindent #2\relax\@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima #3\relax
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ {#4}\nobreak
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ mu$}\hfill
+ \nobreak
+ \hb@xt@\@pnumwidth{\hfil\helvbx #5}%
+ \par}%
+ \fi}
+
+\renewcommand*\l@section
+{%
+\helvbx\color{red!50!black}\bfseries
+\def\@linkcolor{red!50!black}\@dottedtocline{1}{1.5em}{1.5em}
+}
+
+\renewcommand*\l@subsection
+{%
+\helvbx\color{green!50!black}
+\def\@linkcolor{green!50!black}
+\@dottedtocline{1}{2.3em}{2.6em}
+}
+
+\renewcommand*\l@subsubsection
+{%
+\helvbx\color{orange!80!black}
+\def\@linkcolor{orange!80!black}
+\@dottedtocline{1}{3em}{3.3em}
+}
+
+\def\contentsline#1#2#3#4{%
+ \ifx\\#4\\%
+ \csname l@#1\endcsname{#2}{#3}%
+ \else
+ \csname l@#1\endcsname{\hyper@linkstart{link}{#4}{#2}\hyper@linkend}{%
+ \hyper@linkstart{link}{#4}{#3}\hyper@linkend
+ }%
+ \fi
+}
+
+% --------------------
+% TITRES DES SECTIONS
+% --------------------
+
+\titleformat{\section}[block]
+{\helvbx\Large\color{red!50!black}}
+{\fcolorbox{red!50!black}{red!50!black}{\textcolor{white}{\bfseries\thesection}}}
+{1em}
+{\helvbx}
+
+\titleformat{\subsection}[block]
+{\helvbx\large\color{green!50!black}}
+{\thesubsection}
+{1em}
+{\helvbx}
+
+\titleformat{\subsubsection}[block]
+{\helvbx\large\color{orange!50!black}}
+{\thesubsubsection}
+{1em}
+{\helvbx}
+
+\makeatother
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pas-tableur/pas-tableur.tex new/doc/latex/pas-tableur/pas-tableur.tex
--- old/doc/latex/pas-tableur/pas-tableur.tex 2014-08-24 23:19:23.000000000 +0200
+++ new/doc/latex/pas-tableur/pas-tableur.tex 2016-02-02 00:06:34.000000000 +0100
@@ -1,114 +1,50 @@
-\documentclass[12pt]{article}
+\documentclass[a4paper,french]{article}
\usepackage[latin1]{inputenc}
-\usepackage[french]{babel}
-\usepackage[T1]{fontenc}
-\usepackage{listings}
+ \usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage{etex}
+\usepackage{fourier}
+\usepackage[table]{xcolor}
+\usepackage{tabularx}
+\usepackage{cellspace}
+ \setlength{\cellspacetoplimit}{4pt}
+ \setlength{\cellspacebottomlimit}{4pt}
\usepackage[colorlinks=true,urlcolor=blue]{hyperref}
-\usepackage[vmargin=2cm,hmargin=2cm]{geometry}
-\usepackage{titlesec}
\usepackage{pas-tableur}
-\usetikzlibrary{arrows}
-\usepackage{kpfonts}
-
-\makeatletter
-% -------------------
-% TABLE DES MATIERES
-% -------------------
-
-\def\@dottedtocline#1#2#3#4#5{%
- \ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@
- {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
- \parindent #2\relax\@afterindenttrue
- \interlinepenalty\@M
- \leavevmode
- \@tempdima #3\relax
- \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
- {#4}\nobreak
- \leaders\hbox{$\m@th
- \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
- mu$}\hfill
- \nobreak
- \hb@xt@\@pnumwidth{\hfil\normalfont #5}%
- \par}%
- \fi}
-
-\renewcommand*\l@section
-{%
-\color{blueSelecCellBottom}
-\def\@linkcolor{blueSelecCellBottom}\@dottedtocline{1}{1.5em}{2.3em}
-}
-
-\renewcommand*\l@subsection
-{%
-\color{blueSelecCellTop}
-\def\@linkcolor{blueSelecCellTop}
-\@dottedtocline{1}{2.3em}{2.6em}
-}
-
-\def\contentsline#1#2#3#4{%
- \ifx\\#4\\%
- \csname l@#1\endcsname{#2}{#3}%
- \else
- \csname l@#1\endcsname{\hyper@linkstart{link}{#4}{#2}\hyper@linkend}{%
- \hyper@linkstart{link}{#4}{#3}\hyper@linkend
- }%
- \fi
-}
-
-% --------------------
-% TITRES DES SECTIONS
-% --------------------
-
-\titleformat{\section}[block]
-{\helvbx\Large\color{blueSelecCellBottom}}
-{\fcolorbox{blueSelecCellBottom}{blueSelecCellBottom}{\textcolor{white}{\bfseries\thesection}}}
-{1em}
-{\helvbx}
-
-\titleformat{\subsection}[block]
-{\helvbx\large\color{blueSelecCellTop}}
-{\thesubsection}
-{1em}
-{\helvbx}
+\usepackage{titlesec}
+\usepackage{tcolorbox}
+ \tcbuselibrary{skins}
+ \tcbuselibrary{theorems}
+ \tcbuselibrary{breakable}
+\usepackage{listings}
+% ----------------------
+\usetikzlibrary{arrows}
-\makeatother
+\setlength{\parindent}{0pt}
-\title{pas-tableur.sty\\\small v2.00}
-\date{\today}
-\author{Stéphane PASQUET\\\href{mailto:contact@mathweb.fr}{contact@mathweb.fr}}
-
-\lstset{
- numbers=left,
- numberstyle=\tiny,
- stepnumber=1,
- numbersep=3pt,
- language=[LaTeX]TeX,
- backgroundcolor=\color{blueSelec},
- frame=shadowbox,
- rulesepcolor=\color{blueSelecCellBottom},
- rulecolor=\color{blueSelecCellBottom},
- framexleftmargin=10pt,
- keywordstyle=\color{blueSelecCellBottom}\bfseries,
- basicstyle=\ttfamily,
- columns=flexible,
- keepspaces=true,
- upquote=true,
- commentstyle=\color{gray},
- morekeywords={tableur,celtxt,selecCell,definecolor,colminwidth,lineminheight, multiSelec,tabcolwidth,tabnumlinewidth,tablineheight,helvbx,draw}
-}
+\input{doc.codes.tex}
+\input{doc.styles.tex}
-\setlength{\parindent}{0pt}
-\begin{document}
+\begin{document}
-\maketitle
+\begin{center}
+\begin{tcolorbox}[head]
+{\bfseries\LARGE Documentation \texttt{pas-tableur} }\\[3mm]
+{\large Version 2.01 -- \today}
+\end{tcolorbox}
-\tableofcontents
+{\large
+\href{http://www.mathweb.fr/contact.html}{St\'ephane Pasquet}}
+\end{center}
-\section{Introduction}
+\begin{tcolorbox}[toc]
+\makeatletter
+\@starttoc{toc}
+\makeatother
+\end{tcolorbox}
-\subsection{Résumé}
+\section{Introduction et installation}
L'extension \texttt{pas-tableur.sty} a pour but d'imiter l'apparence des tableurs.
@@ -116,126 +52,133 @@
\medskip
-Pour cette version 2 de l'extension, j'ai souhaité utiliser une syntaxe dans le fichier sty plus intuitive et plus pratique pour effectuer d'autres opérations par rapport à la version 1.
+Pour cette version 2 de l'extension, j'ai souhait\'e utiliser une syntaxe dans le fichier sty plus intuitive et plus pratique pour effectuer d'autres op\'erations par rapport \`a la version 1.
-\subsection{Installation}
+\medskip
-Dans le fichier zip, l'arborescence \LaTeX a été conservée pour vous permettre une installation plus facile.
+Cette extension charge automatiquement les extensions suivantes :
-Ainsi, \texttt{pas-tableur.sty} devra \^etre installée dans le répertoire \og latex \fg{} de votre arborescence \LaTeX, et les fichiers \og pas-tableur.tex \fg{} et \og pas-tableur.pdf \fg{} dans son répertoire \og doc \fg.
+\medskip
-\subsection{Les extensions chargées}
+\begin{quote}
+tikz (avec la librairie : calc) \\
+xkeyval\\
+xstring
+\end{quote}
-Afin de fonctionner correctement, \texttt{pas-tableur.sty} chargent les extensions suivantes :
+\newpage
-\medskip
+On pourra d\'ecompresser \texttt{pas-tableur.zip}
+de sorte \`a avoir :
\begin{itemize}
-\item TiKZ, avec la librairie \og calc \fg{} ;
-\item xstring ;
-\item xkeyval.
+\item Sous Ubuntu :
+
+\begin{verbatim}
+./texlive/texmf-local/tex/latex/pas-tableur/pas-tableur.sty
+./texlive/texmf-local/doc/latex/pas-tableur/pas-tableur.tex
+./texlive/texmf-local/doc/latex/pas-tableur/pas-tableur.pdf
+./texlive/texmf-local/doc/latex/pas-tableur/doc.codes.tex
+./texlive/texmf-local/doc/latex/pas-tableur/doc.styles.tex
+\end{verbatim}
+
+\item Sous Windows :
+
+\begin{verbatim}
+C:\texmf\latex\pas-tableur\pas-tableur.sty
+C:\texmf\doc\pas-tableur\pas-tableur.tex
+C:\texmf\doc\pas-tableur\pas-tableur.pdf
+C:\texmf\doc\pas-tableur\doc.codes.tex
+C:\texmf\doc\pas-tableur\doc.styles.tex
+\end{verbatim}
\end{itemize}
+\medskip
+
+Apr\`es installation, n'oubliez pas de taper la commande \texttt{texhash} dans le terminal pour mettre \`a jour la base de donn\'ees des extensions.
+
+\bigskip
+
+Sous Mac OS, j'imagine que l'arborescence ressemble \`a ce qui est \'ecrit pr\'ec\'edemment.
+
+
\section{\textbackslash tableur et \textbackslash tableur* : construire un tableur}
-Pour créer un tableur, il faudra se mettre dans un environnement \texttt{tikzpicture} et utiliser la commande \textbackslash tableur ou sa version étoilée.
+Pour cr\'eer un tableur, il faudra se mettre dans un environnement \texttt{tikzpicture} et utiliser la commande \textbackslash tableur ou sa version \'etoil\'ee.
\subsection{\textbackslash tableur}
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
\begin{tikzpicture}
\tableur[<nombre de lignes>]{<colonnes>}
\end{tikzpicture}
-\end{lstlisting}
+\end{tcblisting}
\bigskip
-L'argument \og colonnes \fg{} peut se présenter de deux façons différentes :
+L'argument \og colonnes \fg{} peut se pr\'esenter de deux fa\c cons diff\'erentes :
\bigskip
-\begin{minipage}{6cm}
-~\par
-\begin{lstlisting}
-\begin{tikzpicture}
-\tableur[2]{A,B,C}
-\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-6.5cm}
+\begin{tcblisting}{listing,title=Exemple 1}
\begin{tikzpicture}
\tableur[2]{A,B,C}
\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
\bigskip
-\begin{minipage}{6cm}
-~\par
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=Exemple 2}
\begin{tikzpicture}
\tableur[2]{A-D}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-6.5cm}
-\begin{tikzpicture}
-\tableur[2]{A-C}
-\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
\bigskip
-Pour cette macro, les valeurs par défaut sont :
+Pour cette macro, les valeurs par d\'efaut sont :
\medskip
\begin{itemize}
\item la hauteur de chaque ligne : 1.57em ;
\item la largeur de chaque colonne : 7em ;
-\item la largeur de la 1\iere{} colonne (contenant le numéros des lignes) : 3em ;
-\item le nombre de lignes : si l'option entre crochets n'est pas informée, il y aura 1 ligne.
+\item la largeur de la 1\iere{} colonne (contenant le num\'eros des lignes) : 3em ;
+\item le nombre de lignes : si l'option entre crochets n'est pas inform\'ee, il y aura 1 ligne.
\end{itemize}
\medskip
-Pour changer ces valeurs par défaut, on utilisera les commandes :
+Pour changer ces valeurs par d\'efaut, on utilisera les commandes :
\medskip
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
\tabcolwidth{2cm} % pour que chaque colonne ait une largeur de 2 cm
-\tabnumlinewidth{1cm} % pour que la 1ère colonne fasse 1 cm de large
+\tabnumlinewidth{1cm} % pour que la 1\`ere colonne fasse 1 cm de large
\tablineheight{15mm} % pour que chaque ligne ait une hauteur de 15 mm
-\end{lstlisting}
+\end{tcblisting}
-\paragraph*{Attention :} il faut impérativement mettre l'unité (cm, mm, em, ex ou pt).
+\paragraph*{Attention :} il faut imp\'erativement mettre l'unit\'e (cm, mm, em, ex ou pt).
\subsection{\textbackslash tableur*}
-La version étoilée de \textbackslash\texttt{tableur} permet de construire un tableur dont les colonnes n'ont pas les m\^emes dimensions.
-
-%\medskip%
+La version \'etoil\'ee de \textbackslash\texttt{tableur} permet de construire un tableur dont les colonnes n'ont pas les m\^emes dimensions.
-\begin{lstlisting}
-\tableur*{A/2cm,B/4cm,C/1cm,D/4cm}
-\end{lstlisting}
-\begin{center}
+\begin{tcblisting}{listing}
\begin{tikzpicture}
-\tableur*{A/2cm,B/4cm,C/1cm,D/4cm}
+\tableur*[2]{A/2cm,B/4cm,C/1cm,D/3cm}
\end{tikzpicture}
-\end{center}
+\end{tcblisting}
+
+\newpage
\subsection{Les noms de colonnes}
-Les colonnes peuvent porter n'importe quelle lettre majuscule de l'alphabet latin :\\ ABCDEFGHIJKLMNOPKRSTUVWXYZ.
+Les colonnes peuvent porter n'importe quelle lettre majuscule de l'alphabet latin :
+
+ABCDEFGHIJKLMNOPKRSTUVWXYZ.
On ne peut pas nommer les colonnes par \og AA \fg{} par exemple.
@@ -243,87 +186,77 @@
Quant aux lignes, elles commencent toujours par \og 1 \fg.
-\subsection{Les couleurs par défaut}
-Deux couleurs sont utilisées pour les cases \og en-t-\^etes \fg{} :
+\subsection{Les couleurs par d\'efaut}
+
+Deux couleurs sont utilis\'ees pour les cases \og en-t-\^etes \fg{} :
\medskip
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
\definecolor{grayTopCell}{cmyk}{0.08,0.05,0.06,0}
\definecolor{grayBottomCell}{cmyk}{0.1,0.07,0.08,0}
-\end{lstlisting}
+\end{tcblisting}
\medskip
-Pour les changer, vous pouvez les redéfinir après avoir appelé \texttt{pas-tableur}.
+Pour les changer, vous pouvez les red\'efinir apr\`es avoir appel\'e \texttt{pas-tableur}.
\medskip
-Le gris de séparation des cellules est, quant à lui, défini par :
+Le gris de s\'eparation des cellules est, quant \`a lui, d\'efini par :
\medskip
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
\definecolor{graySepCell}{cmyk}{0.29,0.21,0.21,0}
-\end{lstlisting}
+\end{tcblisting}
-\subsection{La police de caractère des en-t\^ete}
+\subsection{La police de caract\`ere des en-t\^ete}
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
\newcommand{\helvbx}{\usefont{T1}{phv}{m}{n}}
-\end{lstlisting}
+\end{tcblisting}
\medskip
-Ainsi, si vous souhaitez insérer le nom d'une cellule dans votre document, vous pouvez utiliser la syntaxe suivante :
+Ainsi, si vous souhaitez ins\'erer le nom d'une cellule dans votre document, vous pouvez utiliser la syntaxe suivante :
\medskip
-\begin{minipage}{8cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing}
Dans la cellule {\helvbx A3}, nous
-avons inséré la formule ...
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-8.5cm}
-Dans la cellule {\helvbx A3}, nous avons inséré la formule ...
-\end{minipage}
+avons ins\'er\'e la formule...
+\end{tcblisting}
+
\subsection{Nomination des cellules}
-Toujours dans un logique de simplifier la rédaction des documents, j'ai souhaité nommer chaque cellule de façon intuitive.
+Toujours dans un logique de simplifier la r\'edaction des documents, j'ai souhait\'e nommer chaque cellule de fa\c con intuitive.
-Ainsi, la cellule {\helvbx A1} est nommée : cellA-1.
+Ainsi, la cellule {\helvbx A1} est nomm\'ee : cellA-1.
-Cette précision est utile lorsque l'on souhaite ajouter des flèches vers certaines cellules comme dans l'exemple suivant :
+Cette pr\'ecision est utile lorsque l'on souhaite ajouter des fl\`eches vers certaines cellules comme dans l'exemple suivant :
\medskip
-\begin{lstlisting}
+\begin{tcblisting}{listing}
\begin{tikzpicture}
-\tableur[3]{A-E}
-\draw[<-] (cellB-2.center) to[bend right=30] ($(cellB-2)+(2,-1.7)$)
+\tableur[3]{A-D}
+\draw[<-,>=latex'] (cellB-2.center) to[bend right=30] ($(cellB-2)+(2,-1.7)$)
node[right] {C'est la cellule {\helvbx B2}};
\end{tikzpicture}
-\end{lstlisting}
-
-\begin{tikzpicture}
-\tableur[3]{A-E}
-\draw[<-,>=stealth'] (cellB-2.center) to[bend right=30] ($(cellB-2)+(2,-1.7)$) node[right] {C'est la cellule {\helvbx B2}};
-\end{tikzpicture}
-
-\section{\textbackslash celtxt : insérer du texte dans une cellule}
+\end{tcblisting}
+\section{\textbackslash celtxt et \textbackslash celtxt* : ins\'erer du texte dans une cellule}
-\subsection{Syntaxe générale}
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
+% Ins\'erer une formule ou un texte
\celtxt[<options>}{<colonne>}{<ligne>}{<texte>}
-\end{lstlisting}
+% Ins\'erer un texte en mode math\'ematiques ou non
+\celtxt*[<options>}{<colonne>}{<ligne>}{<texte>}
+\end{tcblisting}
\medskip
@@ -333,60 +266,38 @@
\begin{itemize}
\item \texttt{c} : pour centrer le texte ;
-\item \texttt{l} : pour positionner le texte à gauche (c'est cette valeur qui est désignée par défaut) ;
-\item \texttt{r} : pour positionner le texte à droite ;
-\item \texttt{width=} : pour spécifier la largeur de la colonne dans le cas où nous avons utiliser la commande \textbackslash\texttt{tableur*}. Par défaut, la largeur est 7em (largeur par défaut de chaque colonne) ;
-\item \texttt{color=} : couleur du texte. Par défaut, la couleur est noire.
+\item \texttt{l} : pour positionner le texte \`a gauche (c'est cette valeur qui est d\'esign\'ee par d\'efaut) ;
+\item \texttt{r} : pour positionner le texte \`a droite ;
+
+\item \texttt{width=} : pour sp\'ecifier la largeur de la colonne dans le cas o\`u nous avons utilis\'e la commande \texttt{\textbackslash tableur*}. Par d\'efaut,la largeur est 7em (largeur par d\'efaut de chaque colonne) ;
+
+\item \texttt{color=} : couleur du texte. Par d\'efaut, la couleur est noire.
\end{itemize}
\medskip
-Le texte peut \^etre formatté de deux façons différentes selon qu'il désigne une formule ou un texte normal, comme le montre l'exemple suivant :
+Le texte peut \^etre format\'e de deux fa\c cons diff\'erentes selon qu'il d\'esigne une formule ou un texte normal, comme le montre l'exemple suivant :
\bigskip
-\begin{minipage}{7cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=Exemple 1}
\begin{tikzpicture}
\tableur[2]{M-O}
\celtxt{M}{1}{=B1^2}
\celtxt[r]{N}{2}{Du texte ici}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur[2]{M-O}
-\celtxt{M}{1}{=B1^2}
-\celtxt[r]{N}{2}{Du texte ici}
-\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
\medskip
-\begin{minipage}{7cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=Exemple 2}
\begin{tikzpicture}
\tableur*[2]{M/13mm,N/3cm}
\celtxt[width=13mm]{M}{1}{=B1^2}
\celtxt[r,width=3cm]{N}{2}
{Du texte ici}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur*[2]{M/13mm,N/3cm}
-\celtxt[width=13mm]{M}{1}{=B1^2}
-\celtxt[r,width=3cm]{N}{2}{Du texte ici}
-\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
\subsection{Formater le texte}
@@ -394,26 +305,14 @@
\medskip
-\begin{minipage}{7cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=\'Ecrire en italique}
\begin{tikzpicture}
\tableur[2]{M-O}
\celtxt{M}{1}{=B1^2}
\celtxt[r]{N}{2}
{\itshape Du texte ici}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur[2]{M-O}
-\celtxt{M}{1}{=B1^2}
-\celtxt[r]{N}{2}{\itshape Du texte ici}
-\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
\medskip
@@ -421,139 +320,150 @@
\medskip
-\begin{minipage}{7cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=\'Ecrire en gras}
\begin{tikzpicture}
\tableur[2]{M-O}
\celtxt{M}{1}{=B1^2}
\celtxt[r]{N}{2}
{\bfseries Du texte ici}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur[2]{M-O}
-\celtxt{M}{1}{=B1^2}
-\celtxt[r]{N}{2}{\bfseries Du texte ici}
-\end{tikzpicture}
-\end{minipage}
-
-\medskip
+\end{tcblisting}
voire m\^eme en petites majuscules :
\medskip
-
-\begin{minipage}{7cm}
-\begin{lstlisting}
+\begin{tcblisting}{listing,title=\'Ecrire en petites majuscules}
\begin{tikzpicture}
\tableur[2]{M-O}
\celtxt{M}{1}{=B1^2}
\celtxt[r,color=red]{N}{2}
{\scshape Du texte ici}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
+\end{tcblisting}
+
+\subsection{Mode math\'ematique dans une cellule}
+
+G\'en\'eration des premiers termes de la suite d\'efinie par $\left\{\begin{array}{l}
+u_0=5\\
+u_{n+1}=au_n+0,1
+\end{array}
+\right.$ o\`u $a$ est une valeur mise dans la cellule \helvbx{
+C1}.
+
+\begin{tcblisting}{listing,title=\'Ecrire en mode math\'ematique}
\begin{tikzpicture}
-\tableur[2]{M-O}
-\celtxt{M}{1}{=B1^2}
-\celtxt[r,color=red]{N}{2}{\scshape Du texte ici}
+\tableur*[3]{A/2cm,B/3cm,C/2cm}
+\celtxt*[c]{A}{1}{$n$}
+\celtxt*[c]{B}{1}{$u_n$}
+\celtxt[c]{C}{1}{0.85}
+\celtxt[c]{A}{2}{0}
+\celtxt[c]{B}{2}{5}
+\celtxt{A}{3}{=A2+1}
+\celtxt{B}{3}{=$C$1*B2+0.1}
\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
-\section{Sélection de cellules}
+\paragraph*{Remarque :} les commandes \texttt{\textbackslash celtxt} et sa version \'etoil\'ee (introduites dans la version 2.01 du 31 janvier 2016) ont \'et\'e r\'e-\'ecrites et imagin\'ees sur la page \url{https://groups.google.com/forum/#!topic/fr.comp.text.tex/7K1r9fUd_Rs}. J'ai donc d\'ecid\'e d'introduire ce nouveau code car il semblerait que certains utilisateurs aient express\'ement envie d'ins\'erer du texte en mode math\'ematique dans certaines cellules.
-\subsection{\textbackslash selecCell : sélection d'une cellule}
+\section{S\'election de cellules}
-\begin{lstlisting}
+\subsection{\textbackslash selecCell : s\'election d'une cellule}
+
+\begin{tcblisting}{codeTEX}
\selecCell{<colonne>}{<ligne>}
-\end{lstlisting}
+\end{tcblisting}
\medskip
-Permet de simuler le cas où une cellule est sélectionnée, comme le montre l'exemple suivant :
+Permet de simuler le cas o\`u une cellule est s\'electionn\'ee, comme le montre l'exemple suivant :
\medskip
-\begin{minipage}{7cm}
-~\par
-\begin{lstlisting}
+\begin{tcblisting}{listing}
\begin{tikzpicture}
-\tableur[3]{M-O}
-\selecCell{N}{2}
-\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur[3]{M-O}
+\tableur[2]{M-O}
\selecCell{N}{2}
\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
+
-\subsection{\textbackslash multiSelec : sélection de plusieurs colonnes}
+\subsection{\textbackslash multiSelec : s\'election de plusieurs colonnes}
Voyons un exemple pour comprendre la syntaxe :
\medskip
-\begin{minipage}{7cm}
-~\par
-\begin{lstlisting}
+\begin{tcblisting}{listing}
\begin{tikzpicture}
\tableur[3]{M-O}
\multiSelec{N-2}{O-3}
\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}{5mm}
-~\par
-\end{minipage}
-\begin{minipage}{\dimexpr\linewidth-7.5mm}
-\begin{tikzpicture}
-\tableur[3]{M-O}
-\multiSelec{N-2}{O-3}
-\end{tikzpicture}
-\end{minipage}
+\end{tcblisting}
+
+\newpage
-\subsection{Les couleurs par défaut}
+\subsection{Les couleurs par d\'efaut}
-\begin{lstlisting}
+\begin{tcblisting}{codeTEX}
% Pour les en-tetes
\definecolor{blueSelecCellTop}{cmyk}{0.52,0.17,0,0}
\definecolor{blueSelecCellBottom}{cmyk}{0.75,0.34,0,0}
-% Pour les cellules sélectionnées
+% Pour les cellules s\'electionn\'ees
\definecolor{blueSelec}{cmyk}{0.23,0.06,0,0}
-\end{lstlisting}
+\end{tcblisting}
\medskip
-\`A noter qu'une opacité de 50\% est appliquée pour les cellules sélectionnées (afin de voir les traits de séparation des cellules).
+\`A noter qu'une opacit\'e de 50\,\% est appliqu\'ee pour les cellules s\'electionn\'ees (afin de voir les traits de s\'eparation des cellules).
-\section{Suggestions et remarques}
+\section{R\'esum\'e des commandes \`a travers des exemples}
-Je suis bien entendu ouvert à toute suggestion d'évolution et remarques. C'est d'ailleurs à l'aide de vos remarques que j'ai pu faire évoluer cette extension.
+\begin{tabularx}{\linewidth}{|Sl|X|}
+\hline
+\texttt{\textbackslash tableur[3]\{A-F\}} & Trace un tableur sur 3 lignes, avec les colonnes A, B, C, D, E, F.
+\\
+\hline
+\texttt{\textbackslash tableur[2]\{A,B,C\}} & Trace un tableur sur 2 lignes, avec les colonnes A, B, C.\\
+\hline
+\texttt{\textbackslash tableur*[3]\{A/2cm,B/5cm\}} & Trace un tableur sur 3 lignes, avec des colonnes A et B de largeur diff\'erente.\\
+\hline
+\texttt{\textbackslash celtxt[c]\{A\}\{1\}\{=B2*2\}} & Affiche la formule \og =B2*2 \fg{} dans la cellule A1 centr\'ee horizontalement.\\
+\hline
+\texttt{\textbackslash celtxt[color=red]\{A\}\{1\}\{=B2*2\}} & Affiche en rouge la formule \og =B2*2 \fg{} dans la cellule A1.\\
+\hline
+\texttt{\textbackslash celtxt[width=5cm]\{A\}\{1\}\{=B2*2\}} & Affiche la formule \og =B2*2 \fg{} dans la cellule A1, de largeur 5 cm.\\
+\hline
+\texttt{\textbackslash celtxt*[r]\{A\}\{1\}\{\verb+$+u\verb+_+n\verb+$+\}} & Affiche \og $u_n$ \fg{} dans la cellule A1, align\'e \`a droite.\\
+\hline
+\texttt{\textbackslash selecCell\{A\}\{1\}} & Dessine un cadre autour de la cellule A1.\\
+\hline
+\texttt{\textbackslash multiSelec\{A-1\}\{C-2\}} & Simule la s\'election des cellules allant de A1 \`a C2.\\
+\hline
+\texttt{\textbackslash helvbx\{A1\}} & Affiche \helvbx{A1}.\\
+\hline
+\end{tabularx}
+
+\newpage
+\section{Implantation}
+
+\lstset{%
+numbers=left,
+numberstyle=\tiny,
+tabsize=2,
+stepnumber=5,
+numbersep=5pt,
+language=TeX,
+breaklines=true,
+basicstyle=\small,%
+keywordstyle=\color{red!50!black},%
+identifierstyle=, %
+commentstyle=\color{gray},%
+stringstyle=\ttfamily,%
+showstringspaces=true,
+morekeywords={newcommand,definecolor,RequirePackage, usetikzlibrary,fill,node,draw,tikzstyle,StrChar,StrBetween, foreach,IfSubStr,StrBefore,StrBehind,StrLen,IfBeginWith,makebox, dimexpr,StrGobbleLeft,setlength}}
-N'hésitez donc pas à m'envoyer un mail ou a poster votre soucis sur le forum de \href{http://forum.mathematex.net}{mathematex}.
-
-\medskip
-
-J'attire toutefois votre attention sur le fait que toute demande concernant un problème de compilation doit \^etre postée sur le forum (en non envoyée par mail) et accompagnée d'un code précis afin que cela serve aux multiples utilisateurs de cette extension.
-
-\medskip
+\lstinputlisting{pas-tableur.sty}
-Je ne répondrai par mail qu'aux questions concernant directement \texttt{pas-tableur}, et non aux problèmes de compilation, qui sont plus d'ordre technique.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pas-tableur.doc.tlpobj new/tlpkg/tlpobj/pas-tableur.doc.tlpobj
--- old/tlpkg/tlpobj/pas-tableur.doc.tlpobj 2015-04-13 02:09:55.000000000 +0200
+++ new/tlpkg/tlpobj/pas-tableur.doc.tlpobj 2016-04-14 19:32:40.000000000 +0200
@@ -1,9 +1,11 @@
name pas-tableur.doc
category Package
-revision 35034
+revision 39542
shortdesc doc files of pas-tableur
relocated 1
-docfiles size=6
+docfiles size=8
RELOC/doc/latex/pas-tableur/README
RELOC/doc/latex/pas-tableur/README.TEXLIVE
+ RELOC/doc/latex/pas-tableur/doc.codes.tex
+ RELOC/doc/latex/pas-tableur/doc.styles.tex
RELOC/doc/latex/pas-tableur/pas-tableur.tex
++++++ pas-tableur.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pas-tableur/pas-tableur.sty new/tex/latex/pas-tableur/pas-tableur.sty
--- old/tex/latex/pas-tableur/pas-tableur.sty 2014-08-24 23:19:23.000000000 +0200
+++ new/tex/latex/pas-tableur/pas-tableur.sty 2016-02-02 00:06:34.000000000 +0100
@@ -1,461 +1,353 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% pas-tableur.sty v2.00 encodage : UTF8 %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% Créé par Stéphane PASQUET %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% pas-tableur.sty v2.01 encodage : UTF8 %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% Cree par Stephane PASQUET %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-\def\fileversion{2.00}
-\def\filedate{2014/08/16}
+\def\fileversion{2.1}
+\def\filedate{2016/01/31}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{pas-tableur}[%
\filedate\space v\fileversion\space
LaTeX package by Stephane PASQUET]
-\@ifpackageloaded{tikz}{}{\RequirePackage{tikz}}
+\RequirePackage{tikz}
\usetikzlibrary{calc}
-\@ifpackageloaded{xstring}{}{\RequirePackage{xstring}}
-\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
-
-
-% Définition des couleurs
-
+\RequirePackage{xstring}
+\RequirePackage{xkeyval}
+%
+% Definition des couleurs
+%
\definecolor{grayTopCell}{cmyk}{0.08,0.05,0.06,0}
\definecolor{grayBottomCell}{cmyk}{0.1,0.07,0.08,0}
\definecolor{graySepCell}{cmyk}{0.29,0.21,0.21,0}
\definecolor{blueSelecCellTop}{cmyk}{0.52,0.17,0,0}
\definecolor{blueSelecCellBottom}{cmyk}{0.75,0.34,0,0}
\definecolor{blueSelec}{cmyk}{0.23,0.06,0,0}
-
-% Définition des dimensions par défaut
-
+%
+% Definition des dimensions par defaut
+%
\def\col@width{7em}
-\def\numline@width{3em} % largeur de la colonne indiquant le numéros des lignes
+\def\numline@width{3em} % largeur de la colonne indiquant le numeros des lignes
\def\line@height{1.57em}
-
- %==> Changer les valeurs par défaut
+%
+ %==> Changer les valeurs par defaut
\newcommand*{\tabcolwidth}[1]{\def\col@width{#1}}
\newcommand*{\tabnumlinewidth}[1]{\def\numline@width{#1}}
\newcommand*{\tablineheight}[1]{\def\line@height{#1}}
-
-% Définition des polices de caractÚres
-
+%
+% Definition des polices de caracteres
+%
\newcommand{\helvbx}{\usefont{T1}{phv}{m}{n}}
-
-% Construction du tableur
-
- %==> Style des cellules
- \tikzstyle{celempty} = [outer sep=0pt]
- \tikzstyle{celhead} = [draw=black,rectangle,outer sep=0pt]
-
- %==> Macro de redirection : étoilée ou pas étoilée ?
- \newcommand{\tableur}{\@ifstar{\tableur@star}{\tableur@nostar}}
-
- %==> Macro étoilée : \tableur*{A/<l1>,B/<l2>,...}. Tableur avec colonnes de largeurs différentes
- \newcommand{\tableur@star}[2][1]
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Construction du tableur %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%==> Macro intermediaire : trace de la premiere cellule
+%
+\newcommand{\pastab@draw@cell}[5]
+% #1 : \first@width, #2 : \first@name, #3 : 0=colonne1 / 1=autres colonnes /
+% 2 = ligne 1, #4 : coord., #5 : contenu
{%
- \xdef\list@of@col{#2}
- % Placement de la premiÚre cellule en-tête
- \StrChar{#2}{1}[\first@name]
- \StrBetween{#2}{/}{,}[\first@width]
- \node[minimum width={\first@width},minimum height=\line@height,celhead] (\first@name) {\helvbx\first@name};
- \fill[grayBottomCell]
- (\first@name.south west) --
- (\first@name.south east) --
- ($0.5*(\first@name.south east)+0.5*(\first@name.north east)$) --
- ($0.5*(\first@name.south west)+0.5*(\first@name.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\first@name.north west) --
- (\first@name.north east) --
- ($0.5*(\first@name.south east)+0.5*(\first@name.north east)$) --
- ($0.5*(\first@name.south west)+0.5*(\first@name.north west)$) --
- cycle;
- \node[minimum width={\first@width},minimum height=\line@height,celhead] at (\first@name) {\helvbx\first@name};
-
- % Placement des autres en-têtes de colonnes
-
- \foreach \name/\w [remember=\name as \lastname,count=\colnumber] in {#2}
- {
- \ifx\name\first@name
+ \ifnum#3=0%
+ \tikzstyle{cellstyle} = [celhead,minimum width={#1},minimum height=\line@height]%
+ \def\pastableur@coord{(0,0)}%
+ \else%
+ \ifnum#3=1%
+ \tikzstyle{cellstyle} = [celhead,right,minimum width={#1},minimum height=\line@height]%
\else
- \node[minimum width={\w},minimum height=\line@height,celhead,right] (\name) at (\lastname.east) {\helvbx\name};
- \fill[grayBottomCell]
- (\name.south west) --
- (\name.south east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\name.north west) --
- (\name.north east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \node[minimum width={\w},minimum height=\line@height,celhead,right] at (\lastname.east) {\helvbx\name};
- \fi
- }
-
- % Placement des en-têtes de lignes
-
- \node[below left,celhead,minimum width=\numline@width,minimum height=\line@height] (numline1) at (\first@name.south west) {\helvbx 1};
+ \ifnum#3=2%
+ \tikzstyle{cellstyle} = [below left,celhead,minimum width={#1},minimum height=\line@height]
+ \else%
+ \tikzstyle{cellstryle} = [below,celhead,minimum width={#1},minimum height=\line@height]
+ \fi%
+ \fi%
+ \def\pastableur@coord{(#4)}%
+ \fi%
+ \node[cellstyle] (#2) at \pastableur@coord {\helvbx#5};%
\fill[grayBottomCell]
- (numline1.south west) --
- (numline1.south east) --
- ($0.5*(numline1.south east)+0.5*(numline1.north east)$) --
- ($0.5*(numline1.south west)+0.5*(numline1.north west)$) --
- cycle;
+ (#2.south west) --
+ (#2.south east) --
+ ($0.5*(#2.south east)+0.5*(#2.north east)$) --
+ ($0.5*(#2.south west)+0.5*(#2.north west)$) --
+ cycle;%
\fill[grayTopCell]
- (numline1.north west) --
- (numline1.north east) --
- ($0.5*(numline1.south east)+0.5*(numline1.north east)$) --
- ($0.5*(numline1.south west)+0.5*(numline1.north west)$) --
- cycle;
- \node[below left,celhead,minimum width=\numline@width,minimum height=\line@height] (numline1) at (\first@name.south west) {\helvbx1};
- \ifnum#1>1
- \foreach \num@line [remember=\num@line as \lastnum (initially 1)] in {2,...,#1}
- {
- \node[below,celhead,minimum width=\numline@width,minimum height=\line@height] (numline\num@line) at (numline\lastnum.south) {\helvbx\num@line};
- \fill[grayBottomCell]
- (numline\num@line.south west) --
- (numline\num@line.south east) --
- ($0.5*(numline\num@line.south east)+0.5*(numline\num@line.north east)$) --
- ($0.5*(numline\num@line.south west)+0.5*(numline\num@line.north west)$) --
- cycle;
- \fill[grayTopCell]
- (numline\num@line.north west) --
- (numline\num@line.north east) --
- ($0.5*(numline\num@line.south east)+0.5*(numline\num@line.north east)$) --
- ($0.5*(numline\num@line.south west)+0.5*(numline\num@line.north west)$) --
- cycle;
- \node[below,celhead,minimum width=\numline@width,minimum height=\line@height] (numline\num@line) at (numline\lastnum.south) {\helvbx\num@line};
- }
- \fi
-
- % Tracé de la grille
-
- \foreach \name/\w in {#2}
- {
- \node[celempty,below,minimum height=\line@height,minimum width=\w] (cell\name-1) at (\name.south) {};
- \draw[graySepCell] ($(cell\name-1.south west)+(0.25pt,0)$) -- (cell\name-1.south east) -- ($(cell\name-1.north east)+(0,-0.25pt)$);
- }
- \ifnum#1>1
- \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
- {
- \foreach \name/\w in {#2}
- {
- \node[celempty,below,minimum height=\line@height,minimum width=\w] (cell\name-\numline) at (cell\name-\lastnumline.south) {};
- \draw[graySepCell] ($(cell\name-\numline.south west)+(0.25pt,0)$) -- (cell\name-\numline.south east) -- ($(cell\name-\numline.north east)+(0,-0.25pt)$);
- }
- }
- \fi
+ (#2.north west) --
+ (#2.north east) --
+ ($0.5*(#2.south east)+0.5*(#2.north east)$) --
+ ($0.5*(#2.south west)+0.5*(#2.north west)$) --
+ cycle;%
+ \node[minimum width={#1},minimum height=\line@height,cellstyle] at \pastableur@coord {\helvbx#5};%
+ }
+%
+%==> Macro intermediaire : trace de la grille
+%
+\newcommand{\pastableur@grid}[4] % #1 : width, #2 : name, #3 : numline, #4 : coord.
+ {%
+ \node[celempty,below,minimum height=\line@height,minimum width=#1] (cell#2-#3) at (#4) {};%
+ \draw[graySepCell] ($(cell#2-#3.south west)+(0.25pt,0)$) -- (cell#2-#3.south east) -- ($(cell#2-#3.north east)+(0,-0.25pt)$);%
+ }
+%
+%==> Style des cellules
+%
+\tikzstyle{celempty} = [outer sep=0pt]
+\tikzstyle{celhead} = [draw=black,rectangle,outer sep=0pt]
+%
+%==> Macro de redirection : etoilee ou pas etoilee ?
+%
+\newcommand{\tableur}{\@ifstar{\tableur@star}{\tableur@nostar}}
+%
+%==> Macro etoilee : \tableur*{A/<l1>,B/<l2>,...}. Tableur avec colonnes de largeurs differentes
+%
+\newcommand{\tableur@star}[2][1]
+ {%
+ \xdef\list@of@col{#2}%
+ % Placement de la premiere cellule en-tête
+ \StrChar{#2}{1}[\first@name]%
+ \StrBetween{#2}{/}{,}[\first@width]%
+ \pastab@draw@cell{\first@width}{\first@name}{0}{}{\first@name}
+ % Placement des autres en-têtes de colonnes
+ \foreach \name/\w [remember=\name as \lastname,count=\colnumber] in {#2}
+ {%
+ \ifx\name\first@name%
+ \else%
+ \pastab@draw@cell{\w}{\name}{1}{\lastname.east}{\name}
+ \fi%
+ }%
+ % Placement des en-têtes de lignes
+ \pastab@draw@cell{\numline@width}{numline1}{2}{\first@name.south west}{1}
+ \ifnum#1>1%
+ \foreach \num@line [remember=\num@line as \lastnum (initially 1)] in {2,...,#1}
+ {%
+ \pastab@draw@cell{\numline@width}{numline\num@line}{3}{numline\lastnum.south east}{\num@line}%
+ }%
+ \fi%
+ % Trace de la grille
+ \foreach \name/\w in {#2}
+ {%
+ \pastableur@grid{\w}{\name}{1}{\name.south}%
+ }%
+ \ifnum#1>1%
+ \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
+ {%
+ \foreach \name/\w in {#2}
+ {%
+ \pastableur@grid{\w}{\name}{\numline}{cell\name-\lastnumline.south}%
+ }%
+ }%
+ \fi%
} % --> Fin de \tableur*
-
- %==> Macro non étoilée : \tableur{A,B,C,...} ou \tableur{A-C}
-
- %----------> Liste des noms de colonnes <----------
- \xdef\col@names{ABCDEFGHIJKLMNOPQRSTUVWXYZ}
-
- \newcommand{\tableur@nostar}[2][1] % [#1] -> nombre de lignes (par défaut, "1"), #2 -> A,B,...,Z
+%
+%==> Macro non etoilee : \tableur{A,B,C,...} ou \tableur{A-C}
+%
+\xdef\col@names{ABCDEFGHIJKLMNOPQRSTUVWXYZ} %----------> Liste des noms de colonnes <----------
+%
+\newcommand{\tableur@nostar}[2][1] % [#1] -> nombre de lignes (par defaut, "1"), #2 -> A,B,...,Z
{%
\IfSubStr{#2}{-}
{%
- \StrBefore{#2}{-}[\str@start] % 1Úre lettre, par ex. "G"
- \StrBehind{#2}{-}[\str@end] % 2Úme lettre, par ex. "L"
+ \StrBefore{#2}{-}[\str@start] % 1ere lettre, par ex. "G"
+ \StrBehind{#2}{-}[\str@end] % 2eme lettre, par ex. "L"
\StrBetween{\col@names}{\str@start}{\str@end}[\str@col] % retourne par exemple "HIJK"
\edef\str@col{\str@start\str@col\str@end} % retourne alors "GHIJKL"
\StrLen{\str@col}[\nb@columns] % nombre de colonnes
- % --> On place la premiÚre cellule en-tête
- \node[minimum width={\col@width},minimum height=\line@height,celhead] (\str@start) {\helvbx\str@start};
- \fill[grayBottomCell]
- (\str@start.south west) --
- (\str@start.south east) --
- ($0.5*(\str@start.south east)+0.5*(\str@start.north east)$) --
- ($0.5*(\str@start.south west)+0.5*(\str@start.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\str@start.north west) --
- (\str@start.north east) --
- ($0.5*(\str@start.south east)+0.5*(\str@start.north east)$) --
- ($0.5*(\str@start.south west)+0.5*(\str@start.north west)$) --
- cycle;
- \node[minimum width={\col@width},minimum height=\line@height,celhead] at (\str@start) {\helvbx\str@start};
+ % --> On place la premiere cellule en-tête
+ \pastab@draw@cell{\col@width}{\str@start}{0}{}{\str@start}%
% --> On place les autres en-têtes
\foreach \i [remember=\i as \lasti (initially 1)] in {2,...,\nb@columns}
- {
- \StrChar{\str@col}{\i}[\name]
- \StrChar{\str@col}{\lasti}[\lastname]
- \node[minimum width={\col@width},minimum height=\line@height,celhead,right] (\name) at (\lastname.east) {\helvbx\name};
- \fill[grayBottomCell]
- (\name.south west) --
- (\name.south east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\name.north west) --
- (\name.north east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \node[minimum width={\col@width},minimum height=\line@height,celhead] at (\name) {\helvbx\name};
- }
- }
- {
- \StrChar{#2}{1}[\str@start]
- \node[minimum width={\col@width},minimum height=\line@height,celhead] (\str@start) {\helvbx\str@start};
- \fill[grayBottomCell]
- (\str@start.south west) --
- (\str@start.south east) --
- ($0.5*(\str@start.south east)+0.5*(\str@start.north east)$) --
- ($0.5*(\str@start.south west)+0.5*(\str@start.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\str@start.north west) --
- (\str@start.north east) --
- ($0.5*(\str@start.south east)+0.5*(\str@start.north east)$) --
- ($0.5*(\str@start.south west)+0.5*(\str@start.north west)$) --
- cycle;
- \node[minimum width={\col@width},minimum height=\line@height,celhead] at (\str@start) {\helvbx\str@start};
-
+ {%
+ \StrChar{\str@col}{\i}[\name]%
+ \StrChar{\str@col}{\lasti}[\lastname]%
+ \pastab@draw@cell{\col@width}{\name}{1}{\lastname.east}{\name}%
+ }%
+ }%
+ {%
+ \StrChar{#2}{1}[\str@start]%
+ \pastab@draw@cell{\col@width}{\str@start}{0}{}{\str@start}%
\foreach \name [remember=\name as \lastname] in {#2}
- {
- \ifx\name\str@start
- \else
- \node[minimum width={\col@width},minimum height=\line@height,celhead,right] (\name) at (\lastname.east) {\helvbx\name};
- \fill[grayBottomCell]
- (\name.south west) --
- (\name.south east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \fill[grayTopCell]
- (\name.north west) --
- (\name.north east) --
- ($0.5*(\name.south east)+0.5*(\name.north east)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)$) --
- cycle;
- \node[minimum width={\col@width},minimum height=\line@height,celhead] at (\name) {\helvbx\name};
- \fi
- }
- }
-
-
+ {%
+ \ifx\name\str@start%
+ \else%
+ \pastab@draw@cell{\col@width}{\name}{1}{\lastname.east}{\name}%
+ \fi%
+ }%
+ }%
% Placement des en-têtes de lignes
-
- \StrChar{#2}{1}[\first@name]
- \node[below left,celhead,minimum width=\numline@width,minimum height=\line@height] (numline1) at (\first@name.south west) {\helvbx 1};
- \fill[grayBottomCell]
- (numline1.south west) --
- (numline1.south east) --
- ($0.5*(numline1.south east)+0.5*(numline1.north east)$) --
- ($0.5*(numline1.south west)+0.5*(numline1.north west)$) --
- cycle;
- \fill[grayTopCell]
- (numline1.north west) --
- (numline1.north east) --
- ($0.5*(numline1.south east)+0.5*(numline1.north east)$) --
- ($0.5*(numline1.south west)+0.5*(numline1.north west)$) --
- cycle;
- \node[below left,celhead,minimum width=\numline@width,minimum height=\line@height] (numline1) at (\first@name.south west) {\helvbx1};
- \ifnum#1>1
- \foreach \num@line [remember=\num@line as \lastnum (initially 1)] in {2,...,#1}
- {
- \node[below,celhead,minimum width=\numline@width,minimum height=\line@height] (numline\num@line) at (numline\lastnum.south) {\helvbx\num@line};
- \fill[grayBottomCell]
- (numline\num@line.south west) --
- (numline\num@line.south east) --
- ($0.5*(numline\num@line.south east)+0.5*(numline\num@line.north east)$) --
- ($0.5*(numline\num@line.south west)+0.5*(numline\num@line.north west)$) --
- cycle;
- \fill[grayTopCell]
- (numline\num@line.north west) --
- (numline\num@line.north east) --
- ($0.5*(numline\num@line.south east)+0.5*(numline\num@line.north east)$) --
- ($0.5*(numline\num@line.south west)+0.5*(numline\num@line.north west)$) --
- cycle;
- \node[below,celhead,minimum width=\numline@width,minimum height=\line@height] (numline\num@line) at (numline\lastnum.south) {\helvbx\num@line};
+ \StrChar{#2}{1}[\first@name]%
+ \pastab@draw@cell{\numline@width}{numline1}{2}{\first@name.south west}{1}
+ \ifnum#1>1%
+ \foreach \num@line [remember=\num@line as \lastnum (initially 1)] in {2,...,#1}
+ {%
+ \pastab@draw@cell{\numline@width}{numline\num@line}{3}{numline\lastnum.south east}{\num@line}%
+ }%
+ \fi%
+ % Trace de la grille
+ \IfSubStr{#2}{-}
+ {%
+ \foreach \i in {1,...,\nb@columns}
+ {%
+ \StrChar{\str@col}{\i}[\name]%
+ \pastableur@grid{\col@width}{\name}{1}{\name.south}%
+ }%
+ \ifnum#1>1%
+ \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
+ {%
+ \foreach \i in {1,...,\nb@columns}
+ {%
+ \StrChar{\str@col}{\i}[\name]%
+ \pastableur@grid{\col@width}{\name}{\numline}{cell\name-\lastnumline.south}%
+ }%
+ }%
+ \fi%
}
- \fi
-
- % Tracé de la grille
-
- \IfSubStr{#2}{-}
- {%
- \foreach \i in {1,...,\nb@columns}
- {
- \StrChar{\str@col}{\i}[\name]
- \node[celempty,below,minimum height=\line@height,minimum width=\col@width] (cell\name-1) at (\name.south) {};
- \draw[graySepCell] ($(cell\name-1.south west)+(0.25pt,0)$) -- (cell\name-1.south east) -- ($(cell\name-1.north east)+(0,-0.25pt)$);
- }
- \ifnum#1>1
- \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
- {
- \foreach \i in {1,...,\nb@columns}
- {
- \StrChar{\str@col}{\i}[\name]
- \node[celempty,below,minimum height=\line@height,minimum width=\col@width] (cell\name-\numline) at (cell\name-\lastnumline.south) {};
- \draw[graySepCell] ($(cell\name-\numline.south west)+(0.25pt,0)$) -- (cell\name-\numline.south east) -- ($(cell\name-\numline.north east)+(0,-0.25pt)$);
- }
- }
- \fi
- }
- {%
- \foreach \name in {#2}
- {
- \node[celempty,below,minimum height=\line@height,minimum width=\col@width] (cell\name-1) at (\name.south) {};
- \draw[graySepCell] ($(cell\name-1.south west)+(0.25pt,0)$) -- (cell\name-1.south east) -- ($(cell\name-1.north east)+(0,-0.25pt)$);
- }
- \ifnum#1>1
- \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
- {
- \foreach \name in {#2}
- {
- \node[celempty,below,minimum height=\line@height,minimum width=\col@width] (cell\name-\numline) at (cell\name-\lastnumline.south) {};
- \draw[graySepCell] ($(cell\name-\numline.south west)+(0.25pt,0)$) -- (cell\name-\numline.south east) -- ($(cell\name-\numline.north east)+(0,-0.25pt)$);
- }
- }
- \fi
- }
-}
-
-% Insérer quelque chose dans une cellule
-
+ {%
+ \foreach \name in {#2}
+ {%
+ \pastableur@grid{\col@width}{\name}{1}{\name.south}%
+ }%
+ \ifnum#1>1%
+ \foreach\numline [remember=\numline as \lastnumline (initially 1)] in {2,...,#1}
+ {%
+ \foreach \name in {#2}
+ {%
+ \pastableur@grid{\col@width}{\name}{\numline}{cell\name-\lastnumline.south}%
+ }%
+ }%
+ \fi%
+ }%
+ } % --> Fin de \tableur
+%
+% Inserer quelque chose dans une cellule : \celtxt [modif. du 2016/01/21 due \`a "Un bon petit"]
+%
\define@cmdkey [PAS] {celtxt} {width}{}
\define@cmdkey [PAS] {celtxt} {color}{}
\define@boolkey [PAS] {celtxt} {l}[true]{}
\define@boolkey [PAS] {celtxt} {r}[true]{}
\define@boolkey [PAS] {celtxt} {c}[true]{}
\presetkeys [PAS] {celtxt} {width = \col@width, color=black}{}
-
-\newcommand*{\celtxt}[1][]{\cel@txt[#1]}
-
-\newcommand\cel@txt[3][]{%
- \setkeys[PAS]{celtxt}{#1}
- \begingroup
- \@makeother\^%
- \@makeother\$%
- \@celtxt@[#1]{#2}{#3}%
-}
-\newcommand\@celtxt@[4][]{%
- \endgroup
- \setkeys[PAS]{celtxt}{#1}
- \StrPosition{#4}{=}[\@equalPos]
- \ifnum\@equalPos=1
- %\def\@scale{1}%
- \let\@style\texttt
- \else
- %\def\@scale{0.9}%
- \let\@style\@empty
- \fi
- \ifPAS@celtxt@c
- \def\pos@align{c}
- \else
- \ifPAS@celtxt@r
- \def\pos@align{r}
- \else
- \def\pos@align{l}
- \fi
- \fi
- \node at (cell#2-#3) {\makebox[\dimexpr\cmdPAS@celtxt@width-2pt][\pos@align]{\@style{\textcolor{\cmdPAS@celtxt@color}{#4}}}};
-}
-
-% Cellule sélectionnée : \selecCell
-
+%
+\newcommand*\celtxt@catcoderegime@begin{}
+\newcommand*\celtxt@catcoderegime@end{}
+%
+\newcommand*\celtxt
+ {%
+ \@ifstar{%
+ \let\celtxt@catcoderegime@end\@empty
+ \let\celtxt@catcoderegime@begin\@empty
+ \celtxt@i
+ }{%
+ \def\celtxt@catcoderegime@begin{%
+ \begingroup
+ \@makeother\^%
+ \@makeother\$%
+ }%
+ \let\celtxt@catcoderegime@end\endgroup
+ \celtxt@i
+ }%
+ }
+%
+\newcommand*{\celtxt@i}[1][]{\celtxt@ii{#1}}
+%
+\newcommand*\celtxt@ii[3]
+ {%
+ \setkeys[PAS]{celtxt}{#1}%
+ \celtxt@catcoderegime@begin
+ \celtxt@iii{#1}{#2}{#3}%
+ }
+%
+\newcommand*\celtxt@iii[4]
+ {%
+ \celtxt@catcoderegime@end
+ \IfBeginWith{#4}{=}{\let\pastab@style\texttt}{\let\pastab@style\@empty}
+ \ifPAS@celtxt@c
+ \def\pos@align{c}%
+ \else
+ \ifPAS@celtxt@r
+ \def\pos@align{r}%
+ \else
+ \def\pos@align{l}%
+ \fi
+ \fi
+ \node at (cell#2-#3) {\makebox[\dimexpr\cmdPAS@celtxt@width-2pt][\pos@align]{\pastab@style{\textcolor{\cmdPAS@celtxt@color}{#4}}}};%
+ }
+%
+% Cellule selectionnee : \selecCell
+%
\newcommand*\selecCell[2]
-{%
- %==> En-tête ligne
-
- \fill[blueSelecCellBottom]
- (numline#2.south west) --
- (numline#2.south east) --
- ($0.5*(numline#2.south east)+0.5*(numline#2.north east)$) --
- ($0.5*(numline#2.south west)+0.5*(numline#2.north west)$) --
- cycle;
- \fill[blueSelecCellTop]
- (numline#2.north west) --
- (numline#2.north east) --
- ($0.5*(numline#2.south east)+0.5*(numline#2.north east)$) --
- ($0.5*(numline#2.south west)+0.5*(numline#2.north west)$) --
- cycle;
- \node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline#2) {\helvbx#2};
-
- %==> En-tête colonne
-
- \fill[blueSelecCellBottom]
- ($(#1.south west)+(0.25pt,0.25pt)$) --
- ($(#1.south east)+(-0.25pt,0.25pt)$) --
- ($0.5*(#1.south east)+0.5*(#1.north east)+(-0.25pt,0)$) --
- ($0.5*(#1.south west)+0.5*(#1.north west)+(0.25pt,0)$) --
- cycle;
- \fill[blueSelecCellTop]
- ($(#1.north west)+(0.25pt,-0.25pt)$) --
- ($(#1.north east)+(-0.25pt,-0.25pt)$) --
- ($0.5*(#1.south east)+0.5*(#1.north east)+(-0.25pt,0)$) --
- ($0.5*(#1.south west)+0.5*(#1.north west)+(0.25pt,0)$) --
- cycle;
- \node at (#1) {\helvbx#1};
-
- %==> Cellule cell#1-#1
-
- \draw[very thick] (cell#1-#2.south west) rectangle (cell#1-#2.north east);
- \fill[black] ($(cell#1-#2.south east)+(-1pt,1pt)$) rectangle +(3pt,-3pt);
-}
-
-% Sélection de plusieurs cellules : \multiSelec{A-1}{B-2} _/!\_ Nouvelle syntaxe 2014
-
+ {%
+ %==> En-tête ligne
+ %
+ \pastableur@colorcell{numline#2}{0}
+ \node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline#2) {\helvbx#2};%
+ %
+ %==> En-tête colonne
+ %
+ \pastableur@colorcell{#1}{1}
+ \node at (#1) {\helvbx#1};%
+ %
+ %==> Cellule cell#1-#1
+ %
+ \draw[very thick] (cell#1-#2.south west) rectangle (cell#1-#2.north east);%
+ \fill[black] ($(cell#1-#2.south east)+(-1pt,1pt)$) rectangle +(3pt,-3pt);%
+ } % fin de \selecCell
+%
+% Selection de plusieurs cellules : \multiSelec{A-1}{B-2} _/!\_ Nouvelle syntaxe 2014
+%
\newcommand*\multiSelec[2]
-{%
- \fill[blueSelec,opacity=0.5] ($(cell#1.north west)+(0.25pt,-0.25pt)$) rectangle ($(cell#2.south east)+(-0.25pt,0.25pt)$);
- \draw[very thick] (cell#1.south west) rectangle (cell#1.north east);
- \fill[black] ($(cell#2.south east)+(-0.5pt,0.5pt)$) rectangle +(3pt,-3pt);
-
- %==> On colorie les en-têtes "colonnes"
-
- \StrChar{#1}{1}[\str@start] % par exemple, "G"
- \StrChar{#2}{1}[\str@end] % par exemple, "L"
- \StrBetween{\col@names}{\str@start}{\str@end}[\str@col] % retourne par exemple "HIJK"
- \edef\str@col{\str@start\str@col\str@end} % retourne alors "GHIJKL"
- \StrLen{\str@col}[\nb@columns] % nombre d'en-têtes "colonnes" à colorier
- \foreach \i in {1,...,\nb@columns}
- {
- \StrChar{\str@col}{\i}[\name]
- \fill[blueSelecCellBottom]
- ($(\name.south west)+(0.25pt,0.25pt)$) --
- ($(\name.south east)+(-0.25pt,0.25pt)$) --
- ($0.5*(\name.south east)+0.5*(\name.north east)+(-0.25pt,0)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)+(0.25pt,0)$) --
- cycle;
- \fill[blueSelecCellTop]
- ($(\name.north west)+(0.25pt,-0.25pt)$) --
- ($(\name.north east)+(-0.25pt,-0.25pt)$) --
- ($0.5*(\name.south east)+0.5*(\name.north east)+(-0.25pt,0)$) --
- ($0.5*(\name.south west)+0.5*(\name.north west)+(0.25pt,0)$) --
- cycle;
- \node at (\name) {\helvbx\name};
- }
-
- %==> On colorie les en-têtes "lignes"
-
- \StrGobbleLeft{#1}{2}[\first@num]
- \StrGobbleLeft{#2}{2}[\second@num]
- \foreach \i in {\first@num,...,\second@num}
- {
+ {%
+ \fill[blueSelec,opacity=0.5] ($(cell#1.north west)+(0.25pt,-0.25pt)$) rectangle ($(cell#2.south east)+(-0.25pt,0.25pt)$);%
+ \draw[very thick] (cell#1.south west) rectangle (cell#1.north east);%
+ \fill[black] ($(cell#2.south east)+(-0.5pt,0.5pt)$) rectangle +(3pt,-3pt);%
+ %
+ %==> On colorie les en-têtes "colonnes"
+ %
+ \StrChar{#1}{1}[\str@start] % par exemple, "G"
+ \StrChar{#2}{1}[\str@end] % par exemple, "L"
+ \StrBetween{\col@names}{\str@start}{\str@end}[\str@col] % retourne par exemple "HIJK"
+ \edef\str@col{\str@start\str@col\str@end} % retourne alors "GHIJKL"
+ \StrLen{\str@col}[\nb@columns] % nombre d'en-têtes "colonnes" \`a colorier
+ \foreach \i in {1,...,\nb@columns}
+ {%
+ \StrChar{\str@col}{\i}[\name]%
+ \pastableur@colorcell{\name}{1}
+ \node at (\name) {\helvbx\name};%
+ }%
+ %
+ %==> On colorie les en-têtes "lignes"
+ %
+ \StrGobbleLeft{#1}{2}[\first@num]%
+ \StrGobbleLeft{#2}{2}[\second@num]%
+ \foreach \i in {\first@num,...,\second@num}
+ {%
+ \pastableur@colorcell{numline\i}{0}
+ \node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline\i) {\helvbx\i};%
+ }%
+ }% fin de \multiSelec
+%
+%
+%
+\newlength\pastableur@decal
+\newcommand{\pastableur@colorcell}[2] % #1 : name, #2 : 0=en-tetes "lignes" / 1=en-tetes "colonnes"
+ {%
+ \ifnum#2=0%
+ \setlength\pastableur@decal{0pt}%
+ \else%
+ \setlength\pastableur@decal{0.25pt}%
+ \fi%
\fill[blueSelecCellBottom]
- (numline\i.south west) --
- (numline\i.south east) --
- ($0.5*(numline\i.south east)+0.5*(numline\i.north east)$) --
- ($0.5*(numline\i.south west)+0.5*(numline\i.north west)$) --
- cycle;
+ ($(#1.south west)+(\pastableur@decal,-\pastableur@decal)$) --
+ ($(#1.south east)+(-\pastableur@decal,\pastableur@decal)$) --
+ ($0.5*(#1.south east)+0.5*(#1.north east)+(-\pastableur@decal,0)$) --
+ ($0.5*(#1.south west)+0.5*(#1.north west)+(\pastableur@decal,0)$) --
+ cycle;%
\fill[blueSelecCellTop]
- (numline\i.north west) --
- (numline\i.north east) --
- ($0.5*(numline\i.south east)+0.5*(numline\i.north east)$) --
- ($0.5*(numline\i.south west)+0.5*(numline\i.north west)$) --
- cycle;
- \node[celhead,minimum width=\numline@width,minimum height=\line@height] at (numline\i) {\helvbx\i};
- }
-}
+ ($(#1.north west)+(\pastableur@decal,-\pastableur@decal)$) --
+ ($(#1.north east)+(-\pastableur@decal,-\pastableur@decal)$) --
+ ($0.5*(#1.south east)+0.5*(#1.north east)+(-\pastableur@decal,0)$) --
+ ($0.5*(#1.south west)+0.5*(#1.north west)+(\pastableur@decal,0)$) --
+ cycle;%
+ }%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pas-tableur.tlpobj new/tlpkg/tlpobj/pas-tableur.tlpobj
--- old/tlpkg/tlpobj/pas-tableur.tlpobj 2015-04-13 02:09:55.000000000 +0200
+++ new/tlpkg/tlpobj/pas-tableur.tlpobj 2016-04-14 19:32:40.000000000 +0200
@@ -1,14 +1,15 @@
name pas-tableur
category Package
-revision 35034
-shortdesc Create a spreadsheet layout.
+revision 39542
+shortdesc Create a spreadsheet layout
relocated 1
longdesc The package provides commands for creating a grid of
longdesc rectangles, and commands for populating locations in the grid.
longdesc PGF/TikZ is used for placement and population of the cells.
-runfiles size=5
+runfiles size=3
RELOC/tex/latex/pas-tableur/pas-tableur.sty
catalogue-ctan /macros/latex/contrib/pas-tableur
-catalogue-date 2014-08-17 17:15:51 +0200
+catalogue-date 2016-02-01 13:48:43 +0100
catalogue-license lppl
-catalogue-version 2.00
+catalogue-topics alignment pgf-tikz
+catalogue-version 2.01
++++++ passivetex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/passivetex.tlpobj new/tlpkg/tlpobj/passivetex.tlpobj
--- old/tlpkg/tlpobj/passivetex.tlpobj 2015-04-13 02:09:55.000000000 +0200
+++ new/tlpkg/tlpobj/passivetex.tlpobj 2016-04-14 19:32:40.000000000 +0200
@@ -18,5 +18,6 @@
RELOC/tex/xmltex/passivetex/ucharacters.sty
RELOC/tex/xmltex/passivetex/unicode.sty
catalogue-ctan /macros/xmltex/contrib/passivetex
-catalogue-date 2014-06-05 00:41:42 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics foreign-import
++++++ patch.source.tar.xz ++++++
++++++ patchcmd.doc.tar.xz ++++++
++++++ patchcmd.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/patchcmd.tlpobj new/tlpkg/tlpobj/patchcmd.tlpobj
--- old/tlpkg/tlpobj/patchcmd.tlpobj 2015-04-13 02:09:55.000000000 +0200
+++ new/tlpkg/tlpobj/patchcmd.tlpobj 2016-04-14 19:32:41.000000000 +0200
@@ -1,7 +1,7 @@
name patchcmd
category Package
revision 15878
-shortdesc Change the definition of an existing command.
+shortdesc Change the definition of an existing command
relocated 1
longdesc The package provides a command \patchcommand that can be used
longdesc to add material at the beginning and/or the end of the
@@ -11,6 +11,7 @@
runfiles size=1
RELOC/tex/latex/patchcmd/patchcmd.sty
catalogue-ctan /macros/latex/contrib/patchcmd
-catalogue-date 2012-06-09 20:15:34 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license pd
+catalogue-topics macro-supp
catalogue-version 1.03
++++++ patgen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/patgen.1 new/texmf-dist/doc/man/man1/patgen.1
--- old/texmf-dist/doc/man/man1/patgen.1 2015-04-22 12:58:54.000000000 +0200
+++ new/texmf-dist/doc/man/man1/patgen.1 2016-04-26 19:41:35.000000000 +0200
@@ -1,11 +1,9 @@
-.TH PATGEN 1 "2 December 2014" "Web2C 2015"
+.TH PATGEN 1 "16 June 2015" "Web2C 2016"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
-.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
.el .ds OX TeX
-.\" that's for nroff.
-.\" the same but obliqued
.\" BX definition must follow TX so BX can use TX
.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
.if n .ds BX BibTeX
Files old/texmf-dist/doc/man/man1/patgen.man1.pdf and new/texmf-dist/doc/man/man1/patgen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/patgen.doc.tlpobj new/tlpkg/tlpobj/patgen.doc.tlpobj
--- old/tlpkg/tlpobj/patgen.doc.tlpobj 2015-04-28 03:28:53.000000000 +0200
+++ new/tlpkg/tlpobj/patgen.doc.tlpobj 2016-04-27 03:21:37.000000000 +0200
@@ -1,7 +1,7 @@
name patgen.doc
category TLCore
-revision 37078
+revision 40768
shortdesc doc files of patgen
-docfiles size=5
+docfiles size=10
texmf-dist/doc/man/man1/patgen.1
texmf-dist/doc/man/man1/patgen.man1.pdf
++++++ patgen2-tutorial.doc.tar.xz ++++++
++++++ path.doc.tar.xz ++++++
++++++ path.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/path.tlpobj new/tlpkg/tlpobj/path.tlpobj
--- old/tlpkg/tlpobj/path.tlpobj 2015-04-13 02:09:58.000000000 +0200
+++ new/tlpkg/tlpobj/path.tlpobj 2016-04-14 19:32:42.000000000 +0200
@@ -1,7 +1,7 @@
name path
category Package
revision 22045
-shortdesc Typeset paths, making them breakable.
+shortdesc Typeset paths, making them breakable
relocated 1
longdesc Defines a macro \path|...|, similar to the LaTeX \verb|...|,
longdesc that sets the text in typewriter font and allows hyphen-less
@@ -10,7 +10,9 @@
longdesc default.
runfiles size=4
RELOC/tex/generic/path/path.sty
+catalogue-also url
catalogue-ctan /macros/generic/path
-catalogue-date 2012-06-11 12:09:17 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics verbatim
catalogue-version 3.05
++++++ pauldoc.doc.tar.xz ++++++
++++++ pauldoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pauldoc.tlpobj new/tlpkg/tlpobj/pauldoc.tlpobj
--- old/tlpkg/tlpobj/pauldoc.tlpobj 2015-04-13 02:09:58.000000000 +0200
+++ new/tlpkg/tlpobj/pauldoc.tlpobj 2016-04-14 19:32:43.000000000 +0200
@@ -1,13 +1,14 @@
name pauldoc
category Package
revision 16005
-shortdesc German LaTeX package documentation.
+shortdesc German LaTeX package documentation
relocated 1
longdesc The package provides helpers for German language package
longdesc documentation.
runfiles size=1
RELOC/tex/latex/pauldoc/pauldoc.sty
catalogue-ctan /macros/latex/contrib/pauldoc
-catalogue-date 2012-05-31 18:34:59 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics doc-supp german-doc
catalogue-version 0.5
++++++ pawpict.doc.tar.xz ++++++
++++++ pawpict.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pawpict.tlpobj new/tlpkg/tlpobj/pawpict.tlpobj
--- old/tlpkg/tlpobj/pawpict.tlpobj 2015-04-13 02:09:58.000000000 +0200
+++ new/tlpkg/tlpobj/pawpict.tlpobj 2016-04-14 19:32:43.000000000 +0200
@@ -1,7 +1,7 @@
name pawpict
category Package
revision 21629
-shortdesc Using graphics from PAW.
+shortdesc Using graphics from PAW
relocated 1
longdesc Support for the easy inclusion of graphics made by PAW (Physics
longdesc Analysis Workstation). You need to have PAW installed on your
@@ -9,6 +9,7 @@
runfiles size=1
RELOC/tex/latex/pawpict/pawpict.sty
catalogue-ctan /macros/latex/contrib/pawpict
-catalogue-date 2012-05-31 18:34:59 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics physics graphics-prep
catalogue-version 1.0
++++++ pax.doc.tar.xz ++++++
++++++ pax.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pax.tlpobj new/tlpkg/tlpobj/pax.tlpobj
--- old/tlpkg/tlpobj/pax.tlpobj 2015-04-13 02:09:58.000000000 +0200
+++ new/tlpkg/tlpobj/pax.tlpobj 2016-04-14 19:32:43.000000000 +0200
@@ -1,7 +1,7 @@
name pax
category Package
revision 26112
-shortdesc Extract and reinsert PDF annotations with pdfTeX.
+shortdesc Extract and reinsert PDF annotations with pdfTeX
longdesc If PDF files are included using pdfTeX, PDF annotations are
longdesc stripped. The pax project offers a solution without altering
longdesc pdfTeX. A Java program (pax.jar) parses the PDF file that will
@@ -16,7 +16,9 @@
texmf-dist/scripts/pax/pax.jar
texmf-dist/scripts/pax/pdfannotextractor.pl
texmf-dist/tex/latex/pax/pax.sty
-catalogue-ctan /macros/latex/contrib/pax/pax-tds.zip
-catalogue-date 2012-11-14 17:56:09 +0100
+catalogue-also pdftex
+catalogue-ctan /macros/latex/contrib/pax
+catalogue-date 2015-12-27 20:31:23 +0100
catalogue-license other-free
-catalogue-version v0.1k
+catalogue-topics pdf-feat
+catalogue-version 0.1k
++++++ pb-diagram.doc.tar.xz ++++++
++++++ pb-diagram.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pb-diagram.tlpobj new/tlpkg/tlpobj/pb-diagram.tlpobj
--- old/tlpkg/tlpobj/pb-diagram.tlpobj 2015-04-13 02:09:59.000000000 +0200
+++ new/tlpkg/tlpobj/pb-diagram.tlpobj 2016-04-14 19:32:43.000000000 +0200
@@ -1,7 +1,7 @@
name pb-diagram
category Package
revision 15878
-shortdesc A commutative diagram package using LAMSTeX or Xy-pic fonts.
+shortdesc A commutative diagram package using LAMSTeX or Xy-pic fonts
relocated 1
runfiles size=19
RELOC/tex/latex/pb-diagram/lamsarrow.sty
@@ -9,6 +9,7 @@
RELOC/tex/latex/pb-diagram/pb-lams.sty
RELOC/tex/latex/pb-diagram/pb-xy.sty
catalogue-ctan /macros/latex/contrib/pb-diagram
-catalogue-date 2012-06-11 12:09:17 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license other-free
+catalogue-topics diagram-comm
catalogue-version 5.0
++++++ pbox.doc.tar.xz ++++++
++++++ pbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pbox.tlpobj new/tlpkg/tlpobj/pbox.tlpobj
--- old/tlpkg/tlpobj/pbox.tlpobj 2015-04-13 02:10:00.000000000 +0200
+++ new/tlpkg/tlpobj/pbox.tlpobj 2016-04-14 19:32:44.000000000 +0200
@@ -1,7 +1,7 @@
name pbox
category Package
revision 24807
-shortdesc A variable-width \parbox command.
+shortdesc A variable-width \parbox command
relocated 1
longdesc Defines a command \pbox{<max width>}{<text>} which adjusts its
longdesc width to that of the enclosed text, up to the maximum width
@@ -9,7 +9,9 @@
longdesc commands.
runfiles size=1
RELOC/tex/latex/pbox/pbox.sty
+catalogue-also varwidth
catalogue-ctan /macros/latex/contrib/pbox
-catalogue-date 2011-12-10 15:11:47 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl2
+catalogue-topics boxing
catalogue-version 1.2
++++++ pbsheet.doc.tar.xz ++++++
++++++ pbsheet.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pbsheet.tlpobj new/tlpkg/tlpobj/pbsheet.tlpobj
--- old/tlpkg/tlpobj/pbsheet.tlpobj 2015-04-13 02:10:01.000000000 +0200
+++ new/tlpkg/tlpobj/pbsheet.tlpobj 2016-04-14 19:32:45.000000000 +0200
@@ -1,7 +1,7 @@
name pbsheet
category Package
revision 24830
-shortdesc Problem sheet class.
+shortdesc Problem sheet class
relocated 1
longdesc This class is designed to simplify the typesetting of problem
longdesc sheets with Mathematics and Computer Science content. It is
@@ -10,6 +10,7 @@
runfiles size=5
RELOC/tex/latex/pbsheet/pbsheet.cls
catalogue-ctan /macros/latex/contrib/pbsheet
-catalogue-date 2012-06-11 12:09:17 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics exercise
catalogue-version 0.1
++++++ pdf-trans.doc.tar.xz ++++++
++++++ pdf-trans.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdf-trans.tlpobj new/tlpkg/tlpobj/pdf-trans.tlpobj
--- old/tlpkg/tlpobj/pdf-trans.tlpobj 2015-04-13 02:10:01.000000000 +0200
+++ new/tlpkg/tlpobj/pdf-trans.tlpobj 2016-04-14 19:32:45.000000000 +0200
@@ -1,14 +1,16 @@
name pdf-trans
category Package
revision 32809
-shortdesc A set of macros for various transformations of TeX boxes.
+shortdesc A set of macros for various transformations of TeX boxes
relocated 1
longdesc pdf-trans is a set of macros offering various transformations
longdesc of TeX boxes (based on plain and pdfeTeX primitives). It was
longdesc initially inspired by trans.tex, remade to work with pdfTeX.
runfiles size=12
RELOC/tex/generic/pdf-trans/pdf-trans.tex
+catalogue-also trans
catalogue-ctan /macros/generic/pdf-trans
-catalogue-date 2014-01-28 18:35:23 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license pd
+catalogue-topics box-manip
catalogue-version 2.4
++++++ pdf14.doc.tar.xz ++++++
++++++ pdf14.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdf14.tlpobj new/tlpkg/tlpobj/pdf14.tlpobj
--- old/tlpkg/tlpobj/pdf14.tlpobj 2015-04-13 02:10:01.000000000 +0200
+++ new/tlpkg/tlpobj/pdf14.tlpobj 2016-04-14 19:32:46.000000000 +0200
@@ -1,7 +1,7 @@
name pdf14
category Package
revision 17583
-shortdesc Restore PDF 1.4 to a TeX live 2010 format.
+shortdesc Restore PDF 1.4 to a TeX live 2010 format
relocated 1
longdesc Starting with TeX Live 2010, the various formats, that directly
longdesc generate PDF, default to generating PDF 1.5. This is generally
@@ -13,6 +13,7 @@
runfiles size=1
RELOC/tex/latex/pdf14/pdf14.sty
catalogue-ctan /macros/latex/contrib/pdf14
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1.3
+catalogue-topics pdf-feat
catalogue-version 0.1
++++++ pdfbook2.doc.tar.xz ++++++
++++++ pdfbook2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfbook2.tlpobj new/tlpkg/tlpobj/pdfbook2.tlpobj
--- old/tlpkg/tlpobj/pdfbook2.tlpobj 2015-06-15 03:20:50.000000000 +0200
+++ new/tlpkg/tlpobj/pdfbook2.tlpobj 2016-04-14 19:32:46.000000000 +0200
@@ -1,7 +1,7 @@
name pdfbook2
category Package
revision 37537
-shortdesc Create booklets from PDF files.
+shortdesc Create booklets from PDF files
longdesc This python program creates print-ready PDF files from some
longdesc input PDF files for booklet printing. The resulting files need
longdesc to be printed in landscape/long edge double sided printing. The
@@ -19,7 +19,7 @@
texmf-dist/scripts/pdfbook2/pdfbook2
catalogue-also pdfbook
catalogue-ctan /support/pdfbook2
-catalogue-date 2015-06-04 20:40:46 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl3
catalogue-topics pdfprocess
catalogue-version 1.2
++++++ pdfcomment.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/CHANGES new/doc/latex/pdfcomment/CHANGES
--- old/doc/latex/pdfcomment/CHANGES 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/CHANGES 2016-03-28 23:55:48.000000000 +0200
@@ -1,8 +1,31 @@
-5a38dc437d0f
-
=== pdfcomment.sty ===
--- pdfcomment.sty (v2.3a) (<- v2.3 2012/09/28) (Commit: 5a38dc437d0f)
+-- pdfcomment.sty (v2.3b) (<- v2.3.1dev 2015/04/10) (Commit: 382b38b2e17e4853fbc537250aabc6c42160df2a)
+
+2012/09/30 added 'pdfencoding=auto' while loading hyperref [jk]
+ Needed for Unicode bookmarks in XeTeX and LuaTeX
+
+2015/04/10 Bugfix: incorrect vertical position of superscripts in \pdftooltip [jk]
+
+ reported and patched by Ross Moore
+
+2015/04/10 Bugfix: change zero width in \pdfcomment and \pdfmargincomment [jk]
+ to make the comments visible in both evince and the internal viewer of texstudio
+
+ reported by shaniaki (BitBucket #7)
+
+2015/04/23 improve appearance of tooltips with Mac Preview (at least)
+
+ feature request by Ross Moore
+
+2015/09/08 expand comment argument in \pdftooltip before pushing it through \pdfstringdef
+
+ feature request by Robert Terwilliger (BitBucket #18)
+
+2016/03/26 dropped support for \pdfreply
+
+
+-- pdfcomment.sty (v2.3a) (<- v2.3 2012/09/28) (Commit: 0752b119ceff2e866fb7a00331661bff57113bbd)
2012/09/28 Bugfix: problem with boxes around tooltips [jk]
spurious backslash in "/Ff/65536\space%" in line 2967, see:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/README new/doc/latex/pdfcomment/README
--- old/doc/latex/pdfcomment/README 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-For a long time pdflatex has offered the command \pdfannot for inserting
-arbitrary PDF annotations. However, the command is presented in
-a form where additional knowledge of the definition of the PDF format is
-indispensable. This package is an answer to the occasional questions
-in newsgroups, about how one could use the comment function of Adobe
-Reader. At least for the writer of LaTeX code, the package offers a
-convenient and user-friendly means of using \pdfannot to provide comments
-in PDF files. Since version v1.1, pdfcomment.sty also supports:
-
- LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx and XeLaTeX.
-
-Unfortunately, support of PDF annotations by PDF viewers is sparse to
-nonexistent. The reference viewer for the development of this package is
-Adobe Reader.
-
-License: LPPL
-
-Changes in v2.3a:
-
-- Bugfix: problem with boxes around tooltips [jk]
- spurious backslash in "/Ff/65536\space%" in line 2967, see:
- https://bitbucket.org/kleberj/pdfcomment/issue/8/pdftooltip-tooltip-area-is-...
- http://tex.stackexchange.com/questions/34698/strange-appearance-of-tooltips-...
-
- reported by: diabonas
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/README.md new/doc/latex/pdfcomment/README.md
--- old/doc/latex/pdfcomment/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pdfcomment/README.md 2016-03-28 23:55:48.000000000 +0200
@@ -0,0 +1,41 @@
+# README #
+
+For a long time pdflatex has offered the command `\pdfannot` for inserting
+arbitrary PDF annotations. However, the command is presented in
+a form where additional knowledge of the definition of the PDF format is
+indispensable. This package is an answer to the â occasional â questions
+in newsgroups, about how one could use the comment function of Adobe
+Reader. At least for the writer of LaTeX code, the package offers a
+convenient and user-friendly means of using `\pdfannot` to provide comments
+in PDF files. Since version v1.1, pdfcomment.sty also supports:
+
+ LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx, XeLaTeX and LuaLaTeX
+
+Unfortunately, support of PDF annotations by PDF viewers may vary.
+The reference viewer for the development of this package is Adobe Reader.
+
+License: **LPPL**
+
+Changes in v2.3b:
+
+* Bugfix: incorrect vertical position of superscripts in `\pdftooltip`
+
+reported and patched by Ross Moore
+
+* Bugfix: change zero width in `\pdfcomment` and `\pdfmargincomment`
+ to make the comments visible in both Evince and the internal viewer of TeXStudio
+
+reported by shaniaki (BitBucket #7)
+
+* improve appearance of tooltips with Mac Preview (at least)
+
+feature request by Ross Moore
+
+* expand comment argument in `\pdftooltip` before pushing it through `\pdfstringdef`
+
+feature request by Robert Terwilliger (Bitbucket #18)
+
+* added `pdfencoding=auto` while loading `hyperref`
+ Needed for Unicode bookmarks in `XeTeX` and `LuaTeX`
+
+* dropped support for `\pdfreply`
\ No newline at end of file
Files old/doc/latex/pdfcomment/example.pdf and new/doc/latex/pdfcomment/example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example.tex new/doc/latex/pdfcomment/example.tex
--- old/doc/latex/pdfcomment/example.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/example.tex 2016-03-28 23:55:48.000000000 +0200
@@ -18,11 +18,7 @@
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
\pdfcommentsetup{date=D:20101211153723+01'00'}
-A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,subject={Comment2},icon=Note,open=true,hspace=100pt]{This is another comment.}
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply to a reply}
-\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,subject={Comment2},icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
\defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
\definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
\pdfcomment[avatar=CaptainJack,style=MyStar,subject={enough},deadline={2009/11/11 - Josef}]{It's enough now!}
Files old/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf and new/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_latex_dvipdfmx.tex new/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
--- old/doc/latex/pdfcomment/example_latex_dvipdfmx.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/example_latex_dvipdfmx.tex 2016-03-28 23:55:48.000000000 +0200
@@ -6,8 +6,7 @@
\usepackage{microtype}
\usepackage{lipsum}
\usepackage[absolute]{textpos}
-%dvipdfmx leads to an error with xcolor
-\usepackage[svgnames,dvipdfm,rgb]{xcolor}
+\usepackage[svgnames,dvipdfmx,rgb]{xcolor}
% define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf
\def\pgfsysdriver{pgfsys-dvipdfm.def}
\usepackage{tikz}
@@ -20,12 +19,7 @@
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
\pdfcommentsetup{date=D:20101211153723+01'00'}
-A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.}
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
- test the hspace!%
+A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
\defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
\definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}
Files old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf and new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
--- old/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex 2016-03-28 23:55:48.000000000 +0200
@@ -17,12 +17,7 @@
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
\pdfcommentsetup{date=D:20101211153723+01'00'}
-A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.}%
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
\defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
\definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}%
Files old/doc/latex/pdfcomment/example_math_markup.pdf and new/doc/latex/pdfcomment/example_math_markup.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_math_markup.tex new/doc/latex/pdfcomment/example_math_markup.tex
--- old/doc/latex/pdfcomment/example_math_markup.tex 2010-12-14 00:45:28.000000000 +0100
+++ new/doc/latex/pdfcomment/example_math_markup.tex 2016-03-28 23:55:48.000000000 +0200
@@ -3,7 +3,6 @@
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{lmodern}
-\usepackage[leading=1.08]{stonehand}
\usepackage[svgnames,rgb]{xcolor}
\usepackage{listings}
\usepackage[author={Josef Kleber},subject={Math test},color=Khaki]{pdfcomment}
@@ -24,9 +23,6 @@
PDF annotations work in inline formula ($\pdfmarkupcomment[style=mathpopup]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{comment}$), as well as in display mode:
\[\pdfmarkupcomment[id=1,style=mathpopup,mathstyle=\displaystyle,open=true]{f(x)=\prod_{i=1}^{n}\left(i-\frac{1}{2i}\right)}{comment}\]
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply to a reply}
-\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
\bigskip
Of course, you can only comment parts of a formula:
Files old/doc/latex/pdfcomment/example_xelatex.pdf and new/doc/latex/pdfcomment/example_xelatex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/example_xelatex.tex new/doc/latex/pdfcomment/example_xelatex.tex
--- old/doc/latex/pdfcomment/example_xelatex.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/example_xelatex.tex 2016-03-28 23:55:48.000000000 +0200
@@ -1,3 +1,4 @@
+% This file works with lualatex as well!
% Make sure to write the page size into the dvi file!
% That's possible with the pagesize option of KoMa-Script
% Otherwise the positioning of the annotations will fail!
@@ -24,12 +25,7 @@
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
\pdfcommentsetup{date=D:20101211153723+01'00',timezone=+01'00'}
-A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.}
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
\defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
\definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
\pdfcomment[avatar=CaptainJack,style=MyStar,date={}]{It's enough now!}
@@ -193,5 +189,5 @@
You can use tooltips with simple \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or chemical notation like: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$
\bigskip\bigskip
-It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
+It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little GauÃ}\]
\end{document}
Files old/doc/latex/pdfcomment/pdfcomment.pdf and new/doc/latex/pdfcomment/pdfcomment.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/pdfcomment.tex new/doc/latex/pdfcomment/pdfcomment.tex
--- old/doc/latex/pdfcomment/pdfcomment.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/pdfcomment.tex 2016-03-28 23:55:48.000000000 +0200
@@ -9,6 +9,7 @@
\usepackage{attachfile}%
\usepackage{ltxdocext}%
\usepackage{marginnote}%
+\usepackage{metalogo}%
\usepackage[svgnames,rgb]{xcolor}%
\usepackage{amsmath,array}%
\usepackage{tikz}%
@@ -138,18 +139,18 @@
\title{\filename}%
\Subtitle{A user-friendly interface to PDF annotations}%
\author{Josef Kleber}
-\Fileversion{v2.3a}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
+\Fileversion{v2.3b}
+\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
\maketitle
\Headline{Abstract}
\begin{abstract}
For a long time \texttt{pdflatex} has offered the command \cmd\pdfannot{} for inserting arbitrary PDF annotations. However, the command is presented in a form where additional knowledge of the definition of the PDF format is indispensable. This package is an answer to the -- occasional -- questions in newsgroups, about how one could use the comment function of \texttt{Adobe Reader}. At least for the writer of \LaTeX{} code, the package offers a convenient and user-friendly means of using \cmd\pdfannot{} to provide comments in PDF files. Since version v1.1, \texttt{\filename{}} also supports:
\medskip
-\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{only with style option \texttt{dvipdfmx}} and \XeLaTeX}.\hfill
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{only with style option \texttt{dvipdfmx}} \XeLaTeX and \LuaLaTeX}.\hfill
\medskip
-Unfortunately, support of PDF annotations by PDF viewers is sparse to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+Unfortunately, support of PDF annotations by PDF viewers may vary. The reference viewer for the development of this package is \texttt{Adobe Reader}.
If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test annotation},color=lime,hspace=20pt]{This is an annotation} you are definitely using the wrong PDF viewer!
\end{abstract}
@@ -206,9 +207,6 @@
\subsection{Local options}
The following options are useable as options for the commands presented in sections \ref{sec:umgebungen} and \ref{sec:befehle}, as well as style options. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten.
-\subsubsection[\texttt{id}]{\styleoption{id}}\label{sec:id}
-You can use the option \styleoption{id} to define a unique ID for referencing in a PDF reply (see \ref{sec:pdfreply}).
-
\subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
You can use the option \styleoption{subject} for defining the subject of the PDF popup annotations.
@@ -442,7 +440,7 @@
\bigskip
\cmd\pdfcomment{} will typeset an annotation into the text at the current \pdfcommentsetup{subject={\textbackslash pdfcomment test},hspace=18pt}\pdfcomment[icon=Star,color=YellowGreen]{This is a comment in the text} position.
-Internally, the argument \marg{comment} needs to be converted to PDFDocEncoding/PDFUnicode\footnote{\cmd\hypersetup\{unicode\}}. Some chars with special meaning in \LaTeX{} (\texttt{\&}, \texttt{\%,} ...) must be escaped or replaced with their command form, e.\,g. \texttt{\string\_} or \texttt{\string\textunderscore} \cite[6.2 Definition of \texttt{\string\pdfstringdef}]{bib:hyperref}. Furthermore there are some commands for formatting:
+Internally, the argument \marg{comment} needs to be converted to PDFDocEncoding/PDFUnicode\footnote{\cmd\hypersetup\{unicode\}}. Some chars with special meaning in \LaTeX{} (\texttt{\&}, \texttt{\%,} ...) must be escaped or replaced with their command form, e.\,g. \texttt{\string\_} or \texttt{\string\textunderscore}. Furthermore there are some commands for formatting:
\begin{center}
\begin{tabular}{cl}
@@ -531,22 +529,6 @@
\cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \LinkEx).
\clearpage
-\subsection{Replys}
-
-\subsubsection{\texorpdfstring{\cs{pdfreply}}{\textbackslash pdfreply}}
-\label{sec:pdfreply}
-Possible \margcs{\cmd\pdfreply\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
-
-\bigskip
-\defineavatar{Joe}{author=Joe,color=yellow}
-\defineavatar{Bob}{author=Bob,color=green}
-With the command \cmd\pdfreply{} you can compose replys to comments. The option \texttt{replyto} provides a clear reference to the comment the reply refers to.\footnote{The replys must be typeset on the same page than the refering comments}. Due to technical reasons the command \string\pdfreply\ works only while using \texttt{pdflatex}.
-\pdfmargincomment[subject={Top2},author={Josef Kleber},icon=Note,id=1,color=blue]{This is a comment.}
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101212161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101213095321+01'00']{Of course, you can reply to a reply}
-\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101213095512+01'00']{Just another reply}
-Furthermore the command can not support page breaks (\string\pdfmarkupcomment, \string\pdfsidelinecomment). The replys will only appear in the PDF annotations on the second page. Replys to comments without page break work smoothly!
-
\subsection{Tooltips}
\subsubsection{\texorpdfstring{\cs{pdftooltip}}{\textbackslash pdftooltip}}
@@ -698,12 +680,4 @@
Please note that only opened popups will be printed!
-{
-\clearpage
-\raggedright
-\nocite{*}
-\bibliography{pdfcomment}
-\addcontentsline{toc}{section}{\refname}
-}
-
\end{document}
Files old/doc/latex/pdfcomment/pdfcomment_de.pdf and new/doc/latex/pdfcomment/pdfcomment_de.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfcomment/pdfcomment_de.tex new/doc/latex/pdfcomment/pdfcomment_de.tex
--- old/doc/latex/pdfcomment/pdfcomment_de.tex 2012-09-29 00:47:25.000000000 +0200
+++ new/doc/latex/pdfcomment/pdfcomment_de.tex 2016-03-28 23:55:48.000000000 +0200
@@ -9,6 +9,7 @@
\usepackage{attachfile}%
\usepackage{ltxdocext}%
\usepackage{marginnote}%
+\usepackage{metalogo}%
\usepackage[svgnames,rgb]{xcolor}%
\usepackage{amsmath,array}%
\usepackage{tikz}%
@@ -152,15 +153,15 @@
\title{\filename}%
\Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
\author{Josef Kleber}
-\Fileversion{v2.3a}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
+\Fileversion{v2.3b}
+\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
\maketitle
\Headline{Zusammenfassung}%
\begin{abstract}
\texttt{pdflatex}\index{pdflatex} bietet seit jeher den Befehl \cmd\pdfannot{} für das Einfügen beliebiger PDF annotations. Allerdings in einer Form, in der zusätzliche Kenntnisse der PDF-Referenz unabdingbar sind. \substyle{\filename} ist eine Antwort auf die in Newsgroups -- von Zeit zu Zeit -- auftauchende Frage, wie man die Kommentarfunktion des \texttt{Adobe Reader} nutzen könnte. Zumindest aus dem \LaTeX{}-Code heraus, bietet \substyle{\filename} eine bequeme und nutzerfreundliche Möglichkeit PDF annotations in PDF-Dateien zu nutzen. Seit Version v1.1 unterstützt \texttt{\filename{}} auch:
\medskip
-\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{nur mit der Styleoption \texttt{dvipdfmx}} und \XeLaTeX}.\hfill
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{nur mit der Styleoption \texttt{dvipdfmx}}, \XeLaTeX und \LuaLaTeX}.\hfill
\medskip
Leider ist die Unterstützung der PDF annotations durch die PDF-Viewer teilweise nur sehr eingeschränkt bzw. gar nicht vorhanden. Der Referenz-Viewer für die Entwicklung dieses Pakets ist \texttt{Adobe Reader}.
@@ -220,9 +221,6 @@
\subsection{Lokale Optionen}
Die anschließend vorgestellten Optionen sind für die in den Abschnitten \ref{sec:umgebungen} und \ref{sec:befehle} vorgestellten Befehle anwendbar, allerdings können sie auch als Styleoptionen benutzt werden. Als Styleoptionen besitzen sie globale Wirkung, während sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht überschreiben.
-\subsubsection[\texttt{id}]{\styleoption{id}}\label{sec:id}
-Die Option \styleoption{id} dient der Festlegung einer eindeutigen ID für die Referenzierung in einer PDF-Antwort (siehe \ref{sec:pdfreply}).
-
\subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
Die Option \styleoption{subject} dient der Festlegung der Überschriften der PDF popup annotations.
@@ -454,7 +452,7 @@
\bigskip
\cmd\pdfcomment{} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=20pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext.
-Das Argument \marg{Kommentar} muß dazu intern in PDFDocEncoding/PDFUni\-code\footnote{\cmd\hypersetup\{unicode\}} umgewandelt werden. Einige Zeichen mit spezieller \LaTeX{}-Bedeutung (\texttt{\&}, \texttt{\%,} ...) muß man daher escapen oder mit ihrer Befehlsform ersetzen, z.\,B. \texttt{\string\_} bzw. \texttt{\string\textunderscore} \cite[6.2 Definition of \texttt{\string\pdfstringdef}]{bib:hyperref}. Zusätzlich gibt es für die Formatierung die folgenden Befehle:
+Das Argument \marg{Kommentar} muß dazu intern in PDFDocEncoding/PDFUni\-code\footnote{\cmd\hypersetup\{unicode\}} umgewandelt werden. Einige Zeichen mit spezieller \LaTeX{}-Bedeutung (\texttt{\&}, \texttt{\%,} ...) muß man daher escapen oder mit ihrer Befehlsform ersetzen, z.\,B. \texttt{\string\_} bzw. \texttt{\string\textunderscore}. Zusätzlich gibt es für die Formatierung die folgenden Befehle:
\begin{center}
\begin{tabular}{cl}
@@ -542,22 +540,6 @@
\bigskip
\cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \LinkEx).
-\subsection{Antworten}
-
-\subsubsection{\texorpdfstring{\cs{pdfreply}}{\textbackslash pdfreply}}
-\label{sec:pdfreply}
-Mögliche \margcs{\cmd\pdfreply\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
-
-\bigskip
-\defineavatar{Anton}{author=Anton,color=yellow}
-\defineavatar{Berti}{author=Berti,color=green}
-Mit dem Befehl \cmd\pdfreply{} kann man Antworten zu Kommentaren verfassen. Dabei dient die Option \texttt{replyto} der eindeutigen Identifizierung des Kommentars auf den sich die Antwort bezieht\footnote{Die Antworten müssen auf derselben Seite wie die Kommentare gesetzt werden}. Wegen technischer Gründe funktioniert der Befehl \string\pdfreply\ ausschließlich bei der Verwendung von \texttt{pdflatex}.
-\pdfmargincomment[subject={Top2},author={Josef Kleber},icon=Note,id=1,color=blue]{Das ist ein Kommentar.}
-\pdfreply[id=2,avatar=Anton,replyto=1,date=D:20101212161247+01'00']{Das ist eine Antwort auf einen Kommentar}
-\pdfreply[id=3,avatar=Berti,replyto=2,date=D:20101213095321+01'00']{Natürlich kann man auch auf Antworten antworten}
-\pdfreply[id=5,avatar=Berti,replyto=1,date=D:20101213095512+01'00']{Nur eine andere Antwort}
-Weiterhin unterstützt der Befehl keinen Seitenumbruch (\string\pdfmarkupcomment, \string\pdfsidelinecomment). Hier erscheinen die Antworten nur bei den PDF annotations auf der zweiten Seite. Antworten auf Kommentare ohne Seitenumbruch funktionieren problemlos!
-
\subsection{Tooltips}
\subsubsection{\texorpdfstring{\cs{pdftooltip}}{\textbackslash pdftooltip}}
@@ -708,14 +690,4 @@
Bitte beachten Sie, daß nur geöffnete popup annotations gedruckt werden!
-{
-\clearpage
-\raggedright
-\nocite{*}
-\bibliography{pdfcomment}
-\addcontentsline{toc}{section}{\refname}
-}
-
-%for index
-\footnotesize
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcomment.doc.tlpobj new/tlpkg/tlpobj/pdfcomment.doc.tlpobj
--- old/tlpkg/tlpobj/pdfcomment.doc.tlpobj 2015-04-13 02:10:01.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcomment.doc.tlpobj 2016-04-14 19:32:46.000000000 +0200
@@ -1,12 +1,12 @@
name pdfcomment.doc
category Package
-revision 27844
+revision 40166
shortdesc doc files of pdfcomment
relocated 1
-docfiles size=357
+docfiles size=367
RELOC/doc/latex/pdfcomment/CHANGES
RELOC/doc/latex/pdfcomment/INSTALL
- RELOC/doc/latex/pdfcomment/README
+ RELOC/doc/latex/pdfcomment/README.md
RELOC/doc/latex/pdfcomment/example.pdf
RELOC/doc/latex/pdfcomment/example.tex
RELOC/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
++++++ pdfcomment.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfcomment/pdfcomment.sty new/tex/latex/pdfcomment/pdfcomment.sty
--- old/tex/latex/pdfcomment/pdfcomment.sty 2012-09-29 00:47:25.000000000 +0200
+++ new/tex/latex/pdfcomment/pdfcomment.sty 2016-03-28 23:55:48.000000000 +0200
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2008-2012 by:
+%% Copyright (C) 2008-2012, 2015-2016 by:
%% Josef Kleber
%%
%%
@@ -20,7 +20,7 @@
%% This work consists of all files listed in manifest.txt.
%%
%
-\ProvidesPackage{pdfcomment}[2012/09/28 pdfcomment.sty v2.3a - Josef Kleber (C) 2008-2012]%
+\ProvidesPackage{pdfcomment}[2016/03/26 pdfcomment.sty v2.3b - Josef Kleber (C) 2008-2012, 2015-2016]%
%
\RequirePackage{xkeyval}%
%
@@ -173,6 +173,7 @@
\newcounter{pc@count@iv}%
%
\newbox\pc@mathannot@box%
+\newbox\pc@nullbox%
%
\newlength{\pc@dima}%
\newlength{\pc@dimb}%
@@ -1344,7 +1345,7 @@
\hypersetup{pdftex}%
}%
{%
- \RequirePackage[pdftex]{hyperref}[2007/04/09]%
+ \RequirePackage[pdftex,pdfencoding=auto]{hyperref}[2007/06/12]%
}%
\else%
% to avoid problems with different default page size in
@@ -1359,7 +1360,7 @@
\hypersetup{dvipdfmx}%
}%
{%
- \RequirePackage[dvipdfmx]{hyperref}[2007/04/09]%
+ \RequirePackage[dvipdfmx,pdfencoding=auto]{hyperref}[2007/06/12]%
}%
\else%
\@ifpackageloaded{hyperref}%
@@ -1367,7 +1368,7 @@
\hypersetup{dvips}%
}%
{%
- \RequirePackage[dvips]{hyperref}[2007/04/09]%
+ \RequirePackage[dvips,pdfencoding=auto]{hyperref}[2007/06/12]%
}%
\fi%
\else%
@@ -1377,7 +1378,7 @@
\hypersetup{xetex}%
}%
{%
- \RequirePackage[xetex]{hyperref}[2007/04/09]%
+ \RequirePackage[xetex,pdfencoding=auto]{hyperref}[2007/06/12]%
}%
\fi%
\fi%
@@ -1432,7 +1433,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+ \pdfannot width \normalbaselineskip height \normalbaselineskip depth 0pt%
{%
/Subtype /Text%
\pc@annot@text%
@@ -1457,7 +1458,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+ \special{pdf: ann width \the\normalbaselineskip\space height \the\normalbaselineskip\space depth 0pt%
<<%
/Subtype /Text%
\pc@annot@text%
@@ -1477,7 +1478,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \pdfmark[\rule{0pt}{0pt}]%
+ \pdfmark[\rule{\normalbaselineskip}{0pt}\rule{0pt}{\normalbaselineskip}]%
{%
pdfmark=/ANN,%
Subtype=/Text,%
@@ -1539,7 +1540,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+ \pdfannot width \normalbaselineskip height \normalbaselineskip depth 0pt%
{%
/Subtype /Text%
\pc@annot@text%
@@ -1564,7 +1565,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+ \special{pdf: ann width \the\normalbaselineskip\space height \the\normalbaselineskip\space depth 0pt%
<<%
/Subtype /Text%
\pc@annot@text%
@@ -1584,7 +1585,7 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \pdfmark[\rule{0pt}{0pt}]%
+ \pdfmark[\rule{\normalbaselineskip}{0pt}\rule{0pt}{\normalbaselineskip}]%
{%
pdfmark=/ANN,%
Subtype=/Text,%
@@ -2542,7 +2543,7 @@
% Change local options if specified
\setkeys{pdftooltip}{#1}%
\ifmmode%
- \marginnote{\pc@encode@PDF@math{#3}}%
+ \setbox\pc@nullbox=\hbox{\pc@encode@PDF@math{#3}}%
\ifpc@lopt@disable%
#2%
\else%
@@ -2576,7 +2577,7 @@
\fi%
\fi%
\else%
- \pc@encode@PDF{#3}%
+ \expandafter\pc@encode@PDF{#3}%
\ifpc@lopt@disable%
#2%
\else%
@@ -2962,10 +2963,12 @@
{%
/TU (\pc@pdfenc@contents)\space%
/T (tooltip \thezref@unique)\space%
- /C [0 0 0]\space%
+ /C [ ]\space%
/FT/Btn\space%
+ /F 768\space%
/Ff 65536\space%
/H/N\space%
+ /BS << /W 0 >>\space%
}%
%
\newcommand{\pc@create@pdfannotopt}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcomment.tlpobj new/tlpkg/tlpobj/pdfcomment.tlpobj
--- old/tlpkg/tlpobj/pdfcomment.tlpobj 2015-04-13 02:10:03.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcomment.tlpobj 2016-04-14 19:32:47.000000000 +0200
@@ -1,7 +1,7 @@
name pdfcomment
category Package
-revision 27844
-shortdesc A user-friendly interface to pdf annotations.
+revision 40166
+shortdesc A user-friendly interface to pdf annotations
relocated 1
longdesc For a long time pdfLaTeX has offered the command \pdfannot for
longdesc inserting arbitrary PDF annotations. However, the command is
@@ -13,13 +13,14 @@
longdesc convenient and user-friendly means of using \pdfannot to
longdesc provide comments in PDF files. Since version v1.1,
longdesc pdfcomment.sty also supports LaTeX - dvips - ps2pdf, LaTeX -
-longdesc dvipdfmx, and XeLaTeX. Unfortunately, support of PDF
+longdesc dvipdfmx, XeLaTeX and LuaLaTeX. Unfortunately, support of PDF
longdesc annotations by PDF viewers is sparse to nonexistent. The
longdesc reference viewer for the development of this package is Adobe
longdesc Reader.
runfiles size=24
RELOC/tex/latex/pdfcomment/pdfcomment.sty
catalogue-ctan /macros/latex/contrib/pdfcomment
-catalogue-date 2012-11-14 18:06:01 +0100
+catalogue-date 2016-03-28 17:54:50 +0200
catalogue-license lppl1.3
-catalogue-version v2.3a
+catalogue-topics pdf-feat
+catalogue-version 2.3b
++++++ pdfcprot.doc.tar.xz ++++++
++++++ pdfcprot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcprot.tlpobj new/tlpkg/tlpobj/pdfcprot.tlpobj
--- old/tlpkg/tlpobj/pdfcprot.tlpobj 2015-04-13 02:10:03.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcprot.tlpobj 2016-04-14 19:32:47.000000000 +0200
@@ -1,7 +1,7 @@
name pdfcprot
category Package
revision 18735
-shortdesc Activating and setting of character protruding using pdflatex.
+shortdesc Activating and setting of character protruding using pdfLaTeX
relocated 1
longdesc This package provides an easy interface to adjust the character
longdesc protrusion for different fonts and choosing the right
@@ -14,7 +14,9 @@
RELOC/tex/latex/pdfcprot/pplmnT1.cpa
RELOC/tex/latex/pdfcprot/pplmnT2A.cpa
RELOC/tex/latex/pdfcprot/pplmnTS1.cpa
+catalogue-also microtype
catalogue-ctan /macros/latex/contrib/pdfcprot
-catalogue-date 2012-06-15 20:54:24 +0200
+catalogue-date 2015-08-03 05:58:53 +0200
catalogue-license lppl
+catalogue-topics micro-layout
catalogue-version 1.7a
++++++ pdfcrop.doc.tar.xz ++++++
++++++ pdfcrop.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfcrop.tlpobj new/tlpkg/tlpobj/pdfcrop.tlpobj
--- old/tlpkg/tlpobj/pdfcrop.tlpobj 2015-04-13 02:10:04.000000000 +0200
+++ new/tlpkg/tlpobj/pdfcrop.tlpobj 2016-04-14 19:32:48.000000000 +0200
@@ -1,13 +1,14 @@
name pdfcrop
category Package
revision 29348
-shortdesc Crop PDF graphics.
+shortdesc Crop PDF graphics
longdesc A Perl script that can either trim pages of any whitespace
longdesc border, or trim them of a fixed border.
depend pdfcrop.ARCH
runfiles size=10
texmf-dist/scripts/pdfcrop/pdfcrop.pl
-catalogue-ctan /support/pdfcrop/pdfcrop.pl
-catalogue-date 2012-10-25 10:45:27 +0200
+catalogue-ctan /support/pdfcrop
+catalogue-date 2015-12-27 20:31:23 +0100
catalogue-license lppl
+catalogue-topics pdfprocess
catalogue-version 1.37
++++++ pdfjam.doc.tar.xz ++++++
++++++ pdfjam.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfjam.tlpobj new/tlpkg/tlpobj/pdfjam.tlpobj
--- old/tlpkg/tlpobj/pdfjam.tlpobj 2015-04-13 02:10:04.000000000 +0200
+++ new/tlpkg/tlpobj/pdfjam.tlpobj 2016-04-14 19:32:48.000000000 +0200
@@ -1,7 +1,7 @@
name pdfjam
category Package
revision 29752
-shortdesc Shell scripts interfacing to pdfpages.
+shortdesc Shell scripts interfacing to pdfpages
longdesc This is a collection of shell scripts which provide an
longdesc interface to the pdfpages LaTeX package. They do such jobs as
longdesc selecting pages, concatenating files, doing n-up formatting,
@@ -21,6 +21,7 @@
texmf-dist/scripts/pdfjam/pdfnup
texmf-dist/scripts/pdfjam/pdfpun
catalogue-ctan /support/pdfjam
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl2
+catalogue-topics pdfprocess
catalogue-version 2.02
++++++ pdfmarginpar.doc.tar.xz ++++++
++++++ pdfmarginpar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfmarginpar.tlpobj new/tlpkg/tlpobj/pdfmarginpar.tlpobj
--- old/tlpkg/tlpobj/pdfmarginpar.tlpobj 2015-04-13 02:10:05.000000000 +0200
+++ new/tlpkg/tlpobj/pdfmarginpar.tlpobj 2016-04-14 19:32:49.000000000 +0200
@@ -1,7 +1,7 @@
name pdfmarginpar
category Package
revision 23492
-shortdesc Generate marginpar-equivalent PDF annotations.
+shortdesc Generate marginpar-equivalent PDF annotations
relocated 1
longdesc The package provides the \pdfmarginpar command which is similar
longdesc in spirit to \marginpar. However, it creates PDF annotations
@@ -13,7 +13,9 @@
longdesc is not obscured.
runfiles size=2
RELOC/tex/latex/pdfmarginpar/pdfmarginpar.sty
+catalogue-also pdfcomment
catalogue-ctan /macros/latex/contrib/pdfmarginpar
-catalogue-date 2014-02-26 23:03:13 +0100
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license gpl
+catalogue-topics pdf-feat
catalogue-version 0.92
++++++ pdfpagediff.doc.tar.xz ++++++
++++++ pdfpagediff.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpagediff.tlpobj new/tlpkg/tlpobj/pdfpagediff.tlpobj
--- old/tlpkg/tlpobj/pdfpagediff.tlpobj 2015-07-25 03:20:45.000000000 +0200
+++ new/tlpkg/tlpobj/pdfpagediff.tlpobj 2016-04-14 19:32:50.000000000 +0200
@@ -7,7 +7,7 @@
runfiles size=2
RELOC/tex/latex/pdfpagediff/pdfpagediff.sty
catalogue-ctan /macros/latex/contrib/pdfpagediff
-catalogue-date 2015-07-24 15:20:52 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl1
catalogue-topics pdf-view pdfprocess
catalogue-version 1.4
++++++ pdfpages.doc.tar.xz ++++++
Files old/doc/latex/pdfpages/pdfpages.pdf and new/doc/latex/pdfpages/pdfpages.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.doc.tlpobj new/tlpkg/tlpobj/pdfpages.doc.tlpobj
--- old/tlpkg/tlpobj/pdfpages.doc.tlpobj 2015-07-25 03:20:45.000000000 +0200
+++ new/tlpkg/tlpobj/pdfpages.doc.tlpobj 2016-04-21 03:14:38.000000000 +0200
@@ -1,6 +1,6 @@
name pdfpages.doc
category Package
-revision 37944
+revision 40638
shortdesc doc files of pdfpages
relocated 1
docfiles size=87
++++++ pdfpages.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pdfpages.sty new/tex/latex/pdfpages/pdfpages.sty
--- old/tex/latex/pdfpages/pdfpages.sty 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/pdfpages.sty 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
@@ -82,7 +82,13 @@
\RequirePackage{count1to}%
\AddToShipoutPicture{\AM@setanchor}%
\fi
-\RequirePackage{pdflscape}
+\AtBeginDocument{%
+ \let\AM@orig@landscape\landscape
+ \let\AM@orig@endlandscape\endlandscape
+ \RequirePackage{pdflscape}%
+ \let\landscape\AM@orig@landscape
+ \let\endlandscape\AM@orig@endlandscape
+}
\let\AM@Ginclude@graphics\Ginclude@graphics
\@ifpackagelater{eso-pic}{2001/07/20}
{\def\AM@AddToShipoutPicture{\AddToShipoutPicture*}%
@@ -179,15 +185,19 @@
\PackageError{pdfpages}{Cannot find file `#1'}{}%
\fi
}
+\newtoks\AM@global@opts
+\newcommand*{\AM@disable@width@height}{width=!,height=!}
+\AM@global@opts\expandafter{\AM@disable@width@height}
\newcommand*{\includepdfset}[1]{%
- \AM@split@options{pdfpages}{#1}%
- \edef\AM@temp{{pdfpages}{\the\@temptokena}}%
- \expandafter\setkeys\AM@temp
+ \AM@global@opts\expandafter{\AM@disable@width@height,#1}%
}
\newcommand*{\includepdf}[2][]{%
\begingroup
\let\AM@threadname\relax
- \AM@split@options{pdfpages}{#1}%
+ \def\AM@tmp{pdfpages}
+ \expandafter\AM@split@options
+ \expandafter\AM@tmp
+ \expandafter{\the\AM@global@opts,#1}
\edef\AM@temp{{pdfpages}{\the\@temptokena}}%
\expandafter\setkeys\AM@temp
\ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
@@ -224,7 +234,7 @@
\fi
\ifAM@output
\expandafter\AM@readlist\expandafter{\AM@pagestemp}%
- \AM@output{#1}%
+ \expandafter\AM@output\expandafter{\the\AM@global@opts,#1}%
\fi
\AM@CheckAtEnd
\endgroup
@@ -233,11 +243,14 @@
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
\let\AM@currentdocname\relax
- \AM@split@options{pdfpages}{#1}%
+ \def\AM@tmp{pdfpages}
+ \expandafter\AM@split@options
+ \expandafter\AM@tmp
+ \expandafter{\the\AM@global@opts,#1}%
\edef\AM@temp{{pdfpages}{\the\@temptokena}}%
\expandafter\setkeys\AM@temp
\AM@readlist{#2}%
- \AM@output{#1}%
+ \expandafter\AM@output\expandafter{\the\AM@global@opts,#1}%
\AM@CheckAtEnd
\endgroup
\AM@ClearShipoutPicture
@@ -354,9 +367,10 @@
\setbox\@tempboxa=\hbox{%
\rotatebox{\AM@lscape@rot}{\copy\AM@templatesizebox}}%
\else
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, angle=\AM@lscape@rot]}%
\setbox\@tempboxa=\hbox{%
- \expandafter\includegraphics\expandafter[\the\@temptokena,
- page=\AM@page, angle=\AM@lscape@rot]{\AM@docname}}%
+ \expandafter\includegraphics\AM@opts{\AM@docname}}%
\fi
\fi
\ifthenelse{\boolean{AM@fitpaper}}{
@@ -396,10 +410,11 @@
\setbox\@tempboxa=\hbox{%
\rotatebox{\AM@lscape@rot}{\copy\@tempboxa}}%
\else
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, scale=\AM@globalscale,
+ angle=\AM@lscape@rot]}%
\setbox\@tempboxa=\hbox{%
- \expandafter\includegraphics\expandafter[\the\@temptokena,
- page=\AM@page, scale=\AM@globalscale,
- angle=\AM@lscape@rot]{\AM@docname}}%
+ \expandafter\includegraphics\AM@opts{\AM@docname}}%
\fi
\let\@filelist\AM@filelist@save
\edef\AM@templatewidth{\the\wd\@tempboxa}%
@@ -428,6 +443,7 @@
\fi
\setboolean{AM@endoflist}{false}%
\whiledo{\not\boolean{AM@endoflist}}{%
+ \newpage
\AM@getfirst{\AM@pagelist}%
\edef\AM@page{\the\toks@}%
\AM@isphantom
@@ -476,10 +492,11 @@
\def\AM@ynupi{\@ne}%
\fi
}%
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, scale=\AM@globalscale,
+ angle=\AM@lscape@rot]}%
\setbox\@tempboxa=\hbox{%
- \expandafter\includegraphics\expandafter[\the\@temptokena,
- page=\AM@page, scale=\AM@globalscale,
- angle=\AM@lscape@rot]{\AM@docname}}%
+ \expandafter\includegraphics\AM@opts{\AM@docname}}%
\edef\AM@localwd{\the\wd\@tempboxa}%
\setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
\edef\AM@localht{\the\@tempdima}%
@@ -503,11 +520,11 @@
\ifAM@rotateoversize
\def\AM@rotateoversize{90}%
\let\AM@filelist@save\@filelist
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, scale=\AM@globalscale,
+ angle=\AM@lscape@rot, angle=90]}%
\setbox\@tempboxa=\hbox{%
- \expandafter\includegraphics\expandafter
- [\the\@temptokena, page=\AM@page,
- scale=\AM@globalscale,
- angle=\AM@lscape@rot, angle=90]{\AM@docname}}%
+ \expandafter\includegraphics\AM@opts{\AM@docname}}%
\let\@filelist\AM@filelist@save
\edef\AM@localwd{\the\wd\@tempboxa}%
\setlength{\@tempdima}{\ht\@tempboxa + \dp\@tempboxa}%
@@ -543,12 +560,20 @@
\fi
\let\AM@filelist@save\@filelist
\AM@split@options{Gin}{#1}%
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, scale=\AM@globalscale,
+ angle=\AM@lscape@rot]}%
\setbox\@tempboxa=\hbox{%
- \expandafter\includegraphics\expandafter[\the\@temptokena,
- page=\AM@page, scale=\AM@globalscale,
- angle=\AM@lscape@rot]{\AM@docname}}%
+ \expandafter\includegraphics\AM@opts{\AM@docname}}%
\let\@filelist\AM@filelist@save
\setlength{\@tempdimc}{\ht\@tempboxa + \dp\@tempboxa}%
+\edef\AM@texcoord{%
+ \ifESO@texcoord
+ -\AM@pageheight
+ \else
+ \z@
+ \fi
+}
\def\AM@add{+}%
\if@twoside\ifodd\c@page\else\def\AM@add{-}\fi\fi
\setlength{\@tempdimb}{\ht\@tempboxa + \dp\@tempboxa}%
@@ -559,6 +584,7 @@
(\AM@ynupi - 1)
}%
\def\AM@ypos{%
+ \AM@texcoord +
\AM@ymargin + \AM@yoffset + \AM@localyoff +
(\AM@templateheight + \AM@deltay + \tw@\fboxrule) *
(\AM@xnupi - 1)
@@ -570,6 +596,7 @@
(\AM@xnupi - 1)
}%
\def\AM@ypos{%
+ \AM@texcoord +
\AM@ymargin + \AM@yoffset + \AM@localyoff +
(\AM@templateheight + \AM@deltay + \tw@\fboxrule) *
(\AM@ynup-\AM@ynupi)
@@ -581,7 +608,6 @@
\edef\AM@ypos{\strip@pt\@tempdima}%
\setlength{\fboxsep}{\z@}%
\AM@region@calc
- \newpage
\ifnum\AM@xnupi=1
\ifnum\AM@ynupi=1
\ifAM@reflectall \setbox\AM@pagebox\null \fi
@@ -591,6 +617,13 @@
\def\AM@shippage{}%
\else
\AM@split@options{Gin}{#1}%
+ \edef\AM@opts{[\AM@disable@width@height,\the\@temptokena,
+ page=\AM@page, scale=\AM@globalscale,
+ scale=\AM@localscale,
+ \ifAM@sigrotate angle=180,\fi
+ \ifAM@doublepagestwist\ifAM@doublepagestmp
+ angle=180,\fi\fi
+ angle=\AM@rotateoversize, angle=\AM@lscape@rot]}%
\edef\AM@shippage{%
\noexpand\put(\AM@xpos,\AM@ypos){%
\noexpand\raisebox{\dp\@tempboxa}{%
@@ -598,14 +631,8 @@
\AM@hyper@begin@ii\noexpand\AM@fbox{%
\noexpand\AM@ARBug@hook
\noexpand\AM@reflectbox{%
- \noexpand\includegraphics[\the\@temptokena,
- page=\AM@page, scale=\AM@globalscale,
- scale=\AM@localscale,
- \ifAM@sigrotate angle=180,\fi
- \ifAM@doublepagestwist\ifAM@doublepagestmp
- angle=180,\fi\fi
- angle=\AM@rotateoversize,
- angle=\AM@lscape@rot]{\AM@docname}}}%
+ \expandafter\noexpand\expandafter
+ \includegraphics\AM@opts{\AM@docname}}}%
\AM@hyper@end}}%
}%
\fi
@@ -792,7 +819,7 @@
\ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
}{%
\PackageError{pdfpages}
- {page #1 of `\AM@currentdocname' does not exist}
+ {Page #1 of `\AM@currentdocname' does not exist}
{You have set a wrong page number in the `pages' option.
Document \MessageBreak `\AM@currentdocname' does not
have #1 pages.}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvipdfmx.def new/tex/latex/pdfpages/ppdvipdfmx.def
--- old/tex/latex/pdfpages/ppdvipdfmx.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppdvipdfmx.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
@@ -48,22 +48,56 @@
Let's hope for the best}%
\input{dvipdfmx.def}%
\fi
-\PackageInfo{pdfpages}{%
- Driver `dvipdfmx' cannot detect the total number\MessageBreak
- of pages of a PDF. Use option `lastpage' to give\MessageBreak
- me a hint}
+{\catcode`\"=12
+ \gdef\AM@quote{"}%
+}
\def\AM@getpagecount{%
+ \expandafter\expandafter\expandafter\AM@get@xbb@filename
+ \csname Gin@rule@.pdf\endcsname\AM@currentdocname
+ \immediate\openin\@inputcheck=\AM@xbb@filename
+ \AM@read@xbb\@inputcheck
+ \immediate\closein\@inputcheck
+ \ifx\AM@pagecount\AM@undefined
+ \immediate\openin\@inputcheck=
+ \AM@quote|extractbb -O \AM@currentdocname\AM@quote
+ \AM@read@xbb\@inputcheck
+ \immediate\closein\@inputcheck
+ \fi
\ifx\AM@pagecount\AM@undefined
- \def\AM@pagecount{1}%
+ \def\AM@pagecount{1}
\fi
}
-\newcommand*{\AM@checkpagenumber}[1]{}
+\def\AM@get@xbb@filename#1#2#3{%
+ \filename@parse{#3}%
+ \edef\AM@xbb@filename{\filename@area\filename@base#2}%
+}
+\def\AM@read@xbb#1{%
+ \@tempswatrue
+ \loop
+ \ifeof#1
+ \@tempswafalse
+ \else
+ \begingroup
+ \catcode`\%=12\relax
+ \immediate\global\read#1 to \@tempa
+ \endgroup
+ \expandafter\AM@find@pages\@tempa:\relax
+ \fi
+ \if@tempswa\repeat
+}
+\long\def\AM@find@pages#1:#2\relax{%
+ \def\@tempb{#1}%
+ \edef\@tempc{\@percentchar\@percentchar Pages}%
+ \ifx\@tempb\@tempc\AM@set@pagecount#2\fi
+}
+\def\AM@set@pagecount#1:{\def\AM@pagecount{#1}}
\def\AM@getpagedimen{%
\AM@pagewidth=\paperwidth
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \special{pdf:pagesize width \the\AM@pagewidth\space height \the\AM@pageheight\space}
+ \special{pdf:pagesize width \the\AM@pagewidth\space
+ height \the\AM@pageheight\space}
}
\def\AM@pagesize@boogie{%
\ifdim\AM@pagewidth=\z@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvips.def new/tex/latex/pdfpages/ppdvips.def
--- old/tex/latex/pdfpages/ppdvips.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppdvips.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppdvips.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppluatex.def new/tex/latex/pdfpages/ppluatex.def
--- old/tex/latex/pdfpages/ppluatex.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppluatex.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,19 +24,39 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppluatex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for LuaTeX (AM)]
-\ifcase\pdfoutput
+\ifnum\luatexversion<85
+ \let\AM@outputmode\pdfoutput
+ \let\AM@saveimageresource\pdfximage
+ \let\AM@lastsavedimageresourcepages\pdflastximagepages
+ \let\AM@luatexpagewidth\pdfpagewidth
+ \let\AM@luatexpageheight\pdfpageheight
+ \let\AM@annotation\pdfannot
+ \let\AM@thread\pdfthread
+ \let\AM@destination\pdfdest
+\else
+ \let\AM@outputmode\outputmode
+ \let\AM@saveimageresource\saveimageresource
+ \let\AM@lastsavedimageresourcepages\lastsavedimageresourcepages
+ \let\AM@luatexpagewidth\pagewidth
+ \let\AM@luatexpageheight\pageheight
+ \protected\def\AM@annotation {\pdfextension annot }
+ \protected\def\AM@thread {\pdfextension thread }
+ \protected\def\AM@destination {\pdfextension dest }
+\fi
+\ifcase\AM@outputmode
\input{ppnull.def}
\expandafter\endinput
\fi
+
\let\AM@Gread@@pdftex\Gread@@pdftex
\renewcommand*{\Gread@@pdftex}[1]{%
\xdef\AM@currentdocname@fix{#1}%
@@ -44,16 +64,16 @@
}
\def\AM@getpagecount{%
\setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
- \pdfximage{\AM@currentdocname@fix}%
- \edef\AM@pagecount{\the\pdflastximagepages}%
+ \AM@saveimageresource{\AM@currentdocname@fix}%
+ \edef\AM@pagecount{\the\AM@lastsavedimageresourcepages}%
}
\def\AM@getpagedimen{%
\AM@pagewidth=\paperwidth
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \pdfpagewidth\AM@pagewidth
- \pdfpageheight\AM@pageheight
+ \AM@luatexpagewidth\AM@pagewidth
+ \AM@luatexpageheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
\let\AM@fitpaper@special\relax
@@ -69,27 +89,27 @@
\def\AM@setRotate{\PLS@Rotate{90}}
\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoToR
- /F (\AM@linkfilename)
- /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
- \ifAM@newwindow/NewWindow true\fi >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoToR
+ /F (\AM@linkfilename)
+ /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
+ \ifAM@newwindow/NewWindow true\fi >>}%
}
\let\AM@linktodoc@special@end\relax
\def\AM@survey@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoTo
- /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoTo
+ /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
}
\let\AM@survey@special@end\relax
\def\AM@thread@special@begin{%
- \pdfthread width \wd\@tempboxa
+ \AM@thread width \wd\@tempboxa
height \ht\@tempboxa
depth \dp\@tempboxa
attr {/I <<\threadinfodict>>}%
@@ -97,8 +117,8 @@
}
\let\AM@thread@special@end\relax
\def\AM@view{fit}
-\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view}
-\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit}
+\def\AM@dest@special{\AM@destination name {\AM@linkname.\AM@page} \AM@view}
+\def\AM@anchor@special{\AM@destination name {pdfpages.\the\count1} fit}
\def\AM@convert@dest#1{%
\expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi}
\def\AM@convert@dest@i#1 #2\END{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppnull.def new/tex/latex/pdfpages/ppnull.def
--- old/tex/latex/pdfpages/ppnull.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppnull.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppnull.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pppdftex.def new/tex/latex/pdfpages/pppdftex.def
--- old/tex/latex/pdfpages/pppdftex.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/pppdftex.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -41,6 +41,14 @@
\let\AM@endinput\relax
\expandafter\endinput
\fi
+ \let\AM@outputmode\pdfoutput
+ \let\AM@saveimageresource\pdfximage
+ \let\AM@lastsavedimageresourcepages\pdflastximagepages
+ \let\AM@luatexpagewidth\pdfpagewidth
+ \let\AM@luatexpageheight\pdfpageheight
+ \let\AM@annotation\pdfannot
+ \let\AM@thread\pdfthread
+ \let\AM@destination\pdfdest
\ifcase\pdfoutput
\input{ppnull.def}
\expandafter\endinput
@@ -73,16 +81,16 @@
}
\def\AM@getpagecount{%
\setbox\@tempboxa=\hbox{\includegraphics{\AM@currentdocname}}%
- \pdfximage{\AM@currentdocname@fix}%
- \edef\AM@pagecount{\the\pdflastximagepages}%
+ \AM@saveimageresource{\AM@currentdocname@fix}%
+ \edef\AM@pagecount{\the\AM@lastsavedimageresourcepages}%
}
\def\AM@getpagedimen{%
\AM@pagewidth=\paperwidth
\AM@pageheight=\paperheight
}
\def\AM@setpagedimen{%
- \pdfpagewidth\AM@pagewidth
- \pdfpageheight\AM@pageheight
+ \AM@luatexpagewidth\AM@pagewidth
+ \AM@luatexpageheight\AM@pageheight
}
\let\AM@pagesize@boogie\relax
\let\AM@fitpaper@special\relax
@@ -98,27 +106,27 @@
\def\AM@setRotate{\PLS@Rotate{90}}
\def\AM@resetRotate{\PLS@Rotate{0}}
\def\AM@linktodoc@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoToR
- /F (\AM@linkfilename)
- /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
- \ifAM@newwindow/NewWindow true\fi >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoToR
+ /F (\AM@linkfilename)
+ /D [\AM@linktodoc@page@m@ne \AM@linktodocfit]
+ \ifAM@newwindow/NewWindow true\fi >>}%
}
\let\AM@linktodoc@special@end\relax
\def\AM@survey@special@begin{%
- \pdfannot width \wd\@tempboxa
- height \ht\@tempboxa
- depth \dp\@tempboxa
- {/Subtype /Link /Border [0 0 0]
- /A << /S /GoTo
- /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
+ \AM@annotation width \wd\@tempboxa
+ height \ht\@tempboxa
+ depth \dp\@tempboxa
+ {/Subtype /Link /Border [0 0 0]
+ /A << /S /GoTo
+ /D (pdfpages.\AM@linktodoc@page@m@ne) >>}%
}
\let\AM@survey@special@end\relax
\def\AM@thread@special@begin{%
- \pdfthread width \wd\@tempboxa
+ \AM@thread width \wd\@tempboxa
height \ht\@tempboxa
depth \dp\@tempboxa
attr {/I <<\threadinfodict>>}%
@@ -126,8 +134,8 @@
}
\let\AM@thread@special@end\relax
\def\AM@view{fit}
-\def\AM@dest@special{\pdfdest name {\AM@linkname.\AM@page} \AM@view}
-\def\AM@anchor@special{\pdfdest name {pdfpages.\the\count1} fit}
+\def\AM@dest@special{\AM@destination name {\AM@linkname.\AM@page} \AM@view}
+\def\AM@anchor@special{\AM@destination name {pdfpages.\the\count1} fit}
\def\AM@convert@dest#1{%
\expandafter\AM@convert@dest@i\ifdim\z@=0pt#1 \END\fi}
\def\AM@convert@dest@i#1 #2\END{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppvtex.def new/tex/latex/pdfpages/ppvtex.def
--- old/tex/latex/pdfpages/ppvtex.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppvtex.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppvtex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppxetex.def new/tex/latex/pdfpages/ppxetex.def
--- old/tex/latex/pdfpages/ppxetex.def 2015-07-24 23:30:15.000000000 +0200
+++ new/tex/latex/pdfpages/ppxetex.def 2016-04-20 23:53:12.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2015 Andreas MATTHIAS
+%% Copyright (C) 2001-2016 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS .
%%
-\def\AM@fileversion{v0.5a}
+\def\AM@fileversion{v0.5f}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2015-07-19 17:18:25 +0200 $
-\AM@Git@SHA@process$SHA-1: e79a333f7b4030269da1c5f48fa2c8d07b41b058 $
+\AM@Git@Date@process$Date: 2016-04-19 23:45:44 +0200 $
+\AM@Git@SHA@process$SHA-1: 5a5a8af44ff5d6119ea64143e5089987a1df8963 $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.tlpobj new/tlpkg/tlpobj/pdfpages.tlpobj
--- old/tlpkg/tlpobj/pdfpages.tlpobj 2015-07-25 03:20:45.000000000 +0200
+++ new/tlpkg/tlpobj/pdfpages.tlpobj 2016-04-21 03:14:39.000000000 +0200
@@ -1,14 +1,14 @@
name pdfpages
category Package
-revision 37944
-shortdesc Include PDF documents in LaTeX.
+revision 40638
+shortdesc Include PDF documents in LaTeX
relocated 1
longdesc This package simplifies the inclusion of external multi-page
longdesc PDF documents in LaTeX documents. Pages may be freely selected
longdesc and similar to psnup it is possible to put several logical
longdesc pages onto each sheet of paper. Furthermore a lot of hypertext
longdesc features like hyperlinks and article threads are provided. The
-longdesc package supports pdfTeX (pdflatex) and VTeX. With VTeX it is
+longdesc package supports pdfTeX (pdfLaTeX) and VTeX. With VTeX it is
longdesc even possible to use this package to insert PostScript files,
longdesc in addition to PDF files.
depend eso-pic
@@ -22,7 +22,7 @@
RELOC/tex/latex/pdfpages/ppvtex.def
RELOC/tex/latex/pdfpages/ppxetex.def
catalogue-ctan /macros/latex/contrib/pdfpages
-catalogue-date 2015-07-23 23:29:54 +0200
+catalogue-date 2016-04-20 20:12:00 +0200
catalogue-license lppl1.3
catalogue-topics graphics-incl
-catalogue-version 0.5a
+catalogue-version 0.5f
++++++ pdfscreen.doc.tar.xz ++++++
++++++ pdfscreen.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfscreen.tlpobj new/tlpkg/tlpobj/pdfscreen.tlpobj
--- old/tlpkg/tlpobj/pdfscreen.tlpobj 2015-04-13 02:10:07.000000000 +0200
+++ new/tlpkg/tlpobj/pdfscreen.tlpobj 2016-04-14 19:32:51.000000000 +0200
@@ -1,7 +1,7 @@
name pdfscreen
category Package
revision 27510
-shortdesc Support screen-based document design.
+shortdesc Support screen-based document design
relocated 1
longdesc An extension of the hyperref package to provide a screen-based
longdesc document design. This package helps to generate pdf documents
@@ -28,6 +28,7 @@
RELOC/tex/latex/pdfscreen/pdfscreen.sty
RELOC/tex/latex/pdfscreen/right.pdf
catalogue-ctan /macros/latex/contrib/pdfscreen
-catalogue-date 2012-07-18 20:44:29 +0200
+catalogue-date 2015-08-03 05:43:12 +0200
catalogue-license lppl
+catalogue-topics hyper presentation
catalogue-version 1.5