openSUSE Commits

Download

commit@lists.opensuse.org

June 2017

1 participants
2052 discussions

commit texlive-specs-m for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-m for openSUSE:Factory checked in at 2017-06-25 19:23:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-m (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-m.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-m" Sun Jun 25 19:23:15 2017 rev:29 rq:504972 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.changes 2017-06-08 14:55:17.696295846 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-m.new/texlive-specs-m.changes 2017-06-25 19:31:14.319088896 +0200 @@ -1,0 +2,47 @@ +Tue Jun 20 06:39:06 UTC 2017 - werner(a)suse.de + +- Change left over texlive-pdftex-def for texlive-latex-bin + +------------------------------------------------------------------- +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- latex-notes-zh-cn.doc.tar.xz latex-referenz.doc.tar.xz latex-tabellen.doc.tar.xz latex-tds.doc.tar.xz latex-tds.source.tar.xz latex-veryshortguide.doc.tar.xz latex-web-companion.doc.tar.xz latex2e-help-texinfo-fr.doc.tar.xz latex2e-help-texinfo-spanish.doc.tar.xz latex2e-help-texinfo.doc.tar.xz latex2man.doc.tar.xz latex2man.tar.xz latex2man_tmphandling.dif latex4wp-it.doc.tar.xz latex4wp.doc.tar.xz latexcheat-de.doc.tar.xz latexcheat-esmx.doc.tar.xz latexcheat-ptbr.doc.tar.xz latexcheat.doc.tar.xz latexconfig.tar.xz latexcourse-rug.doc.tar.xz latexdemo.doc.tar.xz latexdemo.tar.xz latexdiff.doc.tar.xz latexdiff.tar.xz latexdiff_perl.dif latexfileinfo-pkgs.doc.tar.xz latexfileinfo-pkgs.tar.xz latexfileversion.doc.tar.xz latexfileversion.tar.xz latexindent.doc.tar.xz latexindent.tar.xz latexmk.doc.tar.xz latexmk.tar.xz latexmp.doc.tar.xz latexmp.tar.xz latexpand.doc.tar.xz latexpand.tar.xz latexpand_perl.dif lato.doc.tar.xz lato.tar.xz layaureo.doc.tar.xz layaureo.tar.xz layouts.doc.tar.xz layouts.tar.xz lazylist.doc.tar.xz lazylist.tar.xz lcd.doc.tar.xz lcd.tar.xz lcdftypetools.doc.tar.xz lcg.doc.tar.xz lcg.tar.xz lcyw.doc.tar.xz lcyw.tar.xz leading.doc.tar.xz leading.tar.xz New: ---- inlinedef.doc.tar.xz inlinedef.tar.xz inputtrc.doc.tar.xz inputtrc.tar.xz insbox.doc.tar.xz insbox.tar.xz interactiveworkbook.doc.tar.xz interactiveworkbook.tar.xz interchar.doc.tar.xz interchar.tar.xz interfaces.doc.tar.xz interfaces.tar.xz interpreter.doc.tar.xz interpreter.tar.xz interval.doc.tar.xz interval.tar.xz intro-scientific.doc.tar.xz inversepath.doc.tar.xz inversepath.tar.xz invoice.doc.tar.xz invoice.tar.xz ionumbers.doc.tar.xz ionumbers.tar.xz iopart-num.doc.tar.xz iopart-num.tar.xz ipaex-type1.doc.tar.xz ipaex-type1.tar.xz ipaex.doc.tar.xz ipaex.tar.xz iscram.doc.tar.xz iscram.tar.xz iso.doc.tar.xz iso.tar.xz iso10303.doc.tar.xz iso10303.tar.xz isodate.doc.tar.xz isodate.tar.xz isodoc.doc.tar.xz isodoc.tar.xz isomath.doc.tar.xz isomath.tar.xz isonums.doc.tar.xz isonums.tar.xz isorot.doc.tar.xz isorot.tar.xz isotope.doc.tar.xz isotope.tar.xz issuulinks.doc.tar.xz issuulinks.tar.xz itnumpar.doc.tar.xz itnumpar.tar.xz iwhdp.doc.tar.xz iwhdp.tar.xz iwona.doc.tar.xz iwona.tar.xz jablantile.doc.tar.xz jablantile.tar.xz jacow.doc.tar.xz jacow.tar.xz jadetex.doc.tar.xz jadetex.tar.xz jadetex_ini.dif jamtimes.doc.tar.xz jamtimes.tar.xz japanese-otf-uptex.doc.tar.xz japanese-otf-uptex.tar.xz japanese-otf.doc.tar.xz japanese-otf.tar.xz jlreq.doc.tar.xz jlreq.tar.xz karnaugh-map.doc.tar.xz karnaugh-map.tar.xz keyfloat.doc.tar.xz keyfloat.tar.xz knowledge.doc.tar.xz knowledge.tar.xz ladder.doc.tar.xz ladder.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-m.spec ++++++ ++++ 46164 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-m.new/texlive-specs-m.spec ++++++ jadetex_ini.dif ++++++ --- texmf-dist/tex/jadetex/base/jadetex.ini +++ texmf-dist/tex/jadetex/base/jadetex.ini 2010-01-11 14:35:48.065760000 +0100 @@ -1,7 +1,13 @@ % public domain. \let\primitivedump=\dump \let\dump=\relax -\input latex.ini +\ifx\pdfoutput\undefined \input latex.ini \else + \ifx\pdfoutput\relax \input latex.ini \else + \ifnum\pdfoutput<1 \input latex.ini \else + \input pdflatex.ini + \fi + \fi +\fi \let\dump=\primitivedump \input jadetex.ltx ++++++ jknapltx.doc.tar.xz ++++++ ++++++ jknapltx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jknapltx.tlpobj new/tlpkg/tlpobj/jknapltx.tlpobj --- old/tlpkg/tlpobj/jknapltx.tlpobj 2016-04-14 19:12:06.000000000 +0200 +++ new/tlpkg/tlpobj/jknapltx.tlpobj 2017-04-14 17:45:00.000000000 +0200 @@ -31,6 +31,6 @@ RELOC/tex/latex/jknapltx/ustmary.fd RELOC/tex/latex/jknapltx/young.sty catalogue-ctan /macros/latex/contrib/jknappen -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics collection ++++++ jlabels.doc.tar.xz ++++++ ++++++ jlabels.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jlabels.tlpobj new/tlpkg/tlpobj/jlabels.tlpobj --- old/tlpkg/tlpobj/jlabels.tlpobj 2016-04-14 19:12:06.000000000 +0200 +++ new/tlpkg/tlpobj/jlabels.tlpobj 2017-04-14 17:45:00.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=1 RELOC/tex/latex/jlabels/jlabels.sty catalogue-ctan /macros/latex/contrib/jlabels -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics labels ++++++ jmlr.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/CHANGES new/doc/latex/jmlr/CHANGES --- old/doc/latex/jmlr/CHANGES 2015-02-25 00:10:45.000000000 +0100 +++ new/doc/latex/jmlr/CHANGES 2017-03-12 00:01:04.000000000 +0100 @@ -1,3 +1,11 @@ +v1.23: + + * added pmlr class option + +v1.22: + + * added oneside and twoside class options + v1.21: * jmlr.cls diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/README new/doc/latex/jmlr/README --- old/doc/latex/jmlr/README 2015-02-25 00:10:45.000000000 +0100 +++ new/doc/latex/jmlr/README 2017-03-12 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ -LaTeX Class : jmlr bundle v1.21 +LaTeX Class : jmlr bundle v1.23 -Last Modified : 2015-02-24 +Last Modified : 2017-03-09 Author : Nicola L. C. Talbot @@ -10,9 +10,9 @@ * jmlrbook class The jmlr class is a LaTeX2e class for articles for the Journal of -Machine Learning Research (JMLR) or for the JMLR Workshop and -Conference Proceedings (JMLR W&CP). It is designed as a replacement -for both jmlr2e.sty and jmlrwcp2e.sty. +Machine Learning Research (JMLR) or the JMLR Workshop and Conference +Proceedings (JMLR W&CP). It is designed as a replacement for both +jmlr2e.sty and jmlrwcp2e.sty. The jmlrbook class is a LaTeX2e class that can be used to combine articles written using the jmlr class into a book. The jmlrbook @@ -50,7 +50,7 @@ xkeyval combnat setspace - currfile + fink LICENCE Binary files old/doc/latex/jmlr/jmlr.pdf and new/doc/latex/jmlr/jmlr.pdf differ Binary files old/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf and new/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf differ Binary files old/doc/latex/jmlr/sample-books/proceedings-sample.pdf and new/doc/latex/jmlr/sample-books/proceedings-sample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/sample-books/proceedings-sample.tex new/doc/latex/jmlr/sample-books/proceedings-sample.tex --- old/doc/latex/jmlr/sample-books/proceedings-sample.tex 2015-02-25 00:10:45.000000000 +0100 +++ new/doc/latex/jmlr/sample-books/proceedings-sample.tex 2017-03-12 00:01:03.000000000 +0100 @@ -6,11 +6,14 @@ \usepackage{lipsum} } +%\documentclass[wcp,gray]{jmlrbook} \documentclass[wcp]{jmlrbook} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} +\ifprint{}{\usepackage{bookmark}}% load last + % Title is added to the PDF properties. Optional argument % is used instead, if present. %\title[Short Title]{Big Long Title} @@ -25,7 +28,7 @@ \jmlrworkshop{Workshop on Causality} \jmlrlocation{Somewhere} -\logo[http://www.sampleurl.com/]{\includegraphics{bookLogo}} +\logo{\includegraphics{bookLogo}} \begin{document} \maketitle @@ -47,13 +50,13 @@ \begin{signoff}{March 2010} % First editor: -\Editor{Nicola Talbot\\ -University of East Anglia\\ -\mailto{N.Talbot(a)uea.ac.uk}} - % Second editor: \Editor{Anne Editor\\ University of Nowhere\\ \mailto{ae(a)sample.com}} + % Second editor: +\Editor{Anne Other Editor\\ +University of Nowhere\\ +\mailto{aoe(a)sample.com}} \end{signoff} \end{preface} @@ -73,5 +76,4 @@ \importpaper{paper4}{paper4} \end{jmlrpapers} - \end{document} Binary files old/doc/latex/jmlr/sample-papers/jmlr-sample.pdf and new/doc/latex/jmlr/sample-papers/jmlr-sample.pdf differ Binary files old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf and new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex --- old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2013-10-19 01:22:22.000000000 +0200 +++ new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2017-03-12 00:01:04.000000000 +0100 @@ -1,5 +1,6 @@ %\documentclass[wcp,gray]{jmlr} % test grayscale version -\documentclass[wcp]{jmlr} + %\documentclass[wcp]{jmlr}% former name JMLR W\&CP +\documentclass[pmlr]{jmlr}% new name PMLR (Proceedings of Machine Learning) % The following packages will be automatically loaded: % amsmath, amssymb, natbib, graphicx, url, algorithm2e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jmlr.doc.tlpobj new/tlpkg/tlpobj/jmlr.doc.tlpobj --- old/tlpkg/tlpobj/jmlr.doc.tlpobj 2016-04-14 19:12:07.000000000 +0200 +++ new/tlpkg/tlpobj/jmlr.doc.tlpobj 2017-04-14 17:45:03.000000000 +0200 @@ -1,9 +1,9 @@ name jmlr.doc category Package -revision 36370 +revision 43458 shortdesc doc files of jmlr relocated 1 -docfiles size=505 +docfiles size=519 RELOC/doc/latex/jmlr/CHANGES RELOC/doc/latex/jmlr/INSTALL RELOC/doc/latex/jmlr/README ++++++ jmlr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jmlr/jmlr.cls new/tex/latex/jmlr/jmlr.cls --- old/tex/latex/jmlr/jmlr.cls 2015-02-25 00:10:45.000000000 +0100 +++ new/tex/latex/jmlr/jmlr.cls 2017-03-12 00:01:04.000000000 +0100 @@ -7,7 +7,7 @@ %% jmlr.dtx (with options: `jmlr.cls,package') %% %% jmlr.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2017 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlr}[2015/02/24 v1.21 (NLCT) Journal of Machine Learning Research] +\ProvidesClass{jmlr}[2017/03/09 v1.23 (NLCT) Journal of Machine Learning Research] \RequirePackage{xkeyval} \RequirePackage{calc} \RequirePackage{etoolbox} @@ -90,14 +90,21 @@ \newcommand*{\jmlrwcp}{% \jmlrproceedings{JMLR W\&CP}{JMLR: Workshop and Conference Proceedings}% } +\newcommand*{\jmlrpmlr}{% + \jmlrproceedings{PMLR}{Proceedings of Machine Learning Research}% +} \DeclareOptionX{nowcp}{\jmlrnowcp} \DeclareOptionX{wcp}{\jmlrwcp} +\DeclareOptionX{pmlr}{\jmlrpmlr} +\DeclareOptionX{oneside}{\@twosidefalse \@mparswitchfalse} +\DeclareOptionX{twoside}{\@twosidetrue \@mparswitchtrue} +\@twosidetrue \newif\ifviiXx \viiXxfalse \DeclareOptionX{7x10}{\viiXxtrue} \DeclareOptionX{letterpaper}{\PassOptionsToPackage{letterpaper}{typearea}} \DeclareOptionX*{\PassOptionsToClass{\CurrentOption}{article}} -\ExecuteOptions{twoside,letterpaper} +\ExecuteOptions{letterpaper} \ProcessOptionsX \LoadClass[\pt@size]{article} \ifviiXx @@ -147,7 +154,6 @@ \renewcommand{\textfraction}{0.05} % let figure take up nearly whole page \widowpenalty=10000\relax \clubpenalty=10000\relax -\@twosidetrue \@mparswitchtrue \bibliographystyle{plainnat} \bibpunct{(}{)}{;}{a}{,}{,} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jmlr/jmlrbook.cls new/tex/latex/jmlr/jmlrbook.cls --- old/tex/latex/jmlr/jmlrbook.cls 2015-02-25 00:10:45.000000000 +0100 +++ new/tex/latex/jmlr/jmlrbook.cls 2017-03-12 00:01:04.000000000 +0100 @@ -7,7 +7,7 @@ %% jmlr.dtx (with options: `jmlrbook.cls,package') %% %% jmlr.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2017 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -41,7 +41,7 @@ %% First editor: %% Second editor: \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jmlrbook}[2015/02/24 v1.21 (NLCT) JMLR Book Style] +\ProvidesClass{jmlrbook}[2017/03/09 v1.23 (NLCT) JMLR Book Style] \RequirePackage{xkeyval} \RequirePackage{setspace} \newcommand*\jmlrprefacepath{} @@ -81,6 +81,9 @@ \DeclareOptionX{wcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% } +\DeclareOptionX{pmlr}{% + \PassOptionsToClass{\CurrentOption}{jmlr}% +} \DeclareOptionX{nowcp}{% \PassOptionsToClass{\CurrentOption}{jmlr}% } @@ -89,6 +92,9 @@ \DeclareOptionX{10pt}{\PassOptionsToClass{\CurrentOption}{jmlr}} \DeclareOptionX{11pt}{\PassOptionsToClass{\CurrentOption}{jmlr}} \DeclareOptionX{12pt}{\PassOptionsToClass{\CurrentOption}{jmlr}} +\@twosidetrue +\DeclareOptionX{oneside}{\@twosidefalse \@mparswitchfalse} +\DeclareOptionX{twoside}{\@twosidetrue \@mparswitchtrue} \define(a)boolkey{jmlrbook.cls}[jmlr]{pdfxa}[true]{} \jmlrpdfxafalse \ProcessOptionsX @@ -289,7 +295,6 @@ \expandafter\NAT@split\NAT@temp?????@@% \expandafter\NAT@parse@date\NAT@date??????@@% \ifciteindex\NAT@index\fi} -\@twosidetrue \newif\if@openright \@openrighttrue \newif\if@mainmatter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jmlr.tlpobj new/tlpkg/tlpobj/jmlr.tlpobj --- old/tlpkg/tlpobj/jmlr.tlpobj 2016-04-14 19:12:08.000000000 +0200 +++ new/tlpkg/tlpobj/jmlr.tlpobj 2017-04-14 17:45:04.000000000 +0200 @@ -1,26 +1,22 @@ name jmlr category Package -revision 36370 +revision 43458 shortdesc Class files for the Journal of Machine Learning Research relocated 1 longdesc The jmlr bundle provides a class for authors (jmlr) and a class -longdesc for production editors (jmlrbook), as well as a script -longdesc makejmlrbook The jmlrbook class can be used to combine articles -longdesc written using the jmlr class into a book. The class uses the -longdesc combine class and the hyperref package to produce either a -longdesc colour hyperlinked book for on-line viewing or a greyscale -longdesc nonhyperlinked book for printing. The makejmlrbook Perl script -longdesc can be used to create the colour hyperlinked and greyscale -longdesc nonhyperlinked PDFs of a document using the jmlrbook class. It -longdesc can also create a set of HTML files that list the included -longdesc papers with links to their abstracts and the individual -longdesc articles as PDFs. +longdesc for production editors (jmlrbook). The jmlrbook class can be +longdesc used to combine articles written using the jmlr class into a +longdesc book. The class uses the combine class and the hyperref package +longdesc to produce either a colour hyperlinked book for on-line viewing +longdesc or a greyscale nonhyperlinked book for printing. Production +longdesc editors can use makejmlrbookgui to help build the proceedings +longdesc from the articles. runfiles size=28 RELOC/scripts/jmlr/makejmlrbook RELOC/tex/latex/jmlr/jmlr.cls RELOC/tex/latex/jmlr/jmlrbook.cls catalogue-ctan /macros/latex/contrib/jmlr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-10 05:33:54 +0100 catalogue-license lppl1.3 catalogue-topics journalpub class -catalogue-version 1.21 +catalogue-version 1.23 ++++++ jmn.tar.xz ++++++ ++++++ jneurosci.doc.tar.xz ++++++ ++++++ jneurosci.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jneurosci.tlpobj new/tlpkg/tlpobj/jneurosci.tlpobj --- old/tlpkg/tlpobj/jneurosci.tlpobj 2016-04-14 19:12:08.000000000 +0200 +++ new/tlpkg/tlpobj/jneurosci.tlpobj 2017-04-14 17:45:05.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/bibtex/bst/jneurosci/jneurosci.bst RELOC/tex/latex/jneurosci/jneurosci.sty catalogue-ctan /biblio/bibtex/contrib/jneurosci -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics neuro bibtex-sty catalogue-version 1.00 ++++++ jpsj.doc.tar.xz ++++++ ++++++ jpsj.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jpsj.tlpobj new/tlpkg/tlpobj/jpsj.tlpobj --- old/tlpkg/tlpobj/jpsj.tlpobj 2016-04-14 19:12:09.000000000 +0200 +++ new/tlpkg/tlpobj/jpsj.tlpobj 2017-04-14 17:45:05.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=8 RELOC/tex/latex/jpsj/jpsj2.cls catalogue-ctan /macros/latex/contrib/jpsj -catalogue-date 2016-04-04 10:35:19 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license lppl catalogue-topics physics journalpub catalogue-version 1.2.2 ++++++ js-misc.doc.tar.xz ++++++ ++++++ js-misc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/js-misc.tlpobj new/tlpkg/tlpobj/js-misc.tlpobj --- old/tlpkg/tlpobj/js-misc.tlpobj 2016-04-14 19:12:09.000000000 +0200 +++ new/tlpkg/tlpobj/js-misc.tlpobj 2017-04-14 17:45:05.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/plain/js-misc/sperr.tex RELOC/tex/plain/js-misc/xfig.tex catalogue-ctan /macros/plain/contrib/js-misc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-17 15:12:14 +0200 catalogue-license pd catalogue-topics collection ++++++ jsclasses.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/jsclasses/LICENSE new/doc/platex/jsclasses/LICENSE --- old/doc/platex/jsclasses/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/platex/jsclasses/LICENSE 2017-01-14 00:01:03.000000000 +0100 @@ -0,0 +1,25 @@ +Copyright 1995-1999 ASCII MEDIA WORKS +Copyright 1999-2016 Haruhiko Okumura +Copyright 2016-2017 Japanese TeX Development Community +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/jsclasses/README new/doc/platex/jsclasses/README --- old/doc/platex/jsclasses/README 2014-08-18 00:12:16.000000000 +0200 +++ new/doc/platex/jsclasses/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Japanese classes written by Haruhiko Okumura (okumura(a)edu.mie-u.ac.jp). -jsarticle, jsbook, and jspf classes are provided. In addition, several -style files are provided, too. - -The classes themselves do not automatically enable the support of -Japanese language. You'll need set up LaTeX environment appropriately -so that it can handle Japanese, not only LaTeX itself but also viewers -of outputs. - -WWW: http://oku.edu.mie-u.ac.jp/~okumura/jsclasses/ - -We include the pre-generated cls/sty files in this package to ensure -proper encoding. The files have to be in JIS-2022 encoding to work -properly on Windows. These files can be generated in a Japanese locale -by running platex on the .dtx files. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/jsclasses/README.md new/doc/platex/jsclasses/README.md --- old/doc/platex/jsclasses/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/platex/jsclasses/README.md 2017-03-05 23:01:06.000000000 +0100 @@ -0,0 +1,25 @@ +# jsclasses + +Japanese classes, originally written by Haruhiko Okumura and maintained +by the Japanese TeX Development Community (https://texjp.org), including +jsarticle, jsbook, and miscellaneous classes and style files. + +The classes themselves do not automatically enable the support of +Japanese language. You'll need to set up LaTeX environment appropriately +so that it can handle Japanese. + +WWW: https://github.com/texjporg/jsclasses + +In the above repository, we include the pre-generated cls/sty files to +ensure proper encoding. The files have to be in ISO-2022-JP encoding to +work properly on Windows. These files can be generated in a Japanese +locale by running platex on the .ins files, for example + + platex -kanji=jis jsclasses.ins + +## Release Date + +2017-03-05 + +Haruhiko Okumura, +Japanese TeX Development Community Binary files old/doc/platex/jsclasses/jsclasses.pdf and new/doc/platex/jsclasses/jsclasses.pdf differ Binary files old/doc/platex/jsclasses/jslogo.pdf and new/doc/platex/jsclasses/jslogo.pdf differ Binary files old/doc/platex/jsclasses/okumacro.pdf and new/doc/platex/jsclasses/okumacro.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jsclasses.doc.tlpobj new/tlpkg/tlpobj/jsclasses.doc.tlpobj --- old/tlpkg/tlpobj/jsclasses.doc.tlpobj 2016-04-19 17:45:44.000000000 +0200 +++ new/tlpkg/tlpobj/jsclasses.doc.tlpobj 2017-04-14 17:45:05.000000000 +0200 @@ -1,11 +1,13 @@ name jsclasses.doc category Package -revision 40613 +revision 43403 shortdesc doc files of jsclasses relocated 1 -docfiles size=162 - RELOC/doc/platex/jsclasses/README +docfiles size=230 + RELOC/doc/platex/jsclasses/LICENSE + RELOC/doc/platex/jsclasses/README.md RELOC/doc/platex/jsclasses/jsclasses.pdf + RELOC/doc/platex/jsclasses/jslogo.pdf RELOC/doc/platex/jsclasses/jsverb.pdf RELOC/doc/platex/jsclasses/morisawa.pdf RELOC/doc/platex/jsclasses/okumacro.pdf ++++++ jsclasses.tar.xz ++++++ ++++ 7258 lines of diff (skipped) ++++++ jslectureplanner.doc.tar.xz ++++++ ++++ 3741 lines of diff (skipped) ++++++ jslectureplanner.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/english.lps new/tex/latex/jslectureplanner/english.lps --- old/tex/latex/jslectureplanner/english.lps 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/jslectureplanner/english.lps 2017-03-12 23:01:15.000000000 +0100 @@ -0,0 +1,89 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File english.lps +%% +%% English style for lecture planning +%% +%% This file is part of the jslectureplanner bundle. +%% +%% Author: Juergen Spitzmueller <juergen.spitzmueller(a)univie.ac.at> +%% +%% 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://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Juergen Spitzmueller. +%% +%% Code repository and issue tracker: https://github.com/jspitz/jslectureplanner +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% +% English localization of the default strings used by the jslectureplanner package +% + +% Lecture types +\DefLecType{vl}{LEC}{Lecture}{Lecture}% lecture +\DefLecType{ps}{USE}{Undergraduate Seminar}{Session}% undergraduate seminar +\DefLecType{se}{SE}{Seminar}{Session}% seminar +\DefLecType{ue}{PC}{Practical Course}{Session}% practical course +\DefLecType{ko}{CO}{Colloquium}{Session}% colloquium +\DefLecType{pv}{RS}{Research Seminar}{Session}% research seminar + +% Term types +\DefSemType{fs}{ST}{Spring Term}% spring term +\DefSemType{hs}{FT}{Fall Term}% fall term +\DefSemType{ss}{ST}{Summer Term}% summer term +\DefSemType{ws}{WT}{Winter Term}% winter term + +% Date formats +% Uses datetime2 syntax: +% ##1: year +% ##2: month +% ##3: day +% \DTMtwodigits: always output two digits +\DTMrenewdatestyle{lecdate}{% long date: mm/dd/yyyy +\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##2}/\DTMtwodigits{##3}/##1}% +} + +\DTMrenewdatestyle{lecshortdate}{% short date: mm/dd +\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##2}/\DTMtwodigits{##3}}% +} + +% Suffix to cancelled sessions +\renewcommand*\leccancel{\ -- No \lectypesession} + +% Program heading +\renewcommand*\lecprogram{Schedule} + +% Indentation of program list +\renewcommand*\lecprogramlistindent{\textbf{88/88}} + +% +% Strings used by the jsmembertable package +% NOTE that these have to be defined via \newcommand +% + +% 1.) Session column header +\newcommand*\jsmsession{\lectypesession}% +\newcommand*\jsmsessionheader{\textbf{\jsmsession~\thesession}}% + +% 2.) Student Name +\newcommand*\jsmnameheader{\textbf{Surname, Prename}} + +% 3.) Student ID +\newcommand*\jsmidheader{\textbf{Student ID}} + +% 3.) E-Mail +\newcommand*\jsemailheader{\textbf{Email Address}} + +% 4.) Signature advice +\newcommand*\jssigheader{Student's signature} + + +% Finis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/german-default.lps new/tex/latex/jslectureplanner/german-default.lps --- old/tex/latex/jslectureplanner/german-default.lps 2015-07-18 00:42:45.000000000 +0200 +++ new/tex/latex/jslectureplanner/german-default.lps 2016-11-25 19:33:51.000000000 +0100 @@ -42,10 +42,18 @@ \DefSemType{ws}{WS}{Wintersemester}% winter term % Date formats -\renewcommand*\lecdateformat{% - \THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR}% long date -\renewcommand*\lecdateshortformat{% - \THEDAY.\,\twodigit{\THEMONTH}.}% short date +% Uses datetime2 syntax: +% ##1: year +% ##2: month +% ##3: day +% \DTMtwodigits: always output two digits +\DTMrenewdatestyle{lecdate}{% long date: dd.\,mm.~yyyy +\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.~##1}% +} + +\DTMrenewdatestyle{lecshortdate}{% short date: dd.\,mm. +\renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.}% +} % Suffix to cancelled sessions \renewcommand*\leccancel{\ -- keine \lectypesession} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/jslectureplanner.sty new/tex/latex/jslectureplanner/jslectureplanner.sty --- old/tex/latex/jslectureplanner/jslectureplanner.sty 2016-05-11 23:28:48.000000000 +0200 +++ new/tex/latex/jslectureplanner/jslectureplanner.sty 2017-03-12 23:01:15.000000000 +0100 @@ -23,8 +23,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\filedate{2016/05/11} -\def\fileversion{1.2} +\def\filedate{2017/03/12} +\def\fileversion{1.5} \def\filename{jslectureplanner.sty} \NeedsTeXFormat{LaTeX2e} @@ -36,9 +36,8 @@ % REQUIRED PACKAGES % \RequirePackage{etoolbox} -\RequirePackage{advdate} \RequirePackage{xkeyval} -\RequirePackage{datetime} +\RequirePackage[calc,useregional]{datetime2} \RequirePackage{calc} \RequirePackage{ifthen} @@ -63,6 +62,7 @@ \def\lecroom{} \def\lecstartdate{} \def\lecinstructor{} +\def\lecshortinstructor{} \def\lecplatform{} \def\officenumber{} @@ -71,6 +71,7 @@ \def\sesdate{} \def\sesshortdate{} \def\sestitle{} +\def\sesshorttitle{} \def\sestitlesep{} \def\sessubtitle{} \def\sesnr{} @@ -161,6 +162,16 @@ \newcounter{loopcounter} \newcounter{adjsession} + +% +% Booleans +% +\newtoggle{uniquelecshortinstructor} +\newtoggle{uniquesesinstructor} +\newtoggle{uniquesesshortinstructor} +\newtoggle{uniquelecshorttitle} +\newtoggle{uniquesesshorttitle} + % % HELPERS % @@ -204,10 +215,16 @@ } \DeclareOptionX{semester}{\setkeys{lec}{lecsem=#1}} -\define@key{lec}{title}{\def\lectitle{#1}} +\define@key{lec}{title}{\def\lectitle{#1}% + \ifx\lecshorttitle\empty% + \def\lecshorttitle{#1}% + \global\togglefalse{uniquelecshorttitle}% + \fi} \define@key{lec}{titlesep}{\def\lectitlesep{#1}} \define@key{lec}{subtitle}{\def\lecsubtitle{#1}} -\define@key{lec}{shorttitle}{\def\lecshorttitle{#1}} +\define@key{lec}{shorttitle}{% + \def\lecshorttitle{#1}% + \global\toggletrue{uniquelecshorttitle}} \define@key{lec}{year}{\def\lecyear{#1}} \define@key{lec}{uni}{\def\lecuniversity{#1}} \define@key{lec}{institute}{\def\lecinstitute{#1}} @@ -216,7 +233,11 @@ \define@key{lec}{officenumber}{\def\officenumber{#1}} \define@key{lec}{room}{\def\lecroom{#1}} \define@key{lec}{startdate}{\def\lecstartdate{#1}} -\define@key{lec}{instructor}{\def\lecinstructor{#1}} +\define@key{lec}{instructor}{\def\lecinstructor{#1}% + \ifx\lecshortinstructor\empty\def\lecshortinstructor{#1}\fi} +\define@key{lec}{shortinstructor}{% + \def\lecshortinstructor{#1}% + \global\toggletrue{uniquelecshortinstructor}} \define(a)key{lec}{style}{\AtEndOfPackage{\input{#1.lps}}} \define@key{lec}{interval}{% % test if the input is a number @@ -229,22 +250,25 @@ ('#1' was given instead)}{}% \fi } +\define@key{lec}{sestitlesep}{\def\sestitlesep{#1}} -\DeclareOptionX{title}{\setkeys{lec}{title=#1}} -\DeclareOptionX{titlesep}{\setkeys{lec}{titlesep=#1}} -\DeclareOptionX{subtitle}{\setkeys{lec}{subtitle=#1}} -\DeclareOptionX{shorttitle}{\setkeys{lec}{shorttitle=#1}} +\DeclareOptionX{title}{\setkeys{lec}{title={#1}}} +\DeclareOptionX{titlesep}{\setkeys{lec}{titlesep={#1}}} +\DeclareOptionX{subtitle}{\setkeys{lec}{subtitle={#1}}} +\DeclareOptionX{shorttitle}{\setkeys{lec}{shorttitle={#1}}} \DeclareOptionX{year}{\setkeys{lec}{year=#1}} -\DeclareOptionX{uni}{\setkeys{lec}{uni=#1}} -\DeclareOptionX{institute}{\setkeys{lec}{institute=#1}} +\DeclareOptionX{uni}{\setkeys{lec}{uni={#1}}} +\DeclareOptionX{institute}{\setkeys{lec}{institute={#1}}} \DeclareOptionX{startdate}{\setkeys{lec}{startdate=#1}} -\DeclareOptionX{instructor}{\setkeys{lec}{instructor=#1}} -\DeclareOptionX{platform}{\setkeys{lec}{platform=#1}} -\DeclareOptionX{officehours}{\setkeys{lec}{officehours=#1}} -\DeclareOptionX{officenumber}{\setkeys{lec}{officenumber=#1}} -\DeclareOptionX{room}{\setkeys{lec}{room=#1}} +\DeclareOptionX{instructor}{\setkeys{lec}{instructor={#1}}} +\DeclareOptionX{shortinstructor}{\setkeys{lec}{shortinstructor={#1}}} +\DeclareOptionX{platform}{\setkeys{lec}{platform={#1}}} +\DeclareOptionX{officehours}{\setkeys{lec}{officehours={#1}}} +\DeclareOptionX{officenumber}{\setkeys{lec}{officenumber={#1}}} +\DeclareOptionX{room}{\setkeys{lec}{room={#1}}} \DeclareOptionX{style}{\setkeys{lec}{style=#1}} \DeclareOptionX{interval}{\setkeys{lec}{interval=#1}} +\DeclareOptionX{sestitlesep}{\setkeys{lec}{sestitlesep=#1}} \ProcessOptionsX @@ -258,16 +282,23 @@ % \newcommand*{\LecType}[1]{\setkeys{lec}{lectype=#1}} -\newcommand*{\LecTitle}[2][]{\setkeys{lec}{#1,title=#2}} -\newcommand*{\LecTitleSep}[1]{\setkeys{lec}{titlesep=#1}} -\newcommand*{\LecSubTitle}[1]{\setkeys{lec}{subtitle=#1}} +\newcommand*{\LecTitle}[2][]{\setkeys{lec}{shorttitle={#2},#1,title={#2}}} +\newcommand*{\LecTitleSep}[1]{\setkeys{lec}{titlesep={#1}}} +\newcommand*{\LecSubTitle}[1]{\setkeys{lec}{subtitle={#1}}} \newcommand*{\LecYear}[2]{\setkeys{lec}{lecsem=#1,year=#2}} -\newcommand*{\LecUni}[1]{\setkeys{lec}{uni=#1}} -\newcommand*{\LecInstitute}[1]{\setkeys{lec}{institute=#1}} -\newcommand*{\LecRoom}[1]{\setkeys{lec}{room=#1}} +\newcommand*{\LecUni}[1]{\setkeys{lec}{uni={#1}}} +\newcommand*{\LecInstitute}[1]{\setkeys{lec}{institute={#1}}} +\newcommand*{\LecRoom}[1]{\setkeys{lec}{room={#1}}} \newcommand*{\LecStartDate}[1]{\setkeys{lec}{startdate=#1}} -\newcommand*{\LecInstructor}[1]{\setkeys{lec}{instructor=#1}} +\newcommand*{\LecInstructor}[2][\empty]{% + \ifx#1\empty + \setkeys{lec}{instructor={#2}}% + \else + \setkeys{lec}{instructor={#2},shortinstructor={#1}}% + \fi +} \newcommand*{\LecInterval}[1]{\setkeys{lec}{interval=#1}} +\newcommand*{\SessionTitleSep}[1]{\setkeys{lec}{sestitlesep=#1}} % @@ -280,12 +311,25 @@ % -% CUSTOM DATE FORMATS (via datetime) +% CUSTOM DATE FORMATS (via datetime2) % -\newcommand*\lecdateformat{\THEDAY.\,\twodigit{\THEMONTH}.\,\THEYEAR} -\newcommand*\lecdateshortformat{\THEDAY.\,\twodigit{\THEMONTH}.} -\newdateformat{vldate}{\lecdateformat} -\newdateformat{vlshdate}{\lecdateshortformat} + +\DTMnewdatestyle{lecdate}{% long date: DD.\,MM.~YYYY + \renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.~##1}% + \renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}% +} + +\DTMnewdatestyle{lecshortdate}{% short date: DD.\,MM. + \renewcommand*{\DTMdisplaydate}[4]{\DTMtwodigits{##3}.\,\DTMtwodigits{##2}.}% + \renewcommand*{\DTMDisplaydate}{\DTMdisplaydate}% +} + + +% Internal macro to set the date to a given value +% Code adapted from advdate.sty +\newcommand\jslp@SetDate[1][\s@v@dT@d@y]{\edef\d@t@{#1}% + \expandafter\t@d@y\d@t@\t@d@y} +\def\t@d@y#1/#2/#3\t@d@y{\day#1 \month#2 \year#3 \relax} % @@ -511,13 +555,18 @@ % 1) Session definition % -\define@key{session}{titlesep}{\csdef{@sestitlesep}{#1}} -\define@key{session}{subtitle}{\csdef{@vasutitle}{#1}} -\define@key{session}{shorttitle}{\csdef{@vashorttitle}{#1}} +\newtoggle{shortinstrdef} +\define@key{session}{titlesep}{\csdef{@sestitlesep}{{#1}}} +\define@key{session}{subtitle}{\csdef{@sessubtitle}{{#1}}} +\define@key{session}{shorttitle}{\csdef{@sesshorttitle}{{#1}}\csdef{@usesshorttitle}{{#1}}} \define@key{session}{bibsec}{\csdef{@sesbibsec}{#1}} -\define@key{session}{room}{\csdef{@sesroom}{#1}} -\define@key{session}{instructor}{\csdef{@sesinstructor}{#1}} -\define@key{session}{presstudents}{\csdef{@sespresstudents}{#1}} +\define@key{session}{room}{\csdef{@sesroom}{{#1}}} +\define@key{session}{instructor}{% + \csdef{@sesinstructor}{{#1}}\csdef{@usesinstructor}{{#1}}% + \iftoggle{shortinstrdef}{}{\csdef{@sesshortinstructor}{{#1}}\csdef{@usesshortinstructor}{{#1}}}} +\define@key{session}{shortinstructor}{% + \csdef{@sesshortinstructor}{{#1}}\csdef{@usesshortinstructor}{{#1}}\toggletrue{shortinstrdef}} +\define@key{session}{presstudents}{\csdef{@sespresstudents}{{#1}}} \define@boolkey{session}{cancel}[true]{} % \newcommand*\NewSession[2][]{% @@ -531,45 +580,54 @@ \setcounter{dateratio}{(\thesesunit-1)*\thelecinterval+\thesesoffset} \setcounter{snum}{\thesesunit-\thecancellations} \protected@csxdef{sesnr\thesnum}{\thesnum} - \csdef{@sestitlesep}{} - \csdef{@vasutitle}{} - \csdef{@vashorttitle}{} + \togglefalse{shortinstrdef} + \csdef{@sestitlesep}{\sestitlesep} + \csdef{@sessubtitle}{} + \csdef{@sesshorttitle}{#2} + \csdef{@usesshorttitle}{} \csdef{@sesbibsec}{} \csdef{@sesroom}{\lecroom} \csdef{@sesinstructor}{\lecinstructor} + \csdef{@sesshortinstructor}{\lecshortinstructor} + \csdef{@usesinstructor}{} + \csdef{@usesshortinstructor}{} \csdef{@sespresstudents}{} \setkeys{session}{cancel=false} \setkeys{session}{#1} \csdef{@sestitle}{#2} \protected@csxdef{sesdate\thesnum}{% - \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi% - \AdvanceDate[\thedateratio]\vldate\today\egroup} + \bgroup\ifx\lecstartdate\empty\else\jslp@SetDate[\lecstartdate]\fi% + \DTMsetdatestyle{lecdate}\DTMdate{\year-\month-\day+\thedateratio}\egroup} \protected@csxdef{sesshortdate\thesnum}{% - \bgroup\ifx\lecstartdate\empty\else\SetDate[\lecstartdate]\fi% - \AdvanceDate[\thedateratio]\vlshdate\today\egroup} + \bgroup\ifx\lecstartdate\empty\else\jslp@SetDate[\lecstartdate]\fi% + \DTMsetdatestyle{lecshortdate}\DTMdate{\year-\month-\day+\thedateratio}\egroup} \protected@csxdef{sestitle\thesnum}{\csuse{@sestitle}\ifcsempty{@sestitle}{\strut}{}} \protected@csxdef{sestitlesep\thesnum}{\csuse{@sestitlesep}} - \protected@csxdef{sessubtitle\thesnum}{\csuse{@vasutitle}} - \protected@csxdef{sesshorttitle\thesnum}{\csuse{@vashorttitle}} + \protected@csxdef{sessubtitle\thesnum}{\csuse{@sessubtitle}} + \protected@csxdef{sesshorttitle\thesnum}{\csuse{@sesshorttitle}} + \protected@csxdef{usesshorttitle\thesnum}{\csuse{@usesshorttitle}} \protected@csxdef{sesbib\thesnum}{\csuse{@sesbibsec}} \protected@csxdef{sesroom\thesnum}{\csuse{@sesroom}} \protected@csxdef{sesinstructor\thesnum}{\csuse{@sesinstructor}} + \protected@csxdef{sesshortinstructor\thesnum}{\csuse{@sesshortinstructor}} + \protected@csxdef{usesinstructor\thesnum}{\csuse{@usesinstructor}} + \protected@csxdef{usesshortinstructor\thesnum}{\csuse{@usesshortinstructor}} \protected@csxdef{sespresstudents\thesnum}{\csuse{@sespresstudents}} \ifKV@session@cancel \stepcounter{cancellations} \protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% - \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}% + \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}% \noexpand\leccancel\noexpand\egroup} \protected@eappto\programlistbeamer{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% - \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}% + \noexpand\bgroup\noexpand\bfseries\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}% \noexpand\leccancel\noexpand\egroup} \else \protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% - \csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}} + \csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}} \protected@eappto\programlistbeamer{\noexpand\item[{\noexpand\bfseries\csuse{sesshortdate\thesnum}}]% - \csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}} + \csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}} \ifcsempty{sesbib\thesnum}{}{% - \xappto\jsbiblist{\noexpand\section{\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@vasutitle}}% + \xappto\jsbiblist{\noexpand\section{\csuse{sestitle\thesnum}\csuse{@sestitlesep}\csuse{@sessubtitle}}% \noexpand\nocite{*}% \noexpand\printbibliography[keyword=\csuse{sesbib\thesnum},heading=none]}% }% @@ -605,8 +663,8 @@ \setkeys{break}{units=#1}% } \newcommand*\SetBreaks[2][units=1]{% - \csdef{@breakunits}{\empty} - \csdef{@breakspan}{\empty} + \csdef{@breakunits}{} + \csdef{@breakspan}{} \setkeys{break}{#1} \setcounter{breakunits}{\csuse{@breakunits}} \setcounter{sesunit}{\thesesunit+\thebreakunits} @@ -621,13 +679,13 @@ }{} \stepcounter{loopcounter} \repeat - \ifx\empty\csuse{@breakspan} + \ifcsempty{@breakspan}{% \protected@eappto\programlist{\noexpand\begin{center} (#2) \noexpand\end{center}} \protected@eappto\programlistbeamer{\noexpand\begin{center} (#2) \noexpand\end{center}} - \else + }{% \protected@eappto\programlist{\noexpand\begin{center} (\csuse{@breakspan}: #2) \noexpand\end{center}} \protected@eappto\programlistbeamer{\noexpand\begin{center} (\csuse{@breakspan}: #2) \noexpand\end{center}} - \fi + } } % Offset in days @@ -783,10 +841,29 @@ \gdef\sestitle{\csuse{sestitle#1}}% \gdef\sestitlesep{\csuse{sestitlesep#1}}% \gdef\sesshorttitle{\csuse{sesshorttitle#1}}% + \gdef\@usesshorttitle{\csuse{usesshorttitle#1}}% \gdef\sessubtitle{\csuse{sessubtitle#1}}% \gdef\sesroom{\csuse{sesroom#1}}% - \gdef\sesinstructor{\csuse{sesinstructor#1}}% + \gdef\@sesinstructor{\csuse{sesinstructor#1}}% + \gdef\@sesshortinstructor{\csuse{sesshortinstructor#1}}% + \gdef\@usesinstructor{\csuse{usesinstructor#1}}% + \gdef\@usesshortinstructor{\csuse{usesshortinstructor#1}}% \gdef\sespresstudents{\csuse{sespresstudents#1}}% + \if\hfuzz\@usesinstructor\hfuzz% + \global\togglefalse{uniquesesinstructor}% + \else + \global\toggletrue{uniquesesinstructor}% + \fi + \if\hfuzz\@usesshortinstructor\hfuzz% + \global\togglefalse{uniquesesshortinstructor}% + \else + \global\toggletrue{uniquesesshortinstructor}% + \fi + \if\hfuzz\@usesshorttitle\hfuzz% + \global\togglefalse{uniquesesshorttitle}% + \else + \global\toggletrue{uniquesesshorttitle}% + \fi } % Define a local session @@ -800,10 +877,22 @@ \gdef\lsesshorttitle{\csuse{sesshorttitle#1}}% \gdef\lsessubtitle{\csuse{sessubtitle#1}}% \gdef\lsesroom{\csuse{sesroom#1}}% - \gdef\lsesinstructor{\csuse{sesinstructor#1}}% + \gdef\@lsesinstructor{\csuse{sesinstructor#1}}% + \gdef\@lsesshortinstructor{\csuse{sesshortinstructor#1}}% + \gdef\@lusesinstructor{\csuse{usesinstructor#1}}% + \gdef\@lusesshortinstructor{\csuse{usesshortinstructor#1}}% \gdef\lsespresstudents{\csuse{sespresstudents#1}}% } +% \ses[short]instructor and \ses[short]instructor*. +% The starred versions only output something if the session +% instructor differs from the general lecture instructor +\newcommand\sesinstructor{\@ifstar{\@usesinstructor}{\@sesinstructor}} +\newcommand\sesshortinstructor{\@ifstar{\@usesshortinstructor}{\@sesshortinstructor}} +% same for local instructor macros +\newcommand\lsesinstructor{\@ifstar{\@lusesinstructor}{\@lsesinstructor}} +\newcommand\lsesshortinstructor{\@ifstar{\@lusesshortinstructor}{\@lsesshortinstructor}} + % Get information for a specific (local) session % % Full title @@ -842,12 +931,40 @@ \lsesroom% } -% Instructor -\newcommand*\SessionInstructor[1]{% +% Instructor relay +\newcommand*\SessionInstructor{% + \@ifstar{\@@SessionInstructor}{\@SessionInstructor}% +} + +% Instructor, unstarred +\newcommand*\@SessionInstructor[1]{% \LocalSession{#1}% \lsesinstructor% } +% Instructor, starred +\newcommand*\@@SessionInstructor[1]{% + \LocalSession{#1}% + \lsesinstructor*% +} + +% Instructor (Short Form) relay +\newcommand*\SessionShortInstructor{% + \@ifstar{\@@SessionShortInstructor}{\@SessionShortInstructor}% +} + +% Instructor (Short Form), unstarred +\newcommand*\@SessionShortInstructor[1]{% + \LocalSession{#1}% + \lsesshortinstructor% +} + +% Instructor (Short Form), starred +\newcommand*\@@SessionShortInstructor[1]{% + \LocalSession{#1}% + \lsesshortinstructor*% +} + % Presenting students \newcommand*\SessionPresStudents[1]{% \LocalSession{#1}% @@ -906,13 +1023,42 @@ \SessionRoom{\theadjsession}% \fi } -% Instructor -\newcommand*\AdjSessionInstructor[1][1]{% +% Instructor relay +\newcommand*\AdjSessionInstructor{% + \@ifstar{\@@AdjSessionInstructor}{\@AdjSessionInstructor}% +} +% Instructor, unstarred +\newcommand*\@AdjSessionInstructor[1][1]{% \ifnum0<0\sesnr\relax \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% \SessionInstructor{\theadjsession}% \fi } +% Instructor, starred +\newcommand*\@@AdjSessionInstructor[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionInstructor*{\theadjsession}% + \fi +} +% Instructor (Short Form) relay +\newcommand*\AdjSessionShortInstructor{% + \@ifstar{\@@AdjSessionShortInstructor}{\@AdjSessionShortInstructor}% +} +% Instructor (Short Form), unstarred +\newcommand*\@AdjSessionShortInstructor[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionShortInstructor{\theadjsession}% + \fi +} +% Instructor (Short Form), starred +\newcommand*\@@AdjSessionShortInstructor[1][1]{% + \ifnum0<0\sesnr\relax + \setcounter{adjsession}{\numexpr\sesnr+#1\relax}% + \SessionShortInstructor*{\theadjsession}% + \fi +} % Presenting students \newcommand*\AdjSessionPresStudents[1][1]{% \ifnum0<0\sesnr\relax @@ -923,6 +1069,10 @@ % %%%%%%%%%%%%% +% +% DEPRECATED THINGS +% + % Reset to today % DEPRECATED as of v.0.8, \newcommand*\ResetDate{% @@ -930,4 +1080,22 @@ \protect\ResetDate\space is deprecated (not needed anymore).}% } +% datetime (v.1) date formats +% DEPRECATED as of v.1.3 +% Issue a warning if redefined. +\newcommand*\lecdateformat{} +\newcommand*\lecdateshortformat{} +\AtEndPreamble{% + \ifcsempty{lecdateformat}{}{ + \PackageWarning{jslectureplanner}{\protect\lecdateformat\space is deprecated and non-functional.\MessageBreak + Please refer to the manual for the new way of customizing date output. + } + } + \ifcsempty{lecdateshortformat}{}{ + \PackageWarning{jslectureplanner}{\protect\lecdateshortformat\space is deprecated and non-functional.\MessageBreak + Please refer to the manual for the new way of customizing date output. + } + } +} + % Finis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/jsmembertable.sty new/tex/latex/jslectureplanner/jsmembertable.sty --- old/tex/latex/jslectureplanner/jsmembertable.sty 2015-07-18 00:42:45.000000000 +0200 +++ new/tex/latex/jslectureplanner/jsmembertable.sty 2017-03-12 23:01:15.000000000 +0100 @@ -24,8 +24,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\filedate{2015/07/15} -\def\fileversion{1.1} +\def\filedate{2017/03/12} +\def\fileversion{1.5} \def\filename{jsmembertable.sty} \NeedsTeXFormat{LaTeX2e} @@ -54,6 +54,11 @@ \@datatooltrue } \DeclareOptionX{datafile}{\setkeys{mem}{datafile=#1}} +\def\jsmt@datakeys{pname,sname,mid,email} +\define@key{mem}{datakeys}{% + \def\jsmt@datakeys{#1} +} +\DeclareOptionX{datakeys}{\setkeys{mem}{datakeys={#1}}} \ProcessOptionsX % @@ -63,8 +68,8 @@ % Load datatool if necessary \if@datatool \RequirePackage{datatool} - \DTLloadrawdb[noheader,keys={fname,sname,mid,email}]{data}{\jsmt@datafile} - \dtlsort{sname,fname}{data}{\dtlicompare} + \DTLloadrawdb[noheader,keys={\jsmt@datakeys}]{data}{\jsmt@datafile} + \dtlsort{sname,pname}{data}{\dtlicompare} \fi % @@ -194,7 +199,7 @@ \endhead \if@datatool \DTLforeach*{data}{% - \jsmt@firstname=fname,\jsmt@surname=sname,\jsmt@mid=mid,\jsmt@email=email}{% + \jsmt@firstname=pname,\jsmt@surname=sname,\jsmt@mid=mid,\jsmt@email=email}{% \DTLiffirstrow{}{\tabularnewline\hline}% \getmembernr & \jsmt@mid & \jsmt@surname, \jsmt@firstname & \jsmt@email% }% @@ -646,7 +651,7 @@ \endhead \if@datatool% \DTLforeach*{data}{% - \jsmt@firstname=fname,\jsmt@surname=sname}{% + \jsmt@firstname=pname,\jsmt@surname=sname}{% \DTLiffirstrow{}{\tabularnewline\hline}% \bodyrowone{\jsmt@surname, \jsmt@firstname}% }% @@ -681,7 +686,7 @@ \endhead \if@datatool \DTLforeach*{data}{% - \jsmt@firstname=fname,\jsmt@surname=sname}{% + \jsmt@firstname=pname,\jsmt@surname=sname}{% \DTLiffirstrow{}{\tabularnewline\hline}% \bodyrowtwo{\jsmt@surname, \jsmt@firstname}% }% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jslectureplanner.tlpobj new/tlpkg/tlpobj/jslectureplanner.tlpobj --- old/tlpkg/tlpobj/jslectureplanner.tlpobj 2016-05-12 03:18:22.000000000 +0200 +++ new/tlpkg/tlpobj/jslectureplanner.tlpobj 2017-04-14 17:45:06.000000000 +0200 @@ -1,6 +1,6 @@ name jslectureplanner category Package -revision 41043 +revision 43476 shortdesc Creation and management of university course material relocated 1 longdesc The jslectureplanner package facilitates the generation and @@ -11,14 +11,15 @@ longdesc generate course programs, if the course is held weekly and the longdesc date of the first lecture is specified. Moreover, the package longdesc can be used to generate a sectioned course bibliography via -longdesc biblatex. -runfiles size=15 +longdesc BibLaTeX. +runfiles size=17 RELOC/tex/latex/jslectureplanner/cologne.lps + RELOC/tex/latex/jslectureplanner/english.lps RELOC/tex/latex/jslectureplanner/german-default.lps RELOC/tex/latex/jslectureplanner/jslectureplanner.sty RELOC/tex/latex/jslectureplanner/jsmembertable.sty catalogue-ctan /macros/latex/contrib/jslectureplanner -catalogue-date 2016-05-11 21:02:45 +0200 +catalogue-date 2017-03-12 11:30:18 +0100 catalogue-license lppl1.3 catalogue-topics teaching -catalogue-version 1.2 +catalogue-version 1.5 ++++++ jumplines.doc.tar.xz ++++++ ++++++ jumplines.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jumplines.tlpobj new/tlpkg/tlpobj/jumplines.tlpobj --- old/tlpkg/tlpobj/jumplines.tlpobj 2016-04-14 19:12:11.000000000 +0200 +++ new/tlpkg/tlpobj/jumplines.tlpobj 2017-04-14 17:45:06.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/latex/jumplines/jumplines.sty catalogue-ctan /macros/latex/contrib/jumplines -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics luatex journalpub catalogue-version 0.2 ++++++ junicode.doc.tar.xz ++++++ ++++++ junicode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/junicode.tlpobj new/tlpkg/tlpobj/junicode.tlpobj --- old/tlpkg/tlpobj/junicode.tlpobj 2016-04-14 19:12:11.000000000 +0200 +++ new/tlpkg/tlpobj/junicode.tlpobj 2017-04-14 17:45:06.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/fonts/truetype/public/junicode/Junicode.ttf RELOC/tex/latex/junicode/mt-Junicode.cfg catalogue-ctan /fonts/junicode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-ttf font-historical catalogue-version 0.7.7 ++++++ jura.doc.tar.xz ++++++ ++++++ jura.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jura.tlpobj new/tlpkg/tlpobj/jura.tlpobj --- old/tlpkg/tlpobj/jura.tlpobj 2016-04-14 19:12:15.000000000 +0200 +++ new/tlpkg/tlpobj/jura.tlpobj 2017-04-14 17:45:08.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/jura/jura.cls catalogue-also juramisc alnumsec jurabib catalogue-ctan /macros/latex/contrib/jura -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics dissertation legal german class catalogue-version 4.3 ++++++ juraabbrev.doc.tar.xz ++++++ ++++++ juraabbrev.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/juraabbrev.tlpobj new/tlpkg/tlpobj/juraabbrev.tlpobj --- old/tlpkg/tlpobj/juraabbrev.tlpobj 2016-04-14 19:12:15.000000000 +0200 +++ new/tlpkg/tlpobj/juraabbrev.tlpobj 2017-04-14 17:45:08.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/juraabbrev/juraabbrev.sty catalogue-also jurarsp catalogue-ctan /macros/latex/contrib/juraabbrev -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics legal german ++++++ jurabib.doc.tar.xz ++++++ ++++++ jurabib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jurabib.tlpobj new/tlpkg/tlpobj/jurabib.tlpobj --- old/tlpkg/tlpobj/jurabib.tlpobj 2016-04-14 19:12:16.000000000 +0200 +++ new/tlpkg/tlpobj/jurabib.tlpobj 2017-04-14 17:45:08.000000000 +0200 @@ -41,7 +41,7 @@ RELOC/tex/latex/jurabib/spjbbib.ldf catalogue-also jura juramisc alphanum alnumsec catalogue-ctan /macros/latex/contrib/jurabib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-supp catalogue-version 0.6 ++++++ juramisc.doc.tar.xz ++++++ ++++++ juramisc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/juramisc.tlpobj new/tlpkg/tlpobj/juramisc.tlpobj --- old/tlpkg/tlpobj/juramisc.tlpobj 2016-04-14 19:12:18.000000000 +0200 +++ new/tlpkg/tlpobj/juramisc.tlpobj 2017-04-14 17:45:09.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/juramisc/juraurtl.cls catalogue-also jura alphanum alnumsec jurabib catalogue-ctan /macros/latex/contrib/juramisc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics legal book-pub class german catalogue-version 0.91 ++++++ jurarsp.doc.tar.xz ++++++ ++++++ jurarsp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jurarsp.tlpobj new/tlpkg/tlpobj/jurarsp.tlpobj --- old/tlpkg/tlpobj/jurarsp.tlpobj 2016-04-14 19:12:18.000000000 +0200 +++ new/tlpkg/tlpobj/jurarsp.tlpobj 2017-04-14 17:45:09.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/jurarsp/jurarsp.sty catalogue-also juraabbrev catalogue-ctan /macros/latex/contrib/jurarsp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-supp legal german catalogue-version 0.52 ++++++ jvlisting.doc.tar.xz ++++++ ++++++ jvlisting.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jvlisting.tlpobj new/tlpkg/tlpobj/jvlisting.tlpobj --- old/tlpkg/tlpobj/jvlisting.tlpobj 2016-04-14 19:12:19.000000000 +0200 +++ new/tlpkg/tlpobj/jvlisting.tlpobj 2017-04-14 17:45:09.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/jvlisting/jvlisting.sty catalogue-also verbatim catalogue-ctan /macros/latex/contrib/jvlisting -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics listing catalogue-version 0.7 ++++++ kantlipsum.doc.tar.xz ++++++ ++++++ kantlipsum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kantlipsum.tlpobj new/tlpkg/tlpobj/kantlipsum.tlpobj --- old/tlpkg/tlpobj/kantlipsum.tlpobj 2016-04-14 19:12:19.000000000 +0200 +++ new/tlpkg/tlpobj/kantlipsum.tlpobj 2017-04-14 17:45:10.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/kantlipsum/kantlipsum.sty catalogue-also blindtext catalogue-ctan /macros/latex/contrib/kantlipsum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp dummy-gen catalogue-version 0.6 ++++++ karnaugh.doc.tar.xz ++++++ ++++++ karnaugh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/karnaugh.tlpobj new/tlpkg/tlpobj/karnaugh.tlpobj --- old/tlpkg/tlpobj/karnaugh.tlpobj 2016-04-14 19:12:20.000000000 +0200 +++ new/tlpkg/tlpobj/karnaugh.tlpobj 2017-04-14 17:45:10.000000000 +0200 @@ -10,8 +10,8 @@ longdesc and Veitch-Charts with up to ten variables (=1024 entries). runfiles size=5 RELOC/tex/latex/karnaugh/kvmacros.tex -catalogue-also askmaps karnaughmap +catalogue-also askmaps karnaughmap karnaugh-map catalogue-ctan /macros/latex/contrib/karnaugh -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-25 19:23:56 +0100 catalogue-license lppl1 catalogue-topics engineering maths ++++++ karnaughmap.doc.tar.xz ++++++ ++++++ karnaughmap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/karnaughmap.tlpobj new/tlpkg/tlpobj/karnaughmap.tlpobj --- old/tlpkg/tlpobj/karnaughmap.tlpobj 2016-04-14 19:12:20.000000000 +0200 +++ new/tlpkg/tlpobj/karnaughmap.tlpobj 2017-04-14 17:45:10.000000000 +0200 @@ -9,9 +9,9 @@ longdesc karnaughmaps and a proper LaTeX package. runfiles size=6 RELOC/tex/latex/karnaughmap/karnaughmap.sty -catalogue-also karnaugh +catalogue-also karnaugh karnaugh-map catalogue-ctan /graphics/pgf/contrib/karnaughmap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-25 19:28:19 +0100 catalogue-license lppl1.2 catalogue-topics engineering maths pgf-tikz catalogue-version 2.0 ++++++ kastrup.doc.tar.xz ++++++ ++++++ kastrup.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kastrup.tlpobj new/tlpkg/tlpobj/kastrup.tlpobj --- old/tlpkg/tlpobj/kastrup.tlpobj 2016-04-14 19:12:20.000000000 +0200 +++ new/tlpkg/tlpobj/kastrup.tlpobj 2017-04-14 17:45:10.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/generic/kastrup/binhex.tex catalogue-ctan /macros/generic/kastrup -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics numbers ++++++ kdgdocs.doc.tar.xz ++++++ ++++++ kdgdocs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kdgdocs.tlpobj new/tlpkg/tlpobj/kdgdocs.tlpobj --- old/tlpkg/tlpobj/kdgdocs.tlpobj 2016-04-14 19:12:21.000000000 +0200 +++ new/tlpkg/tlpobj/kdgdocs.tlpobj 2017-04-14 17:45:10.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/kdgdocs/kdgcoursetext.cls RELOC/tex/latex/kdgdocs/kdgmasterthesis.cls catalogue-ctan /macros/latex/contrib/kdgdocs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class catalogue-version 1.0 ++++++ kerkis.doc.tar.xz ++++++ ++++++ kerkis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kerkis.tlpobj new/tlpkg/tlpobj/kerkis.tlpobj --- old/tlpkg/tlpobj/kerkis.tlpobj 2016-04-14 19:12:21.000000000 +0200 +++ new/tlpkg/tlpobj/kerkis.tlpobj 2017-04-14 17:45:11.000000000 +0200 @@ -272,6 +272,6 @@ RELOC/tex/latex/kerkis/t1mak.fd RELOC/tex/latex/kerkis/t1maksf.fd catalogue-ctan /fonts/greek/kerkis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-greek font-maths font-type1 ++++++ kerntest.doc.tar.xz ++++++ ++++++ kerntest.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kerntest.tlpobj new/tlpkg/tlpobj/kerntest.tlpobj --- old/tlpkg/tlpobj/kerntest.tlpobj 2016-04-14 19:12:24.000000000 +0200 +++ new/tlpkg/tlpobj/kerntest.tlpobj 2017-04-14 17:45:12.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/latex/kerntest/t2bmtx.clo RELOC/tex/latex/kerntest/ts1mtx.clo catalogue-ctan /macros/latex/contrib/kerntest -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-devel catalogue-version 1.32 ++++++ keycommand.doc.tar.xz ++++++ ++++++ keycommand.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keycommand.tlpobj new/tlpkg/tlpobj/keycommand.tlpobj --- old/tlpkg/tlpobj/keycommand.tlpobj 2016-04-14 19:12:25.000000000 +0200 +++ new/tlpkg/tlpobj/keycommand.tlpobj 2017-04-14 17:45:12.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=5 RELOC/tex/latex/keycommand/keycommand.sty catalogue-ctan /macros/latex/contrib/keycommand -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics keyval catalogue-version 3.1415 ++++++ keyreader.doc.tar.xz ++++++ ++++++ keyreader.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyreader.tlpobj new/tlpkg/tlpobj/keyreader.tlpobj --- old/tlpkg/tlpobj/keyreader.tlpobj 2016-04-14 19:12:25.000000000 +0200 +++ new/tlpkg/tlpobj/keyreader.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=10 RELOC/tex/latex/keyreader/keyreader.sty catalogue-ctan /macros/latex/contrib/keyreader -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics keyval catalogue-version 0.5b ++++++ keystroke.doc.tar.xz ++++++ ++++++ keystroke.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keystroke.tlpobj new/tlpkg/tlpobj/keystroke.tlpobj --- old/tlpkg/tlpobj/keystroke.tlpobj 2016-04-14 19:12:25.000000000 +0200 +++ new/tlpkg/tlpobj/keystroke.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/keystroke/keystroke_right.eps RELOC/tex/latex/keystroke/keystroke_right.pdf catalogue-ctan /macros/latex/contrib/keystroke -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics doc-supp catalogue-version 1.6 ++++++ keyval2e.doc.tar.xz ++++++ ++++++ keyval2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyval2e.tlpobj new/tlpkg/tlpobj/keyval2e.tlpobj --- old/tlpkg/tlpobj/keyval2e.tlpobj 2016-04-14 19:12:26.000000000 +0200 +++ new/tlpkg/tlpobj/keyval2e.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/keyval2e/keyval2e.sty catalogue-ctan /macros/latex/contrib/keyval2e -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics keyval catalogue-version 0.0.2 ++++++ keyvaltable.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/keyvaltable/README.md new/doc/latex/keyvaltable/README.md --- old/doc/latex/keyvaltable/README.md 2016-03-19 23:14:15.000000000 +0100 +++ new/doc/latex/keyvaltable/README.md 2016-11-25 19:29:14.000000000 +0100 @@ -1,11 +1,11 @@ -The keyvaltable package +The keyvaltable Package ======================= Copyright (C) 2016 Richard Gay Released under the [LaTeX Project Public License](http://www.latex-project.org/lppl/) version 1.2 or later -# Purpose +## Purpose The main goal of the `keyvaltable` package is to offer means for typesetting tables easily and yet still looking rather nicely in a way @@ -15,13 +15,15 @@ a previously defined column layout and whose rows can be produced in a key-value fashion. -# Availability +## Availability -The `keyvaltable` package is currently in the process of being uploaded to CTAN, -such that the package can become available in popular LaTeX -distributions like TeXlive and MikTeX. +The `keyvaltable` package is on [CTAN](http://www.ctan.org/pkg/keyvaltable), +where you can also find the [documentation](http://mirrors.ctan.org/macros/latex/contrib/keyvaltable/key…, +as well as on [github](https://github.com/Ri-Ga/keyvaltable). +Since March 2016, `keyvaltable` is part of TeX Live (package `texlive-latex-extra`) and +is included in [MiKTeX](http://miktex.org/packages/keyvaltable). -# Manual Installation +## Manual Installation The `keyvaltable` package comes with (at least) the following files * keyvaltable.ins @@ -46,7 +48,7 @@ Read the documentation of your LaTeX system to find out where this might be. -# Building Documentation +## Building Documentation To build the documentation of the `keyvaltable` package, you additionally need the following classes and packages (including their dependencies) @@ -81,4 +83,3 @@ ``` Happy TeX'ing - Binary files old/doc/latex/keyvaltable/keyvaltable.pdf and new/doc/latex/keyvaltable/keyvaltable.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyvaltable.doc.tlpobj new/tlpkg/tlpobj/keyvaltable.doc.tlpobj --- old/tlpkg/tlpobj/keyvaltable.doc.tlpobj 2016-04-14 19:12:26.000000000 +0200 +++ new/tlpkg/tlpobj/keyvaltable.doc.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -1,8 +1,8 @@ name keyvaltable.doc category Package -revision 40079 +revision 41414 shortdesc doc files of keyvaltable relocated 1 -docfiles size=76 +docfiles size=79 RELOC/doc/latex/keyvaltable/README.md RELOC/doc/latex/keyvaltable/keyvaltable.pdf ++++++ keyvaltable.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/keyvaltable/keyvaltable.sty new/tex/latex/keyvaltable/keyvaltable.sty --- old/tex/latex/keyvaltable/keyvaltable.sty 2016-03-19 23:14:15.000000000 +0100 +++ new/tex/latex/keyvaltable/keyvaltable.sty 2016-11-25 19:33:52.000000000 +0100 @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{keyvaltable} - [2016/03/13 v0.1 Package for filling tables using key-value lists] + [2016/05/22 v0.2 Package for filling tables using key-value lists] \RequirePackage{etoolbox} \RequirePackage{xkeyval} \RequirePackage[table]{xcolor} @@ -38,8 +38,14 @@ \kvt@lazypreset{Table}{#1=##1}}% \presetkeys[kvt]{defaults}{#1=#2}{}% \define@cmdkey[kvt]{Table}{#1}{}% - \presetkeys[kvt]{Table}{#1=#2}{}% -} + \presetkeys[kvt]{Table}{#1=#2}{}} +\newcommand\kvt@addchoicetableprop[3]{% + \define@choicekey[kvt]{defaults}{#1}{#3}{% + \kvt@lazypreset{Table}{#1=##1}}% + \presetkeys[kvt]{defaults}{#1=#2}{}% + \define@choicekey[kvt]{Table}{#1}{#3}% + {\csdef{cmdkvt@Table@#1}{##1}}% + \presetkeys[kvt]{Table}{#1=#2}{}} \newcommand\kvt@addcolumnprop[2]{% \define@key[kvt]{defaults}{#1}{% \kvt@lazypreset{Column}{#1=##1}}% @@ -58,6 +64,7 @@ } \kvt@addtableprop{rowbg}{white..black!10} \kvt@addtableprop{headbg}{black!14} +\kvt@addchoicetableprop{shape}{multipage}{multipage,onepage} \kvt@addcolumnprop{default}{} \kvt@addcolumnprop{format}{\kvt@struttedcell} \kvt@addcolumnprop{align}{l} @@ -65,16 +72,17 @@ \kvt@addchoicecolumnprop{hidden}{false}{false,true} \kvtSet{} \newcommand\kvt@struttedcell[1]{\strut #1\strut} -\newcommand\NewKeyValTable[2]{% - \csdef{kvt@headings@#1}{}% - \csdef{kvt@alignments@#1}{}% - \csdef{kvt@colkeys@#1}{}% - \csdef{kvt@rowcount@#1}{1}% - \csdef{kvt@rows@#1}{}% - \listadd\kvt@alltables{#1}% +\newcommand\NewKeyValTable[3][]{% + \csdef{kvt@options@#2}{#1}% + \csdef{kvt@headings@#2}{}% + \csdef{kvt@alignments@#2}{}% + \csdef{kvt@colkeys@#2}{}% + \csdef{kvt@rowcount@#2}{1}% + \csdef{kvt@rows@#2}{}% + \listadd\kvt@alltables{#2}% \def\do##1{% - \kvt@parsecolspec{#1}##1::\@undefined}% - \mkv@dossvlist{#2}% + \kvt@parsecolspec{#2}##1::\@undefined}% + \mkv@dossvlist{#3}% } \def\kvt@parsecolspec#1#2:#3:#4\@undefined{% \def\kvt@@column{#1@#2}% @@ -95,33 +103,54 @@ \newcounter{kvtTypeRow} \newcounter{kvtTotalRow} \setcounter{kvtTotalRow}{1} +\newcommand\kvtLabel[2]{% + \protected@edef\@currentlabel + {\csname p@#1\endcsname\csname the#1\endcsname}% + \ifstrempty{#2}{}{\label{#2}}% + \csuse{the#1}} \newenvironment{KeyValTable}[2][]{% \bgroup% \def\Row##1{\kvt@AddKeyValRow{#2}{##1}\kvt@@row\\}% - \kvt@StartTable{#2}{#1}% - }{% - \bottomrule% - \end{longtabu}\egroup} + \kvt@SetOptions{#2}{#1}% + \csuse{kvt@StartTable@\cmdkvt@Table@shape}{#2}% +}{% + \csuse{kvt@EndTable@\cmdkvt@Table@shape}% + \egroup} \AfterEndEnvironment{KeyValTable}{% \csdef{kvt@rowcount@\kvt@@recenttable}{\thekvtTypeRow}} -\newcommand\kvt@StartTable[2]{% - \setkeys[kvt]{Table}{#2}% - \gdef\kvt@@recenttable{#1}% +\newcommand\kvt@SetOptions[2]{% + \bgroup\edef\kvt@@do{\egroup\noexpand% + \setkeys[kvt]{Table}% + {\csexpandonce{kvt@options@#1},\unexpanded{#2}}% + }\kvt@@do} +\newcommand\kvt@StartTable@onepage[1]{% + \kvt@StartTabu{tabu}{#1}} +\newcommand\kvt@StartTable@multipage[1]{% + \kvt@StartTabu{longtabu}{#1}} +\newcommand\kvt@StartTabu[2]{% + \gdef\kvt@@recenttable{#2}% \bgroup\edef\kvt@@do{\egroup \noexpand\taburowcolors[2] 2{\cmdkvt@Table@rowbg}% - \noexpand\begin{longtabu}{\csuse{kvt@alignments@#1}}% + \noexpand\begin{#1}{\csuse{kvt@alignments@#2}}% \noexpand\toprule \noexpand\rowcolor{\cmdkvt@Table@headbg}% }\kvt@@do% - \csuse{kvt@headings@#1}\\\midrule\endhead + \csuse{kvt@headings@#2}\\\midrule + \iftabu@long\expandafter\endhead\fi \setcounter{kvtRow}{1}% - \setcounter{kvtTypeRow}{\csuse{kvt@rowcount@#1}}% + \setcounter{kvtTypeRow}{\csuse{kvt@rowcount@#2}}% \everyrow{% \addtocounter{kvtRow}{1}% \addtocounter{kvtTypeRow}{1}% \addtocounter{kvtTotalRow}{1}% }% } +\newcommand\kvt@EndTable@onepage{% + \bottomrule% + \end{tabu}} +\newcommand\kvt@EndTable@multipage{% + \bottomrule% + \end{longtabu}} \newcommand\kvt@AddKeyValRow[2]{% \setkeys[KeyValTable]{#1}{#2}% \def\do##1{% @@ -135,12 +164,9 @@ }\dolistcsloop{kvt@colkeys@#1}% } \newcommand\ShowKeyValTable[2][]{% - \bgroup - \kvt@StartTable{#2}{#1}% - \csuse{kvt@rows@#2}% - \bottomrule - \end{longtabu}% - \egroup + \begin{KeyValTable}[#1]{#2}% + \csuse{kvt@rows@#2}% + \end{KeyValTable}% \csdef{kvt@rows@#2}{}} \newcommand\AddKeyValRow[2]{% \bgroup% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyvaltable.tlpobj new/tlpkg/tlpobj/keyvaltable.tlpobj --- old/tlpkg/tlpobj/keyvaltable.tlpobj 2016-04-14 19:12:26.000000000 +0200 +++ new/tlpkg/tlpobj/keyvaltable.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -1,6 +1,6 @@ name keyvaltable category Package -revision 40079 +revision 41414 shortdesc Re-usable tables separating content and presentation relocated 1 longdesc The main goal of the keyvaltable package is to offer means for @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/keyvaltable/keyvaltable.sty catalogue-ctan /macros/latex/contrib/keyvaltable -catalogue-date 2016-03-21 05:56:19 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics table -catalogue-version 0.1 +catalogue-version 0.2 ++++++ kix.doc.tar.xz ++++++ ++++++ kix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kix.tlpobj new/tlpkg/tlpobj/kix.tlpobj --- old/tlpkg/tlpobj/kix.tlpobj 2016-04-14 19:12:26.000000000 +0200 +++ new/tlpkg/tlpobj/kix.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/kix/kix.sty catalogue-also pst-barcode kixfont catalogue-ctan /macros/latex/contrib/kix -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics barcode ++++++ kixfont.doc.tar.xz ++++++ ++++++ kixfont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kixfont.tlpobj new/tlpkg/tlpobj/kixfont.tlpobj --- old/tlpkg/tlpobj/kixfont.tlpobj 2016-04-14 19:12:26.000000000 +0200 +++ new/tlpkg/tlpobj/kixfont.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/fonts/tfm/public/kixfont/kix.tfm catalogue-also kix pst-barcode catalogue-ctan /fonts/kixfont -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics font font-mf font-specialist barcode ++++++ kluwer.doc.tar.xz ++++++ ++++++ kluwer.tar.xz ++++++ ++++++ knitting.doc.tar.xz ++++++ ++++++ knitting.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knitting.tlpobj new/tlpkg/tlpobj/knitting.tlpobj --- old/tlpkg/tlpobj/knitting.tlpobj 2016-04-14 19:12:27.000000000 +0200 +++ new/tlpkg/tlpobj/knitting.tlpobj 2017-04-14 17:45:13.000000000 +0200 @@ -83,7 +83,7 @@ RELOC/tex/plain/knitting/knitting.tex catalogue-also knittingpattern catalogue-ctan /fonts/knitting -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram font font-type1 font-mf catalogue-version 2.0 ++++++ knittingpattern.doc.tar.xz ++++++ ++++++ knittingpattern.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knittingpattern.tlpobj new/tlpkg/tlpobj/knittingpattern.tlpobj --- old/tlpkg/tlpobj/knittingpattern.tlpobj 2016-04-14 19:12:28.000000000 +0200 +++ new/tlpkg/tlpobj/knittingpattern.tlpobj 2017-04-14 17:45:14.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/knittingpattern/knittingpattern.cls catalogue-also knitting catalogue-ctan /macros/latex/contrib/knittingpattern -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram ++++++ knuth-lib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knuth-lib.tlpobj new/tlpkg/tlpobj/knuth-lib.tlpobj --- old/tlpkg/tlpobj/knuth-lib.tlpobj 2016-04-14 19:12:41.000000000 +0200 +++ new/tlpkg/tlpobj/knuth-lib.tlpobj 2017-04-14 17:45:20.000000000 +0200 @@ -3,9 +3,8 @@ revision 35820 shortdesc A small library of Metafont sources relocated 1 -longdesc A collection of miscellaneous Metafont source, including the -longdesc means to generate the logo font that is used for Metafont and -longdesc MetaPost. +longdesc The collection of core TeX and Metafont macro files from DEK, +longdesc including the plain format, plain base, and the MF logo fonts. runfiles size=47 RELOC/fonts/source/public/knuth-lib/3test.mf RELOC/fonts/source/public/knuth-lib/6test.mf @@ -38,6 +37,6 @@ RELOC/tex/plain/knuth-lib/testfont.tex RELOC/tex/plain/knuth-lib/webmac.tex catalogue-ctan /systems/knuth/dist/lib -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2017-01-28 13:27:32 +0100 catalogue-license knuth catalogue-topics collection ++++++ knuth-local.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knuth-local.tlpobj new/tlpkg/tlpobj/knuth-local.tlpobj --- old/tlpkg/tlpobj/knuth-local.tlpobj 2016-04-14 19:12:41.000000000 +0200 +++ new/tlpkg/tlpobj/knuth-local.tlpobj 2017-04-14 17:45:20.000000000 +0200 @@ -39,6 +39,6 @@ RELOC/mft/knuth-local/e.mft RELOC/tex/plain/knuth-local/xepsf.tex catalogue-ctan /systems/knuth/local -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-28 12:48:42 +0100 catalogue-license knuth catalogue-topics collection ++++++ knuth.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-m/knuth.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/knuth.doc.tar.xz differ: char 27, line 1 ++++++ knuthotherfonts.tar.xz ++++++ ++++++ koma-moderncvclassic.doc.tar.xz ++++++ ++++++ koma-moderncvclassic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/koma-moderncvclassic.tlpobj new/tlpkg/tlpobj/koma-moderncvclassic.tlpobj --- old/tlpkg/tlpobj/koma-moderncvclassic.tlpobj 2016-04-14 19:12:42.000000000 +0200 +++ new/tlpkg/tlpobj/koma-moderncvclassic.tlpobj 2017-04-14 17:45:20.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/koma-moderncvclassic/koma-moderncvclassic.sty catalogue-also moderncv koma-script catalogue-ctan /macros/latex/contrib/koma-moderncvclassic -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv catalogue-version 0.5 ++++++ koma-script-examples.doc.tar.xz ++++++ ++++++ koma-script-sfs.doc.tar.xz ++++++ ++++++ koma-script-sfs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/koma-script-sfs.tlpobj new/tlpkg/tlpobj/koma-script-sfs.tlpobj --- old/tlpkg/tlpobj/koma-script-sfs.tlpobj 2016-04-14 19:13:02.000000000 +0200 +++ new/tlpkg/tlpobj/koma-script-sfs.tlpobj 2017-04-14 17:45:28.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/koma-script-sfs/SFS.lco catalogue-ctan /macros/latex/contrib/koma-script-SFS -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter catalogue-version 1.0 ++++++ koma-script.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-m/koma-script.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/koma-script.tar.xz differ: char 26, line 1 ++++++ komacv.doc.tar.xz ++++++ Binary files old/doc/latex/komacv/examples/komacv_example.pdf and new/doc/latex/komacv/examples/komacv_example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/komacv/examples/komacv_example.tex new/doc/latex/komacv/examples/komacv_example.tex --- old/doc/latex/komacv/examples/komacv_example.tex 2014-08-07 23:48:31.000000000 +0200 +++ new/doc/latex/komacv/examples/komacv_example.tex 2017-04-18 00:26:24.000000000 +0200 @@ -1,15 +1,17 @@ %% start of file `komacv_example.tex'; shows exemplarily the use of the komacv class -%% (c) Copyright 2014 Salome Södergran (salome.soedergran(a)gmx.ch) +%% (c) Copyright 2014-2017 Salome Södergran (salome.soedergran(a)gmx.ch) %% %% Test the flexibility of the class komacv by removing (or adding) the comment signs and changing the values. These are preset not as recommendations of good style but to make the effect as clear as possible! %% \documentclass[% -xcolor=svgnames,% +% xcolor=svgnames,% % color=mycolor,% % DIV=19, -style=classic,% OR -% style=casual,% OR +% fontsize=20, +% style=classic,% (default) OR +% style=casual,% !! remove linebreak in facebook definition (see personal data); OR % style=oldstyle,% +% headline=name,% ]{komacv} \pagestyle{scrheadings} @@ -23,42 +25,43 @@ % =========================== % LENGTHS % =========================== -%\setlength\hintscolwidth{2cm} -%\setlength\sepcolwidth{1em} -%\setlength\quotewidth{.3\textwidth} -%\setlength\titlesepwidth{50pt} -%% \setlength\infocolwidth{6cm} % for oldstyle only! -%% \setlength\sepinfocolwidth{6em} % for oldstyle only! -%\setlength\footerwidth{.5\textwidth} % for casual style only -%\setlength\aftertitlevspace{5\baselineskip} -%\setlength\afterquotevspace{8\baselineskip} -%\setlength\afterelementsvspace{40pt} -%\setlength\beforesecvspace{3\baselineskip} -%\setlength\aftersecvspace{4\baselineskip} -%\setlength\beforesubsecvspace{3\baselineskip} -%\setlength\aftersubsecvspace{4\baselineskip} +% \setlength\titlenamemaxwidth{.4\textwidth} +% \setlength\hintscolwidth{2cm} +% \setlength\sepcolwidth{1em} +% \setlength\quotewidth{.3\textwidth} +% \setlength\titlesepwidth{50pt} +% \setlength\infocolwidth{6cm} % for oldstyle only! +% \setlength\sepinfocolwidth{6em} % for oldstyle only! +% \setlength\footerwidth{.5\textwidth} % for casual style only +% \setlength\aftertitlevspace{5\baselineskip} +% \setlength\afterquotevspace{8\baselineskip} +% \setlength\afterelementsvspace{40pt} +% \setlength\beforesecvspace{3\baselineskip} +% \setlength\aftersecvspace{4\baselineskip} +% \setlength\beforesubsecvspace{3\baselineskip} +% \setlength\aftersubsecvspace{4\baselineskip} +% \setlength\listitemsymbolwidth{1cm} + % =========================== % COLORS % =========================== -%\xdefinecolor{mycolor}{cmyk}{0.92,0,0.87,0.09} -%\colorlet{firstnamecolor}{blue} -%\colorlet{familynamecolor}{red} -%\colorlet{acadtitlecolor}{green} -%\colorlet{addresscolor}{gray} -%\colorlet{quotecolor}{pink} -%\colorlet{framecolor}{yellow} -%\colorlet{framebackcolor}{black} -%\colorlet{secbarcolor}{firstnamecolor} -%\colorlet{seccolor}{familynamecolor} -%\colorlet{subseccolor}{pink!70!black} -%\colorlet{hintcolor}{orange} +% \xdefinecolor{mycolor}{cmyk}{0.92,0,0.87,0.09} +% \colorlet{firstnamecolor}{blue} +% \colorlet{familynamecolor}{red} +% \colorlet{acadtitlecolor}{green} +% \colorlet{addresscolor}{gray} +% \colorlet{quotecolor}{pink} +% \colorlet{framecolor}{yellow} +% \colorlet{framebackcolor}{black} +% \colorlet{secbarcolor}{firstnamecolor} +% \colorlet{seccolor}{familynamecolor} +% \colorlet{subseccolor}{pink!70!black} +% \colorlet{hintcolor}{orange} % =========================== % FONTS % =========================== -\renewcommand*{\familydefault}{\sfdefault}% default font sans-serif - %% Fonts, for use with LuaLaTeX oder XeLaTeX % \defaultfontfeatures{Renderer=Basic,Ligatures=TeX} % \setmainfont[Numbers=OldStyle]{Palatino Linotype} @@ -66,11 +69,12 @@ % \setmonofont{Courier New} % \setkomafont{firstnamefont}{\fontsize{24}{26}\itshape} +\addtokomafont{firstnamefont}{\fontsize{35}{50}} % \addtokomafont{familynamefont}{\scshape} % \setkomafont{addressfont}{\scriptsize} % \setkomafont{acadtitlefont}{\usekomafont{familynamefont}} % \setkomafont{quotefont}{\ttfamily} -% \setkomafont{section}{\Huge\rmfamily\slshape} +% \addtokomafont{section}{\Huge\rmfamily\slshape} % \addtokomafont{subsection}{\bfseries} @@ -84,7 +88,7 @@ % BIBLIOGRAPHY % =========================== \usepackage[backend=biber, -style=authortitle,% +style=ieee,%authortitle,% sorting=ydnt,% ]{biblatex} \bibliography{komacv.bib} @@ -104,17 +108,25 @@ \renewcommand*{\phonenr}{001-23456789} \renewcommand*{\faxnr}{001-23456788} \renewcommand*{\email}{jeyre(a)ferndean.me.uk} +\renewcommand*{\homepage}{www.jeyre.me.uk} +% \renewcommand*{\twitter}{twitter.com/janeeyre} +% \renewcommand*{\github}{github.com/janeeyre} +\renewcommand*{\facebook}{facebook.com/\\jane.eyre} +% \renewcommand*{\facebook}{facebook.com/jane.eyre} % avoid linebreaks in casual style +% \renewcommand*{\linkedin}{https://uk.linkedin.com/pub/jane-eyre} \renewcommand*{\extrainfo}{Some extra info} % \renewcommand*{\cvquote}{\enquote{Convinced I grew that neither earth should perish, \\nor one of the souls it treasured.}} %p.373 % \renewcommand\phonesymbol{Tel.~} +% \headline[l]{name} % [c|l|r]{none|name|title}; default: [c]{none} +% \renewcommand\headlinecontent{Jane Elizabeth Eyre Rochester} % =========================== % PICTURE % =========================== % \setlength\fboxrule{7pt} -%\setlength\mframepicshift{30pt} -%\photo[frame]{3cm}{jeyre} -\photo[mframe]{3cm}{jeyre} +% \setlength\mframepicshift{1cm} +\photo[frame]{3cm}{jeyre} +%\photo[mframe]{5cm}{jeyre} \begin{document} Binary files old/doc/latex/komacv/examples/komacv_example_casual.pdf and new/doc/latex/komacv/examples/komacv_example_casual.pdf differ Binary files old/doc/latex/komacv/examples/komacv_example_classic.pdf and new/doc/latex/komacv/examples/komacv_example_classic.pdf differ Binary files old/doc/latex/komacv/examples/komacv_example_oldstyle.pdf and new/doc/latex/komacv/examples/komacv_example_oldstyle.pdf differ Binary files old/doc/latex/komacv/komacv.pdf and new/doc/latex/komacv/komacv.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/komacv.doc.tlpobj new/tlpkg/tlpobj/komacv.doc.tlpobj --- old/tlpkg/tlpobj/komacv.doc.tlpobj 2016-04-14 19:13:02.000000000 +0200 +++ new/tlpkg/tlpobj/komacv.doc.tlpobj 2017-04-18 18:34:35.000000000 +0200 @@ -1,12 +1,13 @@ name komacv.doc category Package -revision 34906 +revision 43902 shortdesc doc files of komacv relocated 1 -docfiles size=184 +docfiles size=259 RELOC/doc/latex/komacv/README RELOC/doc/latex/komacv/examples/jeyre.jpg RELOC/doc/latex/komacv/examples/komacv.bib + RELOC/doc/latex/komacv/examples/komacv_example.pdf RELOC/doc/latex/komacv/examples/komacv_example.tex RELOC/doc/latex/komacv/examples/komacv_example_casual.pdf RELOC/doc/latex/komacv/examples/komacv_example_classic.pdf ++++++ komacv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/komacv/komacv-casual.sty new/tex/latex/komacv/komacv-casual.sty --- old/tex/latex/komacv/komacv-casual.sty 2014-08-12 00:56:45.000000000 +0200 +++ new/tex/latex/komacv/komacv-casual.sty 2017-04-18 00:26:24.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Salome Södergran (salome.soedergran(a)gmx.ch) +%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran(a)gmx.ch) %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,19 +22,20 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-casual} - [2014/08/10 v1.0.1 style package for komacv class] + [2017/04/17 v1.1.1 style package for komacv class] + \addtokomafont{firstnamefont}{\sffamily\fontsize{38}{40}} \addtokomafont{acadtitlefont}{\sffamily} \addtokomafont{addressfont}{\sffamily\small} \addtokomafont{hintfont}{\sffamily} \newsavebox\@fboxa \newsavebox\@fboxb -\newcommand*\@sboxa[1]{\sbox\@fboxa{#1}} -\newcommand*\@sboxb[1]{\sbox\@fboxb{#1}} -\newcommand*\@uboxa{\usebox\@fboxa} -\newcommand*\@uboxb{\usebox\@fboxb} -\newcommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}} -\newcommand*\addtofooter[2][\@fsymbol]{% +\providecommand*\@sboxa[1]{\sbox\@fboxa{#1}} +\providecommand*\@sboxb[1]{\sbox\@fboxb{#1}} +\providecommand*\@uboxa{\usebox\@fboxa} +\providecommand*\@uboxb{\usebox\@fboxb} +\providecommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}} +\providecommand*\addtofooter[2][\@fsymbol]{% \@sboxb{\@uboxa{}#1#2}% \settowidth\@fboxwidth{\@uboxb}% \ifdimgreater{\@footerwidth}{\@fboxwidth}{% @@ -54,7 +55,7 @@ \hspace*{\fill}% \parbox{\@footerwidth}{% \centering% - \color{@addresscolor}\usekomafont{addressfont}% + \color{@addresscolor}\usefontofkomafont{addressfont}% \ifdefempty{\addressstreet}{}{% \addtofooter[]{\@addresssymbol\addressstreet}% \ifdefempty{\addresscity}{}{% @@ -69,6 +70,14 @@ \addtofooter{\@emailsymbol\emaillink{\email}}} \ifdefempty{\homepage}{}{% \addtofooter{\@homepagesymbol\httplink{\homepage}}}% + \ifdefempty{\twitter}{}{% + \addtofooter{\@twittersymbol\twitter}}% + \ifdefempty{\github}{}{% + \addtofooter{\@githubsymbol\github}}% + \ifdefempty{\facebook}{}{% + \addtofooter{\@facebooksymbol\facebook}}% + \ifdefempty{\linkedin}{}{% + \addtofooter{\@linkedinsymbol\linkedin}}% \ifdefempty{\extrainfo}{}{% \addtofooter{\extrainfo}}\@flushf% }% Ende parbox @@ -119,8 +128,23 @@ \AtBeginDocument{% \thispagestyle{footer} } % end \AtBeginDocument -\renewcommand{\section}[1]{\@cvbarsection{#1}} -\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}} +\setcounter{secnumdepth}{1} + +\RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + font=\color{@seccolor}\sectionfont + ]{section} +\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}} + + \RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + indent=\dimexpr\@sepcolwidth+\@hintscolwidth, + font=\color{@subseccolor}\subsectionfont + ]{subsection} \endinput %% %% End of file `komacv-casual.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/komacv/komacv-classic.sty new/tex/latex/komacv/komacv-classic.sty --- old/tex/latex/komacv/komacv-classic.sty 2014-08-12 00:56:45.000000000 +0200 +++ new/tex/latex/komacv/komacv-classic.sty 2017-04-18 00:26:24.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Salome Södergran (salome.soedergran(a)gmx.ch) +%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran(a)gmx.ch) %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,7 +22,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-classic} - [2014/08/10 v1.0.1 style package for komacv class] + [2017/04/17 v1.1.1 style package for komacv class] + \addtokomafont{firstnamefont}{\sffamily} \addtokomafont{acadtitlefont}{\sffamily} \addtokomafont{addressfont}{\sffamily} @@ -36,9 +37,15 @@ \setlength\@mframepicshift{\mframepicshift} } } % end \AtBeginDocument +\AtEndPreamble{% + \ifdimequal{\titlenamemaxwidth}{0pt}{% +\setlength{\(a)titlenamemaxwidth}{.525\textwidth} +}{ +\setlength\@titlenamemaxwidth{\titlenamemaxwidth} +} +} \providecommand\@cvtitleclassic{% %% set \cs{@titlenamemaxwidth| to the full name length, capped by \cs{@titlenamemaxwidth| -\setlength{\(a)titlenamemaxwidth}{.525\textwidth} \settowidth{\@titlenamefullwidth}{\firstnamestyle{\firstname~}\familynamestyle{\familyname}} \ifdimless{\@titlenamemaxwidth}{\@titlenamefullwidth}{% \setlength{\@titlenamewidth}{\@titlenamemaxwidth} @@ -50,22 +57,36 @@ \ifundef{\@photoname}{}{% else \ifdefstring{\@photoframe}{frame}{% \setlength{\@titledetailswidth}{\@titledetailswidth-\@photowidth-2\@fboxextra} + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning }{% else \ifdefstring{\@photoframe}{mframe}{% \setlength{\@titledetailswidth}{\@titledetailswidth-\@mframepicshift}% - }{}% -}% + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning + }{% picture but no frame + \setlength{\@titledetailswidth}{\@titledetailswidth-\@photowidth} + \setlength{\@titledetailswidth}{.99\@titledetailswidth} % avoid overfullbox warning + } +} }% % name and title - \begin{minipage}[b]{\@titlenamewidth}% +\ifdefstring{\headlinetype}{none}{% +}{ + \begin{center} + \headlinestyle{\@headlinecontent}\par\bigskip + \end{center} +} +\begin{minipage}[b]{\@titlenamewidth}% + \RaggedRight + \ifdefstring{\headlinetype}{name}{\hfill\mbox{}}{% \firstnamestyle{\firstname}\ % \familynamestyle{\familyname}% \ifdefempty{\acadtitle}{}{% - \\[1.25em]\acadtitlestyle{\acadtitle}}% - \end{minipage}% + \par\bigskip\acadtitlestyle{\acadtitle}}% + } +\end{minipage}% % optional data \begin{minipage}[b]{\@titledetailswidth}% - \raggedleft%\addressstyle{% + \raggedleft\addressstyle{% \ifdefempty{\addressstreet}{}{% \@titledetailsnewline% \@addresssymbol\addressstreet% @@ -81,9 +102,17 @@ \@titledetailsnewline\@emailsymbol\emaillink{\email}}% \ifdefempty{\homepage}{}{% \@titledetailsnewline\@homepagesymbol\httplink{\homepage}}% + \ifdefempty{\twitter}{}{% + \@titledetailsnewline\@twittersymbol~\twitter}% + \ifdefempty{\github}{}{% + \@titledetailsnewline\@githubsymbol~\github}% + \ifdefempty{\facebook}{}{% + \@titledetailsnewline\@facebooksymbol~\facebook}% + \ifdefempty{\linkedin}{}{% + \@titledetailsnewline\@linkedinsymbol~\linkedin}% \ifdefempty{\extrainfo}{}{% \@titledetailsnewline\extrainfo}% - %}% + }% \end{minipage}% % optional photo \ifundef{\@photoname}{}{% with picture: @@ -108,8 +137,23 @@ \end{minipage}\\[\@afterquotevspace]% }% } -\renewcommand*{\section}[1]{\@cvbarsection{#1}} -\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}} +\setcounter{secnumdepth}{1} + +\RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + font=\color{@seccolor}\sectionfont + ]{section} +\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}} + + \RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + indent=\dimexpr\@sepcolwidth+\@hintscolwidth, + font=\color{@subseccolor}\subsectionfont + ]{subsection} \endinput %% %% End of file `komacv-classic.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/komacv/komacv-oldstyle.sty new/tex/latex/komacv/komacv-oldstyle.sty --- old/tex/latex/komacv/komacv-oldstyle.sty 2014-08-12 00:56:45.000000000 +0200 +++ new/tex/latex/komacv/komacv-oldstyle.sty 2017-04-18 00:26:24.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Salome Södergran (salome.soedergran(a)gmx.ch) +%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran(a)gmx.ch) %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,13 +22,12 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{komacv-oldstyle} - [2014/08/10 v1.0.1 style package for komacv class] + [2017/04/17 v1.1.1 style package for komacv class] + \KOMAoptions{DIV=15} \setlength{\hintscolwidth}{3cm} \addtokomafont{addressfont}{\small} \addtokomafont{hintfont}{\bfseries} -\setkomafont{section}{\Large\bfseries\upshape} -\setkomafont{subsection}{\large\bfseries\itshape} \colorlet{addresscolor}{gray} \renewcommand*{\listitemsymbol}{\labelitemi~} \renewcommand*{\addresssymbol}{} @@ -56,6 +55,14 @@ \@titledetailsnewline\@emailsymbol\emaillink{\email}}% \ifdefempty{\homepage}{}{% \@titledetailsnewline\@homepagesymbol\httplink{\homepage}}% + \ifdefempty{\twitter}{}{% + \@titledetailsnewline\@twittersymbol~\twitter}% + \ifdefempty{\github}{}{% + \@titledetailsnewline\@githubsymbol~\github}% + \ifdefempty{\facebook}{}{% + \@titledetailsnewline\@facebooksymbol~\facebook}% + \ifdefempty{\linkedin}{}{% + \@titledetailsnewline\@linkedinsymbol~\linkedin}% \ifdefempty{\extrainfo}{}{% \@titledetailsnewline\extrainfo}% } % end \@infocontent @@ -65,7 +72,7 @@ \savebox{\@infobox}{% \parbox[b]{\@infocolwidth}{% % put the first line on the same baseline as the first sectiontitle: - {\usekomafont{section} + {\usefontofkomafont{section} \vspace*{1.6ex} } \raggedleft\addressstyle{% @@ -128,14 +135,27 @@ \AtEndDocument{% \end{addmargin} } -\renewcommand{\section}[1]{\@cvsimplesection{#1}} -\renewcommand{\subsection}[1]{\@cvsimplesubsection{#1}} +\setcounter{secnumdepth}{0} + + \RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + font=\color{@seccolor}\sectionfont + ]{section} + + \RedeclareSectionCommand + [ + beforeskip=\@beforesecvspace, + afterskip=\@aftersecvspace, + font=\color{@subseccolor}\subsectionfont + ]{subsection} \renewcommand*{\cvitem}[3][\@afterelementsvspace]{% \begin{tabular}{% @{}p{\@maincolwidth}% @{\hspace{\@sepcolwidth}}p{\@hintscolwidth}@{}% }% - {#3} & \raggedright\hintstyle{#2}% + {#3} & \RaggedRight\hintstyle{#2}% \end{tabular}\\[#1]% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/komacv/komacv.cls new/tex/latex/komacv/komacv.cls --- old/tex/latex/komacv/komacv.cls 2014-08-12 00:56:45.000000000 +0200 +++ new/tex/latex/komacv/komacv.cls 2017-04-18 00:26:24.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Salome Södergran (salome.soedergran(a)gmx.ch) +%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran(a)gmx.ch) %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,7 +22,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{komacv} - [2014/08/10 v1.0.1 komacv class] + [2017/04/17 v1.1.1 komacv class] + \providecommand*\mycolor{blue} \RequirePackage{ifthen,kvoptions,calc} \SetupKeyvalOptions{% @@ -33,29 +34,37 @@ \DeclareStringOption[mycolor]{color}[mycolor] \DeclareStringOption[x11names]{xcolor}[x11names] \DeclareStringOption[classic]{style}[classic] -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} +\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessKeyvalOptions{komacv} % evaluate keyval options -\ProcessOptions\relax % execute given options -\LoadClass[a4paper,headings=normal,fontsize=11pt,headinclude,footinclude]{scrartcl} +\LoadClass[a4paper,headings=normal,fontsize=11pt]{scrartcl} \RequirePackage[\komacv@xcolor]{xcolor} \RequirePackage{% etoolbox,% ifpdf,% ifluatex,% ifxetex,% - scrpage2,% + scrlayer-scrpage,% marvosym,% + fontawesome,% array,% graphicx,% microtype,% enumitem, hyperref% } +\RequirePackage[raggedrightboxes]{ragged2e} + +\AtEndPreamble{% + \renewcommand\familydefault{\sfdefault}% without this, pdflatex produces error messages; WHY? +} \definecolor{myblue}{rgb}{0.2,0.3,0.65} \colorlet{mycolor}{myblue} \AtEndPreamble{% \renewcommand*\mycolor{\komacv@color} \colorlet{colortheme}{\mycolor}% specified in documentclass option + \@ifundefinedcolor{headlinecolor}{% + \colorlet{@headlinecolor}{black}}{% + \colorlet{@headlinecolor}{headlinecolor}} \@ifundefinedcolor{firstnamecolor}{% \colorlet{@firstnamecolor}{black}}{% \colorlet{@firstnamecolor}{firstnamecolor}} @@ -96,8 +105,9 @@ \RequirePackage[utf8]{inputenc} \RequirePackage[T1]{fontenc}% } -\newkomafont{firstnamefont}{\fontsize{34}{36}\mdseries\upshape} -\newkomafont{familynamefont}{\usekomafont{firstnamefont}} +\newkomafont{headlinefont}{\fontsize{30}{32}\mdseries\upshape} +\newkomafont{firstnamefont}{\Huge\mdseries\upshape} +\newkomafont{familynamefont}{\usefontofkomafont{firstnamefont}} \newkomafont{acadtitlefont}{\LARGE\mdseries\itshape} \newkomafont{addressfont}{\normalsize\mdseries\itshape} \newkomafont{quotefont}{\large\itshape} @@ -107,8 +117,10 @@ \newkomafont{emaillinkfont}{} \newkomafont{commentmainfont}{\bfseries} % in \cvitemwithcomment \newkomafont{commentfont}{\footnotesize\itshape} % in \cvitemwithcomment -\setkomafont{section}{\Large\sffamily\mdseries\upshape} -\setkomafont{subsection}{\large\sffamily\mdseries\upshape} +\providecommand\sectionfont{\Large\sffamily\mdseries\upshape} +\providecommand\subsectionfont{\large\sffamily\mdseries\upshape} +\setkomafont{section}{\sectionfont} +\setkomafont{subsection}{\subsectionfont} \setlength\parindent{0pt} \setlength\columnsep{10\p@} \setlength\columnseprule{0\p@} @@ -149,6 +161,8 @@ \newlength\@commentlength \newlength\@titlenamewidth \newlength\@titlenamemaxwidth +\newlength\titlenamemaxwidth +\setlength\titlenamemaxwidth{0pt} \newlength\@titlenamefullwidth \newlength\@titledetailswidth \newlength\@infocolwidth @@ -228,10 +242,10 @@ % listitem \ifdimequal{\listitemsymbolwidth}{0pt}{% \settowidth{\@listitemsymbolwidth}{\listitemsymbol{}~}% - \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}% }{% \setlength{\@listitemsymbolwidth}{\listitemsymbolwidth}% } + \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}% % listdoubleitem \ifdimequal{\listdbitemmaincolwidth}{0pt}{% @@ -239,6 +253,7 @@ \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % }{% \setlength{\@listdbitemmaincolwidth}{\listdbitemmaincolwidth}% + \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% % } % quote @@ -324,6 +339,14 @@ \providecommand*\emailsymbol{} \providecommand*\@homepagesymbol{} \providecommand*\homepagesymbol{} +\providecommand*\@twittersymbol{\faTwitter~} +\providecommand*\twittersymbol{} +\providecommand*\@githubsymbol{\faGithub~} +\providecommand*\githubsymbol{} +\providecommand*\@facebooksymbol{\faFacebook~} +\providecommand*\facebooksymbol{} +\providecommand*\@linkedinsymbol{\faLinkedin~} +\providecommand*\linkedinsymbol{} \providecommand*\@fsymbol{~~~\textbullet~~~} \providecommand*\fsymbol{} \providecommand*\@listitemsymbol{\textcolor{colortheme}{\Neutral}~} @@ -348,6 +371,18 @@ \ifdefempty{\homepagesymbol}{}{% \renewcommand*\@homepagesymbol{\homepagesymbol} } + \ifdefempty{\twittersymbol}{}{% +\renewcommand*\@twittersymbol{\twittersymbol} +} + \ifdefempty{\githubsymbol}{}{% +\renewcommand*\@githubsymbol{\githubsymbol} +} + \ifdefempty{\facebooksymbol}{}{% +\renewcommand*\@facebooksymbol{\facebooksymbol} +} + \ifdefempty{\linkedinsymbol}{}{% +\renewcommand*\@linkedinesymbol{\linkedinsymbol} +} \ifdefempty{\fsymbol}{}{% \renewcommand*\@fsymbol{\fsymbol} } @@ -368,6 +403,10 @@ \providecommand*{\faxnr}{} \providecommand*{\email}{} \providecommand*{\homepage}{} +\providecommand*{\twitter}{} +\providecommand*{\github}{} +\providecommand*{\facebook}{} +\providecommand*{\linkedin}{} \providecommand*{\extrainfo}{} \providecommand*{\cvquote}{} \newlist{compactitem}{itemize}{3} @@ -393,6 +432,27 @@ \providecommand{\@photoframe}{#1}% \setlength{\@photowidth}{#2}% \providecommand{\@photoname}{#3}} +\providecommand\headlinetype{none} +\providecommand\@headlinecontent{} +\providecommand\headlinecontent{} +\providecommand\headline[2]{\renewcommand\headlinecontent{#1}\renewcommand\headlinetype{#2}} + +\AtEndPreamble{% + \ifdefstring{\headlinetype}{name}{% + \ifdefempty{\headlinecontent}{% + \renewcommand*\@headlinecontent{\firstnamestyle{\firstname}\ \familynamestyle{\familyname} + \ifdefempty{\acadtitle}{}{% + \par\bigskip\acadtitlestyle{\acadtitle}}% + }}{% + \renewcommand*\@headlinecontent{\headlinecontent} + }}{} + \ifdefstring{\headlinetype}{title}{% + \ifdefempty{\headlinecontent}{% +\renewcommand*\@headlinecontent{\headlinestyle{Curriculum Vitae}} + }{% + \renewcommand*\@headlinecontent{\headlinecontent} + }}{} +} \newif\if@firstdetailselement\@firstdetailselementtrue \providecommand*{\@titledetailsnewline}{ \if@firstdetailselement% @@ -404,38 +464,41 @@ \renewcommand\maketitle{\csexpandonce{@cvtitle\komacv@style}} \RequirePackage{lastpage} \providecommand*{\totalpagemark}{% page and pagetotal -\usekomafont{pagenumber}\pageref{LastPage}% +\usefontofkomafont{pagenumber}\pageref{LastPage}% } - \newcommand*{\firstnamestyle}[1]{{% - \usekomafont{firstnamefont}% +\providecommand*\headlinestyle[1]{{% + \usefontofkomafont{headlinefont}% + \textcolor{@headlinecolor}{#1}}} + \providecommand*{\firstnamestyle}[1]{{% + \usefontofkomafont{firstnamefont}% \textcolor{@firstnamecolor}{#1}}} - \newcommand*{\familynamestyle}[1]{{% - \usekomafont{familynamefont}% + \providecommand*{\familynamestyle}[1]{{% + \usefontofkomafont{familynamefont}% \textcolor{@familynamecolor}{#1}}} - \newcommand*{\acadtitlestyle}[1]{{% - \usekomafont{acadtitlefont}% + \providecommand*{\acadtitlestyle}[1]{{% + \usefontofkomafont{acadtitlefont}% \textcolor{@acadtitlecolor}{#1}}} - \newcommand*{\addressstyle}[1]{{% - \usekomafont{addressfont}% + \providecommand*{\addressstyle}[1]{{% + \usefontofkomafont{addressfont}% \textcolor{@addresscolor}{#1}}} - \newcommand*{\quotestyle}[1]{{% - \usekomafont{quotefont}% + \providecommand*{\quotestyle}[1]{{% + \usefontofkomafont{quotefont}% \textcolor{@quotecolor}{#1}}} - \newcommand*{\hintstyle}[1]{{% - \usekomafont{hintfont}% + \providecommand*{\hintstyle}[1]{{% + \usefontofkomafont{hintfont}% \textcolor{@hintcolor}{#1}}} - \newcommand*{\sectionstyle}[1]{% - \usekomafont{section}% + \providecommand*{\sectionstyle}[1]{% + \usefontofkomafont{section}% \textcolor{@seccolor}{#1}} - \newcommand*{\subsectionstyle}[1]{% - \usekomafont{subsection}% + \providecommand*{\subsectionstyle}[1]{% + \usefontofkomafont{subsection}% \textcolor{@subseccolor}{#1}} \providecommand*{\cvitem}[3][\@afterelementsvspace]{% \begin{tabular}{% - @{}p{\@hintscolwidth}% + @{}>{\raggedleft\arraybackslash}p{\@hintscolwidth}% @{\hspace{\@sepcolwidth}}p{\@maincolwidth}@{}% }% - \raggedleft\hintstyle{#2} &{#3}% + \hintstyle{#2} & {#3}% \end{tabular}\\[#1]% } \providecommand*{\cvdoubleitem}[5][\@afterelementsvspace]{% @@ -454,7 +517,8 @@ \providecommand*{\cvlistitem}[2][\@afterelementsvspace]{% \cvitem[#1]{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.95\@listitemmaincolwidth}% #2% \end{minipage}% }% @@ -462,13 +526,15 @@ \providecommand*{\cvlistdoubleitem}[3][\@afterelementsvspace]{% \cvitem[#1]{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listdbitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.9\@listdbitemmaincolwidth}% #2% \end{minipage}% - \hspace*{\@sepcolwidth} + \hspace*{.9\@sepcolwidth} \ifstrempty{#3}{}{% \@listitemsymbol% - \begin{minipage}[t]{\@listdbitemmaincolwidth}% + \hfill % + \begin{minipage}[t]{.9\@listdbitemmaincolwidth}% #3% \end{minipage} }% @@ -492,64 +558,36 @@ } \newbox{\@commentmainbox} \providecommand*{\cvitemwithcomment}[4][\@afterelementsvspace]{% - \savebox{\@commentmainbox}{{\usekomafont{commentmainfont}#3}}% + \savebox{\@commentmainbox}{{\usefontofkomafont{commentmainfont} #3}}% \settowidth\@commentmainlength{\usebox{\@commentmainbox}}% \setlength{\@commentlength}{% \@maincolwidth-\@sepcolwidth-\@commentmainlength% }% \cvitem[#1]{#2}{% \begin{minipage}[t]{\@commentmainlength}% - \usekomafont{commentmainfont} #3% + \usefontofkomafont{commentmainfont} #3% \end{minipage}% \hfill% \begin{minipage}[t]{\@commentlength}% - \raggedleft\usekomafont{commentfont} #4% + \raggedleft\usefontofkomafont{commentfont} #4% \end{minipage}% }% } \providecommand*{\link}[2][]{% \ifstrempty{#1}{% - \href{#2}{\usekomafont{linkfont}#2}}{% - \href{#2}{\usekomafont{linkfont}#1}}% + \href{#2}{\usefontofkomafont{linkfont}#2}}{% + \href{#2}{\usefontofkomafont{linkfont}#1}}% } \providecommand*{\httplink}[2][]{% \ifstrempty{#1}{% - \href{http://#2}{\usekomafont{httplinkfont}#2}}{% - \href{http://#2}{\usekomafont{httplinkfont}#1}}% + \href{http://#2}{\usefontofkomafont{httplinkfont}#2}}{% + \href{http://#2}{\usefontofkomafont{httplinkfont}#1}}% } \providecommand*{\emaillink}[2][]{% \ifstrempty{#1}{% - \href{mailto:#2}{\usekomafont{emaillinkfont}#2}}{% - \href{mailto:#2}{\usekomafont{emaillinkfont}#1}}% + \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#2}}{% + \href{mailto:#2}{\usefontofkomafont{emaillinkfont}#1}}% } -\providecommand\origsection{} -\let\origsection\section -\providecommand\origsubsection{} -\let\origsubsection\subsection - -\providecommand\@cvsimplesection[1]{% - \origsection*{\sectionstyle{#1}} -} -\providecommand\@cvsimplesubsection[1]{% - \origsubsection*{\subsectionstyle{#1}} -} - -\providecommand\@cvbarsection[1]{% - \origsection*{ - \phantomsection{}% reset the anchor for hyperrefs - \addcontentsline{toc}{section}{#1}% - \cvitem[0pt]{% - \raggedleft\hintstyle{\color{@secbarcolor}% - \rule{\@hintscolwidth}{1ex}}% - }{\sectionstyle{#1}} - }% end origsection -} % end cvbarsection - -\providecommand\@cvbarsubsection[1]{% - \origsubsection*{ - \cvitem[0pt]{}{\subsectionstyle{#1}} - }% -} \hypersetup{ breaklinks, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/komacv.tlpobj new/tlpkg/tlpobj/komacv.tlpobj --- old/tlpkg/tlpobj/komacv.tlpobj 2016-04-14 19:13:03.000000000 +0200 +++ new/tlpkg/tlpobj/komacv.tlpobj 2017-04-18 18:34:35.000000000 +0200 @@ -1,18 +1,18 @@ name komacv category Package -revision 34906 +revision 43902 shortdesc Typesetting a beautiful CV with various style options relocated 1 longdesc The class simplifies the creation of beautiful CV. The user may longdesc choose between different styles, and may adjust settings to longdesc tune the output. -runfiles size=10 +runfiles size=11 RELOC/tex/latex/komacv/komacv-casual.sty RELOC/tex/latex/komacv/komacv-classic.sty RELOC/tex/latex/komacv/komacv-oldstyle.sty RELOC/tex/latex/komacv/komacv.cls catalogue-ctan /macros/latex/contrib/komacv -catalogue-date 2015-10-21 17:22:57 +0200 +catalogue-date 2017-04-17 20:41:03 +0200 catalogue-license lppl1.3 catalogue-topics cv class -catalogue-version 1.0.1 +catalogue-version 1.1.1 ++++++ kotex-oblivoir.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/kotex-oblivoir/ChangeLog new/doc/latex/kotex-oblivoir/ChangeLog --- old/doc/latex/kotex-oblivoir/ChangeLog 2015-10-20 23:19:25.000000000 +0200 +++ new/doc/latex/kotex-oblivoir/ChangeLog 2017-02-04 02:01:06.000000000 +0100 @@ -1,3 +1,10 @@ +2017-02-03 Kihwang Lee <leekh at ktug org> + + Version 2.1.8 + + * xob-font.sty: version 0.7 + fix conflicts with the latest l3kernel. + 2015-10-19 Kangsoo Kim <karnes at ktug org> Version 2.1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kotex-oblivoir.doc.tlpobj new/tlpkg/tlpobj/kotex-oblivoir.doc.tlpobj --- old/tlpkg/tlpobj/kotex-oblivoir.doc.tlpobj 2016-04-14 19:13:03.000000000 +0200 +++ new/tlpkg/tlpobj/kotex-oblivoir.doc.tlpobj 2017-04-14 17:45:28.000000000 +0200 @@ -1,6 +1,6 @@ name kotex-oblivoir.doc category Package -revision 38679 +revision 43130 shortdesc doc files of kotex-oblivoir relocated 1 docfiles size=98 ++++++ kotex-oblivoir.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty new/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty --- old/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty 2014-06-26 23:35:57.000000000 +0200 +++ new/tex/latex/kotex-oblivoir/memhangul-x/xob-font.sty 2017-02-04 02:01:07.000000000 +0100 @@ -1,6 +1,7 @@ %% xob-font.sty %% %% Copyright (c) 2014 Kangsoo Kim <karnes at ktug org> +%% Copyright (c) 2017 Kihwang Lee <leekh at ktug org> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -14,7 +15,7 @@ %% oblivoir hangul/hanja font setting. %% part of oblivoir %% -\ProvidesPackage{xob-font}[2014/06/24 v0.6 select hangul/hanja fonts for oblivoir] +\ProvidesPackage{xob-font}[2017/02/03 v0.7 select hangul/hanja fonts for oblivoir] %%% obsolete options: retain \if@.. conditions for backward compatibility \newif\if@nowin\@nowinfalse @@ -50,7 +51,7 @@ \ExplSyntaxOn -\xetex_if_engine:T +\sys_if_engine_xetex:T { \RequirePackage{xetexko-space} \RequirePackage{xetexko-font} @@ -153,7 +154,7 @@ } \setmainhanjafont [ \_font_feature_str, \_additional_feature_str ] { \_regu_font_name } - \luatex_if_engine:T + \sys_if_engine_luatex:T { \tl_if_exist:NT \hanjabyhanjafont { @@ -343,7 +344,7 @@ } } - \luatex_if_engine:T + \sys_if_engine_luatex:T { \tl_if_exist:NT \hanjabyhanjafont { @@ -671,6 +672,7 @@ %%% end of file `xob-font.sty` %% CHANGES +%% v0.7 : Use \sys_if_engine_xetex and \sys_if_engine_luatex instead of xetex_if_engine and luatex_if_engine to be compatible with latest l3kernel. %% v0.6 : HCR auto insert Script=Hangul, HAN disabled %% v0.5 : [nanum] sets Bold, [nanumx] sets ExtraBold for NanumMyeongjo %% v0.4 : hangul_bold_exist && hanja_bold_no_exist bug fixed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kotex-oblivoir.tlpobj new/tlpkg/tlpobj/kotex-oblivoir.tlpobj --- old/tlpkg/tlpobj/kotex-oblivoir.tlpobj 2016-04-14 19:13:03.000000000 +0200 +++ new/tlpkg/tlpobj/kotex-oblivoir.tlpobj 2017-04-14 17:45:29.000000000 +0200 @@ -1,11 +1,12 @@ name kotex-oblivoir category Package -revision 38679 +revision 43130 shortdesc A LaTeX document class for typesetting Korean documents relocated 1 longdesc The class is based on memoir, and is adapted to typesetting longdesc Korean documents. The bundle (of class and associated packages) -longdesc belongs to the ko.TeX bundle. +longdesc belongs to the ko.TeX bundle. It depends on memoir and kotex- +longdesc utf to function. depend memoir depend kotex-utf runfiles size=60 @@ -37,7 +38,7 @@ RELOC/tex/latex/kotex-oblivoir/oblivoir.cls RELOC/tex/latex/kotex-oblivoir/xoblivoir.cls catalogue-ctan /language/korean/kotex-oblivoir -catalogue-date 2015-10-20 07:48:16 +0200 +catalogue-date 2017-02-03 07:59:43 +0100 catalogue-license lppl1.3 catalogue-topics korean class -catalogue-version 2.1.7 +catalogue-version 2.1.8 ++++++ kotex-plain.doc.tar.xz ++++++ ++++++ kotex-plain.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kotex-plain.tlpobj new/tlpkg/tlpobj/kotex-plain.tlpobj --- old/tlpkg/tlpobj/kotex-plain.tlpobj 2016-04-14 19:13:03.000000000 +0200 +++ new/tlpkg/tlpobj/kotex-plain.tlpobj 2017-04-14 17:45:29.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/plain/kotex-plain/kotexutf-core.tex RELOC/tex/plain/kotex-plain/kotexutf.tex catalogue-ctan /language/korean/kotex-plain -catalogue-date 2015-10-13 05:59:51 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics korean plain-ext enc-juggle catalogue-version 2.1.1a ++++++ kotex-utf.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-m/kotex-utf.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/kotex-utf.doc.tar.xz differ: char 27, line 1 ++++++ kotex-utf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kotex-utf.tlpobj new/tlpkg/tlpobj/kotex-utf.tlpobj --- old/tlpkg/tlpobj/kotex-utf.tlpobj 2016-04-14 19:13:09.000000000 +0200 +++ new/tlpkg/tlpobj/kotex-utf.tlpobj 2017-04-14 17:45:31.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/tex/latex/kotex-utf/tex4ht/dhucs.cfg RELOC/tex/latex/kotex-utf/tex4ht/kosections-utf.4ht catalogue-ctan /language/korean/kotex-utf -catalogue-date 2015-10-05 14:56:24 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics korean catalogue-version 2.1.2 ++++++ kotex-utils.doc.tar.xz ++++++ ++++++ kotex-utils.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kotex-utils.tlpobj new/tlpkg/tlpobj/kotex-utils.tlpobj --- old/tlpkg/tlpobj/kotex-utils.tlpobj 2016-04-14 19:13:10.000000000 +0200 +++ new/tlpkg/tlpobj/kotex-utils.tlpobj 2017-04-14 17:45:31.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/scripts/kotex-utils/komkindex.pl texmf-dist/scripts/kotex-utils/ttf2kotexfont.pl catalogue-ctan /language/korean/kotex-utils -catalogue-date 2015-11-04 05:48:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics korean index catalogue-version 2.1.0 ++++++ kpathsea.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/kpathsea.info new/texmf-dist/doc/info/kpathsea.info --- old/texmf-dist/doc/info/kpathsea.info 2016-04-26 18:52:45.000000000 +0200 +++ new/texmf-dist/doc/info/kpathsea.info 2017-05-03 19:42:44.000000000 +0200 @@ -1,9 +1,9 @@ -This is kpathsea.info, produced by makeinfo version 6.1 from +This is kpathsea.info, produced by makeinfo version 6.3 from kpathsea.texi. This file documents the Kpathsea library for path searching. - Copyright (C) 1996-2016 Karl Berry & Olaf Weber. + Copyright (C) 1996-2017 Karl Berry & Olaf Weber. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -37,7 +37,7 @@ **************** This manual documents the Kpathsea library for path searching. It -corresponds to version 6.2.2, released in Aprile 2016. +corresponds to version 6.2.3, released in April 2017. * Menu: @@ -61,8 +61,8 @@ 1 Introduction ************** -This manual corresponds to version 6.2.2 of the Kpathsea library, -released in Aprile 2016. +This manual corresponds to version 6.2.3 of the Kpathsea library, +released in April 2017. The library's fundamental purpose is to return a filename from a list of directories specified by the user, similar to what shells do when @@ -3637,58 +3637,58 @@ Tag Table: Node: Top1480 -Node: Introduction2261 -Node: History4208 -Node: unixtex.ftp8805 -Node: Security10300 -Node: TeX directory structure12804 -Node: Path searching16852 -Node: Searching overview17510 -Node: Path sources20905 -Node: Config files21963 -Node: Path expansion25890 -Node: Default expansion26839 -Node: Variable expansion28909 -Node: Tilde expansion30310 -Node: Brace expansion31290 -Node: KPSE_DOT expansion32215 -Node: Subdirectory expansion32728 -Node: Filename database35082 -Node: ls-R36136 -Node: Filename aliases39031 -Node: Database format40209 -Node: Invoking kpsewhich41222 -Node: Path searching options42177 -Node: Specially-recognized files50097 -Node: Auxiliary tasks51452 -Node: Standard options53791 -Node: TeX support54147 -Node: Supported file formats55499 -Node: File lookup63164 -Node: Glyph lookup64913 -Node: Basic glyph lookup66037 -Node: Fontmap66917 -Node: Fallback font69338 -Node: Suppressing warnings70250 -Node: mktex scripts71377 -Node: mktex configuration72592 -Node: mktex script names78395 -Node: mktex script arguments79781 -Node: Programming80660 -Node: Programming overview81182 -Node: Calling sequence83879 -Node: Program-specific files90411 -Node: Programming with config files91434 -Node: Reporting bugs92746 -Node: Bug checklist93424 -Node: Mailing lists96896 -Node: Debugging97571 -Node: Logging102648 -Node: Common problems104515 -Node: Unable to find files104992 -Node: Slow path searching107402 -Node: Unable to generate fonts108777 -Node: TeX or Metafont failing111248 -Node: Index112601 +Node: Introduction2260 +Node: History4206 +Node: unixtex.ftp8803 +Node: Security10298 +Node: TeX directory structure12802 +Node: Path searching16850 +Node: Searching overview17508 +Node: Path sources20903 +Node: Config files21961 +Node: Path expansion25888 +Node: Default expansion26837 +Node: Variable expansion28907 +Node: Tilde expansion30308 +Node: Brace expansion31288 +Node: KPSE_DOT expansion32213 +Node: Subdirectory expansion32726 +Node: Filename database35080 +Node: ls-R36134 +Node: Filename aliases39029 +Node: Database format40207 +Node: Invoking kpsewhich41220 +Node: Path searching options42175 +Node: Specially-recognized files50095 +Node: Auxiliary tasks51450 +Node: Standard options53789 +Node: TeX support54145 +Node: Supported file formats55497 +Node: File lookup63162 +Node: Glyph lookup64911 +Node: Basic glyph lookup66035 +Node: Fontmap66915 +Node: Fallback font69336 +Node: Suppressing warnings70248 +Node: mktex scripts71375 +Node: mktex configuration72590 +Node: mktex script names78393 +Node: mktex script arguments79779 +Node: Programming80658 +Node: Programming overview81180 +Node: Calling sequence83877 +Node: Program-specific files90409 +Node: Programming with config files91432 +Node: Reporting bugs92744 +Node: Bug checklist93422 +Node: Mailing lists96894 +Node: Debugging97569 +Node: Logging102646 +Node: Common problems104513 +Node: Unable to find files104990 +Node: Slow path searching107400 +Node: Unable to generate fonts108775 +Node: TeX or Metafont failing111246 +Node: Index112599 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/web2c.info new/texmf-dist/doc/info/web2c.info --- old/texmf-dist/doc/info/web2c.info 2016-04-26 18:52:45.000000000 +0200 +++ new/texmf-dist/doc/info/web2c.info 2017-05-03 19:42:44.000000000 +0200 @@ -1,4 +1,4 @@ -This is web2c.info, produced by makeinfo version 6.1 from web2c.texi. +This is web2c.info, produced by makeinfo version 6.3 from web2c.texi. This file documents the installation and use of the programs in Web2c, an implementation of Donald Knuth's TeX system. @@ -58,7 +58,7 @@ This document describes how to install and use the programs in the Web2c implementation of the TeX system, especially for Unix systems. It -corresponds to Web2c version 2016, released in April 2016. +corresponds to Web2c version 2017, released in April 2017. * Menu: @@ -82,8 +82,8 @@ 1 Introduction ************** -This manual corresponds to version 2016 of Web2c, released in April -2016. +This manual corresponds to version 2017 of Web2c, released in April +2017. "Web2c" is the name of a TeX implementation, originally for Unix, but now also running under DOS, Amiga, and other operating systems. By "TeX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/kpathsea/kpathsea.html new/texmf-dist/doc/kpathsea/kpathsea.html --- old/texmf-dist/doc/kpathsea/kpathsea.html 2016-04-26 18:52:45.000000000 +0200 +++ new/texmf-dist/doc/kpathsea/kpathsea.html 2017-05-03 19:42:44.000000000 +0200 @@ -2,7 +2,7 @@ <html>  - + <head> <title>Kpathsea: A library for path searching</title> @@ -171,8 +171,8 @@ <h1 class="top">Kpathsea library</h1> <p>This manual documents the Kpathsea library for path searching. It -corresponds to version 6.2.2, released in -Aprile 2016. +corresponds to version 6.2.3, released in +April 2017. </p> <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top">• <a href="#Introduction" accesskey="1">Introduction</a>:</td><td>  </td><td align="left" valign="top">Overview and history. @@ -216,8 +216,8 @@ <a name="index-introduction"></a> <a name="index-fundamental-purpose-of-Kpathsea"></a> -<p>This manual corresponds to version 6.2.2 of the Kpathsea -library, released in Aprile 2016. +<p>This manual corresponds to version 6.2.3 of the Kpathsea +library, released in April 2017. </p> <p>The library’s fundamental purpose is to return a filename from a list of directories specified by the user, similar to what shells do when Binary files old/texmf-dist/doc/kpathsea/kpathsea.pdf and new/texmf-dist/doc/kpathsea/kpathsea.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/kpseaccess.1 new/texmf-dist/doc/man/man1/kpseaccess.1 --- old/texmf-dist/doc/man/man1/kpseaccess.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/kpseaccess.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH KPSEACCESS 1 "1 March 2011" "Kpathsea 6.2.2" +.TH KPSEACCESS 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/kpseaccess.man1.pdf and new/texmf-dist/doc/man/man1/kpseaccess.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/kpsereadlink.1 new/texmf-dist/doc/man/man1/kpsereadlink.1 --- old/texmf-dist/doc/man/man1/kpsereadlink.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/kpsereadlink.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH KPSEREADLINK 1 "1 March 2011" "Kpathsea 6.2.2" +.TH KPSEREADLINK 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .SH NAME kpsereadlink \- print contents of symbolic link Binary files old/texmf-dist/doc/man/man1/kpsereadlink.man1.pdf and new/texmf-dist/doc/man/man1/kpsereadlink.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/kpsestat.1 new/texmf-dist/doc/man/man1/kpsestat.1 --- old/texmf-dist/doc/man/man1/kpsestat.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/kpsestat.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH KPSESTAT 1 "1 March 2011" "Kpathsea 6.2.2" +.TH KPSESTAT 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/kpsestat.man1.pdf and new/texmf-dist/doc/man/man1/kpsestat.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/kpsewhich.1 new/texmf-dist/doc/man/man1/kpsewhich.1 --- old/texmf-dist/doc/man/man1/kpsewhich.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/kpsewhich.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH KPSEWHICH 1 "1 March 2011" "Kpathsea 6.2.2" +.TH KPSEWHICH 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/kpsewhich.man1.pdf and new/texmf-dist/doc/man/man1/kpsewhich.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mkocp.1 new/texmf-dist/doc/man/man1/mkocp.1 --- old/texmf-dist/doc/man/man1/mkocp.1 2010-05-19 10:40:53.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mkocp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "mkocp" "1" "September 2000" "Omega" "Omega" +.TH "mkocp" "1" "April 2017" "Omega" .PP .SH "NAME" mkocp \- frontend to \fBotp2ocp\fP(1) @@ -25,20 +25,13 @@ .SH "SEE ALSO" .PP \fBomega\fP(1), \fBotp2ocp\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 "BUGS" -.PP -None known, but report any bugs found to <omega(a)ens\&.fr> (mailing list)\&. +.PP +<https://ctan\&.org/pkg/omega> .PP .SH "AUTHOR" .PP \fBmkocp\fP is part of Omega\&. The primary authors of Omega are John Plaice -<plaice(a)cse\&.unsw\&.edu\&.au> and Yannis Haralambous -<yannis(a)fluxus-virus\&.com>\&. +and Yannis Haralambous\&. .PP This manual page was written by C\&.M\&. Connelly <cmc(a)debian\&.org>, for Binary files old/texmf-dist/doc/man/man1/mkocp.man1.pdf and new/texmf-dist/doc/man/man1/mkocp.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mkofm.1 new/texmf-dist/doc/man/man1/mkofm.1 --- old/texmf-dist/doc/man/man1/mkofm.1 2010-05-19 10:40:53.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mkofm.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "mkofm" "1" "September 2000" "teTeX" "teTeX" +.TH "mkofm" "1" "April 2017" "TeX Live" .PP .SH "NAME" mkofm \- front end to \fBmktextfm\fP(1) Binary files old/texmf-dist/doc/man/man1/mkofm.man1.pdf and new/texmf-dist/doc/man/man1/mkofm.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/mktexfmt.man1.pdf and new/texmf-dist/doc/man/man1/mktexfmt.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mktexlsr.1 new/texmf-dist/doc/man/man1/mktexlsr.1 --- old/texmf-dist/doc/man/man1/mktexlsr.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mktexlsr.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MKTEXLSR 1 "1 March 2011" "Kpathsea 6.2.2" +.TH MKTEXLSR 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/mktexlsr.man1.pdf and new/texmf-dist/doc/man/man1/mktexlsr.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mktexmf.1 new/texmf-dist/doc/man/man1/mktexmf.1 --- old/texmf-dist/doc/man/man1/mktexmf.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mktexmf.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MKTEXMF 1 "1 March 2011" "Kpathsea 6.2.2" +.TH MKTEXMF 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/mktexmf.man1.pdf and new/texmf-dist/doc/man/man1/mktexmf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mktexpk.1 new/texmf-dist/doc/man/man1/mktexpk.1 --- old/texmf-dist/doc/man/man1/mktexpk.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mktexpk.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MKTEXPK 1 "1 March 2011" "Kpathsea 6.2.2" +.TH MKTEXPK 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/mktexpk.man1.pdf and new/texmf-dist/doc/man/man1/mktexpk.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mktextfm.1 new/texmf-dist/doc/man/man1/mktextfm.1 --- old/texmf-dist/doc/man/man1/mktextfm.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/mktextfm.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MKTEXTFM 1 "1 March 2011" "Kpathsea 6.2.2" +.TH MKTEXTFM 1 "1 March 2011" "Kpathsea 6.2.3" .\"===================================================================== .if n .ds MP MetaPost .if t .ds MP MetaPost Binary files old/texmf-dist/doc/man/man1/mktextfm.man1.pdf and new/texmf-dist/doc/man/man1/mktextfm.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/texhash.man1.pdf and new/texmf-dist/doc/man/man1/texhash.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/web2c/web2c.html new/texmf-dist/doc/web2c/web2c.html --- old/texmf-dist/doc/web2c/web2c.html 2016-04-26 18:52:45.000000000 +0200 +++ new/texmf-dist/doc/web2c/web2c.html 2017-05-03 19:42:44.000000000 +0200 @@ -19,7 +19,7 @@ Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation --> - + <head> <title>Web2c: A TeX implementation</title> @@ -192,8 +192,8 @@ <p>This document describes how to install and use the programs in the Web2c implementation of the TeX system, especially for Unix systems. It -corresponds to Web2c version 2016, released in -April 2016. +corresponds to Web2c version 2017, released in +April 2017. </p> <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top">• <a href="#Introduction" accesskey="1">Introduction</a>:</td><td>  </td><td align="left" valign="top">A brief introduction. @@ -236,8 +236,8 @@ <a name="index-introduction"></a> -<p>This manual corresponds to version 2016 of Web2c, released in -April 2016. +<p>This manual corresponds to version 2017 of Web2c, released in +April 2017. </p> <a name="index-Knuth_002c-Donald-E_002e"></a> <a name="index-TeX_002c-Web2c-implementation-of"></a> Binary files old/texmf-dist/doc/web2c/web2c.pdf and new/texmf-dist/doc/web2c/web2c.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kpathsea.doc.tlpobj new/tlpkg/tlpobj/kpathsea.doc.tlpobj --- old/tlpkg/tlpobj/kpathsea.doc.tlpobj 2016-05-16 00:51:53.000000000 +0200 +++ new/tlpkg/tlpobj/kpathsea.doc.tlpobj 2017-05-07 02:07:12.000000000 +0200 @@ -1,8 +1,8 @@ name kpathsea.doc category TLCore -revision 41139 +revision 44223 shortdesc doc files of kpathsea -docfiles size=581 +docfiles size=538 texmf-dist/doc/info/dir texmf-dist/doc/info/kpathsea.info texmf-dist/doc/info/tds.info ++++++ kpathsea.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/mktexdir new/texmf-dist/web2c/mktexdir --- old/texmf-dist/web2c/mktexdir 2015-04-12 18:20:42.000000000 +0200 +++ new/texmf-dist/web2c/mktexdir 2016-11-25 19:34:11.000000000 +0100 @@ -1,12 +1,13 @@ #!/bin/sh -# mkinstalldirs (now mktexdir) -- make directory hierarchy. +# mktexdir (was mkinstalldirs) -- make directory hierarchy. # Author: Noah Friedman <friedman(a)prep.ai.mit.edu>, created: 1993-05-16. # Public domain. # # Modified for sticky directory creation, --help, --version, more, # by Thomas Esser, Karl Berry, Olaf Weber, et al. +# Maintained as part of TeX Live, http://tug.org/tex-live. -version='$Id: mktexdir 34656 2014-07-18 23:38:50Z karl $' +version='$Id: mktexdir 42425 2016-11-02 21:34:11Z karl $' progname=`echo $0 | sed 's%.*/%%'` # preferentially use subprograms from our own directory. @@ -50,7 +51,18 @@ pathcomp="$pathcomp$d" if test ! -d "./$pathcomp"; then - mkdir "./$pathcomp" || { errstatus=$?; break; } + # This shell stuff is not atomic, therefore ./$pathcomp + # may have been created in another process and this mkdir will + # fail despite the above test, so do it silently: + mkdir "./$pathcomp" >/dev/null 2>&1 + + # So, if ./$pathcomp is a directory now, call it good. + if test ! -d "./$pathcomp"; then + # Otherwise, presumably it's a real error. Do the mkdir again + # and let the error be seen, and quit the loop. + # (Report at https://bugs.debian.org/794228.) + mkdir "./$pathcomp" || { errstatus=$?; break; } + fi chmod `kpsestat ${MT_APPEND_MASK} "$pathcomp"/..` "./$pathcomp" fi @@ -59,3 +71,6 @@ done exit $errstatus + +# P.S. We don't want to rely on mkdir -p, because of possible +# portability programs. See current mkinstalldirs source (in Automake). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/texmf.cnf new/texmf-dist/web2c/texmf.cnf --- old/texmf-dist/web2c/texmf.cnf 2016-05-13 00:58:14.000000000 +0200 +++ new/texmf-dist/web2c/texmf.cnf 2017-05-06 18:23:44.000000000 +0200 @@ -4,8 +4,8 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy! -- in ../../texmf.cnf. That is, if this file is -% installed in /some/path/to/texlive/2016/texmf-dist/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2016/texmf.cnf. +% installed in /some/path/to/texlive/2017/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2017/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -79,22 +79,31 @@ TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2016/texmf-var +TEXMFVAR = ~/.texlive2017/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2016/texmf-config +TEXMFCONFIG = ~/.texlive2017/texmf-config + +% This is the value manipulated by tlmgr's auxtrees subcommand in the +% root texmf.cnf. Kpathsea warns about a literally empty string for a +% value, hence the empty braces. +TEXMFAUXTREES = {} % List all the texmf trees. For an explanation of what they are, see the % TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. +% explicitly and before other trees. % % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions % should take precedence over distribution files -- although it is % generally a source of confusion to have different versions of a % package installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +% +% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is +% ever defined (the 99% common case), no extra elements will be added to +% the search paths. tlmgr takes care to end any value with a trailing comma. +TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. @@ -102,7 +111,7 @@ % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use @@ -193,11 +202,12 @@ TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// % LuaTeX. -TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luajitlatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// % XeTeX. TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// @@ -359,6 +369,10 @@ % Makeindex style (.ist) files. INDEXSTYLE = .;$TEXMF/makeindex// +% mendex dictionary files. Used internally by mendex and upmendex. +% It is not necessary to introduce a new format in Kpathsea. +INDEXDICTIONARY = .;$TEXMF/makeindex// + % Font encoding files (.enc). ENCFONTS = .;$TEXMF/fonts/enc// @@ -568,8 +582,8 @@ gregorio,\ kpsewhich,\ makeindex,\ -mpost,\ repstopdf,\ +texosquery-jre8,\ % we'd like to allow: % dvips - but external commands can be executed, need at least -R1. @@ -778,10 +792,10 @@ % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 glob_str_size = 20000 -max_strings.bibtex = 35307 -max_strings.bibtex8 = 35307 -max_strings.bibtexu = 35307 -max_strings.pbibtex = 35307 +max_strings.bibtex = 100000 +max_strings.bibtex8 = 100000 +max_strings.bibtexu = 100000 +max_strings.pbibtex = 100000 % GFtype only. line_length.gftype = 500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kpathsea.tlpobj new/tlpkg/tlpobj/kpathsea.tlpobj --- old/tlpkg/tlpobj/kpathsea.tlpobj 2016-05-16 00:51:55.000000000 +0200 +++ new/tlpkg/tlpobj/kpathsea.tlpobj 2017-05-07 02:07:13.000000000 +0200 @@ -1,6 +1,6 @@ name kpathsea category TLCore -revision 41139 +revision 44223 shortdesc Path searching library for TeX-related files longdesc Kpathsea is a library and utility programs which provide path longdesc searching facilities for TeX file types, including the self- @@ -40,6 +40,6 @@ texmf-dist/web2c/tcvn-t5.tcx texmf-dist/web2c/texmf.cnf texmf-dist/web2c/viscii-t5.tcx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license lgpl catalogue-topics sys-supp ++++++ kpathsea_cnf.dif ++++++ --- /var/tmp/diff_new_pack.Q9wiSg/_old 2017-06-25 19:31:28.033151401 +0200 +++ /var/tmp/diff_new_pack.Q9wiSg/_new 2017-06-25 19:31:28.033151401 +0200 @@ -1,8 +1,8 @@ --- texmf-dist/web2c/fmtutil.cnf | 17 ++-- texmf-dist/web2c/mktex.opt | 39 +++++++-- - texmf-dist/web2c/texmf.cnf | 177 +++++++++++++++++++++++++------------------ - 3 files changed, 145 insertions(+), 88 deletions(-) + texmf-dist/web2c/texmf.cnf | 174 +++++++++++++++++++++++++------------------ + 3 files changed, 144 insertions(+), 86 deletions(-) --- texmf-dist/web2c/fmtutil.cnf +++ texmf-dist/web2c/fmtutil.cnf 2015-03-30 10:44:48.993518643 +0000 @@ -120,8 +120,8 @@ # Cache values that may be useful for recursive calls. export MT_MKTEX_OPT MT_MKTEX_CNF --- texmf-dist/web2c/texmf.cnf -+++ texmf-dist/web2c/texmf.cnf 2017-05-26 12:43:09.905770100 +0000 -@@ -57,32 +57,32 @@ ++++ texmf-dist/web2c/texmf.cnf 2017-06-13 13:43:57.026302920 +0000 +@@ -57,20 +57,20 @@ TEXMFROOT = $SELFAUTOPARENT % The main tree of distributed packages and programs: @@ -146,35 +146,33 @@ % Per-user texmf tree(s) -- organized per the TDS, as usual. To define % more than one per-user tree, set this to a list of directories in - % braces, as described above. (This used to be HOMETEXMF.) ~ expands - % to %USERPROFILE% on Windows, $HOME otherwise. --TEXMFHOME = ~/texmf -+TEXMFHOME = $HOME/texmf +@@ -79,10 +79,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config + TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. --TEXMFVAR = ~/.texlive2016/texmf-var +-TEXMFVAR = ~/.texlive2017/texmf-var +TEXMFVAR = ${TEXMFSYSVAR} % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. --TEXMFCONFIG = ~/.texlive2016/texmf-config +-TEXMFCONFIG = ~/.texlive2017/texmf-config +TEXMFCONFIG = ${TEXMFSYSCONFIG} - % List all the texmf trees. For an explanation of what they are, see the - % TeX Live manual. -@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2016/texmf-confi - % should take precedence over distribution files -- although it is - % generally a source of confusion to have different versions of a - % package installed, whatever the trees, so try to avoid it. --TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} + % This is the value manipulated by tlmgr's auxtrees subcommand in the + % root texmf.cnf. Kpathsea warns about a literally empty string for a +@@ -103,7 +103,7 @@ TEXMFAUXTREES = {} + % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is + % ever defined (the 99% common case), no extra elements will be added to + % the search paths. tlmgr takes care to end any value with a trailing comma. +-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the % directories in this path, but if there is one, Kpathsea will use it. -@@ -102,24 +102,23 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO +@@ -111,24 +111,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. --TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMFDBS = $TEXMF;$VARTEXFONTS;$HOMECACHE % The system trees. These are the trees that are shared by all users. @@ -198,7 +196,7 @@ % On some systems, there will be a system tree which contains all the font % files that may be created as well as the formats. For example -@@ -130,7 +129,8 @@ VARTEXFONTS = $TEXMFVAR/fonts +@@ -139,7 +138,8 @@ VARTEXFONTS = $TEXMFVAR/fonts % % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below % one of the TEXMF directories (avoids overlapping ls-R files). @@ -208,7 +206,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. -@@ -138,7 +138,7 @@ VARTEXFONTS = $TEXMFVAR/fonts +@@ -147,7 +147,7 @@ VARTEXFONTS = $TEXMFVAR/fonts % WEB2C is for Web2C specific files. The current directory may not be % a good place to look for them. @@ -217,7 +215,7 @@ % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input % or \openin, including .sty, .eps, etc. We specify paths for all known -@@ -179,18 +179,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ +@@ -188,18 +188,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{ TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// % pdfTeX. @@ -245,8 +243,8 @@ +TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// % LuaTeX. - TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -@@ -238,18 +238,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib + TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +@@ -248,18 +248,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// % jadetex. @@ -271,7 +269,7 @@ % Earlier entries override later ones, so put this generic one last. TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// -@@ -258,7 +258,7 @@ TEXINPUTS = .;$TEXMF/tex/{ +@@ -268,7 +268,7 @@ TEXINPUTS = .;$TEXMF/tex/{ TTF2TFMINPUTS = .;$TEXMF/ttf2pk// % Metafont, MetaPost inputs. @@ -280,7 +278,7 @@ MPINPUTS = .;$TEXMF/metapost// % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. -@@ -268,31 +268,31 @@ MPINPUTS = .;$TEXMF/metapost// +@@ -278,31 +278,31 @@ MPINPUTS = .;$TEXMF/metapost// % We repeat the same definition three times because of the way fmtutil % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats % will not be found. @@ -319,7 +317,7 @@ % Similarly for the GF format, which only remains in existence because % Metafont outputs it (and MF isn't going to change). -@@ -302,7 +302,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD +@@ -312,7 +312,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD GLYPHFONTS = .;$TEXMF/fonts % A place to puth everything that doesn't fit the other font categories. @@ -328,7 +326,7 @@ % font name map files. This isn't just fonts/map// because ConTeXt % wants support for having files with the same name in the different -@@ -384,8 +384,8 @@ MPSUPPORT = .;$TEXMF/metapost/support +@@ -398,8 +398,8 @@ MPSUPPORT = .;$TEXMF/metapost/support % For xdvi to find mime.types and .mailcap, if they do not exist in % ~. These are single directories, not paths. % (But the default mime.types, at least, may well suffice.) @@ -339,7 +337,7 @@ % Default settings for the fontconfig library as used by the Windows % versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. -@@ -404,10 +404,10 @@ WEBINPUTS = .;$TEXMF/web// +@@ -418,10 +418,10 @@ WEBINPUTS = .;$TEXMF/web// CWEBINPUTS = .;$TEXMF/cweb// % Omega-related fonts and other files. @@ -354,7 +352,7 @@ OTPINPUTS = .;$TEXMF/omega/otp// OCPINPUTS = .;$TEXMF/omega/ocp// -@@ -490,32 +490,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna +@@ -504,32 +504,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna % explicitly list every directory. Arguably more understandable anyway. % TEXMFCNF = {\ @@ -418,15 +416,7 @@ % % For reference, here is the old brace-using definition: %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} -@@ -568,7 +574,6 @@ extractbb,\ - gregorio,\ - kpsewhich,\ - makeindex,\ --mpost,\ - repstopdf,\ - - % we'd like to allow: -@@ -791,3 +796,33 @@ max_cols.gftype = 8191 +@@ -805,3 +811,33 @@ max_cols.gftype = 8191 % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? % Default is 0, to not guess. guess_input_kanji_encoding = 1 ++++++ kpfonts.doc.tar.xz ++++++ ++++++ kpfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kpfonts.tlpobj new/tlpkg/tlpobj/kpfonts.tlpobj --- old/tlpkg/tlpobj/kpfonts.tlpobj 2016-04-14 19:13:19.000000000 +0200 +++ new/tlpkg/tlpobj/kpfonts.tlpobj 2017-04-14 17:45:35.000000000 +0200 @@ -1935,7 +1935,7 @@ RELOC/tex/latex/kpfonts/ujkpsyd.fd RELOC/tex/latex/kpfonts/ujkpsydw.fd catalogue-ctan /fonts/kpfonts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-sans font-mono catalogue-version 3.31 ++++++ ksfh_nat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ksfh_nat.tlpobj new/tlpkg/tlpobj/ksfh_nat.tlpobj --- old/tlpkg/tlpobj/ksfh_nat.tlpobj 2016-04-14 19:13:26.000000000 +0200 +++ new/tlpkg/tlpobj/ksfh_nat.tlpobj 2017-04-14 17:45:38.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=6 RELOC/bibtex/bst/ksfh_nat/ksfh_nat.bst catalogue-ctan /biblio/bibtex/contrib/ksfh_nat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bibtex-sty catalogue-version 1.1 ++++++ ksp-thesis.doc.tar.xz ++++++ ++++++ ksp-thesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ksp-thesis.tlpobj new/tlpkg/tlpobj/ksp-thesis.tlpobj --- old/tlpkg/tlpobj/ksp-thesis.tlpobj 2016-04-14 19:13:26.000000000 +0200 +++ new/tlpkg/tlpobj/ksp-thesis.tlpobj 2017-04-14 17:45:39.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=4 RELOC/tex/latex/ksp-thesis/ksp-thesis.cls catalogue-ctan /macros/latex/contrib/ksp-thesis -catalogue-date 2015-12-10 13:54:57 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics class dissertation catalogue-version 1.0.2 ++++++ ktv-texdata.doc.tar.xz ++++++ ++++++ ktv-texdata.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ktv-texdata.tlpobj new/tlpkg/tlpobj/ktv-texdata.tlpobj --- old/tlpkg/tlpobj/ktv-texdata.tlpobj 2016-04-14 19:13:27.000000000 +0200 +++ new/tlpkg/tlpobj/ktv-texdata.tlpobj 2017-04-14 17:45:39.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/ktv-texdata/ktv-buildnum.sty RELOC/tex/latex/ktv-texdata/ktv-texdata.sty catalogue-ctan /macros/latex/contrib/ktv-texdata -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics data-sel catalogue-version 05.34 ++++++ kurier.doc.tar.xz ++++++ ++++++ kurier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kurier.tlpobj new/tlpkg/tlpobj/kurier.tlpobj --- old/tlpkg/tlpobj/kurier.tlpobj 2016-04-14 19:13:27.000000000 +0200 +++ new/tlpkg/tlpobj/kurier.tlpobj 2017-04-14 17:45:39.000000000 +0200 @@ -618,7 +618,7 @@ RELOC/tex/latex/kurier/ts1kurierlc.fd RELOC/tex/plain/kurier/kurier-math.tex catalogue-ctan /fonts/kurier -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-10-16 16:55:04 +0200 catalogue-license gfsl catalogue-topics font font-otf font-type1 catalogue-version 0.995b ++++++ l2picfaq.doc.tar.xz ++++++ ++++++ l2tabu-english.doc.tar.xz ++++++ ++++++ l2tabu-french.doc.tar.xz ++++++ ++++++ l2tabu-italian.doc.tar.xz ++++++ ++++++ l2tabu-spanish.doc.tar.xz ++++++ ++++++ l2tabu.doc.tar.xz ++++++ ++++++ l3build.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3build/README.md new/doc/latex/l3build/README.md --- old/doc/latex/l3build/README.md 2016-03-26 23:56:01.000000000 +0100 +++ new/doc/latex/l3build/README.md 2017-06-06 01:17:08.000000000 +0200 @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2016/03/26 (r6466) +Release 2017/05/29 Overview -------- @@ -74,6 +74,6 @@ ----- -<p>Copyright (C) 2014,2015 The LaTeX3 Project <br /> +<p>Copyright (C) 2014-2017 The LaTeX3 Project <br /> <a href="http://latex-project.org/">http://latex-project.org/</a> <br /> All rights reserved.</p> Binary files old/doc/latex/l3build/l3build.pdf and new/doc/latex/l3build/l3build.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3build.doc.tlpobj new/tlpkg/tlpobj/l3build.doc.tlpobj --- old/tlpkg/tlpobj/l3build.doc.tlpobj 2016-04-14 19:13:41.000000000 +0200 +++ new/tlpkg/tlpobj/l3build.doc.tlpobj 2017-06-06 02:21:56.000000000 +0200 @@ -1,8 +1,8 @@ name l3build.doc category Package -revision 40146 +revision 44483 shortdesc doc files of l3build relocated 1 -docfiles size=149 +docfiles size=154 RELOC/doc/latex/l3build/README.md RELOC/doc/latex/l3build/l3build.pdf ++++++ l3build.tar.xz ++++++ ++++ 2205 lines of diff (skipped) ++++++ l3experimental.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3experimental/README.md new/doc/latex/l3experimental/README.md --- old/doc/latex/l3experimental/README.md 2016-05-16 00:11:11.000000000 +0200 +++ new/doc/latex/l3experimental/README.md 2017-06-06 01:17:08.000000000 +0200 @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2016/05/14 (r6495) +Release 2017/05/29 Overview -------- @@ -21,20 +21,10 @@ Currently included in the CTAN release of l3experimental are the following bundles: -* `l3sort` * `l3str` * `xcoffins` * `xgalley` -`l3sort` --------- - -Ordered variables content (in `tl`, `clist` or `seq` variables) may be sorted -in a flexible manner using the `l3sort` module. The definition of how to sort -two items is provided by the programmer at the point at which the sort is -carried out. Internally, the sorting algorithm is designed to take advantage -of TeX token registers to allow a high performance and scalable sort. - `l3str` ------- @@ -42,11 +32,7 @@ category code 12 ('other'), with the exception of spaces which have the category code 10 ('space'). The `l3str` bundle consists of two parts. The first is `l3str` itself. This is a collection of functions to act on strings, -including for manipulations such as UTF8 mappings in pdfTeX. The second -part of the bundle is `l3regex`, a regular expression search-and-replace -implementation written in TeX primitives. The regex module works on token -lists, and is part of `l3str` (currently) for historical reasons: the team -anticipate splitting the two in the future. +including for manipulations such as UTF8 mappings in pdfTeX. `xcoffins` ---------- @@ -125,6 +111,6 @@ ----- -<p>Copyright (C) 1998-2011,2015 The LaTeX3 Project <br /> +<p>Copyright (C) 1998-2011,2015-2017 The LaTeX3 Project <br /> <a href="http://latex-project.org/">http://latex-project.org/</a> <br /> All rights reserved.</p> Binary files old/doc/latex/l3experimental/l3sort/l3sort.pdf and new/doc/latex/l3experimental/l3sort/l3sort.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3flag.pdf and new/doc/latex/l3experimental/l3str/l3flag.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3regex.pdf and new/doc/latex/l3experimental/l3str/l3regex.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3str-convert.pdf and new/doc/latex/l3experimental/l3str/l3str-convert.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3str-format.pdf and new/doc/latex/l3experimental/l3str/l3str-format.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3tl-analysis.pdf and new/doc/latex/l3experimental/l3str/l3tl-analysis.pdf differ Binary files old/doc/latex/l3experimental/l3str/l3tl-build.pdf and new/doc/latex/l3experimental/l3str/l3tl-build.pdf differ Binary files old/doc/latex/l3experimental/xcoffins/xcoffins.pdf and new/doc/latex/l3experimental/xcoffins/xcoffins.pdf differ Binary files old/doc/latex/l3experimental/xgalley/l3galley.pdf and new/doc/latex/l3experimental/xgalley/l3galley.pdf differ Binary files old/doc/latex/l3experimental/xgalley/xgalley.pdf and new/doc/latex/l3experimental/xgalley/xgalley.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3experimental.doc.tlpobj new/tlpkg/tlpobj/l3experimental.doc.tlpobj --- old/tlpkg/tlpobj/l3experimental.doc.tlpobj 2016-05-16 00:51:56.000000000 +0200 +++ new/tlpkg/tlpobj/l3experimental.doc.tlpobj 2017-06-06 02:21:57.000000000 +0200 @@ -1,17 +1,12 @@ name l3experimental.doc category Package -revision 41163 +revision 44483 shortdesc doc files of l3experimental relocated 1 -docfiles size=938 +docfiles size=460 RELOC/doc/latex/l3experimental/README.md - RELOC/doc/latex/l3experimental/l3sort/l3sort.pdf - RELOC/doc/latex/l3experimental/l3str/l3flag.pdf - RELOC/doc/latex/l3experimental/l3str/l3regex.pdf RELOC/doc/latex/l3experimental/l3str/l3str-convert.pdf RELOC/doc/latex/l3experimental/l3str/l3str-format.pdf - RELOC/doc/latex/l3experimental/l3str/l3tl-analysis.pdf - RELOC/doc/latex/l3experimental/l3str/l3tl-build.pdf RELOC/doc/latex/l3experimental/xcoffins/xcoffins.pdf RELOC/doc/latex/l3experimental/xgalley/l3galley.pdf RELOC/doc/latex/l3experimental/xgalley/xgalley.pdf ++++++ l3experimental.tar.xz ++++++ ++++ 9754 lines of diff (skipped) ++++++ l3kernel.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-m/l3kernel.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/l3kernel.doc.tar.xz differ: char 27, line 1 ++++++ l3kernel.tar.xz ++++++ ++++ 21932 lines of diff (skipped) ++++++ l3packages.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3packages/README.md new/doc/latex/l3packages/README.md --- old/doc/latex/l3packages/README.md 2016-05-18 23:59:39.000000000 +0200 +++ new/doc/latex/l3packages/README.md 2017-06-06 01:17:08.000000000 +0200 @@ -1,7 +1,7 @@ LaTeX3 High-Level Concepts ========================== -Release 2016/05/18 (r6512) +Release 2017/05/29 Overview -------- @@ -21,6 +21,7 @@ Currently included in the CTAN release of `l3packages` are the following bundles: * `l3keys2e` +* `xfp` * `xfrac` * `xparse` * `xtemplate` @@ -33,6 +34,15 @@ uses for processing options, and so it is likely that a stand-alone LaTeX3 kernel will use a very different approach. +`xfp` +----- + +The `xfp` package provides a document-level interface for the LaTeX3 +FPU. As such, it is a wrapper around the core `\fp_eval:n` function +but does not require code syntax. It provides the expandable command +`\fpeval`, which can be used inside for example `\edef` or contexts +where TeX requires a number. + `xfrac` ------- @@ -112,6 +122,6 @@ ----- -<p>Copyright (C) 1998-2011,2015 The LaTeX3 Project <br /> +<p>Copyright (C) 1998-2011,2015-2017 The LaTeX3 Project <br /> <a href="http://latex-project.org/">http://latex-project.org/</a> <br /> All rights reserved.</p> Binary files old/doc/latex/l3packages/l3keys2e/l3keys2e.pdf and new/doc/latex/l3packages/l3keys2e/l3keys2e.pdf differ Binary files old/doc/latex/l3packages/xfp/xfp.pdf and new/doc/latex/l3packages/xfp/xfp.pdf differ Binary files old/doc/latex/l3packages/xfrac/xfrac.pdf and new/doc/latex/l3packages/xfrac/xfrac.pdf differ Binary files old/doc/latex/l3packages/xparse/xparse.pdf and new/doc/latex/l3packages/xparse/xparse.pdf differ Binary files old/doc/latex/l3packages/xtemplate/xtemplate.pdf and new/doc/latex/l3packages/xtemplate/xtemplate.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3packages.doc.tlpobj new/tlpkg/tlpobj/l3packages.doc.tlpobj --- old/tlpkg/tlpobj/l3packages.doc.tlpobj 2016-05-19 17:31:07.000000000 +0200 +++ new/tlpkg/tlpobj/l3packages.doc.tlpobj 2017-06-06 02:22:02.000000000 +0200 @@ -1,12 +1,13 @@ name l3packages.doc category Package -revision 41246 +revision 44483 shortdesc doc files of l3packages relocated 1 -docfiles size=418 +docfiles size=494 RELOC/doc/latex/l3packages/README.md RELOC/doc/latex/l3packages/l3keys2e/l3keys2e-demo.tex RELOC/doc/latex/l3packages/l3keys2e/l3keys2e.pdf + RELOC/doc/latex/l3packages/xfp/xfp.pdf RELOC/doc/latex/l3packages/xfrac/xfrac.pdf RELOC/doc/latex/l3packages/xparse/xparse.pdf RELOC/doc/latex/l3packages/xtemplate/xtemplate.pdf ++++++ l3packages.tar.xz ++++++ ++++ 3389 lines of diff (skipped) ++++++ labbook.doc.tar.xz ++++++ ++++++ labbook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/labbook.tlpobj new/tlpkg/tlpobj/labbook.tlpobj --- old/tlpkg/tlpobj/labbook.tlpobj 2016-04-14 19:13:55.000000000 +0200 +++ new/tlpkg/tlpobj/labbook.tlpobj 2017-04-14 17:45:51.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=5 RELOC/tex/latex/labbook/labbook.cls catalogue-ctan /macros/latex/contrib/labbook -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics record-keep class ++++++ labels.doc.tar.xz ++++++ ++++++ labels.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/labels.tlpobj new/tlpkg/tlpobj/labels.tlpobj --- old/tlpkg/tlpobj/labels.tlpobj 2016-04-14 19:13:56.000000000 +0200 +++ new/tlpkg/tlpobj/labels.tlpobj 2017-04-14 17:45:51.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/labels/labels.sty RELOC/tex/latex/labels/olabels.sty catalogue-ctan /macros/latex/contrib/labels -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics labels catalogue-version .13 ++++++ labyrinth.doc.tar.xz ++++++ ++++++ labyrinth.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/labyrinth.tlpobj new/tlpkg/tlpobj/labyrinth.tlpobj --- old/tlpkg/tlpobj/labyrinth.tlpobj 2016-04-14 19:13:56.000000000 +0200 +++ new/tlpkg/tlpobj/labyrinth.tlpobj 2017-04-14 17:45:51.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/labyrinth/labyrinth.sty catalogue-ctan /macros/latex/contrib/labyrinth -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games catalogue-version 1.0 ++++++ lacheck.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/lacheck.man1.pdf and new/texmf-dist/doc/man/man1/lacheck.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lacheck.doc.tlpobj new/tlpkg/tlpobj/lacheck.doc.tlpobj --- old/tlpkg/tlpobj/lacheck.doc.tlpobj 2016-04-27 03:17:36.000000000 +0200 +++ new/tlpkg/tlpobj/lacheck.doc.tlpobj 2017-05-04 02:07:04.000000000 +0200 @@ -1,7 +1,7 @@ name lacheck.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of lacheck -docfiles size=7 +docfiles size=3 texmf-dist/doc/man/man1/lacheck.1 texmf-dist/doc/man/man1/lacheck.man1.pdf ++++++ latex2e-help-texinfo-fr.doc.tar.xz -> ladder.doc.tar.xz ++++++ ++++ 65798 lines of diff (skipped) ++++++ lambda-lists.doc.tar.xz ++++++ ++++++ lambda-lists.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lambda-lists.tlpobj new/tlpkg/tlpobj/lambda-lists.tlpobj --- old/tlpkg/tlpobj/lambda-lists.tlpobj 2016-04-14 19:13:59.000000000 +0200 +++ new/tlpkg/tlpobj/lambda-lists.tlpobj 2017-04-14 17:45:52.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/plain/lambda-lists/lambda.sty catalogue-ctan /macros/generic/lambda-lists -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp ++++++ lambda.tar.xz ++++++ ++++++ langcode.doc.tar.xz ++++++ ++++++ langcode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/langcode.tlpobj new/tlpkg/tlpobj/langcode.tlpobj --- old/tlpkg/tlpobj/langcode.tlpobj 2016-04-14 19:13:59.000000000 +0200 +++ new/tlpkg/tlpobj/langcode.tlpobj 2017-04-14 17:45:52.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/generic/langcode/langcode.sty catalogue-ctan /macros/generic/langcode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual macro-gen catalogue-version 0.2 ++++++ langsci.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/README.md new/doc/xelatex/langsci/README.md --- old/doc/xelatex/langsci/README.md 2016-05-10 23:26:42.000000000 +0200 +++ new/doc/xelatex/langsci/README.md 2017-04-28 23:15:08.000000000 +0200 @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Project: langsci %% Author: Language Science Press (http://langsci-press.org) -%% Date: 2016-05-10 11:11:11 UTC +%% Date: 2017-04-28 11:11:11 UTC %% Purpose: publishing boks with Language Science Press. %% Languages: LaTeX, tikz, eps %% Copyright 2012- Language Science Press @@ -22,15 +22,18 @@ %% - series.def: metadata for series %% - colors.def: colors used by the series %% - langsci-basic.sty for commands required by the standard template -%% - bib style definitions langsci-unified.bst, biblatex-langsci-unified.bbx, langsci-authoryear-comp.cbx -%% - files for the logos used in the textbook series Textbooks in Language Sciences: book.eps bulb.eps glass.eps law.eps +%% - bib style definitions langsci-unified.bst, biblatex-langsci-unified.bbx, langsci-authoryear-comp.cbx, biblatex-langsci-unified-undecap.bbx +%% - files for the logos used in the textbook series Textbooks in Language Sciences: tbls-book.eps tbls-bulb.eps tbls-glass.eps tbls-law.eps %% - the file logo.pdf as a dummy, to be replaced with a file for the hosting institution %% - a file advertisement.tex added to the very last page in tikz %% - langsci-optional.sty: additional useful commands %% - langsci-gb4e.sty and langsci-cgloss.sty: typeset linguistic examples %% - langsci-forest-setup.sty: definitions for linguistic trees %% - langsci-bidi.sty: bidirectional text -%% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences +%% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciencesjambox.sty +%% - langsci-glyphs.sty: some workarounds for Libertine font limitations +%% - langsci-linguex.sty: a version of linguex which does not break gb4e +%% - langsci-subparts.sty: adds an additional sectioning level between part and chapter %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -48,10 +51,13 @@ The following optional packages are also provided, but have to be included manually if desired: - `langsci-optional.sty`: additional useful commands -- `langsci-gb4e.sty` and langsci-cgloss.sty typeset linguistic examples +- `langsci-gb4e.sty` and `langsci-cgloss.sty` typeset linguistic examples +- `langsci-linguex.sty`: a version of linguex which does not break gb4e - `langsci-forest-setup.sty`: definitions for linguistic trees - `langsci-bidi.sty`: bidirectional text -- `langsci-tbls.sty`: macros for the textbook series Textbooks in Language Sciences +- `langsci-tbls.sty`: macros for the textbook series Textbooks in Language Sciences +- `langsci-glyphs.sty`: some shortcuts for font workarounds +- `langsci-subparts.sty`: adds an additional sectioning level between part and chapter Documentation is found in the folder `documentation/`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/avm.sty new/doc/xelatex/langsci/avm.sty --- old/doc/xelatex/langsci/avm.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/xelatex/langsci/avm.sty 2017-04-24 23:27:53.000000000 +0200 @@ -0,0 +1,184 @@ +%% avm.sty - a style file for attribute-value matrices +%% Copyright 1992, 1993, 2006, 2013 Christopher Manning (manning(a)cs.stanford.edu) +% +% v 1.00 mar 29, 1992 +% v 1.01 dec 6, 1993 +% v 1.02 jan 5, 2006 +% v 1.03 dec 8, 2013 +% +% 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://www.latex-project.org/lppl.txt +% 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 Christopher Manning. +% +% This work consists of the files avm.sty, avm-doc.tex, avm-test.tex. + +\newif\ifavmactive\newif\ifavmsorted\newif\ifavmlabeled +\newif\ifavmcenter\newif\ifavmbottom +\newif\ifavmbottomright\newif\ifavmtopleft\newif\ifavmtopright + +\newdimen\avmdimen +\newbox\avmboxone\newbox\avmboxthree + +\def\avmoptions#1{\avmactivefalse\avmsortedfalse\avmlabeledfalse + \avmcenterfalse\avmbottomfalse + \avmbottomrightfalse\avmtopleftfalse\avmtoprightfalse + \def\more{#1}\ifx\more\empty\else\avmjoptions#1,\@nil\fi} +\def\avmjoptions#1,#2\@nil{\def\more{#2}\csname avm#1true\endcsname + \ifx\more\empty\else\avmjoptions#2\@nil\fi} + + +\def\avmfont#1{\def\avmjfont{#1}} +\def\avmjfont{} + +\def\avmvalfont#1{\def\avmjvalfont{#1}} +\def\avmjvalfont{} + +\def\avmsortfont#1{\def\avmjsortfont{#1}} +\def\avmjsortfont{} + +\def\avmhskip#1{\def\avmjhskip{#1}} +\def\avmjhskip{1em} + +\def\avmbskip#1{\def\avmjbskip{#1}} +\def\avmjbskip{0em} + +\def\avmvskip#1{\def\avmjvskip{#1}} +\def\avmjvskip{0.385ex}%was .3875 + + +\def\avmjprolog#1{$\mskip-\thinmuskip + \left#1\hskip\avmjbskip\vcenter\bgroup\vskip\avmjvskip + \ialign\bgroup\avmjfont + \strut ##\unskip\hfil + &&\hskip\avmjhskip\avmjvalfont ##\unskip\hfil\cr} +\def\avmjpostlog#1{\crcr\egroup\vskip\avmjvskip\egroup + \hskip\avmjbskip\right#1\mskip-\thinmuskip$\ignorespaces} + + +\def\avmjcatcode{\let\lparen=(\let\rparen=)\catcode`\[=13\catcode`\]=13 + \catcode`\<=13\catcode`\@=13\catcode`$=13\catcode`$=13 + \catcode`\>=13\catcode`\|=13} + +{\avmjcatcode % new group: redefine above catcodes as active + +\gdef\specialavm{\avmjcatcode +\def({\avmjprolog\lparen}% +\def){\avmjpostlog\rparen}% +\def<{\avmjprolog\langle}% +\def>{\avmjpostlog\rangle}% +\ifavmsorted +\def[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox2=\hbox + \bgroup\avmjprolog\lbrack}% +\def]{\avmjpostlog\rbrack\egroup\avmjsort}% +\else\ifavmlabeled +\def[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}% +\def]{\avmjpostlog]\egroup\node{\more}{\box2}}% +\else +\def[{\avmjprolog\lbrack}% +\def]{\avmjpostlog\rbrack}% +\fi\fi +% +\def\<{$\langle$}\def\>{$\rangle$}% +\def${\lparen} +\def${\rparen}% +\def\[{\lbrack} +\def\]{\rbrack}% +\def|{$\,\vert\,$}% +\def@##1{\avmbox{##1}}% +} % end defn of \specialavm +} % restore active catcodes + + +\long\def\avm{\begingroup +\ifavmactive\specialavm +\else +\def${\avmjprolog(}% +\def${\avmjpostlog)}% +\def\<{\avmjprolog\langle}% +\def\>{\avmjpostlog\rangle}% +% +\ifavmsorted +\def\[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox + 2=\hbox\bgroup\avmjprolog[}% +\def\]{\avmjpostlog]\egroup\avmjsort}% +\else\ifavmlabeled +\def\[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}% +\def\]{\avmjpostlog]\egroup\node{\more}{\box2}}% +\else +\def\[{\avmjprolog[}% +\def\]{\avmjpostlog]}% +\fi\fi +% +\def\|{$\,\vert\,$}% +\def\@##1{\avmbox{##1}}% +\fi % end not active +% +\ifx\LaTeX\undefined\def\\{\cr}% running under TeX +\else \ifx\@tabularcr\relax +\def\\{\@arraycr}% fix for the Mainz array package +\else +\def\\{\@tabularcr}% Leverage off LaTeX's \\*[dimen] options +\fi +\fi +\def\!{\node}% +\long\def\avmjsort{\dimen2=\ht2\advance\dimen2 by -.25\baselineskip + \global\dimen\avmdimen=\wd\avmboxthree + \ifavmtopleft \raise\dimen2\llap{\box\avmboxthree}\box2% + \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree + \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree + \else \lower\dimen2\llap{\box\avmboxthree}\box2% + \fi\fi\fi}% +\long\def\sort##1##2{\setbox2=\hbox{##2}\setbox + \avmboxthree=\hbox{\avmjsortfont##1\/}\dimen2=\ht2% + \advance\dimen2 by -.25\baselineskip + \ifavmtopleft \raise\dimen2\box\avmboxthree\box2% + \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree% + \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree% + \else \lower\dimen2\box\avmboxthree\box2% + \fi\fi\fi}% +\long\def\osort##1##2{\setbox2=\hbox{##2}\setbox + \avmboxthree=\hbox{\avmjsortfont ##1\/}\avmjsort}% +\def\asort##1{\avmspan{\avmjsortfont ##1}\\}% +\def\avml{\avmjprolog.}% +\def\avmr{\avmjpostlog.}% +\def\avmb##1{\node{##1}{\lbrack\;\rbrack}}% +\def\avmd##1{\node{##1}{---}}% +\def\q##1{\ifx ##1\{$\lbrace$\else + \ifx ##1\}$\rbrace$\else + \ifx ##1<$\langle$\else + \ifx ##1>$\rangle$\fi \fi \fi \fi}% +\def\{{\avmjprolog\lbrace}% +\def\}{\avmjpostlog\rbrace}% +\def\;{\hskip\avmjhskip}% +\def\avmspan##1{\multispan2\strut ##1\expandafter\hfil}% +\avmjfont +\openup\avmjvskip +\setbox\avmboxone=\hbox\bgroup\ignorespaces +} % end defn of \avm + + +\def\endavm{\egroup\ifvmode\leavevmode\fi % this if is useful! + \ifavmsorted\null\hskip\dimen\avmdimen\fi + \ifavmcenter + \box\avmboxone + \else \ifavmbottom + \lower.575\baselineskip\hbox{\vbox{\box\avmboxone\null}}% + \else +% the next bit is ripped off from Emma's \evnup in lingmacros.sty + \dimen2=\ht\avmboxone\advance\dimen2 by -.725\baselineskip + \lower\dimen2\box\avmboxone +\fi \fi \endgroup} + + +% based on TeXbook exercise 21.3 +\def\avmbox#1{\setbox2=\hbox{$\scriptstyle #1$}\lower.2ex\vbox{\hrule + \hbox{\vrule\kern1.25pt + \vbox{\kern1.25pt\box2\kern1.25pt}\kern1.25pt\vrule}\hrule}} Binary files old/doc/xelatex/langsci/documentation/langsci-doc.pdf and new/doc/xelatex/langsci/documentation/langsci-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/documentation/langsci-doc.tex new/doc/xelatex/langsci/documentation/langsci-doc.tex --- old/doc/xelatex/langsci/documentation/langsci-doc.tex 2016-05-10 00:48:39.000000000 +0200 +++ new/doc/xelatex/langsci/documentation/langsci-doc.tex 2017-04-28 23:15:08.000000000 +0200 @@ -1,5 +1,4 @@ \documentclass[% -modfonts, output=guidelines, guidelines]{langscibook} \author{Sebastian Nordhoff} @@ -20,7 +19,7 @@ % \BookDOI{} % \renewcommand{\lsURL}{http://langsci-press.org/catalog/book/000} -\bibliography{localbibliography} +% \bibliography{localbibliography} \newcommand{\option}[3]{\subsection{\texttt{#1}}{#2}\\Default value: {\texttt{#3}}} \begin{document} @@ -41,7 +40,7 @@ \chapter{The class} The class is loaded via \verb+\documentclass{langscibook}+. The standard use case is the creation of a book. If used without an \texttt{output=} option, the option \texttt{output=book} is loaded. The class can also be used to create dust jackets for books with different measurements via the output option values \texttt{covercreatespace} (for \url{http://www.createspace.com}) and -\texttt{coverbod} (for \url{http://www.bod.de}). +\texttt{coverbodsc/coverbodhc} (for \url{http://www.bod.de}). The class provides for the following: \begin{itemize} @@ -78,6 +77,9 @@ % \item \texttt{langsci-lgr.sty}: \item \texttt{langsci-tbls.sty}: Package for the textbook series Textbooks in Language Sciences \item \texttt{langsci-bidi.sty}: Package for typesetting right-to-left text +% \item \texttt{langsci-glyphs.sty}: some shortcuts for font workarounds +% \item \texttt{langsci-subparts.sty}: adds an additional sectioning level between part and chapter + \end{itemize} \section{Colors and series definitions} @@ -87,7 +89,7 @@ The easiest way to start a book is to download the skeletons from \url{http://langsci-press.org/templatesAndTools}. Sample documents for monographs, edited volumes and chapters in edited volumes are provided in the folder \texttt{samples/} as well. \section{Creating a monograph} -Load the class. Make sure the following metadata values are set, either as options or with the metadata commands listed in \sectref{sec:metadatacommands}: +Load the class. Make sure the following metadata values are set with the metadata commands listed in \sectref{sec:metadatacommands}: \begin{itemize} \item author @@ -115,7 +117,7 @@ \section{Creating an edited volume} -Proceed as for a monograph, but use the option \texttt{collection}. Use \verb+\author+ for the editor(s). You may want to use the further options \texttt{collectionchapter} and \texttt{collectiontoclong}. Chapters are included via \verb+\includepaper{}+. Set the bibliography resource for all papers in the main file. +Proceed as for a monograph, but use the option \texttt{collection}. Use \verb+\author+ for the editor(s). Use the option \texttt{multiauthors} if there is more than one editor. You may want to use the further options \texttt{collectionchapter} and \texttt{collectiontoclong}. Chapters are included via \verb+\includepaper{}+. Set the bibliography resource for all papers in the main file. \section{Creating a paper for an edited volume} @@ -126,15 +128,14 @@ \item \verb+\abstract+ (optional) \end{itemize} -You might want to redefine \verb+\rohead+ for chapters with very long titles. +You might want to use \verb+\shorttitlerunninghead+ for chapters with very long titles. \chapter{Creating a dust jacket} -Use the option \texttt{coverbod} or \texttt{covercreatespace}. Set the lengths \verb+\bodspine+ and \verb+\csspine+. For \texttt{covercreatespace} set the further output option \texttt{coverus} if desired. Run {\XeLaTeX} twice. Upload to the respective websites to see whether the lengths were chosen correctly. +Use the option \texttt{coverbodhc}, \texttt{coverbodsc} or \texttt{covercreatespace} and set the option \texttt{spinewidth}. Run {\XeLaTeX} twice. Upload to the respective websites to see whether the lengths were chosen correctly. \chapter{Options} -The class has flag options to toggle certain behaviour and string options to set metadata values. -The metadata values can all also be set via the metadata commands listed in \sectref{sec:metadatacommands}. +The class has flag options to toggle certain behaviour and string options to set metadata values. \section{Flag options} % \option{blackandwhite} @@ -143,39 +144,36 @@ % \option{smallfont} % use 10pt as fontsize % {false -\option{draftmode}{Switch to draft mode (adds: draft stamp, indication of overlong lines, date)}{false} -\option{openreview}{Switch to open review mode}{false} % \option{noindex} % remove index} % {false -\option{nonflat}{Use elaborate directory structure. If set to true, fonts, packages etc will be loaded from subfolders. If set to false, they will be loaded from the working directory}{false} -\option{modfonts}{Use modified fonts provided by Language Science Press}{false} -\option{showindex}{Show indexed terms in margin}{false} \option{biblatex}{Use Bib\LaTeX}{true} \option{bibtex}{Use Bibtex}{false} -\option{newtxmath}{Switch math fonts to newtxmath}{false} \option{collection}{Make the book an edited volume}{false} \option{collectionchapter}{Add numeric chapter prefix to each contribution.}{false} -\option{collectiontoclong}{More detailed table of content in edited volumes}{false} -\option{coverus}{Use \texttt{isbnsoftcoverus} instead of \texttt{isbnsoftcover} if \texttt{output=covercreatespace}}{false} +\option{collectiontoclong}{More detailed table of content in edited volumes}{false} +\option{draftmode}{Switch to draft mode (adds: draft stamp, indication of overlong lines, date)}{false} +\option{openreview}{Switch to open review mode}{false} +\option{modfonts}{Use modified fonts provided by Language Science Press}{false} +\option{multiauthors}{Set editor suffix to eds. instead of ed.}{false} +\option{newtxmath}{Switch math fonts to newtxmath}{false} +\option{nobabel}{Do not use the Babel package in the class}{false} +\option{nonflat}{Use elaborate directory structure. If set to true, fonts, packages etc will be loaded from subfolders. If set to false, they will be loaded from the working directory}{false} +\option{showindex}{Show indexed terms in margin}{false} +\option{smallfont}{Use a smaller font for books above 500 pages}{false} +\option{undecapitalize}{Do not decapitalize titles in the list of references}{false} -\section{String options} -\option{number}{Number of the book within the series}{"??"} -\option{issn}{ISSN of the series this book will appear in}{"??"} -\option{isbndigital}{The ISBN of the digital release}{"000-0-000000-00-0"} -\option{isbnsoftcover}{The ISBN of the soft cover release}{"000-0-000000-00-0"} -\option{isbnsoftcoverus}{The ISBN of the US version of soft cover release (used for distribution to US academic institutions)}{"000-0-000000-00-0"} -\option{isbnhardcover}{The ISBN of the hard cover release}{"000-0-000000-00-0"} -\option{url}{The URL of the book }{"http://langsci-press.org/catalog"} -\option{series}{The series code (see \texttt{series.def} for a list of acronyms)}{"eotms"} +\section{String options} \option{output}{Different output formats}{book} \begin{itemize} \item \texttt{book}: The book with frontcover and backcover \item \texttt{inprep}: Mark manuscript as in preparation \item \texttt{paper}: Contribution to edited volume \item \texttt{guidelines}: Choose color grey; condense frontmatter -\item \texttt{coverbod}: Create a two-page wide cover (back-spine-front) for use with BoD +\item \texttt{coverbodsc}: Create a two-page wide cover (back-spine-front) for use with BoD hardcover books +\item \texttt{coverbodsc}: Create a two-page wide cover (back-spine-front) for use with BoD softcover books \item \texttt{covercreatespace}: Create a two-page wide cover (back-spine-front) for use with CreateSpace +\item \texttt{spinewidth}{The width of the spine (for cover creation)} \end{itemize} \option{copyright}{The license chosen}{"CC-BY"} \option{biblatexbackend}{The backend of BibLaTeX}{"bibtex"} @@ -205,7 +203,7 @@ \section{Metadata commands}\label{sec:metadatacommands} -The following commands are used to indicated metadata. These commands can override the options passed to the class. +The following commands are used to indicated metadata. \option{$\backslash$BackBody}{Text to be printed on the back cover}{Europan lingues es membres del sam familie. Lor separat existentie es un myth. Por scientie, musica, sport etc, litot Europa usa li sam vocabular. Li lingues differe solmen in li grammatica, li pronunciation e li plu commun vocabules. Omnicos directe al desirabilite de un nov lingua franca: On refusa continuar payar custosi traductores.} @@ -218,7 +216,7 @@ \option{$\backslash$ISBNsoftcover}{ISBN for the softcover version}{000-0-000000-00-0} \option{$\backslash$ISBNsoftcoverus}{ISBN for the softcover version (US distribution)}{000-0-000000-00-0} \option{$\backslash$Series}{The series this book appears in. Use the acronyms found in \texttt{series.def}}{eotms} -\option{$\backslash$SeriesNumber}{Number of the book in the series}{??} +\option{$\backslash$SeriesNumber}{Position of the book in its series}{??} \option{$\backslash$URL}{The URL where this title can be downloaded}{http://langsci-press.org/catalog} @@ -231,15 +229,14 @@ \section{Command redefinitions} Redefine the following commands to further alter the appearance: -\option{$\backslash$lsAdvertisement}{specify the advertisement on the last page of the book}{$\backslash$include\{$\backslash$logopath didyoulikethisbook\}} +\option{$\backslash$lsAdvertisement}{Specify the advertisement on the last page of the book}{$\backslash$include\{$\backslash$logopath didyoulikethisbook\}} \option{$\backslash$lsBackBodyFont}{Font used for text on back cover}{\textrm{main font}} \option{$\backslash$lsBackTitleFont}{Font used for title on back cover}{$\backslash$sffamily$\backslash$addfontfeatures{Scale=MatchUppercase}\\$\backslash$fontsize\{25pt\}\{10mm\}$\backslash$selectfont} \option{$\backslash$lsCopyright}{Choice of licence}{CC-BY} \option{$\backslash$lsCoverAuthorFont}{Font for author/editor on cover}{$\backslash$fontsize\{25pt\}\{12.5mm\}$\backslash$selectfont} -\option{$\backslash$lsCoverSubTitleFont}{Font for the subtitle}{$\backslash$sffamily$\backslash$addfontfeatures\{Scale=MatchUppercase\}\\ -$\backslash$fontsize\{25pt\}\{10mm\}$\backslash$selectfont} -% \option{$\backslash$lsCoverTitleFont -\option{$\backslash$lsEditorPrefix}{How editors are indicated on title page. Useful for localization.}{{$\backslash$LARGE Edited by}\\} +\option{$\backslash$lsCoverSubTitleFont}{Font for the subtitle}{$\backslash$sffamily$\backslash$addfontfeatures\{Scale=MatchUppercase\}\\ $\backslash$fontsize\{25pt\}\{10mm\}$\backslash$selectfont} +\option{$\backslash$lsCoverTitleFont}{Font for the title}{$\backslash$sffamily$\backslash$addfontfeatures{Scale=MatchUppercase}\\ $\backslash$fontsize{52pt}{17.25mm}$\backslash$selectfont} +\option{$\backslash$lsEditorPrefix}{How editors are indicated on title page. Useful for localization.}{{$\backslash$LARGE Edited by$\backslash$$\backslash$}} \option{$\backslash$lsFontsize}{size of main font}{11pt} \option{$\backslash$lsImpressumCitationText}{custom citation text, useful for including notes etc.}{\textrm{computed from author and title fields}} \option{$\backslash$lsISSN}{ISSN of the series}{??} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/examples/samplemonograph.tex new/doc/xelatex/langsci/examples/samplemonograph.tex --- old/doc/xelatex/langsci/examples/samplemonograph.tex 2016-05-10 00:48:39.000000000 +0200 +++ new/doc/xelatex/langsci/examples/samplemonograph.tex 2017-04-24 23:27:53.000000000 +0200 @@ -13,10 +13,7 @@ \dedication{For Mom and Dad} \typesetter{Jane Doe} \proofreader{John Doe} -\BackBody{What everyone should know about monographs: it's here} - -\setlength{\csspine}{25.0559784mm} -\setlength{\bodspine}{20mm} +\BackBody{What everyone should know about monographs: it's here} \bibliography{localbibliography} \begin{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/examples/samplevolume.tex new/doc/xelatex/langsci/examples/samplevolume.tex --- old/doc/xelatex/langsci/examples/samplevolume.tex 2016-05-10 00:48:39.000000000 +0200 +++ new/doc/xelatex/langsci/examples/samplevolume.tex 2017-04-24 23:27:53.000000000 +0200 @@ -1,8 +1,6 @@ \documentclass[output=book ,collection - ,collectionchapter - ,collectiontoclongg - ,biblatex + ,collectionchapter ]{langscibook} \author{Jane Doe} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/langsci/jambox.sty new/doc/xelatex/langsci/jambox.sty --- old/doc/xelatex/langsci/jambox.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/xelatex/langsci/jambox.sty 2017-04-24 23:27:53.000000000 +0200 @@ -0,0 +1,93 @@ +%%%%%%%%%%%%%%%%%% JAMBOX: RIGHT-COLUMN ANNOTATIONS %%%%%%%%%%%%%%%% +% +% Alexis Dimitriadis +% +% This is version 0.3 (informal release, Nov. 2003). +% +% Line up material a fixed distance from the right margin. For annotating +% example sentences, usually with a short note in parentheses. +% May overflow to the left or right, or line up on the next line as necessary. +% +% \jambox[width]{text} Align 'text' starting 'width' distance from the +% right margin (default \the\jamwidth). +% \jam(something) Align a note delimited by parentheses (which are +% retained). No optional argument. +% \jambox*{text} Set \jamwidth to the width of 'text', then align it. +% (\jamwidth stays set for the rest of the environment). +% +% Notes: +% +% Distance from the right margin can be set to an explicit amount, or to the +% width of some piece of text, as follows: +% +% \jamwidth=2in\relax Or +% \settowidth\jamwidth {(``annotation'')} +% +% \jamwidth is locally scoped, so it can be set globally or inside an example +% environment. +% +% BUG: Not compatible with ragged-right mode. +% +% Incompatibilities: Not useful with the vanilla cgloss4e.sty, which ends +% glossed lines prematurely. +% I do have a suitably modified file, cgloss.sty. With it you can do the +% following: +% \gll To kimeno. \\ +% the text \\ \jambox{(Greek)} +% \trans `The text.' + + +\newdimen\jamwidth \jamwidth=2in +\def\jambox{\@ifnextchar[{\@jambox} + {\@ifnextchar*{\@jamsetbox}{\@jambox[\the\jamwidth]}}} + +% Quickie invocation: The argument is delimited by the parentheses (no width +% argument allowed). I redefine it in my documents to add formatting. +% Syntax: \jam(Some note) +% +\def\jam(#1){\jambox{(#1)}} + +% Set width AND display the argument. +% The star is read and ignored; the argument #1 is boxed, used to set +% \jamwidth, then passed to \@jambox (which also puts it in \@tempboxa!) +% +\def\@jamsetbox*#1{\setbox\@tempboxa\hbox{#1}\jamwidth=\wd\@tempboxa + \@jambox[\the\jamwidth]{\box\@tempboxa}} + +%% Version 1: old & stupid +%% \def\@jambox[#1]#2{\hfill\hbox to #1 {#2\hfil}} + +% Version 2: +% Always takes up \jamwidth space, even if it means breaking the line. But it +% works on ragged-right mode, too. +% \def\@jambox[#1]#2{\setbox\@tempboxa\hbox {#2\hfil}% +% \ifdim \wd\@tempboxa<#1\relax \wd\@tempboxa=#1\relax\fi +% \hskip 0.5em plus 1fill +% \penalty 100\vadjust{}\nobreak\hfill\box\@tempboxa\par} +% The penalty enables a break. \vadjust inserts an empty element +% at the beginning of the next line, protecting \hfill from being discarded. + +% Version 3: +% This seems to cover everything! But unfortunately, it won't work in +% ragged-right mode-- the line is broken BEFORE the last word, to make enough +% space... +\def\@jambox[#1]#2{{\setbox\@tempboxa\hbox {#2}% + \ifdim \wd\@tempboxa<#1\relax % if label fits in the alloted space: + \@tempdima=#1\relax \advance\@tempdima by-\wd\@tempboxa % remaining \hspace + \unskip\nobreak\hfill\penalty250 % break line here if necessary + \hskip 1.2em minus 1.2em % used when the line extends past the margin + \hbox{}\nobreak\hfill\box\@tempboxa\nobreak + \hskip\@tempdima minus \@tempdima\hbox{}% + \else % the label is too wide: just right-align it + \hfill\penalty50\hbox{}\nobreak\hfill\box\@tempboxa + \fi + % suppress closing glue: + \parfillskip=0pt \finalhyphendemerits=0 \par}} +% The penalty enables a break, taken only if the line cannot fit. +% The \hbox{} ensures the next line does not begin with \hfill, which would +% be discarded if initial. +% (\vadjust inserts an empty element at the beginning of the next line, so +% that COULD be used instead of \hbox{}). +% Algorithm adapted from The TeXBook. +% +% The closing \par could be a problem if there is a \parskip... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/langsci.doc.tlpobj new/tlpkg/tlpobj/langsci.doc.tlpobj --- old/tlpkg/tlpobj/langsci.doc.tlpobj 2016-05-10 23:43:37.000000000 +0200 +++ new/tlpkg/tlpobj/langsci.doc.tlpobj 2017-04-30 02:07:20.000000000 +0200 @@ -1,14 +1,17 @@ name langsci.doc category Package -revision 41007 +revision 44096 shortdesc doc files of langsci relocated 1 -docfiles size=11 +docfiles size=34 RELOC/doc/xelatex/langsci/README.md + RELOC/doc/xelatex/langsci/avm.sty + RELOC/doc/xelatex/langsci/documentation/langsci-doc.pdf RELOC/doc/xelatex/langsci/documentation/langsci-doc.tex RELOC/doc/xelatex/langsci/eotms-info.tex RELOC/doc/xelatex/langsci/examples/samplemonograph.tex RELOC/doc/xelatex/langsci/examples/samplepaper.tex RELOC/doc/xelatex/langsci/examples/samplevolume.tex + RELOC/doc/xelatex/langsci/jambox.sty RELOC/doc/xelatex/langsci/localbibliography.bib RELOC/doc/xelatex/langsci/main.tex ++++++ langsci.tar.xz ++++++ ++++ 3727 lines of diff (skipped) ++++++ lapdf.doc.tar.xz ++++++ ++++++ lapdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lapdf.tlpobj new/tlpkg/tlpobj/lapdf.tlpobj --- old/tlpkg/tlpobj/lapdf.tlpobj 2016-04-14 19:14:01.000000000 +0200 +++ new/tlpkg/tlpobj/lapdf.tlpobj 2017-04-14 17:45:53.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=16 RELOC/tex/latex/lapdf/lapdf.sty catalogue-ctan /macros/latex/contrib/lapdf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-in-tex catalogue-version 1.1 ++++++ lastpackage.doc.tar.xz ++++++ ++++++ lastpackage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lastpackage.tlpobj new/tlpkg/tlpobj/lastpackage.tlpobj --- old/tlpkg/tlpobj/lastpackage.tlpobj 2016-04-14 19:14:01.000000000 +0200 +++ new/tlpkg/tlpobj/lastpackage.tlpobj 2017-04-14 17:45:53.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/lastpackage/lastpackage.sty catalogue-ctan /macros/latex/contrib/lastpackage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics preamble-admin catalogue-version 0.1 ++++++ lastpage.doc.tar.xz ++++++ ++++++ lastpage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lastpage.tlpobj new/tlpkg/tlpobj/lastpage.tlpobj --- old/tlpkg/tlpobj/lastpage.tlpobj 2016-04-14 19:14:02.000000000 +0200 +++ new/tlpkg/tlpobj/lastpage.tlpobj 2017-04-14 17:45:54.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/lastpage/lastpage209.sty catalogue-also totpages catalogue-ctan /macros/latex/contrib/lastpage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics label-ref catalogue-version 1.2m ++++++ latex-bib-ex.doc.tar.xz ++++++ ++++++ latex-bib2-ex.doc.tar.xz ++++++ ++++++ latex-bin.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latex.1 new/texmf-dist/doc/man/man1/latex.1 --- old/texmf-dist/doc/man/man1/latex.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/latex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH LATEX 1 "16 June 2015" "Web2C 2016" +.TH LATEX 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .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 Binary files old/texmf-dist/doc/man/man1/latex.man1.pdf and new/texmf-dist/doc/man/man1/latex.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/pdflatex.man1.pdf and new/texmf-dist/doc/man/man1/pdflatex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-bin.doc.tlpobj new/tlpkg/tlpobj/latex-bin.doc.tlpobj --- old/tlpkg/tlpobj/latex-bin.doc.tlpobj 2016-05-09 03:15:53.000000000 +0200 +++ new/tlpkg/tlpobj/latex-bin.doc.tlpobj 2017-05-04 02:07:04.000000000 +0200 @@ -1,8 +1,8 @@ name latex-bin.doc category TLCore -revision 40963 +revision 44166 shortdesc doc files of latex-bin -docfiles size=18 +docfiles size=9 texmf-dist/doc/man/man1/latex.1 texmf-dist/doc/man/man1/latex.man1.pdf texmf-dist/doc/man/man1/pdflatex.1 ++++++ latex-brochure.doc.tar.xz ++++++ ++++++ latex-course.doc.tar.xz ++++++ ++++++ latex-doc-ptr.doc.tar.xz ++++++ ++++++ latex-fonts.doc.tar.xz ++++++ ++++++ latex-fonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-fonts.tlpobj new/tlpkg/tlpobj/latex-fonts.tlpobj --- old/tlpkg/tlpobj/latex-fonts.tlpobj 2016-04-14 19:14:28.000000000 +0200 +++ new/tlpkg/tlpobj/latex-fonts.tlpobj 2017-04-14 17:46:05.000000000 +0200 @@ -66,6 +66,6 @@ RELOC/fonts/tfm/public/latex-fonts/line10.tfm RELOC/fonts/tfm/public/latex-fonts/linew10.tfm catalogue-ctan /fonts/latex -catalogue-date 2015-11-14 11:44:55 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-symbol font-mf ++++++ latex-git-log.doc.tar.xz ++++++ ++++++ latex-git-log.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-git-log.tlpobj new/tlpkg/tlpobj/latex-git-log.tlpobj --- old/tlpkg/tlpobj/latex-git-log.tlpobj 2016-04-14 19:14:29.000000000 +0200 +++ new/tlpkg/tlpobj/latex-git-log.tlpobj 2017-04-14 17:46:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 texmf-dist/scripts/latex-git-log/latex-git-log catalogue-ctan /support/latex-git-log -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics project-mgmt catalogue-version 0.9 ++++++ latex-graphics-companion.doc.tar.xz ++++++ ++++++ latex-make.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/latex-make/LaTeX.mk new/doc/support/latex-make/LaTeX.mk --- old/doc/support/latex-make/LaTeX.mk 2016-02-12 01:22:00.000000000 +0100 +++ new/doc/support/latex-make/LaTeX.mk 2017-01-10 00:01:05.000000000 +0100 @@ -52,6 +52,7 @@ ifdef VERB MAK_VERB := $(VERB) else +#MAK_VERB := debug #MAK_VERB := verbose #MAK_VERB := normal MAK_VERB := quiet @@ -60,6 +61,14 @@ #--------------------------------------------------------------------- # MAK_VERB -> verbosity +ifeq ($(MAK_VERB),debug) +COMMON_PREFIX = echo " ======> building " $@ "<======" ; \ + printf "%s $(@F) due to:$(foreach file,$?,\n * $(file))\n" $1; set -x; +# +COMMON_HIDE := set -x; +COMMON_CLEAN := set -x; +SHOW_LATEX:=true +else ifeq ($(MAK_VERB),verbose) COMMON_PREFIX = echo " ======> building " $@ "<======" ; \ printf "%s $(@F) due to:$(foreach file,$?,\n * $(file))\n" $1; @@ -88,6 +97,7 @@ endif endif endif +endif #--------------------------------------------------------------------- # Old LaTeX have limitations @@ -390,6 +400,7 @@ # Globals variables $(eval $(call lu-setvar-global,LATEX,latex)) $(eval $(call lu-setvar-global,PDFLATEX,pdflatex)) +$(eval $(call lu-setvar-global,LUALATEX,lualatex)) $(eval $(call lu-setvar-global,DVIPS,dvips)) $(eval $(call lu-setvar-global,DVIPDFM,dvipdfm)) $(eval $(call lu-setvar-global,BIBTEX,bibtex)) @@ -494,6 +505,11 @@ .pdftex_t .$$(_LU_PDFTEX_EXT))) endef +define lu-define-flavor-LUALATEX # + $$(eval $$(call lu-create-flavor,LUALATEX,tex,LUALATEX,.pdf,pdf,\ + .pdftex_t .$$(_LU_PDFTEX_EXT))) +endef + define lu-define-flavor-PS # $$(eval $$(call lu-create-flavor,PS,dvi,DVIPS,.ps,ps,DVI)) endef @@ -544,7 +560,7 @@ if [ ! -f "$(1)$(4).mk" ]; then \ NO_TEXDEPENDS_FILE=1 ;\ fi ;\ - sed -e 's,\\openout[0-9]* = `$.*$'"'.,TD_$(1)$(4)_OUTPUTS += \1,p;d" \ + sed -e 's,\\openout[0-9]* = $[^`].*$,TD_$(1)$(4)_OUTPUTS += \1,p;s,\\openout[0-9]* = `$.*$'"'.,TD_$(1)$(4)_OUTPUTS += \1,p;d" \ "$(1).log" >> "$(1)$(4).mk" ;\ if [ -f "$(1)$(4)_FAILED" ]; then \ echo "*************************************" ;\ @@ -654,7 +670,7 @@ $$(warning *********************************) \ $$(warning *********************************) \ $$(warning Stopping generation of $$@) \ - $$(warning I got max recursion level $$(LU_$(1)_$(2)_MAX_REC)) \ + $$(warning I got max recursion level $$(call lu-getvalue,MAX_REC,$(1),$(2))) \ $$(warning Set LU_$(1)_$(2)_MAX_REC, LU_MAX_REC_$(1) or LU_MAX_REC if you need it) \ $$(warning *********************************) \ $$(warning *********************************) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/latex-make/README new/doc/support/latex-make/README --- old/doc/support/latex-make/README 2016-02-12 01:22:00.000000000 +0100 +++ new/doc/support/latex-make/README 2017-01-10 00:01:05.000000000 +0100 @@ -2,7 +2,7 @@ | The LaTeX-Make system | +------------------------------+ -VERSION: 2.2.2 +VERSION: 2.2.3 DESCRIPTION =========== Binary files old/doc/support/latex-make/figlatex.pdf and new/doc/support/latex-make/figlatex.pdf differ Binary files old/doc/support/latex-make/latex-make.pdf and new/doc/support/latex-make/latex-make.pdf differ Binary files old/doc/support/latex-make/texdepends.pdf and new/doc/support/latex-make/texdepends.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-make.doc.tlpobj new/tlpkg/tlpobj/latex-make.doc.tlpobj --- old/tlpkg/tlpobj/latex-make.doc.tlpobj 2016-04-14 19:14:30.000000000 +0200 +++ new/tlpkg/tlpobj/latex-make.doc.tlpobj 2017-04-14 17:46:06.000000000 +0200 @@ -1,6 +1,6 @@ name latex-make.doc category Package -revision 39678 +revision 42914 shortdesc doc files of latex-make relocated 1 docfiles size=214 ++++++ latex-make.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latex-make/figlatex.cfg new/tex/latex/latex-make/figlatex.cfg --- old/tex/latex/latex-make/figlatex.cfg 2016-02-12 01:22:00.000000000 +0100 +++ new/tex/latex/latex-make/figlatex.cfg 2017-01-10 00:01:06.000000000 +0100 @@ -40,7 +40,7 @@ %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. %% \ProvidesFile{figlatex.cfg}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] %\compatibility %\debug \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latex-make/figlatex.sty new/tex/latex/latex-make/figlatex.sty --- old/tex/latex/latex-make/figlatex.sty 2016-02-12 01:22:00.000000000 +0100 +++ new/tex/latex/latex-make/figlatex.sty 2017-01-10 00:01:06.000000000 +0100 @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{figlatex}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] \newif\ifFL@compatibility \DeclareOption{compatibility}{% %\PackageWarning{figlatex}{option compatibility}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latex-make/pdfswitch.sty new/tex/latex/latex-make/pdfswitch.sty --- old/tex/latex/latex-make/pdfswitch.sty 2016-02-12 01:22:00.000000000 +0100 +++ new/tex/latex/latex-make/pdfswitch.sty 2017-01-10 00:01:06.000000000 +0100 @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{pdfswitch}% -[2016/02/09 v2.2.2 Automatic switch between pdf and ps] +[2017/01/08 v2.2.3 Automatic switch between pdf and ps] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latex-make/texdepends.sty new/tex/latex/latex-make/texdepends.sty --- old/tex/latex/latex-make/texdepends.sty 2016-02-12 01:22:00.000000000 +0100 +++ new/tex/latex/latex-make/texdepends.sty 2017-01-10 00:01:06.000000000 +0100 @@ -42,7 +42,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{texdepends}% -[2016/02/09 v2.2.2 Automatic depends generation] +[2017/01/08 v2.2.3 Automatic depends generation] \RequirePackage{ifthen} \newboolean{TD@debug} \newcommand{\TD@option@debug}[1][true]{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latex-make/texgraphicx.sty new/tex/latex/latex-make/texgraphicx.sty --- old/tex/latex/latex-make/texgraphicx.sty 2016-02-12 01:22:00.000000000 +0100 +++ new/tex/latex/latex-make/texgraphicx.sty 2017-01-10 00:01:06.000000000 +0100 @@ -40,7 +40,7 @@ %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. %% \ProvidesPackage{texgraphicx}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] \PackageWarning{texgraphicx}{'texgraphicx' is now deprecated\MessageBreak% Please, consider switching to 'figlatex' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-make.tlpobj new/tlpkg/tlpobj/latex-make.tlpobj --- old/tlpkg/tlpobj/latex-make.tlpobj 2016-04-14 19:14:31.000000000 +0200 +++ new/tlpkg/tlpobj/latex-make.tlpobj 2017-04-14 17:46:06.000000000 +0200 @@ -1,6 +1,6 @@ name latex-make category Package -revision 39678 +revision 42914 shortdesc Easy compiling of complex (and simple) LaTeX documents relocated 1 longdesc This package provides several tools that aim to simplify the @@ -27,7 +27,7 @@ RELOC/tex/latex/latex-make/texdepends.sty RELOC/tex/latex/latex-make/texgraphicx.sty catalogue-ctan /support/latex-make -catalogue-date 2016-02-11 14:58:46 +0100 +catalogue-date 2017-01-11 05:43:59 +0100 catalogue-license gpl catalogue-topics compilation -catalogue-version 2.2.2 +catalogue-version 2.2.3 ++++++ latex.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-m/latex.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/latex.doc.tar.xz differ: char 77, line 1 ++++++ latex.tar.xz ++++++ ++++ 4830 lines of diff (skipped)

1 0

commit texlive-specs-z for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-z for openSUSE:Factory checked in at 2017-06-25 19:23:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-z (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-z.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-z" Sun Jun 25 19:23:08 2017 rev:26 rq:504816 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.changes 2017-06-08 14:57:19.735071923 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-z.new/texlive-specs-z.changes 2017-06-25 19:30:59.121236013 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- New: ---- wsuipa.doc.tar.xz wsuipa.tar.xz wtref.doc.tar.xz wtref.tar.xz xargs.doc.tar.xz xargs.tar.xz xassoccnt.doc.tar.xz xassoccnt.tar.xz xcharter.doc.tar.xz xcharter.tar.xz xcite.doc.tar.xz xcite.tar.xz xcjk2uni.doc.tar.xz xcjk2uni.tar.xz xcntperchap.doc.tar.xz xcntperchap.tar.xz xcolor-material.doc.tar.xz xcolor-material.tar.xz xcolor-solarized.doc.tar.xz xcolor-solarized.tar.xz xcolor.doc.tar.xz xcolor.tar.xz xcomment.doc.tar.xz xcomment.tar.xz xcookybooky.doc.tar.xz xcookybooky.tar.xz xdoc.doc.tar.xz xdoc.tar.xz xduthesis.doc.tar.xz xduthesis.tar.xz xdvi.doc.tar.xz xdvi.tar.xz xebaposter.doc.tar.xz xebaposter.tar.xz xecjk.doc.tar.xz xecjk.tar.xz xecolor.doc.tar.xz xecolor.tar.xz xecyr.doc.tar.xz xecyr.tar.xz xeindex.doc.tar.xz xeindex.tar.xz xellipsis.doc.tar.xz xellipsis.tar.xz xepersian.doc.tar.xz xepersian.tar.xz xesearch.doc.tar.xz xesearch.tar.xz xespotcolor.doc.tar.xz xespotcolor.tar.xz xetex-devanagari.doc.tar.xz xetex-devanagari.tar.xz xetex-itrans.doc.tar.xz xetex-itrans.tar.xz xetex-pstricks.doc.tar.xz xetex-pstricks.tar.xz xetex-tibetan.doc.tar.xz xetex-tibetan.tar.xz xetex.doc.tar.xz xetex.tar.xz xetexconfig.tar.xz xetexfontinfo.doc.tar.xz xetexfontinfo.tar.xz xetexko.doc.tar.xz xetexko.tar.xz xetexref.doc.tar.xz xevlna.doc.tar.xz xevlna.tar.xz xfor.doc.tar.xz xfor.tar.xz xgreek.doc.tar.xz xgreek.tar.xz xhfill.doc.tar.xz xhfill.tar.xz xifthen.doc.tar.xz xifthen.tar.xz xii.doc.tar.xz xint.doc.tar.xz xint.tar.xz xits.doc.tar.xz xits.tar.xz xkeyval.doc.tar.xz xkeyval.tar.xz xlop.doc.tar.xz xlop.tar.xz xltxtra.doc.tar.xz xltxtra.tar.xz xmltex.doc.tar.xz xmltex.tar.xz xmltexconfig.tar.xz xmpincl.doc.tar.xz xmpincl.tar.xz xnewcommand.doc.tar.xz xnewcommand.tar.xz xoptarg.doc.tar.xz xoptarg.tar.xz xpatch.doc.tar.xz xpatch.tar.xz xpeek.doc.tar.xz xpeek.tar.xz xpiano.doc.tar.xz xpiano.tar.xz xpicture.doc.tar.xz xpicture.tar.xz xpinyin.doc.tar.xz xpinyin.tar.xz xprintlen.doc.tar.xz xprintlen.tar.xz xpunctuate.doc.tar.xz xpunctuate.tar.xz xq.doc.tar.xz xq.tar.xz xsavebox.doc.tar.xz xsavebox.tar.xz xsim.doc.tar.xz xsim.tar.xz xskak.doc.tar.xz xskak.tar.xz xstring.doc.tar.xz xstring.tar.xz xtab.doc.tar.xz xtab.tar.xz xunicode.doc.tar.xz xunicode.tar.xz xwatermark.doc.tar.xz xwatermark.tar.xz xyling.doc.tar.xz xyling.tar.xz xymtex.doc.tar.xz xymtex.tar.xz xypic-tut-pt.doc.tar.xz xypic.doc.tar.xz xypic.tar.xz xytree.doc.tar.xz xytree.tar.xz yafoot.doc.tar.xz yafoot.tar.xz yagusylo.doc.tar.xz yagusylo.tar.xz yaletter.doc.tar.xz yaletter.tar.xz yannisgr.doc.tar.xz yannisgr.tar.xz yathesis.doc.tar.xz yathesis.tar.xz yax.doc.tar.xz yax.tar.xz ycbook.doc.tar.xz ycbook.tar.xz ydoc.doc.tar.xz ydoc.tar.xz yfonts-t1.doc.tar.xz yfonts-t1.tar.xz yfonts.doc.tar.xz yfonts.tar.xz yhmath.doc.tar.xz yhmath.tar.xz yinit-otf.doc.tar.xz yinit-otf.tar.xz york-thesis.doc.tar.xz york-thesis.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-z.spec ++++++ ++++ 10664 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-z.new/texlive-specs-z.spec ++++++ youngtab.doc.tar.xz ++++++ ++++++ youngtab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/youngtab.tlpobj new/tlpkg/tlpobj/youngtab.tlpobj --- old/tlpkg/tlpobj/youngtab.tlpobj 2016-04-14 20:09:43.000000000 +0200 +++ new/tlpkg/tlpobj/youngtab.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/youngtab/youngtab.sty catalogue-also young ytableau catalogue-ctan /macros/latex/contrib/youngtab -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics maths catalogue-version 1.1 ++++++ yplan.doc.tar.xz ++++++ ++++++ yplan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yplan.tlpobj new/tlpkg/tlpobj/yplan.tlpobj --- old/tlpkg/tlpobj/yplan.tlpobj 2016-04-14 20:09:43.000000000 +0200 +++ new/tlpkg/tlpobj/yplan.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -15,6 +15,6 @@ texmf-dist/scripts/yplan/yplan texmf-dist/tex/latex/yplan/yplan.sty catalogue-ctan /macros/latex/contrib/yplan -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics calendar ++++++ ytableau.doc.tar.xz ++++++ ++++++ ytableau.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ytableau.tlpobj new/tlpkg/tlpobj/ytableau.tlpobj --- old/tlpkg/tlpobj/ytableau.tlpobj 2016-04-14 20:09:44.000000000 +0200 +++ new/tlpkg/tlpobj/ytableau.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/ytableau/ytableau.sty catalogue-also youngtab young catalogue-ctan /macros/latex/contrib/ytableau -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics maths catalogue-version 1.3 ++++++ zapfchan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zapfchan.tlpobj new/tlpkg/tlpobj/zapfchan.tlpobj --- old/tlpkg/tlpobj/zapfchan.tlpobj 2016-04-14 20:09:44.000000000 +0200 +++ new/tlpkg/tlpobj/zapfchan.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -46,6 +46,6 @@ RELOC/tex/latex/zapfchan/ts1uzc.fd catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-collection ++++++ zapfding.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zapfding.tlpobj new/tlpkg/tlpobj/zapfding.tlpobj --- old/tlpkg/tlpobj/zapfding.tlpobj 2016-04-14 20:09:44.000000000 +0200 +++ new/tlpkg/tlpobj/zapfding.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -27,6 +27,6 @@ RELOC/tex/latex/zapfding/uuzd.fd catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-collection ++++++ zed-csp.doc.tar.xz ++++++ ++++++ zed-csp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zed-csp.tlpobj new/tlpkg/tlpobj/zed-csp.tlpobj --- old/tlpkg/tlpobj/zed-csp.tlpobj 2016-04-14 20:09:44.000000000 +0200 +++ new/tlpkg/tlpobj/zed-csp.tlpobj 2017-04-14 18:10:20.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/zed-csp/zed-csp.sty catalogue-also objectz catalogue-ctan /macros/latex/contrib/zed-csp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics formal-spec ++++++ zhmetrics-uptex.doc.tar.xz ++++++ ++++++ zhmetrics-uptex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhmetrics-uptex.tlpobj new/tlpkg/tlpobj/zhmetrics-uptex.tlpobj --- old/tlpkg/tlpobj/zhmetrics-uptex.tlpobj 2016-04-25 03:14:43.000000000 +0200 +++ new/tlpkg/tlpobj/zhmetrics-uptex.tlpobj 2017-04-14 18:10:23.000000000 +0200 @@ -44,7 +44,7 @@ RELOC/fonts/vf/public/zhmetrics-uptex/upzhserifit-h.vf RELOC/fonts/vf/public/zhmetrics-uptex/upzhserifit-v.vf catalogue-ctan /fonts/zhmetrics-uptex -catalogue-date 2016-04-24 05:38:57 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp-misc font-cjk chinese catalogue-version 1.0 ++++++ zhmetrics.doc.tar.xz ++++++ ++++++ zhmetrics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhmetrics.tlpobj new/tlpkg/tlpobj/zhmetrics.tlpobj --- old/tlpkg/tlpobj/zhmetrics.tlpobj 2016-04-14 20:09:45.000000000 +0200 +++ new/tlpkg/tlpobj/zhmetrics.tlpobj 2017-04-14 18:10:21.000000000 +0200 @@ -4947,7 +4947,7 @@ RELOC/tex/latex/zhmetrics/c70zhsong.fd RELOC/tex/latex/zhmetrics/c70zhyou.fd catalogue-ctan /fonts/psfonts/zhmetrics -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-use font-cjk chinese catalogue-version r206 ++++++ zhnumber.doc.tar.xz ++++++ ++++++ zhnumber.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhnumber.tlpobj new/tlpkg/tlpobj/zhnumber.tlpobj --- old/tlpkg/tlpobj/zhnumber.tlpobj 2016-05-15 03:21:48.000000000 +0200 +++ new/tlpkg/tlpobj/zhnumber.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/zhnumber/zhnumber-utf8.cfg RELOC/tex/latex/zhnumber/zhnumber.sty catalogue-ctan /macros/latex/contrib/zhnumber -catalogue-date 2016-05-14 08:32:24 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chinese numbers catalogue-version 2.4 ++++++ zhspacing.doc.tar.xz ++++++ ++++++ zhspacing.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhspacing.tlpobj new/tlpkg/tlpobj/zhspacing.tlpobj --- old/tlpkg/tlpobj/zhspacing.tlpobj 2016-05-16 00:52:55.000000000 +0200 +++ new/tlpkg/tlpobj/zhspacing.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/xelatex/zhspacing/zhfont.sty RELOC/tex/xelatex/zhspacing/zhulem.sty catalogue-ctan /macros/xetex/generic/zhspacing -catalogue-date 2016-05-14 09:26:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon chinese ++++++ ziffer.doc.tar.xz ++++++ ++++++ ziffer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ziffer.tlpobj new/tlpkg/tlpobj/ziffer.tlpobj --- old/tlpkg/tlpobj/ziffer.tlpobj 2016-04-14 20:09:51.000000000 +0200 +++ new/tlpkg/tlpobj/ziffer.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/ziffer/ziffer.sty catalogue-also icomma catalogue-ctan /macros/latex/contrib/ziffer -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics numbers catalogue-version 2.1 ++++++ zlmtt.doc.tar.xz ++++++ ++++++ zlmtt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zlmtt.tlpobj new/tlpkg/tlpobj/zlmtt.tlpobj --- old/tlpkg/tlpobj/zlmtt.tlpobj 2016-04-14 20:09:51.000000000 +0200 +++ new/tlpkg/tlpobj/zlmtt.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -27,7 +27,7 @@ RELOC/tex/latex/zlmtt/ts1zlmvtt.fd RELOC/tex/latex/zlmtt/zlmtt.sty catalogue-ctan /fonts/zlmtt -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp catalogue-version 1.01 ++++++ zwgetfdate.doc.tar.xz ++++++ ++++++ zwgetfdate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwgetfdate.tlpobj new/tlpkg/tlpobj/zwgetfdate.tlpobj --- old/tlpkg/tlpobj/zwgetfdate.tlpobj 2016-04-14 20:09:52.000000000 +0200 +++ new/tlpkg/tlpobj/zwgetfdate.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/zwgetfdate/zwgetfdate.sty catalogue-ctan /macros/latex/contrib/zwgetfdate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics file-mgmt ++++++ zwpagelayout.doc.tar.xz ++++++ ++++++ zwpagelayout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwpagelayout.tlpobj new/tlpkg/tlpobj/zwpagelayout.tlpobj --- old/tlpkg/tlpobj/zwpagelayout.tlpobj 2016-04-14 20:09:52.000000000 +0200 +++ new/tlpkg/tlpobj/zwpagelayout.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/zwpagelayout/zwpagelayout.sty catalogue-also geometry crop catalogue-ctan /macros/latex/contrib/zwpagelayout -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics geometry production catalogue-version 1.4d ++++++ zxjafbfont.doc.tar.xz ++++++ ++++++ zxjafbfont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafbfont.tlpobj new/tlpkg/tlpobj/zxjafbfont.tlpobj --- old/tlpkg/tlpobj/zxjafbfont.tlpobj 2016-04-14 20:09:52.000000000 +0200 +++ new/tlpkg/tlpobj/zxjafbfont.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=1 RELOC/tex/latex/zxjafbfont/zxjafbfont.sty catalogue-ctan /language/japanese/zxjafbfont -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:34:28 +0100 +catalogue-license mit catalogue-topics font-supp chinese japanese korean xetex catalogue-version 0.2 ++++++ zxjafont.doc.tar.xz ++++++ ++++++ zxjafont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafont.tlpobj new/tlpkg/tlpobj/zxjafont.tlpobj --- old/tlpkg/tlpobj/zxjafont.tlpobj 2016-04-14 20:09:53.000000000 +0200 +++ new/tlpkg/tlpobj/zxjafont.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=4 RELOC/tex/latex/zxjafont/zxjafont.sty catalogue-ctan /language/japanese/zxjafont -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:34:28 +0100 +catalogue-license mit catalogue-topics japanese font-supp xetex catalogue-version 0.3 ++++++ zxjatype.doc.tar.xz ++++++ ++++++ zxjatype.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjatype.tlpobj new/tlpkg/tlpobj/zxjatype.tlpobj --- old/tlpkg/tlpobj/zxjatype.tlpobj 2016-04-14 20:09:53.000000000 +0200 +++ new/tlpkg/tlpobj/zxjatype.tlpobj 2017-04-14 18:10:26.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=8 RELOC/tex/latex/zxjatype/zxjatype.sty catalogue-ctan /language/japanese/zxjatype -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 09:43:24 +0100 +catalogue-license mit catalogue-topics std-conform japanese xetex catalogue-version 0.6

1 0

commit texlive-specs-y for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-y for openSUSE:Factory checked in at 2017-06-25 19:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-y (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-y.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-y" Sun Jun 25 19:23:04 2017 rev:26 rq:504815 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-y/texlive-specs-y.changes 2017-06-08 14:56:59.549920737 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-y.new/texlive-specs-y.changes 2017-06-25 19:30:31.697110414 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- voss-mathmode.doc.tar.xz wsuipa.doc.tar.xz wsuipa.tar.xz xargs.doc.tar.xz xargs.tar.xz xassoccnt.doc.tar.xz xassoccnt.tar.xz xcharter.doc.tar.xz xcharter.tar.xz xcite.doc.tar.xz xcite.tar.xz xcjk2uni.doc.tar.xz xcjk2uni.tar.xz xcolor-solarized.doc.tar.xz xcolor-solarized.tar.xz xcolor.doc.tar.xz xcolor.tar.xz xcomment.doc.tar.xz xcomment.tar.xz xcookybooky.doc.tar.xz xcookybooky.tar.xz xdoc.doc.tar.xz xdoc.tar.xz xduthesis.doc.tar.xz xduthesis.tar.xz xdvi.doc.tar.xz xdvi.tar.xz xebaposter.doc.tar.xz xebaposter.tar.xz xecjk.doc.tar.xz xecjk.tar.xz xecolor.doc.tar.xz xecolor.tar.xz xecyr.doc.tar.xz xecyr.tar.xz xeindex.doc.tar.xz xeindex.tar.xz xellipsis.doc.tar.xz xellipsis.tar.xz xepersian.doc.tar.xz xepersian.tar.xz xesearch.doc.tar.xz xesearch.tar.xz xespotcolor.doc.tar.xz xespotcolor.tar.xz xetex-def.doc.tar.xz xetex-def.tar.xz xetex-devanagari.doc.tar.xz xetex-devanagari.tar.xz xetex-itrans.doc.tar.xz xetex-itrans.tar.xz xetex-pstricks.doc.tar.xz xetex-pstricks.tar.xz xetex-tibetan.doc.tar.xz xetex-tibetan.tar.xz xetex.doc.tar.xz xetex.tar.xz xetexconfig.tar.xz xetexfontinfo.doc.tar.xz xetexfontinfo.tar.xz xetexko.doc.tar.xz xetexko.tar.xz xetexref.doc.tar.xz xevlna.doc.tar.xz xevlna.tar.xz xfor.doc.tar.xz xfor.tar.xz xgreek.doc.tar.xz xgreek.tar.xz xhfill.doc.tar.xz xhfill.tar.xz xifthen.doc.tar.xz xifthen.tar.xz xii.doc.tar.xz xint.doc.tar.xz xint.tar.xz xits.doc.tar.xz xits.tar.xz xkeyval.doc.tar.xz xkeyval.tar.xz xlop.doc.tar.xz xlop.tar.xz xltxtra.doc.tar.xz xltxtra.tar.xz xmltex.doc.tar.xz xmltex.tar.xz xmltexconfig.tar.xz xmpincl.doc.tar.xz xmpincl.tar.xz xnewcommand.doc.tar.xz xnewcommand.tar.xz xoptarg.doc.tar.xz xoptarg.tar.xz xpatch.doc.tar.xz xpatch.tar.xz xpeek.doc.tar.xz xpeek.tar.xz xpiano.doc.tar.xz xpiano.tar.xz xpicture.doc.tar.xz xpicture.tar.xz xpinyin.doc.tar.xz xpinyin.tar.xz xprintlen.doc.tar.xz xprintlen.tar.xz xpunctuate.doc.tar.xz xpunctuate.tar.xz xq.doc.tar.xz xq.tar.xz xsavebox.doc.tar.xz xsavebox.tar.xz xskak.doc.tar.xz xskak.tar.xz xstring.doc.tar.xz xstring.tar.xz xtab.doc.tar.xz xtab.tar.xz xunicode.doc.tar.xz xunicode.tar.xz xwatermark.doc.tar.xz xwatermark.tar.xz xyling.doc.tar.xz xyling.tar.xz xymtex.doc.tar.xz xymtex.tar.xz xypic-tut-pt.doc.tar.xz xypic.doc.tar.xz xypic.tar.xz xytree.doc.tar.xz xytree.tar.xz yafoot.doc.tar.xz yafoot.tar.xz yagusylo.doc.tar.xz yagusylo.tar.xz yannisgr.doc.tar.xz yannisgr.tar.xz yathesis.doc.tar.xz yathesis.tar.xz yax.doc.tar.xz yax.tar.xz ycbook.doc.tar.xz ycbook.tar.xz ydoc.doc.tar.xz ydoc.tar.xz yfonts-t1.doc.tar.xz yfonts-t1.tar.xz yfonts.doc.tar.xz yfonts.tar.xz yhmath.doc.tar.xz yhmath.tar.xz yinit-otf.doc.tar.xz yinit-otf.tar.xz york-thesis.doc.tar.xz york-thesis.tar.xz New: ---- ucthesis.doc.tar.xz ucthesis.tar.xz udesoftec.doc.tar.xz udesoftec.tar.xz uebungsblatt.doc.tar.xz uebungsblatt.tar.xz uestcthesis.doc.tar.xz uestcthesis.tar.xz uhc.doc.tar.xz uhc.tar.xz uhhassignment.doc.tar.xz uhhassignment.tar.xz uhrzeit.doc.tar.xz uhrzeit.tar.xz uiucredborder.doc.tar.xz uiucredborder.tar.xz uiucthesis.doc.tar.xz uiucthesis.tar.xz ukrhyph.doc.tar.xz ukrhyph.tar.xz ulem.doc.tar.xz ulem.tar.xz ulqda.doc.tar.xz ulqda.tar.xz ulthese.doc.tar.xz ulthese.tar.xz umbclegislation.doc.tar.xz umbclegislation.tar.xz umich-thesis.doc.tar.xz umich-thesis.tar.xz uml.doc.tar.xz uml.tar.xz umlaute.doc.tar.xz umlaute.tar.xz umoline.doc.tar.xz umoline.tar.xz umthesis.doc.tar.xz umthesis.tar.xz umtypewriter.tar.xz unamth-template.doc.tar.xz unamthesis.doc.tar.xz unamthesis.tar.xz undergradmath.doc.tar.xz underlin.doc.tar.xz underlin.tar.xz underoverlap.doc.tar.xz underoverlap.tar.xz underscore.doc.tar.xz underscore.tar.xz undolabl.doc.tar.xz undolabl.tar.xz unfonts-core.doc.tar.xz unfonts-core.tar.xz unfonts-extra.doc.tar.xz unfonts-extra.tar.xz uni-wtal-ger.doc.tar.xz uni-wtal-ger.tar.xz uni-wtal-lin.doc.tar.xz uni-wtal-lin.tar.xz unicode-bidi.doc.tar.xz unicode-bidi.tar.xz unicode-data.doc.tar.xz unicode-data.tar.xz unicode-math.doc.tar.xz unicode-math.tar.xz unisugar.doc.tar.xz unisugar.tar.xz units.doc.tar.xz units.tar.xz unitsdef.doc.tar.xz unitsdef.tar.xz universa.doc.tar.xz universa.tar.xz universalis.doc.tar.xz universalis.tar.xz unravel.doc.tar.xz unravel.tar.xz unswcover.doc.tar.xz unswcover.tar.xz uothesis.doc.tar.xz uothesis.tar.xz uowthesis.doc.tar.xz uowthesis.tar.xz uowthesistitlepage.doc.tar.xz uowthesistitlepage.tar.xz upca.doc.tar.xz upca.tar.xz updmap-map.tar.xz uplatex.doc.tar.xz uplatex.tar.xz upmethodology.doc.tar.xz upmethodology.tar.xz uppunctlm.doc.tar.xz uppunctlm.tar.xz upquote.doc.tar.xz upquote.tar.xz uptex-base.doc.tar.xz uptex-base.tar.xz uptex-fonts.doc.tar.xz uptex-fonts.tar.xz uptex.doc.tar.xz urcls.doc.tar.xz urcls.tar.xz uri.doc.tar.xz uri.tar.xz url.doc.tar.xz url.tar.xz urlbst.doc.tar.xz urlbst.tar.xz urwchancal.doc.tar.xz urwchancal.tar.xz usebib.doc.tar.xz usebib.tar.xz ushort.doc.tar.xz ushort.tar.xz uspace.doc.tar.xz uspace.tar.xz uspatent.doc.tar.xz uspatent.tar.xz ut-thesis.doc.tar.xz ut-thesis.tar.xz utf8mex.doc.tar.xz utf8mex.tar.xz utopia.doc.tar.xz utopia.tar.xz uwmslide.doc.tar.xz uwmslide.tar.xz uwthesis.doc.tar.xz uwthesis.tar.xz vak.doc.tar.xz vak.tar.xz vancouver.doc.tar.xz vancouver.tar.xz variablelm.doc.tar.xz variablelm.tar.xz variations.doc.tar.xz variations.tar.xz varindex.doc.tar.xz varindex.tar.xz varisize.doc.tar.xz varisize.tar.xz varsfromjobname.doc.tar.xz varsfromjobname.tar.xz varwidth.doc.tar.xz varwidth.tar.xz vaucanson-g.doc.tar.xz vaucanson-g.tar.xz vdmlisting.doc.tar.xz vdmlisting.tar.xz velthuis.doc.tar.xz velthuis.tar.xz venn.doc.tar.xz venn.tar.xz venndiagram.doc.tar.xz venndiagram.tar.xz venturisadf.doc.tar.xz venturisadf.tar.xz verbasef.doc.tar.xz verbasef.tar.xz verbatimbox.doc.tar.xz verbatimbox.tar.xz wordcount.doc.tar.xz wordcount.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-y.spec ++++++ ++++ 34907 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-y/texlive-specs-y.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-y.new/texlive-specs-y.spec ++++++ verbatimcopy.doc.tar.xz ++++++ ++++++ verbatimcopy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/verbatimcopy.tlpobj new/tlpkg/tlpobj/verbatimcopy.tlpobj --- old/tlpkg/tlpobj/verbatimcopy.tlpobj 2016-04-14 19:58:08.000000000 +0200 +++ new/tlpkg/tlpobj/verbatimcopy.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/verbatimcopy/verbatimcopy.sty catalogue-ctan /macros/latex/contrib/verbatimcopy -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics verbatim catalogue-version 0.06 ++++++ verbdef.doc.tar.xz ++++++ ++++++ verbdef.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/verbdef.tlpobj new/tlpkg/tlpobj/verbdef.tlpobj --- old/tlpkg/tlpobj/verbdef.tlpobj 2016-04-14 19:58:08.000000000 +0200 +++ new/tlpkg/tlpobj/verbdef.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/verbdef/verbdef.sty catalogue-also newverbs catalogue-ctan /macros/latex/contrib/verbdef -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics verbatim catalogue-version 0.2 ++++++ verbments.doc.tar.xz ++++++ ++++++ verbments.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/verbments.tlpobj new/tlpkg/tlpobj/verbments.tlpobj --- old/tlpkg/tlpobj/verbments.tlpobj 2016-04-14 19:58:08.000000000 +0200 +++ new/tlpkg/tlpobj/verbments.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/verbments/verbments.sty catalogue-also minted texments catalogue-ctan /macros/latex/contrib/verbments -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics listing catalogue-version 1.2 ++++++ verse.doc.tar.xz ++++++ ++++++ verse.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/verse.tlpobj new/tlpkg/tlpobj/verse.tlpobj --- old/tlpkg/tlpobj/verse.tlpobj 2016-04-14 19:58:09.000000000 +0200 +++ new/tlpkg/tlpobj/verse.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/verse/verse.sty catalogue-ctan /macros/latex/contrib/verse -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics verse catalogue-version 2.4b ++++++ version.doc.tar.xz ++++++ ++++++ version.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/version.tlpobj new/tlpkg/tlpobj/version.tlpobj --- old/tlpkg/tlpobj/version.tlpobj 2016-04-14 19:58:09.000000000 +0200 +++ new/tlpkg/tlpobj/version.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/version/version.sty catalogue-also verbatim versions optional comment catalogue-ctan /macros/latex/contrib/version -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics cond-comp catalogue-version 2.0 ++++++ versions.doc.tar.xz ++++++ ++++++ versions.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/versions.tlpobj new/tlpkg/tlpobj/versions.tlpobj --- old/tlpkg/tlpobj/versions.tlpobj 2016-04-14 19:58:09.000000000 +0200 +++ new/tlpkg/tlpobj/versions.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/versions/versions.sty catalogue-also version optional verbatim comment catalogue-ctan /macros/latex/contrib/versions -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cond-comp catalogue-version 0.55 ++++++ versonotes.doc.tar.xz ++++++ ++++++ versonotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/versonotes.tlpobj new/tlpkg/tlpobj/versonotes.tlpobj --- old/tlpkg/tlpobj/versonotes.tlpobj 2016-04-14 19:58:10.000000000 +0200 +++ new/tlpkg/tlpobj/versonotes.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/versonotes/versonotes.sty catalogue-ctan /macros/latex/contrib/versonotes -catalogue-date 2015-12-09 07:59:52 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics notes catalogue-version 0.3 ++++++ vertbars.doc.tar.xz ++++++ ++++++ vertbars.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vertbars.tlpobj new/tlpkg/tlpobj/vertbars.tlpobj --- old/tlpkg/tlpobj/vertbars.tlpobj 2016-04-14 19:58:10.000000000 +0200 +++ new/tlpkg/tlpobj/vertbars.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/vertbars/vertbars.sty catalogue-also changebar catalogue-ctan /macros/latex/contrib/vertbars -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics editorial catalogue-version 1.0b ++++++ vgrid.doc.tar.xz ++++++ ++++++ vgrid.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vgrid.tlpobj new/tlpkg/tlpobj/vgrid.tlpobj --- old/tlpkg/tlpobj/vgrid.tlpobj 2016-04-14 19:58:10.000000000 +0200 +++ new/tlpkg/tlpobj/vgrid.tlpobj 2017-04-14 18:05:49.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/vgrid/vgrid.sty catalogue-ctan /macros/latex/contrib/vgrid -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout-supp catalogue-version 0.1 ++++++ vhistory.doc.tar.xz ++++++ ++++++ vhistory.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vhistory.tlpobj new/tlpkg/tlpobj/vhistory.tlpobj --- old/tlpkg/tlpobj/vhistory.tlpobj 2016-04-14 19:58:10.000000000 +0200 +++ new/tlpkg/tlpobj/vhistory.tlpobj 2017-04-14 18:05:50.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/vhistory/sets.sty RELOC/tex/latex/vhistory/vhistory.sty catalogue-ctan /macros/latex/contrib/vhistory -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics version-control catalogue-version 1.6.1 ++++++ visualfaq.doc.tar.xz ++++++ ++++++ visualpstricks.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-y/visualpstricks.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-y.new/visualpstricks.doc.tar.xz differ: char 27, line 1 ++++++ visualtikz.doc.tar.xz ++++++ ++++ 7354 lines of diff (skipped) ++++++ vlna.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/vlna.man1.pdf and new/texmf-dist/doc/man/man1/vlna.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vlna.doc.tlpobj new/tlpkg/tlpobj/vlna.doc.tlpobj --- old/tlpkg/tlpobj/vlna.doc.tlpobj 2016-04-27 03:26:05.000000000 +0200 +++ new/tlpkg/tlpobj/vlna.doc.tlpobj 2017-05-04 02:07:29.000000000 +0200 @@ -1,8 +1,8 @@ name vlna.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of vlna -docfiles size=43 +docfiles size=38 texmf-dist/doc/man/man1/vlna.1 texmf-dist/doc/man/man1/vlna.man1.pdf texmf-dist/doc/vlna/vlna.pdf ++++++ vmargin.doc.tar.xz ++++++ ++++++ vmargin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vmargin.tlpobj new/tlpkg/tlpobj/vmargin.tlpobj --- old/tlpkg/tlpobj/vmargin.tlpobj 2016-04-14 19:58:52.000000000 +0200 +++ new/tlpkg/tlpobj/vmargin.tlpobj 2017-04-14 18:06:06.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/vmargin/vmargin.sty catalogue-also geometry typearea catalogue-ctan /macros/latex/contrib/vmargin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics geometry catalogue-version 2.5 ++++++ vntex.doc.tar.xz ++++++ ++++++ vntex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vntex.tlpobj new/tlpkg/tlpobj/vntex.tlpobj --- old/tlpkg/tlpobj/vntex.tlpobj 2016-04-14 19:58:53.000000000 +0200 +++ new/tlpkg/tlpobj/vntex.tlpobj 2017-04-14 18:06:07.000000000 +0200 @@ -512,7 +512,7 @@ RELOC/tex/plain/vntex/t5code.tex RELOC/tex/plain/vntex/vntexinfo.tex catalogue-ctan /language/vietnamese/vntex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics vietnamese catalogue-version 3.2 ++++++ vocaltract.doc.tar.xz ++++++ ++++++ vocaltract.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vocaltract.tlpobj new/tlpkg/tlpobj/vocaltract.tlpobj --- old/tlpkg/tlpobj/vocaltract.tlpobj 2016-04-14 19:59:02.000000000 +0200 +++ new/tlpkg/tlpobj/vocaltract.tlpobj 2017-04-14 18:06:10.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=11 RELOC/tex/latex/vocaltract/VocalTract.sty catalogue-ctan /graphics/pstricks/contrib/vocaltract -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 1 ++++++ volumes.doc.tar.xz ++++++ ++++++ volumes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/volumes.tlpobj new/tlpkg/tlpobj/volumes.tlpobj --- old/tlpkg/tlpobj/volumes.tlpobj 2016-04-14 19:59:02.000000000 +0200 +++ new/tlpkg/tlpobj/volumes.tlpobj 2017-04-14 18:06:10.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/volumes/nowtoaux.sty RELOC/tex/latex/volumes/volumes.sty catalogue-ctan /macros/latex/contrib/volumes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics book-pub catalogue-version 1.0 ++++++ voss-mathcol.doc.tar.xz ++++++ ++++++ vpe.doc.tar.xz ++++++ ++++++ vpe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vpe.tlpobj new/tlpkg/tlpobj/vpe.tlpobj --- old/tlpkg/tlpobj/vpe.tlpobj 2016-04-14 19:59:05.000000000 +0200 +++ new/tlpkg/tlpobj/vpe.tlpobj 2017-04-14 18:06:10.000000000 +0200 @@ -15,7 +15,7 @@ texmf-dist/scripts/vpe/vpe.pl texmf-dist/tex/latex/vpe/vpe.sty catalogue-ctan /macros/latex/contrib/vpe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-debug catalogue-version 0.2 ++++++ vruler.doc.tar.xz ++++++ ++++++ vruler.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vruler.tlpobj new/tlpkg/tlpobj/vruler.tlpobj --- old/tlpkg/tlpobj/vruler.tlpobj 2016-04-14 19:59:06.000000000 +0200 +++ new/tlpkg/tlpobj/vruler.tlpobj 2017-04-14 18:06:11.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/vruler/vruler.sty catalogue-also lineno numline catalogue-ctan /macros/latex/contrib/vruler -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics layout catalogue-version 2.3 ++++++ vwcol.doc.tar.xz ++++++ ++++++ vwcol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vwcol.tlpobj new/tlpkg/tlpobj/vwcol.tlpobj --- old/tlpkg/tlpobj/vwcol.tlpobj 2016-04-14 19:59:06.000000000 +0200 +++ new/tlpkg/tlpobj/vwcol.tlpobj 2017-04-14 18:06:11.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/vwcol/vwcol.sty catalogue-ctan /macros/latex/contrib/vwcol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multicol catalogue-version 0.2 ++++++ wadalab.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wadalab.doc.tlpobj new/tlpkg/tlpobj/wadalab.doc.tlpobj --- old/tlpkg/tlpobj/wadalab.doc.tlpobj 2016-04-14 19:59:06.000000000 +0200 +++ new/tlpkg/tlpobj/wadalab.doc.tlpobj 2017-04-14 18:06:11.000000000 +0200 @@ -1,6 +1,6 @@ name wadalab.doc category Package -revision 22576 +revision 42428 shortdesc doc files of wadalab relocated 1 docfiles size=43 ++++++ wadalab.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-y/wadalab.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-y.new/wadalab.tar.xz differ: char 28, line 1 ++++++ wallpaper.doc.tar.xz ++++++ ++++++ wallpaper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wallpaper.tlpobj new/tlpkg/tlpobj/wallpaper.tlpobj --- old/tlpkg/tlpobj/wallpaper.tlpobj 2016-04-14 19:59:28.000000000 +0200 +++ new/tlpkg/tlpobj/wallpaper.tlpobj 2017-04-14 18:06:19.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/wallpaper/wallpaper.sty catalogue-ctan /macros/latex/contrib/wallpaper -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout-page catalogue-version 1.10 ++++++ warning.doc.tar.xz ++++++ ++++++ warning.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/warning.tlpobj new/tlpkg/tlpobj/warning.tlpobj --- old/tlpkg/tlpobj/warning.tlpobj 2016-04-14 19:59:28.000000000 +0200 +++ new/tlpkg/tlpobj/warning.tlpobj 2017-04-14 18:06:19.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/warning/warning.sty catalogue-ctan /macros/latex/contrib/warning -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics comp-supp catalogue-version 0.01 ++++++ warpcol.doc.tar.xz ++++++ ++++++ warpcol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/warpcol.tlpobj new/tlpkg/tlpobj/warpcol.tlpobj --- old/tlpkg/tlpobj/warpcol.tlpobj 2016-04-14 19:59:29.000000000 +0200 +++ new/tlpkg/tlpobj/warpcol.tlpobj 2017-04-14 18:06:20.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/warpcol/warpcol.sty catalogue-ctan /macros/latex/contrib/warpcol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics table catalogue-version 1.0c ++++++ was.doc.tar.xz ++++++ ++++++ was.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/was.tlpobj new/tlpkg/tlpobj/was.tlpobj --- old/tlpkg/tlpobj/was.tlpobj 2016-04-14 19:59:29.000000000 +0200 +++ new/tlpkg/tlpobj/was.tlpobj 2017-04-14 18:06:20.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/was/icomma.sty RELOC/tex/latex/was/upgreek.sty catalogue-ctan /macros/latex/contrib/was -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license collection catalogue-topics collection ++++++ wasy.doc.tar.xz ++++++ ++++++ wasy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasy.tlpobj new/tlpkg/tlpobj/wasy.tlpobj --- old/tlpkg/tlpobj/wasy.tlpobj 2016-04-14 19:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/wasy.tlpobj 2017-04-14 18:06:20.000000000 +0200 @@ -28,6 +28,6 @@ RELOC/fonts/tfm/public/wasy/wasyb10.tfm RELOC/tex/plain/wasy/wasyfont.tex catalogue-ctan /fonts/wasy2 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font font-mf font-symbol ++++++ wasy2-ps.doc.tar.xz ++++++ ++++++ wasy2-ps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasy2-ps.tlpobj new/tlpkg/tlpobj/wasy2-ps.tlpobj --- old/tlpkg/tlpobj/wasy2-ps.tlpobj 2016-04-14 19:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/wasy2-ps.tlpobj 2017-04-14 18:06:20.000000000 +0200 @@ -30,6 +30,6 @@ RELOC/fonts/type1/public/wasy2-ps/wasyb10.pfb RELOC/fonts/type1/public/wasy2-ps/wasyb10.pfm catalogue-ctan /fonts/wasy2/ps-type1/hoekwater -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font font-type1 font-symbol ++++++ wasysym.doc.tar.xz ++++++ ++++++ wasysym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasysym.tlpobj new/tlpkg/tlpobj/wasysym.tlpobj --- old/tlpkg/tlpobj/wasysym.tlpobj 2016-04-14 19:59:31.000000000 +0200 +++ new/tlpkg/tlpobj/wasysym.tlpobj 2017-04-14 18:06:20.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/wasysym/uwasyvar.fd RELOC/tex/latex/wasysym/wasysym.sty catalogue-ctan /macros/latex/contrib/wasysym -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp catalogue-version 2.0 ++++++ web.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tangle.1 new/texmf-dist/doc/man/man1/tangle.1 --- old/texmf-dist/doc/man/man1/tangle.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/tangle.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TANGLE 1 "16 June 2015" "Web2C 2016" +.TH TANGLE 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/tangle.man1.pdf and new/texmf-dist/doc/man/man1/tangle.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/weave.1 new/texmf-dist/doc/man/man1/weave.1 --- old/texmf-dist/doc/man/man1/weave.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/weave.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH WEAVE 1 "16 June 2015" "Web2C 2016" +.TH WEAVE 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/weave.man1.pdf and new/texmf-dist/doc/man/man1/weave.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/web.doc.tlpobj new/tlpkg/tlpobj/web.doc.tlpobj --- old/tlpkg/tlpobj/web.doc.tlpobj 2016-04-27 03:26:05.000000000 +0200 +++ new/tlpkg/tlpobj/web.doc.tlpobj 2017-05-04 02:07:29.000000000 +0200 @@ -1,8 +1,8 @@ name web.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of web -docfiles size=16 +docfiles size=7 texmf-dist/doc/man/man1/tangle.1 texmf-dist/doc/man/man1/tangle.man1.pdf texmf-dist/doc/man/man1/weave.1 ++++++ webguide.doc.tar.xz ++++++ ++++++ widetable.doc.tar.xz ++++++ ++++++ widetable.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/widetable.tlpobj new/tlpkg/tlpobj/widetable.tlpobj --- old/tlpkg/tlpobj/widetable.tlpobj 2016-04-14 19:59:37.000000000 +0200 +++ new/tlpkg/tlpobj/widetable.tlpobj 2017-04-14 18:06:22.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/widetable/widetable.sty catalogue-ctan /macros/latex/contrib/widetable -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics table-long catalogue-version 1.1 ++++++ williams.doc.tar.xz ++++++ ++++++ williams.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/williams.tlpobj new/tlpkg/tlpobj/williams.tlpobj --- old/tlpkg/tlpobj/williams.tlpobj 2016-04-14 19:59:38.000000000 +0200 +++ new/tlpkg/tlpobj/williams.tlpobj 2017-04-14 18:06:22.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/williams/antree.sty RELOC/tex/latex/williams/toklist.sty catalogue-ctan /macros/latex/contrib/williams -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics tree macro-supp ++++++ withargs.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/withargs/README new/doc/latex/withargs/README --- old/doc/latex/withargs/README 2013-10-15 00:31:43.000000000 +0200 +++ new/doc/latex/withargs/README 2016-12-21 00:01:04.000000000 +0100 @@ -1,10 +1,11 @@ -LaTeX Package : withargs 0.0.2 +LaTeX Package : withargs 0.2.0 -Last Modified : 2013-10-07 +Last Modified : 2016-12-19 Author : Michiel Helvensteijn (www.mhelvens.net) -===== Prerequisites ===== + +##### Prerequisites ##### To use this package, you need the following expl3 packages: * expl3 @@ -13,7 +14,8 @@ To generate the documentation some extra packages are needed. -===== Installation ===== + +##### Installation ##### withargs.sty is provided directly in the package archive. Put it in a place where your LaTeX distribution can find it. @@ -22,7 +24,8 @@ may use docstrip to remove the documentation, but you don't have to; it will just work the way it is) -===== Documentation ===== + +##### Documentation ##### withargs.pdf is provided directly in the package archive. To generate the documentation yourself, run LaTeX on withargs.tex. @@ -30,7 +33,8 @@ (withargs.tex does not contain the package code itself; it inputs withargs.sty directly to document the implementation) -===== License ===== + +##### License ##### This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html Binary files old/doc/latex/withargs/withargs.pdf and new/doc/latex/withargs/withargs.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/withargs/withargs.tex new/doc/latex/withargs/withargs.tex --- old/doc/latex/withargs/withargs.tex 2015-09-08 00:26:20.000000000 +0200 +++ new/doc/latex/withargs/withargs.tex 2016-12-21 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%% % % -% Copyright (c) 2013 - Michiel Helvensteijn (www.mhelvens.net) % +% Copyright (c) 2016 - Michiel Helvensteijn (www.mhelvens.net) % % % % This work may be distributed and/or modified under the conditions % % of the LaTeX Project Public License, either version 1.3 of this % @@ -43,6 +43,9 @@ \changes{0.1.0}{2015/09/07} {adjusted code to new version of expl3} +\changes{0.2.0}{2016/12/19} + {adjusted code to new version of expl3} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/withargs.doc.tlpobj new/tlpkg/tlpobj/withargs.doc.tlpobj --- old/tlpkg/tlpobj/withargs.doc.tlpobj 2016-04-14 19:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/withargs.doc.tlpobj 2017-04-14 18:06:30.000000000 +0200 @@ -1,6 +1,6 @@ name withargs.doc category Package -revision 38320 +revision 42756 shortdesc doc files of withargs relocated 1 docfiles size=120 ++++++ withargs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/withargs/withargs.sty new/tex/latex/withargs/withargs.sty --- old/tex/latex/withargs/withargs.sty 2015-09-08 00:26:20.000000000 +0200 +++ new/tex/latex/withargs/withargs.sty 2016-12-21 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%% % % -% Copyright (c) 2013 - Michiel Helvensteijn (www.mhelvens.net) % +% Copyright (c) 2016 - Michiel Helvensteijn (www.mhelvens.net) % % % % This work may be distributed and/or modified under the conditions % % of the LaTeX Project Public License, either version 1.3 of this % @@ -17,7 +17,7 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fi %%%% -% \CheckSum{115} +% \CheckSum{117} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -46,7 +46,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{withargs}{2015/09/07}{0.1.0} +\ProvidesExplPackage{withargs}{2016/12/19}{0.2.0} {an inline construct for passing token lists as TeX parameters} % \end{macrocode} % @@ -142,7 +142,7 @@ % longer than |#1| --- a prefix. % % \begin{macrocode} -\cs_new:Nn \__withargs_var:nx { +\cs_new:Nn \__withargs_var:nn { \cs_generate_variant:cx { withargs : \prg_replicate:nn{#1}{n} n } { #2 n } @@ -155,6 +155,7 @@ } % \end{macrocode} % \uninteresting\begin{macrocode} +\cs_generate_variant:Nn \__withargs_var:nn {nx} \cs_generate_variant:Nn \cs_generate_variant:Nn {cx} % \end{macrocode} % @@ -327,5 +328,3 @@ % \end{macrocode} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/withargs.tlpobj new/tlpkg/tlpobj/withargs.tlpobj --- old/tlpkg/tlpobj/withargs.tlpobj 2016-04-14 19:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/withargs.tlpobj 2017-04-14 18:06:30.000000000 +0200 @@ -1,6 +1,6 @@ name withargs category Package -revision 38320 +revision 42756 shortdesc Ephemeral macro use relocated 1 runfiles size=7 @@ -8,7 +8,7 @@ RELOC/tex/latex/withargs/withargs-packagedoc.cls RELOC/tex/latex/withargs/withargs.sty catalogue-ctan /macros/latex/contrib/withargs -catalogue-date 2015-09-07 15:13:20 +0200 +catalogue-date 2016-12-20 07:19:44 +0100 catalogue-license lppl1.3 catalogue-topics macro-supp -catalogue-version 0.1.0 +catalogue-version 0.2.0 ++++++ wnri-latex.doc.tar.xz ++++++ ++++++ wnri-latex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wnri-latex.tlpobj new/tlpkg/tlpobj/wnri-latex.tlpobj --- old/tlpkg/tlpobj/wnri-latex.tlpobj 2016-04-14 19:59:52.000000000 +0200 +++ new/tlpkg/tlpobj/wnri-latex.tlpobj 2017-04-14 18:06:31.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/wnri-latex/wnri.def RELOC/tex/latex/wnri-latex/wnri.sty catalogue-ctan /macros/latex/contrib/wnri-latex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font-supp catalogue-version 1.0b ++++++ wnri.doc.tar.xz ++++++ ++++++ wnri.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wnri.tlpobj new/tlpkg/tlpobj/wnri.tlpobj --- old/tlpkg/tlpobj/wnri.tlpobj 2016-04-14 19:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/wnri.tlpobj 2017-04-14 18:06:30.000000000 +0200 @@ -87,6 +87,6 @@ RELOC/fonts/tfm/public/wnri/wnrit10.tfm RELOC/fonts/tfm/public/wnri/wnrit8.tfm catalogue-ctan /fonts/wnri -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-mf font-specialist ++++++ wordlike.doc.tar.xz ++++++ ++++++ wordlike.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wordlike.tlpobj new/tlpkg/tlpobj/wordlike.tlpobj --- old/tlpkg/tlpobj/wordlike.tlpobj 2016-04-14 19:59:52.000000000 +0200 +++ new/tlpkg/tlpobj/wordlike.tlpobj 2017-04-14 18:06:31.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=1 RELOC/tex/latex/wordlike/wordlike.sty catalogue-ctan /macros/latex/contrib/wordlike -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout catalogue-version 1.2b ++++++ wrapfig.doc.tar.xz ++++++ ++++++ wrapfig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wrapfig.tlpobj new/tlpkg/tlpobj/wrapfig.tlpobj --- old/tlpkg/tlpobj/wrapfig.tlpobj 2016-04-14 19:59:52.000000000 +0200 +++ new/tlpkg/tlpobj/wrapfig.tlpobj 2017-04-14 18:06:31.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/wrapfig/wrapfig.sty catalogue-also floatflt catalogue-ctan /macros/latex/contrib/wrapfig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics text-flow catalogue-version 3.6 ++++++ wsemclassic.doc.tar.xz ++++++ ++++++ wsemclassic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wsemclassic.tlpobj new/tlpkg/tlpobj/wsemclassic.tlpobj --- old/tlpkg/tlpobj/wsemclassic.tlpobj 2016-04-14 19:59:53.000000000 +0200 +++ new/tlpkg/tlpobj/wsemclassic.tlpobj 2017-04-14 18:06:31.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/wsemclassic/wsemclassic.cls catalogue-ctan /macros/latex/contrib/wsemclassic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics dissertation catalogue-version 1.0.1

1 0

commit texlive-specs-x for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-x for openSUSE:Factory checked in at 2017-06-25 19:22:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-x (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-x.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-x" Sun Jun 25 19:22:58 2017 rev:26 rq:504814 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.changes 2017-06-08 14:56:40.816564657 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-x.new/texlive-specs-x.changes 2017-06-25 19:29:57.341963984 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- ucthesis.doc.tar.xz ucthesis.tar.xz udesoftec.doc.tar.xz udesoftec.tar.xz uebungsblatt.doc.tar.xz uebungsblatt.tar.xz uestcthesis.doc.tar.xz uestcthesis.tar.xz uhc.doc.tar.xz uhc.tar.xz uhrzeit.doc.tar.xz uhrzeit.tar.xz uiucredborder.doc.tar.xz uiucredborder.tar.xz uiucthesis.doc.tar.xz uiucthesis.tar.xz ukrhyph.doc.tar.xz ukrhyph.tar.xz ulem.doc.tar.xz ulem.tar.xz ulqda.doc.tar.xz ulqda.tar.xz ulthese.doc.tar.xz ulthese.tar.xz umich-thesis.doc.tar.xz umich-thesis.tar.xz uml.doc.tar.xz uml.tar.xz umlaute.doc.tar.xz umlaute.tar.xz umoline.doc.tar.xz umoline.tar.xz umthesis.doc.tar.xz umthesis.tar.xz umtypewriter.tar.xz unamth-template.doc.tar.xz unamthesis.doc.tar.xz unamthesis.tar.xz underlin.doc.tar.xz underlin.tar.xz underoverlap.doc.tar.xz underoverlap.tar.xz underscore.doc.tar.xz underscore.tar.xz undolabl.doc.tar.xz undolabl.tar.xz uni-wtal-ger.doc.tar.xz uni-wtal-ger.tar.xz uni-wtal-lin.doc.tar.xz uni-wtal-lin.tar.xz unicode-data.doc.tar.xz unicode-data.tar.xz unicode-math.doc.tar.xz unicode-math.tar.xz unisugar.doc.tar.xz unisugar.tar.xz units.doc.tar.xz units.tar.xz unitsdef.doc.tar.xz unitsdef.tar.xz universa.doc.tar.xz universa.tar.xz universalis.doc.tar.xz universalis.tar.xz unravel.doc.tar.xz unravel.tar.xz unswcover.doc.tar.xz unswcover.tar.xz uothesis.doc.tar.xz uothesis.tar.xz uowthesis.doc.tar.xz uowthesis.tar.xz uowthesistitlepage.doc.tar.xz uowthesistitlepage.tar.xz upca.doc.tar.xz upca.tar.xz updmap-map.tar.xz uplatex.doc.tar.xz uplatex.tar.xz upmethodology.doc.tar.xz upmethodology.tar.xz upquote.doc.tar.xz upquote.tar.xz uptex-base.doc.tar.xz uptex-base.tar.xz uptex-fonts.doc.tar.xz uptex-fonts.tar.xz uptex.doc.tar.xz urcls.doc.tar.xz urcls.tar.xz uri.doc.tar.xz uri.tar.xz url.doc.tar.xz url.tar.xz urlbst.doc.tar.xz urlbst.tar.xz urwchancal.doc.tar.xz urwchancal.tar.xz usebib.doc.tar.xz usebib.tar.xz ushort.doc.tar.xz ushort.tar.xz uspatent.doc.tar.xz uspatent.tar.xz ut-thesis.doc.tar.xz ut-thesis.tar.xz utf8mex.doc.tar.xz utf8mex.tar.xz utopia.doc.tar.xz utopia.tar.xz uwmslide.doc.tar.xz uwmslide.tar.xz uwthesis.doc.tar.xz uwthesis.tar.xz vak.doc.tar.xz vak.tar.xz vancouver.doc.tar.xz vancouver.tar.xz variations.doc.tar.xz variations.tar.xz varindex.doc.tar.xz varindex.tar.xz varisize.doc.tar.xz varisize.tar.xz varsfromjobname.doc.tar.xz varsfromjobname.tar.xz varwidth.doc.tar.xz varwidth.tar.xz vaucanson-g.doc.tar.xz vaucanson-g.tar.xz vdmlisting.doc.tar.xz vdmlisting.tar.xz velthuis.doc.tar.xz velthuis.tar.xz venn.doc.tar.xz venn.tar.xz venndiagram.doc.tar.xz venndiagram.tar.xz venturisadf.doc.tar.xz venturisadf.tar.xz verbasef.doc.tar.xz verbasef.tar.xz verbatimbox.doc.tar.xz verbatimbox.tar.xz New: ---- tikz-3dplot.doc.tar.xz tikz-3dplot.tar.xz tikz-bayesnet.doc.tar.xz tikz-bayesnet.tar.xz tikz-cd.doc.tar.xz tikz-cd.tar.xz tikz-dependency.doc.tar.xz tikz-dependency.tar.xz tikz-dimline.doc.tar.xz tikz-dimline.tar.xz tikz-feynman.doc.tar.xz tikz-feynman.tar.xz tikz-inet.doc.tar.xz tikz-inet.tar.xz tikz-kalender.doc.tar.xz tikz-kalender.tar.xz tikz-opm.doc.tar.xz tikz-opm.tar.xz tikz-optics.doc.tar.xz tikz-optics.tar.xz tikz-page.doc.tar.xz tikz-page.tar.xz tikz-palattice.doc.tar.xz tikz-palattice.tar.xz tikz-qtree.doc.tar.xz tikz-qtree.tar.xz tikz-timing.doc.tar.xz tikz-timing.tar.xz tikzinclude.doc.tar.xz tikzinclude.tar.xz tikzmark.doc.tar.xz tikzmark.tar.xz tikzorbital.doc.tar.xz tikzorbital.tar.xz tikzpagenodes.doc.tar.xz tikzpagenodes.tar.xz tikzpeople.doc.tar.xz tikzpeople.tar.xz tikzpfeile.doc.tar.xz tikzpfeile.tar.xz tikzposter.doc.tar.xz tikzposter.tar.xz tikzscale.doc.tar.xz tikzscale.tar.xz tikzsymbols.doc.tar.xz tikzsymbols.tar.xz times.tar.xz timetable.tar.xz timing-diagrams.doc.tar.xz timing-diagrams.tar.xz tinos.doc.tar.xz tinos.tar.xz tipa-de.doc.tar.xz tipa.doc.tar.xz tipa.tar.xz tipfr.doc.tar.xz tipfr.tar.xz titlecaps.doc.tar.xz titlecaps.tar.xz titlefoot.tar.xz titlepages.doc.tar.xz titlepic.doc.tar.xz titlepic.tar.xz titleref.doc.tar.xz titleref.tar.xz titlesec.doc.tar.xz titlesec.tar.xz titling.doc.tar.xz titling.tar.xz tkz-base.doc.tar.xz tkz-base.tar.xz tkz-berge.doc.tar.xz tkz-berge.tar.xz tkz-doc.doc.tar.xz tkz-doc.tar.xz tkz-euclide.doc.tar.xz tkz-euclide.tar.xz tkz-fct.doc.tar.xz tkz-fct.tar.xz tkz-graph.doc.tar.xz tkz-graph.tar.xz tkz-kiviat.doc.tar.xz tkz-kiviat.tar.xz tkz-linknodes.doc.tar.xz tkz-linknodes.tar.xz tkz-orm.doc.tar.xz tkz-orm.tar.xz tkz-tab.doc.tar.xz tkz-tab.tar.xz tlc2.doc.tar.xz tocbibind.doc.tar.xz tocbibind.tar.xz tocdata.doc.tar.xz tocdata.tar.xz tocloft.doc.tar.xz tocloft.tar.xz tocvsec2.doc.tar.xz tocvsec2.tar.xz todo.doc.tar.xz todo.tar.xz todonotes.doc.tar.xz todonotes.tar.xz tokenizer.doc.tar.xz tokenizer.tar.xz toolbox.doc.tar.xz toolbox.tar.xz tools.doc.tar.xz tools.tar.xz topfloat.doc.tar.xz topfloat.tar.xz toptesi.doc.tar.xz toptesi.tar.xz totcount.doc.tar.xz totcount.tar.xz totpages.doc.tar.xz totpages.tar.xz tpic2pdftex.doc.tar.xz tpslifonts.doc.tar.xz tpslifonts.tar.xz tqft.doc.tar.xz tqft.tar.xz tracklang.doc.tar.xz tracklang.tar.xz trajan.doc.tar.xz trajan.tar.xz tram.doc.tar.xz tram.tar.xz translation-array-fr.doc.tar.xz translation-arsclassica-de.doc.tar.xz translation-biblatex-de.doc.tar.xz translation-chemsym-de.doc.tar.xz translation-dcolumn-fr.doc.tar.xz translation-ecv-de.doc.tar.xz translation-enumitem-de.doc.tar.xz translation-europecv-de.doc.tar.xz trigonometry.doc.tar.xz trigonometry.tar.xz txuprcal.doc.tar.xz txuprcal.tar.xz typoaid.doc.tar.xz typoaid.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-x.spec ++++++ ++++ 29785 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-x.new/texlive-specs-x.spec ++++++ translation-filecontents-de.doc.tar.xz ++++++ ++++++ translation-moreverb-de.doc.tar.xz ++++++ ++++++ translation-natbib-fr.doc.tar.xz ++++++ ++++++ translation-tabbing-fr.doc.tar.xz ++++++ ++++++ translations.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/README new/doc/latex/translations/README --- old/doc/latex/translations/README 2016-04-21 22:57:19.000000000 +0200 +++ new/doc/latex/translations/README 2017-05-16 23:07:07.000000000 +0200 @@ -1,13 +1,13 @@ -------------------------------------------------------------------------- -the TRANSLATIONS package v1.3 - 2016/04/19 +the TRANSLATIONS package v1.6 - 2017/05/16 internationalization of LaTeX2e packages -------------------------------------------------------------------------- Clemens Niederberger -Web: http://www.mychemistry.eu/forums/forum/translations +Web: https://github.com/cgnieder/translations E-Mail: contact(a)mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012-2016 Clemens Niederberger +Copyright 2012-2017 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -23,7 +23,9 @@ -------------------------------------------------------------------------- The translations package consists of the files - translations.sty, translations_en.tex, translations_en.pdf, + translations-basic-dictionary-catalan.trsl, translations-basic-dictionary-english.trsl, + translations-basic-dictionary-dutch.trsl, translations-basic-dictionary-french.trsl, translations-basic-dictionary-german.trsl, translations-basic-dictionary-spanish.trsl Binary files old/doc/latex/translations/translations_en.pdf and new/doc/latex/translations/translations_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/translations_en.tex new/doc/latex/translations/translations_en.tex --- old/doc/latex/translations/translations_en.tex 2016-04-21 22:57:19.000000000 +0200 +++ new/doc/latex/translations/translations_en.tex 2017-04-24 23:26:31.000000000 +0200 @@ -1,4 +1,4 @@ -% arara: pdflatex: { shell: on } +% !arara: pdflatex: { shell: on } % arara: biber % arara: pdflatex % arara: pdflatex @@ -9,10 +9,10 @@ % % -------------------------------------------------------------------------- % Clemens Niederberger -% Web: http://www.mychemistry.eu/forums/forum/translations +% Web: https://github.com/cgnieder/translations % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2016 Clemens Niederberger +% Copyright 2012-2017 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -38,7 +38,7 @@ package = {translations} , authors = Clemens Niederberger , email = contact(a)mychemistry.eu , - url = http://www.mychemistry.eu/forums/forum/translations/ , + url = https://github.com/cgnieder/translations , info = {Internationalization of \LaTeXe\ Packages} , add-cmds = { baselanguage, @@ -47,16 +47,28 @@ DeclareLanguageAlias, DeclareLanguageDialect, DeclareTranslation, + declaretranslation, DeclareTranslationFallback, + declaretranslationfallback, GetTranslation, GetTranslationFor, IfTranslation, LoadDictionary, LoadDictionaryFor, NewTranslation, + definetranslation, + NewTranslationFallback, + definetranslationfallback, ProvideDictionaryFor, ProvideDictTranslation, + ProvideTranslation, + addtranslation, + ProvideTranslationFallback, + addtranslationfallback, RenewTranslation, + redefinetranslation, + RenewTranslationFallback, + redefinetranslationfallback, SaveTranslation, SaveTranslationFor } , @@ -123,9 +135,8 @@ \section{License and Requirements}\label{sec:license} \license -\translations\ requires the packages \pkg{cnltx-base} from the \bnd{cnltx} -bundle~\cite{bnd:cnltx} and \pkg{scrlfile} (part of the \KOMAScript\ -bundle~\cite{bnd:koma-script}). +\translations\ requires the packages \pkg{etoolbox}~\cite{pkg:etoolbox} and +\pkg{scrlfile} (part of the \KOMAScript\ bundle~\cite{bnd:koma-script}). \section{Usage} @@ -219,6 +230,10 @@ same as the third case as again the internal macros are the same. \end{enumerate} +\emph{Beware that if the current language is a language using a non-latin + font, a translation is missing for said language, and the fallback + translation needs a Latin script font then \emph{nothing} might be printed.} + \subsection{Available Commands}\label{ssec:commands} Below the commands provided by \translations\ are explained. The symbol \textcolor{expandable}{\expandablesign} means that the command is expandable. @@ -249,26 +264,59 @@ \translations. \command{NewTranslation}[\marg{lang}\marg{key}\marg{translation}] Defines a translation of key \meta{key} for the language \meta{lang}. - An error will be raised if a translation of \meta{key} already exists. - This command can only be used in the preamble. + An error will be raised if a translation of \meta{key} in language + \marg{lang} already exists. This command can only be used in the + preamble. + \command{NewTranslationFallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}Defines a fallback translation of key \meta{key} for the + language \meta{lang}. An error will be raised if a fallback translation of + \meta{key} already exists. This command can only be used in the preamble. \command{RenewTranslation}[\marg{lang}\marg{key}\marg{translation}] Redefines a translation of key \meta{key} for the language \meta{lang}. - An error will be raised if no translation of \meta{key} exists. - This command can only be used in the preamble. + An error will be raised if no translation of \meta{key} in language + \meta{lang} exists. This command can only be used in the preamble. + \command{RenewTranslationFallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}Renews a fallback translation. This command can only be + used in the preamble. \command{ProvideTranslation}[\marg{lang}\marg{key}\marg{translation}] \sinceversion{1.2}Provides a translation of key \meta{key} for the - language \meta{lang}. If a translation of \meta{key} already exists it - won't be overwritten and no error will be raised. This command can only + language \meta{lang}. If a translation of \meta{key} in language + \meta{lang} already exists it won't be overwritten and no error will be + raised. This command can only be used in the preamble. + \command{ProvideTranslationFallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}Provides a fallback translation. This command can only be used in the preamble. \command{DeclareTranslation}[\marg{lang}\marg{key}\marg{translation}] Defines a translation of key \meta{key} for the language \meta{lang}. No error will be raised if a translation of \meta{key} already exists. This command can only be used in the preamble. \command{DeclareTranslationFallback}[\marg{key}\marg{fallback}] - Defines a fallback translation for key \meta{key} that is used in case no - translation of \meta{key} for the currently active language has been - provided. No error will be raised if a fallback for \meta{key} already - exists. This command can only be used in the preamble. + Declares a fallback translation. This command can only be used in the + preamble. + \command{definetranslation}[\marg{lang}\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{NewTranslation} that \emph{can} be used + after begin document. + \command{definetranslationfallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{NewTranslationFallback} that \emph{can} + be used after begin document. + \command{redefinetranslation}[\marg{lang}\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{RenewTranslation} that \emph{can} be + used after begin document. + \command{redefinetranslationfallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{RenewTranslationFallback} that + \emph{can} be used after begin document. + \command{addtranslation}[\marg{lang}\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{ProvideTranslation} that \emph{can} be + used after begin document. + \command{addtranslationfallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{ProvideTranslationFallback} that + \emph{can} be used after begin document. + \command{declaretranslation}[\marg{lang}\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{DeclareTranslation} that \emph{can} be + used after begin document. + \command{declaretranslationfallback}[\marg{key}\marg{translation}] + \sinceversion{1.4}A version of \cs{DeclareTranslationFallback} that + \emph{can} be used after begin document. \expandable\command{IfTranslation}[\marg{lang}\marg{key}\marg{true}\marg{false}] Checks\sinceversion{1.2d} if a translation for \meta{key} in language \meta{lang} is defined or not and either leaves \meta{true} or @@ -561,12 +609,20 @@ \end{commands} \subsubsection{\translations' Basic Dictionaries}\label{sec:transl-basic-dict} -\translations\ already provides a basic dictionary for the languages English, -French, German and Spanish. This dictionary is loaded automatically if the -document language is one of these four. If you'd like to contribute and add -the basic dictionary in your language this is more than welcome and highly -appreciated! The easiest way to do this would be to copy one of the existing -files \code{translations-basic-dictionary-\meta{lang}.trsl} and modify the file +\translations\ already provides a basic dictionary for the languages +\begin{itemize} + \item Catalan, + \item English, + \item Dutch, + \item French, + \item German, and + \item Spanish. +\end{itemize} +The corresponding dictionary is loaded automatically if the document language +is one of these languages. If you'd like to contribute and add the basic +dictionary in your language this is more than welcome and highly appreciated! +The easiest way to do this would be to copy one of the existing files +\code{translations-basic-dictionary-\meta{lang}.trsl} and modify the file accordingly. You can then send me the file via email and I'll add it to \translations. @@ -609,7 +665,7 @@ explanation what's wrong and why. \newcounter{column} -\gdef\seplang{% +\def\seplang{% \stepcounter{column}% \ifnumless{\value{column}}{5} {&} @@ -716,10 +772,7 @@ case. Should you miss a language please send me an email so I can add it to \translations. -\section{Implementation} -\lstinputlisting[style=cnltx]{translations.sty} - +% \section{Implementation} +% \lstinputlisting[style=cnltx]{translations.sty} \end{document} - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.doc.tlpobj new/tlpkg/tlpobj/translations.doc.tlpobj --- old/tlpkg/tlpobj/translations.doc.tlpobj 2016-04-22 01:26:53.000000000 +0200 +++ new/tlpkg/tlpobj/translations.doc.tlpobj 2017-05-17 02:22:54.000000000 +0200 @@ -1,9 +1,9 @@ name translations.doc category Package -revision 40659 +revision 44381 shortdesc doc files of translations relocated 1 -docfiles size=145 +docfiles size=132 RELOC/doc/latex/translations/README RELOC/doc/latex/translations/translations_en.pdf RELOC/doc/latex/translations/translations_en.tex ++++++ translations.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-catalan.trsl new/tex/latex/translations/translations-basic-dictionary-catalan.trsl --- old/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2015-08-30 00:53:48.000000000 +0200 +++ new/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -1,3 +1,32 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalizations of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% The translations package is part of the exsheets bundle +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- \ProvideDictionaryFor{Spanish}{translations-basic-dictionary} \ProvideDictTranslation{Abstract}{Resum} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-dutch.trsl new/tex/latex/translations/translations-basic-dictionary-dutch.trsl --- old/tex/latex/translations/translations-basic-dictionary-dutch.trsl 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/translations/translations-basic-dictionary-dutch.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -0,0 +1,136 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalization of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- +\ProvideDictionaryFor{Dutch}{translations-basic-dictionary} + +\ProvideDictTranslation{Abstract}{Samenvatting} +\ProvideDictTranslation{Addresses}{Adressen} +\ProvideDictTranslation{addresses}{adressen} +\ProvideDictTranslation{Address}{Adres} +\ProvideDictTranslation{address}{adres} +\ProvideDictTranslation{and}{en} +\ProvideDictTranslation{Appendix}{Appendix} +\ProvideDictTranslation{Authors}{Auteurs} +\ProvideDictTranslation{authors}{auteurs} +\ProvideDictTranslation{Author}{Auteur} +\ProvideDictTranslation{author}{auteur} +\ProvideDictTranslation{Bibliography}{Bibliografie} +\ProvideDictTranslation{cc}{cc} +\ProvideDictTranslation{Chapters}{Hoofdstukken} +\ProvideDictTranslation{chapters}{hoofdstukken} +\ProvideDictTranslation{Chapter}{Hoofdstuk} +\ProvideDictTranslation{chapter}{hoofdstuk} +\ProvideDictTranslation{Conclusion}{Conclusie} +\ProvideDictTranslation{conclusion}{conclusie} +\ProvideDictTranslation{Contents}{Inhoud} +\ProvideDictTranslation{Continuation}{Vervolg} +\ProvideDictTranslation{continuation}{vervolg} +\ProvideDictTranslation{cont}{vervolg} +\ProvideDictTranslation{encl (plural)}{B\ij lagen} +\ProvideDictTranslation{encl (singular)}{B\ij lage} +\ProvideDictTranslation{encl}{B\ij lage(n)} +\ProvideDictTranslation{Figures}{Figuren} +\ProvideDictTranslation{figures}{figuren} +\ProvideDictTranslation{Figure}{Figuur} +\ProvideDictTranslation{figure}{figuur} +\ProvideDictTranslation{From}{Van} +\ProvideDictTranslation{from}{van} +\ProvideDictTranslation{Glossary}{Verklarende Woordenl\ij st} +\ProvideDictTranslation{Index}{Register} +\ProvideDictTranslation{Introduction}{Inleiding} +\ProvideDictTranslation{introduction}{inleiding} +\ProvideDictTranslation{List of Figures and Tables}{L\ij st van figuren en tabellen} +\ProvideDictTranslation{List of Figures}{L\ij st van figuren} +\ProvideDictTranslation{List of Tables}{L\ij st van tabellen} +\ProvideDictTranslation{or}{of} +\ProvideDictTranslation{Outline}{Indeling} +\ProvideDictTranslation{Overview}{Overzicht} +\ProvideDictTranslation{Pages}{Pagina's} +\ProvideDictTranslation{pages}{pagina's} +\ProvideDictTranslation{Page}{Pagina} +\ProvideDictTranslation{page}{pagina} +\ProvideDictTranslation{Paragraphs}{Alinea's} +\ProvideDictTranslation{paragraphs}{alinea's} +\ProvideDictTranslation{Paragraph}{Alinea} +\ProvideDictTranslation{paragraph}{alinea} +\ProvideDictTranslation{Parts}{Delen} +\ProvideDictTranslation{parts}{delen} +\ProvideDictTranslation{Part}{Deel} +\ProvideDictTranslation{part}{deel} +\ProvideDictTranslation{Preface}{Woord vooraf} +\ProvideDictTranslation{Proofs}{Bew\ij zen} +\ProvideDictTranslation{proofs}{Bew\ij zen} +\ProvideDictTranslation{Proof}{Bew\ij s} +\ProvideDictTranslation{proof}{bew\ij s} +\ProvideDictTranslation{References}{Referenties} +\ProvideDictTranslation{Related work}{Verwant werk} +\ProvideDictTranslation{Related Work}{Verwant Werk} +\ProvideDictTranslation{Sections}{Paragrafen} +\ProvideDictTranslation{sections}{paragrafen} +\ProvideDictTranslation{Section}{Paragraaf} +\ProvideDictTranslation{section}{paragraaf} +\ProvideDictTranslation{See also}{Zie ook} +\ProvideDictTranslation{see also}{zie ook} +\ProvideDictTranslation{See}{Zie} +\ProvideDictTranslation{see}{zie} +\ProvideDictTranslation{Sketch of Proofs}{Bew\ij sschetsen} +\ProvideDictTranslation{Sketch of proofs}{bew\ij sschetsen} +\ProvideDictTranslation{Sketch of Proof}{Bew\ij sschets} +\ProvideDictTranslation{Sketch of proof}{bew\ij sschets} +\ProvideDictTranslation{Subsections}{Subparagrafen} +\ProvideDictTranslation{subsections}{subparagrafen} +\ProvideDictTranslation{Subsection}{Subparagraaf} +\ProvideDictTranslation{subsection}{subparagraaf} +\ProvideDictTranslation{Summary}{Samenvatting} +\ProvideDictTranslation{Tables}{Tabellen} +\ProvideDictTranslation{tables}{tabellen} +\ProvideDictTranslation{Table}{Tabel} +\ProvideDictTranslation{table}{tabel} +\ProvideDictTranslation{To}{Aan} +\ProvideDictTranslation{to}{aan} + +\ProvideDictTranslation{Monday}{Maandag} +\ProvideDictTranslation{Tuesday}{Dinsdag} +\ProvideDictTranslation{Wednesday}{Woensdag} +\ProvideDictTranslation{Thursday}{Donderdag} +\ProvideDictTranslation{Friday}{Vr\ij dag} +\ProvideDictTranslation{Saturday}{Zaterdag} +\ProvideDictTranslation{Sunday}{Zondag} + +\ProvideDictTranslation{January}{Januari} +\ProvideDictTranslation{February}{Februari} +\ProvideDictTranslation{March}{Maart} +\ProvideDictTranslation{April}{April} +\ProvideDictTranslation{May}{Mei} +\ProvideDictTranslation{June}{Juni} +\ProvideDictTranslation{July}{Juli} +\ProvideDictTranslation{August}{Augustus} +\ProvideDictTranslation{September}{September} +\ProvideDictTranslation{October}{Oktober} +\ProvideDictTranslation{November}{November} +\ProvideDictTranslation{December}{December} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-english.trsl new/tex/latex/translations/translations-basic-dictionary-english.trsl --- old/tex/latex/translations/translations-basic-dictionary-english.trsl 2014-01-11 00:26:30.000000000 +0100 +++ new/tex/latex/translations/translations-basic-dictionary-english.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -1,3 +1,30 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalization of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- \ProvideDictionaryFor{English}{translations-basic-dictionary} \ProvideDictTranslation{Abstract}{Abstract} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-french.trsl new/tex/latex/translations/translations-basic-dictionary-french.trsl --- old/tex/latex/translations/translations-basic-dictionary-french.trsl 2015-11-08 00:19:03.000000000 +0100 +++ new/tex/latex/translations/translations-basic-dictionary-french.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -1,3 +1,30 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalization of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- \ProvideDictionaryFor{French}{translations-basic-dictionary} \ProvideDictTranslation{Abstract}{R\'{e}sum\'{e}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-german.trsl new/tex/latex/translations/translations-basic-dictionary-german.trsl --- old/tex/latex/translations/translations-basic-dictionary-german.trsl 2014-01-11 00:26:30.000000000 +0100 +++ new/tex/latex/translations/translations-basic-dictionary-german.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -1,3 +1,30 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalization of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- \ProvideDictionaryFor{German}{translations-basic-dictionary} \ProvideDictTranslation{Abstract}{Zusammenfassung} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-spanish.trsl new/tex/latex/translations/translations-basic-dictionary-spanish.trsl --- old/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2014-01-11 00:26:30.000000000 +0100 +++ new/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2017-04-24 23:26:31.000000000 +0200 @@ -1,3 +1,30 @@ +% -------------------------------------------------------------------------- +% the TRANSLATIONS package +% +% internationalization of LaTeX2e packages +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: https://github.com/cgnieder/translations +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2012-2017 Clemens Niederberger +% +% 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://www.latex-project.org/lppl.txt +% 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 Clemens Niederberger. +% -------------------------------------------------------------------------- +% If you have any ideas, questions, suggestions or bugs to report, please +% feel free to contact me. +% -------------------------------------------------------------------------- \ProvideDictionaryFor{Spanish}{translations-basic-dictionary} \ProvideDictTranslation{Abstract}{Resumen} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations.sty new/tex/latex/translations/translations.sty --- old/tex/latex/translations/translations.sty 2016-04-21 22:57:19.000000000 +0200 +++ new/tex/latex/translations/translations.sty 2017-05-16 23:07:07.000000000 +0200 @@ -5,10 +5,10 @@ % % -------------------------------------------------------------------------- % Clemens Niederberger -% Web: http://www.mychemistry.eu/forums/forum/translations +% Web: https://github.com/cgnieder/translations % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2016 Clemens Niederberger +% Copyright 2012-2017 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,47 +25,47 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\def\@trnslt@date{2016/04/19} -\def\@trnslt@version{v1.3} -\def\@trnslt@info{internationalization of LaTeX2e packages} +\newcommand*\@trnslt@date{2017/05/16} +\newcommand*\@trnslt@version{v1.6} +\newcommand*\@trnslt@packageinfo{internationalization of LaTeX2e packages} \ProvidesPackage{translations}[% \@trnslt@date\space \@trnslt@version\space - \@trnslt@info\space (CN)] -\RequirePackage{cnltx-base,scrlfile} + \@trnslt@packageinfo\space (CN)] +\RequirePackage{scrlfile,etoolbox} % -------------------------------------------------------------------------- % message handling % generic help message: -\def\@trnslt@error@message{% +\newcommand*\@trnslt@error@message{% For details have a look at the `translations' manual.% } -% create message macros: -\cnltx@create@generic@message{@trnslt}{translations}{Error}{\@trnslt@error@message} -\cnltx@create@generic@message{@trnslt}{translations}{Warning}{} -\cnltx@create@generic@message{@trnslt}{translations}{WarningNoLine}{} -\cnltx@create@generic@message{@trnslt}{translations}{Info}{} +\newrobustcmd*\@trnslt@info[1]{\PackageInfo{translations}{#1}} +\newrobustcmd*\@trnslt@warning[1]{\PackageWarning{translations}{#1}} +\newrobustcmd*\@trnslt@error[1]{% + \PackageError{translations}{#1}\@trnslt@error@message +} % specific errors: -\newrobustcmd*\@trnslt@err@unknown@lang[1]{\@trnslt@error{Unknown language `#1'}} -\newrobustcmd*\@trnslt@warn@unknown@lang[1]{\@trnslt@warning{Unknown language `#1'}} +\newrobustcmd*\@trnslt@err@unknown@lang[1]{% + \@trnslt@error{Unknown language `#1'}% +} +\newrobustcmd*\@trnslt@warn@unknown@lang[1]{% + \PackageWarning{translations}{Unknown language `#1'}% +} \newrobustcmd*\@trnslt@err@already@defined[2]{% \@trnslt@error{The #2 translation for `#1' is already defined.}% } \newrobustcmd*\@trnslt@err@not@defined[2]{% - \@trnslt@error{% - The \@trnslt@language{#2} translation for `#1' is not defined yet.% - }% + \@trnslt@error{The \@trnslt@language{#2} translation for `#1' is not defined yet.}% } \newrobustcmd*\@trnslt@err@dict@already@defined[2]{% \@trnslt@error{The #2 dictionary entry for `#1' is already defined.}% } \newrobustcmd*\@trnslt@err@dict@not@defined[2]{% - \@trnslt@error{% - The \@trnslt@language{#2} dictionary entry for `#1' is not defined yet.% - }% + \@trnslt@error{The \@trnslt@language{#2} dictionary entry for `#1' is not defined yet.}% } % -------------------------------------------------------------------------- @@ -85,6 +85,23 @@ } % -------------------------------------------------------------------------- +% test string equality, expandably: +\newcommand\@trnslt@ifstrequal[2]{% + \ifnum\pdf@strcmp{\unexpanded{#1}}{\unexpanded{#2}}=\z@ + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} + +\long\def\@trnslt@getnext@braced#1#2#3{#2\@trnslt@firstofone{#3{#1}}} +\long\def\@trnslt@firstofone#1{#1} +\long\def\@trnslt@braced@expanded@fully#1\@trnslt@firstofone#2#3{% + \expandafter\@trnslt@getnext@braced + \expandafter{\romannumeral-`0#3}{#1}{#2}% +} + +% -------------------------------------------------------------------------- % book keeping: the following macros will be used as `etoolbox' lists that % keep record of defined languages, dialects and aliases \newcommand*\@trnslt@languages{}% all languages @@ -218,11 +235,12 @@ \@trnslt@if@dialect{#2} {\csletcs{@trnslt@dialect@#1}{@trnslt@dialect@#2}} {}% - \ifinlist{#1}\@trnslt@aliases@single - {}{% + \ifcsdef{@trnslt@alias@#1} + {} + {% \csdef{@trnslt@alias@#1}{#2}% - \listeadd\@trnslt@aliases@pair{{#1}{#2}}% - \listeadd\@trnslt@aliases@single{#1}% + \listadd\@trnslt@aliases@pair{{#1}{#2}}% + \listadd\@trnslt@aliases@single{#1}% }% } @@ -239,10 +257,10 @@ % #2: true % #3: false \newcommand*\@trnslt@iflanguage[1]{% - \cnltx@braced@expanded@fully - \cnltx@braced@expanded@fully - \cnltx@firstofone - \cnltx@ifstrequal + \@trnslt@braced@expanded@fully + \@trnslt@braced@expanded@fully + \@trnslt@firstofone + \@trnslt@ifstrequal {\@trnslt@language{#1}} {\@trnslt@language{\languagename}}% } @@ -251,10 +269,10 @@ \newcommand*\@trnslt@ifbaselanguage[1]{% \@trnslt@if@dialect{\languagename} {% - \cnltx@braced@expanded@fully - \cnltx@braced@expanded@fully - \cnltx@firstofone - \cnltx@ifstrequal + \@trnslt@braced@expanded@fully + \@trnslt@braced@expanded@fully + \@trnslt@firstofone + \@trnslt@ifstrequal {\@trnslt@language{\@trnslt@dialect@of{\languagename}}} {\@trnslt@language{#1}}% } @@ -277,64 +295,83 @@ % #1: language % #2: word % #3: replacement -\newrobustcmd*\DeclareTranslation[3]{% +\newrobustcmd\declaretranslation[3]{% \@trnslt@declare@translation{#2}{#1}{#3}% } -\@onlypreamble\DeclareTranslation - -\newrobustcmd*\DeclareTranslationFallback[2]{% - \@trnslt@declare@translation{#1}{fallback}{#2}% -} -\@onlypreamble\DeclareTranslationFallback - -\newrobustcmd*\NewTranslation[3]{% +\newrobustcmd\definetranslation[3]{% \@trnslt@new@translation{#2}{#1}{#3}% } -\@onlypreamble\NewTranslation - -\newrobustcmd*\RenewTranslation[3]{% +\newrobustcmd\redefinetranslation[3]{% \@trnslt@renew@translation{#2}{#1}{#3}% } -\@onlypreamble\RenewTranslation - -\newrobustcmd*\ProvideTranslation[3]{% +\newrobustcmd\addtranslation[3]{% \@trnslt@provide@translation{#2}{#1}{#3}% } + +\let\DeclareTranslation\declaretranslation +\@onlypreamble\DeclareTranslation +\let\NewTranslation\definetranslation +\@onlypreamble\NewTranslation +\let\RenewTranslation\redefinetranslation +\@onlypreamble\RenewTranslation +\let\ProvideTranslation\addtranslation \@onlypreamble\ProvideTranslation +\newrobustcmd*\declaretranslationfallback{% + \declaretranslation{fallback}% +} +\newrobustcmd*\definetranslationfallback{% + \definetranslation{fallback}% +} +\newrobustcmd*\redefinetranslationfallback{% + \redefinetranslation{fallback}% +} +\newrobustcmd*\addtranslationfallback{% + \addtranslation{fallback}% +} + +\let\DeclareTranslationFallback\declaretranslationfallback +\@onlypreamble\DeclareTranslationFallback +\let\NewTranslationFallback\definetranslationfallback +\@onlypreamble\NewTranslationFallback +\let\RenewTranslationFallback\redefinetranslationfallback +\@onlypreamble\RenewTranslationFallback +\let\ProvideTranslationFallback\addtranslationfallback +\@onlypreamble\ProvideTranslationFallback + % #1: word % #2: language % #3: replacement -\newrobustcmd*\@trnslt@declare@translation[3]{% +\newrobustcmd\@trnslt@declare@translation[3]{% \@trnslt@if@language{#2} {% \@trnslt@if@dialect{#2} {% - \csdef{@trnslt@word@\detokenize{#1}@\@trnslt@dialect{#2}}{#3}% + \long\csdef{@trnslt@word@\detokenize{#1}@\@trnslt@dialect{#2}}{#3}% \@trnslt@if@word\@trnslt@dialect@of{#1}{#2} {} - {\csdef{@trnslt@word@\detokenize{#1}@\@trnslt@dialect@of{#2}}{#3}}% + {\long\csdef{@trnslt@word@\detokenize{#1}@\@trnslt@dialect@of{#2}}{#3}}% } - {\csdef{@trnslt@word@\detokenize{#1}@\@trnslt@language{#2}}{#3}}% + {\long\csdef{@trnslt@word@\detokenize{#1}@\@trnslt@language{#2}}{#3}}% % save the <word> as <word>: \csdef{@trnslt@word@\detokenize{#1}@literal}{#1}% } {\@trnslt@err@unknown@lang{#2}}% } -\newrobustcmd*\@trnslt@new@translation[3]{% +\newrobustcmd\@trnslt@new@translation[3]{% \@trnslt@if@word\@trnslt@language{#1}{#2} {\@trnslt@err@already@defined{#1}{#2}} {\@trnslt@declare@translation{#1}{#2}{#3}}% } -\newrobustcmd*\@trnslt@renew@translation[3]{% +\newrobustcmd\@trnslt@renew@translation[3]{% \@trnslt@if@word\@trnslt@language{#1}{#2} {\@trnslt@declare@translation{#1}{#2}{#3}} {\@trnslt@err@not@defined{#1}{#2}}% } -\newrobustcmd*\@trnslt@provide@translation[3]{% +\newrobustcmd\@trnslt@provide@translation[3]{% \@trnslt@if@word\@trnslt@language{#1}{#2} {} {\@trnslt@declare@translation{#1}{#2}{#3}}% @@ -578,8 +615,6 @@ }% } -% \newcommand*\@trnslt@if@dictionary[2]{\IfFileExists{#1-#2.trsl}} - % -------------------------------------------------------------------------- % the contents of a dictionary; let's declare that is one. % #1: lang @@ -596,7 +631,7 @@ % this macro can be used to check if we have a dictionary and will also be % used as a list for the dictionary entries: \csdef{@trnslt@dictionary@\@trnslt@dictionary@name @\@trnslt@dictionary@lang}{}% - \@ifnextchar[ + \@ifnextchar[ % ] {\@trnslt@provide@dictionary@version} { \ProvidesFile @@ -610,14 +645,18 @@ {\@trnslt@dictionary@name-\@trnslt@dictionary@lang.trsl}% [(\@trnslt@dictionary@lang\space translation file `\@trnslt@dictionary@name') #1]} -% change this test (we can't use braces inside the item with \ifinlist): \newcommand*\@trnslt@check@dictionary@entry[2]{% - \cnltx@ifinlistcs - {{#1}{#2}} - {@trnslt@dictionary@\@trnslt@dictionary@name @\@trnslt@dictionary@lang}% + \ifcsdef{% + @trnslt@dictionary@\@trnslt@dictionary@name + @\@trnslt@dictionary@lang @{#1}{\detokenize{#2}}% + }% } \newrobustcmd*\@trnslt@add@dictionary@entry[2]{% + \csdef{% + @trnslt@dictionary@\@trnslt@dictionary@name + @\@trnslt@dictionary@lang @{#1}{\detokenize{#2}}% + }{{#1}{#2}}% \listcsadd {@trnslt@dictionary@\@trnslt@dictionary@name @\@trnslt@dictionary@lang} {{#1}{#2}}% @@ -700,7 +739,7 @@ \newcommand*\@trnslt@print@dictionary@entry@aux[5]{#1#4#2#5#3} % ========================================================================== -% Now that the package is finished let's us the above commands to provide a +% Now that the package is finished let's use the above commands to provide a % basis for usage; we need all languages known to `babel' and `polyglossia' % as well as aliases to allow different spellings/names; we also need dialects % where it makes sense (e.g. British as a dialect of English) @@ -719,6 +758,7 @@ \DeclareLanguage{arabic} \DeclareLanguage{armenian} \DeclareLanguage{asturian} +\DeclareLanguage{azerbaijani} \DeclareLanguage{basque} \DeclareLanguage{bengali} \DeclareLanguage{breton} @@ -807,6 +847,7 @@ \DeclareLanguageAlias {Astur-Leonese}{astur-leonese} \DeclareLanguageAlias {asturian-leonese}{asturian} \DeclareLanguageAlias {Asturian-Leonese}{asturian-leonese} +\DeclareLanguageAlias {Azerbaijani}{azerbaijani} \DeclareLanguageAlias {Basque}{basque} \DeclareLanguageAlias {Bengali}{bengali} \DeclareLanguageAlias {Breton}{breton} @@ -892,17 +933,23 @@ \DeclareLanguageAlias {Lettish}{lettish} \DeclareLanguageAlias {Lithuanian}{lithuanian} \DeclareLanguageAlias {Macedonian}{macedonian} -% hopefully someone who knows better than me can comment on these +% hopefully someone who knows better than me can comment on the following +% family: \DeclareLanguageAlias {Malay}{malay} -\DeclareLanguageDialect{indonesian}{malay} -\DeclareLanguageAlias {Indonesian}{indonesian} -\DeclareLanguageAlias {indon}{indonesian} -\DeclareLanguageAlias {bahasa meyalu}{malay} -\DeclareLanguageAlias {Bahasa Meyalu}{bahasa meyalu} -\DeclareLanguageAlias {bahasa}{bahasa meyalu} +\DeclareLanguageAlias {bahasa malaysia}{malay} +\DeclareLanguageAlias {Bahasa Malaysia}{bahasa malaysia} +\DeclareLanguageAlias {bahasa melayu}{bahasa malaysia} +\DeclareLanguageAlias {Bahasa Melayu}{bahasa melayu} +\DeclareLanguageAlias {bahasa}{bahasa melayu} \DeclareLanguageAlias {Bahasa}{bahasa} \DeclareLanguageAlias {bahasai}{bahasa} +\DeclareLanguageAlias {Bahasai}{bahasai} \DeclareLanguageAlias {bahasam}{bahasa} +\DeclareLanguageAlias {Bahasam}{bahasam} +\DeclareLanguageDialect{indonesian}{malay} +\DeclareLanguageAlias {Indonesian}{indonesian} +\DeclareLanguageAlias {indon}{indonesian} +% \DeclareLanguageAlias {Malayalam}{malayalam} \DeclareLanguageAlias {Maldivian}{maldivian} \DeclareLanguageAlias {divehi}{maldivian} @@ -1012,27 +1059,6 @@ % -------------------------------------------------------------------------- % load basic dictionary if available \AtBeginDocument{% - % \@trnslt@if@dialect{\@trnslt@current@language} - % {% - % \@trnslt@if@dictionary - % {translations-basic-dictionary} - % {\@trnslt@language{\@trnslt@current@language}}% - % {% - % \@trnslt@load@dictionary@silent@for - % {translations-basic-dictionary} - % {\@trnslt@language{\@trnslt@current@language}}% - % }% - % {% - % \@trnslt@load@dictionary@silent@for - % {translations-basic-dictionary} - % {\@trnslt@dialect@of{\@trnslt@current@language}}% - % } - % } - % {% - % \@trnslt@load@dictionary@silent@for - % {translations-basic-dictionary} - % {\@trnslt@language{\@trnslt@current@language}}% - % }% \@trnslt@load@dictionary@silent@for {translations-basic-dictionary} \@trnslt@current@language @@ -1105,10 +1131,24 @@ 2015/11/07 v1.2e - Some fixes to the French translations in the basic dictionary, thanks to Denis Bitouz\'e - add Macedonian language -2016/01/20 v1.3 - \LoadDictionary first checks if a dictionary for the +2016/04/19 v1.3 - \LoadDictionary first checks if a dictionary for the dialect exists and loads it if it does; else it looks for a dictionary of the base language and loads that instead - New command \LoadDictionaryForDialect which only loads the dictionary for a specified dialect – this doesn't check if a dictionary for a baselanguage exists +2016/06/02 v1.4 - new commands \declaretranslation, \newtranslation, + \renewtranslation and \providetranslation which can be + used after begin document + - fallback versions for each definition command +2016/06/02 v1.4a - rename new commands: they conflict with the translator + package! +2017/03/03 v1.5 - remove dependency on cnltx-base + - add Dutch dictionary (thanks to kwikwi) + - add Catalan dictionary (thanks to kwikwi) +2017/03/05 v1.5a - correct typos in Dutch dictionary +2017/04/24 v1.5b - correct typos in Malaysian language names +2017/05/06 v1.5c - add Azerbaijani +2017/05/16 v1.6 - allow translations to contain \par + - improve perfomance by replacing list checks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.tlpobj new/tlpkg/tlpobj/translations.tlpobj --- old/tlpkg/tlpobj/translations.tlpobj 2016-04-22 01:26:53.000000000 +0200 +++ new/tlpkg/tlpobj/translations.tlpobj 2017-05-17 02:22:54.000000000 +0200 @@ -1,26 +1,27 @@ name translations category Package -revision 40659 +revision 44381 shortdesc Internationalisation of LaTeX2e packages relocated 1 longdesc This package (once part of the exsheets package), provides a longdesc framework for providing multilingual features to a LaTeX longdesc package. The package has its own basic dictionaries for -longdesc English, French, German and Spanish; it aims to use translation -longdesc material for English, French, German, Italian, Spanish, -longdesc Catalan, Turkish, Croatian, Hungarian, Danish and Portuguese -longdesc from babel or polyglossia if either is in use in the document. -longdesc (Additional languages from the multilingual packages may be -longdesc possible: ask the author.) -runfiles size=20 +longdesc English, Dutch, French, German and Spanish; it aims to use +longdesc translation material for English, Dutch, French, German, +longdesc Italian, Spanish, Catalan, Turkish, Croatian, Hungarian, Danish +longdesc and Portuguese from babel or polyglossia if either is in use in +longdesc the document. (Additional languages from the multilingual +longdesc packages may be possible: ask the author.) +runfiles size=23 RELOC/tex/latex/translations/translations-basic-dictionary-catalan.trsl + RELOC/tex/latex/translations/translations-basic-dictionary-dutch.trsl RELOC/tex/latex/translations/translations-basic-dictionary-english.trsl RELOC/tex/latex/translations/translations-basic-dictionary-french.trsl RELOC/tex/latex/translations/translations-basic-dictionary-german.trsl RELOC/tex/latex/translations/translations-basic-dictionary-spanish.trsl RELOC/tex/latex/translations/translations.sty catalogue-ctan /macros/latex/contrib/translations -catalogue-date 2016-04-20 22:48:12 +0200 +catalogue-date 2017-05-16 13:00:40 +0200 catalogue-license lppl1.3 catalogue-topics multilingual package-supp -catalogue-version 1.3 +catalogue-version 1.6 ++++++ tree-dvips.doc.tar.xz ++++++ ++++++ tree-dvips.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tree-dvips.tlpobj new/tlpkg/tlpobj/tree-dvips.tlpobj --- old/tlpkg/tlpobj/tree-dvips.tlpobj 2016-04-14 19:53:47.000000000 +0200 +++ new/tlpkg/tlpobj/tree-dvips.tlpobj 2017-04-14 18:03:35.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/tree-dvips/lingmacros.sty RELOC/tex/latex/tree-dvips/tree-dvips.sty catalogue-ctan /macros/latex209/contrib/trees/tree-dvips -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics tree catalogue-version .91 ++++++ treetex.doc.tar.xz ++++++ ++++++ treetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/treetex.tlpobj new/tlpkg/tlpobj/treetex.tlpobj --- old/tlpkg/tlpobj/treetex.tlpobj 2016-04-14 19:53:47.000000000 +0200 +++ new/tlpkg/tlpobj/treetex.tlpobj 2017-04-14 18:03:35.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/plain/treetex/l_pic.tex RELOC/tex/plain/treetex/treetex.tex catalogue-ctan /macros/plain/contrib/treetex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-19 10:27:54 +0200 catalogue-license pd catalogue-topics tree ++++++ trfsigns.doc.tar.xz ++++++ ++++++ trfsigns.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/trfsigns.tlpobj new/tlpkg/tlpobj/trfsigns.tlpobj --- old/tlpkg/tlpobj/trfsigns.tlpobj 2016-04-14 19:53:47.000000000 +0200 +++ new/tlpkg/tlpobj/trfsigns.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/trfsigns/trfsigns.sty catalogue-ctan /macros/latex/contrib/trfsigns -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths-symbol catalogue-version 1.01 ++++++ trimspaces.doc.tar.xz ++++++ ++++++ trimspaces.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/trimspaces.tlpobj new/tlpkg/tlpobj/trimspaces.tlpobj --- old/tlpkg/tlpobj/trimspaces.tlpobj 2016-04-14 19:53:48.000000000 +0200 +++ new/tlpkg/tlpobj/trimspaces.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/trimspaces/trimspaces.sty catalogue-ctan /macros/latex/contrib/trimspaces -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp catalogue-version 1.1 ++++++ trivfloat.doc.tar.xz ++++++ ++++++ trivfloat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/trivfloat.tlpobj new/tlpkg/tlpobj/trivfloat.tlpobj --- old/tlpkg/tlpobj/trivfloat.tlpobj 2016-04-14 19:53:48.000000000 +0200 +++ new/tlpkg/tlpobj/trivfloat.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/trivfloat/trivfloat.sty catalogue-ctan /macros/latex/contrib/trivfloat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics float catalogue-version 1.3b ++++++ trsym.doc.tar.xz ++++++ ++++++ trsym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/trsym.tlpobj new/tlpkg/tlpobj/trsym.tlpobj --- old/tlpkg/tlpobj/trsym.tlpobj 2016-04-14 19:53:48.000000000 +0200 +++ new/tlpkg/tlpobj/trsym.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/trsym/trsym.sty RELOC/tex/latex/trsym/utrsy.fd catalogue-ctan /fonts/trsym -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics font font-symbol font-mf catalogue-version 1.0 ++++++ truncate.doc.tar.xz ++++++ ++++++ truncate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/truncate.tlpobj new/tlpkg/tlpobj/truncate.tlpobj --- old/tlpkg/tlpobj/truncate.tlpobj 2016-04-14 19:53:48.000000000 +0200 +++ new/tlpkg/tlpobj/truncate.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/truncate/truncate.sty catalogue-ctan /macros/latex/contrib/truncate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics layout catalogue-version 3.6 ++++++ tsemlines.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tsemlines.tlpobj new/tlpkg/tlpobj/tsemlines.tlpobj --- old/tlpkg/tlpobj/tsemlines.tlpobj 2016-04-14 19:53:48.000000000 +0200 +++ new/tlpkg/tlpobj/tsemlines.tlpobj 2017-04-14 18:03:36.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/tsemlines/tsemlines.sty catalogue-ctan /macros/latex/contrib/tsemlines -catalogue-date 2015-12-27 20:31:23 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-prep catalogue-version 1.0 ++++++ ttfutils.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ttf2afm.1 new/texmf-dist/doc/man/man1/ttf2afm.1 --- old/texmf-dist/doc/man/man1/ttf2afm.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ttf2afm.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TTF2AFM 1 "8 March 2016" "Web2C 2016" +.TH TTF2AFM 1 "8 March 2016" "Web2C 2017" .PP .SH "NAME" ttf2afm \- utility to generate AFM files for TrueType fonts Binary files old/texmf-dist/doc/man/man1/ttf2afm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2afm.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/ttf2pk.man1.pdf and new/texmf-dist/doc/man/man1/ttf2pk.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/ttfdump.man1.pdf and new/texmf-dist/doc/man/man1/ttfdump.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.doc.tlpobj new/tlpkg/tlpobj/ttfutils.doc.tlpobj --- old/tlpkg/tlpobj/ttfutils.doc.tlpobj 2016-04-27 03:25:13.000000000 +0200 +++ new/tlpkg/tlpobj/ttfutils.doc.tlpobj 2017-05-04 02:07:27.000000000 +0200 @@ -1,8 +1,8 @@ name ttfutils.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of ttfutils -docfiles size=65 +docfiles size=48 texmf-dist/doc/man/man1/ttf2afm.1 texmf-dist/doc/man/man1/ttf2afm.man1.pdf texmf-dist/doc/man/man1/ttf2pk.1 ++++++ ttfutils.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.tlpobj new/tlpkg/tlpobj/ttfutils.tlpobj --- old/tlpkg/tlpobj/ttfutils.tlpobj 2016-04-27 03:25:13.000000000 +0200 +++ new/tlpkg/tlpobj/ttfutils.tlpobj 2017-05-04 02:07:27.000000000 +0200 @@ -1,6 +1,6 @@ name ttfutils category TLCore -revision 40768 +revision 44166 depend ttfutils.ARCH runfiles size=219 texmf-dist/fonts/enc/ttf2pk/base/T1-WGL4.enc ++++++ tucv.doc.tar.xz ++++++ ++++++ tucv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tucv.tlpobj new/tlpkg/tlpobj/tucv.tlpobj --- old/tlpkg/tlpobj/tucv.tlpobj 2016-04-14 19:54:13.000000000 +0200 +++ new/tlpkg/tlpobj/tucv.tlpobj 2017-04-14 18:03:45.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=1 RELOC/tex/latex/tucv/tucv.sty catalogue-ctan /macros/latex/contrib/tucv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics cv catalogue-version 1.0 ++++++ tudscr.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/LICENSE new/doc/latex/tudscr/LICENSE --- old/doc/latex/tudscr/LICENSE 2016-03-26 23:56:30.000000000 +0100 +++ new/doc/latex/tudscr/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -============================================================================ - - TUD-KOMA-Script - Copyright (c) Falk Hanisch <tudscr(a)gmail.com>, 2012-2016 - -============================================================================ - - This work may be distributed and/or modified under the conditions of the - LaTeX Project Public License, version 1.3c of the license. The latest - version of this license is in http://www.latex-project.org/lppl.txt and - version 1.3c or later is part of all distributions of LaTeX 2005/12/01 - or later and of this work. This work has the LPPL maintenance status - "author-maintained". The current maintainer and author of this work - is Falk Hanisch. - ----------------------------------------------------------------------------- - - Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz - in der Version 1.3c, verteilt und/oder veraendert werden. Die aktuelle - Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und - Version 1.3c oder spaeter ist Teil aller Verteilungen von LaTeX 2005/12/01 - oder spaeter und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status - "author-maintained", wird somit allein durch den Autor verwaltet. Der - aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch. - -============================================================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/LICENSE.md new/doc/latex/tudscr/LICENSE.md --- old/doc/latex/tudscr/LICENSE.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/tudscr/LICENSE.md 2017-03-27 23:42:47.000000000 +0200 @@ -0,0 +1,27 @@ + + TUD-Script -- Corporate Design of Technische Universität Dresden +---------------------------------------------------------------------------- + + Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2017 + +---------------------------------------------------------------------------- + + This work may be distributed and/or modified under the conditions of the + LaTeX Project Public License, version 1.3c of the license. The latest + version of this license is in http://www.latex-project.org/lppl.txt and + version 1.3c or later is part of all distributions of LaTeX 2005/12/01 + or later and of this work. This work has the LPPL maintenance status + "author-maintained". The current maintainer and author of this work + is Falk Hanisch. + +---------------------------------------------------------------------------- + + Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz + in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle + Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und + Version 1.3c oder später ist Teil aller Verteilungen von LaTeX 2005/12/01 + oder später und dieses Werks. Dieses Werk hat den LPPL-Verwaltungs-Status + "author-maintained", wird somit allein durch den Autor verwaltet. Der + aktuelle Verwalter und Autor dieses Werkes ist Falk Hanisch. + +---------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/README new/doc/latex/tudscr/README --- old/doc/latex/tudscr/README 2016-03-26 23:56:30.000000000 +0100 +++ new/doc/latex/tudscr/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,279 +0,0 @@ - -TUD-KOMA-Script -=============== - -TUD-KOMA-Script 2016/03/26 v2.04d -Copyright (c) Falk Hanisch <tudscr(a)gmail.com>, 2012-2016 - -This material is subject to the LaTeX Project Public License version 1.3c or -later. See http://www.latex-project.org/lppl.txt for details of that license. - -English text below - -------------------------------------------------------------------------------- - -Zusammenfassung ---------------- - -Das TUD-KOMA-Script-Bundle stellt sowohl Klassen als auch Pakete bereit, um -LaTeX-Dokumente im Corporate Design der Technischen Universität Dresden zu -erstellen. Es basiert auf dem KOMA-Script-Bundle, welches zwingend vorhanden -sein muss. Außerdem sollten die beiden PostScript-Schriftfamilien Univers und -DIN-Bold installiert werden. Geschieht dies nicht, können die Dokumentklassen -zwar genutzt werden, die ausgegebenen Dokumente entsprechen in diesem Fall -jedoch nicht dem ursprünglich erhofftem Stil. - -Mitarbeiter und Studenten der Technischen Universität Dresden können die -Schriftdateien unter https://tu-dresden.de/service/publizieren/cd/4_latex vom -Universitätsmarketing mit dem Hinweis auf die Verwendung von LaTeX anfordern. -Für die Installation der PostScript-Schriften sei auf den entsprechenden -Release unter https://github.com/tud-cd/tudscr/releases/tag/fonts und das -LaTeX-Forum der Technischen Universität Dresden verwiesen: -http://latex.wcms-file3.tu-dresden.de/phpBB3/index.php - - -Klassen und Pakete ------------------- - -Das Bundle beinhaltet: - -+ die drei Dokumentklassen `tudscrartcl`, `tudscrreprt`, `tudscrbook` als - Wrapper-Klassen von `scrartcl`, `scrreprt` and `scrbook`, -+ das Paket `tudscrsupervisor`, welches Umgebungen und Befehle für die - Erstellung von Aufgabenstellungen, Gutachten und Aushängen bereitstellt, -+ das Paket `tudscrfonts`, das die Schriften des Corporate Designs der - Technischen Universität Dresden für die LaTeX-Standard-Klassen und die - KOMA-Script-Klassen nutzbar macht, -+ das Paket `mathswap` für das Austauschen mathematischer Trennzeichen - innerhalb von Zahlen (ähnlich zu `ionumbers`), -+ das Paket `twocolfix` zur Fehlerbefehbung der Position von Überschriften im - zweispaltigen Layout und -+ eine umfassende Anwenderdokumentation sowie mehrere Tutorials. - -Versionen ---------- - -**v2.04d** (2016/03/26) - -+ Bugfix für Titelseite bei `tudscrartcl` - - -**v2.04c** (2015/11/29) - -+ Bugfix für fehlenden Schriften bei Verwendung von Paket `fontspec` - - -**v2.04b** (2015/10/06) - -+ Bugfix für KOMA-Script v3.19 - - -**v2.04a** (2015/07/24) - -+ Bugfix für Option `ddc` - - -**v2.04** (2015/07/02) - -+ Anpassungen an KOMA-Script v3.18 -+ Einfachere Verwendung von `fontspec` -+ verbesserte Installationsroutine der Schriften für portable Distributionen -+ alleinstehender farbiger Querbalken im Kopfbereich -+ freier Inhalt im Fußbereich möglich - - -**v2.03a** (2015/06/11) - -+ Anpassungen an KOMA-Script v3.17 -+ Fehlerkorrektur für Auswahl der Mathematikschriften - - -**v2.03** (2015/02/15) - -+ Anpassungen an KOMA-Script v3.15 -+ Verbesserung des Satzspiegels für das Corporate Design -+ Kopf und Fuß können farbig dargestellt werden -+ Logos in der Fußzeile für Titel und dergleichen möglich -+ kleinere Fehlerkorrekturen - - -**v2.02** (2014/12/17) - -+ Paket `tudscrfonts` -+ Probleme mit der Klasse `standalone` behoben -+ Laden der Schriften des Corporate Designs im OpenType-Format mit `fontspec` - ermöglicht -+ verbesserte Installationsroutine der PostScript-Schriften -+ Seiten im Stil des Corporate Designs werden mithilfe des Paketes - `scrlayer-scrpage` erzeugt -+ verschiedene Optionen und Befehle zur individuellen Gestaltung dieser Seiten -+ Unterstützung der KOMA-Script-Schriftelemente für Titel und Umschlagseite -+ Befehle und Umgebungen für Zusammenfassung, Selbstständigkeitserklärung und - Sperrvermerk wurden verbessert -+ Fussnoten in Überschriften können per Option mit Symbolen gesetzt werden -+ einige Befehle wurden für Kompatibilität zu anderen Paketen umbenannt -+ Funktionalität des Paketes `mathswap` im Dokument umschaltbar - - -**v2.01b** (2014/06/04) - -+ Bug bei Aufgabenstellung behoben (tudscrsupervisor) - - -**v2.01a** (2014/06/03) - -+ Bug bei der Verwendung des Untertitels behoben - - -**v2.01** (2014/04/24) - -+ Fehlerkorrekturen beim Kerning der Ziffern und bei der Schriftstärke auf der - Titelseite - - -**v2.00** (2014/04/22) - -+ Das TUD-KOMA-Script-Bundle wurde von Grund auf überarbeitet und mittels - `docstrip` erzeugt. Viele Fehler wurden entfernt und die Robustheit der - Befehle und Optionen wurde erhöht. Die Verwendung der Schriften, insbesondere - für den mathematischen Satz, wurde entscheidend verbessert. Weiterhin erfuhr - das Handbuch des Bundles eine komplette Überarbeitung, wurde erweitert und um - mehrere Indexe ergänzt. - - -**v1.0** (2012/10/31) - -+ erste Version des TUD-KOMA-Script-Bundles - - -------------------------------------------------------------------------------- - -Summary -------- - -The TUD-KOMA-Script bundle provides both classes and packages in order to -create LaTeX documents in the corporate design of the Technische Universität -Dresden. It bases on the KOMA-Script bundle, which must necessarily be present. -In addition, the PostScript font families Univers and DIN-Bold should be -installed. Otherwise, the document classes can admittedly be used, but in this -case, the created documents do not correspond to the originally thought style. - -Employees and students of the Technische Universität Dresden can request these -fonts via https://tu-dresden.de/service/publizieren/cd/4_latex from the -university marketing university marketing with regard to the use of LaTeX. To -install the PostScript fonts, please refer to the corresponding release under -https://github.com/tud-cd/tudscr/releases/tag/fonts and the LaTeX forum of the -Technische Universität Dresden: -http://latex.wcms-file3.tu-dresden.de/phpBB3/index.php - -Classes and Packages --------------------- - -The bundle offers: - -+ the three document classes `tudscrartcl`, `tudscrreprt`, `tudscrbook` as - wrapper classes for `scrartcl`, `scrreprt` and `scrbook`, -+ the package `tudscrsupervisor` providing environments and macros to create - tasks, evaluations and notices for scientific theses, -+ the package `tudscrfonts`, which makes the corporate design fonts of the - Technische Universität Dresden available for LaTeX standard classes and - KOMA-Script classes, -+ the package `mathswap` for swapping math delimiters within numbers (similiar - to `ionumbers`), -+ the package `twocolfix` for fixing the positioning bug of headings in - twocolumn layout and -+ an comprehensive user documentation as well as several tutorials. - -Versions --------- - -**v2.04d** (2016/03/26) - -+ bug fix for titlepage with `tudscrartcl` - - -**v2.04c** (2015/11/29) - -+ bug fix for missing fonts when using package `fontspec` - - -**v2.04b** (2015/10/06) - -+ bug fix for KOMA-Script v3.19 - - -**v2.04a** (2015/07/24) - -+ bug fix for option `ddc` - - -**v2.04** (2015/07/02) - -+ adjustments to KOMA-Script v3.18 -+ simpler usage of `fontspec` -+ improved installation routine for portable distributions -+ solitary colored head bar -+ customisable content in the foot possible - - -**v2.03a** (2015/06/11) - -+ adjustments to KOMA-Script v3.17 -+ bug fix for math font selecting - - -**v2.03** (2015/02/15) - -+ adjustments to KOMA-Script v3.15 -+ improvement of the corporate design type area -+ colored head and foot possible -+ including logos in the foot for the title etc. -+ a few little bug fixes - - -**v2.02** (2014/12/17) - -+ package `tudscrfonts` -+ fixed bug with class `standalone` -+ loading the corporate design fonts in OpenType format with `fontspec` is - possible -+ improved installation routine of PostScript fonts -+ pages in the style of the corporate design are generated using the package - `scrlayer-scrpage` -+ various options and commands to customize these pages -+ support of the KOMA-Script font elements for title and cover -+ commands and environments for abstract, statement of authorship and - restriction note have been improved -+ footnotes in headings can be set as symbols per option `footnotes` -+ some commands have been renamed for compatibility with other packages -+ functionality of the package `mathswap` can be switched within the document - - -**v2.01b** (2014/06/04) - -+ fixed bug when using task (tudscrsupervisor) - - -**v2.01a** (2014/06/03) - -+ fixed bug when using the subtitle - - -**v2.01** (2014/04/24) - -+ fixes the kerning of the digits and the font weight at the title page - - -**v2.00** (2014/04/22) - -+ The TUD-KOMA-Script bundle has been redesigned from the ground up and is - generated by using `docstrip`. Many bugs have been removed and the robustness - of the commands and options has been increased. The use of the fonts, - especially for the mathematical set, was significantly improved. The manual - of the bundle underwent a complete overhaul, has been extended and - supplemented by several indexes. - - -**v1.0** (2012/10/31) - -+ first version of the TUD-KOMA-Script bundle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/README.md new/doc/latex/tudscr/README.md --- old/doc/latex/tudscr/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/tudscr/README.md 2017-06-06 01:14:56.000000000 +0200 @@ -0,0 +1,357 @@ + + TUD-Script -- Corporate Design of Technische Universität Dresden +---------------------------------------------------------------------------- + + Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2017 + + tudscr 2017/03/29 v2.05l + +---------------------------------------------------------------------------- + + This material is subject to the LaTeX Project Public License version 1.3c + or later. See http://www.latex-project.org/lppl.txt for details. + English text below + +---------------------------------------------------------------------------- + +Zusammenfassung +--------------- + +Das TUD-Script-Bundle stellt sowohl Klassen als auch Pakete bereit, um +LaTeX-Dokumente im Corporate Design der Technischen Universität Dresden zu +erstellen. Es basiert auf dem KOMA-Script-Bundle, welches zwingend vorhanden +sein muss. Außerdem sollten die beiden PostScript-Schriftfamilien Univers und +DIN-Bold installiert werden. Geschieht dies nicht, können die Dokumentklassen +zwar genutzt werden, die ausgegebenen Dokumente entsprechen in diesem Fall +jedoch nicht dem ursprünglich erhofftem Stil. + +Mitarbeiter und Studenten der Technischen Universität Dresden können die +Schriftdateien unter https://tu-dresden.de/service/publizieren/cd/4_latex vom +Universitätsmarketing mit dem Hinweis auf die Verwendung von LaTeX anfordern. +Für die Installation der PostScript-Schriften sei auf den entsprechenden +Release unter https://github.com/tud-cd/tudscr/releases/tag/fonts und das +LaTeX-Forum der Technischen Universität Dresden verwiesen: +http://latex.wcms-file3.tu-dresden.de/phpBB3/ + + +Klassen und Pakete +------------------ + +Das Bundle beinhaltet: + ++ die drei Dokumentklassen **tudscrartcl**, **tudscrreprt**, **tudscrbook** + als Wrapper-Klassen von **scrartcl**, **scrreprt** und **scrbook**, ++ die Klasse **tudscrposter** für das Erstellen von Postern ++ das Paket **tudscrsupervisor**, welches Umgebungen und Befehle für die + Erstellung von Aufgabenstellungen, Gutachten und Aushängen bereitstellt, ++ das Paket **tudscrfonts**, das die Schriften des Corporate Designs der + Technischen Universität Dresden für die LaTeX-Standard-Klassen und die + KOMA-Script-Klassen nutzbar macht, ++ das Paket **fix-tudscrfonts**, das selbige Schriften für weitere + TUD-CD-Klassen verfügbar macht, welche nicht zu TUD-Script gehören, ++ das Paket **tudscrcomp**, welches den Umstieg von fremden TUD-CD-Klassen auf + TUD-Script vereinfacht, ++ das Paket **mathswap** für das Austauschen mathematischer Trennzeichen + innerhalb von Zahlen (ähnlich zu **ionumbers**), ++ das Paket **twocolfix** zur Fehlerbefehbung der Position von Überschriften im + zweispaltigen Layout und ++ eine umfassende Anwenderdokumentation sowie mehrere Tutorials. + +Versionen +--------- + +**v2.05m** (2017/05/30) ++ Bugfix für Unicode-Engines für die Glyphe `ß` ++ Bugfix für Paket **siunitx** bei Erkennung der Schriftfamilie + +**v2.05l** (2017/03/29) ++ Bugfix für Paket **fontspec** bei Option `cdfont=false` ++ Bugfix für Paket **fontspec** bei Schriftnamen + +**v2.05k** (2017/03/27) ++ Bugfix für Gliederungsbefehle `\addpart`, `\addchap` und `\addsec` ++ kleinere Anpassungen für Dokumentationsklassen + +**v2.05i** (2017/03/12) ++ Befehl `\Describe<Element>s` für mehrere Elemente in Klasse **tudscrdoc** ++ Umgebung `DescribeParameterParent` in Klasse **tudscrdoc** ++ Bugfix für `\mu` bei Mathematikschriften ++ Bugfix in Klasse **tudscrmanual** für neue Version von **xparse** + +**v2.05h** (2017/02/04) ++ Quelltextdokumentationsklasse **tudscrdoc** an neue Version von **dox** + angepasst ++ Glyphen (`lessequal` und `greaterequal`) in Schriftfamilien korrigiert + +**v2.05g** (2017/01/26) ++ Erweiterung der Quelltextdokumentationsklasse **tudscrdoc** ++ kleinere Fehler im TUD-Script-Bundle behoben + +**v2.05f** (2016/10/12) ++ Probleme mit dem Paket **bm** behoben + +**v2.05e** (2016/10/10) ++ Bugfix für Verwendung von `\author` nach `\maketitle` + +**v2.05d** (2016/09/22) ++ Bezeichnung in TUD-Script-Bundle geändert ++ Probleme mit dem Paket **flexisym** behoben + +**v2.05c** (2016/09/15) ++ Bugfix bei Verwendung von KOMA-Script v3.19 und früher + +**v2.05b** (2016/09/09) ++ Bugfix für **fix-tudscrfonts** + +**v2.05a** (2016/08/24) ++ Bugfix für Überprüfung der installierten Schriften + +**v2.05** (2016/07/26) ++ Klasse **tudscrposter** ++ Schnittmarken mit Paketen **crop** und **geometry** möglich ++ neue Einstellungsmöglichkeiten für den Satzspiegel ++ schriftgrößenabhängige Abstände mit Option `relspacing` ++ `\course` und `\discipline` für Titel nutzbar ++ Paket **tudscrcomp**: Unterstützung der Klassen **tudmathposter** und + **tudposter** ++ Paket **fix-tudscrfonts** + +**v2.04e** (2016/06/17) ++ Bugfix für Teile mit KOMA-Script v3.21 + +**v2.04d** (2016/03/26) ++ Bugfix für Titelseite bei **tudscrartcl** + +**v2.04c** (2015/11/29) ++ Bugfix für fehlenden Schriften bei Verwendung von Paket **fontspec** + +**v2.04b** (2015/10/06) ++ Bugfix für KOMA-Script v3.19 + +**v2.04a** (2015/07/24) ++ Bugfix für Option `ddc` + +**v2.04** (2015/07/02) ++ Anpassungen an KOMA-Script v3.18 ++ Einfachere Verwendung von Paket **fontspec** ++ verbesserte Installationsroutine der Schriften für portable Distributionen ++ alleinstehender farbiger Querbalken im Kopfbereich ++ freier Inhalt im Fußbereich möglich + +**v2.03a** (2015/06/11) ++ Anpassungen an KOMA-Script v3.17 ++ Fehlerkorrektur für Auswahl der Mathematikschriften + +**v2.03** (2015/02/15) ++ Anpassungen an KOMA-Script v3.15 ++ Verbesserung des Satzspiegels für das Corporate Design ++ Kopf und Fuß können farbig dargestellt werden ++ Logos in der Fußzeile für Titel und dergleichen möglich ++ kleinere Fehlerkorrekturen + +**v2.02** (2014/12/17) ++ Paket **tudscrfonts** ++ Probleme mit der Klasse **standalone** behoben ++ Laden der Schriften des Corporate Designs im OpenType-Format mit Paket + **fontspec** ermöglicht ++ verbesserte Installationsroutine der PostScript-Schriften ++ Seiten im Stil des Corporate Designs werden mithilfe des Paketes + **scrlayer-scrpage** erzeugt ++ verschiedene Optionen und Befehle zur individuellen Gestaltung dieser Seiten ++ Unterstützung der KOMA-Script-Schriftelemente für Titel und Umschlagseite ++ Befehle und Umgebungen für Zusammenfassung, Selbstständigkeitserklärung und + Sperrvermerk wurden verbessert ++ Fussnoten in Überschriften als Symbole per Option `footnotes` ++ einige Befehle wurden für Kompatibilität zu anderen Paketen umbenannt ++ Funktionalität des Paketes **mathswap** im Dokument umschaltbar + +**v2.01b** (2014/06/04) ++ Bug bei Aufgabenstellung behoben (tudscrsupervisor) + +**v2.01a** (2014/06/03) ++ Bug bei der Verwendung des Untertitels behoben + +**v2.01** (2014/04/24) ++ Fehlerkorrekturen beim Kerning der Ziffern und bei der Schriftstärke auf der + Titelseite + +**v2.00** (2014/04/22) ++ Das TUD-Script-Bundle wurde von Grund auf überarbeitet und mittels Paket + **docstrip** erzeugt. Viele Fehler wurden entfernt und die Robustheit der + Befehle und Optionen wurde erhöht. Die Verwendung der Schriften, insbesondere + für den mathematischen Satz, wurde entscheidend verbessert. Weiterhin erfuhr + das Handbuch des Bundles eine komplette Überarbeitung, wurde erweitert und um + mehrere Indexe ergänzt. + +**v1.0** (2012/10/31) ++ erste Version des TUD-Script-Bundles + +------------------------------------------------------------------------------- + +Summary +------- + +The TUD-Script bundle provides both classes and packages in order to +create LaTeX documents in the corporate design of the Technische Universität +Dresden. It bases on the KOMA-Script bundle, which must necessarily be present. +In addition, the PostScript font families Univers and DIN-Bold should be +installed. Otherwise, the document classes can admittedly be used, but in this +case, the created documents do not correspond to the originally thought style. + +Employees and students of the Technische Universität Dresden can request these +fonts via https://tu-dresden.de/service/publizieren/cd/4_latex from the +university marketing university marketing with regard to the use of LaTeX. To +install the PostScript fonts, please refer to the corresponding release under +https://github.com/tud-cd/tudscr/releases/tag/fonts and the LaTeX forum of the +Technische Universität Dresden: +http://latex.wcms-file3.tu-dresden.de/phpBB3/ + +Classes and Packages +-------------------- + +The bundle offers: + ++ the three document classes **tudscrartcl**, **tudscrreprt**, **tudscrbook** + as wrapper classes for **scrartcl**, **scrreprt** and **scrbook**, ++ the class **tudscrposter** for creating posters, ++ the package **tudscrsupervisor** providing environments and macros to create + tasks, evaluations and notices for scientific theses, ++ the package **tudscrfonts**, which makes the corporate design fonts of the + Technische Universität Dresden available for LaTeX standard classes and + KOMA-Script classes, ++ the package **fix-tudscrfonts**, which provides the same fonts to additional + corporate design classes not related to TUD-Script ++ the package **tudscrcomp**, which simplifies the switch to TUD-Script + from external corporate design classes, ++ the package **mathswap** for swapping math delimiters within numbers + (similiar to **ionumbers**), ++ the package **twocolfix** for fixing the positioning bug of headings in + twocolumn layout and ++ an comprehensive user documentation as well as several tutorials. + +Versions +-------- + +**v2.05m** (2017/05/30) ++ bug fix for Unicode engines for glyph`ß` ++ bug fix for package **siunitx** when recognizing the font family + +**v2.05l** (2017/03/29) ++ bug fix for package **fontspec** with option `cdfont=false` ++ bug fix for package **fontspec** with font names + +**v2.05k** (2017/03/27) ++ bug fix for sectioning commands `\addpart`, `\addchap` und `\addsec` ++ small adaptions for documentation classes + +**v2.05i** (2017/03/12) ++ command `\Describe<Element>s` for mutliple elements in class **tudscrdoc** ++ environment `DescribeParameterParent` in class **tudscrdoc** ++ bug fix for `\mu` with math font ++ bug fix in class **tudscrmanual** for new version of **xparse** + +**v2.05h** (2017/02/04) ++ adaption to source code documentation class **tudscrdoc** for updated **dox** ++ glyphs (`lessequal` und `greaterequal`) in font families corrected + +**v2.05g** (2017/01/26) ++ enhancement of the source code documentation class **tudscrdoc** ++ minor errors fixed within the TUD-Script bundle + +**v2.05f** (2016/10/12) ++ solved problems with package **bm** + +**v2.05e** (2016/10/10) ++ bug fix for usage of `\author` after `\maketitle` + +**v2.05d** (2016/09/22) ++ notation changed to TUD-Script bundle ++ solved problems with package **flexisym** + +**v2.05c** (2016/09/15) ++ bug fix for usage of KOMA-Script v3.19 and earlier + +**v2.05b** (2016/09/09) ++ bug fix for **fix-tudscrfonts** + +**v2.05a** (2016/08/24) ++ bug fix for verification of installed fonts + +**v2.05** (2016/07/26) ++ class **tudscrposter** ++ crop marks with packages **crop** and **geometry** possible ++ new possible settings for type area ++ font size related skips with option `relspacing` ++ `\course` and `\discipline` available on title ++ package **tudscrcomp**: support for classes **tudmathposter** and + **tudposter** ++ package **fix-tudscrfonts** + +**v2.04e** (2016/06/17) ++ bug fix for parts with KOMA-Script v3.21 + +**v2.04d** (2016/03/26) ++ bug fix for titlepage with **tudscrartcl** + +**v2.04c** (2015/11/29) ++ bug fix for missing fonts when using package **fontspec** + +**v2.04b** (2015/10/06) ++ bug fix for KOMA-Script v3.19 + +**v2.04a** (2015/07/24) ++ bug fix for option `ddc` + +**v2.04** (2015/07/02) ++ adjustments to KOMA-Script v3.18 ++ simpler usage of package **fontspec** ++ improved installation routine for portable distributions ++ solitary colored head bar ++ customisable content in the foot possible + +**v2.03a** (2015/06/11) ++ adjustments to KOMA-Script v3.17 ++ bug fix for math font selecting + +**v2.03** (2015/02/15) ++ adjustments to KOMA-Script v3.15 ++ improvement of the corporate design type area ++ colored head and foot possible ++ including logos in the foot for the title etc. ++ a few little bug fixes + +**v2.02** (2014/12/17) ++ package **tudscrfonts** ++ fixed bug with class **standalone** ++ loading the corporate design fonts in OpenType format with package + **fontspec** is possible ++ improved installation routine of PostScript fonts ++ pages in the style of the corporate design are generated using the package + **scrlayer-scrpage** ++ various options and commands to customize these pages ++ support of the KOMA-Script font elements for title and cover ++ commands and environments for abstract, statement of authorship and + restriction note have been improved ++ footnotes in headings can be set as symbols per option `footnotes` ++ some commands have been renamed for compatibility with other packages ++ functionality of the package **mathswap** can be switched within the document + +**v2.01b** (2014/06/04) ++ fixed bug when using task (tudscrsupervisor) + +**v2.01a** (2014/06/03) ++ fixed bug when using the subtitle + +**v2.01** (2014/04/24) ++ fixes the kerning of the digits and the font weight at the title page + +**v2.00** (2014/04/22) ++ The TUD-Script bundle has been redesigned from the ground up and is + generated by using **docstrip**. Many bugs have been removed and the + robustness of the commands and options has been increased. The use of the + fonts, especially for the mathematical set, was significantly improved. The + manual of the bundle underwent a complete overhaul, has been extended and + supplemented by several indexes. + +**v1.0** (2012/10/31) ++ first version of the TUD-Script bundle Binary files old/doc/latex/tudscr/tudscr.pdf and new/doc/latex/tudscr/tudscr.pdf differ Binary files old/doc/latex/tudscr/tudscr_print.pdf and new/doc/latex/tudscr/tudscr_print.pdf differ Binary files old/doc/latex/tudscr/tudscrsource.pdf and new/doc/latex/tudscr/tudscrsource.pdf differ Binary files old/doc/latex/tudscr/tutorials/mathswap.pdf and new/doc/latex/tudscr/tutorials/mathswap.pdf differ Binary files old/doc/latex/tudscr/tutorials/mathtype.pdf and new/doc/latex/tudscr/tutorials/mathtype.pdf differ Binary files old/doc/latex/tudscr/tutorials/treatise.pdf and new/doc/latex/tudscr/tutorials/treatise.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tudscr.doc.tlpobj new/tlpkg/tlpobj/tudscr.doc.tlpobj --- old/tlpkg/tlpobj/tudscr.doc.tlpobj 2016-04-14 19:54:15.000000000 +0200 +++ new/tlpkg/tlpobj/tudscr.doc.tlpobj 2017-06-06 02:22:24.000000000 +0200 @@ -1,11 +1,11 @@ name tudscr.doc category Package -revision 40147 +revision 44480 shortdesc doc files of tudscr relocated 1 -docfiles size=976 - RELOC/doc/latex/tudscr/LICENSE - RELOC/doc/latex/tudscr/README +docfiles size=1143 + RELOC/doc/latex/tudscr/LICENSE.md + RELOC/doc/latex/tudscr/README.md RELOC/doc/latex/tudscr/tudscr.pdf RELOC/doc/latex/tudscr/tudscr_print.pdf RELOC/doc/latex/tudscr/tudscrsource.pdf ++++++ tudscr.tar.xz ++++++ ++++ 47212 lines of diff (skipped) ++++++ tufte-latex.doc.tar.xz ++++++ ++++++ tufte-latex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tufte-latex.tlpobj new/tlpkg/tlpobj/tufte-latex.tlpobj --- old/tlpkg/tlpobj/tufte-latex.tlpobj 2016-04-14 19:54:19.000000000 +0200 +++ new/tlpkg/tlpobj/tufte-latex.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/tufte-latex/tufte-common.def RELOC/tex/latex/tufte-latex/tufte-handout.cls catalogue-ctan /macros/latex/contrib/tufte-latex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license apache2 catalogue-topics book-pub class catalogue-version 3.5.2 ++++++ tugboat-plain.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/tugboat-plain/README new/doc/plain/tugboat-plain/README --- old/doc/plain/tugboat-plain/README 2012-05-24 01:32:15.000000000 +0200 +++ new/doc/plain/tugboat-plain/README 2016-11-25 19:30:45.000000000 +0100 @@ -1,5 +1,11 @@ -$Id: README 100 2012-05-22 18:09:46Z bnb $ -(This file in the public domain.) +$Id: README 169 2016-11-07 19:11:13Z karl $ +(This README file is public domain.) The plain style files for TUGboat, the journal of the TeX Users Group. -See http://tug.org/TUGboat for back issues, author information, and more. +See http://tug.org/TUGboat for all issues, contact information, + notes for authors, and all else. + +tugboat.sty is for both regular and proceedings issue. Just \input it. +tugproc.sty was for proceedings issue, but is no longer used. +tugboat.cmn had definitions common for both (could/should also be common + to the LaTeX TUGboat style, but isn't). Binary files old/doc/plain/tugboat-plain/tubguide.pdf and new/doc/plain/tugboat-plain/tubguide.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/tugboat-plain/tubguide.tex new/doc/plain/tugboat-plain/tubguide.tex --- old/doc/plain/tugboat-plain/tubguide.tex 2012-05-24 01:32:15.000000000 +0200 +++ new/doc/plain/tugboat-plain/tubguide.tex 2016-11-25 19:30:45.000000000 +0100 @@ -1,9 +1,9 @@ %% @texfile{ %% filename = "tubguide.tex", -%% version = "1.04", -%% date = "2012/05/22", +%% version = "1.22", +%% date = "2016/09/26", %% filetype = "TUGboat Authors' Guide", -%% copyright = "Copyright 1989, 1992, 2006, 2012 TeX Users Group. +%% copyright = "Copyright 1989, 1992, 2006, 2012-2016 TeX Users Group. %% Unlimited copying and redistribution of this file %% are permitted as long as this file is not %% modified. Modifications (and redistribution of @@ -17,7 +17,7 @@ %% that produced the original Authors' Guide in %% TUGboat 10, no. 3, November 1989.", %% } -%% $Id: tubguide.tex 100 2012-05-22 18:09:46Z bnb $ +%% $Id: tubguide.tex 157 2016-09-26 23:34:10Z karl $ %% ********************************************************* %% %% TeXing this file requires the following files: @@ -48,8 +48,8 @@ \author * Barbara Beeton * \address * American Mathematical Society\\ - 201 Charles Street\\ - Providence, RI 02904-2294 * + 201 Charles Street\\ + Providence, RI 02904-2294 * \netaddress * TUGboat(a)tug.org * \author * Ron Whitney * @@ -57,12 +57,13 @@ %\netaddress * TUGboat(a)Math.AMS.com * -\vfootnote{}{Revised March 1992, May 2006, May 2012; the original appeared in +\vfootnote{}{Revised March 1992, May 2006, May 2012, September 2016; the +original appeared in \tubissue 10(3), November 1989.} \article -With this article we hope to fill a lacuna (some might say ``void'') +With this report we hope to fill a lacuna (some might say ``void'') whose existence we have been attributing to the usual factors: tight schedules, alternative priorities and warty \TeX\ code. We now feel the macros in use for \TUB\/ have stabilized to the extent that @@ -74,38 +75,40 @@ the addresses listed below. \TUB\/ was originally typeset with a package based only on \plain. -Later, as demand for style files follows wherever -\LaTeX-devotees wander, a \TUB\/ variant of the \LaTeX\ {\tt article} -style was also created. The two macro sets yield -much the same output, differing in certain ways for input. Below we -make comment on various aspects of the \TUB\/ package, first for the -\plain-based macros, then for \LaTeX. The macro sets share -the file |tugboat.cmn|,\footnote{$^1$}{This file used to be named -{\tt tugboat.com}, but that notation was in conflict with conventions -of \acro{MS-DOS} and other operating systems; no conflicts are known to -exist for the new name.} and users of either style should read the -section entitled ``Common Abbreviations and Utilities''. We conclude -with some general suggestions to help make the lives of those on the -receiving end of (any kind of) electronic copy a little easier. +Later, as demand for style files follows wherever \LaTeX-devotees +wander, a \TUB\/ variant of the \LaTeX\ {\tt article} class was also +created\Dash see |ltugboat.cls| and its documentation in the separate +package |tugboat| (|http://ctan.org/pkg/tugboat|) . The two macro sets +yield much the same output, and many input conventions are identical, +with differences where they seemed natural. + +Below we describe various aspects of the \TUB\/ package for the +\plain-based macros. We conclude with some general suggestions to help +make the lives of those on the receiving end of (any kind of) electronic +copy a little easier. \head * The \plain-based macros: {\tt tugboat.sty} * -The macros are contained in two files, |tugboat.sty| and |tugboat.cmn|.$^1$ - -\subhead * General description of tags * -We attempt wherever possible to tag the various elements of \TUB\/ -articles in a ``generic'' way, modified in some respects by -convenience. Authors and editors, of course, need tools to shape -their articles to the form they desire, but we also wish to encourage -a tagging style which is appropriate for electronic interchange. It -seems unfair to expect much thought from authors concerning the -markup of their information if we only provide a bag of widgets and -do-hickies to hack and pound an article together. The tags whose use -we encourage are the higher-level tags that mark the logical -document structure. Below these are formatting macros that we -recognize may be essential for certain applications. Both sorts of -tags are described in the following article. +The macros are contained in two files, |tugboat.sty| and +|tugboat.cmn|.\footnote{$^1$}{1) A file |tugproc.sty| is also +distributed, but no longer used. 2) |tugboat.cmn| used to be named {\tt +tugboat.com}, but that notation was in conflict with conventions of +\acro{MS-DOS} and other operating systems; no conflicts are known to +exist for the new name.} + +\subhead * General description of tags * We attempt wherever possible to +tag the various elements of \TUB\/ articles in a ``generic'' way, +modified in some respects by convenience. Authors and editors need +tools to shape their articles to the form they desire, but we also wish +to encourage a tagging style which is appropriate for electronic +interchange. It seems unfair to expect much thought from authors +concerning the markup of their information if we only provide a bag of +widgets and do-hickies to hack and pound an article together. The tags +whose use we encourage are the higher-level tags that mark the logical +document structure. Below these are formatting macros that we recognize +may be essential for certain applications. Both sorts of tags are +described in the following article. Generally, to ``mark up'' the data <foo>, a tag |\xxx| will precede <foo> and |\endxxx| will follow (thus: |\xxx <foo>\endxxx|). We use @@ -216,7 +219,7 @@ \thenetaddress {<author number>} || to get the desired result. For example, for an article with% -\footnote{$^2$}{\xEdNote The \TUB{} address shown in examples +\footnote{$^2$}{\xEdNote The \TUB{} email address shown in examples was current when this article first appeared, but is now obsolete; it has been left intact to avoid other problems. The correct address is now {\tt TUGboat(a)tug.org}.} @@ -294,7 +297,7 @@ \subhead * Lists * -Lists are everywhere, of course, and a simple list hierarchy can +Lists are everywhere, and a simple list hierarchy can transform a one-dimensional typesetting problem into something nasty. All of which is to say, we are certainly not done with this area of tagging, but here are the available macros. @@ -660,56 +663,7 @@ \caption{...} \twocolfigure || -and, of course, \verbinline|\endverbatim and \verbinline||\endverbatim. - -\head * The \LaTeX\ macros: {\tt ltugboat.sty}% -\footnote{$^3$}{This discussion of {\tt ltugboat.sty} is now of -historical interest only; it has been superseded by a \LaTeXe{} -documentclass, {\tt ltugboat.cls}, available from \CTAN.} * - -|ltugboat.sty| is the primary macro file, and is based on the \LaTeX{} -|article.sty|. |tugboat.cmn|, a collection of items common to both -\LaTeX\ and \plain\ input, is also required. Articles will have -the form:\footnote{$^4$}{{\tt ltugboat} used to be a substyle; it now -stands on its own, by automatically inputting {\tt article.sty}.} -\verbatim[\makeescape\|] -\documentstyle{ltugboat} -|halfline -<perhaps additional macros for article> -|halfline -\title {<title>} -\author{<author>} -\address{<address>} -\netaddress{<netaddress>} - -\begin{document} -\maketitle -|vellipsis -<body of article> -|vellipsis -\makesignature -\end{document} -\endverbatim -This is the usual form for \LaTeX\ documents, of course, except -that now each author will have his/her own -\verbatim -\author{...} -\address{...} -\netaddress{...} -\endverbatim -block. As with the \plain{} style, the author and address -macros will store their information for later display. -See the discussion of |\address|, |\netaddress| and |\makesignature| -on the second page of this article to understand more. Linebreaks -within |\title|, |\author|, and |\...address| are specified with |\\|. - -We refer the user to the \LaTeX\ manual for description of section -heads, verbatim mode, insertions, and movement between one- and -two-column format. The style of printed output has, of course, been -somewhat modified to fit \TUB\/ style. |ltugboat.sty| might be of some -use to others wishing to modify the |article| option in this -direction. - +and \verbinline|\endverbatim and \verbinline||\endverbatim input syntax. \head * Common abbreviations and utilities * @@ -722,14 +676,18 @@ A nicety for the sake of appearance is the command |\acro|, which sets an acronym in caps one size smaller than the surrounding text. Compare CTAN (full size), \CTAN{} (|\acro{CTAN}|) and {\smc ctan} -(small caps). Acronyms in |tugboat.cmn| use |\acro| consistently. +(small caps). Acronyms in |tugboat.cmn| use |\acro| consistently, +except in (some) bibliographies. Several other constructions that we have found useful for both \plain- and \LaTeX-style input have been incorporated in |tugboat.cmn|. Various |\*lap|\,s (|\ulap|, |\dlap|, |\xlap|, |\ylap|, |\zlap|) and |\*smash|\,es provide means of setting type -which ``laps'' into neighboring regions. |\dash| and |\Dash| are en- -and em-dashes that break properly. |\slash| is a breakable slash. +which ``laps'' into neighboring regions. +|\Dash| is an em-dash with surrounding thinspaces, our preferred style. +|\slash| is a breakable slash. +|\cs{foo}| typesets |\foo|, just like \verbinline|\foo|\endverbatim (but +since |\cs| is the usual \TUB\ \LaTeX\ convention, we support it here too). The macro \verbatim \makestrut [<ascender dimen>; @@ -760,7 +718,7 @@ that authors may notice when articles are returned for proofing. |\xrefto| allows for symbolic cross-referencing, but is enabled only late in the production process. The distribution version of -|tugboat.cmn| defines |\xrefto| so that ``???'' is typeset whenever it +|tugboat.cmn| defines |\xrefto| so that ``???''\ is typeset whenever it is called. Not to worry. We also put notes into the file since there are many things to @@ -804,21 +762,19 @@ When authors proof their articles in formats other than that of \TUB\/ (for example), they should expect that \TUB's changes in pagewidth and pagedepth may drastically alter text layout. Paragraphs are rebroken -automatically when |\hsize| and |\vsize| change, but |\centerline| -does not break, and we often see tables and math displays which are -rigidly laid out. When possible, authors might use paragraphing -techniques instead of calls to, say, |\centerline| (Beeton will be -writing up her lectures on paragraphing techniques for a future issue -of \TUB\/), and they should try to code tables in such a way that -widths of columns can be changed easily. Generally, authors should -attempt to anticipate the work that might be necessary if requests for -other reasonable formats of their texts are made. In the case of -\TUB, we make a strong effort to stuff macro listings and tables into -the two-column format. Since these types of items are not generally -susceptible to automatic line-breaking, we give thanks to stuffings -made by authors ahead of time. In this context, we recommend the use -of |\verbfile{...}| (see the section `{Verbatim modes}') to maintain -consistency between documentation and reality. +automatically when |\hsize| and |\vsize| change, but |\centerline| does +not break, and we often see tables and math displays which are rigidly +laid out. When possible, authors might use paragraphing techniques +instead of calls to, say, |\centerline|, and they should try to code +tables in such a way that widths of columns can be changed easily. +Generally, authors should attempt to anticipate the work that might be +necessary if requests for other reasonable formats of their texts are +made. In the case of \TUB, we make a strong effort to stuff macro +listings and tables into the two-column format. Since these types of +items are not generally susceptible to automatic line-breaking, we give +thanks to stuffings made by authors ahead of time. In this context, we +recommend the use of |\verbfile{...}| (see the section `{Verbatim +modes}') to maintain consistency between documentation and reality. Specifically in the domain of \TeX\ macros, we find that many authors throw in unnecessary |%| characters to end code lines. Except in @@ -842,14 +798,12 @@ in wide distribution and in making them robust will be much appreciated. -\TBremark{Anything about formatting macros?} - \head * Electronic documentation and submissions * -In addition to |tugboat.sty|, |ltugboat.sty|, and |tugboat.cmn|, -a copy of this article, |tubguide.tex|, will be available in -most \TeX{} distributions and on \CTAN: +The TUGboat styles for both \LaTeX\ and plain \TeX\ are available on +\CTAN\ and already included in most \TeX\ distributions: + ||http://ctan.org/pkg/tugboat http://ctan.org/pkg/tugboat-plain|| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj --- old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2016-04-14 19:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -1,9 +1,9 @@ name tugboat-plain.doc category Package -revision 31340 +revision 43560 shortdesc doc files of tugboat-plain relocated 1 -docfiles size=66 +docfiles size=60 RELOC/doc/plain/tugboat-plain/README RELOC/doc/plain/tugboat-plain/tubguide.pdf RELOC/doc/plain/tugboat-plain/tubguide.tex ++++++ tugboat-plain.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/tugboat-plain/tugboat.cmn new/tex/plain/tugboat-plain/tugboat.cmn --- old/tex/plain/tugboat-plain/tugboat.cmn 2013-08-04 00:38:31.000000000 +0200 +++ new/tex/plain/tugboat-plain/tugboat.cmn 2017-03-21 01:01:03.000000000 +0100 @@ -3,7 +3,7 @@ %% version = "see below \fileversion" %% date = "see below \filedate", %% filetype = "common macros for TUGboat", -%% copyright = "Copyright 1993-1996,2006,2008,2011-2013 TeX Users Group. +%% copyright = "Copyright 1993-1996,2006,2008,2011-2016 TeX Users Group. %% Unlimited copying and redistribution of this file %% are permitted as long as this file is not %% modified. Modifications (and redistribution of @@ -19,11 +19,11 @@ %% definitions for abbreviations and logos that %% appear in TUGboat." %% } -%% $Id: tugboat.cmn 119 2013-08-02 18:22:58Z bnb $ +%% $Id: tugboat.cmn 176 2017-03-19 18:13:59Z karl $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{v1.21} -\def\filedate{2013/08/02} +\def\fileversion{v1.23} +\def\filedate{2017/03/19} \message{File `TUGBOAT.CMN' \fileversion \space\space <\filedate>} @@ -112,6 +112,8 @@ \def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \def\Cplusplus{C\raise.7ex\hbox{$_{++}$}} \def\CSS{\acro{CSS}} +\def\CSabbr{$\cal C$\kern-.1667em\lower.5ex\hbox{$\cal S$}} % from opmac.tex +\def\CSTUG{\CSabbr\acro{TUG}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} \def\DVD{\acro{DVD}} @@ -153,12 +155,10 @@ \def\MathML{Math\acro{ML}} % for Robert McGaffey \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}} -% Additional sizes of the manual font may be needed. -\font\manual=logo10 % font used for the METAFONT logo, etc. \def\MF{{\manual META}\-{\manual FONT}\spacefactor1000 } \def\MP{{\manual META}\-{\manual POST}\spacefactor1000 } \def\mf{{\smc Metafont}} -\def\MFB{{\sl The \slMF book}} +\def\MFB{{\sl The \slMF\kern1pt book}} % multilingual (INRS) TeX \def\mtex{T\kern-.1667em\lower.5ex\hbox{\^E}\kern-.125emX\spacefactor1000 } \def\NTStext{N\mkern-4mu \lower.5ex\hbox{$\cal T$}\mkern-2mu S} @@ -185,9 +185,7 @@ \def\SC{Steering Committee} \def\SGML{\acro{SGML}} \def\SliTeX{{\rm S\kern-.06em{\smc l\kern-.035emi}\kern-.06em\TeX}} -% for \def\slMF{{\manualsl META}\-{\manualsl FONT}\spacefactor1000 } -% Use \font\manualsl=logosl10 instead, if it's available, -\def\slMF{\MF} +\def\slMF{{\manualsl META}\-{\manualsl FONT}\spacefactor1000 } % Atari ST (Klaus Guntermann) \def\stTeX{{\smc st\rm\kern-0.13em\TeX}} \def\SVG{\acro{SVG}} @@ -455,6 +453,7 @@ \def\bull{\vrule height 1ex width .8ex depth -.2ex } % square bullet \def\cents{{\rm\raise.2ex\rlap{\kern.05em$\scriptstyle/$}c}} +\def\cs#1{{\tt \char`\\#1}} \def\Dag{\raise .6ex\hbox{$\scriptstyle\dagger$}} \def\careof{\leavevmode\hbox{\raise.75ex\hbox{c}\kern-.15em @@ -871,12 +870,12 @@ \TFM \Thanh Han The Thanh \TIFF -\ttn TTN -\TTN \TeX and TUG News +\ttn TTN +\TTN \TeX and TUG News \TUB TUGboat \TUG TeX Users Group \tug -\UG Users Group +\UG Users Group \UNIX \UTF \VAX @@ -998,9 +997,15 @@ % ************************************************************************* % Change history +------------------ Version Date Changes ------- --------- --------------------------------------------------- +1.23 19 Mar 17 move \manual and \manualsl to tugboat.sty. + +1.22 31 Oct 16 define \CSabbr, \CSTUG; + use logosl10 (\manualsl) for \slMF. + 1.21 2 Aug 13 define \LyX 1.20 4 Apr 12 allow omission of hyphenation list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/tugboat-plain/tugboat.sty new/tex/plain/tugboat-plain/tugboat.sty --- old/tex/plain/tugboat-plain/tugboat.sty 2012-05-24 01:32:15.000000000 +0200 +++ new/tex/plain/tugboat-plain/tugboat.sty 2017-03-21 01:01:03.000000000 +0100 @@ -3,7 +3,7 @@ %% version = "see below \fileversion" %% date = "see below \filedate", %% filetype = "Plain TeX macros for TUGboat", -%% copyright = "Copyright 1993,1999,2003,2006,2011,2012 TeX Users Group. +%% copyright = "Copyright 1993,1999,2003,2006,2011-2016 TeX Users Group. %% Unlimited copying and redistribution of this file %% are permitted as long as this file is not %% modified. Modifications (and redistribution of @@ -17,7 +17,7 @@ %% for preparation of items in TUGboat, the %% Communications of the TeX Users Group.", %% } -%% $Id: tugboat.sty 100 2012-05-22 18:09:46Z bnb $ +%% $Id: tugboat.sty 176 2017-03-19 18:13:59Z karl $ %% %% ********************************************************* %% @@ -26,11 +26,9 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% TUGBOAT.STY - \def\thistubstyle{plain} -\def\fileversion{v1.20} -\def\filedate{2012/05/22} +\def\fileversion{v1.23} +\def\filedate{2017/03/19} % general items @@ -43,7 +41,7 @@ \message{File `TUGBOAT.STY' \fileversion \space\space <\filedate>} -\input tugboat.cmn % macros common to tugboat.sty and +\input tugboat.cmn % macros intended to be common to tugboat.sty and % ltugboat.sty (latex style file) @@ -250,6 +248,8 @@ \textfont\bffam=\tenbf \scriptfont\bffam=\eightbf \def\smc{\tensmc}% \def\SMC{\ninerm}% + \font\manual=logo10 + \font\manualsl=logosl10 \def\tt{\tentt}% \setttglue \def\upright{\tenuit}% @@ -283,6 +283,8 @@ \textfont\bffam=\ninebf \scriptfont\bffam=\sevenbf \def\smc{\ninesmc}% \def\SMC{\eightrm}% + \font\manual=logo9 + \font\manualsl=logosl10 at 9pt \def\tt{\ninett}% \setttglue \setbox\strutbox=\hbox{\vrule height 6.75pt depth 2.25pt width\z@}% @@ -316,6 +318,9 @@ \def\bf{\fam\bffam\eightbf}% \textfont\bffam=\eightbf \scriptfont\bffam=\sixbf \def\smc{\eightsmc}% + \def\SMC{\sevenrm}% + \font\manual=logo8 + \font\manualsl=logosl10 at 8pt \def\tt{\eighttt}% \setttglue \setbox\strutbox=\hbox{\vrule height 6pt depth 2pt width\z@}% @@ -1662,7 +1667,7 @@ \def\inlinestyle##1{\def\@altinlinestyle{##1}}% \def\numbered{\@numberedtrue}% \def\ruled{\@ruledtrue}% - \def\smallcode{\ninepoint\tt\baselineskip=10pt }% + \def\smallcode{\ninepoint\tt }% \let\@verbinputvar\relax \let\@verbinputfile\relax \@SpecialsGetOther @@ -1974,6 +1979,8 @@ \newif\if@@mid \@@midfalse \newif\if@@bot \@@botfalse \def\@caption{} +\def\abovecaptionskip{\bigskip} + \newif\if@fixed \@fixedfalse % items for top and bottom ``banners'' on first page @@ -2000,7 +2007,7 @@ \def\top{}% \def\bot{\@@bottrue}% \def\mid{\@@midtrue}% - \def\caption##1{\def\@caption{\ulap{\bigskip##1\smallskip}}}% + \def\caption##1{\def\@caption{\ulap{\abovecaptionskip##1\smallskip}}}% \def\fixed{\@fixedtrue}% \def\scol{\@figurescol}% \def\ecol{\@figureecol}% @@ -2175,13 +2182,14 @@ \twocol \maxcols=2 +\hfuzz=1pt % don't worry about small overfulls \OverlaysinTeXtrue \Trimmarksfalse \PrelimDrafttrue \initializearticle -\pageno=1001 % number of title page +\pageno=901 % number of title page -% Stretchy spacing was the default for many years, but in summer 2011 it +% Stretchy spacing was the default for many years, but in 2012 it % looked too stretchy. Comment out. %\StretchyTenPointSpacing %\StretchyNinePointSpacing @@ -2191,12 +2199,24 @@ \endinput +%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % History of changes Version Date Changes ------- --------- --------------------------------------------------- +1.23 19 Mar 17 define \manual and \manualsl in each of \tenpoint, + \ninepoint, \eightpoint; define \SMC in \eightpoint. + +1.22 7 Nov 16 \smallcode: do not reduce baselineskip. + \abovecaptionskip: generalize \bigskip; no change + to default. + \pageno: start at 901 to make LaTeX. + \hfuzz: initialize to 1pt to match existing practice. + +1.21 <skipped this version number> + 1.20 22 May 12 Do not hyphenate in typewriter. Add footnote hooks. No \Stretchy*Spacing by default. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/tugboat-plain/tugproc.sty new/tex/plain/tugboat-plain/tugproc.sty --- old/tex/plain/tugboat-plain/tugproc.sty 2007-04-03 01:48:15.000000000 +0200 +++ new/tex/plain/tugboat-plain/tugproc.sty 2016-11-25 19:34:06.000000000 +0100 @@ -1,27 +1,20 @@ %% @texfile{ %% filename="tugproc.sty", -%% version="1.11", -%% date="26-Jan-1994", -%% filetype="TeX macros for TUG Proceedings", -%% copyright="Copyright (C) TeX Users Group. -%% Copying of this file is authorized only if either: -%% (1) you make absolutely no changes to your copy, OR -%% (2) if you do make changes, you first rename it to some -%% other name.", -%% author="TeX Users Group", -%% address="TeX Users Group", -%% P. O. Box 869, -%% Santa Barbara, CA 93102-0869, -%% USA", -%% telephone="805-963-8358", -%% email="Internet: tug(a)tug.org or TUGboat(a)Math.AMS.org", -%% codetable="ISO/ASCII", -%% checksumtype="line count", -%% checksum="366", -%% keywords="tex users group, tugboat, proceedings, plain tex", -%% abstract="This file contains the plain-based macros -%% for Proceedings issues of TUGboat, the -%% Communications of the TeX Users Group." +%% version = "see below \fileversion" +%% date = "see below \filedate", +%% filetype = "was plain TeX macros for TUG Proceedings; now unused", +%% copyright = "Copyright 1990-2016 TeX Users Group. +%% Unlimited copying and redistribution of this file +%% are permitted as long as this file is not +%% modified. Modifications (and redistribution of +%% modified versions) are also permitted, but only if +%% the resulting file is renamed." +%% email = "TUGboat(a)tug.org", +%% codetable = "ISO/ASCII", +%% keywords = "tex users group, tugboat, proceedings, plain tex", +%% abstract = "This file contains the plain-based macros +%% that were used in proceedings issues of TUGboat, the +%% Communications of the TeX Users Group. Now unused." %% } %% ********************************************************* %% @@ -31,8 +24,8 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{v1.11} -\def\filedate{26 Jan 94} +\def\fileversion{v1.22} +\def\filedate{26 Sep 16} \message{File `TUGPROC.STY' \fileversion \space\space <\filedate>} @@ -56,7 +49,7 @@ % fonts \font\twelverm=cmr10 scaled 1200 -\font\twelvebf=cmbx10 scaled 1200 +\font\twelvebf=cmbx10 scaled 1200 \font\fourteenrm=cmr10 scaled 1440 \font\fourteenit=cmti10 scaled 1440 \font\fourteensl=cmsl10 scaled 1440 @@ -66,7 +59,7 @@ \def\rm{\fam\z@\twelverm}% \textfont\z@=\twelverm \def\bf{\fam\bffam\twelvebf}% - \textfont\bffam=\twelvebf + \textfont\bffam=\twelvebf \normalbaselines \rm} \def\fourteenpoint{% @@ -85,7 +78,7 @@ \def\addressfont{\ninepoint\rm} \def\netaddrfont{\ninepoint\tt} -\def\br{\unskip\hfil\break} % version for titles +\def\br{\unskip\hfil\break} % version for titles \def\degrade{\def\br{\unskip\space\ignorespaces}% \let\\\br} % in running heads. @@ -112,7 +105,7 @@ \rtitlex\hfill\stamp \fi\fi }% - } + } \ifx\startingpage\undefined \def\startingpage{1001}\fi \pageno=\startingpage @@ -136,9 +129,9 @@ }% } -\v@lx % normalize publication info for footer +\v@lx % normalize publication info for footer \def\pfoottext{{\smc Preprint}: \mtgyear{} \TUG{} Annual Meeting} -\def\rfoottext{\tenrm\TUB, \volx\Dash +\def\rfoottext{\tenrm\TUB, \volx\Dash {Proceedings of the \volyr{} Annual Meeting}} % midpage redone to align running feet. @@ -170,14 +163,14 @@ % *************************************************** % Bibliography -\def\Hang{1em} +\def\Hang{1em} \def\entry #1{\noindent\frenchspacing\hangindent\Hang #1} % Appendix \def\appendix #1\endappendix{\newpage\onecol\centerline{\HEADfont #1}} % Box for deadlines: -\newbox\textbox % \twocolcolwd=18.75pc [cf. tugboat.sty] +\newbox\textbox % \twocolcolwd=18.75pc [cf. tugboat.sty] \long\def\boxit #1{\vbox{\hrule\hbox{\vrule\kern3pt \vbox{\kern3pt\vskip 4pt#1\vskip 4pt\kern3pt}\kern3pt\vrule}\hrule}} \long\def\boxedlist #1{$$\boxit{\setbox\textbox=\vbox{\hsize 18pc @@ -192,8 +185,8 @@ \edef\thetitle{\ignorespaces\the\toks@\unskip}% \let\rhtitle\thetitle } - % If your title is too long for the running head, - % use this to construct a shorter version: + % If your title is too long for the running head, + % use this to construct a shorter version: \def\shorttitle{% \begingroup \def\CurrentTag{shorttitle}% @@ -208,8 +201,8 @@ } \def\rhauthor{\@defaultauthorlist} - % Use the following for running heads if more than - % one author or author's name is too long to fit: + % Use the following for running heads if more than + % one author or author's name is too long to fit: \def\shortauthor{% \begingroup \def\CurrentTag{shortauthor}% @@ -295,7 +288,7 @@ \immediate\write\titleabs{\string\TITLE\string\bf\space \rhauthor:\ \string\rm \rhtitle;;} \immediate\write\titleabs{\space} - \immediate\write\titleabs{\string\ABS\string\bf\space + \immediate\write\titleabs{\string\ABS\string\bf\space Abstract.\ \theabstract;;} \immediate\write\titleabs{\space} \immediate\write\titleabs{\string\endinput} @@ -304,7 +297,7 @@ } % \head (This writes over a definition in tugboat.sty) -\def\@domainhead{% +\def\@domainhead{% \if@removeprewhite\else\vskip\baselineskip\fi \noindent{\HEADfont\baselineskip15pt % larger type than usual \raggedright\bf\ignorespaces\the\@argument\unskip\endgraf}% @@ -320,7 +313,7 @@ \restorecat\@ -% \Trimmarkstrue % for final copy +% \Trimmarkstrue % for final copy % \overfullrule=0pt \endinput @@ -329,6 +322,10 @@ Change History -------------- +1.22 update header; remark that this is no longer used; no changes to code. + +<interim versions skipped> + 1.11 changed TUG address in header to Santa Barbara parameterized dates, etc., in running footers initialized them at top of file instead of in footer text @@ -354,9 +351,9 @@ %%% 26-jun-90 [changed running feet, page numbers, \start] %%% 28-jun-90 [added \stamp, \ifproof] 29-jun-90 [\Proof] %%% TUGPROC.sty 03-feb-90 (renamed 13-feb-90) 20-feb-90 -%%% +%%% %%% Supplementary header file for TUG Proceedings volume -%%% for use with plain.tex (under revision still) +%%% for use with plain TeX. No longer used. %%% %%% (*) This version writes the title and abstract into %%% a file, for use in preparing the Title-Abstract-Bio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.tlpobj new/tlpkg/tlpobj/tugboat-plain.tlpobj --- old/tlpkg/tlpobj/tugboat-plain.tlpobj 2016-04-14 19:54:21.000000000 +0200 +++ new/tlpkg/tlpobj/tugboat-plain.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -1,6 +1,6 @@ name tugboat-plain category Package -revision 31340 +revision 43560 shortdesc Plain TeX macros for TUGboat relocated 1 longdesc The macros defined in this directory (in files tugboat.sty and @@ -12,7 +12,7 @@ RELOC/tex/plain/tugboat-plain/tugproc.sty catalogue-also tugboat catalogue-ctan /macros/plain/contrib/tugboat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-20 06:58:03 +0100 catalogue-license other-free catalogue-topics journalpub -catalogue-version 1.21 +catalogue-version 1.23 ++++++ tugboat.doc.tar.xz ++++++ Binary files old/doc/latex/tugboat/ltubguid.pdf and new/doc/latex/tugboat/ltubguid.pdf differ Binary files old/doc/latex/tugboat/tugboat.pdf and new/doc/latex/tugboat/tugboat.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.doc.tlpobj new/tlpkg/tlpobj/tugboat.doc.tlpobj --- old/tlpkg/tlpobj/tugboat.doc.tlpobj 2016-04-14 19:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/tugboat.doc.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -1,6 +1,6 @@ name tugboat.doc category Package -revision 36614 +revision 42465 shortdesc doc files of tugboat relocated 1 docfiles size=203 ++++++ tugboat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.cls new/tex/latex/tugboat/ltugboat.cls --- old/tex/latex/tugboat/ltugboat.cls 2015-03-24 22:19:03.000000000 +0100 +++ new/tex/latex/tugboat/ltugboat.cls 2016-11-25 19:34:01.000000000 +0100 @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugboat} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUGboat journal class% ] \csname tugstyloaded@\endcsname @@ -195,7 +195,9 @@ \def\Cplusplus{C\plusplus} \def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CPU{\acro{CPU}} +\def\CSabbr{\ensuremath{\cal C}\kern-.1667em\lower.5ex\hbox{$\cal S$}} \def\CSS{\acro{CSS}} +\def\CSTUG{\CSabbr\acro{TUG}} \def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} @@ -246,7 +248,7 @@ \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} -\def\MFB{\textsl{The \MF book}} +\def\MFB{\textsl{The \MF\kern1pt book}} \def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand{\mp}{\ifmmode\TB@@mp\else MetaPost\fi} @@ -632,6 +634,7 @@ \textwidth 39pc \columnsep 1.5pc \columnwidth 18.75pc +\hfuzz 1pt \parindent \normalparindent \parskip \z@ % \@plus\p@ \leftmargini 2em @@ -648,7 +651,12 @@ \topsep=3\p@\@plus\p@\@minus\p@ \parsep=3\p@\@plus\p@\@minus\p@ \itemsep=\parsep -\if@tubtwocolumn \twocolumn \else \onecolumn \textwidth=34pc \fi +\if@tubtwocolumn \twocolumn \else + \onecolumn + \textwidth=34pc + \oddsidemargin=30.8775pt + \evensidemargin=\oddsidemargin +\fi \newdimen\pagewd \pagewd=\textwidth \newdimen\trimwd \trimwd=\pagewd \newdimen\trimlgt \trimlgt=11in @@ -879,6 +887,7 @@ \fi \begingroup \setcounter{footnote}{0} + \global\@topnum\z@ % disallow floats above the title \def\thefootnote{\fnsymbol{footnote}} \@maketitle \@thanks @@ -1070,20 +1079,7 @@ {-0.5em\@plus-\fontdimen3\font}% {\normalsize\bf\raggedright\hyphenpenalty=\@M}}} \fi -\if@numbersec - \def\TB@startsection#1{\@startsection#1}% -\else - \def\TB@startsection#1{% - \@ifstar - {\TBWarning{*-form of \expandafter\string\csname\@firstofsix#1% - \endcsname\space - \MessageBreak - conflicts with nonumber class option}% - \@startsection#1}% - {\@startsection#1}% - } -\fi -\def\@firstofsix#1#2#3#4#5#6{#1} +\def\TB@startsection#1{\@startsection#1}% \def\TB@safe@startsection#1{\@startsection#1} \newenvironment{SafeSection}% {\let\TB@startsection\TB@safe@startsection}% @@ -1163,6 +1159,8 @@ \csname r@nr@#1\endcsname\@secondoftwo{#1}} \newdimen\@tubfullpageindent \@tubfullpageindent = \if@tubtwocolumn 4.875pc \else 3.875pc \fi +\let\tubcaptionleftglue=\hfil +\let\tubcaptionleftglue=\hfil \def\tubcaptionfonts{\small}% \long\def\@makecaption#1#2{% \vskip\abovecaptionskip @@ -1179,7 +1177,7 @@ \else % fits on one line; use the hbox, centered. Do not reset its glue. \global\@minipagefalse - \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% + \hb@xt@\hsize{\tubcaptionleftglue\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip} \def\tubmakecaptionbox#1#2{#1: #2}% allow overriding for a paper @@ -1358,7 +1356,7 @@ \@ifundefined{refname}% {\newcommand{\refname}{References}}% {}% -\def\thebibliography#1{% +\def\thebibliography#1{% for harvardcite \let\TB@startsection\TB@safe@startsection \section*{\refname \@mkboth{\uppercase{\refname}}{\uppercase{\refname}}}% @@ -1368,10 +1366,10 @@ \itemindent -\bibindent \listparindent \itemindent \parsep \z@ - \usecounter{enumi}} - \def\newblock{} + \usecounter{enumi}}% + \def\newblock{}% \BibJustification - \sfcode`\.=1000\relax + \frenchspacing % more than just period, see comments below } \def\etal{et\,al.\@} \def\bibentry{% @@ -1394,13 +1392,13 @@ \immediate\write\@auxout{\string\bibstyle{\@tubfilename{#1}}}% \fi } -\else -\let\TB@@thebibliography\thebibliography +\else % not harvardcite +\let\TB@origthebibliography\thebibliography \def\thebibliography{% \let\TB@startsection\TB@safe@startsection - \let\sloppy\BibJustification - \TB@@thebibliography} -\fi + \def\sloppy{\frenchspacing\BibJustification}% + \TB@origthebibliography} % latex's thebibliography now reads args. +\fi % not harvardcite \let\TB@@sloppy\sloppy \let\BibJustification\TB@@sloppy \newcommand{\SetBibJustification}[1]{% @@ -1451,7 +1449,7 @@ \def\@evenfoot{\@author\hfil} } -\def\@tubrunninggetauthor#1{#1 +\def\@tubrunninggetauthor#1{#1% \begingroup \let\thanks\@gobble \protected@xdef\rhAuthor{\the\toks@##1}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.sty new/tex/latex/tugboat/ltugboat.sty --- old/tex/latex/tugboat/ltugboat.sty 2015-03-24 22:19:03.000000000 +0100 +++ new/tex/latex/tugboat/ltugboat.sty 2016-11-25 19:34:01.000000000 +0100 @@ -32,7 +32,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugboat} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUG compatibility package% ] \(a)obsoletefile{ltugboat.cls}{ltugboat.sty} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugcomn.sty new/tex/latex/tugboat/ltugcomn.sty --- old/tex/latex/tugboat/ltugcomn.sty 2015-03-24 22:19:03.000000000 +0100 +++ new/tex/latex/tugboat/ltugcomn.sty 2016-11-25 19:34:01.000000000 +0100 @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{ltugcomn} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUGboat `common macros' package% ] \IfFileExists{mflogo.sty}% @@ -125,7 +125,9 @@ \def\Cplusplus{C\plusplus} \def\plusplus{\raisebox{.7ex}{$_{++}$}} \def\CPU{\acro{CPU}} +\def\CSabbr{\ensuremath{\cal C}\kern-.1667em\lower.5ex\hbox{$\cal S$}} \def\CSS{\acro{CSS}} +\def\CSTUG{\CSabbr\acro{TUG}} \def\CSV{\acro{CSV}} \def\CTAN{\acro{CTAN}} \def\DTD{\acro{DTD}} @@ -176,7 +178,7 @@ \def\Mc{\setbox\TestBox=\hbox{M}M\vbox to\ht\TestBox{\hbox{c}\vfil}} % for Robert McGaffey \def\mf{\textsc{Metafont}} -\def\MFB{\textsl{The \MF book}} +\def\MFB{\textsl{The \MF\kern1pt book}} \def\MkIV{Mk\acro{IV}} \let\TB@@mp\mp \DeclareRobustCommand{\mp}{\ifmmode\TB@@mp\else MetaPost\fi} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.cls new/tex/latex/tugboat/ltugproc.cls --- old/tex/latex/tugboat/ltugproc.cls 2015-03-24 22:19:03.000000000 +0100 +++ new/tex/latex/tugboat/ltugproc.cls 2016-11-25 19:34:01.000000000 +0100 @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesClass {ltugproc} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUG conference proceedings class% ] \def\@tugclass{ltugproc} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.sty new/tex/latex/tugboat/ltugproc.sty --- old/tex/latex/tugboat/ltugproc.sty 2015-03-24 22:19:03.000000000 +0100 +++ new/tex/latex/tugboat/ltugproc.sty 2016-11-25 19:34:01.000000000 +0100 @@ -32,7 +32,7 @@ %% extension .ins) which are part of the distribution. %% \ProvidesPackage{ltugproc} - [2015/03/24 v2.17 + [2016/11/07 v2.18 TUG compatibility package% ] \(a)obsoletefile{ltugproc.cls}{ltugproc.sty} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.tlpobj new/tlpkg/tlpobj/tugboat.tlpobj --- old/tlpkg/tlpobj/tugboat.tlpobj 2016-04-14 19:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/tugboat.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -1,6 +1,6 @@ name tugboat category Package -revision 36614 +revision 42465 shortdesc LaTeX macros for TUGboat articles relocated 1 longdesc Provides ltugboat.cls for both regular and proceedings issues @@ -15,7 +15,7 @@ RELOC/tex/latex/tugboat/ltugproc.sty catalogue-also tugboat-plain catalogue-ctan /macros/latex/contrib/tugboat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-08 05:41:04 +0100 catalogue-license lppl1.3 catalogue-topics journalpub -catalogue-version 2.17 +catalogue-version 2.18 ++++++ tui.doc.tar.xz ++++++ ++++++ tui.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tui.tlpobj new/tlpkg/tlpobj/tui.tlpobj --- old/tlpkg/tlpobj/tui.tlpobj 2016-04-14 19:54:21.000000000 +0200 +++ new/tlpkg/tlpobj/tui.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/tui/tui.cls catalogue-ctan /macros/latex/contrib/tui -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation class catalogue-version 1.9 ++++++ turabian-formatting.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/README new/doc/latex/turabian-formatting/README --- old/doc/latex/turabian-formatting/README 2016-03-18 22:08:04.000000000 +0100 +++ new/doc/latex/turabian-formatting/README 2017-03-19 00:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -Turabian Formatting for LaTeX (2016/03/18) +Turabian Formatting for LaTeX (2017/03/18) INTRODUCTION @@ -37,7 +37,7 @@ ============================== -Copyright 2013-2016 Omar Abdool +Copyright 2013-2017 Omar Abdool This work may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3 of this license Binary files old/doc/latex/turabian-formatting/turabian-formatting-doc.pdf and new/doc/latex/turabian-formatting/turabian-formatting-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/turabian-formatting-doc.tex new/doc/latex/turabian-formatting/turabian-formatting-doc.tex --- old/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2016-03-18 22:08:04.000000000 +0100 +++ new/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2017-03-19 00:01:06.000000000 +0100 @@ -1,7 +1,7 @@ % Turabian Formatting for LaTeX -- Package Documentation % % ============================== -% Copyright 2013-2016 Omar Abdool +% Copyright 2013-2017 Omar Abdool % % This work may be distributed and/or modified under the conditions of the LaTeX % Project Public License (LPPL), either version 1.3 of this license or (at your @@ -19,7 +19,7 @@ % and turabian-formatting-doc.pdf (in addition to the README file). % % ============================== -% Last updated: 2016/03/18 +% Last updated: 2017/03/18 % % @@ -31,18 +31,18 @@ \defaultfontfeatures{Ligatures=TeX} \usepackage{filecontents} -\begin{filecontents}{references.bib} - @book{turabian_manual_2013, - author = {Turabian, Kate L.}, - edition = {8th edition}, - title = {A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, - shorttitle = {A Manual for Writers of Research Papers, Theses, and Dissertations}, - publisher = {University of Chicago Press}, - year = {2013}} +\begin{filecontents}{\jobname.bib} +@book{turabian_manual_2013, + author = {Turabian, Kate L.}, + edition = {8th edition}, + title = {A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, + shorttitle = {A Manual for Writers of Research Papers, Theses, and Dissertations}, + publisher = {University of Chicago Press}, + year = {2013}} \end{filecontents} \usepackage[authordate,backend=biber]{biblatex-chicago} -\addbibresource{references.bib} +\addbibresource{\jobname.bib} \usepackage{units, metalogo, setspace} @@ -62,7 +62,7 @@ \usepackage[hidelinks]{hyperref} -\usepackage{ellipsis} +\usepackage{ellipsis, shortvrb} \usepackage{listings} \lstset{% @@ -75,7 +75,27 @@ numbers=none, breaklines=true, breakatwhitespace=true, - breakindent=0pt} + breakindent=0pt, + escapeinside={(*}{*)}} + +\newcommand{\codecomment}[1]{\textrm{$\langle$\emph{#1}$\rangle$}} + +\newcommand{\textcmd}[1]{\texttt{\textbackslash #1}} + +\newenvironment{pagestyleoptions} + {\list{}{% + \setlength\topsep{0in} + \setlength\itemsep{1\baselineskip} + \setlength\parsep{0pt} + \setlength\labelwidth{0.75in} + \setlength\leftmargin{1in} + \setlength\listparindent{0in} + \setlength\itemindent{0in} + \setlength\labelsep{0pt} + \let\makelabel\pagestylelabel} + \singlespacing} + {\endlist} +\newcommand*{\pagestylelabel}[1]{\parbox[t]{\labelwidth}{\normalfont \texttt{#1}}} \title{Turabian Formatting for \LaTeX{}} @@ -92,6 +112,7 @@ \renewcommand{\abstractname}{} \begin{abstract} +\vspace{-\baselineskip} \noindent This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers} (8th edition). \end{abstract} @@ -100,7 +121,7 @@ % Formatting for document content -\newgeometry{top=1.75in, bottom=1.75in, left=2.25in, right=1.25in, marginparsep=0.25in, marginparwidth=1.25in} +\newgeometry{top=1.75in, bottom=1.75in, left=2.25in, right=1.25in, marginparsep=0.03in, marginparwidth=1.47in} \reversemarginpar \setlength\parindent{0in} @@ -111,6 +132,7 @@ \section*{Introduction} \label{sec:introduction} + This package provides Chicago-style formatting based on Kate L. Turabian's \emph{A Manual for Writers of Research Papers, Theses, and Dissertations: Chicago Style for Students and Researchers}, 8th edition. In doing so, this package adheres closely to the formatting guidelines described in Turabian's work while, also, being readily adaptable to additional formatting requirements (e.g. formatting requirements specific to an institution and/or department). It is hoped that authors will find this package relatively easy to implement. There are few (if any) new commands to learn, as the package builds upon (and makes adjustments to) already-existing \LaTeX{} commands. As such, formatting research papers, theses, and dissertations should require a minimum amount of changes to a standard \LaTeX{} source file (your \texttt{.tex} file). @@ -118,223 +140,332 @@ For citations, this package is designed to work well with David Fussner's outstanding (and highly-recommended) \texttt{biblatex-chicago}. - -\section{Using the Document Classes and Package} +\clearpage +\section{Document Classes (Getting Started)} \label{sec:implementation} -A document may be formatted using \texttt{turabian-formatting} in one of three ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}), or (3) loading the package in the \LaTeX{} source-file preamble. +A document may be formatted using \texttt{turabian-formatting} in one of two ways: either (1) specifying the document class as a turabian-formatted research paper (\texttt{turabian-researchpaper}), or (2) specifying the document class as a thesis/dissertation with turabian-style formatting (\texttt{turabian-thesis}). -\subsection{Document Class for Research Papers} +\subsection{Research Papers} \marginnote{turabian-\newline researchpaper}% -The \texttt{turabian-researchpaper} document class provides formatting specific to research papers. The requisite code: +The \texttt{turabian-researchpaper} document class provides formatting specific to research papers and is based upon the \texttt{article} document class. + +When placed in the source document preamble (your \texttt{.tex} file), the following specifies the document class as \texttt{turabian-researchpaper}: \begin{lstlisting} \documentclass{turabian-researchpaper} \end{lstlisting} -This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{article} document class. - -\clearpage -\subsection{Document Class for Theses and Dissertations} +\subsection{Theses/Dissertations} \marginnote{turabian-thesis}% -The \texttt{turabian-thesis} document class offers formatting specific to theses and dissertations. The requisite code: -\begin{lstlisting} - \documentclass{turabian-thesis} -\end{lstlisting} +The \texttt{turabian-thesis} document class offers formatting specific to theses and dissertations. It is based upon the \texttt{book} document class. -This document class builds on the \texttt{turabian-formatting} package and is based on the \texttt{book} document class. As such, support for chapter headings (\texttt{\textbackslash chapter} and \texttt{\textbackslash chapter*}), title pages specific to theses/dissertations (refer to subsection~\ref{subsec:titlepage}), table of contents, and formatting commands to structure the document into front matter, main matter, and back matter (refer to subsection~\ref{subsec:td_structure}), are also included. - - -\subsection{Package for Turabian-Style Formatting} - -\marginnote{turabian-\newline formatting}% -The \texttt{turabian-formatting} package can be loaded in the preamble of the source file as follows:\footnote{% - The \texttt{turabian-formatting} package has been tested with the standard \texttt{article}, \texttt{report}, and \texttt{book} \LaTeX{} document classes. If the document class is either \texttt{turabian-researchpaper} or \texttt{turabian-thesis}, however, do not load the \texttt{turabian-formatting} package again.} +This document class provides additional formatting commands for parts and chapters as well as organizing a document into front matter, main matter, and back matter (refer to subsections~\ref{subsec:parts},~\ref{subsec:chapters}, and~\ref{subsec:td_structure}). +When placed in the source document preamble, the following specifies the document class as \texttt{turabian-thesis}: \begin{lstlisting} - \usepackage{turabian-formatting} + \documentclass{turabian-thesis} \end{lstlisting} -This package should always be loaded \emph{before} using the \texttt{biblatex-chicago} package. - +\clearpage \section{Formatting Options} \label{sec:formatting_options} + The \texttt{turabian-formatting} package adheres to the manual's guidelines on the formatting of text. This includes double-spacing all text throughout the document except items that should have single-spacing \autocite[373]{turabian_manual_2013}.\footnote{% - Double-spaced text is typeset with a \texttt{\textbackslash baselinestretch} of \texttt{2}. This is different than the default values provided by the \texttt{setspace} package.} + Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \texttt{setspace} package.} Paragraph indentation is set to 0.5 inches. Page margins, by default, are 1 inch from the edges of the paper. -The \texttt{turabian-thesis} document class has an additional binding offset of 0.5 inches, effectively creating a left/inside margin of 1\nicefrac{1}{2} inches.\footnote{% - This is accomplished by \texttt{turabian-thesis} making changes to the following lengths: (1) setting \texttt{\textbackslash oddsidemargin} to \texttt{0.5in}; (2) setting \texttt{\textbackslash evensidemargin} to \texttt{0}; and (3) adding \texttt{-0.5in} to \texttt{\textbackslash textwidth}.} +The \texttt{turabian-thesis} document class has an additional binding offset of 0.5 inches, effectively creating a left/inside margin of 1\nicefrac{1}{2} inches. \subsection{Standard Options for Document Classes} -Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options. -The default \texttt{normal} font size is twelve-point type (\texttt{12pt})---the preferred font type size for the body of the text \autocite[373]{turabian_manual_2013}. This package also supports \texttt{normal} font type sizes of \texttt{10pt} and \texttt{11pt}. +Both \texttt{turabian-thesis} and \texttt{turabian-researchpaper} document classes support most of the standard document class options. -The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inches (US Letter size). And as with other standard \LaTeX{} document classes, different paper sizes and can be specified as class options, including \texttt{letterpaper} (the default), \texttt{a4paper}, and \texttt{legalpaper}. +The default \texttt{normal} font size is twelve-point type (\texttt{12pt})---the preferred font type size for the body of the text \autocite[373]{turabian_manual_2013}. This package also supports \texttt{normal} font sizes of \texttt{10pt} and \texttt{11pt}. -The \texttt{twocolumn} option, however, is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option either. +The default page size, for both document classes, is 8\nicefrac{1}{2} × 11 inches (US Letter size, specified as \texttt{letterpaper}). Other paper size options can be specified instead, including \texttt{a4paper} and \texttt{legalpaper}. -Both documents classes, by default, are set to \texttt{oneside}. +The \texttt{twocolumn} option, however, is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option. +Both documents classes, by default, are set to \texttt{oneside}. The \texttt{twoside} option is also supported. +\clearpage \subsection{Ragged Right (Left Align) Text} +\label{subsec:raggedright} \marginnote{raggedright}% -By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature" \autocite[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option. +By default, text consisting of more than one line is justified on both sides of the document with the last line flush left. Turabian, however, recommends setting ``your word processor to align text flush left with a ragged right margin" while also not using its ``automated hyphenation feature" \autocite[404]{turabian_manual_2013}. For ragged right formatting without hyphenations throughout the work, use the \texttt{raggedright} formatting option.\footnote{% + Alternatively, placing the \textcmd{raggedright} command in the document preamble will have the same effect as using the \texttt{raggedright} option. The \textcmd{raggedright} command, however, does not pass a \texttt{raggedright} option to other loaded packages.} \subsection{Notes-Bibliography and Author-Date Styles} This package is designed to work well with the \texttt{biblatex-chicago} package. This includes support for both notes-bibliography and author-date citation styles (the former being the default style). -If the \texttt{biblatex-chicago} package is loaded by the user, the following options are passed to \texttt{biblatex-chicago}: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}. The \texttt{\textbackslash printbibliography} command will provide a bibliography with \emph{Bibliography} as the default heading, irrespective of the document class. +If the \texttt{biblatex-chicago} package is loaded by the user, the following options are passed to \texttt{biblatex-chicago}: \texttt{isbn=false}, \texttt{autolang=other}, \texttt{footmarkoff}, and \texttt{backend=biber}. The \textcmd{printbibliography} command will provide a bibliography with \emph{Bibliography} as the default heading, irrespective of the document class. \marginnote{authordate}% -Support for the author-date style is enabled by specifying the \texttt{authordate} formatting option. This option passes an \texttt{authordate} option to \texttt{biblatex-chicago} as well as redefines the default heading for the references list (also typeset using the \texttt{\textbackslash printbibliography} command) to that of \emph{References}. +Support for the author-date style is enabled by specifying the \texttt{authordate} formatting option. This option passes an \texttt{authordate} option to \texttt{biblatex-chicago} as well as redefines the default heading for the references list (also typeset using the \textcmd{printbibliography} command) to that of \emph{References}. \marginnote{noadjustbib}% -Adjustments made to \texttt{\textbackslash printbibliography} can be disabled using the \texttt{noadjustbib} formatting option. The following code, loaded at the end of the preamble, is affected by this option: -\begin{lstlisting} - \if@authordateformat - \DefineBibliographyStrings{english}{% - bibliography = {References}} - \else - \DefineBibliographyStrings{english}{% - references = {Bibliography}} - \fi - \renewcommand{\bibsetup}{\singlespacing} - \renewcommand{\bibitemsep}{1\baselineskip} - \renewcommand{\bibhang}{0.5in} -\end{lstlisting} - +Adjustments made by \texttt{turabian-formatting} to the \textcmd{printbibliography} command can be disabled using the \texttt{noadjustbib} formatting option. \subsection{Endnotes} -Although footnotes are used by default, endnotes can also be enabled. This is accomplished through the use of the \texttt{endnotes} package. - \marginnote{endnotes}% -Endnotes can be used by specifying the \texttt{endnotes} formatting option. Through this option, the \texttt{endnotes} package is loaded. More so, the \texttt{endnotes} option causes footnotes to be restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ \autocite[156]{turabian_manual_2013}. The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package. +Although footnotes are used by default, endnotes can also be used by specifying the \texttt{endnotes} formatting option. Through this option, the \texttt{endnotes} package is loaded. + +With the \texttt{endnotes} option, footnotes are restarted on each page and labelled using symbols in the sequence of: * $\dagger$ $\ddagger$ $\S$ \autocite[156]{turabian_manual_2013}. The \texttt{notetype=endonly} option is also passed to the \texttt{biblatex-chicago} package. -To produce a list of endnotes, use the \texttt{\textbackslash theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{% - The \emph{Notes} heading is typeset using either \texttt{\textbackslash section*} or, if \texttt{\textbackslash chapter} has been defined by the document class, \texttt{\textbackslash chapter*}. If there are no endnotes preceding \texttt{\textbackslash theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.} -If the document class supports chapters, the numbering of endnotes is also restarted for each chapter. The endnotes list will then have subheadings that divide endnotes by each chapter \autocite[157]{turabian_manual_2013}. +To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{% + The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typesets the \emph{Notes} heading with \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.} +When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter. In this case, the endnotes list then uses subheadings that divide endnotes by each chapter \autocite[157]{turabian_manual_2013}. + +\clearpage \section{Formatting Commands} \label{sec:formatting_commands} -\subsection{Headings: Chapters, Sections, and Subsections} +\subsection{Parts} +\label{subsec:parts} + +\marginnote{\textbackslash part\{\}} +A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be separated into parts using the \textcmd{part} command. -The \texttt{turabian-formatting} package provides support for document classes that allow text to be divided into sections and subsections. This package also provides support for document classes that define \texttt{\textbackslash chapter} and \texttt{\textbackslash chapter*}, including the \texttt{report}, \texttt{book}, and \texttt{turabian-thesis} document classes. +The \textcmd{part} command creates a part-title page with an optional descriptive title. If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title is preceded by a \emph{Part} label and part number (in capitalized roman numerals) at the top of the page---the ``descriptive title separated from the label and number by a blank line. Although the part-title page is counted in pagination, no page number is placed on the page \autocite[390]{turabian_manual_2013}. -\subsubsection*{Chapters} +\marginnote{\textbackslash part*\{\}} +The \textcmd{part*} command also starts a new page with a descriptive title. If in the main matter, this command provides the same \emph{Part} label and part number as \textcmd{part}. Unlike \textcmd{part}, however, \textcmd{part*} allows for ``text introducing the contents of the part on the part-tile page" to follow a descriptive title, separated by two blank lines. A page number, using the \texttt{plain} page style (refer to subsection~\ref{subsec:page_styles}), is placed on the page \autocite[390]{turabian_manual_2013}. -\marginnote{\textbackslash chapter} -The \texttt{\textbackslash chapter} command starts a new page and creates a \emph{Chapter} label ``followed by the chapter number at the top of the page" in arabic numerals. The ``descriptive title" of the chapter is placed ``two lines down, following a blank line" and is separated from the first line of following text by ``two blank lines" \autocite[391]{turabian_manual_2013}. -\marginnote{\textbackslash chapter*} -\texttt{\textbackslash chapter*}, unlike \texttt{\textbackslash chapter}, does not provide a line with a \emph{Chapter} label and numbering nor is it included in the Table of Contents.\footnote{% - To add a numberless ``chapter" to the Table of Contents, use the \texttt{\textbackslash addcontentsline} command immediately following the \texttt{\textbackslash chapter*} command. For the \emph{Bibliography} or \emph{References} heading from \texttt{\textbackslash printbibliography} (from the \texttt{biblatex-chicago} package), place this command immediately \emph{after} the use of the \texttt{\textbackslash clearpage} and \texttt{\textbackslash addcontentsline} commands. Using the \texttt{endnotes} option will place the \emph{Notes} heading in the table of contents.} -This is useful for the titles/headings of specific elements, including \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Abstract} \autocite[389]{turabian_manual_2013}, \emph{Conclusion} \autocite[398]{turabian_manual_2013}, \emph{Appendixes} \autocite[398]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}. +\subsection{Chapters} +\label{subsec:chapters} -\subsubsection*{Sections and Subsections} +\marginnote{\textbackslash chapter\{\}} +A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be divided into chapters using the \textcmd{chapter} command. -\marginnote{\textbackslash section\newline \textbackslash subsection\newline \textbackslash subsubsection} -This package provides support for three levels of sections and subsections: \texttt{\textbackslash section}, \texttt{\textbackslash subsection}, and \texttt{\textbackslash subsubsection} (including their asterisked versions). These section and subsection commands do not provide any label or numbering. +The \textcmd{chapter} command starts a new page with a descriptive title of the chapter, separated from the first line of following text by ``two blank lines." If located in the main matter (refer to subsection~\ref{subsec:td_structure}), the descriptive title---separated by a blank line---is preceded by a \emph{Chapter} label and chapter number (in arabic numerals) at the top of the page \autocite[391]{turabian_manual_2013}. -\texttt{\textbackslash section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)" \autocite[393]{turabian_manual_2013}. +\marginnote{\textbackslash chapter*\{\}} +\textcmd{chapter*}, unlike \textcmd{chapter}, does not provide a line with a \emph{Chapter} label and numbering nor is it included in the table of contents.\footnote{% + To add a numberless ``chapter" to the table of contents, use the \textcmd{addcontentsline} command immediately following the \textcmd{chapter*} command.} -\marginnote{\textbackslash section*\newline \textbackslash noadjustssect} -If the document class does not define chapter headings, \texttt{\textbackslash section*} will instead provide two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction} \autocite[390]{turabian_manual_2013}, \emph{Notes} \autocite[399]{turabian_manual_2013}, and \emph{Bibliography} \autocite[401]{turabian_manual_2013}. Inserting the \texttt{\textbackslash noadjustssect} command in the document preamble will disable this behaviour. + +\clearpage +\subsection{Sections and Subsections} + +\marginnote{\textbackslash section\{\}\newline \textbackslash subsection\{\}\newline \textbackslash subsubsection\{\}} +Three levels of sections and subsections are supported: \textcmd{section}, \textcmd{subsection}, and \textcmd{subsubsection} (including their asterisked versions). These section and subsection commands do not provide any label or numbering. + +\textcmd{section} places ``more space before a subhead than after (up to two blank lines before and one line, or double line spacing, after)" \autocite[393]{turabian_manual_2013}. + +\marginnote{\textbackslash section*\{\}\newline \textbackslash noadjustssect} +When used with \texttt{turabian-researchpaper}, the \textcmd{section*} command places two blank lines between the title/subheading and the first line of text. This is particularly useful for the subheadings of specific elements, including \emph{Introduction}, \emph{Notes}, and \emph{Bibliography} \autocite[390--401]{turabian_manual_2013}. Inserting the \textcmd{noadjustssect} command in the document preamble will disable this behaviour. \subsection{Page Styles: Headers and Footers} -\label{sec:page_styles} +\label{subsec:page_styles} -Headers and footers, by default, are placed within the margins. The top of the header is 0.5 inches from the top edge of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page \autocite[372, 374]{turabian_manual_2013}. +Headers and footers are placed within the margins. The top of the header is 0.5 inches from the top edge of the page. The baseline of the footer is 0.5 inches from the bottom edge of the page \autocite[372, 374]{turabian_manual_2013}. -\marginnote{\textbackslash pagestyle\newline \textbackslash thispagestyle} -The layout of the headers and footers are determined by the specific page styles. They are used with the \texttt{\textbackslash pagestyle} and \texttt{\textbackslash thispagestyle} commands.\footnote{% - The \texttt{fancyhdr} package can be used to typset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer \autocite[374]{turabian_manual_2013}.} +\marginnote{\textbackslash pagestyle\{\}\newline \textbackslash thispagestyle\{\}} +The layout of the headers and footers are determined by the page styles specified using the \textcmd{pagestyle} and \textcmd{thispagestyle} commands.\footnote{% + The \texttt{fancyhdr} package can be used to typeset (and adjust) these page styles. This includes placing optional text (such as a page identifier) in the header and/or footer \autocite[374]{turabian_manual_2013}.} +This package provides the following page styles: -\textbf{\texttt{empty}}: An empty page style with no header or footer. +\begin{pagestyleoptions} + \item[empty] An empty page style with no header or footer. -\textbf{\texttt{plain}}: A ``plain" page style that centres the page number in the footer. For a thesis or dissertation, it applies to pages with page numbers in the front matter as well as the first page of each chapter in the main matter and back matter (refer to subsection~\ref{subsec:td_structure}). + \item[plain] A ``plain" page style that centres the page number in the footer. For a thesis or dissertation, it applies to pages with page numbers in the front matter as well as the first page of each chapter in the main matter and back matter (refer to subsection~\ref{subsec:td_structure}). -\textbf{\texttt{headings}}: The default page style places a page number in the right-hand corner of the header. + \item[headings] The default page style places a page number in the right-hand corner of the header. +\end{pagestyleoptions} -\subsection{Document Structure for Thesis/Dissertation} +\subsection{Front Matter, Main Matter, and Back Matter} \label{subsec:td_structure} -A thesis/dissertation is divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter \autocite[375]{turabian_manual_2013}. As such, this package provides support for document classes that use the \texttt{\textbackslash frontmatter}, \texttt{\textbackslash mainmatter}, and \texttt{\textbackslash backmatter} commands (such as the \texttt{book} and \texttt{turabian-thesis} document classes). + +A thesis or dissertation, using the \texttt{turabian-thesis} document class, can be divided into three, distinct components: (1) front matter, (2) main matter or text of the paper, and (3) back matter \autocite[375]{turabian_manual_2013}. \subsubsection*{Front Matter} \marginnote{\textbackslash frontmatter} -The front matter is declared with the \texttt{\textbackslash frontmatter} command. By default, the \texttt{\textbackslash pagestyle} is set to \texttt{empty} (refer to section~\ref{sec:page_styles}). The numbering of pages in the front matter begins with the title page, although page numbers are not placed on pages until the Table of Contents \autocite[373--374, 376, 380]{turabian_manual_2013}. +The front matter begins with the \textcmd{frontmatter} command. Page numbering starts with the title page. Page numbers do not appear in the headers or footers of pages in the front matter, as the \textcmd{frontmatter} command sets \textcmd{pagestyle} to \texttt{empty} \autocite[373--374, 376]{turabian_manual_2013}. -\clearpage -\marginnote{\texttt{\textbackslash tableofcontents}} -Placing the \texttt{\textbackslash tableofcontents} command in the front matter will cause page numbers to appear on pages with the Table of Contents and subsequent pages of the front matter. These page numbers use roman numerals and are placed in centre of the footer \autocite[373--374]{turabian_manual_2013} using the \texttt{plain} page style (refer to section~\ref{sec:page_styles}). +Page numbers, however, do appear on pages that follow the \textcmd{tableofcontents} command when typesetting the table of contents (refer to subsection~\ref{subsec:toc}). \subsubsection*{Main Matter} \marginnote{\textbackslash mainmatter} -The main matter (or text of the paper) begins with the \texttt{\textbackslash mainmatter} command. Page numbering restarts with arabic numerals, starting with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter, which instead use the \texttt{plain} page style) \autocite[373--374]{turabian_manual_2013}. +The main matter (or text of the paper) begins with the \textcmd{mainmatter} command. Page numbering restarts with arabic numerals, starting with page 1. Page numbers are placed on the right-side of the header, using the \texttt{headings} page style (with the exception of the first page of each chapter which, instead, use the \texttt{plain} page style) \autocite[373--374]{turabian_manual_2013}. \subsubsection*{Back Matter} \marginnote{\textbackslash backmatter} -The back matter is declared using the \texttt{\textbackslash backmatter} command. Page numbering and page styles are continued from the main matter \autocite[373--374]{turabian_manual_2013}. +The back matter is declared using the \textcmd{backmatter} command. Page numbering and page styles are continued from the main matter \autocite[373--374]{turabian_manual_2013}. \subsection{Title Page} \label{subsec:titlepage} -The \texttt{turabian-researchpaper} document class provides a title page intended for research papers.\footnote{% - The \texttt{turabian-formatting} package provides a title page for research papers.} -Page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}. +The \texttt{turabian-researchpaper} document class provides a title page intended for research papers. Page numbering begins immediately following the title page. The \texttt{turabian-thesis} document class, however, provides a ``model" title page intended for a thesis or dissertation. The title page of a thesis/dissertation is included in the page numbering of the front matter \autocite[376, 378]{turabian_manual_2013}. -\marginnote{\textbackslash maketitle}% -The \texttt{\textbackslash maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}. +\clearpage +\marginnote{\textbackslash maketitle} +The \textcmd{maketitle} command will create a separate title page if the document class specifies (or has as default) the \texttt{titlepage} option---the default option for both \texttt{turabian-researchpaper} and \texttt{turabian-thesis}. -\marginnote{\textbackslash title\newline \textbackslash subtitle\newline \textbackslash author\newline \textbackslash date\newline} -\texttt{\textbackslash maketitle} uses information specified in the source document preamble, through the following commands (each of which is self-evident): \texttt{\textbackslash title}, \texttt{\textbackslash author}, \texttt{\textbackslash date}, and \texttt{\textbackslash subtitle}. For research paper title pages, footnotes (as well as \texttt{\textbackslash thanks}) can also be used. +\marginnote{\textbackslash title\{\}\newline \textbackslash subtitle\{\}\newline \textbackslash author\{\}\newline \textbackslash date\{\}} +\textcmd{maketitle} uses information specified in the source document preamble, through the following commands (each of which is self-evident): \textcmd{title}, \textcmd{author}, \textcmd{date}, and \textcmd{subtitle}.\footnote{% + If a subtitle is specified using \textcmd{subtitle}, the title will be followed by a colon when typeset on the title page.} +For research paper title pages, footnotes (as well as the \textcmd{thanks} command) can also be used. -\marginnote{\textbackslash submissioninfo} -For a research paper, \texttt{\textbackslash submissioninfo} is used for typesetting ``any information requested by your instructor," between the name of the course and the date \autocite[376]{turabian_manual_2013}. For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department. +\marginnote{\textbackslash submissioninfo\{\}} +For a research paper, \textcmd{submissioninfo} is used for typesetting ``any information requested by your instructor," between the name of the course and the date \autocite[376]{turabian_manual_2013}. For a thesis or dissertation title page, however, this command is used to typeset requested information between the title/subtitle and the name of the department. -\marginnote{\textbackslash course} -\texttt{turabian-researchpaper} provides the optional \texttt{\textbackslash course} command for typesetting course information (such as the name of the course). +\marginnote{\textbackslash course\{\}} +\texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the name of the course). -\marginnote{\textbackslash institution\newline \textbackslash department\newline \textbackslash location} -\texttt{turabian-thesis} also provides: (1) \texttt{\textbackslash institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \texttt{\textbackslash location} for typesetting a location just above the date. +\marginnote{\textbackslash institution\{\}\newline \textbackslash department\{\}\newline \textbackslash location\{\}} +\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date. To create a custom title page, use the \texttt{titlepage} environment. +\subsection{Table of Contents} +\label{subsec:toc} + +\marginnote{\textcmd{tableofcontents}} +The \textcmd{tableofcontents} command creates a table of contents with the first page labelled \emph{Contents}. Items within the table of contents are single-spaced with ``a blank line after each item." By default, subheadings are not included in the table of contents \autocite[380]{turabian_manual_2013}.\footnote{% + To add subheadings to the table of contents, increase the \texttt{tocdepth} counter.} + +For the \texttt{turabian-thesis} document class, the \textcmd{tableofcontents} command causes subsequent pages in the front matter to be typeset using the \texttt{plain} page style. Page numbers in the front matter use roman numerals and are placed in the centre of the footer \autocite[373--374; refer to subsection~\ref{subsec:page_styles}]{turabian_manual_2013}. More so, in the table of contents, the front matter and back matter are each separated from the main matter by two blank lines \autocite[380]{turabian_manual_2013}. + + +\subsection{List of Figures, Tables, or Illustrations} +\label{subsec:toft} + +The \texttt{figure} and \texttt{table} environments are both supported. Figures are numbered separately from tables and, both, in the order in which they are mentioned in the text \autocite[363, 369]{turabian_manual_2013}. + +With \texttt{turabian-researchpaper}, figures and tables are numbered consecutively, throughout the paper (e.g. ``Figure 6"). + +The \texttt{turabian-thesis} document class, however, uses double numeration for both figures and tables: the chapter number followed by a period and a figure/table number that restarts with each chapter (e.g. ``Figure 3.2"). Within the \texttt{appendixes} environment, figures and tables are numbered with an ``A" prefix followed by a period and a figure/table number that does \emph{not} restart with each appendix (e.g. ``Table A.4"). Figures and tables not placed within a chapter do not use double numeration and are, instead, numbered consecutively throughout the thesis/dissertation. + +\marginnote{\textbackslash listoffigures} +The \textcmd{listoffigures} command creates a list of figures with a \emph{Figures} label on the top of the first page. + +\marginnote{\textbackslash listoftables} +The \textcmd{listoftables} command creates a list of tables with a \emph{Tables} label on the top of the first page. + +\marginnote{\textcmd{listofillustrations}} +The \textcmd{listofillustrations} command creates a combined list of figures and tables with the first page labelled \emph{Illustrations}. This list, however, is divided into two sections labelled \emph{Figures} and \emph{Tables} \autocite[383]{turabian_manual_2013}. + +Individual items in a list of figures, tables, or illustrations are single-spaced with a blank line between each item \autocite[383]{turabian_manual_2013}. + + +\clearpage +\section{Formatting Environments} +\label{sec:formatting_environments} + + +\subsection{Block Quotations} +\marginnote{quotation} +Block quotations are typeset using the \texttt{quotation} environment. Each block quotation is single-spaced and leaves a blank line both before and after it. The necessary code is as follows: + +\begin{lstlisting} + \begin{quotation} + (*\codecomment{Text being quoted.}*) + \end{quotation} +\end{lstlisting} + +The entire quotation is indented as far as the indentation of the first line of a paragraph---by default, an indentation of \texttt{0.5in} \autocite[349]{turabian_manual_2013}. The block quotation is also indented by the same amount on the right side. When using the \texttt{raggedright} option (or the \textcmd{raggedright} command), however, the block quotation is not indented on the right side (refer to subsection~\ref{subsec:raggedright}). + + +\subsection{Appendixes} +\label{subsec:appendixes} + +When ``supporting material cannot be easily worked into the body of your paper," the manual recommends placing it ``in one or more appendixes in the back matter" \autocite[398]{turabian_manual_2013}. + +If only one appendix is needed, the first page is to be labelled \emph{Appendix} with ``two blank lines between the title and the first line of text or other material" \autocite[398]{turabian_manual_2013}. With the \texttt{turabian-thesis} document class, the material is preceded by a chapter heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{chapter}\{Appendix\}}) and is placed in the back matter. For \texttt{turabian-researchpaper}, the material is preceded by a section heading labelled \emph{Appendix} (i.e.~\texttt{\textcmd{section*}\{Appendix\}}). + +\marginnote{appendixes} +To divide material of different types among more than one appendix \autocite[398]{turabian_manual_2013}, place the material inside the \texttt{appendixes} environment. The requisite code for this environment: + +\begin{lstlisting} + \begin{appendixes} + (*\codecomment{Material belonging to the appendixes.}*) + \end{appendixes} +\end{lstlisting} + +The headings of each appendix, within the \texttt{appendixes} environment, use an \emph{Appendix} prefix accompanied by a single, capitalized letter from the alphabet (in sequential order, starting with A). + +For the \texttt{turabian-thesis} document class, the heading of each appendix is typeset using the \textcmd{chapter} command. The \textcmd{chapter} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix and capitalized letter from the alphabet, followed by an optional descriptive title. + +With the \texttt{turabian-researchpaper} document class, the heading of each appendix is typeset using the \textcmd{section} command. The \textcmd{section} command, inside the \texttt{appendixes} environment, provides a heading with an \emph{Appendix} prefix and capitalized letter from the alphabet followed, on the next line, by an optional descriptive title. + + +\clearpage \section{Required and Recommended Packages} \label{sec:required_packages} -This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, \texttt{endnotes}, \texttt{xparse}, and \texttt{geometry}.\footnote{% - The \texttt{geometry} package is only required if using the deprecated \texttt{emptymargins} option.} -The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{fancyhdr}, \texttt{ellipsis}, and \texttt{threeparttable}. +This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, \texttt{endnotes}, and \texttt{xparse}. + +The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{fancyhdr}, \texttt{tocloft}, \texttt{ellipsis}, and \texttt{threeparttable}. +\clearpage \section{Updates} \label{sec:updates} + +\marginnote{\rmfamily{2017/03/18}}% + +Adjustments to title page formatting. + +\marginnote{\rmfamily{2016/10/09}}% + +Improvements to table of contents when using the \textcmd{include} command. + +\marginnote{\rmfamily{2016/09/17}}% + +Support for the \textcmd{part} command. + +Improvements to \texttt{figure} and \texttt{table} counters and number formatting. + +The bibliography/references list is included in the table of contents. + +\marginnote{\rmfamily{2016/07/18}}% + +Improvements to \texttt{figure} and \texttt{table} counters and number formatting. + +Loading \texttt{turabian-formatting} as a package is no longer supported. + +\marginnote{\rmfamily{2016/07/12}}% + +Re-implementation of the \textcmd{raggedright} command as an alternative to using the \texttt{raggedright} option. + +Improvements to the \textcmd{tableofcontents}, \textcmd{listoffigures}, and \textcmd{listoftables} commands with support for the \texttt{tocloft} package. + +Added the \textcmd{listofillustrations} command. + +Added an \texttt{appendixes} environment to support formatting of appendixes. + +Support for changes made to the \texttt{biblatex-chicago} package. + +Removed commands: \textcmd{tablenote}, \textcmd{tablesource}, \textcmd{faculty}, and \textcmd{mydegree}. + +Removed options: \texttt{emptymargins}. + \marginnote{\rmfamily{2016/03/18}}% Support for changes made to the \texttt{biblatex} package (2016/03/03). @@ -345,7 +476,7 @@ Adjustments to the formatting of both enumerated and itemized lists. -The \texttt{endnotes} option has (1) added support for endnotes that contain an underscore character (\texttt{\_}), and (2) improved the implementation of the \texttt{\textbackslash theendnotes} command. +The \texttt{endnotes} option has (1) added support for endnotes that contain an underscore character, and (2) improved the implementation of the \textcmd{theendnotes} command. \marginnote{\rmfamily{2016/02/27}}% @@ -353,17 +484,17 @@ Both \texttt{turabian-researchpaper} and \texttt{turabian-thesis} can use the \texttt{noadjustbib} option. -Significant adjustments made to the \texttt{\textbackslash maketitle} command, including support for footnotes. +Significant adjustments made to the \textcmd{maketitle} command, including support for footnotes. -Double-spaced text is typeset with a \texttt{\textbackslash baselinestretch} of \texttt{2} using the \texttt{\textbackslash setstretch} command provided by the \texttt{setspace} package (instead of \texttt{\textbackslash doublespacing}). This is different than previous versions of \texttt{turabian-formatting} and should be more-consistent with expectations for ``double spaced" work. +Double-spaced text is typeset with a \textcmd{baselinestretch} of \texttt{2} using the \textcmd{setstretch} command provided by the \texttt{setspace} package (instead of \textcmd{doublespacing}). This is different than previous versions of \texttt{turabian-formatting} and should be more-consistent with expectations for ``double spaced" work. Packages no longer required: \texttt{xifthen}, \texttt{fancyhdr}, \texttt{titlesec}, \texttt{quoting}, \texttt{caption}, \texttt{flafter}, \texttt{url}, and \texttt{chngcntr}. Deprecated options: \texttt{emptymargins}. -Deprecated commands: \texttt{\textbackslash tablenote}, \texttt{\textbackslash tablesource}, \texttt{\textbackslash faculty}, and \texttt{\textbackslash mydegree}. +Deprecated commands: \textcmd{tablenote}, \textcmd{tablesource}, \textcmd{faculty}, and \textcmd{mydegree}. -Removed commands: \texttt{\textbackslash setpageidentifier}, and \texttt{\textbackslash setwordcount}. +Removed commands: \textcmd{setpageidentifier}, and \textcmd{setwordcount}. \marginnote{\rmfamily{2015/11/14}}% @@ -373,19 +504,19 @@ Footnote lines are no longer forced together, allowing a footnote to run over to the next page. -Adjustments to the spacing that follow the \texttt{\textbackslash chapter*} and \texttt{\textbackslash section*} commands. +Adjustments to the spacing that follow the \textcmd{chapter*} and \textcmd{section*} commands. Updated use of page style options, removing the \texttt{fancy} page style. -\texttt{\textbackslash frontmatter} and \texttt{\textbackslash tableofcontents} no longer ignore the \texttt{bindingoffset} value and margin sizes specified in the source document preamble, through the \texttt{geometry} package. +\textcmd{frontmatter} and \textcmd{tableofcontents} no longer ignore the \texttt{bindingoffset} value and margin sizes specified in the source document preamble, through the \texttt{geometry} package. -Improved implementation of the \texttt{raggedright} formatting option with: (1) table and figure captions; and (2) the \texttt{\textbackslash tablenote} command. +Improved implementation of the \texttt{raggedright} formatting option with: (1) table and figure captions; and (2) the \textcmd{tablenote} command. Adjustments to the behaviour of table and figure positioning. -Deprecated commands: \texttt{\textbackslash setwordcount}, \texttt{\textbackslash setpageidentifier}, and \texttt{\textbackslash tablesource}. +Deprecated commands: \textcmd{setwordcount}, \textcmd{setpageidentifier}, and \textcmd{tablesource}. -Removed commands: \texttt{\textbackslash mytitlepage} and \texttt{\textbackslash setdraftindicator}. +Removed commands: \textcmd{mytitlepage} and \textcmd{setdraftindicator}. \marginnote{\rmfamily{2014/12/27}}% Formatting changes to both subsection titles and title page for both research papers and theses/dissertations. @@ -395,11 +526,6 @@ -%\section{Known Bugs} -%\label{sec:bugs} - - - \printbibliography @@ -410,7 +536,6 @@ \label{sec:sample_code} \addcontentsline{toc}{section}{Appendix: Sample Code for a Research Paper} -The following is for a research paper using the \LaTeX{} markup language. \vspace{1.3\baselineskip} \begin{lstlisting} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj --- old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2016-04-14 19:54:21.000000000 +0200 +++ new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -1,9 +1,9 @@ name turabian-formatting.doc category Package -revision 40065 +revision 43537 shortdesc doc files of turabian-formatting relocated 1 -docfiles size=33 +docfiles size=35 RELOC/doc/latex/turabian-formatting/README RELOC/doc/latex/turabian-formatting/turabian-formatting-doc.pdf RELOC/doc/latex/turabian-formatting/turabian-formatting-doc.tex ++++++ turabian-formatting.tar.xz ++++++ ++++ 1748 lines of diff (skipped) ++++++ turabian.doc.tar.xz ++++++ ++++++ turabian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian.tlpobj new/tlpkg/tlpobj/turabian.tlpobj --- old/tlpkg/tlpobj/turabian.tlpobj 2016-04-14 19:54:21.000000000 +0200 +++ new/tlpkg/tlpobj/turabian.tlpobj 2017-04-14 18:03:48.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/turabian/turabian.cls catalogue-also turabian-formatting catalogue-ctan /macros/latex/contrib/turabian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics gen-paper class catalogue-version 0.1.0 ++++++ turkmen.doc.tar.xz ++++++ ++++++ turkmen.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turkmen.tlpobj new/tlpkg/tlpobj/turkmen.tlpobj --- old/tlpkg/tlpobj/turkmen.tlpobj 2016-04-14 19:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/turkmen.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/turkmen/turkmen.ldf catalogue-ctan /language/turkmen -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics turkmen multilingual-addon catalogue-version 0.2 ++++++ turnstile.doc.tar.xz ++++++ ++++++ turnstile.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turnstile.tlpobj new/tlpkg/tlpobj/turnstile.tlpobj --- old/tlpkg/tlpobj/turnstile.tlpobj 2016-04-14 19:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/turnstile.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/turnstile/turnstile.sty catalogue-ctan /macros/latex/contrib/turnstile -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class maths-symbol catalogue-version 1.0 ++++++ turnthepage.doc.tar.xz ++++++ ++++++ turnthepage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turnthepage.tlpobj new/tlpkg/tlpobj/turnthepage.tlpobj --- old/tlpkg/tlpobj/turnthepage.tlpobj 2016-04-14 19:54:23.000000000 +0200 +++ new/tlpkg/tlpobj/turnthepage.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/turnthepage/turnpagewoetex.sty RELOC/tex/latex/turnthepage/turnthepage.sty catalogue-ctan /macros/latex/contrib/turnthepage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout exam catalogue-version 1.3a ++++++ twoinone.doc.tar.xz ++++++ ++++++ twoinone.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/twoinone.tlpobj new/tlpkg/tlpobj/twoinone.tlpobj --- old/tlpkg/tlpobj/twoinone.tlpobj 2016-04-14 19:54:23.000000000 +0200 +++ new/tlpkg/tlpobj/twoinone.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/twoinone/2in1.sty catalogue-also twoupltx catalogue-ctan /macros/latex/contrib/twoinone -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics compact-print plain-ext ++++++ twoup.doc.tar.xz ++++++ ++++++ twoup.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/twoup.tlpobj new/tlpkg/tlpobj/twoup.tlpobj --- old/tlpkg/tlpobj/twoup.tlpobj 2016-04-14 19:54:23.000000000 +0200 +++ new/tlpkg/tlpobj/twoup.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/twoup/twoup.sty catalogue-also twoinone catalogue-ctan /macros/latex/contrib/twoup -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics compact-print catalogue-version 1.3 ++++++ txfonts.doc.tar.xz ++++++ ++++++ txfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfonts.tlpobj new/tlpkg/tlpobj/txfonts.tlpobj --- old/tlpkg/tlpobj/txfonts.tlpobj 2016-04-14 19:54:24.000000000 +0200 +++ new/tlpkg/tlpobj/txfonts.tlpobj 2017-04-14 18:03:49.000000000 +0200 @@ -324,6 +324,6 @@ RELOC/tex/latex/txfonts/utxtt.fd catalogue-also newtx catalogue-ctan /fonts/txfonts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-maths font-type1 ++++++ txfontsb.doc.tar.xz ++++++ ++++++ txfontsb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfontsb.tlpobj new/tlpkg/tlpobj/txfontsb.tlpobj --- old/tlpkg/tlpobj/txfontsb.tlpobj 2016-04-14 19:54:45.000000000 +0200 +++ new/tlpkg/tlpobj/txfontsb.tlpobj 2017-04-14 18:03:58.000000000 +0200 @@ -74,7 +74,7 @@ RELOC/tex/latex/txfontsb/txfontsb.sty catalogue-also newtx catalogue-ctan /fonts/txfontsb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-maths font-greek font-type1 catalogue-version 1.1 ++++++ txgreeks.doc.tar.xz ++++++ ++++++ txgreeks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txgreeks.tlpobj new/tlpkg/tlpobj/txgreeks.tlpobj --- old/tlpkg/tlpobj/txgreeks.tlpobj 2016-04-14 19:54:51.000000000 +0200 +++ new/tlpkg/tlpobj/txgreeks.tlpobj 2017-04-14 18:04:00.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/txgreeks/txgreeks.sty catalogue-ctan /macros/latex/contrib/txgreeks -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp catalogue-version 1.0 ++++++ type1cm.doc.tar.xz ++++++ ++++++ type1cm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/type1cm.tlpobj new/tlpkg/tlpobj/type1cm.tlpobj --- old/tlpkg/tlpobj/type1cm.tlpobj 2016-04-14 19:54:51.000000000 +0200 +++ new/tlpkg/tlpobj/type1cm.tlpobj 2017-04-14 18:04:00.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/tex/latex/type1cm/type1cm.sty catalogue-also type1ec fix-cm catalogue-ctan /macros/latex/contrib/type1cm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp ++++++ typed-checklist.doc.tar.xz ++++++ ++++++ typed-checklist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typed-checklist.tlpobj new/tlpkg/tlpobj/typed-checklist.tlpobj --- old/tlpkg/tlpobj/typed-checklist.tlpobj 2016-04-14 19:54:52.000000000 +0200 +++ new/tlpkg/tlpobj/typed-checklist.tlpobj 2017-04-14 18:04:00.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=3 RELOC/tex/latex/typed-checklist/typed-checklist.sty catalogue-ctan /macros/latex/contrib/typed-checklist -catalogue-date 2016-04-10 18:27:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics list catalogue-version 1.4 ++++++ typeface.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-x/typeface.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-x.new/typeface.doc.tar.xz differ: char 27, line 1 ++++++ typeface.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typeface.tlpobj new/tlpkg/tlpobj/typeface.tlpobj --- old/tlpkg/tlpobj/typeface.tlpobj 2016-04-14 19:55:06.000000000 +0200 +++ new/tlpkg/tlpobj/typeface.tlpobj 2017-04-14 18:04:07.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/typeface/typeface.cfg RELOC/tex/latex/typeface/typeface.sty catalogue-ctan /macros/latex/contrib/typeface -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-sel catalogue-version 0.1 ++++++ typehtml.doc.tar.xz ++++++ ++++++ typehtml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typehtml.tlpobj new/tlpkg/tlpobj/typehtml.tlpobj --- old/tlpkg/tlpobj/typehtml.tlpobj 2016-04-14 19:55:06.000000000 +0200 +++ new/tlpkg/tlpobj/typehtml.tlpobj 2017-04-14 18:04:07.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=7 RELOC/tex/latex/typehtml/typehtml.sty catalogue-ctan /macros/latex/contrib/typehtml -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics foreign-import ++++++ typeoutfileinfo.doc.tar.xz ++++++ ++++++ typeoutfileinfo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typeoutfileinfo.tlpobj new/tlpkg/tlpobj/typeoutfileinfo.tlpobj --- old/tlpkg/tlpobj/typeoutfileinfo.tlpobj 2016-04-14 19:55:07.000000000 +0200 +++ new/tlpkg/tlpobj/typeoutfileinfo.tlpobj 2017-04-14 18:04:07.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 texmf-dist/scripts/typeoutfileinfo/typeoutfileinfo.sh catalogue-ctan /support/typeoutfileinfo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics file-mgmt catalogue-version 0.31 ++++++ typicons.doc.tar.xz ++++++ ++++++ typicons.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typicons.tlpobj new/tlpkg/tlpobj/typicons.tlpobj --- old/tlpkg/tlpobj/typicons.tlpobj 2016-04-14 19:55:07.000000000 +0200 +++ new/tlpkg/tlpobj/typicons.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/fonts/truetype/public/typicons/typicons.ttf RELOC/tex/latex/typicons/typicons.sty catalogue-ctan /fonts/typicons -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-supp-symbol font-symbol font-ttf catalogue-version 2.0.7 ++++++ typogrid.doc.tar.xz ++++++ ++++++ typogrid.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/typogrid.tlpobj new/tlpkg/tlpobj/typogrid.tlpobj --- old/tlpkg/tlpobj/typogrid.tlpobj 2016-04-14 19:55:07.000000000 +0200 +++ new/tlpkg/tlpobj/typogrid.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/typogrid/typogrid.sty catalogue-ctan /macros/latex/contrib/typogrid -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout-show catalogue-version 0.21 ++++++ uaclasses.doc.tar.xz ++++++ ++++++ uaclasses.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uaclasses.tlpobj new/tlpkg/tlpobj/uaclasses.tlpobj --- old/tlpkg/tlpobj/uaclasses.tlpobj 2016-04-14 19:55:08.000000000 +0200 +++ new/tlpkg/tlpobj/uaclasses.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -16,6 +16,6 @@ RELOC/tex/latex/uaclasses/ua-thesis.cls RELOC/tex/latex/uaclasses/ua-title.sty catalogue-ctan /macros/latex/contrib/uaclasses -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics dissertation ++++++ uafthesis.doc.tar.xz ++++++ ++++++ uafthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uafthesis.tlpobj new/tlpkg/tlpobj/uafthesis.tlpobj --- old/tlpkg/tlpobj/uafthesis.tlpobj 2016-04-14 19:55:08.000000000 +0200 +++ new/tlpkg/tlpobj/uafthesis.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=8 RELOC/tex/latex/uafthesis/uafthesis.cls catalogue-ctan /macros/latex/contrib/uafthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation catalogue-version 12.12 ++++++ uantwerpendocs.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/README new/doc/latex/uantwerpendocs/README --- old/doc/latex/uantwerpendocs/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/uantwerpendocs/README 2017-01-10 00:01:04.000000000 +0100 @@ -0,0 +1,38 @@ +************************************************************ +* * +* The uantwerpendocs package * +* * +************************************************************ + Walter Daems + walter.daems(at)uantwerpen.be + +These class files implement the house style of the University +of Antwerp, a.o. for course texts. This package originated +from the Faculty of Applied Engineering. +Using these class files will make it easy for you to make and +keep your documents compliant to this version and future +versions of the house style of the University of Antwerp. + +If you think + - there's an error in compliancy w.r.t. the house style, + - there's a feature missing in this class file, + - there's a bug in this class file, +please, contact us through e-mail (paul.levrie(a)uantwerpen.be or +walter.daems(a)uantwerpen.be). We'll provide you with an answer +and if (and as soon as) possible with a solution to the +problem you spotted. + +Do you like this class file? You're welcome to send us +beer, wine, or just kind words. + + +License +======= + +see file LICENSE + + +History +======= + +see PDF documentation Binary files old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf and new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex --- old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2016-05-02 03:30:23.000000000 +0200 +++ new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -24,8 +24,8 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext} \usepackage[english,dutch]{babel} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpencoursetext_example.tex new/doc/latex/uantwerpendocs/uantwerpencoursetext_example.tex --- old/doc/latex/uantwerpendocs/uantwerpencoursetext_example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/uantwerpendocs/uantwerpencoursetext_example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -0,0 +1,197 @@ +%% +%% This is file `uantwerpencoursetext_example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% uantwerpendocs.dtx (with options: `ct-example') +%% +%% This is a generated file. +%% +%% Copyright (C) 2013-2016 by Walter Daems <walter.daems(a)uantwerpen.be> +%% +%% 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://www.latex-project.org/lppl.txt +%% +%% 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 Walter Daems. +%% +\def\fileversion{1.8} +\def\filedate{2016/05/01} +\documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext} + +\usepackage[english,dutch]{babel} + +\title{Z\'agen, zoeken en zuchten} +\qrtitle{Zágen, zoeken en zuchten} +\subtitle{Cursusnota's} +\author{Walter Daems en Paul Levrie} + +\courseversion{1.3} +\versionyear{2016} + +\lectureri{Zoltan Zo\"ekers} +\qrlectureri{Zoltan Zoëkers} +\lecturerii{Siana Sigh} +\lectureriii{Zeger de Z\'ager} +\qrlectureriii{Zeger de Záger} + +\facultyacronym{TI} +\programme{MA}{IW}{EI} +\coursei{2023FTIZZZ}{5-Zoekmachines in een zaagperspectief} +\courseii{2045FTIIII}{6-Zaagmachines in \'e\'en zuchtperspectief} +\qrcourseii{6-Zaagmachines in één zuchtperspectief} + +\academicyear{2015-2016} + +\publisher{Universiteit Antwerpen\\ + Cursusdienst en reprografie\\ + Campus Groenenborger, G.U.027\\ + Groenenborgerlaan 171\\ + 2020 Antwerpen\\ + T +32 3 265 32 15\\ + F + 32 3 233 32 27\\ + E cursusdienst.cgb(a)uantwerpen.be} + +\publishercode{C11111102} + +\copyrightnotices{ + The graphics in this document have been typeset using \texttt{TikZ}.\\ + This document has been \TeX-ed on a GNU/Linux workstation. +} + +\begin{document} +\selectlanguage{dutch} % or english if your text is in English + +\maketitle + +\frontmatter + +\tableofcontents + +\mainmatter +\chapter*{Inleiding} +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do +eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad +minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquip ex ea commodo consequat. Duis aute irure dolor in +reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla +pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. + +\chapter{Onzin voor dummies} + +\section{Een beetje Cicero} +Sed ut perspiciatis unde omnis iste natus error sit voluptatem +accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae +ab illo inventore veritatis et quasi architecto beatae vitae dicta +sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit +aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos +qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui +dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed +quia non numquam eius modi tempora incidunt ut labore et dolore magnam +aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum +exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex +ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in +ea voluptate velit esse quam nihil molestiae consequatur, vel illum +qui dolorem eum fugiat quo voluptas nulla pariatur? + +\begin{equation} + e^{-j\pi} + 1 = 0 +\end{equation} + +At vero eos et accusamus et iusto odio dignissimos ducimus qui +blanditiis praesentium voluptatum deleniti atque corrupti quos dolores +et quas molestias excepturi sint occaecati cupiditate non provident, +similique sunt in culpa qui officia deserunt mollitia animi, id est +laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita +distinctio. Nam libero tempore, cum soluta nobis est eligendi optio +cumque nihil impedit quo minus id quod maxime placeat facere possimus, +omnis voluptas assumenda est, omnis dolor repellendus. Temporibus +autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe +eveniet ut et voluptates repudiandae sint et molestiae non +recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut +reiciendis voluptatibus maiores alias consequatur aut perferendis +doloribus asperiores repellat. + +\section{En waartoe het geleid heeft} + +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do +eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad +minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquip ex ea commodo consequat. Duis aute irure dolor in +reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla +pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. + +\subsection{Herhaling} +Sed ut perspiciatis unde omnis iste natus error sit voluptatem +accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae +ab illo inventore veritatis et quasi architecto beatae vitae dicta +sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit +aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos +qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui +dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed +quia non numquam eius modi tempora incidunt ut labore et dolore magnam +aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum +exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex +ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in +ea voluptate velit esse quam nihil molestiae consequatur, vel illum +qui dolorem eum fugiat quo voluptas nulla pariatur? + +\subsection{Begint vervelend te worden} +At vero eos et accusamus et iusto odio dignissimos ducimus qui +blanditiis praesentium voluptatum deleniti atque corrupti quos dolores +et quas molestias excepturi sint occaecati cupiditate non provident, +similique sunt in culpa qui officia deserunt mollitia animi, id est +laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita +distinctio. Nam libero tempore, cum soluta nobis est eligendi optio +cumque nihil impedit quo minus id quod maxime placeat facere possimus, +omnis voluptas assumenda est, omnis dolor repellendus. Temporibus +autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe +eveniet ut et voluptates repudiandae sint et molestiae non +recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut +reiciendis voluptatibus maiores alias consequatur aut perferendis +doloribus asperiores repellat. + +\newpage + +\subsection{Begint echt vervelend te worden} +At vero eos et accusamus et iusto odio dignissimos ducimus qui +blanditiis praesentium voluptatum deleniti atque corrupti quos dolores +et quas molestias excepturi sint occaecati cupiditate non provident, +similique sunt in culpa qui officia deserunt mollitia animi, id est +laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita +distinctio. Nam libero tempore, cum soluta nobis est eligendi optio +cumque nihil impedit quo minus id quod maxime placeat facere possimus, +omnis voluptas assumenda est, omnis dolor repellendus. Temporibus +autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe +eveniet ut et voluptates repudiandae sint et molestiae non +recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut +reiciendis voluptatibus maiores alias consequatur aut perferendis +doloribus asperiores repellat. + +\chapter{Besluit} + +\backmatter +\appendix + +\chapter{Symbolen} +\chapter{Romeinse sprekers} +\chapter{Referentielijst} + +\makefinalpage + +\end{document} + +\endinput +%% +%% End of file `uantwerpencoursetext_example.tex'. Binary files old/doc/latex/uantwerpendocs/uantwerpendocs.pdf and new/doc/latex/uantwerpendocs/uantwerpendocs.pdf differ Binary files old/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex --- old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2016-05-02 03:30:23.000000000 +0200 +++ new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -24,8 +24,8 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \documentclass[a4paper]{uantwerpenletter} @@ -118,7 +118,8 @@ doloribus asperiores repellat. \closing{Kind regards,} - + % you might want to insert a signature picture or text: + % \signature{\includegraphics{signature.jpg}} \carboncopy{Prof. S. Mariotte, Mumford University} \enclosed{ \begin{enumerate} Binary files old/doc/latex/uantwerpendocs/uantwerpenletter_example.pdf and new/doc/latex/uantwerpendocs/uantwerpenletter_example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenletter_example.tex new/doc/latex/uantwerpendocs/uantwerpenletter_example.tex --- old/doc/latex/uantwerpendocs/uantwerpenletter_example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/uantwerpendocs/uantwerpenletter_example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -0,0 +1,134 @@ +%% +%% This is file `uantwerpenletter_example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% uantwerpendocs.dtx (with options: `le-example') +%% +%% This is a generated file. +%% +%% Copyright (C) 2013-2016 by Walter Daems <walter.daems(a)uantwerpen.be> +%% +%% 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://www.latex-project.org/lppl.txt +%% +%% 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 Walter Daems. +%% +\def\fileversion{1.8} +\def\filedate{2016/05/01} + +\documentclass[a4paper]{uantwerpenletter} + +%% As a good UAntwerpen citizen, you would use the calibri font. +%% As this only works for XeLaTeX or LuaLaTeX, we chose to include +%% cmbright instead. So for ease of use, we include: +\usepackage{cmbright} +%% But if you have XeLaTeX or LuaLaTeX, use the following instead: +%%\usepackage{fontspec} +%%\setmainfont{Calibri} + +\usepackage[english]{babel} + +\sender{Prof. Walter Daems}{Senior Lecturer} +\facultyacronym{TI} +\unit{CoSys-Lab} +\address{ + Campus Groenenborger\\ + Groenenborgerlaan 171\\ + B-2020 Antwerpen\\ + BELGIUM} +\email{walter.daems}{uantwerpen.be} +\phone{+32 3 265 98 43} +\mobile{+32 499 355 115} +\returnaddress{FTI - U.301 -- Groenenborgerlaan 171, 2020 Antwerpen, BELGIUM} + +\to{Prof. B. Bonette} +\toorganization{Mumford University} +\toaddress{ + 450 Morning Mall\\ + Mumford, DX 94305-2004\\ + USA} + +\date{January 3, 2016} +\subject{Congratulations for online video lectures} + +\begin{document} + \maketitle + + \opening{Dear Prof. Bonette,} + + I'd like to congratulate you and the other professors of your + university on the very instructive video lectures + provided by your University. They are valued very + highly. + + You inspired many a professor at our university to provide more + technical content beyond classical paper courses. + Based on your inspiring lectures, some students desire to candidate + themselves for taking an internship at your university. You can find + their details enclosed. + + Below, you can find a few more paragraphs to illustrate that this + class can generate multipage letters. + + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad + minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in + culpa qui officia deserunt mollit anim id est laborum. + + Sed ut perspiciatis unde omnis iste natus error sit voluptatem + accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae + ab illo inventore veritatis et quasi architecto beatae vitae dicta + sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit + aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos + qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui + dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed + quia non numquam eius modi tempora incidunt ut labore et dolore magnam + aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum + exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex + ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in + ea voluptate velit esse quam nihil molestiae consequatur, vel illum + qui dolorem eum fugiat quo voluptas nulla pariatur? + + At vero eos et accusamus et iusto odio dignissimos ducimus qui + blanditiis praesentium voluptatum deleniti atque corrupti quos dolores + et quas molestias excepturi sint occaecati cupiditate non provident, + similique sunt in culpa qui officia deserunt mollitia animi, id est + laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita + distinctio. Nam libero tempore, cum soluta nobis est eligendi optio + cumque nihil impedit quo minus id quod maxime placeat facere possimus, + omnis voluptas assumenda est, omnis dolor repellendus. Temporibus + autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe + eveniet ut et voluptates repudiandae sint et molestiae non + recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut + reiciendis voluptatibus maiores alias consequatur aut perferendis + doloribus asperiores repellat. + + \closing{Kind regards,} + + \carboncopy{Prof. S. Mariotte, Mumford University} + \enclosed{ + \begin{enumerate} + \item list of course numbers that are most fequently viewed at + our university (1pp) + \item a list of students desiring to take an internship at + Mumford University (2pp) + \end{enumerate} + } +\end{document} +\endinput +%% +%% End of file `uantwerpenletter_example.tex'. Binary files old/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex new/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex --- old/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex 2016-05-02 03:30:23.000000000 +0200 +++ new/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -24,8 +24,8 @@ %% %% The Current Maintainer of this work is Walter Daems. %% -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis} \usepackage[english]{babel} % or dutch if your text is in Dutch Binary files old/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.pdf and new/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.tex new/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.tex --- old/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.tex 2017-01-10 00:01:04.000000000 +0100 @@ -0,0 +1,119 @@ +%% +%% This is file `uantwerpenmasterthesis_example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% uantwerpendocs.dtx (with options: `mt-example') +%% +%% This is a generated file. +%% +%% Copyright (C) 2013-2016 by Walter Daems <walter.daems(a)uantwerpen.be> +%% +%% 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://www.latex-project.org/lppl.txt +%% +%% 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 Walter Daems. +%% +\def\fileversion{1.8} +\def\filedate{2016/05/01} +\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenmasterthesis} + +\usepackage[english]{babel} % or dutch if your text is in Dutch + +\title{Minimax optimisatie voor performantieruimtemodellering} +\author{Bert Bibber} + +\supervisori{Prof. dr. ir. Kumulus (Universiteit Antwerpen)} +\supervisorii{Prof. dr. Hilarius Warwinkel (TNT-Bang, N.V.)} +\supervisoriii{ing. Piet Pienter (POM)} + +\facultyacronym{TI} +\academicyear{2015-2016} +\diploma{MA-IW-EI-ICT} +\defenselocation{Antwerpen} +\defensedate{juni 2016} + +\begin{document} + +\maketitle + +\frontmatter + +\tableofcontents + +\mainmatter +\chapter*{Inleiding} +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do +eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad +minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquip ex ea commodo consequat. Duis aute irure dolor in +reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla +pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. + +\chapter{Onderzoeksvraag} + +\section{Een beetje Cicero} +Sed ut perspiciatis unde omnis iste natus error sit voluptatem +accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae +ab illo inventore veritatis et quasi architecto beatae vitae dicta +sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit +aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos +qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui +dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed +quia non numquam eius modi tempora incidunt ut labore et dolore magnam +aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum +exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex +ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in +ea voluptate velit esse quam nihil molestiae consequatur, vel illum +qui dolorem eum fugiat quo voluptas nulla pariatur? + +\begin{equation} + e^{-j\pi} + 1 = 0 +\end{equation} + +At vero eos et accusamus et iusto odio dignissimos ducimus qui +blanditiis praesentium voluptatum deleniti atque corrupti quos dolores +et quas molestias excepturi sint occaecati cupiditate non provident, +similique sunt in culpa qui officia deserunt mollitia animi, id est +laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita +distinctio. Nam libero tempore, cum soluta nobis est eligendi optio +cumque nihil impedit quo minus id quod maxime placeat facere possimus, +omnis voluptas assumenda est, omnis dolor repellendus. Temporibus +autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe +eveniet ut et voluptates repudiandae sint et molestiae non +recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut +reiciendis voluptatibus maiores alias consequatur aut perferendis +doloribus asperiores repellat. + +\chapter{Literatuurstudie} + +\chapter{Theoretische achtergrond} + +\chapter{Eigen realisatie} + +\chapter{Besluit} + +\backmatter +\appendix + +\chapter{Symbolen} +\chapter{Referentielijst} + +\makefinalpage + +\end{document} + +\endinput +%% +%% End of file `uantwerpenmasterthesis_example.tex'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj --- old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2016-05-03 03:19:59.000000000 +0200 +++ new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -1,14 +1,20 @@ name uantwerpendocs.doc category Package -revision 40826 +revision 42912 shortdesc doc files of uantwerpendocs relocated 1 -docfiles size=184 +docfiles size=245 RELOC/doc/latex/uantwerpendocs/LICENSE + RELOC/doc/latex/uantwerpendocs/README RELOC/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf RELOC/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex + RELOC/doc/latex/uantwerpendocs/uantwerpencoursetext_example.tex RELOC/doc/latex/uantwerpendocs/uantwerpendocs.pdf RELOC/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf RELOC/doc/latex/uantwerpendocs/uantwerpenletter-example.tex + RELOC/doc/latex/uantwerpendocs/uantwerpenletter_example.pdf + RELOC/doc/latex/uantwerpendocs/uantwerpenletter_example.tex RELOC/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.pdf RELOC/doc/latex/uantwerpendocs/uantwerpenmasterthesis-example.tex + RELOC/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.pdf + RELOC/doc/latex/uantwerpendocs/uantwerpenmasterthesis_example.tex ++++++ uantwerpendocs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls --- old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2016-05-02 03:30:23.000000000 +0200 +++ new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2017-01-10 00:01:06.000000000 +0100 @@ -27,8 +27,8 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpencoursetext} [2016/05/01 v1.7 .dtx skeleton file] -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \newif\if@copyright \DeclareOption{copyright}{\@copyrighttrue} @@ -48,6 +48,8 @@ \setcounter{secnumdepth}{3} \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry} \RequirePackage{ifthen} +\RequirePackage{ifmtarg} +\RequirePackage{shellesc} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{color} @@ -577,6 +579,9 @@ \else \cleardoublepage \thispagestyle{empty} + ~% intentionally blank page + \clearpage + \thispagestyle{empty} \begin{tikzpicture}[remember picture,overlay] \node at (current page.center) { \begin{tikzpicture}[inner sep=0pt] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenletter.cls new/tex/latex/uantwerpendocs/uantwerpenletter.cls --- old/tex/latex/uantwerpendocs/uantwerpenletter.cls 2016-05-02 03:30:23.000000000 +0200 +++ new/tex/latex/uantwerpendocs/uantwerpenletter.cls 2017-01-10 00:01:06.000000000 +0100 @@ -25,8 +25,8 @@ %% The Current Maintainer of this work is Walter Daems. %% \ProvidesClass{uantwerpenletter} -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \newif\if@filled \DeclareOption{filled}{\@filledtrue} @@ -42,6 +42,8 @@ \RequirePackage[normalem]{ulem} \RequirePackage{atbegshi} \RequirePackage{ifthen} +\RequirePackage{ifmtarg} +\RequirePackage{shellesc} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{color} @@ -186,6 +188,8 @@ \renewcommand*{\opening}[1]{#1} \newcommand{\@closing}{<specify a closing formula using \tbs closing\{\}>} \renewcommand*{\closing}[1]{\renewcommand{\@closing}{#1}} +\newcommand{\@signature}{\vspace*{8ex}} +\renewcommand*{\signature}[1]{\renewcommand{\@signature}{#1}} \newcommand{\@carboncopy}{} \newcommand{\carboncopy}[1]{\renewcommand{\@carboncopy}{#1}} \newcommand{\@enclosed}{} @@ -232,8 +236,8 @@ {\includegraphics{\footername}}; \end{tikzpicture} ~\\[3ex] - \textcolor{uacorpblue}{\bf \@sender}\\* - \(a)senderrole\\[1.75ex] + \textcolor{uacorpblue}{\bf \@sender} + \ifx\@senderrole\@emptymacro\\[1.75ex]\else \\*\(a)senderrole\\[1.75ex]\fi \@faculty \ifx\@unit\@emptymacro\else\\* \(a)unit\fi~\\[1.75ex] \(a)address\\[1.75ex] @@ -253,12 +257,12 @@ \end{tikzpicture}~\\[4ex] } \AtEndDocument{ - \@closing\\*[12ex] - \@sender\\* - \@senderrole + \@closing\\*[3ex]\@signature~\\[3ex] + \@sender + \ifx\@senderrole\@emptymacro\\[8ex]\else\\*\@senderrole\\[8ex]\fi \setlength{\parskip}{0em} - \ifx\@carboncopy\@emptymacro\else ~\\[4ex] CC: \@carboncopy\fi - \ifx\@enclosed\@emptymacro\else ~\\[4ex] ENCL: \@enclosed\fi + \ifx\@carboncopy\@emptymacro\else CC: \@carboncopy\\[4ex]\fi + \ifx\@enclosed\@emptymacro\else ENCL: \@enclosed\fi \label{lastpage} } \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls --- old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2016-05-02 03:30:23.000000000 +0200 +++ new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2017-01-10 00:01:06.000000000 +0100 @@ -27,8 +27,8 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenmasterthesis} [2016/05/01 v1.7 .dtx skeleton file] -\def\fileversion{1.7} -\def\filedate{2016/05/01} +\def\fileversion{1.8} +\def\filedate{2017/01/08} \newif\if@titlepagenoartwork \DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue} @@ -44,6 +44,8 @@ \setcounter{secnumdepth}{3} \RequirePackage[top=1in, bottom=1in, left=1in, right=1in]{geometry} \RequirePackage{ifthen} +\RequirePackage{ifmtarg} +\RequirePackage{shellesc} \newcommand{\@emptymacro}{} \RequirePackage{graphicx} \RequirePackage{color} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.tlpobj new/tlpkg/tlpobj/uantwerpendocs.tlpobj --- old/tlpkg/tlpobj/uantwerpendocs.tlpobj 2016-05-03 03:19:59.000000000 +0200 +++ new/tlpkg/tlpobj/uantwerpendocs.tlpobj 2017-04-14 18:04:08.000000000 +0200 @@ -1,6 +1,6 @@ name uantwerpendocs category Package -revision 40826 +revision 42912 shortdesc Course texts and masters theses in University of Antwerp style relocated 1 longdesc These class files implement the house style of the University @@ -27,7 +27,7 @@ RELOC/tex/latex/uantwerpendocs/uantwerpenletter.cls RELOC/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls catalogue-ctan /macros/latex/contrib/uantwerpendocs -catalogue-date 2016-05-01 06:37:58 +0200 +catalogue-date 2017-01-09 06:37:15 +0100 catalogue-license lppl1.3 catalogue-topics class dissertation essay letter -catalogue-version 1.7 +catalogue-version 1.8 ++++++ uassign.doc.tar.xz ++++++ ++++++ uassign.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uassign.tlpobj new/tlpkg/tlpobj/uassign.tlpobj --- old/tlpkg/tlpobj/uassign.tlpobj 2016-04-14 19:55:11.000000000 +0200 +++ new/tlpkg/tlpobj/uassign.tlpobj 2017-04-14 18:04:09.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/uassign/uassign.sty catalogue-ctan /macros/latex/contrib/uassign -catalogue-date 2015-09-23 22:57:46 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class catalogue-version 1.01 ++++++ ucbthesis.doc.tar.xz ++++++ ++++++ ucbthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucbthesis.tlpobj new/tlpkg/tlpobj/ucbthesis.tlpobj --- old/tlpkg/tlpobj/ucbthesis.tlpobj 2016-04-14 19:55:11.000000000 +0200 +++ new/tlpkg/tlpobj/ucbthesis.tlpobj 2017-04-14 18:04:09.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=6 RELOC/tex/latex/ucbthesis/ucbthesis.cls catalogue-ctan /macros/latex/contrib/ucbthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation catalogue-version 3.5 ++++++ ucdavisthesis.doc.tar.xz ++++++ ++++++ ucdavisthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucdavisthesis.tlpobj new/tlpkg/tlpobj/ucdavisthesis.tlpobj --- old/tlpkg/tlpobj/ucdavisthesis.tlpobj 2016-04-27 03:25:23.000000000 +0200 +++ new/tlpkg/tlpobj/ucdavisthesis.tlpobj 2017-04-14 18:04:10.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/ucdavisthesis/ucdthesis12.clo RELOC/tex/latex/ucdavisthesis/ucdthesis13.clo catalogue-ctan /macros/latex/contrib/ucdavisthesis -catalogue-date 2016-04-26 08:12:46 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics dissertation catalogue-version 1.3 ++++++ ucharcat.doc.tar.xz ++++++ ++++++ ucharcat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucharcat.tlpobj new/tlpkg/tlpobj/ucharcat.tlpobj --- old/tlpkg/tlpobj/ucharcat.tlpobj 2016-04-14 19:55:14.000000000 +0200 +++ new/tlpkg/tlpobj/ucharcat.tlpobj 2017-04-14 18:04:10.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/ucharcat/ucharcat.sty catalogue-ctan /macros/latex/contrib/ucharcat -catalogue-date 2015-11-20 05:46:40 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics lua-supp luatex catalogue-version 0.03 ++++++ ucharclasses.doc.tar.xz ++++++ ++++++ ucharclasses.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucharclasses.tlpobj new/tlpkg/tlpobj/ucharclasses.tlpobj --- old/tlpkg/tlpobj/ucharclasses.tlpobj 2016-05-03 03:20:01.000000000 +0200 +++ new/tlpkg/tlpobj/ucharclasses.tlpobj 2017-04-14 18:04:10.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=8 RELOC/tex/xelatex/ucharclasses/ucharclasses.sty catalogue-ctan /macros/xetex/latex/ucharclasses -catalogue-date 2016-04-26 05:42:27 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics xetex font-supp catalogue-version 2.2.1 ++++++ ucs.doc.tar.xz ++++++ ++++++ ucs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucs.tlpobj new/tlpkg/tlpobj/ucs.tlpobj --- old/tlpkg/tlpobj/ucs.tlpobj 2016-04-14 19:55:17.000000000 +0200 +++ new/tlpkg/tlpobj/ucs.tlpobj 2017-04-14 18:04:11.000000000 +0200 @@ -240,7 +240,7 @@ RELOC/tex/latex/ucs/utils/xscmr.fd RELOC/tex/latex/ucs/utils/xsenc.def catalogue-ctan /macros/latex/contrib/ucs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-10-08 11:55:22 +0200 catalogue-license lppl1.3 -catalogue-topics inputenc +catalogue-topics inputenc unicode catalogue-version 2.2

1 0

commit texlive-specs-w for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-w for openSUSE:Factory checked in at 2017-06-25 19:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-w (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-w.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-w" Sun Jun 25 19:22:53 2017 rev:26 rq:504813 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.changes 2017-06-08 14:56:32.709708815 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-w.new/texlive-specs-w.changes 2017-06-25 19:29:41.020269844 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- tikz-3dplot.doc.tar.xz tikz-3dplot.tar.xz tikz-bayesnet.doc.tar.xz tikz-bayesnet.tar.xz tikz-cd.doc.tar.xz tikz-cd.tar.xz tikz-dependency.doc.tar.xz tikz-dependency.tar.xz tikz-dimline.doc.tar.xz tikz-dimline.tar.xz tikz-feynman.doc.tar.xz tikz-feynman.tar.xz tikz-inet.doc.tar.xz tikz-inet.tar.xz tikz-opm.doc.tar.xz tikz-opm.tar.xz tikz-palattice.doc.tar.xz tikz-palattice.tar.xz tikz-qtree.doc.tar.xz tikz-qtree.tar.xz tikz-timing.doc.tar.xz tikz-timing.tar.xz tikzinclude.doc.tar.xz tikzinclude.tar.xz tikzmark.doc.tar.xz tikzmark.tar.xz tikzorbital.doc.tar.xz tikzorbital.tar.xz tikzpagenodes.doc.tar.xz tikzpagenodes.tar.xz tikzpfeile.doc.tar.xz tikzpfeile.tar.xz tikzposter.doc.tar.xz tikzposter.tar.xz tikzscale.doc.tar.xz tikzscale.tar.xz tikzsymbols.doc.tar.xz tikzsymbols.tar.xz times.tar.xz timetable.tar.xz timing-diagrams.doc.tar.xz timing-diagrams.tar.xz tipa-de.doc.tar.xz tipa.doc.tar.xz tipa.tar.xz tipfr.doc.tar.xz tipfr.tar.xz titlecaps.doc.tar.xz titlecaps.tar.xz titlefoot.tar.xz titlepages.doc.tar.xz titlepic.doc.tar.xz titlepic.tar.xz titleref.doc.tar.xz titleref.tar.xz titlesec.doc.tar.xz titlesec.tar.xz titling.doc.tar.xz titling.tar.xz tkz-base.doc.tar.xz tkz-base.tar.xz tkz-berge.doc.tar.xz tkz-berge.tar.xz tkz-doc.doc.tar.xz tkz-doc.tar.xz tkz-euclide.doc.tar.xz tkz-euclide.tar.xz tkz-fct.doc.tar.xz tkz-fct.tar.xz tkz-graph.doc.tar.xz tkz-graph.tar.xz tkz-kiviat.doc.tar.xz tkz-kiviat.tar.xz tkz-linknodes.doc.tar.xz tkz-linknodes.tar.xz tkz-orm.doc.tar.xz tkz-orm.tar.xz tkz-tab.doc.tar.xz tkz-tab.tar.xz tlc2.doc.tar.xz tocbibind.doc.tar.xz tocbibind.tar.xz tocloft.doc.tar.xz tocloft.tar.xz tocvsec2.doc.tar.xz tocvsec2.tar.xz todo.doc.tar.xz todo.tar.xz todonotes.doc.tar.xz todonotes.tar.xz tokenizer.doc.tar.xz tokenizer.tar.xz toolbox.doc.tar.xz toolbox.tar.xz tools.doc.tar.xz tools.tar.xz topfloat.doc.tar.xz topfloat.tar.xz toptesi.doc.tar.xz toptesi.tar.xz totcount.doc.tar.xz totcount.tar.xz totpages.doc.tar.xz totpages.tar.xz tpic2pdftex.doc.tar.xz tpslifonts.doc.tar.xz tpslifonts.tar.xz tqft.doc.tar.xz tqft.tar.xz tracklang.doc.tar.xz tracklang.tar.xz trajan.doc.tar.xz trajan.tar.xz tram.doc.tar.xz tram.tar.xz translation-array-fr.doc.tar.xz translation-arsclassica-de.doc.tar.xz translation-biblatex-de.doc.tar.xz translation-chemsym-de.doc.tar.xz translation-dcolumn-fr.doc.tar.xz translation-ecv-de.doc.tar.xz translation-enumitem-de.doc.tar.xz translation-europecv-de.doc.tar.xz New: ---- tablefootnote.doc.tar.xz tablefootnote.tar.xz tableof.doc.tar.xz tableof.tar.xz tablestyles.doc.tar.xz tablestyles.tar.xz tablists.doc.tar.xz tablists.tar.xz tablor.doc.tar.xz tablor.tar.xz tabls.doc.tar.xz tabls.tar.xz tabriz-thesis.doc.tar.xz tabriz-thesis.tar.xz tabstackengine.doc.tar.xz tabstackengine.tar.xz tabto-generic.tar.xz tabto-ltx.doc.tar.xz tabto-ltx.tar.xz tabu.doc.tar.xz tabu.tar.xz tabularborder.doc.tar.xz tabularborder.tar.xz tabularcalc.doc.tar.xz tabularcalc.tar.xz tabularew.doc.tar.xz tabularew.tar.xz tabulars-e.doc.tar.xz tabulary.doc.tar.xz tabulary.tar.xz tabvar.doc.tar.xz tabvar.tar.xz tagging.doc.tar.xz tagging.tar.xz tagpair.doc.tar.xz tagpair.tar.xz talk.doc.tar.xz talk.tar.xz tamefloats.doc.tar.xz tamefloats.tar.xz tamethebeast.doc.tar.xz tap.doc.tar.xz tap.tar.xz tapir.doc.tar.xz tapir.tar.xz tasks.doc.tar.xz tasks.tar.xz tcldoc.doc.tar.xz tcldoc.tar.xz tcolorbox.doc.tar.xz tcolorbox.tar.xz tdclock.doc.tar.xz tdclock.tar.xz tds.doc.tar.xz tdsfrmath.doc.tar.xz tdsfrmath.tar.xz technics.doc.tar.xz technics.tar.xz ted.doc.tar.xz ted.tar.xz templates-fenn.doc.tar.xz templates-sommer.doc.tar.xz templatetools.doc.tar.xz templatetools.tar.xz tempora.doc.tar.xz tempora.tar.xz tengwarscript.doc.tar.xz tengwarscript.tar.xz tensor.doc.tar.xz tensor.tar.xz termcal.doc.tar.xz termcal.tar.xz termlist.doc.tar.xz termlist.tar.xz termmenu.doc.tar.xz termmenu.tar.xz testhyphens.doc.tar.xz testhyphens.tar.xz testidx.doc.tar.xz testidx.tar.xz tetex.doc.tar.xz tetex.tar.xz tetex_scripts.dif teubner.doc.tar.xz teubner.tar.xz tex-ewd.doc.tar.xz tex-ewd.tar.xz tex-font-errors-cheatsheet.doc.tar.xz tex-gyre-math.doc.tar.xz tex-gyre-math.tar.xz tex-gyre.doc.tar.xz tex-gyre.tar.xz tex-ini-files.doc.tar.xz tex-ini-files.tar.xz tex-label.doc.tar.xz tex-label.tar.xz tex-overview.doc.tar.xz tex-ps.doc.tar.xz tex-ps.tar.xz tex-refs.doc.tar.xz tex-virtual-academy-pl.doc.tar.xz tex.doc.tar.xz tex4ebook.doc.tar.xz tex4ebook.tar.xz tex4ht.doc.tar.xz tex4ht.tar.xz tex4ht_env.dif texapi.doc.tar.xz texapi.tar.xz texbytopic.doc.tar.xz texconfig.doc.tar.xz texconfig.tar.xz texconfig_scripts.dif texcount.doc.tar.xz texcount.tar.xz texdef.doc.tar.xz texdef.tar.xz texdiff.doc.tar.xz texdiff.tar.xz texdirflatten.doc.tar.xz texdirflatten.tar.xz texdoc.doc.tar.xz texdoc.tar.xz texdoc_cnf.dif texdraw.doc.tar.xz texdraw.tar.xz texdraw_info.dif texfot.doc.tar.xz texfot.tar.xz texilikechaps.tar.xz texilikecover.tar.xz texosquery.doc.tar.xz texosquery.tar.xz texproposal.doc.tar.xz thaienum.doc.tar.xz thaienum.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-w.spec ++++++ ++++ 25000 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-w.new/texlive-specs-w.spec ++++++ tikz-3dplot.doc.tar.xz -> tableof.doc.tar.xz ++++++ ++++ 8581 lines of diff (skipped) ++++++ tikz-3dplot.doc.tar.xz -> tableof.tar.xz ++++++ ++++ 8607 lines of diff (skipped) ++++++ tikzsymbols.doc.tar.xz -> tabls.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tabls/miscdoc.sty new/doc/latex/tabls/miscdoc.sty --- old/doc/latex/tabls/miscdoc.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/tabls/miscdoc.sty 2016-11-25 19:30:11.000000000 +0100 @@ -0,0 +1,95 @@ +\ProvidesPackage{miscdoc}[2010/01/20 v1.2 documentation macros misc latex pkgs] + +% miscdoc.sty +% Copyright 2010 Robin Fairbairns +% +% 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://www.latex-project.org/lppl.txt +% 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 Robin Fairbairns. +% +% This work consists of the file miscdoc.sty (only) + +\setcounter{errorcontextlines}{1274} + +% The package arose from a small exercise to document packages whose +% previous documentation consisted solely of comments in the package files. +% The macros here defined are lifted from the author's faq.sty +% (written for the UK TeX FAQ, CTAN:help/uk-tex-faq) or are inspired +% by others' work (credited where the author is known) ... except +% where they came as a flash of inspiration while actually writing the +% documentation. + +% this option suggested by Heiko Oberdiek, 2010-01-29 +\DeclareOption{hyper}{% + \AtEndOfPackage{% + \RequirePackage[pdfusetitle]{hyperref} + \RequirePackage{bookmark} + \bookmarksetup{numbered,open,openlevel=1} + } +} +\ProcessOptions\relax + +% note: T1 encoding assumed +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{booktabs} + +% from faq.sty +\newcommand\cs[1]{\texttt{\char`\\#1}} +\let\csx\cs +\def\bsbs{\cs{\char`\\}} + +% \cmdinvoke\cs<argument sequence> +% \cs typeset as above +% <argument sequence> may consist of optional or mandatory arguments; +% +% the `arguments' are simply typesett \texttt, as yet -- if something +% fancier is needed, there's a bunch of code needs rewriting here... +\DeclareRobustCommand\cmdinvoke{\@ifstar + {\let\@tempa\emph\@scmdinvoke}% + {\let\@tempa\relax\@scmdinvoke}% +} +\def\@scmdinvoke#1{\texttt{\symbol{92}#1}% + \futurelet\@let@token\@cmdinvoke +} +\def\@cmdinvoke{\ifx\@let@token\bgroup + \let\@tempb\@cmdinvoke@lbrace + \else + \ifx\@let@token[% ] + \let\@tempb\@cmdinvoke@lbrack + \else + \ifx\@let@token(% ) + \let\@tempb\@cmdinvoke@lparen + \else + \let\@tempb\@empty + \fi + \fi + \fi + \@tempb +} +\def\@cmdinvoke@lbrace#1{\penalty0\hskip0pt\relax + \texttt{\symbol{123}\@tempa{#1}\symbol{125}}% + \futurelet\@let@token\@cmdinvoke +} +\def\@cmdinvoke@lbrack[#1]{\penalty-150\hskip0pt\relax + \texttt{[\@tempa{#1}]}% + \futurelet\@let@token\@cmdinvoke +} +\def\@cmdinvoke@lparen(#1){\penalty-150\hskip0pt\relax + \texttt{(\@tempa{#1})}% + \futurelet\@let@token\@cmdinvoke +} + +% sui generis +\newcommand\newitem{\par\addvspace{1ex}\noindent} + +% inspired by doc.sty in latex distribution +\newcommand\meta[1]{\ensuremath{\langle}\emph{#1}\ensuremath{\rangle}} Binary files old/doc/latex/tabls/tabls.pdf and new/doc/latex/tabls/tabls.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tabls/tabls.tex new/doc/latex/tabls/tabls.tex --- old/doc/latex/tabls/tabls.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/tabls/tabls.tex 2016-11-25 19:30:11.000000000 +0100 @@ -0,0 +1,83 @@ +\documentclass[a4paper]{article} +\usepackage[a4paper]{geometry} +\usepackage{miscdoc} +\usepackage[scaled=0.85]{luximono} +\begin{document} +\title{The \textsf{tabls} package} +\author{Donald Arseneau\thanks{Documentation derived from the package + file by Robin Fairbairns}} +\maketitle +\begin{quote} + The package modifies \LaTeX{}'s \texttt{array} and \texttt{tabular} + environments to keep text from touching other text or hlines above + or below. +\end{quote} +\section{New parameters, etc.} + +The behaviour of the package is controlled by a small set of +parameters, which are all \TeX{} \cs{dimen} registers (and so may be +adjusted using \LaTeX{} \cs{setlength} commands. + +\paragraph{\cs{tablinesep} (or \cs{tablelineskip}):} the minimum space +between text on successive lines in a tabular environment. Negative +distances are treated as zero. The default value is \texttt{1pt}. A +value of \texttt{0pt} turns off checking for touching text. Text +given in an \verb|@{ }| specification (cf. the \textsf{array} package) +is never checked for overlap. + +\paragraph{\cs{arraylinesep} (or \cs{arraylineskip})}: like +\cs{tablinesep}, but for arrays. + +\paragraph{\cs{extrarulesep}:} extra space to add above and below each +\cs{hline} and \cs{cline}. There will be at least +\texttt{\cs{extrarulesep} + 0.5\cs{tablinesep}} between an \cs{hline} +and a line of text. Negative values can be used, but only until some +text touches the line. The default value is \texttt{3pt}. + +\noindent To ensure interline separations in tables but not arrays, +declare +\begin{quote} + \cs{setlength}\cmdinvoke{arraylinesep}{0pt} +\end{quote} +\noindent The appearance of normal \LaTeX{} tables can be had with +\begin{quote} + \cs{setlength}\cmdinvoke{tablinesep}{0pt}\\ + \cs{setlength}\cmdinvoke{arraylinesep}{0pt}\\ + \cs{setlength}\cmdinvoke{extrarulesep}{0pt} +\end{quote} +\noindent but it would be better to not use \textsf{tabls} in this +situation. + +The command \cmdinvoke{hline}[extra] has gained an optional length +argument (just like \bsbs), which gives the space to insert below the +line. This space is in addition to the \cs{extrarulesep} and +linesep. A negative value will reduce the space until the line +touches some text below, and will then have no further effect. For +example, \cmdinvoke{hline}[-9cm] draws a horizontal line while +suppressing all the extra spacing. + +(This \cs{hline} also fixes the notches that used to appear at the +junction between horizontal and vertical lines.) + +\section{How it works} + +There are no struts in the preamble entries\footnote{The comments in + the package say this is a lie\dots}, rather, there are tests to +measure the maximum height and depth of all entries on a line. The +maximum values start at the size of LaTeX's \cs{@arstrut} minus the +appropriate linesep. At the \bsbs, a strut is inserted (in its own +column) which is that maximum size plus the linesep plus any +additional space for separation from \cs{hline}s. + +\section{The Downside} + +Building a table will be slower than before because the entries have +to be boxed twice (by the package's \cs{@seesize} and by \cs{halign} +itself) instead of just once. +\cs{setlength}\cmdinvoke{tablinesep}{0pt} will recover most of this +speed, with \cs{extrarulesep} still partially in effect\,---\,extra +space will still be added around \cs{hline}s, but it may be taken up +by very tall or very deep table entries; thus text may still touch the +lines. Because of the speed penalty, if your computer is slow, it is +probably best to omit \textsf{tabls} until producing a final copy. +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzsymbols/README new/doc/latex/tikzsymbols/README --- old/doc/latex/tikzsymbols/README 2016-04-04 23:16:01.000000000 +0200 +++ new/doc/latex/tikzsymbols/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,75 +0,0 @@ -tikzsymbols -=========== - -Overview --------- - -The `tiksymbols` package v4.0 contains symbols created using tikz. - -This package provides: - * various emoticons - * cooking symbols - * trees - * other symbols (e.g. Penrose-Triangle(Triban), chair, coffeecup, etc.) - -Changes -------- -* v1.6 Several bugs fixed and some options added. -* v1.7 New symbols and some "bugs" fixed -* v2.0 Bug fixed, now option "tree=on/off" is working again, - new symbols: "Triban", improved BasicTree code. - New option: "marvsoym" (see documentation for more details). -* v2.2 Included \@ifpackageloaded, now symbols can have negative scale, - Did something else, I can`t remember. -* v2.25 Changed some code -* v2.5 New option: draftabsolute (symbols are replaced by text and LateX - becomes faster again). Changed manual a bit. -* v3.0 Symbols are stored inside a save-box and are used via \usebox{}, - New option: "draft=absolute" (old option is still useable but obsolete), - Changed output of "draft=absolute", - New option: "prefix=<prefix>", adds a <prefix> to all commands, - New option: "usebox=true/false" If false the symbols aren`t stored inside a box, - See manual for more changes. -* v3.0a New cookingsymbols: \grater, \bottle -* v3.0b Deleted some non-ASCII characters. -* v3.0g Removed a bug caused by me messing up with commands. - Removed package `calc` and replaced \setlength with \pgfmathsetlength - Reworked some code of the symbols. - Did not change the manual. -* v3.0h Created a bug in the process of fixing the last bug, - added the forgotten \fi. -* v3.01alpha Copied the 2e code and started rewriting the code - in LaTeX3. -* v3.38 Nearly finished rewriting. -* v3.40 Now everything is coded in LaTeX3. -* v3.40-v0.95 Various fixes and changes. -* v3.95 New emoticon \(d)Changey. -* v4.0 Finished reworking the code. - - -Requirements ------------- - - * expl3 & xparse - * tikz - * xcolor - * xspace - * l3keys2e - - -This file contains ------------------- - - * README - * tikzsymbols.pdf - * tikzsymbols.dtx - * tikzsymbols.ins - -License -------- -This material is subject to the LaTeX Project Public License. See - - http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html - -for the details of that license. - Binary files old/doc/latex/tikzsymbols/tikzsymbols.pdf and new/doc/latex/tikzsymbols/tikzsymbols.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabls.doc.tlpobj new/tlpkg/tlpobj/tabls.doc.tlpobj --- old/tlpkg/tlpobj/tabls.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/tabls.doc.tlpobj 2017-04-14 18:01:12.000000000 +0200 @@ -0,0 +1,9 @@ +name tabls.doc +category Package +revision 17255 +shortdesc doc files of tabls +relocated 1 +docfiles size=59 + RELOC/doc/latex/tabls/miscdoc.sty + RELOC/doc/latex/tabls/tabls.pdf + RELOC/doc/latex/tabls/tabls.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzsymbols.doc.tlpobj new/tlpkg/tlpobj/tikzsymbols.doc.tlpobj --- old/tlpkg/tlpobj/tikzsymbols.doc.tlpobj 2016-04-14 19:51:53.000000000 +0200 +++ new/tlpkg/tlpobj/tikzsymbols.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name tikzsymbols.doc -category Package -revision 40236 -shortdesc doc files of tikzsymbols -relocated 1 -docfiles size=121 - RELOC/doc/latex/tikzsymbols/README - RELOC/doc/latex/tikzsymbols/tikzsymbols.pdf ++++++ tikzsymbols.tar.xz -> tabls.tar.xz ++++++ ++++ 2721 lines of diff (skipped) ++++++ tikz-3dplot.doc.tar.xz -> tcldoc.doc.tar.xz ++++++ ++++ 15452 lines of diff (skipped) ++++++ tikz-3dplot.doc.tar.xz -> tcldoc.tar.xz ++++++ ++++ 9501 lines of diff (skipped) ++++++ tikzpagenodes.doc.tar.xz -> tds.doc.tar.xz ++++++ ++++ 6898 lines of diff (skipped) ++++++ tikz-3dplot.doc.tar.xz -> ted.doc.tar.xz ++++++ ++++ 8452 lines of diff (skipped) ++++++ tikz-3dplot.doc.tar.xz -> ted.tar.xz ++++++ ++++ 8774 lines of diff (skipped) ++++++ tpic2pdftex.doc.tar.xz -> tetex.doc.tar.xz ++++++ ++++ 2995 lines of diff (skipped) ++++++ tetex_scripts.dif ++++++ --- texmf-dist/scripts/texlive/fmtutil-sys.sh | 1 texmf-dist/scripts/texlive/fmtutil.pl | 24 ++++++++--- texmf-dist/scripts/texlive/mktexlsr.pl | 7 ++- texmf-dist/scripts/texlive/texconfig-dialog.sh | 14 +++++- texmf-dist/scripts/texlive/texlinks.sh | 53 ++++++++++++++++--------- texmf-dist/scripts/texlive/updmap-sys.sh | 1 texmf-dist/scripts/texlive/updmap.pl | 19 +++++--- 7 files changed, 85 insertions(+), 34 deletions(-) --- texmf-dist/scripts/texlive/fmtutil-sys.sh +++ texmf-dist/scripts/texlive/fmtutil-sys.sh 2016-02-01 15:28:31.009755153 +0000 @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' +umask 022 exec fmtutil --sys ${1+"$@"} --- texmf-dist/scripts/texlive/fmtutil.pl +++ texmf-dist/scripts/texlive/fmtutil.pl 2016-06-09 12:03:21.132289331 +0000 @@ -10,16 +10,16 @@ # History: # Original shell script (C) 2001 Thomas Esser, public domain -my $TEXMFROOT; +my $TEXMFDIST; BEGIN { $^W = 1; - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; + $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`; if ($?) { - die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; + die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n"; } - chomp($TEXMFROOT); - unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive"); + chomp($TEXMFDIST); + unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive"); require "mktexlsr.pl"; TeX::Update->import(); } @@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path(); # this function checks by itself whether it is running on windows or not reset_root_home(); -chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); +chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`); chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); @@ -361,7 +361,14 @@ sub callback_build_formats { TeXLive::TLWinGoo::maybe_make_ro ($tmpdir); } } else { + my ($uid, $gid); $tmpdir = File::Temp::tempdir(CLEANUP => 1); + if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) { + my $cnt = chown $uid, $gid, $tmpdir; + die "could not create directory $tmpdir" if $cnt <= 0; + $cnt = chmod 0770, $tmpdir; + die "could not create directory $tmpdir" if $cnt <= 0; + } } # set up destination directory $opts{'fmtdir'} ||= "$texmfvar/web2c"; @@ -576,6 +583,7 @@ sub rebuild_one_format { # check for existence of ini file before doing anything else if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) { # we didn't find the ini file, skip + return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'}); print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n"); # The original script just skipped it but in TeX Live we expect that # all activated formats are also buildable, thus return failure. @@ -635,11 +643,15 @@ sub rebuild_one_format { ",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) { return $FMT_NOTAVAIL; } else { + return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'}); print_deferred_error("not building $fmt due to missing engine $eng.\n"); return $FMT_FAILURE; } } + if ($ENV{batchmode} eq "yes") { + $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex"; + } my $cmdline = "$eng -ini $tcxflag $recorderswitch $jobswitch " . "$prgswitch $texargs"; print_verbose("running \`$cmdline' ...\n"); --- texmf-dist/scripts/texlive/mktexlsr.pl +++ texmf-dist/scripts/texlive/mktexlsr.pl 2016-02-08 09:36:58.465067429 +0000 @@ -72,7 +72,7 @@ output version information and exit use strict; $^W = 1; - +use POSIX qw(setgid); package mktexlsr; my $ismain; @@ -340,6 +340,11 @@ sub write { my %params = @_; my $fn; my $dosort = 0; + my $gid = getgrnam("mktex"); + if (defined($gid) && $> == 0) { + POSIX::setgid($gid); + umask(0002); + } $fn = $params{'filename'} if $params{'filename'}; $dosort = $params{'sort'}; if (!defined($self->{'root'})) { --- texmf-dist/scripts/texlive/texconfig-dialog.sh +++ texmf-dist/scripts/texlive/texconfig-dialog.sh 2016-02-01 15:30:20.646789151 +0000 @@ -157,7 +157,14 @@ termCtl() ############################################################################### menuMain() { - cat <<-'eof' + rows="$(stty size)" + columns=${rows##* } + rows=${rows%% *} + test -n "$rows" || rows=0 + test -n "$columns" || columns=0 + + if test $rows -lt 24 -a $columns -lt 80 ; then + cat <<-'eof' The interactive texconfig utility will be started now. Make sure your screen has at least 24 rows and 80 columns. If texconfig crashes now, you can still set up your TeX system using the @@ -169,8 +176,9 @@ menuMain() More likely these days, you're better off using tlmgr. See http://tug.org/texlive/tlmgr.html. -eof - termCtl readln + eof + termCtl readln + fi while :; do logMessage='view logfile' --- texmf-dist/scripts/texlive/texlinks.sh +++ texmf-dist/scripts/texlive/texlinks.sh 2009-09-02 12:47:26.000000000 +0000 @@ -100,7 +100,7 @@ setupTmpDir() trap 'cleanup 1' 1 2 3 7 13 15 needsCleanup=true - (umask 077; mkdir "$tmpdir") \ + (umask 077; mkdir -m 0700 "$tmpdir") \ || abort "could not create directory \`$tmpdir'" } @@ -108,16 +108,18 @@ setupTmpDir() # search a binary along $PATH: check_for_binary() { - testbin=$1 - set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift - for i - do - if [ -x "$i/$testbin" ]; then - echo "$i/$testbin" - return 0 - fi - done - return 1 +# testbin=$1 +# set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift +# for i +# do +# if [ -x "$i/$testbin" ]; then +# echo "$i/$testbin" +# return 0 +# fi +# done +# return 1 + + type -p $1 } @@ -208,8 +210,22 @@ search_symlinkdir() upd_symlinkdir() { search_symlinkdir || return 0 - for i in `sed 's@ .*@@' cnf_file_ln.$$`; do - install_link "$selfautoloc/$i" "$symlinkdir/$i" + set x `cat cnf_file_ln.$$` ; shift + while test $# != 0; do + fmt=$1; ini=$3; shift; shift; shift + + # Some broken shells destroy the positional arguments when calling a + # shellfunction. Therefore, we save and restore them "by hand" in the + # main_args_while variable. + main_args_while="$@" + + kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1 + test $? -ne 0 && continue + + install_link "$selfautoloc/$fmt" "$symlinkdir/$fmt" + + # restore positional arguments: + set x $main_args_while; shift done } @@ -274,12 +290,12 @@ main() test -f "$cnf_file" || abort "config file \`$cnf' not found" - tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$ + tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$.$RANDOM setupTmpDir cd "$tmpdir" || cleanup 1 - sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \ - | awk '{print $1, $2}' > cnf_file_ln.$$ + sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \ + | awk '{print $1, $2, $NF}' > cnf_file_ln.$$ if test -z "$dirs"; then if test $multiplatform = true; then @@ -300,13 +316,16 @@ main() # cnf_file_ln.$$ has lines with "format engine" pairs set x `cat cnf_file_ln.$$`; shift while test $# != 0; do - fmt=$1; engine=$2; shift; shift + fmt=$1; engine=$2; ini=$3; shift; shift; shift # Some broken shells destroy the positional arguments when calling a # shellfunction. Therefore, we save and restore them "by hand" in the # main_args_while variable. main_args_while="$@" + kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1 + test $? -ne 0 && continue + test "x$fmt" = "x$engine" && continue if test -f "$d/$engine$exeext"; then case $unlink in --- texmf-dist/scripts/texlive/updmap-sys.sh +++ texmf-dist/scripts/texlive/updmap-sys.sh 2016-02-01 15:28:58.194011537 +0000 @@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' +umask 022 exec updmap --sys ${1+"$@"} --- texmf-dist/scripts/texlive/updmap.pl +++ texmf-dist/scripts/texlive/updmap.pl 2017-04-10 08:48:59.737567193 +0000 @@ -16,15 +16,15 @@ my $svnid = '$Id: updmap.pl 44331 2017-05-14 02:15:43Z preining $'; -my $TEXMFROOT; +my $TEXMFDIST; BEGIN { $^W = 1; - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; + $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`; if ($?) { - die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; + die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n"; } - chomp($TEXMFROOT); - unshift(@INC, "$TEXMFROOT/tlpkg"); + chomp($TEXMFDIST); + unshift(@INC, "$TEXMFDIST/tlpkg"); } my $lastchdate = '$Date: 2017-05-14 04:15:43 +0200 (Sun, 14 May 2017) $'; @@ -46,7 +46,7 @@ use TeXLive::TLUtils qw(mkdirhier mktexu # see more comments at the definition of this function. reset_root_home(); -chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); +chomp(my $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`); chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); @@ -397,7 +397,12 @@ sub main { } print "in $changes_config_file\n"; print "Do you really want to continue (y/N)? "; - my $answer = <STDIN>; + my $answer; + if (-t STDIN ) { + $answer = <STDIN>; + } else { + $answer = "y"; + } $answer = "n" if !defined($answer); chomp($answer); print "answer =$answer=\n"; ++++++ translation-dcolumn-fr.doc.tar.xz -> teubner.doc.tar.xz ++++++ ++++ 1773 lines of diff (skipped) ++++++ toolbox.doc.tar.xz -> tex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/README new/doc/latex/toolbox/README --- old/doc/latex/toolbox/README 2013-11-27 23:24:54.000000000 +0100 +++ new/doc/latex/toolbox/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -The TeX programmer's toolbox; enhanced version. -This (La)TeX package provides some macros which are convenient for -writing indices, glossaries, or other macros. -It contains macros which support - - - implicit macros - a useful supplement to \index or varindex for - writing glossaries or indices - - fancy optional arguments - - loops over tokenlists and itemlists - - searching, splitting, and replacing - - controlled expansion - - redefinition of macros - - concatenated macro names - -Author: M. V\"ath martin(a)mvath.de - -The package may be distributed and/or modified under the conditions of -the LaTeX Project Public License (version 1.3c or later). Binary files old/doc/latex/toolbox/toolbox.pdf and new/doc/latex/toolbox/toolbox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.tex new/doc/latex/toolbox/toolbox.tex --- old/doc/latex/toolbox/toolbox.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/toolbox/toolbox.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -\documentclass{ltxdoc} -\OnlyDescription%% Comment this out, or -%%\AlsoImplementation%% uncomment this line, if you want to see the source. - -%% If you want an index, uncomment one of the following lines. -%% After running latex a first time, you have to use -%% makeindex -s gind.ist toolbox -%% Then run latex again. -%%\CodelineIndex% comment this out if you want an index referring to codelines -%%\PageIndex% comment this out if you want an index referring to pages -%%\OldMakeindex% uncomment this line, if your MakeIndex is pre-v2.9 - -\setlength\hfuzz{15pt} -\hbadness=7000 -\begin{document} -\DocInput{toolbox.dtx} -\end{document} -\endinput -%% -%% End of file `toolbox.tex'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.txt new/doc/latex/toolbox/toolbox.txt --- old/doc/latex/toolbox/toolbox.txt 2013-11-27 23:24:54.000000000 +0100 +++ new/doc/latex/toolbox/toolbox.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,790 +0,0 @@ - -%%# -%%# Author: -%%# -%%# M. V\"ath martin(a)mvath.de -%%# -%%# The author thanks -%%# David Kastrup <David.Kastrup(a)neuroinformatik.ruhr-uni-bochum.de> -%%# - -%%# The package may be distributed and/or modified under the conditions of -%%# the LaTeX Project Public License (version 1.3c or later). - -%%############################################################################# -%%# -%%# The TeX programmer's toolbox; enhanced version. -%%# This (La)TeX package provides some macros which are convenient for -%%# writing indices, glossaries, or other macros. -%%# It contains macros which support -%%# -%%# - implicit macros - a useful supplement to \index or varindex for -%%# writing glossaries or indices -%%# - fancy optional arguments -%%# - loops over tokenlists and itemlists -%%# - searching, splitting, and replacing -%%# - controlled expansion -%%# - redefinition of macros -%%# - concatenated macro names -%%# -%%############################################################################# - -%%# -%%# This package was tested with plain TeX, LaTeX 2.09, and LaTeX 2e, -%%# and it should actually run with all TeX formats. -%%# - - -%%# To use toolbox, you have to put `toolbox.sty' in a path where TeX looks -%%# for its input files. The TeX documents using toolbox need the -%%# following modifications in their header: -%%# -%%# a) If you use LaTeX2.09, use toolbox as a style option, e.g. -%%# \documentstyle[toolbox]{article} -%%# or -%%# \documentstyle[toolbox,12pt]{article} -%%# b) If you use LaTeX2e, put in the preamble the command -%%# \usepackage{toolbox} -%%# c) If you use some other (non-LaTeX) format, you will probably have to -%%# insert a line like -%%# \catcode`\@=11\input toolbox.sty\catcode`\@=12\relax -%%# -%%# The only LaTeX-specific commands used in `toolbox.sty' are: -%%# -%%# \newcommand (only in the form \newcommand{\command}{} to ensure that -%%# \command was not defined before) -%%# \ProvidesPackage -%%# \typeout -%%# -%%# The above commands are used only if they are defined. -%%# - -%%# -%%# Description of the provided macros: -%%# - -%%# General remark: Many macros could appear in several sections. -%%# For example, \toolboxMakeDef and \toolboxSourround might be considered -%%# as macros which support redefinitions of macros. However, we put them -%%# in different sections which perhaps explain better their nature. - -%%# -%%# Implicit macro definitions -%%# -------------------------- - -%%# What we mean by implicit macro definitions is probably best explained by -%%# the following examples which show the intended usage: -%%# -%%# (In the following examples, we always refer to the \index command. Note -%%# that it may be more convenient to use for indices the varindex package in -%%# addition - the documentation of varindex (release 2.3 or newer) gives -%%# additional hints and examples how these two (essentially independent) -%%# approaches can be combined in practice). -%%# -%%# Assume that you want to write an index for a book which has rather -%%# long and complicated \index entries. The first idea that one might have in -%%# this connection is to put the various \index commands at the beginning of -%%# the document into several macros (one for each \index entry), and to use -%%# just these macros in the main text. For example, one might want to write -%%# near the beginning of the document commands like -%%# \newcommand{\Start}{\index{finish or end}} -%%# \newcommand{\End}{\index{finish or end}} -%%# and then to use in the main text \Start and \End whenever a reference -%%# in the corresponding index to the current place is desired. -%%# However, this has two major disadvantages: -%%# 1. Unless you are very disciplinary with your macro names, it is easy to -%%# forget that \End writes an index entry. So the \End in the main text -%%# might be very confusing. -%%# 2. You cannot choose short and intuitive macro names for common phrases, -%%# because they are usually already reserved by TeX, LaTeX, or some -%%# packages. -%%# -%%# To avoid these problems, one may be very disciplinary and call the -%%# involved macros systematically e.g. \GlossaryStart \GlossaryEnd etc. -%%# However, this produces terrible long and unreadable macro names in the -%%# main text. -%%# -%%# The implicit macro definitions of "toolbox" provide a more convenient -%%# solution. The idea is that you do not use the corresponding macros directly -%%# but only implicitly by a call of other macros where your "macro name" is -%%# just an argument. -%%# Moreover, "toolbox" assists you in writing the corresponding definitions. -%%# For example, if you know that you want a set of macros which all expand -%%# into something of the form \index{...}, you can give a ``mask'' which -%%# contains this form, and you only have to fill in the changing content -%%# (similarly as for usual TeX macros with arguments, but the level of -%%# abstraction is one step higher). -%%# For the above task, you might use the command: -%%# -%%# \toolboxMakeDef{Glossary}{\index{#1}} -%%# -%%# The argument `Glossary' serves to distinguish independent definitions -%%# (this will become clear later). Its effect visible now is that it -%%# determines the name of the following macros which you can use after -%%# the above call: -%%# -%%# \NewGlossary{start-1}{start} -%%# \NewGlossary{start-2}{start or beginning} -%%# \NewGlossary{end}{finish or end} -%%# -%%# These command are now similar to the \newcommand definitions explained -%%# above. However, there is no name collision with the TeX-internal command -%%# \end. Of course, this means that you cannot just write \end in the main -%%# text to get the desired index entry. Instead, you have to write the more -%%# intuitive commands -%%# -%%# \Glossary{start-1} -%%# \Glossary{start-2} -%%# \Glossary{end} -%%# -%%# (again, the name \Glossary stems from our first call of \toolboxMakeDef). -%%# Note that e.g. \Glossary{start-1} expands not only to `start' but -%%# actually to \index{start} (because of our first call of \toolboxMakeDef). -%%# Note also that you can use symbols like - or numbers which are usually -%%# not allowed in TeX macro names. -%%# -%%# Of course, similarly as for \newcommand, you can also do other things with -%%# the macros. For example, -%%# -%%# \LetGlossary\tempname{end} -%%# \NewGlossary*{finish}\tempname -%%# -%%# will first define \tempname to expand to the same text as \Glossary{end}, -%%# and then defines a new entry \Glossary{finish} to expand to the same text -%%# as \tempname. Hence, the above new lines make the calls \Glossary{end} and -%%# \Glossary{finish} equivalent. -%%# -%%# At the end of your list of \NewGlossary commands, you might want to put -%%# -%%# \toolboxFreeDef*{Glossary} -%%# -%%# The purpose of this command is that \NewGlossary cannot be used anymore -%%# (unless, of course, you define it again). So you cannot unintentionally -%%# add new entries to your glossary list (but you still can use \Glossary{...} -%%# to reference to the already produced entries). -%%# Moreover, the above command frees some memory which was needed for -%%# \NewGlossary to work. -%%# -%%# If you additionally want to free the memory used by \Glossary, you can use -%%# -%%# \toolboxFreeDef{Glossary} -%%# -%%# (without the `*'). This may be necessary, if you want to call again e.g. -%%# -%%# \toolboxMakeDef{Glossary}{\emph{#1}\index{#1}} -%%# -%%# (if you have not freed the memory for \Glossary before this repeated call, -%%# TeX will complain that \Glossary is already defined). -%%# -%%# Of course, it is possible to call \toolboxMakeDef with several different -%%# names, for example, for \Glossary, \SymbolList etc. Another application -%%# might be to use a different command to mark e.g.\ the main occurrence of -%%# some index entry or to output additionally the entry into the running text. -%%# We do this in the following example which simultaneously -%%# demonstrates that the names can also be constructed in another way: -%%# -%%# \toolboxMakeDef[Ind]{}{\index{#1}} -%%# \toolboxMakeDef[Ind]{Main}{\index{#1|textbf}} -%%# \toolboxMakeDef{OutInd}{#1} -%%# -%%# \IndNew{A}{A is a letter} -%%# \IndNewMain{A}{A is a letter} -%%# \NewOutInd{A}{\textbf{The letter A}\Ind{A}} -%%# -%%# After the above commands, you can use \Ind{A}, \IndMain{A}, and -%%# \OutInd{A} to produce the corresponding \index entry, the "main" \index -%%# entry (with a boldface page number), and the text \textbf{The letter A} -%%# with an additional entry into the index, respectively. -%%# Of course, it might usually be more convenient to define the \Ind and -%%# \IndMain" entries simultaneously, e.g. as follows -%%# -%%# \toolboxMakeDef[Ind]{}{#1} -%%# \toolboxMakeDef[Ind]{Main}{#1} -%%# \newcommand{\NewStandardInd}[2]{% -%%# \IndNew{#1}{\index{#2}}% -%%# \IndNewMain{#1}{\index{#2|textbf}}} -%%# -%%# \NewStandardInd{A}{A is a letter} -%%# -%%# This approach has the additional advantage that you can define exceptional -%%# cases "by hand" (e.g. if you want that for certain "main" index -%%# entries the page number is printed with "\textsl" instead of "\textbf"). - -%%# Since the motivation for implicit definitions now is hopefully clear, -%%# let us now describe in detail which commands are provided by "toolbox" -%%# for this purpose. -%%# As explained in the example, the main generic macro provided to this -%%# purpose is \toolboxMakeDef. Its call syntax is as follows: -%%# -%%# \toolboxMakeDef[Prefix]{Name}{ReplacementMask} -%%# -%%# (the argument [Prefix] is optional and by default empty). -%%# The above command generates new macros -%%# -%%# \PrefixNewName -%%# \PrefixRenewName -%%# \PrefixProvideName -%%# \PrefixDefName -%%# \PrefixLetName -%%# \PrefixName -%%# -%%# which in turn can be called as follows -%%# -%%# \PrefixNewName{something}{RememberText} -%%# \PrefixRenewName{something}{RememberText} -%%# \PrefixProvideName{something}{RememberText} -%%# \PrefixDefName{something}{RememberText} -%%# \PrefixNewName*{something}{\SomeMacro} -%%# \PrefixRenewName*{something}{\SomeMacro} -%%# \PrefixProvideName*{something}{\SomeMacro} -%%# \PrefixDefName*{something}{\SomeMacro} -%%# \PrefixLetName{\SomeMacro}{something} -%%# \PrefixName{something} -%%# \PrefixName*{something} -%%# -%%# These calls are in a sense similar to the respective commands -%%# -%%# \newcommand{\something}{RememberText} -%%# \renewcommand{\something}{RememberText} -%%# \providecommand{\something}{RememberText} -%%# \def\something{RememberText} -%%# \newcommand{\something}{}\let\something\SomeMacro -%%# \renewcommand{\something}{}\let\something\SomeMacro -%%# \@ifundefined\something{\let\something\SomeMacro}{} -%%# \let\something\SomeMacro -%%# \let\SomeMacro{\something} -%%# \something -%%# \something (but without error if \something is undefined). -%%# -%%# with the differences already pointed out before: -%%# 1. The macro name actually used is not \something. Instead, it is a name -%%# which does not conflict with any existing macro (except one -%%# generated previously by another \PrefixNewName, but in this case a -%%# descriptive error is reported). For this reason, it is not possible to -%%# use this macro directly but only indirectly by the call -%%# \PrefixName{something} (or with \PrefixLetName). -%%# 2. The replacement text is not `RememberText' but determined by -%%# ReplacementMask where every occurrence of #1 in ReplacementMask is -%%# replaced by RememberText (recall the examples). If you want to have the -%%# plain RememberText, use {#1} as ReplacementMask. -%%# -%%# Since toolbox 4.2 there is another slight difference: The symbol '#' -%%# is treated as usual and not as in a macro definition. -%%# -%%# \toolboxMakeDef gives an error message if the commands -%%# \Prefix... are already defined. If you intentionally want to -%%# change a previous definition, you have to call the command -%%# -%%# \toolboxFreeDef[Prefix]{Name} -%%# -%%# before. The latter not only lets all of the macros \Prefix... be -%%# \undefined, but also frees all other memory internally used by the -%%# corresponding call of \toolboxMakeDef -%%# (note, however, that the above command does not free the -%%# memory allocated before by calls of \PrefixNew... - to free the latter, -%%# you have to call subsequently e.g. -%%# -%%# \PrefixNewName*{...}{\undefined} -%%# -%%% before). There is also the command -%%# -%%# \toolboxFreeDef*[Prefix]{Name} -%%# -%%# which acts similarly as \toolboxFreeDef but which does not undefine the -%%# two macros \PrefixName and \PrefixLetName. -%%# - -%%# -%%# Fancy optional argument parsing -%%# ------------------------------- - -%%# This section contains macros which are convenient if you e.g. write a -%%# package that contains macros which contain a lot of optional arguments -%%# and flags (like "*"). -%%# Typically, to read such an optional argument or flag, you save -%%# the next token with \futurelet and then call a macro which decides what to -%%# do with the token read. Thus, a typical use of \futurelet looks like -%%# -%%# \def\MacroWithOptionalFlag{\futurelet\tokread\myscan} -%%# -%%# which will define \tokread to be the token *following* the macro -%%# \MacroWithOptionalFlag in the token stream and then execute \myscan. -%%# In this context, it is not very convenient that you are *forced* -%%# to define a macro \myscan: It could be more convenient if you could just -%%# write the *content* of \tokread (in braces) into the above definition. -%%# You can indeed do this if you replace \futurelet by \toolboxFuturelet: -%%# -%%# \toolboxFuturelet\token{argument} -%%# -%%# The call \toolboxFuturelet\token{\command} has precisely the same effect as -%%# \futurelet\token\command. The advantage of \toolboxFuturelet is that -%%# instead of a single \command one may use also a sequence of commands. - -%%# Let us consider \MacroWithOptionalFlag as above. Assume that the user -%%# has called this macro in the form "\MacroWithOptionalFlag*" where the -%%# "*" is a flag which should cause your macro to do something slightly -%%# different. On some place in your macro definition you will have recognized -%%# (e.g. with \futurelet or \toolboxFuturelet) that a "*" is following -%%# in the calling sequence. So you now want to execute your action -%%# (whatever \MacroWithOptionalFlag is supposed to do). -%%# However, if you do not take special care, after this action, TeX will -%%# print a "*", because this is the next token on the token stream: \futurelet -%%# does not delete any tokens. So you have to "gobble" this token away. -%%# A rude way to do this is by using the macro \gobblenext as the last token -%%# in you macro which can be defined by -%%# \begin{verbatim} -%%# \def\gobblenext#1{}\end{verbatim} -%%# However, this has two major drawbacks: -%%# -%%# 1. This works for "*", but not for "{" or space tokens. -%%# For space tokens the situation is even worse, since TeX eats spaces -%%# around arguments, so sometimes space tokens might unexpectedly -%%# disappear. -%%# 2. It is not possible in this way to read another argument following -%%# the "*": Recall that \gobblenext must be the *last* token in your -%%# macro expansion, i.e. you have "lost control" after this call. -%%# -%%# The solution to these problems is instead of calling \gobblenext to use -%%# \toolboxGobbleNext as the last command in your call: -%%# You can pass it an argument which describes the action that -%%# you want to do *after* gobbling the next token ("*" in the above example) -%%# from the token stream. Thus -%%# -%%# \toolboxGobbleNext{cmd} -%%# -%%# erases the token following that command from the token stream and -%%# then executes cmd. This is similar to -%%# \def\toolboxGobbleNext#1#2{#1} -%%# with the difference that #2 is considered as a token and that no spaces -%%# are eaten. -%%# The effect is that e.g. the call -%%# -%%# Example: -%%# \toolboxGobbleNext{\foo}{{arg} -%%# is the same as \foo{arg} (the brace "{" is eaten in this example). - -%%# As described earlier, the commands "\futurelet" or "\toolboxFuturelet" can -%%# be used to check for optional flags. Frequently you will only want -%%# to test for one particular flag and decide the next action on this flag. -%%# Of course, you can test the token found with \ifx...\f", but this has the -%%# disadvantage that some tokens (e.g. \fi) follow your action, which might -%%# be bad (recall that e.g. \toolboxGobbleNext must be the last command of -%%# your action, i.e. it would in the above examples not gobble the "*" but -%%# the "\fi" which is probably not what you want). -%%# The simplest solution is to use the command \toolboxIfNextToken which -%%# already has the test included. For example, to test for an optional "[", -%%# you can simply write -%%# -%%# \def\MacroWithOptionalBrace{\toolboxIfNextToken[{\yes}{\no}} -%%# -%%# and then the call "\MacroWithOptionalBrace[...]" will expand to "\yes[...]" -%%# while "\MacroWithOptionalBrace x" will expand to "\no x" -%%# (note that the brace is not gobbled - if you want the latter, -%%# use "\toolboxIfNextGobbling" described below). - -%%# More precisely, the calling syntax of "\toolboxIfNextToken" is -%%# -%%# \toolboxIfNextToken{token}{IfPart}{ElsePart} -%%# -%%# The semantic is the following: -%%# If the token following this command is `token', then IfPart is executed, -%%# otherwise ElsePart. It is explicitly admissible that `token' is a space. -%%# To support further tests, \toolboxToken is \let to the token which follows -%%# the command. \toolboxToken is only a temporary token, i.e. -%%# it may also be modified by other commands of this package; in particular, -%%# you may also freely to modify \toolboxToken. -%%# The token \toolboxSpaceToken which is described later may be handy -%%# in connection with this command. -%%# -%%# In contrast to similar LaTeX2e macros much care has been taken -%%# that spaces are not eaten. This solves the following problem: -%%# -%%# Assume that you want to write a macro which should have the calling syntax -%%# "\mymacro{arg1}" or "\mymacro{arg1}[arg2]". You will probably implement -%%# \mymacro to read the first argument and then to look whether the next -%%# token is a "[". If you use the LaTeX2e macro to test for "[", -%%# then all spaces until the next non-space token would be gobbled which means -%%# that if you would use the LaTeX2e macros for the test, then the call -%%# "\mymacro{arg1} Text" would behave like "\mymacro{arg1}Text", -%%# i.e. the space is `mysteriously' lost. With the "toolbox" macros this -%%# does not happen. The `disadvantage' is that "\mymacro{arg1} [arg2]" -%%# is not the same as "\mymacro{arg1}[arg2]" (which is reasonable IMHO). -%%# -%%# Example: -%%# -%%# \def\mycmd#1{\toolboxIfNextToken[{\ParseOpt{#1}}{\NoOpt{#1}}} -%%# \def\ParseOpt#1[#2]{\OptAtEnd{#1}{#2}} -%%# -%%# After the above definition, \mycmd{arg} executes \NoOpt{arg} while -%%# \mycmd{arg}[optional] executes \OptAtEnd{arg}{optional} -%%# We point out once more that in the first call a space following -%%# \mycmd{arg} does not vanish (as would be the case if the LaTeX 2e macros -%%# would have been used). - -%%# If \toolboxIfNextToken has found the required token, it does *not* -%%# gobble that token from the token stream. Of course, you can do this by -%%# yourself using the earlier described macro \toolboxGobbleNext. However, -%%# it is simpler to use -%%# -%%# \toolboxIfNextGobbling{token}{IfPart}{ElsePart} -%%# -%%# This command is analogous to \toolboxIfNextToken with the difference that -%%# in the case that the next token is the desired token, it is gobbled before -%%# IfPart is executed. -%%# -%%# Example: -%%# -%%# \def\myloop{\toolboxIfNextGobbling*\toolboxTokenLoop\toolboxLoop} -%%# -%%# This makes \myloop*... behave like \toolboxTokenLoop, and -%%# \myloop... (without *) behave like \toolboxLoop. - -%%# The following macro is one which you may want to use in connection with -%%# LaTeX 2e optional arguments: -%%# -%%# \toolboxIfEmpty{arg}{IfPart}{ElsePart} -%%# -%%# The argument is not expand; it is only used to decide whether the -%%# {IfPart} or the {ElsePart} will be expanded. -%%# For further tests there are more involved macros: -%%# -%%# \toolboxIfx{arg}\macro{IfPart}{ElsePart} -%%# -%%# This tests via \ifx whether \def\Macro{arg} would give the definition -%%# of \macro. -%%# -%%# \toolboxIfX{arga}{argb}{IfPart}{ElsePart} -%%# -%%# This tests whether "arga" and "argb" are the same token sequences. -%%# If you want to avoid the \else and \fi commands to avoid certain side -%%# effects, you can use instead: -%%# -%%# \toolboxIfElse{ifcmd}{IfPart}{ElsePart} -%%# -%%# This is rather analogous to "ifcmd" IfPart \else ElsePart \fi -%%# but has everything in this line already eliminated from the tokenlist -%%# when IfPart resp. ElsePart are expanded. - -%%# -%%# Loops over tokenlists and itemlists -%%# ----------------------------------- - -%%# \toolboxLoop{items}{action} -%%# -%%# This calls iteratively "action{#1}", where #1 runs over each item in the -%%# argument items. Here, an item is either a token or a group braced by {...}. -%%# In the latter case, the braces are lost. Spaces in items are ignored -%%# (unless they are braced). It is admissible that \action is not a single -%%# macro but instead a sequence of tokens. -%%# Examples follow below. -%%# -%%# The counterintuitive order of arguments is explained by the fact that the -%%# typical usage is -%%# \expandafter\toolboxLoop\expandafter{\MacroExpandingToItems}{action} -%%# which for swapped order of arguments could hardly be written. - -%%# \toolboxLoop is not reentrant i.e. "action" may not expand -%%# to something which contains a call to \toolboxLoop. To enable such calls -%%# anyway, the command -%%# -%%# \toolboxLoopName{name}{items}{\action} -%%# -%%# is provided which is analogous to \toolboxLoop. This is also not reentrant, -%%# but in contrast to \toolboxLoop, calls with different `name' arguments can -%%# be used independently of each other, i.e. in the `action' part of a -%%# \toolboxLoop (or \toolboxLoopName) can be a call to \toolboxLoopName with -%%# a *different* `name'. -%%# In particular, using a counter in `name' one could easily implement -%%# even recursive calls. In this connection, it should be noted that -%%# `name' is expanded via \csname ... \endcsname, and so you may use -%%# constructs like \the\namecounter there. - -%%# \toolboxTokenLoop{tokens}{\action} -%%# -%%# This is similar to \toolboxLoop: The command \action\toolboxToken -%%# is executed iteratively where \toolboxToken runs over each token in tokens. -%%# The important difference is that \toolboxToken is a token (instead of an -%%# item). In particular, \toolboxToken runs through every single token -%%# including spaces and braces. -%%# The token \toolboxSpaceToken which is described later may be handy -%%# in connection with this command. -%%# -%%# Example: -%%# -%%# \toolboxTokenLoop{Some text}{\kern0.1em} -%%# -%%# is the similar to "\kern0.1em S\kern0.1em o\kern0.1em m...", i.e. you -%%# get wider spacing between the letters of "Some text" (I do not claim that -%%# this is typographically a good idea). -%%# -%%# Note that you do not have to take special care about the space. -%%# With \toolboxLoop, you would have to mask the space e.g. with -%%# -%%# \toolboxLoop{Some{ }text}{\kern0.1em} or -%%# \toolboxLoop{Some\toolboxSpace text}{\kern0.1em} -%%# -%%# In contrast, \toolboxTokenLoop would behave differently here: -%%# -%%# \toolboxTokenLoop{Some{ }text}{\kern0.1em} -%%# -%%# would produce \kern0.1em S...\kern0.1em{\kern0.1em <space>\kern0.1em}... -%%# because the braces are simply considered as tokens. - -%%# \toolboxTokenLoop is not reentrant. Analogously to \toolboxLoopName, -%%# independent versions can be generated by -%%# -%%# \toolboxTokenName{name}{tokens}{\action} - -%%# -%%# Controlled expansion -%%# -------------------- - -%%# There are some occasions when you want more control over the expansion. -%%# E.g. you might want to concatenate the contents of two macros to a -%%# further macro or you want to expand a macro by one level but no full -%%# expansion. Usually you can get this effects with \expandafter, but if -%%# you expand several concatenated tokens in this way you either have to -%%# write a lot of \expandafter's or you have to define subsidiary macros -%%# that help you to \expandafter certain parts of macros. The macros in -%%# this section allow you to do this in the most generic way that I could -%%# implement. - -%%# \toolboxDef\macrotodefine{argumentlist} -%%# -%%# This call is similar to -%%# \def\macrotodefine{argumentlist} -%%# with two important differences: -%%# -%%# For \toolboxDef, the argumentlist is expanded precisely by one level. -%%# argumentlist may not contain macros with parameters, and spaces on the -%%# highest level are ignored. If you want to force a space on a particular -%%# place, use the macro \toolboxSpace at this place -%%# (which is described later). Contrary to the usual \def, the symbol # is -%%# treated as a usual symbol. -%%# -%%# Example of usage: -%%# \toolboxDef\chain{\chain\toolboxSpace\after} -%%# This modifies the macro \chain such that a space and the content of the -%%# macro \after is appended at the end. - -%%# \toolboxAppend\macrotodefine{arglist} -%%# -%%# This is equivalent to \toolboxDef\macrotodefine{\macrotodefine arglist} -%%# - -%%# \toolboxSurround{ContentBefore}{ContentAfter}\macro -%%# -%%# This redefines \macro such that ContentBefore is put at the beginning -%%# and ContentAfter after the definition of \macro. So this is equivalent to -%%# \def\macro{ContentBefore * ContentAfter} -%%# where * is the old content of \macro. It is required that \macro is a -%%# usual macro without any arguments. If you want to patch more complicated -%%# macros, use the patch.doc package instead. -%%# The order of the arguments may appear strange, but it is convenient if -%%# ContentBefore or ContentAfter are macros which should be expanded with -%%# \expandafter. - -%%# There is some subsidiary macro used in the implementation of the above -%%# macros which might be useful also in some other situations: -%%# -%%# \toolboxTokDef{argumentlist}\macrotodefine -%%# -%%# This call is similar to -%%# \def\macrotodefine{argumentlist} -%%# with the difference that the symbol # is stored as such. -%%# The order of the arguments has been swapped in order to simplify the -%%# application of \expandafter to the argumentlist. - -%%# -%%# Searching, splitting, and replacing -%%# ---------------------------------- - -%%# \toolboxSplitAt{argument}{search}{\beforestring}{\afterstring} -%%# -%%# Here, \beforestring and \afterstring are arbitrary macro names, -%%# and search and argument are any sequences of tokens (which are in -%%# the following considered as `strings'). -%%# -%%# This call scans the string `argument' for the first occurrence of `search'. -%%# The macros \beforestring and \afterstring are defined correspondingly -%%# such that \beforestring expands to the part before the first occurrence, -%%# and \afterstring to the part following the first occurrence. -%%# If `search' does not occur in `argument', \beforestring is defined to -%%# `argument', and \afterstring is \let \undefined. -%%# -%%# If \beforestring or \afterstring had already been defined before the -%%# call, the previous definition is tacitly overridden. -%%# It is explicitly allowed that \beforestring and \afterstring are the -%%# same names. In this case, the result has the meaning of \afterstring. -%%# -%%# It is guaranteed that braces {...} are *not* lost in `argument'. -%%# However, `search' may not contain any braces, and `argument' may contain -%%# only matching pairs of braces. Moreover, occurrences of `search' within a -%%# pair of braces in `argument' are not recognized. -%%# -%%# (The order of the arguments has been chosen in order to simplify the -%%# use of \expandafter). -%%# -%%# There are some restrictions for the strings in search. For example, -%%# the symbol '#' is not allowed. -%%# -%%# In the above call, the arguments may not run over several paragraphs. -%%# If you want the latter, you have to use the alternative call -%%# -%%# \toolboxSplitAt*{argument}{search}{\beforestring}{\afterstring} -%%# -%%# Example of usage: -%%# -%%# \def\examplemacro#1{\toolboxSplitAt{#1}{@}\testme\testme -%%# \ifx\testme\undefined -%%# ... (do this when #1 contains no `@' token) -%%# \fi} -%%# - -%%# \toolboxMakeSplit{search}{command} -%%# -%%# If \toolboxSplitAt should be used several times with the same search -%%# string, it is much more effective to use the above call: This call -%%# defines a new macro \command (the name is determined by the second argument -%%# of \toolboxMakeSplit) which can be called in the form -%%# -%%# \command{argument}{\beforestring}{\afterstring} -%%# -%%# and which has the analogous meaning as \toolboxSplitAt (the argument -%%# {search} is implicitly fixed and taken from the call of -%%# \toolboxMakeSplit). -%%# It is explicitly admissible that the above macro \toolboxMakeSplit is -%%# used with an already existing command name. In this case, the previous -%%# definition of \command is tacitly overridden. -%%# -%%# The command created by \toolboxMakeSplit does not accept arguments which -%%# run over several paragraphs. If you want the latter, you have to create -%%# this command by the alternative call -%%# -%%# \toolboxMakeSplit*{search}{command} - -%%# -%%# The command -%%# \toolboxFreeSplit{command} -%%# frees the memory used by a previous \toolboxMakeSplit (and lets \command -%%# again be undefined). - -%%# The command -%%# \toolboxReplace{search}{replace}\macro -%%# replaces in \macro all occurences of {search} by {replace}. -%%# The same matches are found as in \toolboxSplitAt. -%%# If you need to search for the same text several times, it is faster -%%# to use the command -%%# \toolboxReplaceSplit{replace}\SplitCmd\macro -%%# where \SplitCmd is a command previously generated with \toolboxMakeSplit* -%%# according to your search string. (You could also use \toolboxMakeSplit -%%# to generate \SplitCmd, but then \macro should not contain any \par's). - -%%# -%%# Redefinition of macros -%%# ---------------------- - -%%# \toolboxMakeHarmless{\macro} -%%# -%%# The above call redefines \macro such that it expands to an ASCII text -%%# containing the previous definition of \macro (i.e. the catcodes of \macro -%%# are changed). - -%%# \toolboxDropBrace\variable -%%# -%%# drops possible outer braces in \variable. More precisely, -%%# if \variable expands to {content}, then \variable is redefined to -%%# content (without braces). Otherwise, nothing happens. - -%%# -%%# \toolboxIf\comparison{DefinitionCommand}{\macro}... -%%# -%%# The above command allows conditional definitions. -%%# Here, {DefinitionCommand} is either \def, {\long\def}, \let, or some -%%# similar command like the LaTeX \newcommand. If the test -%%# \ifx\comparison\macro evaluates positive, then \macro is defined -%%# correspondingly. Otherwise, \macro is not changed. -%%# -%%# Examples: -%%# -%%# \toolboxIf\undefined\def\macro{....} -%%# \toolboxIf\undefined\let\macro... -%%# \toolboxIf\undefined{\long\def}\macro{....} -%%# \toolboxIf\undefined\newcommand{\macro}{....} -%%# -%%# are similar to \def\macro{...} resp. \let\macro... resp. -%%# \long\def\macro{...} resp. \newcommand{\macro}{...} with the difference -%%# that \macro is not changed if it was already defined. -%%# In this sense, \toolboxIf is a more flexible variant of \providecommand. -%%# - -%%# \toolboxNewiftrue{name} or \toolboxNewiffalse{name} -%%# -%%# If the command \ifname was already introduced with \newif, then -%%# nothing happens. Otherwise \ifname is introduced similarly to -%%# \newif\ifname and set to `true' respectively `false'. -%%# In contrast to the corresponding command in TeX or LaTeX 2.09, this macro -%%# is not \outer! - -%%# \toolboxNewifTrue{name} or \toolboxNewifFalse{name} -%%# -%%# are similar to \toolboxNewiftrue{name} and \toolboxNewiffalse{name}, -%%# respectively, with the difference that \ifname is set unconditionally -%%# to `true' respectively `false'. - -%%# -%%# Concatenated macro names -%%# ------------------------ - -%%# \toolboxLet\variable{macroname} -%%# -%%# The above command is analogous to \let\variable\macroname with the -%%# difference that macroname can also contain other tokens like numbers -%%# (it is obtained via \csname). Some converse to this command is -%%# -%%# \toolboxWithNr {number}\cmd{macro} -%%# -%%# which translates into \cmd\macronumber (here, `macro' and `number' -%%# are just concatenated and evaluated via \csname). -%%# Examples: -%%# \toolboxWithNr 1\let{name}\toolboxEmpty -%%# This is the same as \let\name1\toolboxEmpty -%%# (but such that \name1 is considered as a name, not as \name 1) -%%# \toolboxWithNr {10}\def{name}{Foo} -%%# This corresponds analogously to \def\name10{Foo}. -%%# \toolboxLet \mymacro{name\the\mycount} -%%# This is similar to \let\mymacro\namexx where xx is the content -%%# of the counter \mycount. - -%%# -%%# Various -%%# ------- - -%%# The following macros have equivalents in most formats (like LaTeX2e). -%%# However, we do not want to rely too much on these formats, so we provide -%%# our own definitions. -%%# The macro -%%# \toolboxEmpty -%%# expands to nothing (usually, this is the same as \empty). -%%# Similarly, the macro -%%# \toolboxSpace -%%# expands to a space symbol (usually, this is the same as \space). -%%# The token -%%# \toolboxSpaceToken -%%# is \let a space token (usually, this is the same as \@sptoken). -%%# This token is convenient in tests of tokens -%%# (because it is hard to get a space there which is not eaten by the TeX -%%# parser, although sometimes also constructions like -%%# \expandafter\ifx\toolboxSpace\token can be used). -%%# Also the macros -%%# \toolboxFirstOfTwo -%%# \toolboxSecondOfTwo -%%# are provided which read two arguments and return only the first -%%# respectively second argument (usually, this is the same as -%%# \@firstoftwo respectively \@secondoftwo). Similarly, -%%# \toolboxGobbleArg{argument} -%%# just reads its argument and expands to nothing. - -\endinput -%% -%% End of file `toolbox.txt'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/initex.1 new/texmf-dist/doc/man/man1/initex.1 --- old/texmf-dist/doc/man/man1/initex.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/initex.1 2016-11-25 19:30:37.000000000 +0100 @@ -0,0 +1 @@ +.so man1/tex.1 Binary files old/texmf-dist/doc/man/man1/initex.man1.pdf and new/texmf-dist/doc/man/man1/initex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tex.1 new/texmf-dist/doc/man/man1/tex.1 --- old/texmf-dist/doc/man/man1/tex.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/tex.1 2017-05-03 19:35:31.000000000 +0200 @@ -0,0 +1,514 @@ +.TH TEX 1 "16 June 2015" "Web2C 2017" +.\"===================================================================== +.if n .ds MF Metafont +.if t .ds MF Metafont +.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 +.el .ds OX TeX +.\" 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 +.\" LX definition must follow TX so LX can use TX +.if t .ds LX \fRL\\h'-0.36m'\\v'-0.15v'\s-2A\s0\\h'-0.15m'\\v'0.15v'\fP\*(TX +.if n .ds LX LaTeX +.if n .ds WB Web +.if t .ds WB W\s-2EB\s0 +.\" EX and EE are used for displays that are pure code +.de EX +.nf +.ft CW +.. +.de EE +.ft R +.fi +.. +.\"===================================================================== +.SH NAME +tex, initex \- text formatting and typesetting +.SH SYNOPSIS +.B tex +.RI [ options ] +.RI [ \fB&\fPformat ] +.RI [ file | \fB\e\fPcommands ] +.\"===================================================================== +.SH DESCRIPTION +Run the \*(TX typesetter on +.IR file , +usually creating +.IR file.dvi . +If the file argument has no extension, ".tex" will be appended to it. +Instead of a filename, a set of \*(TX commands can be given, the first +of which must start with a backslash. +With a +.BI & format +argument \*(TX uses a different set of precompiled commands, +contained in +.IR format\fB.fmt\fP ; +it is usually better to use the +.B -fmt +.I format +option instead. +.PP +\*(TX +formats the interspersed text and commands contained in the named +files +and outputs a typesetter independent file (called +.IR DVI , +which is short for +.IR "DeVice Independent" ). +\*(TX's capabilities and language are described in +.IR "The \*(OXbook" . +\*(TX +is normally used with a large body of precompiled macros, +and there are several specific formatting systems, such as +\*(LX, +which require the support of several macro files. +.PP +This version of \*(TX looks at its command line to see what name it +was called under. If they exist, then both +.B initex +and +.B virtex +are symbolic links to the +.B tex +executable. When called as +.BR initex +(or when the +.B -ini +option is given) it can be used to precompile macros into a +.I .fmt +file. When called as +.B virtex +it will use the +.I plain +format. When called under any other name, \*(TX will use that name as +the name of the format to use. For example, when called as +.B tex +the +.I tex +format is used, which is identical to the +.I plain +format. The commands defined by the +.I plain +format are documented in +.IR "The \*(OXbook" . +Other formats that are often available include +.I latex +and +.IR amstex . +.PP +The non-option command line arguments to the +\*(TX +program are passed to it as the first input line. (But it is often +easier to type extended arguments as the first input line, since UNIX +shells tend to gobble up or misinterpret \*(TX's favorite symbols, +like backslashes, unless you quote them.) +As described in +.IR "The \*(OXbook" , +that first line should begin with a filename, a +.IR \econtrolsequence , +or a +.IR &formatname . +.PP +The normal usage is to say +.EX +tex paper +.EE +to start processing +.IR paper.tex . +The name +.I paper +will be the ``jobname'', and is used in forming +output filenames. +If \*(TX doesn't get a filename in the first line, the jobname is +.IR texput . +When looking for a file, \*(TX looks for the name with and without the +default extension +.RI ( .tex ) +appended, unless the name already contains that extension. If +.I paper +is the ``jobname'', +a log of error messages, with rather more detail than normally appears +on the screen, will appear in +.IR paper.log , +and the output file will be in +.IR paper.dvi . +.PP +This version of \*(TX can look in the first line of the file +.I paper.tex +to see if it begins with the magic sequence +.IR %& . +If the first line begins with +.BI %& format +.BI -translate-file \ tcxname +then \*(TX will use the named format and translation table +.I tcxname +to process the source file. Either the format name or the +.B -translate-file +specification may be omitted, but not both. This overrides the +format selection based on the name by which the program is invoked. +The +.B -parse-first-line +option or the +.B parse_first_line +configuration variable controls whether this behaviour is enabled. +.PP +The +.I e +response to \*(TX's error prompt causes the system default editor to +start up at the current line of the current file. The environment +variable TEXEDIT can be used to change the editor used. It may +contain a string with "%s" indicating where the filename goes and "%d" +indicating where the decimal line number (if any) goes. For example, +a TEXEDIT string for +.B emacs +can be set with the +.B sh +command +.EX +\fITEXEDIT="emacs +%d %s"; export TEXEDIT\fP +.EE +.PP +A convenient file in the library is +.IR null.tex , +containing nothing. +When \*(TX can't find a file it thinks you want to input, it keeps +asking you for another filename; responding `null' gets you out +of the loop if you don't want to input anything. You can also type your +EOF character (usually control-D). +.PP +.\"===================================================================== +.SH OPTIONS +This version of \*(TX understands the following command line options. +.TP +.B -enc +Enable the enc\*(TX extensions. This option is only effective in +combination with +.BR -ini . +For documentation of the enc\*(TX extensions see +.BR http://www.olsak.net/enctex.html . +.TP +.B -file-line-error +Print error messages in the form +.I file:line:error +which is similar to the way many compilers format them. +.TP +.B -no-file-line-error +Disable printing error messages in the +.I file:line:error +style. +.TP +.B -file-line-error-style +This is the old name of the +.B -file-line-error +option. +.TP +.BI -fmt \ format +Use +.I format +as the name of the format to be used, instead of the name by which +\*(TX was called or a +.I %& +line. +.TP +.B -halt-on-error +Exit with an error code when an error is encountered during processing. +.TP +.B -help +Print help message and exit. +.TP +.B -ini +Start in +.I INI +mode, which is used to dump formats. The +.I INI +mode can be used for typesetting, but no format is preloaded, and +basic initializations like setting catcodes may be required. +.TP +.BI -interaction \ mode +Sets the interaction mode. The mode can be either +.IR batchmode , +.IR nonstopmode , +.IR scrollmode , +and +.IR errorstopmode . +The meaning of these modes is the same as that of the corresponding +\ecommands. +.TP +.B -ipc +Send DVI output to a socket as well as the usual output file. Whether +this option is available is the choice of the installer. +.TP +.B -ipc-start +As +.BR -ipc , +and starts the server at the other end as well. Whether this option +is available is the choice of the installer. +.TP +.BI -jobname \ name +Use +.I name +for the job name, instead of deriving it from the name of the input file. +.TP +.BI -kpathsea-debug \ bitmask +Sets path searching debugging flags according to the bitmask. See the +.I Kpathsea +manual for details. +.TP +.BI -mktex \ fmt +Enable +.RI mktex fmt , +where +.I fmt +must be either +.I tex +or +.IR tfm . +.TP +.B -mltex +Enable ML\*(TX extensions. Only effective in combination with +.BR -ini . +.TP +.BI -no-mktex \ fmt +Disable +.RI mktex fmt , +where +.I fmt +must be either +.I tex +or +.IR tfm . +.TP +.BI -output-comment \ string +Use +.I string +for the +.I DVI +file comment instead of the date. +.TP +.BI -output-directory \ directory +Write output files in +.I directory +instead of the current directory. Look up input files in +.I directory +first, then along the normal search path. See also description of the +TEXMFOUTPUT environment variable. +.TP +.B -parse-first-line +If the first line of the main input file begins with +.I %& +parse it to look for a dump name or a +.B -translate-file +option. +.TP +.B -no-parse-first-line +Disable parsing of the first line of the main input file. +.TP +.BI -progname \ name +Pretend to be program +.IR name . +This affects both the format used and the search paths. +.TP +.B -recorder +Enable the filename recorder. This leaves a trace of the files opened +for input and output in a file with extension +.IR .fls . +.TP +.B -shell-escape +Enable the +.BI \ewrite18{ command } +construct. The +.I command +can be any shell command. This construct is normally +disallowed for security reasons. +.TP +.B -no-shell-escape +Disable the +.BI \ewrite18{ command } +construct, even if it is enabled in the +.I texmf.cnf +file. +.TP +.B -src-specials +Insert source specials into the +.I DVI +file. +.TP +.BI -src-specials \ where +Insert source specials in certain places of the +.I DVI +file. +.I where +is a comma-separated value list: +.IR cr , +.IR display , +.IR hbox , +.IR math , +.IR par , +.IR parent , +or +.IR vbox . +.TP +.BI -translate-file \ tcxname +Use the +.I tcxname +translation table to set the mapping of input characters and +re-mapping of output characters. +.TP +.BI -default-translate-file \ tcxname +Like +.B -translate-file +except that a +.I %& +line can overrule this setting. +.TP +.B -version +Print version information and exit. +.\"===================================================================== +.SH ENVIRONMENT +See the Kpathsearch library documentation (the `Path specifications' +node) for precise details of how the environment variables are used. +The +.B kpsewhich +utility can be used to query the values of the variables. +.PP +One caveat: In most \*(TX formats, you cannot use ~ in a filename you +give directly to \*(TX, because ~ is an active character, and hence is +expanded, not taken as part of the filename. Other programs, such as +\*(MF, do not have this problem. +.PP +.TP +.B TEXMFOUTPUT +Normally, \*(TX puts its output files in the current directory. If +any output file cannot be opened there, it tries to open it in the +directory specified in the environment variable TEXMFOUTPUT. +There is no default value for that variable. For example, if you say +.I tex paper +and the current directory is not writable, if TEXMFOUTPUT has +the value +.IR /tmp , +\*(TX attempts to create +.I /tmp/paper.log +(and +.IR /tmp/paper.dvi , +if any output is produced.) TEXMFOUTPUT is also checked for input +files, as \*(TX often generates files that need to be subsequently +read; for input, no suffixes (such as ``.tex'') are added by default, +the input name is simply checked as given. +.TP +.B TEXINPUTS +Search path for +.I \einput +and +.I \eopenin +files. +This probably start with ``.'', so +that user files are found before system files. An empty path +component will be replaced with the paths defined in the +.I texmf.cnf +file. For example, set TEXINPUTS to ".:/home/user/tex:" to prepend the +current directory and ``/home/user/tex'' to the standard search path. +.TP +.B TEXFORMATS +Search path for format files. +.TP +.B TEXPOOL +search path for +.B tex +internal strings. +.TP +.B TEXEDIT +Command template for switching to editor. The default, usually +.BR vi , +is set when \*(TX is compiled. +.TP +.B TFMFONTS +Search path for font metric +.RI ( .tfm ) +files. +.\"===================================================================== +.SH FILES +The location of the files mentioned below varies from system to +system. Use the +.B kpsewhich +utility to find their locations. +.TP +.I texmf.cnf +Configuration file. This contains definitions of search paths as well +as other configuration parameters like +.BR parse_first_line . +.TP +.I tex.pool +Text file containing \*(TX's internal strings. +.TP +.I texfonts.map +Filename mapping definitions. +.TP +.I *.tfm +Metric files for \*(TX's fonts. +.TP +.I *.fmt +Predigested \*(TX format (.\|fmt) files. +.TP +.I $TEXMFMAIN/tex/plain/base/plain.tex +The basic macro package described in the \*(OXbook. +.br +.\"===================================================================== +.SH NOTES +This manual page is not meant to be exhaustive. The complete +documentation for this version of \*(TX can be found in the info manual +.IR "Web2C: A TeX implementation" . +.\"===================================================================== +.SH BUGS +This version of \*(TX implements a number of optional extensions. +In fact, many of these extensions conflict to a greater or lesser +extent with the definition of \*(TX. When such extensions are +enabled, the banner printed when \*(TX starts is changed to print +.B TeXk +instead of +.BR TeX . +.PP +This version of \*(TX fails to trap arithmetic overflow when +dimensions are added or subtracted. Cases where this occurs are rare, +but when it does the generated +.I DVI +file will be invalid. +.\"===================================================================== +.SH "SEE ALSO" +.BR mf (1), +.br +Donald E. Knuth, +.IR "The \*(OXbook" , +Addison-Wesley, 1986, ISBN 0-201-13447-0. +.br +Leslie Lamport, +.IR "\*(LX \- A Document Preparation System" , +Addison-Wesley, 1985, ISBN 0-201-15790-X. +.br +K. Berry, +.IR "Eplain: Expanded plain \*(TX" , +ftp://ftp.cs.umb.edu/pub/tex/eplain/doc. +.br +Michael Spivak, +.IR "The Joy of \*(OX" , +2nd edition, Addison-Wesley, 1990, ISBN 0-8218-2997-1. +.br +.I TUGboat +(the journal of the \*(TX Users Group). +.\"===================================================================== +.SH TRIVIA +\*(TX, pronounced properly, rhymes with ``blecchhh.'' The proper +spelling in typewriter-like fonts is ``TeX'' and not ``TEX'' or ``tex.'' +.\"===================================================================== +.SH AUTHORS +\*(TX was created by Donald E. Knuth, +who implemented it using his \*(WB system for Pascal programs. +It was ported to Unix at Stanford by Howard Trickey, and +at Cornell by Pavel Curtis. +The version now offered with the Unix \*(TX distribution is that +generated by the \*(WB to C system +.RB ( web2c ), +originally written by Tomas Rokicki and Tim Morgan. +.PP +The enc\*(TX extensions were written by Petr Olsak. Binary files old/texmf-dist/doc/man/man1/tex.man1.pdf and new/texmf-dist/doc/man/man1/tex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex.doc.tlpobj new/tlpkg/tlpobj/tex.doc.tlpobj --- old/tlpkg/tlpobj/tex.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/tex.doc.tlpobj 2017-05-04 02:07:14.000000000 +0200 @@ -0,0 +1,9 @@ +name tex.doc +category TLCore +revision 44166 +shortdesc doc files of tex +docfiles size=15 + texmf-dist/doc/man/man1/initex.1 + texmf-dist/doc/man/man1/initex.man1.pdf + texmf-dist/doc/man/man1/tex.1 + texmf-dist/doc/man/man1/tex.man1.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toolbox.doc.tlpobj new/tlpkg/tlpobj/toolbox.doc.tlpobj --- old/tlpkg/tlpobj/toolbox.doc.tlpobj 2016-04-14 19:53:29.000000000 +0200 +++ new/tlpkg/tlpobj/toolbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name toolbox.doc -category Package -revision 32260 -shortdesc doc files of toolbox -relocated 1 -docfiles size=49 - RELOC/doc/latex/toolbox/README - RELOC/doc/latex/toolbox/toolbox.pdf - RELOC/doc/latex/toolbox/toolbox.tex - RELOC/doc/latex/toolbox/toolbox.txt ++++++ tex4ht_env.dif ++++++ --- texmf-dist/tex4ht/base/unix/tex4ht.env | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- texmf-dist/tex4ht/base/unix/tex4ht.env +++ texmf-dist/tex4ht/base/unix/tex4ht.env 2010-01-28 09:42:44.000000000 +0000 @@ -226,7 +226,7 @@ S* % <javahelp> .html mv %%1.html %%1.tmp -.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp +.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp .jhm echo "java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html" .jhm echo "--- Warning --- Beware of leftover %%1*.html files from other compilations" .jhm java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html @@ -237,42 +237,42 @@ S* <emspk> .html mv %%1.html %%1.tmp -.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp +.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.html %%1.tmp </emspk> <jsml> .jsml mv %%1.jsml %%1.tmp -.jsml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp +.jsml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp </jsml> <docbk> .xml cp %%1.xml %%1.tmp -.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp +.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.xml %%1.tmp </docbk> <xhtml> .html mv %%1.html %%1.tmp -.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp +.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp .xht mv %%1.xht %%1.tmp -.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp +.xht java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp .xml mv %%1.xml %%1.tmp -.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp +.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp </xhtml> <xhtmml> .html mv %%1.html %%1.tmp -.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp +.html java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp .xht mv %%1.xht %%1.tmp -.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp +.xht java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp .xml mv %%1.xml %%1.tmp -.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp +.xml java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp </xhtmml> <ooxtpipes> .4oo mv %%0.4oo %%0.tmp -.4oo java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp +.4oo java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp .4om mv %%1.4om %%1.tmp -.4om java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp +.4om java -classpath /usr/share/texmf/tex4ht/bin/tex4ht.jar xtpipes -i /usr/share/texmf/tex4ht/xtpipes/ -o %%1.4om %%1.tmp </ooxtpipes> % <validatehtml> ++++++ texconfig_scripts.dif ++++++ --- texmf-dist/scripts/texlive/texconfig.sh | 35 +------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) --- texmf-dist/scripts/texlive/texconfig.sh +++ texmf-dist/scripts/texlive/texconfig.sh 2009-09-02 12:47:26.000000000 +0000 @@ -40,7 +40,7 @@ envVars=" TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS " -tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$ +tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM needsCleanup=false lastUpdatedFile= @@ -975,21 +975,6 @@ For more information about these \`featu ;; formats) - cat >&2 <<EOM -texconfig formats is no longer supported, because manual edits of -fmtutil.cnf will be overwritten by the new TeX Live package manager, -tlmgr, which regenerates that file as needed upon package changes. -Thus, to add or remove formats, the recommended method is to use tlmgr -to add or remove the appropriate package. - -If you need to make manual additions, you can edit the file -fmtutil-local.cnf under TEXMFLOCAL. Further information with -tlmgr --help and at http://tug.org/texlive/tlmgr.html. - -Exiting. -EOM - exit 1 # but leave the real code for posterity - setupTmpDir echo "$progname: analyzing old configuration..." >&2 fmtutil --catcfg > $tmpdir/pre @@ -1015,22 +1000,6 @@ EOM # "hyphen FORMAT" hyphen) - cat >&2 <<EOM -texconfig hyphen is no longer supported, because manual edits of -language.dat (or language.def) will be overwritten by the new TeX Live -package manager, tlmgr, which regenerates those configuration files as -needed upon package changes. Thus, to add or remove hyphenation -patterns, the recommended method is to use tlmgr to add or remove the -appropriate package. - -If you need to make manual additions, you can edit the files -language-local.dat and language-local.def under TEXMFLOCAL. Further -information with tlmgr --help and at http://tug.org/texlive/tlmgr.html. - -Exiting. -EOM - exit 1 # but leave the real code for posterity - tcBatchHyphenFormat=$2 formatsForHyphen=`getFormatsForHyphen` formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'` @@ -1276,7 +1245,7 @@ Valid PAPER settings: ;; rehash) - mktexlsr + ( unset KPSE_DOT; mktexlsr ) ;; # ++++++ toolbox.doc.tar.xz -> texdef.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/README new/doc/latex/toolbox/README --- old/doc/latex/toolbox/README 2013-11-27 23:24:54.000000000 +0100 +++ new/doc/latex/toolbox/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -The TeX programmer's toolbox; enhanced version. -This (La)TeX package provides some macros which are convenient for -writing indices, glossaries, or other macros. -It contains macros which support - - - implicit macros - a useful supplement to \index or varindex for - writing glossaries or indices - - fancy optional arguments - - loops over tokenlists and itemlists - - searching, splitting, and replacing - - controlled expansion - - redefinition of macros - - concatenated macro names - -Author: M. V\"ath martin(a)mvath.de - -The package may be distributed and/or modified under the conditions of -the LaTeX Project Public License (version 1.3c or later). Binary files old/doc/latex/toolbox/toolbox.pdf and new/doc/latex/toolbox/toolbox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.tex new/doc/latex/toolbox/toolbox.tex --- old/doc/latex/toolbox/toolbox.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/toolbox/toolbox.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -\documentclass{ltxdoc} -\OnlyDescription%% Comment this out, or -%%\AlsoImplementation%% uncomment this line, if you want to see the source. - -%% If you want an index, uncomment one of the following lines. -%% After running latex a first time, you have to use -%% makeindex -s gind.ist toolbox -%% Then run latex again. -%%\CodelineIndex% comment this out if you want an index referring to codelines -%%\PageIndex% comment this out if you want an index referring to pages -%%\OldMakeindex% uncomment this line, if your MakeIndex is pre-v2.9 - -\setlength\hfuzz{15pt} -\hbadness=7000 -\begin{document} -\DocInput{toolbox.dtx} -\end{document} -\endinput -%% -%% End of file `toolbox.tex'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/toolbox/toolbox.txt new/doc/latex/toolbox/toolbox.txt --- old/doc/latex/toolbox/toolbox.txt 2013-11-27 23:24:54.000000000 +0100 +++ new/doc/latex/toolbox/toolbox.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,790 +0,0 @@ - -%%# -%%# Author: -%%# -%%# M. V\"ath martin(a)mvath.de -%%# -%%# The author thanks -%%# David Kastrup <David.Kastrup(a)neuroinformatik.ruhr-uni-bochum.de> -%%# - -%%# The package may be distributed and/or modified under the conditions of -%%# the LaTeX Project Public License (version 1.3c or later). - -%%############################################################################# -%%# -%%# The TeX programmer's toolbox; enhanced version. -%%# This (La)TeX package provides some macros which are convenient for -%%# writing indices, glossaries, or other macros. -%%# It contains macros which support -%%# -%%# - implicit macros - a useful supplement to \index or varindex for -%%# writing glossaries or indices -%%# - fancy optional arguments -%%# - loops over tokenlists and itemlists -%%# - searching, splitting, and replacing -%%# - controlled expansion -%%# - redefinition of macros -%%# - concatenated macro names -%%# -%%############################################################################# - -%%# -%%# This package was tested with plain TeX, LaTeX 2.09, and LaTeX 2e, -%%# and it should actually run with all TeX formats. -%%# - - -%%# To use toolbox, you have to put `toolbox.sty' in a path where TeX looks -%%# for its input files. The TeX documents using toolbox need the -%%# following modifications in their header: -%%# -%%# a) If you use LaTeX2.09, use toolbox as a style option, e.g. -%%# \documentstyle[toolbox]{article} -%%# or -%%# \documentstyle[toolbox,12pt]{article} -%%# b) If you use LaTeX2e, put in the preamble the command -%%# \usepackage{toolbox} -%%# c) If you use some other (non-LaTeX) format, you will probably have to -%%# insert a line like -%%# \catcode`\@=11\input toolbox.sty\catcode`\@=12\relax -%%# -%%# The only LaTeX-specific commands used in `toolbox.sty' are: -%%# -%%# \newcommand (only in the form \newcommand{\command}{} to ensure that -%%# \command was not defined before) -%%# \ProvidesPackage -%%# \typeout -%%# -%%# The above commands are used only if they are defined. -%%# - -%%# -%%# Description of the provided macros: -%%# - -%%# General remark: Many macros could appear in several sections. -%%# For example, \toolboxMakeDef and \toolboxSourround might be considered -%%# as macros which support redefinitions of macros. However, we put them -%%# in different sections which perhaps explain better their nature. - -%%# -%%# Implicit macro definitions -%%# -------------------------- - -%%# What we mean by implicit macro definitions is probably best explained by -%%# the following examples which show the intended usage: -%%# -%%# (In the following examples, we always refer to the \index command. Note -%%# that it may be more convenient to use for indices the varindex package in -%%# addition - the documentation of varindex (release 2.3 or newer) gives -%%# additional hints and examples how these two (essentially independent) -%%# approaches can be combined in practice). -%%# -%%# Assume that you want to write an index for a book which has rather -%%# long and complicated \index entries. The first idea that one might have in -%%# this connection is to put the various \index commands at the beginning of -%%# the document into several macros (one for each \index entry), and to use -%%# just these macros in the main text. For example, one might want to write -%%# near the beginning of the document commands like -%%# \newcommand{\Start}{\index{finish or end}} -%%# \newcommand{\End}{\index{finish or end}} -%%# and then to use in the main text \Start and \End whenever a reference -%%# in the corresponding index to the current place is desired. -%%# However, this has two major disadvantages: -%%# 1. Unless you are very disciplinary with your macro names, it is easy to -%%# forget that \End writes an index entry. So the \End in the main text -%%# might be very confusing. -%%# 2. You cannot choose short and intuitive macro names for common phrases, -%%# because they are usually already reserved by TeX, LaTeX, or some -%%# packages. -%%# -%%# To avoid these problems, one may be very disciplinary and call the -%%# involved macros systematically e.g. \GlossaryStart \GlossaryEnd etc. -%%# However, this produces terrible long and unreadable macro names in the -%%# main text. -%%# -%%# The implicit macro definitions of "toolbox" provide a more convenient -%%# solution. The idea is that you do not use the corresponding macros directly -%%# but only implicitly by a call of other macros where your "macro name" is -%%# just an argument. -%%# Moreover, "toolbox" assists you in writing the corresponding definitions. -%%# For example, if you know that you want a set of macros which all expand -%%# into something of the form \index{...}, you can give a ``mask'' which -%%# contains this form, and you only have to fill in the changing content -%%# (similarly as for usual TeX macros with arguments, but the level of -%%# abstraction is one step higher). -%%# For the above task, you might use the command: -%%# -%%# \toolboxMakeDef{Glossary}{\index{#1}} -%%# -%%# The argument `Glossary' serves to distinguish independent definitions -%%# (this will become clear later). Its effect visible now is that it -%%# determines the name of the following macros which you can use after -%%# the above call: -%%# -%%# \NewGlossary{start-1}{start} -%%# \NewGlossary{start-2}{start or beginning} -%%# \NewGlossary{end}{finish or end} -%%# -%%# These command are now similar to the \newcommand definitions explained -%%# above. However, there is no name collision with the TeX-internal command -%%# \end. Of course, this means that you cannot just write \end in the main -%%# text to get the desired index entry. Instead, you have to write the more -%%# intuitive commands -%%# -%%# \Glossary{start-1} -%%# \Glossary{start-2} -%%# \Glossary{end} -%%# -%%# (again, the name \Glossary stems from our first call of \toolboxMakeDef). -%%# Note that e.g. \Glossary{start-1} expands not only to `start' but -%%# actually to \index{start} (because of our first call of \toolboxMakeDef). -%%# Note also that you can use symbols like - or numbers which are usually -%%# not allowed in TeX macro names. -%%# -%%# Of course, similarly as for \newcommand, you can also do other things with -%%# the macros. For example, -%%# -%%# \LetGlossary\tempname{end} -%%# \NewGlossary*{finish}\tempname -%%# -%%# will first define \tempname to expand to the same text as \Glossary{end}, -%%# and then defines a new entry \Glossary{finish} to expand to the same text -%%# as \tempname. Hence, the above new lines make the calls \Glossary{end} and -%%# \Glossary{finish} equivalent. -%%# -%%# At the end of your list of \NewGlossary commands, you might want to put -%%# -%%# \toolboxFreeDef*{Glossary} -%%# -%%# The purpose of this command is that \NewGlossary cannot be used anymore -%%# (unless, of course, you define it again). So you cannot unintentionally -%%# add new entries to your glossary list (but you still can use \Glossary{...} -%%# to reference to the already produced entries). -%%# Moreover, the above command frees some memory which was needed for -%%# \NewGlossary to work. -%%# -%%# If you additionally want to free the memory used by \Glossary, you can use -%%# -%%# \toolboxFreeDef{Glossary} -%%# -%%# (without the `*'). This may be necessary, if you want to call again e.g. -%%# -%%# \toolboxMakeDef{Glossary}{\emph{#1}\index{#1}} -%%# -%%# (if you have not freed the memory for \Glossary before this repeated call, -%%# TeX will complain that \Glossary is already defined). -%%# -%%# Of course, it is possible to call \toolboxMakeDef with several different -%%# names, for example, for \Glossary, \SymbolList etc. Another application -%%# might be to use a different command to mark e.g.\ the main occurrence of -%%# some index entry or to output additionally the entry into the running text. -%%# We do this in the following example which simultaneously -%%# demonstrates that the names can also be constructed in another way: -%%# -%%# \toolboxMakeDef[Ind]{}{\index{#1}} -%%# \toolboxMakeDef[Ind]{Main}{\index{#1|textbf}} -%%# \toolboxMakeDef{OutInd}{#1} -%%# -%%# \IndNew{A}{A is a letter} -%%# \IndNewMain{A}{A is a letter} -%%# \NewOutInd{A}{\textbf{The letter A}\Ind{A}} -%%# -%%# After the above commands, you can use \Ind{A}, \IndMain{A}, and -%%# \OutInd{A} to produce the corresponding \index entry, the "main" \index -%%# entry (with a boldface page number), and the text \textbf{The letter A} -%%# with an additional entry into the index, respectively. -%%# Of course, it might usually be more convenient to define the \Ind and -%%# \IndMain" entries simultaneously, e.g. as follows -%%# -%%# \toolboxMakeDef[Ind]{}{#1} -%%# \toolboxMakeDef[Ind]{Main}{#1} -%%# \newcommand{\NewStandardInd}[2]{% -%%# \IndNew{#1}{\index{#2}}% -%%# \IndNewMain{#1}{\index{#2|textbf}}} -%%# -%%# \NewStandardInd{A}{A is a letter} -%%# -%%# This approach has the additional advantage that you can define exceptional -%%# cases "by hand" (e.g. if you want that for certain "main" index -%%# entries the page number is printed with "\textsl" instead of "\textbf"). - -%%# Since the motivation for implicit definitions now is hopefully clear, -%%# let us now describe in detail which commands are provided by "toolbox" -%%# for this purpose. -%%# As explained in the example, the main generic macro provided to this -%%# purpose is \toolboxMakeDef. Its call syntax is as follows: -%%# -%%# \toolboxMakeDef[Prefix]{Name}{ReplacementMask} -%%# -%%# (the argument [Prefix] is optional and by default empty). -%%# The above command generates new macros -%%# -%%# \PrefixNewName -%%# \PrefixRenewName -%%# \PrefixProvideName -%%# \PrefixDefName -%%# \PrefixLetName -%%# \PrefixName -%%# -%%# which in turn can be called as follows -%%# -%%# \PrefixNewName{something}{RememberText} -%%# \PrefixRenewName{something}{RememberText} -%%# \PrefixProvideName{something}{RememberText} -%%# \PrefixDefName{something}{RememberText} -%%# \PrefixNewName*{something}{\SomeMacro} -%%# \PrefixRenewName*{something}{\SomeMacro} -%%# \PrefixProvideName*{something}{\SomeMacro} -%%# \PrefixDefName*{something}{\SomeMacro} -%%# \PrefixLetName{\SomeMacro}{something} -%%# \PrefixName{something} -%%# \PrefixName*{something} -%%# -%%# These calls are in a sense similar to the respective commands -%%# -%%# \newcommand{\something}{RememberText} -%%# \renewcommand{\something}{RememberText} -%%# \providecommand{\something}{RememberText} -%%# \def\something{RememberText} -%%# \newcommand{\something}{}\let\something\SomeMacro -%%# \renewcommand{\something}{}\let\something\SomeMacro -%%# \@ifundefined\something{\let\something\SomeMacro}{} -%%# \let\something\SomeMacro -%%# \let\SomeMacro{\something} -%%# \something -%%# \something (but without error if \something is undefined). -%%# -%%# with the differences already pointed out before: -%%# 1. The macro name actually used is not \something. Instead, it is a name -%%# which does not conflict with any existing macro (except one -%%# generated previously by another \PrefixNewName, but in this case a -%%# descriptive error is reported). For this reason, it is not possible to -%%# use this macro directly but only indirectly by the call -%%# \PrefixName{something} (or with \PrefixLetName). -%%# 2. The replacement text is not `RememberText' but determined by -%%# ReplacementMask where every occurrence of #1 in ReplacementMask is -%%# replaced by RememberText (recall the examples). If you want to have the -%%# plain RememberText, use {#1} as ReplacementMask. -%%# -%%# Since toolbox 4.2 there is another slight difference: The symbol '#' -%%# is treated as usual and not as in a macro definition. -%%# -%%# \toolboxMakeDef gives an error message if the commands -%%# \Prefix... are already defined. If you intentionally want to -%%# change a previous definition, you have to call the command -%%# -%%# \toolboxFreeDef[Prefix]{Name} -%%# -%%# before. The latter not only lets all of the macros \Prefix... be -%%# \undefined, but also frees all other memory internally used by the -%%# corresponding call of \toolboxMakeDef -%%# (note, however, that the above command does not free the -%%# memory allocated before by calls of \PrefixNew... - to free the latter, -%%# you have to call subsequently e.g. -%%# -%%# \PrefixNewName*{...}{\undefined} -%%# -%%% before). There is also the command -%%# -%%# \toolboxFreeDef*[Prefix]{Name} -%%# -%%# which acts similarly as \toolboxFreeDef but which does not undefine the -%%# two macros \PrefixName and \PrefixLetName. -%%# - -%%# -%%# Fancy optional argument parsing -%%# ------------------------------- - -%%# This section contains macros which are convenient if you e.g. write a -%%# package that contains macros which contain a lot of optional arguments -%%# and flags (like "*"). -%%# Typically, to read such an optional argument or flag, you save -%%# the next token with \futurelet and then call a macro which decides what to -%%# do with the token read. Thus, a typical use of \futurelet looks like -%%# -%%# \def\MacroWithOptionalFlag{\futurelet\tokread\myscan} -%%# -%%# which will define \tokread to be the token *following* the macro -%%# \MacroWithOptionalFlag in the token stream and then execute \myscan. -%%# In this context, it is not very convenient that you are *forced* -%%# to define a macro \myscan: It could be more convenient if you could just -%%# write the *content* of \tokread (in braces) into the above definition. -%%# You can indeed do this if you replace \futurelet by \toolboxFuturelet: -%%# -%%# \toolboxFuturelet\token{argument} -%%# -%%# The call \toolboxFuturelet\token{\command} has precisely the same effect as -%%# \futurelet\token\command. The advantage of \toolboxFuturelet is that -%%# instead of a single \command one may use also a sequence of commands. - -%%# Let us consider \MacroWithOptionalFlag as above. Assume that the user -%%# has called this macro in the form "\MacroWithOptionalFlag*" where the -%%# "*" is a flag which should cause your macro to do something slightly -%%# different. On some place in your macro definition you will have recognized -%%# (e.g. with \futurelet or \toolboxFuturelet) that a "*" is following -%%# in the calling sequence. So you now want to execute your action -%%# (whatever \MacroWithOptionalFlag is supposed to do). -%%# However, if you do not take special care, after this action, TeX will -%%# print a "*", because this is the next token on the token stream: \futurelet -%%# does not delete any tokens. So you have to "gobble" this token away. -%%# A rude way to do this is by using the macro \gobblenext as the last token -%%# in you macro which can be defined by -%%# \begin{verbatim} -%%# \def\gobblenext#1{}\end{verbatim} -%%# However, this has two major drawbacks: -%%# -%%# 1. This works for "*", but not for "{" or space tokens. -%%# For space tokens the situation is even worse, since TeX eats spaces -%%# around arguments, so sometimes space tokens might unexpectedly -%%# disappear. -%%# 2. It is not possible in this way to read another argument following -%%# the "*": Recall that \gobblenext must be the *last* token in your -%%# macro expansion, i.e. you have "lost control" after this call. -%%# -%%# The solution to these problems is instead of calling \gobblenext to use -%%# \toolboxGobbleNext as the last command in your call: -%%# You can pass it an argument which describes the action that -%%# you want to do *after* gobbling the next token ("*" in the above example) -%%# from the token stream. Thus -%%# -%%# \toolboxGobbleNext{cmd} -%%# -%%# erases the token following that command from the token stream and -%%# then executes cmd. This is similar to -%%# \def\toolboxGobbleNext#1#2{#1} -%%# with the difference that #2 is considered as a token and that no spaces -%%# are eaten. -%%# The effect is that e.g. the call -%%# -%%# Example: -%%# \toolboxGobbleNext{\foo}{{arg} -%%# is the same as \foo{arg} (the brace "{" is eaten in this example). - -%%# As described earlier, the commands "\futurelet" or "\toolboxFuturelet" can -%%# be used to check for optional flags. Frequently you will only want -%%# to test for one particular flag and decide the next action on this flag. -%%# Of course, you can test the token found with \ifx...\f", but this has the -%%# disadvantage that some tokens (e.g. \fi) follow your action, which might -%%# be bad (recall that e.g. \toolboxGobbleNext must be the last command of -%%# your action, i.e. it would in the above examples not gobble the "*" but -%%# the "\fi" which is probably not what you want). -%%# The simplest solution is to use the command \toolboxIfNextToken which -%%# already has the test included. For example, to test for an optional "[", -%%# you can simply write -%%# -%%# \def\MacroWithOptionalBrace{\toolboxIfNextToken[{\yes}{\no}} -%%# -%%# and then the call "\MacroWithOptionalBrace[...]" will expand to "\yes[...]" -%%# while "\MacroWithOptionalBrace x" will expand to "\no x" -%%# (note that the brace is not gobbled - if you want the latter, -%%# use "\toolboxIfNextGobbling" described below). - -%%# More precisely, the calling syntax of "\toolboxIfNextToken" is -%%# -%%# \toolboxIfNextToken{token}{IfPart}{ElsePart} -%%# -%%# The semantic is the following: -%%# If the token following this command is `token', then IfPart is executed, -%%# otherwise ElsePart. It is explicitly admissible that `token' is a space. -%%# To support further tests, \toolboxToken is \let to the token which follows -%%# the command. \toolboxToken is only a temporary token, i.e. -%%# it may also be modified by other commands of this package; in particular, -%%# you may also freely to modify \toolboxToken. -%%# The token \toolboxSpaceToken which is described later may be handy -%%# in connection with this command. -%%# -%%# In contrast to similar LaTeX2e macros much care has been taken -%%# that spaces are not eaten. This solves the following problem: -%%# -%%# Assume that you want to write a macro which should have the calling syntax -%%# "\mymacro{arg1}" or "\mymacro{arg1}[arg2]". You will probably implement -%%# \mymacro to read the first argument and then to look whether the next -%%# token is a "[". If you use the LaTeX2e macro to test for "[", -%%# then all spaces until the next non-space token would be gobbled which means -%%# that if you would use the LaTeX2e macros for the test, then the call -%%# "\mymacro{arg1} Text" would behave like "\mymacro{arg1}Text", -%%# i.e. the space is `mysteriously' lost. With the "toolbox" macros this -%%# does not happen. The `disadvantage' is that "\mymacro{arg1} [arg2]" -%%# is not the same as "\mymacro{arg1}[arg2]" (which is reasonable IMHO). -%%# -%%# Example: -%%# -%%# \def\mycmd#1{\toolboxIfNextToken[{\ParseOpt{#1}}{\NoOpt{#1}}} -%%# \def\ParseOpt#1[#2]{\OptAtEnd{#1}{#2}} -%%# -%%# After the above definition, \mycmd{arg} executes \NoOpt{arg} while -%%# \mycmd{arg}[optional] executes \OptAtEnd{arg}{optional} -%%# We point out once more that in the first call a space following -%%# \mycmd{arg} does not vanish (as would be the case if the LaTeX 2e macros -%%# would have been used). - -%%# If \toolboxIfNextToken has found the required token, it does *not* -%%# gobble that token from the token stream. Of course, you can do this by -%%# yourself using the earlier described macro \toolboxGobbleNext. However, -%%# it is simpler to use -%%# -%%# \toolboxIfNextGobbling{token}{IfPart}{ElsePart} -%%# -%%# This command is analogous to \toolboxIfNextToken with the difference that -%%# in the case that the next token is the desired token, it is gobbled before -%%# IfPart is executed. -%%# -%%# Example: -%%# -%%# \def\myloop{\toolboxIfNextGobbling*\toolboxTokenLoop\toolboxLoop} -%%# -%%# This makes \myloop*... behave like \toolboxTokenLoop, and -%%# \myloop... (without *) behave like \toolboxLoop. - -%%# The following macro is one which you may want to use in connection with -%%# LaTeX 2e optional arguments: -%%# -%%# \toolboxIfEmpty{arg}{IfPart}{ElsePart} -%%# -%%# The argument is not expand; it is only used to decide whether the -%%# {IfPart} or the {ElsePart} will be expanded. -%%# For further tests there are more involved macros: -%%# -%%# \toolboxIfx{arg}\macro{IfPart}{ElsePart} -%%# -%%# This tests via \ifx whether \def\Macro{arg} would give the definition -%%# of \macro. -%%# -%%# \toolboxIfX{arga}{argb}{IfPart}{ElsePart} -%%# -%%# This tests whether "arga" and "argb" are the same token sequences. -%%# If you want to avoid the \else and \fi commands to avoid certain side -%%# effects, you can use instead: -%%# -%%# \toolboxIfElse{ifcmd}{IfPart}{ElsePart} -%%# -%%# This is rather analogous to "ifcmd" IfPart \else ElsePart \fi -%%# but has everything in this line already eliminated from the tokenlist -%%# when IfPart resp. ElsePart are expanded. - -%%# -%%# Loops over tokenlists and itemlists -%%# ----------------------------------- - -%%# \toolboxLoop{items}{action} -%%# -%%# This calls iteratively "action{#1}", where #1 runs over each item in the -%%# argument items. Here, an item is either a token or a group braced by {...}. -%%# In the latter case, the braces are lost. Spaces in items are ignored -%%# (unless they are braced). It is admissible that \action is not a single -%%# macro but instead a sequence of tokens. -%%# Examples follow below. -%%# -%%# The counterintuitive order of arguments is explained by the fact that the -%%# typical usage is -%%# \expandafter\toolboxLoop\expandafter{\MacroExpandingToItems}{action} -%%# which for swapped order of arguments could hardly be written. - -%%# \toolboxLoop is not reentrant i.e. "action" may not expand -%%# to something which contains a call to \toolboxLoop. To enable such calls -%%# anyway, the command -%%# -%%# \toolboxLoopName{name}{items}{\action} -%%# -%%# is provided which is analogous to \toolboxLoop. This is also not reentrant, -%%# but in contrast to \toolboxLoop, calls with different `name' arguments can -%%# be used independently of each other, i.e. in the `action' part of a -%%# \toolboxLoop (or \toolboxLoopName) can be a call to \toolboxLoopName with -%%# a *different* `name'. -%%# In particular, using a counter in `name' one could easily implement -%%# even recursive calls. In this connection, it should be noted that -%%# `name' is expanded via \csname ... \endcsname, and so you may use -%%# constructs like \the\namecounter there. - -%%# \toolboxTokenLoop{tokens}{\action} -%%# -%%# This is similar to \toolboxLoop: The command \action\toolboxToken -%%# is executed iteratively where \toolboxToken runs over each token in tokens. -%%# The important difference is that \toolboxToken is a token (instead of an -%%# item). In particular, \toolboxToken runs through every single token -%%# including spaces and braces. -%%# The token \toolboxSpaceToken which is described later may be handy -%%# in connection with this command. -%%# -%%# Example: -%%# -%%# \toolboxTokenLoop{Some text}{\kern0.1em} -%%# -%%# is the similar to "\kern0.1em S\kern0.1em o\kern0.1em m...", i.e. you -%%# get wider spacing between the letters of "Some text" (I do not claim that -%%# this is typographically a good idea). -%%# -%%# Note that you do not have to take special care about the space. -%%# With \toolboxLoop, you would have to mask the space e.g. with -%%# -%%# \toolboxLoop{Some{ }text}{\kern0.1em} or -%%# \toolboxLoop{Some\toolboxSpace text}{\kern0.1em} -%%# -%%# In contrast, \toolboxTokenLoop would behave differently here: -%%# -%%# \toolboxTokenLoop{Some{ }text}{\kern0.1em} -%%# -%%# would produce \kern0.1em S...\kern0.1em{\kern0.1em <space>\kern0.1em}... -%%# because the braces are simply considered as tokens. - -%%# \toolboxTokenLoop is not reentrant. Analogously to \toolboxLoopName, -%%# independent versions can be generated by -%%# -%%# \toolboxTokenName{name}{tokens}{\action} - -%%# -%%# Controlled expansion -%%# -------------------- - -%%# There are some occasions when you want more control over the expansion. -%%# E.g. you might want to concatenate the contents of two macros to a -%%# further macro or you want to expand a macro by one level but no full -%%# expansion. Usually you can get this effects with \expandafter, but if -%%# you expand several concatenated tokens in this way you either have to -%%# write a lot of \expandafter's or you have to define subsidiary macros -%%# that help you to \expandafter certain parts of macros. The macros in -%%# this section allow you to do this in the most generic way that I could -%%# implement. - -%%# \toolboxDef\macrotodefine{argumentlist} -%%# -%%# This call is similar to -%%# \def\macrotodefine{argumentlist} -%%# with two important differences: -%%# -%%# For \toolboxDef, the argumentlist is expanded precisely by one level. -%%# argumentlist may not contain macros with parameters, and spaces on the -%%# highest level are ignored. If you want to force a space on a particular -%%# place, use the macro \toolboxSpace at this place -%%# (which is described later). Contrary to the usual \def, the symbol # is -%%# treated as a usual symbol. -%%# -%%# Example of usage: -%%# \toolboxDef\chain{\chain\toolboxSpace\after} -%%# This modifies the macro \chain such that a space and the content of the -%%# macro \after is appended at the end. - -%%# \toolboxAppend\macrotodefine{arglist} -%%# -%%# This is equivalent to \toolboxDef\macrotodefine{\macrotodefine arglist} -%%# - -%%# \toolboxSurround{ContentBefore}{ContentAfter}\macro -%%# -%%# This redefines \macro such that ContentBefore is put at the beginning -%%# and ContentAfter after the definition of \macro. So this is equivalent to -%%# \def\macro{ContentBefore * ContentAfter} -%%# where * is the old content of \macro. It is required that \macro is a -%%# usual macro without any arguments. If you want to patch more complicated -%%# macros, use the patch.doc package instead. -%%# The order of the arguments may appear strange, but it is convenient if -%%# ContentBefore or ContentAfter are macros which should be expanded with -%%# \expandafter. - -%%# There is some subsidiary macro used in the implementation of the above -%%# macros which might be useful also in some other situations: -%%# -%%# \toolboxTokDef{argumentlist}\macrotodefine -%%# -%%# This call is similar to -%%# \def\macrotodefine{argumentlist} -%%# with the difference that the symbol # is stored as such. -%%# The order of the arguments has been swapped in order to simplify the -%%# application of \expandafter to the argumentlist. - -%%# -%%# Searching, splitting, and replacing -%%# ---------------------------------- - -%%# \toolboxSplitAt{argument}{search}{\beforestring}{\afterstring} -%%# -%%# Here, \beforestring and \afterstring are arbitrary macro names, -%%# and search and argument are any sequences of tokens (which are in -%%# the following considered as `strings'). -%%# -%%# This call scans the string `argument' for the first occurrence of `search'. -%%# The macros \beforestring and \afterstring are defined correspondingly -%%# such that \beforestring expands to the part before the first occurrence, -%%# and \afterstring to the part following the first occurrence. -%%# If `search' does not occur in `argument', \beforestring is defined to -%%# `argument', and \afterstring is \let \undefined. -%%# -%%# If \beforestring or \afterstring had already been defined before the -%%# call, the previous definition is tacitly overridden. -%%# It is explicitly allowed that \beforestring and \afterstring are the -%%# same names. In this case, the result has the meaning of \afterstring. -%%# -%%# It is guaranteed that braces {...} are *not* lost in `argument'. -%%# However, `search' may not contain any braces, and `argument' may contain -%%# only matching pairs of braces. Moreover, occurrences of `search' within a -%%# pair of braces in `argument' are not recognized. -%%# -%%# (The order of the arguments has been chosen in order to simplify the -%%# use of \expandafter). -%%# -%%# There are some restrictions for the strings in search. For example, -%%# the symbol '#' is not allowed. -%%# -%%# In the above call, the arguments may not run over several paragraphs. -%%# If you want the latter, you have to use the alternative call -%%# -%%# \toolboxSplitAt*{argument}{search}{\beforestring}{\afterstring} -%%# -%%# Example of usage: -%%# -%%# \def\examplemacro#1{\toolboxSplitAt{#1}{@}\testme\testme -%%# \ifx\testme\undefined -%%# ... (do this when #1 contains no `@' token) -%%# \fi} -%%# - -%%# \toolboxMakeSplit{search}{command} -%%# -%%# If \toolboxSplitAt should be used several times with the same search -%%# string, it is much more effective to use the above call: This call -%%# defines a new macro \command (the name is determined by the second argument -%%# of \toolboxMakeSplit) which can be called in the form -%%# -%%# \command{argument}{\beforestring}{\afterstring} -%%# -%%# and which has the analogous meaning as \toolboxSplitAt (the argument -%%# {search} is implicitly fixed and taken from the call of -%%# \toolboxMakeSplit). -%%# It is explicitly admissible that the above macro \toolboxMakeSplit is -%%# used with an already existing command name. In this case, the previous -%%# definition of \command is tacitly overridden. -%%# -%%# The command created by \toolboxMakeSplit does not accept arguments which -%%# run over several paragraphs. If you want the latter, you have to create -%%# this command by the alternative call -%%# -%%# \toolboxMakeSplit*{search}{command} - -%%# -%%# The command -%%# \toolboxFreeSplit{command} -%%# frees the memory used by a previous \toolboxMakeSplit (and lets \command -%%# again be undefined). - -%%# The command -%%# \toolboxReplace{search}{replace}\macro -%%# replaces in \macro all occurences of {search} by {replace}. -%%# The same matches are found as in \toolboxSplitAt. -%%# If you need to search for the same text several times, it is faster -%%# to use the command -%%# \toolboxReplaceSplit{replace}\SplitCmd\macro -%%# where \SplitCmd is a command previously generated with \toolboxMakeSplit* -%%# according to your search string. (You could also use \toolboxMakeSplit -%%# to generate \SplitCmd, but then \macro should not contain any \par's). - -%%# -%%# Redefinition of macros -%%# ---------------------- - -%%# \toolboxMakeHarmless{\macro} -%%# -%%# The above call redefines \macro such that it expands to an ASCII text -%%# containing the previous definition of \macro (i.e. the catcodes of \macro -%%# are changed). - -%%# \toolboxDropBrace\variable -%%# -%%# drops possible outer braces in \variable. More precisely, -%%# if \variable expands to {content}, then \variable is redefined to -%%# content (without braces). Otherwise, nothing happens. - -%%# -%%# \toolboxIf\comparison{DefinitionCommand}{\macro}... -%%# -%%# The above command allows conditional definitions. -%%# Here, {DefinitionCommand} is either \def, {\long\def}, \let, or some -%%# similar command like the LaTeX \newcommand. If the test -%%# \ifx\comparison\macro evaluates positive, then \macro is defined -%%# correspondingly. Otherwise, \macro is not changed. -%%# -%%# Examples: -%%# -%%# \toolboxIf\undefined\def\macro{....} -%%# \toolboxIf\undefined\let\macro... -%%# \toolboxIf\undefined{\long\def}\macro{....} -%%# \toolboxIf\undefined\newcommand{\macro}{....} -%%# -%%# are similar to \def\macro{...} resp. \let\macro... resp. -%%# \long\def\macro{...} resp. \newcommand{\macro}{...} with the difference -%%# that \macro is not changed if it was already defined. -%%# In this sense, \toolboxIf is a more flexible variant of \providecommand. -%%# - -%%# \toolboxNewiftrue{name} or \toolboxNewiffalse{name} -%%# -%%# If the command \ifname was already introduced with \newif, then -%%# nothing happens. Otherwise \ifname is introduced similarly to -%%# \newif\ifname and set to `true' respectively `false'. -%%# In contrast to the corresponding command in TeX or LaTeX 2.09, this macro -%%# is not \outer! - -%%# \toolboxNewifTrue{name} or \toolboxNewifFalse{name} -%%# -%%# are similar to \toolboxNewiftrue{name} and \toolboxNewiffalse{name}, -%%# respectively, with the difference that \ifname is set unconditionally -%%# to `true' respectively `false'. - -%%# -%%# Concatenated macro names -%%# ------------------------ - -%%# \toolboxLet\variable{macroname} -%%# -%%# The above command is analogous to \let\variable\macroname with the -%%# difference that macroname can also contain other tokens like numbers -%%# (it is obtained via \csname). Some converse to this command is -%%# -%%# \toolboxWithNr {number}\cmd{macro} -%%# -%%# which translates into \cmd\macronumber (here, `macro' and `number' -%%# are just concatenated and evaluated via \csname). -%%# Examples: -%%# \toolboxWithNr 1\let{name}\toolboxEmpty -%%# This is the same as \let\name1\toolboxEmpty -%%# (but such that \name1 is considered as a name, not as \name 1) -%%# \toolboxWithNr {10}\def{name}{Foo} -%%# This corresponds analogously to \def\name10{Foo}. -%%# \toolboxLet \mymacro{name\the\mycount} -%%# This is similar to \let\mymacro\namexx where xx is the content -%%# of the counter \mycount. - -%%# -%%# Various -%%# ------- - -%%# The following macros have equivalents in most formats (like LaTeX2e). -%%# However, we do not want to rely too much on these formats, so we provide -%%# our own definitions. -%%# The macro -%%# \toolboxEmpty -%%# expands to nothing (usually, this is the same as \empty). -%%# Similarly, the macro -%%# \toolboxSpace -%%# expands to a space symbol (usually, this is the same as \space). -%%# The token -%%# \toolboxSpaceToken -%%# is \let a space token (usually, this is the same as \@sptoken). -%%# This token is convenient in tests of tokens -%%# (because it is hard to get a space there which is not eaten by the TeX -%%# parser, although sometimes also constructions like -%%# \expandafter\ifx\toolboxSpace\token can be used). -%%# Also the macros -%%# \toolboxFirstOfTwo -%%# \toolboxSecondOfTwo -%%# are provided which read two arguments and return only the first -%%# respectively second argument (usually, this is the same as -%%# \@firstoftwo respectively \@secondoftwo). Similarly, -%%# \toolboxGobbleArg{argument} -%%# just reads its argument and expands to nothing. - -\endinput -%% -%% End of file `toolbox.txt'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texdef/INSTALL new/texmf-dist/doc/support/texdef/INSTALL --- old/texmf-dist/doc/support/texdef/INSTALL 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/support/texdef/INSTALL 2016-11-25 19:30:50.000000000 +0100 @@ -0,0 +1,59 @@ +Installation +============ + +Requirements +------------ + +The `texdef` program is a Perl script which needs a Perl interpreter to work. +Informations about installing Perl can be found at http://www.perl.org/get.html. + +The script calls a TeX compiler (tex, latex, ...) to display the definition of commands/macros. +Therefore (La)TeX must also be installed. +Informations about installing (La)TeX can be found at http://www.latex-project.org/ftp.html. + + +Location +-------- + +For installation the script 'texdef.pl' must simply be copied to a location suitable for executables, +i.e. a directory in the PATHi, e.g. '/usr/bin' or '/usr/local/bin' for Linux/Unix. + +The script should be set as "executable", i.e. 'chmod +x texdef.pl' for Linux/Unix. +This is not required for MS Windows. + + +Name +---- + +This script can show the definitions of commands with different flavours of TeX +(tex, etex, latex, pdftex, pdfetex, pdflatex, xetex, xelatex, context, ...). +The flavour can be given using an command line option or over the _script name_, +i.e. if the script is called 'texdef' it will use 'tex', but called 'latexdef' +it will use 'latex' and so on. +The script can be simply copied several times, but creating _symbolic links_ +to the real script is enough on operation systems / file systems which support +this. + +At least the two variations 'texdef' and 'latexdef' should be installed. + + +Quick Install Nodes for Linux/Unix +---------------------------------- + + cp texdef.pl /usr/local/bin/ + cd /usr/local/bin + ln -s texdef.pl texdef + ln -s texdef.pl latexdef + ln -s texdef.pl etexdef + ln -s texdef.pl luatexdef + ln -s texdef.pl lualatexdef + ln -s texdef.pl pdftexdef + ln -s texdef.pl pdflatexdef + ln -s texdef.pl xetexdef + ln -s texdef.pl xelatexdef + ln -s texdef.pl 'some other TeX flavour of your choice' + +or use the Makefile (defaults to `/usr/local/bin`) + + make install INSTALLDIR=/your/path + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texdef/README new/texmf-dist/doc/support/texdef/README --- old/texmf-dist/doc/support/texdef/README 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/support/texdef/README 2016-11-25 19:30:50.000000000 +0100 @@ -0,0 +1,88 @@ +texdef -- Show definitions of TeX commands +Version 1.7b -- 2012/05/15 +Copyright (C) 2011-2012 Martin Scharrer <martin(a)scharrer-online.de> +This program comes with ABSOLUTELY NO WARRANTY; +This is free software, and you are welcome to redistribute it under certain conditions; + +Usage: + texdef [options] commandname [commandname ...] + latexdef [options] commandname [commandname ...] + +Other program names are possible. See the 'tex' option. Command names do not need to start with `\`. + +Options: + --tex <format>, -t <format> : Use given format of TeX: 'tex', 'latex', 'context'. + Variations of 'tex' and 'latex', like 'luatex', 'lualatex', 'xetex', 'xelatex' are supported. + The default is given by the used program name: 'texdef' -> 'tex', 'latexdef' -> 'latex', etc. + --source, -s : Try to show the original source code of the command definition (L). + --value, -v : Show value of command instead (i.e. \the\command). + --Environment, -E : Every command name is taken as an environment name. This will show the definition of + both \Macro\foo and \Macro\endfoo if \texttt{foo} is used as command name (L). + --preamble, -P : Show definition of the command inside the preamble. + --beforeclass, -B : Show definition of the command before \documentclass. + --package <pkg>, -p <pkg> : (M) Load given tex-file, package or module depending on whether '*tex', '*latex' + or 'context' is used. For LaTeX the <pkg> can start with `[<options>]` and end + with `<pkgname>` or `{<pkgname>}`. + --class <class>, -c <class> : (LaTeX only) Load given class instead of default ('article'). + The <class> can start with `[<classs options>]` and end + with `<classname>` or `{<classname>}`. + --environment <env>, -e <env> : (M) Show definition inside the given environment <env>. + --othercode <code>, -o <code> : (M) Add other code into the preamble before the definition is shown. + This can be used to e.g. load PGF/TikZ libraries. + --before <code>, -b <code> : (M) Place <code> before definition is shown. + The <code> can be arbitray TeX code and doesn't need be be balanced. + --after <code>, -a <code> : (M) Place <code> after definition is shown. + The <code> can be arbitray TeX code and doesn't need be be balanced. + --find, -f : Find file where the command sequence was defined (L). + --Find, -F : Show full filepath of the file where the command sequence was defined (L). + --list, -l : List user level command sequences of the given packages (L). + --list-defs, -L : List user level command sequences and their shorten definitions of the given packages (L). + --list-all, -ll : List all command sequences of the given packages (L). + --list-defs-all, -LL : List all command sequences and their shorten definitions of the given packages (L). + --ignore-cmds <cs,cs,..>, -i : Ignore the following command sequence(s) in the above lists. (M) + --ignore-regex <regex,..>, -I : Ignore all command sequences in the above lists which match the given Perl regular expression(s). (M) + --pgf-keys, -k : Takes commands as pgfkeys and displays their definitions. Keys must use the full path but the common '.\@cmd' prefix is applied. + --pgf-Keys, -K : Takes commands as pgfkeys and displays their definitions. Keys must use the full path. + --version, -V : If used alone prints version of this script. + (L) Together with -p or -c prints version of LaTeX package(s) or class, respectively. + --edit : Opens the file holding the macro definition. Uses --Find and --source. (L) + If the source definition can not be found the definition is printed as normal instead. + --editor <editor> : Can be used to set the used editor. If not used the environment variables TEXDEF_EDITOR, EDITOR and + SELECTED_EDITOR are read in this order. If none of these are set a list of default + editors are tried. The <editor> string can include '%f' for the filename, '%n' for + the line number and '%%' for a literal '%'. If no '%' is used '+%n %f' is added to + the given command. + --tempdir <directory> : Use given existing directory for temporary files. + --help, -h : Print this help and quit. + + Long option can be shorten as long the are still unique. Short options can be combined. + If the option 'environment', 'before' and 'after' are used toegether the + produced code will be inserted in the given order (reversed order for 'after'). + (M) = This option can be given multiple times. + (L) = LaTeX only. Requires the packages 'filehook' and 'currfile'. + +Examples: +Show the definition of '\chapter' with different classes ('article' (default), 'book' and 'scrbook'): + + latexdef chapter + latexdef -c book chapter + latexdef -c scrbook chapter + +Show value of `\textwidth` with different class options: + + latexdef -c [a4paper]{book} -v paperwidth + latexdef -c [letter]{book} -v paperwidth + +Show definition of TikZ's '\draw' outside and inside a 'tikzpicture' environment: + + latexdef -p tikz draw + latexdef -p tikz --env tikzpicture draw + +Show definition of TikZ's '\draw' inside a node, inside a 'beamer' frame in 'handout' mode: + + latexdef -c [handout]beamer -p tikz --env frame --env tikzpicture -b '\node {' -a '};' draw + +List all user level command sequences (macros) defined by the 'xspace' LaTeX package: + + latexdef -l -p xspace + Binary files old/texmf-dist/doc/support/texdef/texdef.pdf and new/texmf-dist/doc/support/texdef/texdef.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdef.doc.tlpobj new/tlpkg/tlpobj/texdef.doc.tlpobj --- old/tlpkg/tlpobj/texdef.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/texdef.doc.tlpobj 2017-04-14 18:01:56.000000000 +0200 @@ -0,0 +1,8 @@ +name texdef.doc +category Package +revision 26420 +shortdesc doc files of texdef +docfiles size=64 + texmf-dist/doc/support/texdef/INSTALL + texmf-dist/doc/support/texdef/README + texmf-dist/doc/support/texdef/texdef.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toolbox.doc.tlpobj new/tlpkg/tlpobj/toolbox.doc.tlpobj --- old/tlpkg/tlpobj/toolbox.doc.tlpobj 2016-04-14 19:53:29.000000000 +0200 +++ new/tlpkg/tlpobj/toolbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name toolbox.doc -category Package -revision 32260 -shortdesc doc files of toolbox -relocated 1 -docfiles size=49 - RELOC/doc/latex/toolbox/README - RELOC/doc/latex/toolbox/toolbox.pdf - RELOC/doc/latex/toolbox/toolbox.tex - RELOC/doc/latex/toolbox/toolbox.txt ++++++ toolbox.doc.tar.xz -> texdef.tar.xz ++++++ ++++ 1823 lines of diff (skipped) ++++++ toolbox.doc.tar.xz -> texdoc.tar.xz ++++++ ++++ 36421 lines of diff (skipped) ++++++ texdoc_cnf.dif ++++++ --- texmf-dist/texdoc/texdoc.cnf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- texmf-dist/texdoc/texdoc.cnf +++ texmf-dist/texdoc/texdoc.cnf 2010-11-12 11:46:52.320054617 +0000 @@ -61,8 +61,11 @@ # For each "ext" in zipext_list, you must define a "unzip_ext" unzipper. # The unzipped data must be printed on stdout. Example: # -# zipext_list = gz -# unzip_gz = gzip -d -c +zipext_list = gz, bz2, xz, lzma +unzip_gz = gzip -d -c +unzip_bz2 = bzip2 -d -c +unzip_xz = xz -d -c +unzip_lzma = lzma -d -c ## User interaction ++++++ texdraw_info.dif ++++++ --- texmf-dist/doc/info/texdraw.info | 5 +++++ 1 file changed, 5 insertions(+) --- texmf-dist/doc/info/texdraw.info +++ texmf-dist/doc/info/texdraw.info 2016-06-09 12:09:59.736660763 +0000 @@ -14,6 +14,11 @@ this manual under the conditions for ver entire resulting derived work is distributed under the terms of a permission notice identical to this one. +INFO-DIR-SECTION TeX +START-INFO-DIR-ENTRY +* TeXdraw: (texdraw). TeX commands for drawing. +END-INFO-DIR-ENTRY + File: texdraw, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) ++++++ texinfo.tar.xz ++++++ ++++ 2367 lines of diff (skipped) ++++++ texlive-common.doc.tar.xz ++++++ Binary files old/doc/texlive/texlive-common/install-lnx-main.png and new/doc/texlive/texlive-common/install-lnx-main.png differ Binary files old/doc/texlive/texlive-common/stdcoll.png and new/doc/texlive/texlive-common/stdcoll.png differ Binary files old/doc/texlive/texlive-common/tlmgr-general-options.png and new/doc/texlive/texlive-common/tlmgr-general-options.png differ Binary files old/doc/texlive/texlive-common/tlmgr-gui.png and new/doc/texlive/texlive-common/tlmgr-gui.png differ Binary files old/doc/texlive/texlive-common/tray-menu.png and new/doc/texlive/texlive-common/tray-menu.png differ Binary files old/doc/texlive/texlive-common/wizard-w32.png and new/doc/texlive/texlive-common/wizard-w32.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-common.doc.tlpobj new/tlpkg/tlpobj/texlive-common.doc.tlpobj --- old/tlpkg/tlpobj/texlive-common.doc.tlpobj 2016-04-23 03:19:39.000000000 +0200 +++ new/tlpkg/tlpobj/texlive-common.doc.tlpobj 2017-05-05 02:06:57.000000000 +0200 @@ -1,9 +1,9 @@ name texlive-common.doc category TLCore -revision 40682 +revision 44191 shortdesc doc files of texlive-common relocated 1 -docfiles size=93 +docfiles size=69 RELOC/doc/texlive/index.html RELOC/doc/texlive/texlive-common/examples/ex5.tex RELOC/doc/texlive/texlive-common/examples/ex6.tex ++++++ texlive-cz.doc.tar.xz ++++++ ++++ 6739 lines of diff (skipped) ++++++ texlive-de.doc.tar.xz ++++++ ++++ 15410 lines of diff (skipped) ++++++ texlive-en.doc.tar.xz ++++++ ++++ 15173 lines of diff (skipped) ++++++ texlive-es.doc.tar.xz ++++++ ++++ 6558 lines of diff (skipped) ++++++ texlive-fr.doc.tar.xz ++++++ ++++ 10078 lines of diff (skipped) ++++++ texlive-it.doc.tar.xz ++++++ ++++ 7115 lines of diff (skipped) ++++++ texlive-pl.doc.tar.xz ++++++ ++++ 7860 lines of diff (skipped) ++++++ texlive-ru.doc.tar.xz ++++++ ++++ 6262 lines of diff (skipped) ++++++ texlive-sr.doc.tar.xz ++++++ ++++ 9088 lines of diff (skipped) ++++++ texlive-zh-cn.doc.tar.xz ++++++ Binary files old/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf and new/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex --- old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2016-05-11 16:44:20.000000000 +0200 +++ new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2017-05-14 06:56:21.000000000 +0200 @@ -1,7 +1,7 @@ % $Id$ % TeX Live documentation. Originally written by Sebastian Rahtz and % Michel Goossens, now maintained by Karl Berry and others. -% Translated by Jjgod Jiang <gzjjgod(a)gmail.com>, +% Translated by Jiang Jiang <gzjjgod(a)gmail.com>, % Jinsong Zhao <jinsong.zhao(a)gmail.com>, % Yue Wang <yulewang(a)gmail.com> % Helin Gai <helin.gai(a)gmail.com> @@ -13,22 +13,18 @@ \usepackage{tex-live-zh-cn, indentfirst} \title{% - {\huge \textit{\TeX\ Live 指南---2016}}% + {\huge \textit{\TeX\ Live 指南---2017}}% } \author{Karl Berry 编写 \\[3mm] \url{http://tug.org/texlive/} } -\date{2016 年 6 月} +\date{2017 年 5 月} \begin{document} \maketitle -\begin{center} -今年的 \TeX\ Live 谨献给我们不幸离世的同事 Sebastian Rahtz 和 Peter Breitenlohner。 -\end{center} - \begin{multicols}{2} \tableofcontents %\listoftables @@ -37,7 +33,7 @@ \section{简介} \label{sec:intro} -\subsection{\TeX\ Live 与 \TeX\ Collection} +\subsection{\protect\TeX\protect\ Live 与 \protect\TeX\protect\ Collection} 本文档描述 \TL{} 软件的主要功能和特性，\TL{} 是 \TeX{} 及其相关程序在 GNU/Linux 及其他类 Unix 系统、\MacOSX\ 和 Windows @@ -63,8 +59,8 @@ \MacOSX{}、和 Cygwin。它还包含了源代码，可供在没有提供可执行文件的平台上编译安装。 -至于 Windows，\TL{} 仅支持 Windows Vista 或后续版本。 -Windows~XP 和 2000 可能可以继续工作。我们没有包含 64 位的 Windows +至于 Windows，\TL{} 仅支持 Windows~7 或后续版本。 +Windows Vista, Windows~XP 和 2000 可能可以继续工作。我们没有包含 64 位的 Windows 可执行文件，不过 32 位的可执行文件也能 64 位的系统上正常运行。除了 \TL{} 以外，Windows 和 \MacOSX 用户还有其它的选择，请参考 @@ -160,7 +156,8 @@ 这个小节描述的是 \TL{} 的内容，以及包含 \TL{} 的 \TK{}。 -\subsection{\TL, pro\TeX{}t, Mac\TeX\ 的大集合：\TK} +\subsection{\protect\TeX\protect\ Collection: \protect\TL, + pro\protect\TeX{}t, Mac\protect\TeX} \label{sec:tl-coll-dists} \TK{} 的 \DVD{} 包含了以下内容： @@ -184,7 +181,7 @@ \CTAN{} 和 \pkgname{protext} 并不一定遵循 \TL{} 的版权协议，因此在分发或修改时要格外地小心。 -\subsection{\TL{} 的顶层目录} +\subsection{\protect\TL{} 的顶层目录} \label{sec:tld} 这里是 \TL{} 发行版顶层目录的一个简短的列表和描述。 @@ -241,7 +238,8 @@ 所有这些目录树，包括个人的，都应该遵循 \TeX\ 目录结构 (\TDS, \url{http://tug.org/tds})，包括其中所有细小的子目录，否则文件就可能找不到。第 \ref{sec:local-personal-macros} 节 (第 -\pageref{sec:local-personal-macros} 页) 有更详细的介绍。 +\pageref{sec:local-personal-macros} 页) 有更详细的介绍。这里描述的顺序和搜索的 +优先级相反，也就是说，列在更靠后的目录树会被更优先搜索。 \begin{ttdescription} \item [TEXMFDIST] 这个目录树包含几乎所有原有发行版本的文件——配置文件、脚本、宏 @@ -249,17 +247,17 @@ 录下。 \item [TEXMFLOCAL] 系统管理员用来安装供整个系统使用的额外的或更新过的宏包、字体的目录。 -\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。 -这个变量根据不同的用户选择不同的主目录。 -\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+ -这些程序存储个人修改过的配置文件。 +\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和 +\verb+fmtutil-sys+ 还有 \verb+tlmgr+ 这几个命令存储、缓存运行时使用的格式文件和 +生成的 map 文件，对整个系统都有效。 \item [TEXMFSYSCONFIG] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和 \verb+fmtutil-sys+ 这些程序存储修改过的全局文件. +\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。 +这个变量根据不同的用户选择不同的主目录。 \item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap+ 和 \verb+fmtutil+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。 -\item [TEXMFSYSVAR] 给 \verb+texconfig-sys+、\verb+updmap-sys+ 和 -\verb+fmtutil-sys+ 还有 \verb+tlmgr+ 这几个命令存储、缓存运行时使用的格式文件和 -生成的 map 文件，对整个系统都有效。 +\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+ +这些程序存储个人修改过的配置文件。 \item [TEXMFCACHE] \ConTeXt\ MkIV 和 Lua\LaTeX\ 用来保存 (缓存的) 运行时数据的目录树；缺省为 \code{TEXMFSYSVAR}，如果该目录不可写，则使用 \code{TEXMFVAR}。 @@ -270,14 +268,14 @@ \begin{description} \item[全系统根目录] 可以包含多个 \TL{} 版本： \begin{ttdescription} - \item[2015] 上一个版本。 - \item[2016] 当前版本。 + \item[2016] 上一个版本。 + \item[2017] 当前版本。 \begin{ttdescription} \item [bin] ~ \begin{ttdescription} \item [i386-linux] \GNU/Linux 二进制文件 \item [...] - \item [universal-darwin] \MacOSX\ 二进制文件 + \item [x86\_64-darwin] \MacOSX\ 二进制文件 \item [win32] Windows 二进制文件 \end{ttdescription} \item [texmf-dist\ \ ] \envname{TEXMFDIST} 和 \envname{TEXMFMAIN} @@ -289,8 +287,8 @@ \item[用户主 (home) 目录] (\texttt{\$HOME} 或 \texttt{\%USERPROFILE\%}) \begin{ttdescription} - \item[.texlive2015] 给上个版本的，个人生成和配置的数据。 - \item[.texlive2016] 给这个版本的，个人生成和配置的数据。 + \item[.texlive2016] 给上个版本的，个人生成和配置的数据。 + \item[.texlive2017] 给这个版本的，个人生成和配置的数据。 \begin{ttdescription} \item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE} \item [texmf-config] \envname{TEXMFCONFIG} @@ -505,23 +503,23 @@ \begin{figure}[tb] \begin{boxedverbatim} -Installing TeX Live 2016 from: ... -Platform: i386-linux => 'GNU/Linux on Intel x86' +Installing TeX Live 2017 from: ... +Platform: x86_64-linux => 'GNU/Linux on x86_64' Distribution: inst (compressed) Directory for temporary files: /tmp ... - Detected platform: GNU/Linux on Intel x86 + Detected platform: GNU/Linux on Intel x86_64 - <B> platforms: 1 out of 17 + <B> platforms: 1 out of 19 <S> Set installation scheme (scheme-full) <C> customizing installation collections - 47 collections out of 48, disk space required: 4268 MB + 40 collections out of 41, disk space required: 4900 MB <D> directories: TEXDIR (the main TeX directory): - /usr/local/texlive/2016 + /usr/local/texlive/2017 ... <O> options: @@ -531,6 +529,7 @@ Actions: <I> start installation to hard disk + <P> save installation profile to 'texlive.profile' and exit <H> help <Q> quit \end{boxedverbatim} @@ -610,21 +609,23 @@ =============================================================================== a [ ] Cygwin on Intel x86 (i386-cygwin) b [ ] Cygwin on x86_64 (x86_64-cygwin) - c [ ] MacOSX/Darwin universal binaries (universal-darwin) - d [ ] MacOSX/Darwin on x86_64 (x86_64-darwin) - e [ ] FreeBSD on x86_64 (amd64-freebsd) - f [ ] FreeBSD on Intel x86 (i386-freebsd) - g [ ] GNU/Linux on ARM (armel-linux) - h [ ] GNU/Linux on ARMhf (armhf-linux) - i [X] GNU/Linux on Intel x86 (i386-linux) - j [ ] GNU/Linux on PowerPC (powerpc-linux) - k [ ] GNU/Linux on x86_64 (x86_64-linux) - l [ ] NetBSD on x86_64 (amd64-netbsd) - m [ ] NetBSD on Intel x86 (i386-netbsd) - o [ ] Solaris on Intel x86 (i386-solaris) - p [ ] Solaris on Sparc (sparc-solaris) - s [ ] Solaris on x86_64 (x86_64-solaris) - t [ ] Windows (win32) + c [ ] MacOSX legacy (10.5-10.6) on Intel x86 (i386-darwin) + d [ ] MacOSX legacy (10.5) on PowerPC (powerpc-darwin) + e [ ] MacOSX current on x86_64 (x86_64-darwin) + f [ ] MacOSX legacy (10.6-10.9) on x86_64 (x86_64-darwinlegacy) + g [ ] FreeBSD on x86_64 (amd64-freebsd) + h [ ] FreeBSD on Intel x86 (i386-freebsd) + i [ ] GNU/Linux on ARM (armel-linux) + j [ ] GNU/Linux on ARMhf (armhf-linux) + k [ ] GNU/Linux on Intel x86 (i386-linux) + l [ ] GNU/Linux on PowerPC (powerpc-linux) + m [X] GNU/Linux on x86_64 (x86_64-linux) + o [ ] NetBSD on x86_64 (amd64-netbsd) + p [ ] NetBSD on Intel x86 (i386-netbsd) + s [ ] Solaris on Intel x86 (i386-solaris) + t [ ] Solaris on Sparc (sparc-solaris) + u [ ] Solaris on x86_64 (x86_64-solaris) + v [ ] Windows (win32) \end{boxedverbatim} \caption{Binaries (二进制程序) 菜单}\label{fig:bin-text} \end{figure} @@ -648,8 +649,8 @@ e [ ] minimal scheme (plain only) f [ ] ConTeXt scheme g [ ] GUST TeX Live scheme - h [ ] teTeX scheme (more than medium, but nowhere near full) - i [ ] XML scheme + h [ ] infrastructure-only scheme (no TeX at all) + i [ ] teTeX scheme (more than medium, but nowhere near full) j [ ] custom selection of collections \end{boxedverbatim} \caption{Scheme (安装方案) 菜单}\label{fig:scheme-text} @@ -684,8 +685,8 @@ 缺省的目录布局在第~\ref{sec:texmftrees}~节有过叙述，见第~\pageref{sec:texmftrees}~页。在 Unix 下默认的安装目录是 -\dirname{/usr/local/texlive/2016} 而 Windows 下是 -|%SystemDrive%\texlive\2016|。这样的安排允许你有多个并行存在的 \TL\ 安装，每年的 +\dirname{/usr/local/texlive/2017} 而 Windows 下是 +|%SystemDrive%\texlive\2017|。这样的安排允许你有多个并行存在的 \TL\ 安装，每年的发行版本一个，你可以通过修改搜索路径来在它们中间切换。这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项 @@ -699,7 +700,7 @@ 在线版本) 以了解完整的列表和更多的信息。一个合理的选择是你自己主目录下的一个子目录，尤其在只有你一个人 -使用的时候。使用 `|~|' 来表示主目录，比如 `|~/texlive/2016|'。 +使用的时候。使用 `|~|' 来表示主目录，比如 `|~/texlive/2017|'。我们建议在目录名称中保留年份，这样可以让你保留多个不同版本的 \TL{}。(你可能希望还维护一个类似 \dirname{/usr/local/texlive-cur} @@ -762,16 +763,18 @@ 成。这样每次二进制文件或者断字模式更新的时候，这些格式文件也得不到更新，所以可能会导致它们的不兼容。 -\item[install font/macro \ldots\ tree:] 忽略下载安装大部分宏包中的文档和源代码文 -件。不建议使用。 +\item[install font/macro \ldots\ tree:] 下载安装大部分宏包中的文档和源代码文 +件。建议选择。 \item[create symlinks in standard directories:] 这个选项 (只对 Unix 有效的) 可以省下设定环境变量的步骤。如果没有选择它，就必须把 \TL{} 的对应目录添加到 \envname{PATH}, \envname{MANPATH} 和 \envname{INFOPATH} 中。如果要创建符号链 -接，你需要对这些目标目录的写权限。我们强烈建议不要\emph{不要} -用这个命令来覆盖现有的 \TeX\ 系统，它主要是为了在用户已知的 -标准目录中创建符号链接设计的，这些目录并不包含任何 \TeX\ 文件。 +接，你需要对这些目标目录的写权限。这个选项是为了在用户已知的 +标准目录中创建符号链接设计的，比如 \dirname{/usr/local/bin}, +这些目录并不包含任何 \TeX\ 文件。不要用这个选项来覆盖系统中 +现有的文件，比如给它指定系统目录。最保险和推荐的做法还是不要 +选择这个选项。 \item[after installation \ldots\ \CTAN:] 从 \DVD\ 安装时，这个选项被缺省启用，因为通常你会希望在此后通过 \CTAN\ 安装一年内更新的软件 @@ -781,7 +784,24 @@ 第~\ref{sec:dvd-install-net-updates}~节。 \end{description} -如果所有的设置已经齐备，你就可以按下 `I' 来开始安装了。安装完成后， +Windows 专有的选项，在高级 Perl/Tk 界面中显示有： +\begin{description} +\item[adjust PATH setting in registry] 保证所有程序都可以在它们的 +搜索路径中找到 \TL{} 程序目录。 + +\item[add menu shortcuts] 如果选择了，它会在开始菜单中创建一个 \TL{} +子菜单。除了 `TeX Live menu' 和 `No shortcuts' 之外，还有 `Launcher entry' +这个选项。这个选项在第 \ref{sec:sharedinstall} 节有详细叙述。 + +\item[change file associations] The options are `Only new' (create + file associations, but do not overwrite existing ones), `All' and + `None'. + +\item[install \TeX{}works front end] +\end{description} + +如果所有的设置已经齐备，你就可以在文本界面中按下 `I'，或者图形界面 +中按下 `Install TeX Live' 按钮来开始安装了。安装完成后，你可以跳至第~\ref{sec:postinstall}~节来了解还需要做些什么工作。 \subsection{install-tl 命令行选项} @@ -878,18 +898,18 @@ 这样： \begin{sverbatim} -PATH=/usr/local/texlive/2016/bin/i386-linux:$PATH; export PATH -MANPATH=/usr/local/texlive/2016/texmf-dist/doc/man:$MANPATH; export MANPATH -INFOPATH=/usr/local/texlive/2016/texmf-dist/doc/info:$INFOPATH; export INFOPATH +PATH=/usr/local/texlive/2017/bin/i386-linux:$PATH; export PATH +MANPATH=/usr/local/texlive/2017/texmf-dist/doc/man:$MANPATH; export MANPATH +INFOPATH=/usr/local/texlive/2017/texmf-dist/doc/info:$INFOPATH; export INFOPATH \end{sverbatim} 对于 csh 或者 tcsh，需要修改的文件通常是 \filename{$HOME/.cshrc}，而应该添加的内容类似： \begin{sverbatim} -setenv PATH /usr/local/texlive/2016/bin/i386-linux:$PATH -setenv MANPATH /usr/local/texlive/2016/texmf-dist/doc/man:$MANPATH -setenv INFOPATH /usr/local/texlive/2016/texmf-dist/doc/info:$INFOPATH +setenv PATH /usr/local/texlive/2017/bin/i386-linux:$PATH +setenv MANPATH /usr/local/texlive/2017/texmf-dist/doc/man:$MANPATH +setenv INFOPATH /usr/local/texlive/2017/texmf-dist/doc/info:$INFOPATH \end{sverbatim} 如果你已经在你的配置文件里写过了这样的路径设置，那就只需要 @@ -906,8 +926,8 @@ 这个文件是否存在，如果有的话，添加下面这样的内容： \begin{sverbatim} -MANPATH_MAP /usr/local/texlive/2016/bin/i386-linux \ - /usr/local/texlive/2016/texmf-dist/doc/man +MANPATH_MAP /usr/local/texlive/2017/bin/i386-linux \ + /usr/local/texlive/2017/texmf-dist/doc/man \end{sverbatim} 然后 2)~检查 \filename{/etc/environment} 是否定义了默认的搜索路径 @@ -936,15 +956,16 @@ 列表中自己指定一个 \CTAN\ 镜像。使用与上述一致的 \dirname{tlnet} 子目录路径。 -\subsubsection{\XeTeX{} 和 Lua\TeX{} 的系统字体配置} +\subsubsection{\protect\XeTeX\protect\ 和 Lua\protect\TeX 的系统字体配置} \label{sec:font-conf-sys} \XeTeX\ 和 Lua\TeX\ 可以使用任何系统安装的字体，而不只是 \TeX\ 目录树中的那些。它们使用类似但不完全一致的方式实现这一功能。 -在 Windows 和 \MacOSX\ 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用。 -但如果你在其他 Unix 系统中安装了 \filename{xetex} 软件包，则需要把系 -统配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。 +在 Windows 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用，只要通过字体名称就可以了。 +在 \MacOSX\ 下如果需要按字体名称查找则需要额外的步骤，参见 Mac\TeX\ 网页 +(\url{http://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex} +软件包，需要把系统按如下配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。为了进行配置，\pkgname{xetex} 安装后 (不管是初始安装还是后来安装的) 都会在 \filename{TEXMFSYSVAR/fonts/conf/texlive-fontconfig.conf} 创建一个 @@ -969,7 +990,7 @@ 你可以运行 \code{fc-list} 来查看系统字体的名称。命令 \code{fc-list : family style file spacing} 可以列出一些有趣的信息。 -\subsubsection{\ConTeXt{} Mark IV} +\subsubsection{\protect\ConTeXt{} Mark IV} \label{sec:context-mkiv} “旧”的 \ConTeXt{} (Mark II) 和“新的” \ConTeXt{} (Mark IV) @@ -985,7 +1006,7 @@ \end{sverbatim} 来刷新 \ConTeXt{} 磁盘缓存数据。生成的文件会被保存在 \code{TEXMFCACHE} 目录下，在 \TL{} 中这个目录 -的默认值是 \verb+TEXMSYSVAR;TEXMFVAR+。 +的默认值是 \verb+TEXMFSYSVAR;TEXMFVAR+。 \ConTeXt\ MkIV 会读取 \verb+TEXMFCACHE+ 提到的所有路径，并写入第一个可写东风路径。在读取时，最后找到的匹配会被优先选择。 @@ -1114,7 +1135,8 @@ \cmdname{gv} 和 \cmdname{xpdf} 现在都不包含在 \TL{} 中，你必须单独安装它们。请分别参阅 \url{http://www.gnu.org/software/gv} 和 \url{http://www.foolabs.com/xpdf}。(还有许多其他的 PDF 查看器。) -Windows 下我们推荐 Sumatra PDF (\url{http://blog.kowalczyk.info/software/sumatrapdf})。 +Windows 下我们推荐 Sumatra PDF +(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。 \item 除 \filename{sample2e.tex} 外可能会对你有用的标准测试文件： @@ -1151,7 +1173,7 @@ 这里是一些你可能会考虑安装的其他工具的链接。 \begin{description} -\item[Ghostscript] \url{http://www.cs.wisc.edu/~ghost/} +\item[Ghostscript] \url{https://ghostscript.com/} \item[Perl] \url{http://www.perl.org/} 与 CPAN 中的补充包， \url{http://www.cpan.org/} \item[ImageMagick] \url{http://www.imagemagick.com}, 用于图形处理和转换 @@ -1160,17 +1182,17 @@ \item[面向 \TeX\ 的编辑器] 有很广泛的选择，一般依用户个人的口味而定。这里按字典序列出了一些 (部分是 Windows 才有的)。 \begin{itemize*} - \item \cmdname{GNU Emacs} 在 Windows 下的原生版本在 - \url{http://www.gnu.org/software/emacs/windows/ntemacs.html}。 + \item \cmdname{GNU Emacs} 在 Windows 下也有原生版本，参见 + \url{http://www.gnu.org/software/emacs/emacs.html}。 \item \cmdname{Emacs 的 Auc\TeX\ 包} 的 Windows 版本在 \CTAN\ 提供。 AuC\TeX\ 的主页在 \url{http://www.gnu.org/software/auctex}。 - \item \cmdname{LEd} 在 \url{http://mirror.ctan.org/support/LEd} 提供。 + \item \cmdname{LEd} 在 \url{http://www.latexeditor.org/} 提供。 \item \cmdname{SciTE} 在 \url{http://www.scintilla.org/SciTE.html} 提供。 \item \cmdname{Texmaker} 是自由软件，在 \url{http://www.xm1math.net/texmaker} 提供。 \item \cmdname{TeXstudio} 是 \cmdname{Texmaker} 的一个 - fork，引入了额外的功能；\url{http://texstudio.sourceforge.net}。 + fork，引入了额外的功能；\url{http://texstudio.org}。 \item \cmdname{TeXnicCenter} 是自由软件，在 \url{http://www.texniccenter.org} 提供，也随 pro\TeX{}t 发行版附带。 @@ -1193,8 +1215,8 @@ \subsection{用户共享 (或跨机器) 安装} \label{sec:sharedinstall} -\TL{} 的设计可以使它在同一个系统的不同的用户间共享，或者可以在网络上不 -同的系统间共享。在标准的目录结构下，不需要配置固定的绝对路径：\TL{} 程 +\TL{} 的设计可以使它在同一个网络中的不同的系统间共享。在标准的 +目录结构下，不需要配置固定的绝对路径：\TL{} 程序所需要的文件都能通过都在这些程序自身的相对路径找到。你可以在 \filename{$TEXMFDIST/web2c/texmf.cnf} 配置文件中看到实际的处理，它包含了类似下面的内容： @@ -1203,22 +1225,19 @@ ... TEXMFDIST = $TEXMFROOT/texmf-dist ... -TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local +TEXMFLOCAL = $SELFAUTOGRANDPARENT/../texmf-local \end{verbatim} 这就意味着，其它的系统或用户只需要把 \TL{} 的可执行文件的位置添加到其系统的搜索路径中就可以使用了。同理，你也可以先把 \TL{} 安装在本地，然后再把整个安装目录转移到网络上。 -至于 Windows，可以在 \url{http://tug.org/texlive/w32client.html} -下载到一个叫 \filename{tlaunch} 的启动程序。它的主窗口的菜单和按钮包括许多 -\TeX\ 相关功能的程序和文档。 - -首次使用时，它会修改 \TL\ 的搜索路径并创建一些文件关联。它还会创建一个开始 -菜单项目来取消这些配置，在这个启动器自身的菜单里也有这个选项。 - -所有这些配置都是在一个 ini 文件里设置的。你可以自己编辑这个文件来添加比如 -SumatraPDF 或者某个 \LaTeX\ 编辑器的信息。参见上述网站获得更多的信息。 +至于 Windows，\TL{} 包含了一个叫 \filename{tlaunch} 的启动程序。它的主 +窗口的菜单和按钮包括许多 \TeX\ 相关功能的程序和文档，还可以通过 \code{ini} +定制。首次使用时，它会进行一些 Windows 专有的安装后设置，比如给当前用户 +修改搜索路径并创建文件关联。因此，在局域网络中可以访问到 \TL{} 的工作站 +只需要启动器的快捷菜单就够了。参见 \code{tlaunch} 手册 (\code{texdoc tlaunch}, +或 \url{https://ctan.org/pkg/tlaunch})。 \htmlanchor{tlportable} \section{便携 (\USB{}) 安装} @@ -1230,8 +1249,10 @@ 后复制到 \USB{} 盘上。要使用这样的便携安装来运行 \TeX{}，你必须将对应的二进制目录加入终端 -的搜索路径，如往常一样。在 Windows 下，你可以双击安装根目录下的 -\filename{tl-tray-menu} 来选择执行一些常见任务，如这个截图所示： +的搜索路径，如往常一样。 + +在 Windows 下，你可以双击安装根目录下的 \filename{tl-tray-menu} +来创建一个临时的启动栏菜单，以选择执行一些常见任务，如这个截图所示： \medskip \tlpng{tray-menu}{4cm} @@ -1239,49 +1260,6 @@ \noindent `More\ldots' 项目解释了如何定制这个菜单。 -\htmlanchor{tlisoinstall} -\subsection{\ISO\ (或 \DVD) 安装} -\label{sec:isoinstall} - -如果你不需要经常更新或者修改安装，或者有其他可以使用 \TL{} 的系统， -创建一个 \TL{} 安装的 \ISO\ 可能会比较方便，因为： - -\begin{itemize} -\item 在不同计算机之间复制 \ISO\ 要比复制普通安装快得多。 -\item 如果你双启动不同的操作系统而且希望它们共享一个 - \TL{} 的安装，\ISO\ 安装不会受不同文件系统支持 - (FAT32, NTFS, HFS+) 的限制。 -\item 虚拟机可以直接挂载这样的 \ISO{}。 -\end{itemize} - -当然你还可以把 \ISO\ 刻录到 \DVD{} 上，如果有用的话。 - -桌面 \GNU/Linux/Unix 系统，包括 \MacOSX{}，都能够挂载 \ISO{}。Windows 8 是第一个 -(!) 支持这个功能的 Windows 版本。此外，没有任何与普通硬盘安装不同的地方，参见第 -\ref{sec:env} 节。 - -在准备这样的 \ISO\ 安装时，最好忽略发布年份的子目录，并让 \filename{texmf-local} -处在和其他目录树 (\filename{texmf-dist}, \filename{texmf-var} 等) 同级。 -你可以在安装程序的普通目录选项中设置这些。 - -对于一个物理的 (而不是虚拟的) Windows 系统，你可以将 \ISO\ 刻录在 -DVD 上，不过花点时间在免费的 \ISO\ 挂载工具上是值得的，比如 -\url{http://wincdemu.sysprogs.org/} 的 WinCDEmu。 - -至于 Windows 系统集成，你可以包含第~\ref{sec:sharedinstall} 节描述的 -\filename{w32client} 脚本 (在 \url{http://tug.org/texlive/w32client.html})， -它在 \ISO\ 里和在网络安装时一样好用。 - -在 \MacOSX{}，如果符号链接 \filename{/usr/texbin} 指向对应的二进制目录， -TeXShop 会使用 DVD 安装，比如： -\begin{verbatim} -sudo ln -s /Volumes/MyTeXLive/bin/universal-darwin /usr/texbin -\end{verbatim} - -历史说明：\TL{} 2010 是第一个不支持“live”发布的 \TL{} 版本，但要在 -\DVD\ 或者 \ISO\ 上执行一直是需要一定技巧的，尤其是必须设置一些环境 -变量。如果你从现有的安装创建 \ISO\ 就不需要了。 - \htmlanchor{tlmgr} \section{\cmdname{tlmgr}: 管理你的安装} \label{sec:tlmgr} @@ -1371,12 +1349,12 @@ install: xetex-def ... running mktexlsr -mktexlsr: Updating /usr/local/texlive/2016/texmf-dist/ls-R... +mktexlsr: Updating /usr/local/texlive/2017/texmf-dist/ls-R... ... running fmtutil-sys --missing ... Transcript written on xelatex.log. -fmtutil: /usr/local/texlive/2016/texmf-var/web2c/xetex/xelatex.fmt installed. +fmtutil: /usr/local/texlive/2017/texmf-var/web2c/xetex/xelatex.fmt installed. \end{fverbatim} 如你所见，\prog{tlmgr} 会安装所有依赖的包，也会处理所有包括刷新文件名 @@ -1429,6 +1407,8 @@ 格式的本地磁盘时是这样的。 \end{description} +另外，另一种方式可以参见 \filename{tlaunch}, 在第~\ref{sec:sharedinstall} 节有描述。 + \subsection{Windows 上附加的软件} 为了使安装更加完整，\TL{} 需要支持那些 Windows 机器上不常见的软件包。 @@ -1475,7 +1455,7 @@ \label{sec:winhome} Windows 下对应于 Unix 下的主目录的是 \verb|%USERPROFILE%|。 -在 Windows XP 下，它通常位于 +在 Windows Vista 和以后的系统下，它通常位于 \verb|C:\Documents and Settings\<username>|；在 Windows Vista 和之后的版本下是 \verb|C:\Users\<username>|。通常情况下，在 \filename{texmf.cnf} 文件和 \KPS{} 中，\verb|~| 在 Windows 和 Unix 下均可以 @@ -1621,17 +1601,6 @@ 数据库 (见第~\pageref{sec:filename-database}~页的``文件名数据库'') 存在，也就是说，是否有数据库正好对应着 \var{p} 的一个前缀。如果存在，就在数据库中寻找符合的路径后缀。 -要是没有这种数据库存在、又或者所有的数据库都不能和指定的路径前缀匹配上、再或者找到的数 -据库里没有进一步的匹配，就要搜索文件系统了 (前提是我们没在路径前加上 \samp{!!} ，又 -或者搜索时就指定了这是一次``必定存在 (must exist)''型的搜索方式)。此时 \KPS{} 将 -根据路径元素构建一个需要检查的目录列表，逐个尝试这些目录，试图找到指定的文件。 - -搜索 \samp{.vf} 文件和 \TeX{} 用 \cs{openin} 命令读入的文件时，会指定``文件必 -定存在 (must exist)''这个选项。而有些文件 (比如 \file{cmr10.vf}) 可能不存在， -花费时间在磁盘上对它进行搜索是不值得的。因此，如果你安装了新的 \samp{.vf} 文件后没有 -更新 \file{ls-R}，那这个文件将永远找不到。搜索时会优先在数据库寻找，然后再去搜索磁盘。 -一旦找到了就立即停止搜索，返回结果。 - 尽管最简单也最常见的路径元素是目录名称，\KPS{} 搜索的路径里还是可以使用其他额外功能的：多层默认值，环境变量名称、配置文件值、用户主目录，以及递归式子目录查找。所以我们把 \KPS{} 将搜索路径变换为一个或多个基本目录名的过程称为\emph{展开}路径元素的过程。展开的方式 @@ -1676,16 +1645,16 @@ 而这个 \file{texmf.cnf} 存放的路径则是在 \envname{TEXMFCNF} 变量里定义的，但我们不建议设置这个 (或者任何) 环境变量。 -作为代替，标准的安装将产生文件 \file{.../2016/texmf.cnf}。如果你必须修改缺省 +作为代替，标准的安装将产生文件 \file{.../2017/texmf.cnf}。如果你必须修改缺省值 (一般不需要)，这是修改的地方。主配置文件是 -\file{.../2016/texmf-dist/web2c/texmf.cnf}。你不应该修改后者，因为在发行版本被更 +\file{.../2017/texmf-dist/web2c/texmf.cnf}。你不应该修改后者，因为在发行版本被更新后会丢失修改。搜索路径里\emph{所有的} \file{texmf.cnf} 文件都会被读入，而先读入的优先级更高。比如搜索路径是 \verb|.:$TEXMF|，那么文件 \file{./texmf.cnf} 里面的值要比 \verb|$TEXMF/texmf.cnf| 里边的优先。 -\begin{itemize} +\begin{itemize*} \item 以 \code{\%} 表示单行注释。 \item @@ -1712,7 +1681,7 @@ \file{texmf.cnf}，这会很有用。 \item 在读入所有定义后再开始展开，所以你可以引用后边才定义的变量。 -\end{itemize} +\end{itemize*} 展示上面所有内容的一段配置文件 \ifSingleColumn 如下: @@ -2058,16 +2027,6 @@ \centering \input{examples/ex6a.tex} \caption{寻找配置文件}\label{fig:dvipsdbga} - -\bigskip - -\input{examples/ex6b.tex} -\caption{寻找 prolog 文件}\label{fig:dvipsdbgb} - -\bigskip - -\input{examples/ex6c.tex} -\caption{寻找字体文件}\label{fig:dvipsdbgc} \end{figure*} \cmdname{dvips} 启动后就开始搜寻其需要使用的文件。首先找到的是 \file{texmf.cnf}， @@ -2194,7 +2153,7 @@ 版本，年复一年。Eitan 于 2009 年 6 月过早地离开了我们，我们希望把这份文档献给它，以志纪念。 -\item Hans Hagen，他对 \ConTeXt\ 格式 (\url{http://pragma-ade.com}) 做了 +\item Hans Hagen，他对 \ConTeXt\ 宏包 (\url{http://pragma-ade.com}) 做了许多测试和修改，使之能够包含在 \TL{} 的框架下。 \item \Thanh, Martin Schr\"oder，和 pdf\TeX\ 团队，他们持续不断地改进 \TeX\ @@ -2257,8 +2216,8 @@ \item Vladimir Volovich，他很大地帮助解决了许多移植和维护的问题，尤其是令我们能够将 \cmdname{xindy} 包含进来。 -\item Staszek Wawrykiewicz，\TL{} 主要的测试人员，同时还是许多重要波兰语支持的协调 -人员：字体、Windows 安装，和其他许多工作。 +\item Staszek Wawrykiewicz，\TL{} 的一个主要的测试人员，同时还是许多重要波兰语 +支持的协调人员：字体、Windows 安装，和其他许多工作。 \item Olaf Weber，他在以前几年对 \Webc{} 耐心的维护。 @@ -2269,16 +2228,18 @@ \end{itemize*} 二进制版本的编译者: -Ettore Aldrovandi (\pkgname{i386-solaris}, \pkgname{x86\_64-solaris}), Marc Baudoin (\pkgname{amd64-netbsd}, \pkgname{i386-netbsd}), Karl Berry (\pkgname{i386-linux}), Ken Brown (\pkgname{i386-cygwin}, \pkgname{x86\_64-cygwin}), Simon Dales (\pkgname{armhf-linux}), Akira Kakuto (\pkgname{win32}), -Dick Koch (\pkgname{universal-darwin}, \pkgname{x86\_64-darwin}), +Dick Koch (\pkgname{x86\_64-darwin}), Nikola Le\v{c}i\'c (\pkgname{amd64-freebsd}, \pkgname{i386-freebsd}), -Mojca Miklavec (\pkgname{mipsel-linux}, \pkgname{sparc-solaris}), -Norbert Preining (\pkgname{alpha-linux}, \pkgname{x86\_64-linux}), +Mojca Miklavec (\pkgname{i386-darwin}, \pkgname{powerpc-darwin}, + \pkgname{x86\_64-darwinlegacy}, + \pkgname{i386-solaris}, \pkgname{x86\_64-solaris}, + \pkgname{sparc-solaris}), +Norbert Preining (\pkgname{x86\_64-linux}), Thomas Schmitz (\pkgname{powerpc-linux}), Boris Veytsman (\pkgname{armel-linux}). 关于 \TL{} 编译进程的信息，请查阅 \url{http://tug.org/texlive/build.html}。 @@ -2320,8 +2281,8 @@ \texttt{texconfig} 脚本的辅助下，基于标准的 \Webc{} 来制作第二版的 \CD{}。第 3 版的 \CD{} 基于 Olaf Weber 完成的 \Webc{} 的一个重大修正版本，7.2。与此同时， \teTeX{} 的一个新版本出现了，\TL{} 也包含了其中绝大多数特性。第 4 版依照上面的模式进 -行，使用了新版本的 \teTeX{} 和新版本的 \Webc{} (7.3)。系统此时也包括了完整的 Windows -下的配置。 +行，使用了新版本的 \teTeX{} 和新版本的 \Webc{} (7.3)。感谢 Fabrice Popineau 的帮 +助，系统此时也包括了完整的 Windows 下的配置。在第 5 版 (2000 年 3 月) 中检查并修正了 \CD{} 的许多部分，更新了数百个软件包。软件包的详细说明现在存放在 XML 文件中。不过 \TeX\ Live 5 的首要变化还是移除了所有的非自由软 @@ -2780,15 +2741,15 @@ 内容，以及其他功能 (见主页)。 \XeTeX\ (见其主页了解更多信息): -\begin{itemize} +\begin{itemize*} \item 使用 HarfBuzz 库替代 ICU 进行字体排版。(仍然使用 ICU 来支持输入编码、双向排版，以及可选的 Unicode 断行。) \item 使用 Graphite2 和 HarfBuzz 来替代 SilGraphite 进行 Graphite 排版。 \item 在 Mac 上，使用 Core Text 替代 (Apple 不再建议使用的) ATSUI。 -\item 在名称相同的情况下有限使用 TrueType/OpenType 字体而不是 Type1 字体。 +\item 在名称相同的情况下优先使用 TrueType/OpenType 字体而不是 Type1 字体。 \item 修正偶尔出现的 \XeTeX\ 和 \code{xdvipdfmx} 字体查找不匹配的问题。 \item 支持 OpenType math 间距调整。 -\end{itemize} +\end{itemize*} \cmdname{xdvi}: 现在使用 FreeType 替代 \code{t1lib} 进行字体渲染。 @@ -2887,9 +2848,7 @@ 部分额外平台提供了定制二进制包 (\url{http://tug.org/texlive/custom-bin.html})。此外，为节省空间部分平台现在没有在 \DVD\ 中提供，但可以通过网络安装。 -\htmlanchor{news} -\subsection{当前版本---2016} -\label{sec:tlcurrent} +\subsubsection{2016} Lua\TeX: 原生命令有大量改变，包括重命名和去除，还有一些节点结构的重整。这些修改在 Han Hagen 的“Lua\TeX\ 0.90 对于 PDF 的后端改变及更多” @@ -2918,7 +2877,7 @@ \cs{mdfivesum}; 字符分类限制提高到了 4096；DVI 版本提升。其他实用工具： -\begin{itemize} +\begin{itemize*} \item \code{gregorio} 是一个新的程序，作为 \code{gregoriotex} 宏包的一部分用于 Gregorian 圣歌音乐的排版；它缺省就被包括在了 \code{shell\_escape\_commands} 中。 @@ -2930,17 +2889,74 @@ 忽略所有调整。 \item \code{ps2pk} 可以处理扩展 PK/GF 字体了。 -\end{itemize} +\end{itemize*} Mac\TeX: 去除了 \TeX\ Distribution Preference Pane；它的功能现在在 TeX Live Utility 里提供了；更新了捆绑的 GUI 应用；给需要在 Ghostscript 中使用多种 CJK 字体的用户提供了新的 \code{cjk-gs-integrate} 脚本。基础架构：支持系统级别的 \code{tlmgr} 配置文件；校验包的完整性；如果有 GPG 还会 -校验网络更新的签名。(如果没有 GPG 则跳过这一步。) +校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。 +(如果没有 GPG 则跳过这一步。) 平台：\code{alpha-linux} 和 \code{mipsel-linux} 被移除了。 +\htmlanchor{news} +\subsection{当前版本---2017} +\label{sec:tlcurrent} + +Lua\TeX: 更多 callback，更多排版控制，更多对内部机制的控制；在一些平台 +增加了用来动态载入代码的 \code{ffi} 库。 + +pdf\TeX: 去年的 |SOURCE_DATE_EPOCH_TEX_PRIMITIVES| 环境变量被改名为 +|FORCE_SOURCE_DATE|，没有功能改变。如果 \cs{pdfpageattr} token 列表包含了字符串 +\code{/MediaBox}，则会忽略输出默认的 \code{/MediaBox}。 + +Xe\TeX: Unicode/OpenType 数学支持现在是基于 HarfBuzz 的 MATH table 支持实现的； +还有一些 bug 修正。 + +Dvips: 保证最后一次设置的 papersize special 是最后选中的纸张尺寸，和 +\code{dvipdfmx} 以及宏包希望的效果一致；\code{-L0} 选项 (\code{L0} +配置文件设置) 可以用来恢复以前的行为，也就是第一次设置纸张尺寸的 special +才有效。 + +ep\TeX, eup\TeX: 来自 pdf\TeX\ 新的原生命令 \cs{pdfuniformdeviate}, +\cs{pdfnormaldeviate}, \cs{pdfrandomseed}, \cs{pdfsetrandomseed}, +\cs{pdfelapsedtime}, \cs{pdfresettimer}。 + +Mac\TeX: 从这一年开始，Mac\TeX\ 只支持 Apple 还在发布安全更新的 +\MacOSX\ 版本，使用的平台名称是 |x86_64-darwin|，目前这包括 Yosemite, +El~Capitan, 和 Sierra (10.10 及以后的)。给更老版本的 \MacOSX\ +用的二进制程序不会包含在 Mac\TeX\ 里面，但 \TeX\ Live 里还会提供 +(|x86_64-darwinlegacy|, \code{i386-darwin}, \code{powerpc-darwin})。 + +基础架构: \envname{TEXMFLOCAL} 树现在 (默认) 是在 \envname{TEXMFSYSCONFIG} 和 +\envname{TEXMFSYSVAR} 之前搜索了；这是为了更好地符合本地文件优先于系统文件的 +原则。另外，\code{tlmgr} 有一个新的 \code{shell} 模式，进行交互和脚本使用，和 +一个新的 \code{conf auxtrees} 功能来方便添加和删除额外的目录树。 + +\code{updmap} 和 \code{fmtutil}: 这些脚本如果在没有明确指定是系统模式 +(\code{updmap-sys}, \code{fmtutil-sys}, 或者 \code{-sys} 选项)，还是用 +户模式 (\code{updmap-user}, \code{fmtutil-user}, 或者 \code{-user} 选项) +的时候会给出警告。这是为了减少常见的不小心启用用户模式而导致系统更新无法 +生效。细节请参见 \url{http://tug.org/texlive/scripts-sys-user.html}。 + +\code{install-tl}: Mac 下的个人路径现在默认设置为和 Mac\TeX\ 一样的 +(|~/Library/...|)。增加了新选项 \code{-init-from-profile} 来以特定 +profile 启动安装；新命令 \code{P} 来直接保存一个 profile；新的 profile +变量名 (但先前的名字也还支持)。 + +Sync\TeX: 临时文件现在被改为了 \code{foo.synctex(busy)}，而不是 +\code{foo.synctex.gz(busy)} (不再有~\code{.gz})。需要删除临时文 +件的前端和编译系统因此需要调整。 + +其他工具: \code{texosquery-jre8} 是一个新的跨平台程序，用来在 \TeX\ 文档 +中获取系统 locale 和其他 OS 信息；它已经包含在了 |shell_escape_commands| +中，可以在受限的 shell 环境中执行。(texosquery 也支持更老的 JRE 版本，但 +不能在受限模式下启用，因为 Oracle 由于安全问题不再支持那些版本了。) + +平台：见上述的 Mac\TeX\ 条目。没有其他的变化。 + \subsection{未来} \emph{\TL{} 并不完美！} (也永远不会达到完美。) 我们希望继续发行新的 @@ -2985,6 +3001,6 @@ 2009 年的简体中文版本由 Jiang Jiang 和 Jinsong Zhao 翻译。 -2010 到 2015 年的简体中文版本都由 Jiang Jiang 翻译。 +2010 到 2017 年的简体中文版本都由 Jiang Jiang 翻译。 \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj --- old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2016-05-12 03:23:45.000000000 +0200 +++ new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2017-05-15 02:07:45.000000000 +0200 @@ -1,9 +1,9 @@ name texlive-zh-cn.doc category TLCore -revision 41031 +revision 44333 shortdesc doc files of texlive-zh-cn relocated 1 -docfiles size=259 +docfiles size=229 RELOC/doc/texlive/texlive-zh-cn/Makefile RELOC/doc/texlive/texlive-zh-cn/README-live.ZH-CN RELOC/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty ++++++ texlive.infra.doc.tar.xz ++++++ ++++ 3914 lines of diff (skipped) ++++++ texlive.infra.tar.xz ++++++ ++++ 6647 lines of diff (skipped) ++++++ texliveonfly.doc.tar.xz ++++++ ++++++ texliveonfly.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texliveonfly.tlpobj new/tlpkg/tlpobj/texliveonfly.tlpobj --- old/tlpkg/tlpobj/texliveonfly.tlpobj 2016-04-14 19:50:24.000000000 +0200 +++ new/tlpkg/tlpobj/texliveonfly.tlpobj 2017-04-14 18:02:10.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=5 texmf-dist/scripts/texliveonfly/texliveonfly.py catalogue-ctan /support/texliveonfly -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics distribution ++++++ texloganalyser.doc.tar.xz ++++++ ++++++ texloganalyser.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.tlpobj new/tlpkg/tlpobj/texloganalyser.tlpobj --- old/tlpkg/tlpobj/texloganalyser.tlpobj 2016-04-14 19:50:25.000000000 +0200 +++ new/tlpkg/tlpobj/texloganalyser.tlpobj 2017-04-14 18:02:11.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 texmf-dist/scripts/texloganalyser/texloganalyser catalogue-ctan /support/texloganalyser -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics log-manip catalogue-version 0.9 ++++++ texlogos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlogos.tlpobj new/tlpkg/tlpobj/texlogos.tlpobj --- old/tlpkg/tlpobj/texlogos.tlpobj 2016-04-14 19:50:25.000000000 +0200 +++ new/tlpkg/tlpobj/texlogos.tlpobj 2017-04-14 18:02:11.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/texlogos/texlogos.sty catalogue-also hologo catalogue-ctan /macros/latex/contrib/texlogos/texlogos.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics logo catalogue-version 1.3.1 ++++++ texmate.doc.tar.xz ++++++ ++++++ texmate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texmate.tlpobj new/tlpkg/tlpobj/texmate.tlpobj --- old/tlpkg/tlpobj/texmate.tlpobj 2016-04-14 19:50:26.000000000 +0200 +++ new/tlpkg/tlpobj/texmate.tlpobj 2017-04-14 18:02:11.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=7 RELOC/tex/latex/texmate/texmate.sty catalogue-ctan /macros/latex/contrib/texmate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games catalogue-version 2 ++++++ texments.doc.tar.xz ++++++ ++++++ texments.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texments.tlpobj new/tlpkg/tlpobj/texments.tlpobj --- old/tlpkg/tlpobj/texments.tlpobj 2016-04-14 19:50:26.000000000 +0200 +++ new/tlpkg/tlpobj/texments.tlpobj 2017-04-14 18:02:11.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/texments/texments.sty catalogue-also minted verbments catalogue-ctan /macros/latex/contrib/texments -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics listing catalogue-version 0.2.0 ++++++ texpower.doc.tar.xz ++++++ ++++++ texpower.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texpower.tlpobj new/tlpkg/tlpobj/texpower.tlpobj --- old/tlpkg/tlpobj/texpower.tlpobj 2016-04-14 19:50:27.000000000 +0200 +++ new/tlpkg/tlpobj/texpower.tlpobj 2017-04-14 18:02:12.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/texpower/tpsettings.cfg catalogue-also prosper beamer catalogue-ctan /macros/latex/contrib/texpower -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics presentation catalogue-version 0.2 ++++++ texshade.doc.tar.xz ++++++ ++++++ texshade.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texshade.tlpobj new/tlpkg/tlpobj/texshade.tlpobj --- old/tlpkg/tlpobj/texshade.tlpobj 2016-04-14 19:50:29.000000000 +0200 +++ new/tlpkg/tlpobj/texshade.tlpobj 2017-04-14 18:02:14.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/texshade/texshade.def RELOC/tex/latex/texshade/texshade.sty catalogue-ctan /macros/latex/contrib/texshade -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics chemistry molbio catalogue-version 1.24 ++++++ texsis.doc.tar.xz ++++++ ++++++ texsis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texsis.tlpobj new/tlpkg/tlpobj/texsis.tlpobj --- old/tlpkg/tlpobj/texsis.tlpobj 2016-04-14 19:50:30.000000000 +0200 +++ new/tlpkg/tlpobj/texsis.tlpobj 2017-04-14 18:02:14.000000000 +0200 @@ -9,7 +9,7 @@ longdesc Simplified control of type sizes, line spacing, footnotes, longdesc running headlines and footlines, and tables of contents, longdesc figures and tables; Specialized document formats for research -longdesc papers, preprints and ``e-prints,'' conference proceedings, +longdesc papers, preprints and "e-prints", conference proceedings, longdesc theses, books, referee reports, letters, and memoranda; longdesc Simplified means of constructing an index for a book or thesis; longdesc Easy to use double column formatting; Specialized environments @@ -19,6 +19,11 @@ longdesc physicists, but others may also find it useful. It is longdesc completely compatible with Plain TeX. depend tex +depend cm +depend hyphen-base +depend knuth-lib +depend plain +depend texsis depend texsis.ARCH execute AddFormat name=texsis engine=pdftex options="-translate-file=cp227.tcx texsis.ini" fmttriggers=cm,hyphen-base,knuth-lib,plain,texsis runfiles size=142 @@ -63,7 +68,7 @@ texmf-dist/tex/texsis/base/twin.txs texmf-dist/tex/texsis/config/texsis.ini catalogue-ctan /macros/texsis -catalogue-date 2016-04-01 09:40:16 +0200 +catalogue-date 2016-10-16 19:36:27 +0200 catalogue-license lppl catalogue-topics physics format catalogue-version 2.18 ++++++ textcase.doc.tar.xz ++++++ ++++++ textcase.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.tlpobj new/tlpkg/tlpobj/textcase.tlpobj --- old/tlpkg/tlpobj/textcase.tlpobj 2016-04-14 19:50:32.000000000 +0200 +++ new/tlpkg/tlpobj/textcase.tlpobj 2017-04-14 18:02:15.000000000 +0200 @@ -16,6 +16,6 @@ runfiles size=1 RELOC/tex/latex/textcase/textcase.sty catalogue-ctan /macros/latex/contrib/textcase -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp ++++++ textfit.doc.tar.xz ++++++ ++++++ textfit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textfit.tlpobj new/tlpkg/tlpobj/textfit.tlpobj --- old/tlpkg/tlpobj/textfit.tlpobj 2016-04-14 19:50:32.000000000 +0200 +++ new/tlpkg/tlpobj/textfit.tlpobj 2017-04-14 18:02:15.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/textfit/textfit.sty catalogue-ctan /macros/latex/contrib/textfit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics fit-to-size catalogue-version 5 ++++++ textglos.doc.tar.xz ++++++ ++++++ textglos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textglos.tlpobj new/tlpkg/tlpobj/textglos.tlpobj --- old/tlpkg/tlpobj/textglos.tlpobj 2016-04-14 19:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/textglos.tlpobj 2017-04-14 18:02:15.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/textglos/textglos.sty catalogue-ctan /macros/latex/contrib/textglos -catalogue-date 2015-08-12 06:28:09 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics linguistic catalogue-version 1.0 ++++++ textgreek.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textgreek.doc.tlpobj new/tlpkg/tlpobj/textgreek.doc.tlpobj --- old/tlpkg/tlpobj/textgreek.doc.tlpobj 2016-04-14 19:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/textgreek.doc.tlpobj 2017-05-05 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name textgreek.doc category Package -revision 24282 +revision 44192 shortdesc doc files of textgreek relocated 1 docfiles size=136 ++++++ textgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textgreek.tlpobj new/tlpkg/tlpobj/textgreek.tlpobj --- old/tlpkg/tlpobj/textgreek.tlpobj 2016-04-14 19:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/textgreek.tlpobj 2017-05-05 02:06:59.000000000 +0200 @@ -1,13 +1,14 @@ name textgreek category Package -revision 24282 +revision 44192 shortdesc Upright greek letters in text relocated 1 longdesc Use upright greek letters as text symbols, e.g. \textbeta. +depend greek-fontenc runfiles size=3 RELOC/tex/latex/textgreek/textgreek.sty catalogue-ctan /macros/latex/contrib/textgreek -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics text-symbol catalogue-version 0.7 ++++++ textmerg.doc.tar.xz ++++++ ++++++ textmerg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textmerg.tlpobj new/tlpkg/tlpobj/textmerg.tlpobj --- old/tlpkg/tlpobj/textmerg.tlpobj 2016-04-14 19:50:33.000000000 +0200 +++ new/tlpkg/tlpobj/textmerg.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/textmerg/textmerg.sty catalogue-ctan /macros/latex/contrib/textmerg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics doc-gen catalogue-version 2.01 ++++++ textopo.doc.tar.xz ++++++ ++++++ textopo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textopo.tlpobj new/tlpkg/tlpobj/textopo.tlpobj --- old/tlpkg/tlpobj/textopo.tlpobj 2016-04-14 19:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/textopo.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/textopo/textopo.def RELOC/tex/latex/textopo/textopo.sty catalogue-ctan /macros/latex/contrib/textopo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics molbio chemistry catalogue-version 1.5 ++++++ textpath.doc.tar.xz ++++++ ++++++ textpath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpath.tlpobj new/tlpkg/tlpobj/textpath.tlpobj --- old/tlpkg/tlpobj/textpath.tlpobj 2016-04-14 19:50:35.000000000 +0200 +++ new/tlpkg/tlpobj/textpath.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/textpath/textpathmp.sty catalogue-also pst-text catalogue-ctan /graphics/metapost/contrib/macros/textpath -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-text catalogue-version 1.6 ++++++ textpos.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/README new/doc/latex/textpos/README --- old/doc/latex/textpos/README 2014-01-05 00:42:24.000000000 +0100 +++ new/doc/latex/textpos/README 2016-11-25 19:30:15.000000000 +0100 @@ -2,12 +2,12 @@ Textpos: absolute positioning of text on the LaTeX page ------------------------------------------------------- -Version 1.7j, 2014 January 3 +Version 1.8, 2016 June 7 This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but the main one (or at least my motivating one) is to help produce a -large-format conference poster. +large-format conference poster. This package provides a single environment, plus a starred variant, which contains the text (or graphics, or table, or whatever) which is @@ -36,7 +36,7 @@ Licence ------- -This software is copyright, 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray. +This software is copyright, 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray. It is released under the terms of the [LaTeX Project Public License][lppl], which is included in the file LICENCE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.7j new/doc/latex/textpos/VERSION-1.7j --- old/doc/latex/textpos/VERSION-1.7j 2014-01-05 00:42:24.000000000 +0100 +++ new/doc/latex/textpos/VERSION-1.7j 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -textpos-1.7j, released 2014 January 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.8 new/doc/latex/textpos/VERSION-1.8 --- old/doc/latex/textpos/VERSION-1.8 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/textpos/VERSION-1.8 2016-11-25 19:30:15.000000000 +0100 @@ -0,0 +1 @@ +textpos-1.8, released 2016 June 7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/README-examples new/doc/latex/textpos/examples/README-examples --- old/doc/latex/textpos/examples/README-examples 2014-01-05 00:42:24.000000000 +0100 +++ new/doc/latex/textpos/examples/README-examples 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -The t?.tex files in this directory are intended as regression tests, -rather than strictly as examples. They nonetheless serve to illustrate -some of what textpos can do. - -Not all of them actually work, as regression tests, right now, but -this is because when comparing binary formats such as .dvi files, -it's not always completely obvious what counts as a significant -change. Any comments and suggestions would be welcome. - -Norman -2006 September 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/README.examples new/doc/latex/textpos/examples/README.examples --- old/doc/latex/textpos/examples/README.examples 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/textpos/examples/README.examples 2016-11-25 19:30:15.000000000 +0100 @@ -0,0 +1,11 @@ +The t?.tex files in this directory are intended as regression tests, +rather than strictly as examples. They nonetheless serve to illustrate +some of what textpos can do. + +Not all of them actually work, as regression tests, right now, but +this is because when comparing binary formats such as .dvi files, +it's not always completely obvious what counts as a significant +change. Any comments and suggestions would be welcome. + +Norman +2006 September 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t10.tex new/doc/latex/textpos/examples/t10.tex --- old/doc/latex/textpos/examples/t10.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/textpos/examples/t10.tex 2016-11-25 19:30:15.000000000 +0100 @@ -0,0 +1,46 @@ +%%% Testing:interactions between (x,y)-positioning and \TPMargin +% See https://bitbucket.org/nxg/textpos/issues/3/ +% Thanks to Richard Schreiber for the report and initial test code. + +\documentclass{minimal} +\usepackage[top=0mm,bottom=0mm,left=0mm,right=0mm,a5paper]{geometry} +\usepackage{color} +\usepackage[absolute,showboxes]{textpos} + +\parindent0mm +\begin{document} + +\textblockrulecolour{magenta} +\TPGrid[0mm,0mm]{6}{9}% +\TPMargin{5mm}% + +\null\vskip 4cm +\noindent \hrule width 2\TPHorizModule +\smallskip +\hbox to 2\TPHorizModule{$\leftarrow$\hfil two units wide\hfil $\rightarrow$} + +\begin{textblock}{2}(0,0) + This box is top-left. + The top and left margin lines touch the edge of the page. +\end{textblock} + +\begin{textblock}{2}[0,1](0,9) + This box should sit at the bottom left. + The box should be two units wide, and the text correspondingly narrower. + The bottom and left margin lines should touch the edge of the page. +\end{textblock} + +\TPMargin*{5mm} +\begin{textblock}{2}[1,0](6,0) + This box should sit at the top right of the page, and the text + should be two units wide. The top and right margin lines should be + off the page. +\end{textblock} + +\TPMargin{0mm}% +\begin{textblock}{2}[1,1](6,9) + This box sits at the bottom right edge. + The text and box are two units wide. + The bottom and right margin lines touch the edge of the page. +\end{textblock} +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t6.tex new/doc/latex/textpos/examples/t6.tex --- old/doc/latex/textpos/examples/t6.tex 2007-04-03 02:15:52.000000000 +0200 +++ new/doc/latex/textpos/examples/t6.tex 2016-11-25 19:30:15.000000000 +0100 @@ -20,15 +20,21 @@ Blue \end{textblock} -\begin{textblock}{8}(14,0) +\begin{textblock}{12}(4,-1) + \hrule width 12\TPHorizModule + \vbox to 0pt{\hbox{12 units}\vss} + \vskip1\TPVertModule \hrule width 8\TPHorizModule + \vbox to 0pt{\hbox{8 units}\vss} \vskip1\TPVertModule \hrule width 4\TPHorizModule + \vbox to 0pt{\hbox{4 units}\vss} \vskip1\TPVertModule \hrule width 2\TPHorizModule + \vbox to 0pt{\hbox{2 units}\vss} \vskip1\TPVertModule \hrule width 1\TPHorizModule -\end{textblock} +\end{textblock} \begin{textblock}{12}(4,4) This text is inside a box with a blue background. The text is flush diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t9.tex new/doc/latex/textpos/examples/t9.tex --- old/doc/latex/textpos/examples/t9.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/textpos/examples/t9.tex 2016-11-25 19:30:15.000000000 +0100 @@ -0,0 +1,67 @@ +%%% Testing: switching between absolute and relative mode + +\documentclass{article} + +\usepackage[absolute,showboxes]{textpos} +\setlength{\parindent}{0pt} +\TPHorizModule=1cm +\TPVertModule=1cm + +\begin{document} + +Here is some text, which appears in the body of the page. +\begin{textblock}{5}(0,0) +This text is at (0,0), and should appear at the very top-left corner. +\end{textblock} + +Here is more text, which also appears in the body. +\begin{textblock}{5}(1,1) +This text is at (1,1), and should appear near the top-left corner, 1cm +in and down. +\end{textblock} + +\newpage +\TPoptions{ absolute=false, + showboxes = false} + +Here is some text, which appears in the body of page two. +\begin{textblock}{5}(0,0) +This text is at (0,0), and appears at the top-left of the text block, +just under `Here is some text'. +It should not have a box around it. +\end{textblock} + +\vskip4cm +Here is more text, which also appears in the body of p.2. +\begin{textblock}{5}(1,1) +This text is at (1,1), and also appears in the text block 1cm along +and down from the `Here is more text', and without a surrounding box. +\end{textblock} + +\TPoptions{absolute=true, showboxes=true, showtext=false} + +\vskip4cm +Text. The corresponding text block should appear only as a box, with +no text inside it. It appears in the top-left corner of the page. +\begin{textblock}{5}(0,0) +This text should not appear (just the box, positioned 2cm along and +down from `Text.' +\end{textblock} + +\TPoptions{absolute=false, showboxes=true, showtext=true} + +\vskip4cm +Text 2. +\begin{textblock}{5}(6,0) +This text should appear surrounded by a box, level with, but along from, `Text 2'. +\end{textblock} + +\newpage +\TPoptions{absolute=true} + +Page 3. +\begin{textblock}{5}(0,0) +This text appears at the extreme top-left of page three. +\end{textblock} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos-example.tex new/doc/latex/textpos/textpos-example.tex --- old/doc/latex/textpos/textpos-example.tex 2014-01-05 00:42:24.000000000 +0100 +++ new/doc/latex/textpos/textpos-example.tex 2016-11-25 19:30:15.000000000 +0100 @@ -7,7 +7,7 @@ %% textpos.dtx (with options: `example') %% Textpos: absolute positioning of text on the page %%%% File: textpos.dtx -%%%% Copyright 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray +%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -29,7 +29,7 @@ %% %% See the file LICENCE for a copy of the LPPL. %% -%% Mercurial ident: 41b12ce5565c, 2014-01-03 19:15 +0000 +%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100 %% \documentclass{article} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos.html new/doc/latex/textpos/textpos.html --- old/doc/latex/textpos/textpos.html 2014-01-05 00:42:24.000000000 +0100 +++ new/doc/latex/textpos/textpos.html 2016-11-25 19:30:15.000000000 +0100 @@ -1,65 +1,97 @@ <?xml version="1.0"?> - <html xmlns="http://www.w3.org/1999/xhtml"> <head profile="http://dublincore.org/documents/dcq-html/"> <title>Textpos</title> -<meta name='DC.subject' content='latex, textpos, absolute positioning'/> -<meta name='DC.title' content='Textpos'/> -<meta name='DC.date' content='2006-8-24'/>  -<meta name='rcsdate' content='$Date$'/> -<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" /> -<link href="http://nxg.me.uk" rev="author"/> -<link type="text/css" rel="stylesheet" - href="style.css"/> +<meta name="DC.subject" content="latex, textpos, absolute positioning"/> +<meta name="DC.title" content="Textpos"/> +<meta name="DC.date" content="2016-06-07"/> +<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/> +<link href="https://nxg.me.uk/norman" rev="author"/> +<link type="text/css" rel="stylesheet" href="style.css"/> </head> <body> <h1>Textpos</h1> <div class="abstract"> <p>Lay out text and graphics at arbitrary positions on the LaTeX page.</p> -<p>The textpos home page is at <a href='http://purl.org/nxg/dist/textpos' - ><code>http://purl.org/nxg/dist/textpos</code></a>; + +<p> + +<span class="distpage">The textpos home page is at +<a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>;</span> please quote this URL rather than the URL it resolves to.</p> -<p>Version 1.7j, 2014 January 3.</p> +<p>Version 1.8, 2016 June 7.</p> </div> <p>This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but the main one (or at least my motivating one) is to help produce a large-format conference poster. Other applications include placing -material within, say, figures. Textpos is also discussed in the <a -href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos'>TeX FAQ +material within, say, figures. Textpos is also discussed in the <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos">TeX FAQ entry on absolute positioning</a>.</p> <p>This package provides a single environment, which contains the text (or graphics, or table, or whatever) which is to be placed on the page, and which specifies where it is to be placed. The environment -is accompanied by various configuration commands. See the <a -href="textpos.pdf" >manual (pdf)</a>.</p> +is accompanied by various configuration commands. See the <a href="textpos.pdf">manual (pdf)</a>.</p> <p>An article describing Textpos appeared in TUGboat in 2002: -<a href='http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf' ->Norman Gray, <em>Absolute Positioning with Textpos</em>, +<a href="http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf">Norman Gray, <em>Absolute Positioning with Textpos</em>, TUGboat <strong>23</strong> (3/4), pp341–4, 2002.</a></p> -<p>I have a collection of general advice about <a -href="http://purl.org/nxg/note/posters" >creating +<p>I have a collection of general advice about <a href="http://purl.org/nxg/note/posters">creating conference posters with LaTeX</a>.</p> <p>Rolf Niepraschk provided me with a wonderful demo -(<a href="niepraschk-eso-pic.tex" >tex</a>, -<a href="niepraschk-eso-pic.pdf" >pdf</a>) +(<a href="niepraschk-eso-pic.tex">tex</a>, +<a href="niepraschk-eso-pic.pdf">pdf</a>) of using Textpos along with his <code>eso-pic</code> package, and the <code>calc</code> package, to produce a grid which can help lay out material on the page.</p> <p>The source is held at -<a href='https://bitbucket.org/nxg/textpos'>bitbucket</a>, +<a href="https://bitbucket.org/nxg/textpos">bitbucket</a>, and there is an issues list there, for bug reports.</p> -<h3>History</h3> + +<div class="distpage"> + <h2>Installation and further information</h2> +</div> + +<ol> + + + +<li>Run LaTeX on the file <code>textpos.ins</code> – this will +unpack the style file <code>textpos.sty</code> amongst other files. +Place this somewhere where TeX can find it.</li> + +<li>Run LaTeX on the file <code>textpos.dtx</code> to obtain the +documentation.</li> +</ol> + +<p class="distpage">The <code>textpos</code> home page is at <a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more up-to-date versions available there.</p> + +<p><code>Textpos</code> is also available on CTAN: +<a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">/tex-archive/macros/latex/contrib/textpos/</a></p> + + + +<h2>History</h2> <dl> +<dt><strong>1.8, 2016 June 5</strong></dt> +<dd><ul> +<li>Added the <code>\TPoptions</code> command, to switch modes on and +off within the document. Various documentation tweaks.</li> +<li>The behaviour of <code>\TPMargin</code> and +<code>\TPMargin*</code> were somewhat underspecified in versions of +Textpos before v1.8, and in consequence inconsistently implemented. +This has now been rationalised, but the change <em>may</em> change +documents which relied on the previous behaviour. +Thanks to Richard Schreiber for the detailed bug report.</li> +</ul></dd> + <dt>1.7j, 2014 January 3</dt> <dd>Re-released under the LPPL.</dd> @@ -74,7 +106,7 @@ <dt>1.7g, 2010 September 30</dt> <dd>Bugfix: change the way we handle the {color} package not being -loaded -- replacement <code>\color</code> command is now robust. +loaded – replacement <code>\color</code> command is now robust. Thanks to Joseph Wright for the bugreport. Also adjusted documentation of reference points.</dd> @@ -175,7 +207,7 @@ <dt>1.2a, 2002 April 28</dt> <dd>Version 1.2 had an error, which caused a confusing error if you gave any fractional part in the arguments to the -<code>{textblock}</code> environment. This was fixed in version 1.2a, +<code>{textblock}</code> environment. This was fixed in version 1.2a, which adds a <code>{textblock*}</code> environment (fully compatible with <code>calc</code>), and does not attempt to support calc-style expressions in the parameters to the unstarred @@ -185,40 +217,16 @@ <dd>Rolf Niepraschk <code>niepraschk(a)ptb.de</code> provided code to make textpos compatible with the <code>calc</code> package</dd> -<dt>Version 1.1 was released in 1999</dt> +<dt>Version 1.1</dt> +<dd>Released in 1999</dd> </dl> -<h3>Installation and further information</h3> - -<ol> - -<li>Run LaTeX on the file <code>textpos.ins</code> -- this will -unpack the style file <code>textpos.sty</code> amongst other files. -Place this somewhere where TeX can find it.</li> - -<li>Run LaTeX on the file <code>textpos.dtx</code> to obtain the -documentation.</li> -</ol> - -<p>The <code>textpos</code> home page is at <a href='http://purl.org/nxg/dist/textpos' -><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more -up-to-date versions available there.</p> - -<p><code>Textpos</code> is also available on CTAN: -<a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/' - >/tex-archive/macros/latex/contrib/textpos/</a></p> - <div class="signature"> -<a href="http://nxg.me.uk" >Norman Gray</a><br /> -2014 January 3 +<a href="http://nxg.me.uk">Norman Gray</a><br/> +2016 June 7 </div> </body> </html> - - - - - Binary files old/doc/latex/textpos/textpos.pdf and new/doc/latex/textpos/textpos.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.doc.tlpobj new/tlpkg/tlpobj/textpos.doc.tlpobj --- old/tlpkg/tlpobj/textpos.doc.tlpobj 2016-04-14 19:50:35.000000000 +0200 +++ new/tlpkg/tlpobj/textpos.doc.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -1,14 +1,15 @@ name textpos.doc category Package -revision 32571 +revision 41331 shortdesc doc files of textpos relocated 1 -docfiles size=90 +docfiles size=96 RELOC/doc/latex/textpos/LICENCE RELOC/doc/latex/textpos/README - RELOC/doc/latex/textpos/VERSION-1.7j - RELOC/doc/latex/textpos/examples/README-examples + RELOC/doc/latex/textpos/VERSION-1.8 + RELOC/doc/latex/textpos/examples/README.examples RELOC/doc/latex/textpos/examples/t1.tex + RELOC/doc/latex/textpos/examples/t10.tex RELOC/doc/latex/textpos/examples/t2.tex RELOC/doc/latex/textpos/examples/t3.tex RELOC/doc/latex/textpos/examples/t4.tex @@ -16,6 +17,7 @@ RELOC/doc/latex/textpos/examples/t6.tex RELOC/doc/latex/textpos/examples/t7.tex RELOC/doc/latex/textpos/examples/t8.tex + RELOC/doc/latex/textpos/examples/t9.tex RELOC/doc/latex/textpos/niepraschk-eso-pic.pdf RELOC/doc/latex/textpos/niepraschk-eso-pic.tex RELOC/doc/latex/textpos/textpos-example.tex ++++++ textpos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textpos/textpos.sty new/tex/latex/textpos/textpos.sty --- old/tex/latex/textpos/textpos.sty 2014-01-05 00:42:24.000000000 +0100 +++ new/tex/latex/textpos/textpos.sty 2016-11-25 19:34:00.000000000 +0100 @@ -7,7 +7,7 @@ %% textpos.dtx (with options: `package') %% Textpos: absolute positioning of text on the page %%%% File: textpos.dtx -%%%% Copyright 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray +%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -29,11 +29,11 @@ %% %% See the file LICENCE for a copy of the LPPL. %% -%% Mercurial ident: 41b12ce5565c, 2014-01-03 19:15 +0000 +%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{textpos}[2014/01/03 v1.7j] -\typeout{Package: textpos 2014/01/03 1.7j, absolute positioning of text on the page} +\ProvidesPackage{textpos}[2016/06/07 v1.8] +\typeout{Package: textpos 2016/06/07 1.8, absolute positioning of text on the page} \newif\ifTPshowboxes \TPshowboxesfalse @@ -44,6 +44,7 @@ \newif\ifTP@abspos \TP@absposfalse \DeclareOption{absolute}{\TP@abspostrue} +\DeclareOption{relative}{\TP@absposfalse} \newif\ifTP@overlay \TP@overlayfalse \DeclareOption{overlay}{\TP@overlaytrue} @@ -55,6 +56,13 @@ \ifTP@abspos \RequirePackage{everyshi} \fi +\RequirePackage{keyval} +\define@key{tp}{absolute}{\csname TP@abspos#1\endcsname} +\define@key{tp}{overlay}{\csname TP@overlay#1\endcsname} +\define@key{tp}{verbose}{\csname TP@chatter#1\endcsname} +\define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname} +\define@key{tp}{showtext}{\csname TP@showtext#1\endcsname} +\def\TPoptions{\setkeys{tp}} \def\TP@xfloat#1[#2]{ \par\def\@captype{#1}% \@floatpenalty\z@ @@ -236,9 +244,9 @@ \relax \else \egroup % end of inner vbox - \hskip\TP@absmargin + \hskip\TP@absmargin % (just \hfil would work here, too) \egroup % end of inner hbox - \vskip \TP@absmargin + \vskip\TP@absmargin \fi \ifTPshowboxes \vskip-\TPboxrulesize @@ -260,21 +268,18 @@ \ifdim\TP@margin < 0pt \advance\@tempdima \TP@margin \advance\@tempdimb \TP@margin - % #1,#2 are proportions of \TP@textbox size - \@tempdimc=-#1\wd\TP@textbox - \advance\@tempdima\@tempdimc - \@tempdimc=-#2\ht\TP@textbox - \advance\@tempdimb\@tempdimc - \else - % \TP@margin is positive - % #1,#2 are proportions of \TP@framebox size = \TP@textbox+2\TP@margin \@tempdimc=\wd\TP@textbox - \advance\@tempdimc 2\TP@margin - \@tempdimc=#1\@tempdimc + \advance\@tempdimc 2\TP@margin % now \@tempdimc is width of textblock + \multiply\@tempdimc #1 \advance\@tempdima -\@tempdimc \@tempdimc=\ht\TP@textbox - \advance\@tempdimc 2\TP@margin - \@tempdimc=#2\@tempdimc + \advance\@tempdimc 2\TP@margin % now \@tempdimc is height of textblock + \multiply\@tempdimc #2 + \advance\@tempdimb -\@tempdimc + \else + \@tempdimc=#1\wd\TP@textbox + \advance\@tempdima -\@tempdimc + \@tempdimc=#2\ht\TP@textbox \advance\@tempdimb -\@tempdimc \fi \ifTP@abspos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.tlpobj new/tlpkg/tlpobj/textpos.tlpobj --- old/tlpkg/tlpobj/textpos.tlpobj 2016-04-14 19:50:35.000000000 +0200 +++ new/tlpkg/tlpobj/textpos.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -1,6 +1,6 @@ name textpos category Package -revision 32571 +revision 41331 shortdesc Place boxes at arbitrary positions on the LaTeX page relocated 1 longdesc A package to facilitate placement of boxes at absolute @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/textpos/textpos.sty catalogue-ctan /macros/latex/contrib/textpos -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license gpl +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 catalogue-topics layout -catalogue-version 1.7j +catalogue-version 1.8 ++++++ texvc.doc.tar.xz ++++++ ++++++ texvc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texvc.tlpobj new/tlpkg/tlpobj/texvc.tlpobj --- old/tlpkg/tlpobj/texvc.tlpobj 2016-04-14 19:50:36.000000000 +0200 +++ new/tlpkg/tlpobj/texvc.tlpobj 2017-04-14 18:02:16.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/texvc/texvc.sty catalogue-ctan /macros/latex/contrib/texvc -catalogue-date 2015-11-11 05:13:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics foreign-import catalogue-version 1.0 ++++++ texware.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitype.1 new/texmf-dist/doc/man/man1/dvitype.1 --- old/texmf-dist/doc/man/man1/dvitype.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/dvitype.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DVITYPE 1 "16 June 2015" "Web2C 2016" +.TH DVITYPE 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .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 Binary files old/texmf-dist/doc/man/man1/dvitype.man1.pdf and new/texmf-dist/doc/man/man1/dvitype.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pooltype.1 new/texmf-dist/doc/man/man1/pooltype.1 --- old/texmf-dist/doc/man/man1/pooltype.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pooltype.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH POOLTYPE 1 "16 June 2015" "Web2C 2016" +.TH POOLTYPE 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .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 Binary files old/texmf-dist/doc/man/man1/pooltype.man1.pdf and new/texmf-dist/doc/man/man1/pooltype.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texware.doc.tlpobj new/tlpkg/tlpobj/texware.doc.tlpobj --- old/tlpkg/tlpobj/texware.doc.tlpobj 2016-04-27 03:25:11.000000000 +0200 +++ new/tlpkg/tlpobj/texware.doc.tlpobj 2017-05-04 02:07:17.000000000 +0200 @@ -1,8 +1,8 @@ name texware.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of texware -docfiles size=13 +docfiles size=5 texmf-dist/doc/man/man1/dvitype.1 texmf-dist/doc/man/man1/dvitype.man1.pdf texmf-dist/doc/man/man1/pooltype.1 ++++++ tfrupee.doc.tar.xz ++++++ ++++++ tfrupee.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tfrupee.tlpobj new/tlpkg/tlpobj/tfrupee.tlpobj --- old/tlpkg/tlpobj/tfrupee.tlpobj 2016-04-14 19:51:33.000000000 +0200 +++ new/tlpkg/tlpobj/tfrupee.tlpobj 2017-04-14 18:02:40.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/fonts/type1/public/tfrupee/tfrupee.pfb RELOC/tex/latex/tfrupee/tfrupee.sty catalogue-ctan /fonts/tfrupee -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics font font-type1 font-specialist catalogue-version 1.02 ++++++ thalie.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/CHANGELOG.md new/doc/latex/thalie/CHANGELOG.md --- old/doc/latex/thalie/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/thalie/CHANGELOG.md 2017-04-26 00:31:16.000000000 +0200 @@ -0,0 +1,64 @@ +* thalie 0.9b (2017-04-24) + + * Remove blank page at the beginning of documentation. + * Add missing dependency. + + -- Louis Paternault <spalax+ctan(a)gresille.org> + +* thalie 0.9a (2017-04-22) + + * Thalie.sty + + * Commands `\playmark`, `\actmark` and `\scenemark` no longer include label (e.g. "Act 1"). It is up to the user to add it or not. + * Display default translations, even in language environments using non-latin characters where no latin font is available (closes #24). + * Do not add a wrong indentation after character name in verse environment (closes #3). + * Package options can be redefined anywhere in the document (closes #5). + * Reduce vertical space around character names in style `imprimerie-verse` (closes #6). + * Replace package [ifthen](http://ctan.org/pkg/ifthen) with package [etoolbox](http://ctan.org/pkg/etoolbox) (closes #29). + * Style of ramatis personæ can be customized (closes #9 #15 #18 #19). + * Use [translations](http://ctan.org/pkg/translations) to translate words ("act", "scene", etc.). + + * Documentation + + * Add sections *Examples* and *Localization*. + * Add a note about non-latin characters and character style `bold` (closes #26). + * Fix `\customact` example. + * Various minor improvements. + + * README + + * Convert README from text to markdown. + * Add examples. + + -- Louis Paternault <spalax+ctan(a)gresille.org> + +* thalie 0.8 (2015-12-30) + + * Fix release errors in previous release. + + -- Louis Paternault <spalax+ctan(a)gresille.org> + +* thalie 0.7 (2015-12-28) + + * Update project URL to http://framagit.org/spalax/thalie. + * Add commands `\pauseverse`, `\resumeverse` and `\adjustverse`. + * Add package option `xspace`. + * Minor documentation improvements. + + -- Louis Paternault <spalax+ctan(a)gresille.org> + +* thalie 0.6 (2014-06-26) + + * Add character style `imprimerie-verse`, `imprimerie-prose`, and `arden`. + * Correct a lot of typos in documentation (thanks Per). + * Better alignment of groups of characters. + * Improve spacing (thanks Caroline). + * Several documentation and core improvements. + + -- Louis Paternault <spalax+ctan(a)gresille.org> + +* thalie 0.5 (2013-06-08) + + * Initial release. + + -- Louis Paternault <spalax+ctan(a)gresille.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README new/doc/latex/thalie/README --- old/doc/latex/thalie/README 2015-12-30 23:06:16.000000000 +0100 +++ new/doc/latex/thalie/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -Thalie - -A package providing tools to typeset drama plays. It defines commands to -introduce characters' lines, to render stage directions, to divide a play into -acts and scenes, to automatically build the dramatis personae, etc. - -VERSION: 0.8 (2015-12-30) - -PROJECT HOME PAGE: https://git.framasoft.org/spalax/thalie - -LICENSE - -Copyright 2010-2015 Louis Paternault - -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://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of LaTeX - version 2005/12/01 or later. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README.md new/doc/latex/thalie/README.md --- old/doc/latex/thalie/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/thalie/README.md 2017-04-26 00:31:16.000000000 +0200 @@ -0,0 +1,30 @@ +Thalie — A LaTeX package providing tools to typeset drama plays +=============================================================== + +[![Sources](https://img.shields.io/badge/sources-thalie-brightgreen.svg)](http://framagit.org/spalax/thalie) +[![CTAN](https://img.shields.io/ctan/v/thalie.svg)](http://ctan.org/pkg/thalie) +[![Documentation](https://img.shields.io/badge/doc-pdf-brightgreen.svg)](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.pdf) + +It defines commands to introduce characters' lines, to render stage direction, +to divide a play into acts and scenes, to automatically build the dramatis +personae, etc. + +- Version 0.9b (2017-04-24) +- Usage and installation instruction are available in the [documentation](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.p…. +- Examples + - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.9b/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/cyrano.tex)) + - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.9b/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/domjuan.tex)) + - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.9b/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.9b/examples/hamlet.tex)) + +License +------- + +*Copyright 2010-2017 Louis Paternault* + +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://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX version +2005/12/01 or later. Binary files old/doc/latex/thalie/thalie.pdf and new/doc/latex/thalie/thalie.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.doc.tlpobj new/tlpkg/tlpobj/thalie.doc.tlpobj --- old/tlpkg/tlpobj/thalie.doc.tlpobj 2016-04-14 19:51:33.000000000 +0200 +++ new/tlpkg/tlpobj/thalie.doc.tlpobj 2017-04-26 02:09:51.000000000 +0200 @@ -1,9 +1,10 @@ name thalie.doc category Package -revision 39241 +revision 44048 shortdesc doc files of thalie relocated 1 -docfiles size=99 +docfiles size=105 + RELOC/doc/latex/thalie/CHANGELOG.md RELOC/doc/latex/thalie/LICENSE.txt - RELOC/doc/latex/thalie/README + RELOC/doc/latex/thalie/README.md RELOC/doc/latex/thalie/thalie.pdf ++++++ thalie.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-english.trsl new/tex/latex/thalie/thalie-english.trsl --- old/tex/latex/thalie/thalie-english.trsl 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/thalie/thalie-english.trsl 2017-04-24 00:08:37.000000000 +0200 @@ -0,0 +1,26 @@ +\ProvideDictionaryFor{English}{thalie} + +\ProvideDictTranslation{play}{play} +\ProvideDictTranslation{plays}{plays} +\ProvideDictTranslation{Play}{Play} +\ProvideDictTranslation{Plays}{Plays} +\ProvideDictTranslation{act}{acte} +\ProvideDictTranslation{acts}{acts} +\ProvideDictTranslation{Act}{Act} +\ProvideDictTranslation{Acts}{Acts} +\ProvideDictTranslation{scene}{scene} +\ProvideDictTranslation{scenes}{scenes} +\ProvideDictTranslation{Scene}{Scene} +\ProvideDictTranslation{Scenes}{Scenes} +\ProvideDictTranslation{interlude}{interlude} +\ProvideDictTranslation{interludes}{interludes} +\ProvideDictTranslation{Interlude}{Interlude} +\ProvideDictTranslation{Interludes}{Interludes} +\ProvideDictTranslation{curtain}{curtain} +\ProvideDictTranslation{curtains}{curtains} +\ProvideDictTranslation{Curtain}{Curtain} +\ProvideDictTranslation{Curtains}{Curtains} +\ProvideDictTranslation{pause}{pause} +\ProvideDictTranslation{pauses}{pauses} +\ProvideDictTranslation{Pause}{Pause} +\ProvideDictTranslation{Pauses}{Pauses} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-fallback.trsl new/tex/latex/thalie/thalie-fallback.trsl --- old/tex/latex/thalie/thalie-fallback.trsl 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/thalie/thalie-fallback.trsl 2017-04-24 00:08:37.000000000 +0200 @@ -0,0 +1,45 @@ +\ProvideDictionaryFor{fallback}{thalie} + +\makeatletter + +\newcommand{\@latin}[1]{% + % Try hard to display argument, even in an environment that uses non-latin characters. + \ifdefined\normalfontlatin% + {\normalfontlatin#1}% + \else% + {% + \ifdefined\ensureascii% + {\ensureascii{#1}}% + \else% + {#1}% + \fi% + }% + \fi% +} + +\ProvideTranslationFallback{play}{\@latin{play}} +\ProvideTranslationFallback{plays}{\@latin{plays}} +\ProvideTranslationFallback{Play}{\@latin{Play}} +\ProvideTranslationFallback{Plays}{\@latin{Plays}} +\ProvideTranslationFallback{act}{\@latin{acte}} +\ProvideTranslationFallback{acts}{\@latin{acts}} +\ProvideTranslationFallback{Act}{\@latin{Act}} +\ProvideTranslationFallback{Acts}{\@latin{Acts}} +\ProvideTranslationFallback{scene}{\@latin{scene}} +\ProvideTranslationFallback{scenes}{\@latin{scenes}} +\ProvideTranslationFallback{Scene}{\@latin{Scene}} +\ProvideTranslationFallback{Scenes}{\@latin{Scenes}} +\ProvideTranslationFallback{interlude}{\@latin{interlude}} +\ProvideTranslationFallback{interludes}{\@latin{interludes}} +\ProvideTranslationFallback{Interlude}{\@latin{Interlude}} +\ProvideTranslationFallback{Interludes}{\@latin{Interludes}} +\ProvideTranslationFallback{curtain}{\@latin{curtain}} +\ProvideTranslationFallback{curtains}{\@latin{curtains}} +\ProvideTranslationFallback{Curtain}{\@latin{Curtain}} +\ProvideTranslationFallback{Curtains}{\@latin{Curtains}} +\ProvideTranslationFallback{pause}{\@latin{pause}} +\ProvideTranslationFallback{pauses}{\@latin{pauses}} +\ProvideTranslationFallback{Pause}{\@latin{Pause}} +\ProvideTranslationFallback{Pauses}{\@latin{Pauses}} + +\makeatother diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie-french.trsl new/tex/latex/thalie/thalie-french.trsl --- old/tex/latex/thalie/thalie-french.trsl 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/thalie/thalie-french.trsl 2017-04-24 00:08:37.000000000 +0200 @@ -0,0 +1,26 @@ +\ProvideDictionaryFor{French}{thalie} + +\ProvideDictTranslation{play}{pi\`ece} +\ProvideDictTranslation{plays}{pi\`eces} +\ProvideDictTranslation{Play}{Pi\`ece} +\ProvideDictTranslation{Plays}{Pi\`eces} +\ProvideDictTranslation{act}{acte} +\ProvideDictTranslation{acts}{actes} +\ProvideDictTranslation{Act}{Acte} +\ProvideDictTranslation{Acts}{Actes} +\ProvideDictTranslation{scene}{sc\`ene} +\ProvideDictTranslation{scenes}{sc\`enes} +\ProvideDictTranslation{Scene}{Sc\`ene} +\ProvideDictTranslation{Scenes}{Sc\`enes} +\ProvideDictTranslation{interlude}{interm\`ede} +\ProvideDictTranslation{interludes}{interm\`edes} +\ProvideDictTranslation{Interlude}{Interm\`ede} +\ProvideDictTranslation{Interludes}{Interm\`edes} +\ProvideDictTranslation{curtain}{rideau} +\ProvideDictTranslation{curtains}{rideaux} +\ProvideDictTranslation{Curtain}{Rideau} +\ProvideDictTranslation{Curtains}{Rideaux} +\ProvideDictTranslation{pause}{pause} +\ProvideDictTranslation{pauses}{pauses} +\ProvideDictTranslation{Pause}{Pause} +\ProvideDictTranslation{Pauses}{Pauses} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie.sty new/tex/latex/thalie/thalie.sty --- old/tex/latex/thalie/thalie.sty 2015-12-30 23:06:16.000000000 +0100 +++ new/tex/latex/thalie/thalie.sty 2017-04-26 00:31:16.000000000 +0200 @@ -5,7 +5,7 @@ %% The original source files were: %% %% thalie.dtx (with options: `package') -%% Copyright 2010-2015 Louis Paternault +%% Copyright 2010-2017 Louis Paternault %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -23,137 +23,30 @@ %% and the derived file thalie.sty. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{thalie} - [2015/12/30 v0.8 A package to typeset drama plays] -\RequirePackage{ifthen} + [2017/04/24 v0.9b A package to typeset drama plays] + +\RequirePackage{pgfkeys} \RequirePackage{etoolbox} \RequirePackage{suffix} -\RequirePackage{longtable} +\RequirePackage{tabularx} \RequirePackage{xspace} -\RequirePackage{pgfopts} - -\pgfkeys{ - % Character style - /THALIE/.cd, - characterstyle/.value required, - characterstyle/.default=simple, - characterstyle/.is choice, - characterstyle/bold/.code=\def\@characterstyle{bold}, - characterstyle/center/.code=\def\@characterstyle{center}, - characterstyle/margin/.code=\def\@characterstyle{margin}, - characterstyle/simple/.code=\def\@characterstyle{simple}, - characterstyle/arden/.code=\def\@characterstyle{arden}, - characterstyle/imprimerie-verse/.code=\def\@characterstyle{imprimerie-verse}, - characterstyle/imprimerie-prose/.code=\def\@characterstyle{imprimerie-prose}, - characterstyle, -} - -\pgfkeys{ - % play style - /THALIE/.cd, - playstyle/.value required, - playstyle/.default=box, - playstyle/.is choice, - playstyle/center/.code=\def\@playstyle{center}, - playstyle/bigcenter/.code=\def\@playstyle{bigcenter}, - playstyle/box/.code=\def\@playstyle{box}, - playstyle/custom/.code=\def\@playstyle{custom}, - playstyle, -} -\pgfkeys{ - % act style - /THALIE/.cd, - actstyle/.value required, - actstyle/.default=bigcenter, - actstyle/.is choice, - actstyle/center/.code=\def\@actstyle{center}, - actstyle/bigcenter/.code=\def\@actstyle{bigcenter}, - actstyle/box/.code=\def\@actstyle{box}, - actstyle/custom/.code=\def\@actstyle{custom}, - actstyle, -} -\pgfkeys{ - % scene style - /THALIE/.cd, - scenestyle/.value required, - scenestyle/.default=center, - scenestyle/.is choice, - scenestyle/center/.code=\def\@scenestyle{center}, - scenestyle/bigcenter/.code=\def\@scenestyle{bigcenter}, - scenestyle/box/.code=\def\@scenestyle{box}, - scenestyle/custom/.code=\def\@scenestyle{custom}, - scenestyle, -} - -\pgfkeys{ - % play level - /THALIE/.cd, - playlevel/.value required, - playlevel/.default=chapter, - playlevel/.store in=\@playlevel, - playlevel, -} -\pgfkeys{ - % act level - /THALIE/.cd, - actlevel/.value required, - actlevel/.default=section, - actlevel/.store in=\@actlevel, - actlevel, -} -\pgfkeys{ - % scene level - /THALIE/.cd, - scenelevel/.value required, - scenelevel/.default=subsection, - scenelevel/.store in=\@scenelevel, - scenelevel, -} -\pgfkeys{ - % interlude level - /THALIE/.cd, - interludelevel/.value required, - interludelevel/.default=act, - interludelevel/.is choice, - interludelevel/play/.code=\def\@interludelevel{play}, - interludelevel/act/.code=\def\@interludelevel{act}, - interludelevel/scene/.code=\def\@interludelevel{scene}, - interludelevel, -} -\newif\if@xspace -\pgfkeys{ - % xspace option - /THALIE/.cd, - xspace/.value required, - xspace/.is if=@xspace, - xspace/.default=true, - xspace, -} - -\ProcessPgfPackageOptions{/THALIE} -\newcommand{\playname}{Play} -\newcommand{\actname}{Act} -\newcommand{\scenename}{Scene} -\newcommand{\interludename}{Interlude} -\newcommand{\curtainname}{Curtain} -\newcommand{\pausename}{Pause} -\@ifpackageloaded{babel}{ - \addto\captionsfrench{% - \renewcommand{\playname}{Pi\`ece} - \renewcommand{\actname}{Acte} - \renewcommand{\scenename}{Sc\`ene} - \renewcommand{\interludename}{Interm\`ede} - \renewcommand{\curtainname}{Rideau} - \renewcommand{\pausename}{Pause} - } - \addto\captionsenglish{% - % Useless: these are the default... - } -}{} +\RequirePackage{translations} +\LoadDictionary{thalie} +\LoadDictionaryFor{fallback}{thalie} +\newcommand{\playname}{\GetTranslation{Play}} +\newcommand{\actname}{\GetTranslation{Act}} +\newcommand{\scenename}{\GetTranslation{Scene}} +\newcommand{\interludename}{\GetTranslation{Interlude}} +\newcommand{\curtainname}{\GetTranslation{Curtain}} +\newcommand{\pausename}{\GetTranslation{Pause}} \newcommand{\playmark}[1]{% \markboth{\MakeUppercase{#1}}{}% } \newcommand{\actmark}[1]{% - \markright{\MakeUppercase{#1}}% + \markright{\MakeUppercase{% + \GetTranslation{Act}\ \theact% + \ifdefempty{#1}{}{: #1}% + }}% } \newcommand{\scenemark}[1]{% } @@ -168,20 +61,20 @@ % - Style % - Label (none = not in toc) % - Title - \ifthenelse{\equal{#1}{center}}{ + \ifdefstring{#1}{center}{ \begin{center} \textsc{#2} #3 \end{center} - }{\ifthenelse{\equal{#1}{bigcenter}}{ + }{\ifdefstring{#1}{bigcenter}{ \begin{center} \Large \textsc{#2} #3 \end{center} - }{\ifthenelse{\equal{#1}{box}}{ + }{\ifdefstring{#1}{box}{ \begin{center} \framebox{\begin{minipage}{0.7\textwidth} \begin{center} @@ -189,7 +82,7 @@ \vspace{0.5em} #2 - \ifthenelse{\equal{#3}{} \OR \equal{#2}{}}{}{---} + \ifboolexpr{test{\ifstrempty{#3}} or test{\ifstrempty{#2}}}{}{---} #3 \vspace{0.5em} @@ -201,7 +94,7 @@ } \newcommand\@clearpage[1]{% % Clear page if necessary - \ifthenelse{\equal{#1}{part} \OR \equal{#1}{chapter}}{ + \ifboolexpr{test{\ifdefstring{#1}{part}} or test{\ifdefstring{#1}{chapter}}}{ \cleardoublepage \thispagestyle{empty} }{} @@ -209,7 +102,7 @@ \newcommand{\play}[2][]{% \refstepcounter{play} - \ifthenelse{\equal{#1}{}}{ + \ifstrempty{#1}{ \def\@short{#2} }{ \def\@short{#1} @@ -217,7 +110,7 @@ \@clearpage{\@playlevel} \playmark{\@short} \addcontentsline{toc}{\@playlevel}{\@short} - \ifthenelse{\equal{\@playstyle}{custom}}{ + \ifdefstring{\@playstyle}{custom}{ \customplay{\theplay}{#2} }{ \@displaytitle{\@playstyle}{}{#2} @@ -225,7 +118,7 @@ } \WithSuffix\newcommand\play*[1]{% \@clearpage{\@playlevel} - \ifthenelse{\equal{\@playstyle}{custom}}{ + \ifdefstring{\@playstyle}{custom}{ \customplay*{#1} }{ \@displaytitle{\@playstyle}{}{#1} @@ -233,28 +126,28 @@ } \newcommand{\act}[2][]{% \refstepcounter{act} - \ifthenelse{\equal{#1}{}}{ + \ifstrempty{#1}{ \def\@short{#2} }{ \def\@short{#1} } - \ifthenelse{\equal{\@short}{}}{ - \def\@label{\actname{} \theact{}} + \ifdefempty{\@short}{ + \def\@label{\GetTranslation{Act} \theact{}} }{ - \def\@label{\actname{} \theact{}\xspace: } + \def\@label{\GetTranslation{Act} \theact{}\xspace: } } \@clearpage{\@actlevel} - \actmark{\@label\@short} + \actmark{\@short} \addcontentsline{toc}{\@actlevel}{\@label\@short} - \ifthenelse{\equal{\@actstyle}{custom}}{ + \ifdefstring{\@actstyle}{custom}{ \customact{\theact}{#2} }{ - \@displaytitle{\@actstyle}{\actname{} \theact}{#2} + \@displaytitle{\@actstyle}{\GetTranslation{Act} \theact}{#2} } } \WithSuffix\newcommand\act*[1]{% \@clearpage{\@actlevel} - \ifthenelse{\equal{\@actstyle}{custom}}{ + \ifdefstring{\@actstyle}{custom}{ \customact*{#1} }{ \@displaytitle{\@actstyle}{}{#1} @@ -262,76 +155,76 @@ } \newcommand{\scene}[2][]{% \refstepcounter{scene} - \ifthenelse{\equal{#1}{}}{ + \ifstrempty{#1}{ \def\@short{#2} }{ \def\@short{#1} } - \ifthenelse{\equal{\@short}{}}{ - \def\@label{\scenename{} \thescene{}} + \ifdefempty{\@short}{ + \def\@label{\GetTranslation{Scene} \thescene{}} }{ - \def\@label{\scenename{} \thescene{}\xspace: } + \def\@label{\GetTranslation{Scene} \thescene{}\xspace: } } \@clearpage{\@scenelevel} - \scenemark{\@label\@short} + \scenemark{\@short} \addcontentsline{toc}{\@scenelevel}{\@label\@short} - \ifthenelse{\equal{\@scenestyle}{custom}}{ + \ifdefstring{\@scenestyle}{custom}{ \customscene{\thescene}{#2} }{ - \@displaytitle{\@scenestyle}{\scenename{} \thescene}{#2} + \@displaytitle{\@scenestyle}{\GetTranslation{Scene} \thescene}{#2} } } \WithSuffix\newcommand\scene*[1]{% \@clearpage{\@scenelevel} - \ifthenelse{\equal{\@scenestyle}{custom}}{ + \ifdefstring{\@scenestyle}{custom}{ \customscene*{#1} }{ \@displaytitle{\@scenestyle}{}{#1} } } \newcommand{\interlude}[2][]{% - \ifthenelse{\equal{#1}{}}{ + \ifstrempty{#1}{ \def\@short{#2} }{ \def\@short{#1} } - \ifthenelse{\equal{\@short}{}}{ - \def\@label{\interludename{}} + \ifdefempty{\@short}{ + \def\@label{\GetTranslation{Interlude}} }{ - \def\@label{\interludename{}\xspace: } + \def\@label{\GetTranslation{Interlude}\xspace: } } - \ifthenelse{\equal{\@interludelevel}{play}}{ + \ifdefstring{\@interludelevel}{play}{ \@clearpage{\@playlevel} - \playmark{\@label\@short} + \playmark{\@short} \addcontentsline{toc}{\@playlevel}{\@label\@short} - \@displaytitle{\@playstyle}{\interludename}{#2} - }{\ifthenelse{\equal{\@interludelevel}{act}}{ + \@displaytitle{\@playstyle}{\GetTranslation{Interlude}}{#2} + }{\ifdefstring{\@interludelevel}{act}{ \@clearpage{\@actlevel} - \actmark{\@label\@short} + \actmark{\@short} \addcontentsline{toc}{\@actlevel}{\@label\@short} - \@displaytitle{\@actstyle}{\interludename}{#2} + \@displaytitle{\@actstyle}{\GetTranslation{Interlude}}{#2} }{% \@interludelevel is scene \@clearpage{\@scenelevel} - \scenemark{\@label\@short} + \scenemark{\@short} \addcontentsline{toc}{\@scenelevel}{\@label\@short} - \@displaytitle{\@scenestyle}{\interludename}{#2} + \@displaytitle{\@scenestyle}{\GetTranslation{Interlude}}{#2} }} } \WithSuffix\newcommand\interlude*[1]{% - \ifthenelse{\equal{\@interludelevel}{play}}{ + \ifdefstring{\@interludelevel}{play}{ \@clearpage{\@playlevel} - \@displaytitle{\@playstyle}{\interludename}{#1} - }{\ifthenelse{\equal{\@interludelevel}{act}}{ + \@displaytitle{\@playstyle}{\GetTranslation{Interlude}}{#1} + }{\ifdefstring{\@interludelevel}{act}{ \@clearpage{\@actlevel} - \@displaytitle{\@actstyle}{\interludename}{#1} + \@displaytitle{\@actstyle}{\GetTranslation{Interlude}}{#1} }{% \@interludelevel is scene \@clearpage{\@scenelevel} - \@displaytitle{\@scenestyle}{\interludename}{#1} + \@displaytitle{\@scenestyle}{\GetTranslation{Interlude}}{#1} }} } \newcommand\curtain{ \begin{center} - \sffamily\LARGE\bfseries \textsc{\curtainname} + \Large\textsc{\GetTranslation{Curtain}} \end{center} } \newcommand{\@maybexspace}{% @@ -340,97 +233,105 @@ \fi% } \newcommand{\@speaks}[2][]{% - \ifthenelse{\equal{#1}{}}{% + \ifstrempty{#1}{% \speakswithoutdirection{#2}% }{% \speakswithdirection{#2}{#1}% }\@maybexspace% } -\ifthenelse{\equal{\@characterstyle}{bold}}{% - % Bold style - \newcommand\speakswithdirection[2]{% - \noindent% - {\bfseries\sffamily #1} \emph{(#2)}\xspace:% - } - \newcommand\speakswithoutdirection[1]{% - \noindent% - {\bfseries\sffamily #1\xspace:}% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{center}}{% - % Center style - \newcommand\speakswithdirection[2]{% - \begin{center}% - \textsc{#1},\\\emph{#2}% - \end{center}% - }% - \newcommand\speakswithoutdirection[1]{% - \begin{center}% - \textsc{#1}% - \end{center}% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{imprimerie-verse}}{% - % Style for verse plays defined by the French Imprimerie nationale - \newcommand\speakswithdirection[2]{% - \begin{center}% - \textsc{#1}, \emph{#2}% - \end{center}% - }% - \newcommand\speakswithoutdirection[1]{% - \begin{center}% - \textsc{#1}% - \end{center}% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{imprimerie-prose}}{% - % Style for prose plays defined by the French Imprimerie nationale - \newcommand\speakswithdirection[2]{% - \noindent\hspace*{-\parindent}\textsc{#1}, \emph{#2}\xspace:% - }% - \newcommand\speakswithoutdirection[1]{% - \noindent\hspace*{-\parindent}\textsc{#1}\xspace:% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{arden}}{% - \newcommand\speakswithdirection[2]{% - \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}} [\emph{#2}]\quad% - }% - \newcommand\speakswithoutdirection[1]{% - \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{#1}}\quad% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{simple}}{% - % Simple style - \newcommand\speakswithdirection[2]{% - \indent\textsc{#1}, \emph{#2}\xspace:% - }% - \newcommand\speakswithoutdirection[1]{% - \indent\textsc{#1}\xspace:% - }% -}{}% -\ifthenelse{\equal{\@characterstyle}{margin}}{% - % Margin style - \setlength{\leftskip}{3cm} - \newcommand\speakswithdirection[2]{% - \hspace{-3cm} #1 #2 - } - \newcommand\speakswithoutdirection[1]{% - \hspace{-3cm} #1 - }% -}{}% +\newenvironment{@smallcenter} + {\par\smallskip\centering} + {\par\nopagebreak\ignorespacesafterend} +\providecommand{\speakswithdirection}{} +\providecommand{\speakswithoutdirection}{} +\newcommand{\@setcharacterstyle}[1]{ + \ifstrequal{#1}{bold}{% + % Bold style + \renewcommand\speakswithdirection[2]{% + \noindent% + {\bfseries\sffamily ##1} \emph{(##2)}\xspace:% + } + \renewcommand\speakswithoutdirection[1]{% + \noindent% + {\bfseries\sffamily ##1\xspace:}% + }% + }{}% + \ifstrequal{#1}{center}{% + % Center style + \renewcommand\speakswithdirection[2]{% + \begin{center}% + \textsc{##1},\\\emph{##2}% + \end{center}% + \par\ignorespacesafterend% + }% + \renewcommand\speakswithoutdirection[1]{% + \begin{center}% + \textsc{##1}% + \end{center}% + \par\ignorespacesafterend% + }% + }{}% + \ifstrequal{#1}{imprimerie-verse}{% + % Style for verse plays defined by the French Imprimerie nationale + \renewcommand\speakswithdirection[2]{% + \begin{@smallcenter}% + \textsc{##1}, \emph{##2}% + \end{@smallcenter}% + }% + \renewcommand\speakswithoutdirection[1]{% + \begin{@smallcenter}% + \textsc{##1}% + \end{@smallcenter}% + }% + }{}% + \ifstrequal{#1}{imprimerie-prose}{% + % Style for prose plays defined by the French Imprimerie nationale + \renewcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{##1}, \emph{##2}\xspace:% + }% + \renewcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{##1}\xspace:% + }% + }{}% + \ifstrequal{#1}{arden}{% + \renewcommand\speakswithdirection[2]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{##1}} [\emph{##2}]\quad% + }% + \renewcommand\speakswithoutdirection[1]{% + \noindent\hspace*{-\parindent}\textsc{\MakeLowercase{##1}}\quad% + }% + }{}% + \ifstrequal{#1}{simple}{% + % Simple style + \renewcommand\speakswithdirection[2]{% + \indent\textsc{##1}, \emph{##2}\xspace:% + }% + \renewcommand\speakswithoutdirection[1]{% + \indent\textsc{##1}\xspace:% + }% + }{}% + \ifstrequal{#1}{margin}{% + % Margin style + \setlength{\leftskip}{3cm} + \renewcommand\speakswithdirection[2]{% + \hspace{-3cm} ##1 ##2 + } + \renewcommand\speakswithoutdirection[1]{% + \hspace{-3cm} ##1 + }% + }{}% +} \newcommand{\@dramatis@clear}{} -\provideboolean{@dramatis@hidden} +\newcommand{\@empty@}{} +\providebool{@dramatis@hidden} \newenvironment{dramatis}[1][]{ \@dramatis@clear{} \undef{\@dramatis@clear} - \undef{\@dramatis@hook} - \newcommand{\@dramatis@hook}{} - \ifthenelse{\equal{#1}{hidden}}{ - \setboolean{@dramatis@hidden}{true} - }{\ifthenelse{\equal{#1}{}}{ - \setboolean{@dramatis@hidden}{false} - \gappto{\@dramatis@hook}{\begin{longtable}{l}} + \ifstrequal{#1}{hidden}{ + \booltrue{@dramatis@hidden} + }{\ifstrempty{#1}{ + \boolfalse{@dramatis@hidden} + \dramatisenv }{ \ClassError{thalie}{% Environment dramatis does not accept option #1.% @@ -439,43 +340,63 @@ } } }{% - \ifthenelse{\boolean{@dramatis@hidden}}{% - }{% - \gappto{\@dramatis@hook}{\end{longtable}} - \@dramatis@hook{}% - } -} -\newcommand{\@character}[2]{% - \ifthenelse{$ \equal{#1}{} $ \AND $ \equal{#2}{} $}{% - ~% + \notbool{@dramatis@hidden}{% + \enddramatisenv }{}% - \ifthenelse{$ \NOT \equal{#1}{} $ \AND $ \equal{#2}{} $}{% - #1% +} +\newenvironment{dramatisenv}{% + \list{}{\rightmargin1cm\leftmargin2cm}\item[] +}{% + \endlist% +} + +\newcommand{\dramatischaractername}[1]{\textbf{#1}} + +\newcommand{\dramatischaracterdescription}[1]{#1} + +\newcommand{\characterspace}{ % + \notbool{@dramatis@hidden}{% + \smallskip\newline % + }{} % +} + +\newcommand{\dramatischaracter}[2]{ % + \hspace*{-1cm} % + \ifboolexpr{(not test {\ifdefempty{#1}}) and test {\ifdefempty{#2}}}{% + \dramatischaractername{#1} % }{}% - \ifthenelse{$ \equal{#1}{} $ \AND $ \NOT \equal{#2}{} $}{% - #2% + \ifboolexpr{ test{\ifdefempty{#1}} and not test{\ifdefempty{#2}}}{% + \dramatischaracterdescription{#2} % }{}% - \ifthenelse{$ \NOT \equal{#1}{} $ \AND $ \NOT \equal{#2}{} $}{% - #1, #2% + \ifboolexpr{ (not test{\ifdefempty{#1}}) and (not test{\ifdefempty{#2}})}{% + \dramatischaractername{#1}, \dramatischaracterdescription{#2} % }{}% - \tabularnewline -} -\newcommand{\characterspace}{% - \gappto{\@dramatis@hook}{\@character{}{~}} + \newline % } -\newenvironment{charactergroup}[1]{% - \gdef\@groupname{#1} - \gappto{\@dramatis@hook}{ - \hspace{-7.2pt}\begin{math}\left. - \begin{tabular}{ll} - } + + \newlength{\@spaceaftergroup} +\newenvironment{charactergroup}[2][5cm]{% + \notbool{@dramatis@hidden}{% + \gdef\@groupname{#2} % + \gdef\@grouplength{#1} % + \hspace*{-1.3pt}\math\left. % + \minipage[c]{#1} % + \vspace*{2pt} % + }{}% }{% - \gappto{\@dramatis@hook}{ - \end{tabular} - \right\} \end{math} - } - \protected@xappto{\@dramatis@hook}{\@groupname} - \gappto{\@dramatis@hook}{\tabularnewline} + \notbool{@dramatis@hidden}{% + \vspace*{-8pt} % + \endminipage % + \right\} \endmath % + % + \setlength{\@spaceaftergroup}{\linewidth} + \addtolength\@spaceaftergroup{-\@grouplength} + \addtolength\@spaceaftergroup{-20pt} + \begin{minipage}[c]{\@spaceaftergroup} + \@groupname % + \end{minipage} + \newline % + }{}% } \newcommand{\setcharactername}[2]{% \expandafter\gdef\csname#1name\endcsname{% @@ -494,17 +415,16 @@ }% } \newcommand{\@definecharactercommand}[2]{% - \@ifundefined{#1}{% - }{% + \ifcsdef{#1}{% \ClassError{thalie}{% A command named \@backslashchar#1 already exists. We cannot define a new one.% }{% Choose another command name to introduce character #2's lines.% }% - }% - \@ifundefined{#1name}{% }{% + }% + \ifcsdef{#1name}{% \ClassError{thalie}{% A command named \@backslashchar#1name already exists. We cannot define a new one.% @@ -513,6 +433,7 @@ when a new command is defined by adding "name" to it, it does not conflict with an existing one. }% + }{% }% \setcharactername{#1}{#2}% } @@ -520,7 +441,8 @@ \def\defcharcommand@without#1{\@speaks{#1}} \pgfkeys{ % Character definition - /CHARACTER/.is family, /CHARACTER, + /THALIE/CHARACTER/.is family, + /THALIE/CHARACTER, cmd/.value required, cmd/.store in=\@cmd, drama/.value required, @@ -532,36 +454,34 @@ \undef{\@drama} \undef{\@cmd} \undef{\@desc} - \pgfkeys{/CHARACTER, #1}% + \pgfkeys{/THALIE/CHARACTER, #1}% % Forbidden combinations - \ifthenelse{ - $ \( \NOT \isundefined{\@cmd} $ \AND \equal{#2}{} \) \OR - $ \equal{#2}{} \AND \isundefined{\@cmd} \AND \isundefined{\@desc} \AND \isundefined{\@drama} $ \OR - $ \isundefined{\@cmd} \AND \( \NOT \equal{#2}{} $ \AND $ \NOT \isundefined{\@drama} $ \) + \ifboolexpr{ + ( test{\ifdef{\@cmd}} and test{\ifstrempty{#2}} ) or + ( test{\ifstrempty{#2}} and test{\ifundef{\@cmd}} and test{\ifundef{\@desc}} and test{\ifundef{\@drama}} ) or + ( test{\ifundef{\@cmd}} and (not test{\ifstrempty{#2}}) and test{\ifdef{\@drama}} ) }{ \ClassError{thalie}{Invalid character definition.}{All combination of omitted arguments are not allowed. See the documentation for more information} - }{ - % Defining character command - \ifthenelse{$ \NOT \isundefined{\@cmd} $ \AND $ \NOT \equal{#2}{} $}{ - \@definecharactercommand{\@cmd}{#2} - }{ - } - \ifthenelse{ - $ \NOT \equal{#2}{} $ \AND $ \NOT \isundefined{\@cmd} $ \AND $ \NOT \isundefined{\@drama} $ \AND \isundefined{\@desc} - }{ - \ifthenelse{\equal{\@drama}{}}{ + }{} + % Defining character command + \ifboolexpr{ test{\ifdef{\@cmd}} and (not test{\ifstrempty{#2}}) }{% + \@definecharactercommand{\@cmd}{#2} + }{}% + \notbool{@dramatis@hidden}{% + \ifboolexpr{ (not test{\ifstrempty{#2}}) and test{\ifdef{\@cmd}} and test{\ifdef{\@drama}} and test{\ifundef{\@desc}}}{% + \ifdefempty{\@drama}{% % Hidden character. Nothing added to dramatis personae - }{ + }{% % Populating dramatis personae - \protected@xappto{\@dramatis@hook}{\noexpand\@character{\@drama}{}} - } - }{ + \dramatischaracter{\@drama}{\@empty@} + }% + }{% % Populating dramatis personae - \@ifundefined{@desc}{\def\@desc{}}{} - \@ifundefined{@drama}{\def\@drama{#2}}{} - \protected@xappto{\@dramatis@hook}{\noexpand\@character{\@drama}{\@desc}} - } - } + \ifcsundef{@desc}{\gdef\@desc{}}{}% + \ifcsundef{@drama}{\gdef\@drama{#2}}{}% + \dramatischaracter{\@drama}{\@desc} + }% + }{}% } \newcommand{\disposablecharacter}[2][]{% \@speaks[#1]{#2}% @@ -575,7 +495,7 @@ \end{em} \end{quote} } -\newcommand\pause{\did{\pausename}} +\newcommand\pause{\did{\GetTranslation{Pause}}} \newlength{\@verseadjust} @@ -595,6 +515,110 @@ \newcommand{\resumeverse}{% \hspace{\@verseadjust}\hspace{\the\dimen\@ne} } +\RequirePackage{pgfopts} + +\pgfkeys{ + % Character style + /THALIE/.cd, + characterstyle/.value required, + characterstyle/.default=simple, + characterstyle/.is choice, + characterstyle/bold/.code=\@setcharacterstyle{bold}, + characterstyle/center/.code=\@setcharacterstyle{center}, + characterstyle/margin/.code=\@setcharacterstyle{margin}, + characterstyle/simple/.code=\@setcharacterstyle{simple}, + characterstyle/arden/.code=\@setcharacterstyle{arden}, + characterstyle/imprimerie-verse/.code=\@setcharacterstyle{imprimerie-verse}, + characterstyle/imprimerie-prose/.code=\@setcharacterstyle{imprimerie-prose}, + characterstyle, +} + +\pgfkeys{ + % play style + /THALIE/.cd, + playstyle/.value required, + playstyle/.default=box, + playstyle/.is choice, + playstyle/center/.code=\def\@playstyle{center}, + playstyle/bigcenter/.code=\def\@playstyle{bigcenter}, + playstyle/box/.code=\def\@playstyle{box}, + playstyle/custom/.code=\def\@playstyle{custom}, + playstyle, +} +\pgfkeys{ + % act style + /THALIE/.cd, + actstyle/.value required, + actstyle/.default=bigcenter, + actstyle/.is choice, + actstyle/center/.code=\def\@actstyle{center}, + actstyle/bigcenter/.code=\def\@actstyle{bigcenter}, + actstyle/box/.code=\def\@actstyle{box}, + actstyle/custom/.code=\def\@actstyle{custom}, + actstyle, +} +\pgfkeys{ + % scene style + /THALIE/.cd, + scenestyle/.value required, + scenestyle/.default=center, + scenestyle/.is choice, + scenestyle/center/.code=\def\@scenestyle{center}, + scenestyle/bigcenter/.code=\def\@scenestyle{bigcenter}, + scenestyle/box/.code=\def\@scenestyle{box}, + scenestyle/custom/.code=\def\@scenestyle{custom}, + scenestyle, +} + +\pgfkeys{ + % play level + /THALIE/.cd, + playlevel/.value required, + playlevel/.default=chapter, + playlevel/.store in=\@playlevel, + playlevel, +} +\pgfkeys{ + % act level + /THALIE/.cd, + actlevel/.value required, + actlevel/.default=section, + actlevel/.store in=\@actlevel, + actlevel, +} +\pgfkeys{ + % scene level + /THALIE/.cd, + scenelevel/.value required, + scenelevel/.default=subsection, + scenelevel/.store in=\@scenelevel, + scenelevel, +} +\pgfkeys{ + % interlude level + /THALIE/.cd, + interludelevel/.value required, + interludelevel/.default=act, + interludelevel/.is choice, + interludelevel/play/.code=\def\@interludelevel{play}, + interludelevel/act/.code=\def\@interludelevel{act}, + interludelevel/scene/.code=\def\@interludelevel{scene}, + interludelevel, +} +\newif\if@xspace +\pgfkeys{ + % xspace option + /THALIE/.cd, + xspace/.value required, + xspace/.is if=@xspace, + xspace/.default=true, + xspace, +} + +\ProcessPgfPackageOptions{/THALIE} +\newcommand{\setthalieoptions}[1]{% + \pgfkeys{/THALIE/.cd, #1}% +} \endinput %% %% End of file `thalie.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.tlpobj new/tlpkg/tlpobj/thalie.tlpobj --- old/tlpkg/tlpobj/thalie.tlpobj 2016-04-14 19:51:34.000000000 +0200 +++ new/tlpkg/tlpobj/thalie.tlpobj 2017-04-26 02:09:51.000000000 +0200 @@ -1,17 +1,20 @@ name thalie category Package -revision 39241 +revision 44048 shortdesc Typeset drama plays relocated 1 longdesc The package provides tools to typeset drama plays. It defines longdesc commands to introduce characters' lines, to render stage longdesc directions, to divide a play into acts and scenes and to build longdesc the dramatis personae automatically. -runfiles size=4 +runfiles size=8 + RELOC/tex/latex/thalie/thalie-english.trsl + RELOC/tex/latex/thalie/thalie-fallback.trsl + RELOC/tex/latex/thalie/thalie-french.trsl RELOC/tex/latex/thalie/thalie.sty catalogue-also drama dramatist play catalogue-ctan /macros/latex/contrib/thalie -catalogue-date 2015-12-30 21:00:07 +0100 +catalogue-date 2017-04-24 23:53:23 +0200 catalogue-license lppl1.3 catalogue-topics drama-script -catalogue-version 0.8 +catalogue-version 0.9b ++++++ theoremref.doc.tar.xz ++++++ ++++++ theoremref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.tlpobj new/tlpkg/tlpobj/theoremref.tlpobj --- old/tlpkg/tlpobj/theoremref.tlpobj 2016-04-14 19:51:34.000000000 +0200 +++ new/tlpkg/tlpobj/theoremref.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=3 RELOC/tex/latex/theoremref/theoremref.sty catalogue-ctan /macros/latex/contrib/theoremref -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-12-28 10:23:26 +0100 +catalogue-license lpplgpl2 catalogue-topics label-ref maths-theorem ++++++ thesis-ekf.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/README new/doc/latex/thesis-ekf/README --- old/doc/latex/thesis-ekf/README 2015-04-20 00:33:46.000000000 +0200 +++ new/doc/latex/thesis-ekf/README 2017-04-11 00:04:27.000000000 +0200 @@ -1,22 +1,18 @@ -thesis-ekf class, 2014 by Tibor Tomacs +thesis-ekf class +Copyright 2014- by Tibor Tomacs This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.2 of this license or (at your option) any later version. The latest version of this license is in: - http://www.latex-project.org/lppl.txt +http://www.latex-project.org/lppl.txt and version 1.2 or later is part of all distributions of LaTeX version 1999/12/01 or later. Install: - - run 'latex thesis-ekf.ins' for the cls file - - run twice 'pdflatex thesis-ekf.dtx' to get the documentation - -Thesis class for the Eszterhazy Karoly College (Eger, Hungary). -Since the college is in Hungary, -the documentation is given in Hungarian only. - -LaTeX-osztaly szakdolgozat keszitesehez -az Eszterhazy Karoly Foiskola hallgatoi reszere. \ No newline at end of file + - Run 'latex thesis-ekf.ins' for the cls file. + - Run twice 'pdflatex thesis-ekf.dtx' to get the documentation. + +Thesis class for the Eszterhazy Karoly University (Eger, Hungary). \ No newline at end of file Binary files old/doc/latex/thesis-ekf/szakdolgozat1.pdf and new/doc/latex/thesis-ekf/szakdolgozat1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat1.tex new/doc/latex/thesis-ekf/szakdolgozat1.tex --- old/doc/latex/thesis-ekf/szakdolgozat1.tex 2015-04-20 00:33:46.000000000 +0200 +++ new/doc/latex/thesis-ekf/szakdolgozat1.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -\documentclass{thesis-ekf} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\PassOptionsToPackage{defaults=hu-min}{magyar.ldf} -\usepackage[magyar]{babel} -\usepackage{graphicx,amsmath,amssymb,amsthm} -\graphicspath{{./images/}} -\footnotestyle{rule=fourth} - -\newtheorem{tetel}{Tétel}[chapter] -\newtheorem{lemma}[tetel]{Lemma} -\theoremstyle{definition} -\newtheorem{definicio}[tetel]{Definíció} -\newtheorem{feladat}[tetel]{Feladat} -\theoremstyle{remark} -\newtheorem{megjegyzes}[tetel]{Megjegyzés} -\newtheorem*{megoldas}{Megoldás} - -\logo{\includegraphics[width=8cm]{ekf-logo1}} -\institute{Eszterházy Károly Főiskola\\ Matematikai és Informatikai Intézet} -\title{A szakdolgozat címe} -\authorcaption{Készítette:} -\author{Szerző neve\\ szak} -\supervisorcaption{Témavezető:} -\supervisor{Tanár neve\\ beosztás} -\city{Eger} -\date{2015} - -\begin{document} -\maketitle -\tableofcontents - -\chapter*{Bevezetés} - -\chapter{Fejezet címe} - -\section{Szakasz címe} - -\subsection{Alszakasz címe} - -\begin{thebibliography}{1} -\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám. -\end{thebibliography} -\end{document} Binary files old/doc/latex/thesis-ekf/szakdolgozat2.pdf and new/doc/latex/thesis-ekf/szakdolgozat2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat2.tex new/doc/latex/thesis-ekf/szakdolgozat2.tex --- old/doc/latex/thesis-ekf/szakdolgozat2.tex 2015-04-20 00:33:46.000000000 +0200 +++ new/doc/latex/thesis-ekf/szakdolgozat2.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -\documentclass[logodown]{thesis-ekf} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\PassOptionsToPackage{defaults=hu-min}{magyar.ldf} -\usepackage[magyar]{babel} -\usepackage{graphicx,amsmath,amssymb,amsthm} -\graphicspath{{./images/}} -\footnotestyle{rule=fourth} - -\newtheorem{tetel}{Tétel}[chapter] -\newtheorem{lemma}[tetel]{Lemma} -\theoremstyle{definition} -\newtheorem{definicio}[tetel]{Definíció} -\newtheorem{feladat}[tetel]{Feladat} -\theoremstyle{remark} -\newtheorem{megjegyzes}[tetel]{Megjegyzés} -\newtheorem*{megoldas}{Megoldás} - -\logo{\includegraphics[width=3cm]{ekf-logo2}} -\institute{Eszterházy Károly Főiskola\\ Matematikai és Informatikai Intézet} -\title{A szakdolgozat címe} -\authorcaption{Készítette:} -\author{Szerző neve\\ szak} -\supervisorcaption{Témavezető:} -\supervisor{Tanár neve\\ beosztás} -\city{Eger} -\date{2015} - -\begin{document} -\maketitle -\tableofcontents - -\chapter*{Bevezetés} - -\chapter{Fejezet címe} - -\section{Szakasz címe} - -\subsection{Alszakasz címe} - -\begin{thebibliography}{1} -\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám. -\end{thebibliography} -\end{document} Binary files old/doc/latex/thesis-ekf/szakdolgozat3.pdf and new/doc/latex/thesis-ekf/szakdolgozat3.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/szakdolgozat3.tex new/doc/latex/thesis-ekf/szakdolgozat3.tex --- old/doc/latex/thesis-ekf/szakdolgozat3.tex 2015-04-20 00:33:46.000000000 +0200 +++ new/doc/latex/thesis-ekf/szakdolgozat3.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -\documentclass[centeredchapter]{thesis-ekf} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\PassOptionsToPackage{defaults=hu-min}{magyar.ldf} -\usepackage[magyar]{babel} -\usepackage{graphicx,amsmath,amssymb,amsthm} -\graphicspath{{./images/}} -\footnotestyle{rule=fourth} - -\newtheorem{tetel}{Tétel}[chapter] -\newtheorem{lemma}[tetel]{Lemma} -\theoremstyle{definition} -\newtheorem{definicio}[tetel]{Definíció} -\newtheorem{feladat}[tetel]{Feladat} -\theoremstyle{remark} -\newtheorem{megjegyzes}[tetel]{Megjegyzés} -\newtheorem*{megoldas}{Megoldás} - -\logo{\includegraphics[width=9cm]{ekf-logo3}} -\institute{Matematikai és Informatikai Intézet} -\title{A szakdolgozat címe} -\authorcaption{Készítette:} -\author{Szerző neve\\ szak} -\supervisorcaption{Témavezető:} -\supervisor{Tanár neve\\ beosztás} -\city{Eger} -\date{2015} - -\begin{document} -\maketitle -\tableofcontents - -\chapter*{Bevezetés} - -\chapter{Fejezet címe} - -\section{Szakasz címe} - -\subsection{Alszakasz címe} - -\begin{thebibliography}{1} -\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám. -\end{thebibliography} -\end{document} Binary files old/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf and new/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf differ Binary files old/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf and new/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex --- old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex 2017-04-11 00:04:27.000000000 +0200 @@ -0,0 +1,36 @@ +\documentclass[colorlinks]{thesis-ekf} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[english]{babel} +\usepackage{graphicx,amsmath,amssymb,amsthm} +\graphicspath{{./figures/}} + +\newtheorem{thm}{Theorem}[chapter] +\newtheorem{lemma}[thm]{Lemma} +\theoremstyle{definition} +\newtheorem{defin}[thm]{Definition} +\newtheorem{exercise}[thm]{Exercise} +\theoremstyle{remark} +\newtheorem{remark}[thm]{Remark} +\newtheorem*{answer}{Answer} + +\begin{document} +\logo{\includegraphics[width=9cm]{eku-logo}} +\institute{Institute of Mathematics and Informatics} +\title{Title} +\author{John Smith\\ Mathematics B.Sc.} +\supervisor{Dr.~John Brown\\ associate professor} +\city{Eger} +\date{2017} +\maketitle +\tableofcontents + +\chapter*{Introduction} +\chapter{Chapter title} +\section{Section title} +\subsection{Subsection title} + +\begin{thebibliography}{1} +\bibitem{Birkel} \textsc{Birkel, T.}, Moment bounds for associated sequences, Ann.\ Probab.\ 16, 1988. +\end{thebibliography} +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex --- old/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex 2017-04-11 00:04:27.000000000 +0200 @@ -0,0 +1,38 @@ +\documentclass[colorlinks]{thesis-ekf} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\PassOptionsToPackage{defaults=hu-min}{magyar.ldf} +\usepackage[magyar]{babel} +\usepackage{graphicx,amsmath,amssymb,amsthm} +\graphicspath{{./figures/}} % A képfájlokat a [figures] mappába kell tenni! +\footnotestyle{rule=fourth} + +\newtheorem{tetel}{Tétel}[chapter] +\newtheorem{lemma}[tetel]{Lemma} +\theoremstyle{definition} +\newtheorem{definicio}[tetel]{Definíció} +\newtheorem{feladat}[tetel]{Feladat} +\theoremstyle{remark} +\newtheorem{megjegyzes}[tetel]{Megjegyzés} +\newtheorem*{megoldas}{Megoldás} + +\begin{document} +\logo{\includegraphics[width=9cm]{eke-logo}} +\institute{Matematikai és Informatikai Intézet} +\title{A szakdolgozat címe} +\author{Szerző neve\\ szak} +\supervisor{Tanár neve\\ beosztás} +\city{Eger} +\date{2017} +\maketitle +\tableofcontents + +\chapter*{Bevezetés} +\chapter{Fejezet címe} +\section{Szakasz címe} +\subsection{Alszakasz címe} + +\begin{thebibliography}{1} +\bibitem{cimke} \textsc{Szerző}: Cím, Kiadó, Hely, évszám. +\end{thebibliography} +\end{document} Binary files old/doc/latex/thesis-ekf/thesis-ekf.pdf and new/doc/latex/thesis-ekf/thesis-ekf.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj --- old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2016-04-14 19:51:34.000000000 +0200 +++ new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -1,14 +1,12 @@ name thesis-ekf.doc category Package -revision 36950 +revision 43745 shortdesc doc files of thesis-ekf relocated 1 -docfiles size=567 +docfiles size=291 RELOC/doc/latex/thesis-ekf/README - RELOC/doc/latex/thesis-ekf/szakdolgozat1.pdf - RELOC/doc/latex/thesis-ekf/szakdolgozat1.tex - RELOC/doc/latex/thesis-ekf/szakdolgozat2.pdf - RELOC/doc/latex/thesis-ekf/szakdolgozat2.tex - RELOC/doc/latex/thesis-ekf/szakdolgozat3.pdf - RELOC/doc/latex/thesis-ekf/szakdolgozat3.tex + RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eke-logo.pdf + RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/figures/eku-logo.pdf + RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-en.tex + RELOC/doc/latex/thesis-ekf/thesis-ekf-templates/thesis-ekf-template-hu.tex RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf ++++++ thesis-ekf.tar.xz ++++++ Binary files old/tex/latex/thesis-ekf/images/ekf-logo1.png and new/tex/latex/thesis-ekf/images/ekf-logo1.png differ Binary files old/tex/latex/thesis-ekf/images/ekf-logo2.pdf and new/tex/latex/thesis-ekf/images/ekf-logo2.pdf differ Binary files old/tex/latex/thesis-ekf/images/ekf-logo3.pdf and new/tex/latex/thesis-ekf/images/ekf-logo3.pdf differ Binary files old/tex/latex/thesis-ekf/images/ekf-logo4.pdf and new/tex/latex/thesis-ekf/images/ekf-logo4.pdf differ Binary files old/tex/latex/thesis-ekf/images/ekf-logo5.pdf and new/tex/latex/thesis-ekf/images/ekf-logo5.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thesis-ekf/thesis-ekf.cls new/tex/latex/thesis-ekf/thesis-ekf.cls --- old/tex/latex/thesis-ekf/thesis-ekf.cls 2015-04-20 00:33:46.000000000 +0200 +++ new/tex/latex/thesis-ekf/thesis-ekf.cls 2017-04-11 00:04:27.000000000 +0200 @@ -6,7 +6,7 @@ %% %% ./thesis-ekf.dtx (with options: `class') %% This is a generated file. -%% Copyright (C) 2014 Tibor Tomacs +%% Copyright (C) 2014- by Tibor Tomacs %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.2 of this license or (at your option) any later @@ -19,56 +19,65 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{thesis-ekf}[2015/04/19 v1.1 class for EKF thesis] -\LoadClass[a4paper,12pt]{report} -\RequirePackage[top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry} -\RequirePackage[unicode,linktocpage,linkcolor=blue,citecolor=blue,urlcolor=blue, -pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref} -\linespread{1.24} -\overfullrule10pt +\ProvidesClass{thesis-ekf}[2017/04/08 v2.1 Thesis class for Eszterhazy Karoly University (Eger, Hungary)] + +\RequirePackage{kvoptions,etoolbox,setspace} +\SetupKeyvalOptions{family=ekf,prefix=ekf@} +\DeclareVoidOption{twoside}{\PassOptionsToClass{twoside}{report}} +\DeclareVoidOption{colorlinks}{\PassOptionsToPackage{colorlinks}{hyperref}} +\DeclareBoolOption{logodown} +\DeclareBoolOption[true]{centeredchapter} +\DeclareStringOption[12pt]{fontsize} +\DeclareStringOption[10mm]{institutesep} +\DeclareStringOption[0mm]{logosep} +\DeclareStringOption[\stretch{1.5}]{titlesep} +\DeclareStringOption[15mm]{authorsep} +\DeclareStringOption[10mm]{xmargin} +\DeclareStringOption[1mm]{captionsep} +\DeclareStringOption[\large\normalfont\scshape]{institutefont} +\DeclareStringOption[\large\normalfont\scshape]{logofont} +\DeclareStringOption[\Huge\normalfont\sffamily\bfseries]{titlefont} +\DeclareStringOption[\large\normalfont]{authorfont} +\DeclareStringOption[\large\normalfont\bfseries]{captionfont} +\DeclareStringOption[\large\normalfont\scshape]{cityfont} +\ProcessKeyvalOptions{ekf} +\InputIfFileExists{thesis-ekf.cfg}{}{} + +\def\ekf@ten{10pt} +\def\ekf@eleven{11pt} +\def\ekf@twelve{12pt} + +\ifx\ekf@fontsize\ekf@ten\else +\ifx\ekf@fontsize\ekf@eleven\else +\ifx\ekf@fontsize\ekf@twelve\else +\ClassWarning{thesis-ekf}{Unused option: fontsize=\ekf@fontsize. Use fontsize=10pt, fontsize=11pt or fontsize=12pt!} +\def\ekf@fontsize{12pt} +\fi\fi\fi + +\PassOptionsToClass{\ekf@fontsize}{report} +\LoadClass{report} + +\RequirePackage[unicode,linktocpage,allcolors=blue,pdfstartview=FitH,bookmarksnumbered,pdfborder={0 0 0}]{hyperref} +\RequirePackage[a4paper,top=25mm,bottom=25mm,inner=30mm,outer=25mm]{geometry} + +\onehalfspacing \flushbottom \widowpenalty=10000 \clubpenalty=10000 -\if@twoside -\def\ps@plain{} -\def\@oddfoot{\hbox{}\hfill\normalsize\textnormal\thepage} -\def\@evenfoot{\normalsize\textnormal\thepage} -\def\@aftertitlepage{\thispagestyle{empty}\hbox{}\newpage} -\else -\def\@aftertitlepage{} -\fi - -\renewcommand*\l@chapter[2]{% - \ifnum \c@tocdepth >\z@ - \addpenalty\@secpenalty - \addvspace{1.0em \@plus\p@}% - \setlength\(a)tempdima{1.8em}% - \begingroup - \parindent \z@ \rightskip \@pnumwidth - \parfillskip -\@pnumwidth - \leavevmode \bfseries - \advance\leftskip\@tempdima - \hskip -\leftskip - #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par - \endgroup - \fi} -\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}} -\renewcommand*\l@subsection{\@dottedtocline{2}{4.1em}{3.2em}} - -\def\thesisekf@chapternumber{% +\def\ekf@chapternumber{% \@ifundefined{l@magyar} {\@chapapp\space \thechapter} {\iflanguage{magyar} {\magyar@huordinal@chapterheaddot \@chapapp} {\@chapapp\space \thechapter}}} -\def\thesisekf@centeredchapter{% +\def\ekf@centeredchapter{% \def\@makechapterhead##1{% \vspace*{50\p@}% {\parindent \z@ \raggedright \normalfont \ifnum \c@secnumdepth >\m@ne - {\centering\huge\bfseries \thesisekf@chapternumber + {\centering\huge\bfseries \ekf@chapternumber \par\nobreak} \vskip 20\p@ \fi @@ -85,55 +94,147 @@ \vskip 40\p@ }}} -\def\logo#1{\def\@logo{#1}}\logo{LOGO} -\def\institute#1{\def\@institute{#1}}\institute{INSTITUTE} -\def\authorcaption#1{\def\@authorcaption{#1}}\authorcaption{Author:} -\def\supervisorcaption#1{\def\@supervisorcaption{#1}}\supervisorcaption{Supervisor:} -\def\supervisor#1{\def\@supervisor{#1}}\supervisor{} -\def\city#1{\def\@city{#1}}\city{} +\AfterEndPreamble{ + +\ifekf@centeredchapter + \ekf@centeredchapter + \let\original@selectlanguage\selectlanguage + \def\selectlanguage#1{\original@selectlanguage{#1}\ekf@centeredchapter}\fi + +\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 \normalcolor #5}% + \par}% + \fi} + +\renewcommand*\l@chapter[2]{% + \ifnum \c@tocdepth >\z@ + \addpenalty\@secpenalty + \addvspace{1.0em \@plus\p@}% + \setlength\(a)tempdima{1.8em}% + \begingroup + \parindent \z@ \rightskip \@pnumwidth + \parfillskip -\@pnumwidth + \leavevmode \bfseries + \advance\leftskip\@tempdima + \hskip -\leftskip + #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par + \endgroup + \fi} +\renewcommand*\l@section{\@dottedtocline{1}{1.8em}{2.5em}} +\renewcommand*\l@subsection{\@dottedtocline{2}{4.3em}{3.2em}} + +\if@nochanged@authorcaption@% + \@ifundefined{l@magyar}{}{% + \iflanguage{magyar}{\gdef\ekf@authorcaption{K\'{e}sz\'{\i}tette}}{}}\fi + +\if@nochanged@supervisorcaption@% + \@ifundefined{l@magyar}{}{% + \iflanguage{magyar}{\gdef\ekf@supervisorcaption{T\'{e}mavezet\H{o}}}{}}\fi + +} + +\def\logo#1{\gdef\ekf@logo{#1}} +\logo{} +\def\ekf@logo@{\ifx\ekf@logo\@empty% + \ClassWarning{thesis-ekf}{There isn't logo!}% + \else\ekf@logo\fi} + +\def\institute#1{\gdef\ekf@institute{#1}} +\institute{} +\def\ekf@institute@{\ifx\ekf@institute\@empty% + \ClassWarning{thesis-ekf}{There isn't institute!}% + \else\ekf@institute\fi} + +\def\title#1{\gdef\ekf@title{#1}} +\title{} +\def\ekf@title@{\ifx\ekf@title\@empty + \ClassWarning{thesis-ekf}{There isn't title!}~% + \else\ekf@title\fi} + +\def\author#1{\gdef\ekf@author{#1}} +\author{} +\def\ekf@author@{\ifx\ekf@author\@empty + \ClassWarning{thesis-ekf}{There isn't author!}~% + \else\ekf@author\fi} + +\newif\if@nochanged@authorcaption@\@nochanged@authorcaption@true +\def\authorcaption#1{\@nochanged@authorcaption@false\gdef\ekf@authorcaption{#1}} +\def\ekf@authorcaption{Author} +\def\ekf@authorcaption@{\ifx\ekf@author\@empty~% + \else + \ifx\ekf@authorcaption\@empty + \ClassWarning{thesis-ekf}{There isn't authorcaption!}~% + \else\ekf@authorcaption\fi\fi} + +\def\supervisor#1{\gdef\ekf@supervisor{#1}} +\supervisor{} +\def\ekf@supervisor@{\ifx\ekf@supervisor\@empty + \ClassWarning{thesis-ekf}{There isn't supervisor!}~% + \else\ekf@supervisor\fi} + +\newif\if@nochanged@supervisorcaption@\@nochanged@supervisorcaption@true +\def\supervisorcaption#1{\@nochanged@supervisorcaption@false\gdef\ekf@supervisorcaption{#1}} +\def\ekf@supervisorcaption{Supervisor} +\def\ekf@supervisorcaption@{\ifx\ekf@supervisor\@empty~% + \else + \ifx\ekf@supervisorcaption\@empty + \ClassWarning{thesis-ekf}{There isn't supervisorcaption!}~% + \else\ekf@supervisorcaption\fi\fi} + +\def\city#1{\gdef\ekf@city{#1}} +\city{} +\def\ekf@city@{\ekf@city\ifx\ekf@city\@empty% + \ClassWarning{thesis-ekf}{There isn't city!}\fi} + +\def\date#1{\gdef\ekf@date{#1}} +\date{\number\year} +\def\ekf@date@{\ekf@date\ifx\ekf@date\@empty% + \ClassWarning{thesis-ekf}{There isn't date!}\fi} + +\def\ekf@sep{,~} +\def\ekf@sep@{\ifx\ekf@city\@empty\else\ifx\ekf@date\@empty\else\ekf@sep\fi\fi} \def\maketitle{ -\if@centeredchapter -\thesisekf@centeredchapter -\let\oldselectlanguage\selectlanguage -\def\selectlanguage##1{\oldselectlanguage{##1}\thesisekf@centeredchapter} -\fi \thispagestyle{empty} -\begin{large} -\centering -\if@logono{\scshape\@institute\\}\fi -\if@logoup{\scshape\@logo\\\@institute\\}\fi -\if@logodown{\scshape\@institute\\[10mm]\@logo\\}\fi -\vfill{\Huge\sffamily\bfseries\(a)title\\}\vspace{\stretch{1.8}} -\begin{tabular}[t]{@{\hspace{10mm}}l@{}} -{\bfseries\@authorcaption}\\[1mm] -\@author +{\centering +\ifekf@logodown +{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty\else\\ +\vspace{\ekf@institutesep}\fi} +{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty~\\\else\\\fi} +\else +{\ekf@logofont\ekf@logo@\ifx\ekf@logo\@empty\else\\\vspace{\ekf@logosep}\fi} +{\ekf@institutefont\ekf@institute@\ifx\ekf@institute\@empty~\\\else\\\fi} +\fi +\vfill{\ekf@titlefont\ekf@title@\\}\vspace{\ekf@titlesep} +{\ekf@authorfont +\begin{tabular}[t]{@{\hspace{\ekf@xmargin}}l@{}} +{\ekf@captionfont\ekf@authorcaption@}\\[\ekf@captionsep] +\ekf@author@ \end{tabular} \hfill -\begin{tabular}[t]{@{}l@{\hspace{10mm}}} -{\bfseries\@supervisorcaption}\\[1mm] -\@supervisor -\end{tabular} -\par\vspace{15mm} -{\scshape\@city\if\@city\empty\else,~\fi\@date\par} -\end{large} -\newpage\@aftertitlepage} - -\newif\if@logono -\newif\if@logoup -\newif\if@logodown -\newif\if@centeredchapter - -\DeclareOption{nocolorlinks}{\hypersetup{colorlinks=false}} -\DeclareOption{colorlinks}{\hypersetup{colorlinks}} -\DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse} -\DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue} -\DeclareOption{logono}{\@logonotrue\@logoupfalse\@logodownfalse} -\DeclareOption{logoup}{\@logonofalse\@logouptrue\@logodownfalse} -\DeclareOption{logodown}{\@logonofalse\@logoupfalse\@logodowntrue} -\DeclareOption{centeredchapter}{\@centeredchaptertrue} -\ExecuteOptions{nocolorlinks,oneside,logoup} -\ProcessOptions +\begin{tabular}[t]{@{}l@{\hspace{\ekf@xmargin}}} +{\ekf@captionfont\ekf@supervisorcaption@}\\[\ekf@captionsep] +\ekf@supervisor@ +\end{tabular}} +\par\vspace{\ekf@authorsep} +{\ekf@cityfont\ekf@city@\ekf@sep@\ekf@date@\par} +} +\newpage +\if@twoside\thispagestyle{empty}\hbox{}\newpage\fi} + \endinput %% %% End of file `thesis-ekf.cls'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.tlpobj new/tlpkg/tlpobj/thesis-ekf.tlpobj --- old/tlpkg/tlpobj/thesis-ekf.tlpobj 2016-04-14 19:51:35.000000000 +0200 +++ new/tlpkg/tlpobj/thesis-ekf.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -1,19 +1,14 @@ name thesis-ekf category Package -revision 36950 -shortdesc Thesis class for Eszterhazy Karoly College +revision 43745 +shortdesc Thesis class for Eszterhazy Karoly University relocated 1 -longdesc The distribution contains the files to generate the thesis -longdesc class as well as three templates. -runfiles size=848 - RELOC/tex/latex/thesis-ekf/images/ekf-logo1.png - RELOC/tex/latex/thesis-ekf/images/ekf-logo2.pdf - RELOC/tex/latex/thesis-ekf/images/ekf-logo3.pdf - RELOC/tex/latex/thesis-ekf/images/ekf-logo4.pdf - RELOC/tex/latex/thesis-ekf/images/ekf-logo5.pdf +longdesc This is a class file for theses and dissertations in the +longdesc Eszterhazy Karoly University (Eger, Hungary). +runfiles size=2 RELOC/tex/latex/thesis-ekf/thesis-ekf.cls catalogue-ctan /macros/latex/contrib/thesis-ekf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-08 12:47:10 +0200 catalogue-license lppl1.2 catalogue-topics dissertation class -catalogue-version 1.1 +catalogue-version 2.1 ++++++ thesis-titlepage-fhac.doc.tar.xz ++++++ ++++++ thesis-titlepage-fhac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj new/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj --- old/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj 2016-04-14 19:51:37.000000000 +0200 +++ new/tlpkg/tlpobj/thesis-titlepage-fhac.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/thesis-titlepage-fhac/figbib_add.sty RELOC/tex/latex/thesis-titlepage-fhac/gloss_add.sty catalogue-ctan /macros/latex/contrib/thesis-titlepage-fhAC -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation catalogue-version 0.1 ++++++ thinsp.doc.tar.xz ++++++ ++++++ thinsp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thinsp.tlpobj new/tlpkg/tlpobj/thinsp.tlpobj --- old/tlpkg/tlpobj/thinsp.tlpobj 2016-04-14 19:51:38.000000000 +0200 +++ new/tlpkg/tlpobj/thinsp.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=1 RELOC/tex/latex/thinsp/thinsp.sty catalogue-ctan /macros/latex/contrib/thinsp -catalogue-date 2016-02-10 22:17:36 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics typesetting catalogue-version 0.2 ++++++ thmbox.doc.tar.xz ++++++ ++++++ thmbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmbox.tlpobj new/tlpkg/tlpobj/thmbox.tlpobj --- old/tlpkg/tlpobj/thmbox.tlpobj 2016-04-14 19:51:38.000000000 +0200 +++ new/tlpkg/tlpobj/thmbox.tlpobj 2017-04-14 18:02:41.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/thmbox/thmbox.sty catalogue-also shadethm catalogue-ctan /macros/latex/contrib/thmbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-theorem decoration ++++++ thmtools.doc.tar.xz ++++++ ++++++ thmtools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.tlpobj new/tlpkg/tlpobj/thmtools.tlpobj --- old/tlpkg/tlpobj/thmtools.tlpobj 2016-04-14 19:51:38.000000000 +0200 +++ new/tlpkg/tlpobj/thmtools.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -28,7 +28,7 @@ RELOC/tex/latex/thmtools/thmtools.sty RELOC/tex/latex/thmtools/unique.sty catalogue-ctan /macros/latex/exptl/thmtools -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths-theorem catalogue-version 66 ++++++ threadcol.doc.tar.xz ++++++ ++++++ threadcol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threadcol.tlpobj new/tlpkg/tlpobj/threadcol.tlpobj --- old/tlpkg/tlpobj/threadcol.tlpobj 2016-04-14 19:51:39.000000000 +0200 +++ new/tlpkg/tlpobj/threadcol.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=1 RELOC/tex/latex/threadcol/threadcol.sty catalogue-ctan /macros/latex/contrib/threadcol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pdf-feat catalogue-version 1.0 ++++++ threeddice.doc.tar.xz ++++++ ++++++ threeddice.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeddice.tlpobj new/tlpkg/tlpobj/threeddice.tlpobj --- old/tlpkg/tlpobj/threeddice.tlpobj 2016-04-14 19:51:39.000000000 +0200 +++ new/tlpkg/tlpobj/threeddice.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/metapost/threeddice/threeddice.mp catalogue-also dice epsdice catalogue-ctan /graphics/metapost/contrib/macros/threeddice -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use catalogue-version 1.0 ++++++ threeparttable.doc.tar.xz ++++++ ++++++ threeparttable.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeparttable.tlpobj new/tlpkg/tlpobj/threeparttable.tlpobj --- old/tlpkg/tlpobj/threeparttable.tlpobj 2016-04-14 19:51:39.000000000 +0200 +++ new/tlpkg/tlpobj/threeparttable.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/threeparttable/3parttable.sty RELOC/tex/latex/threeparttable/threeparttable.sty catalogue-ctan /macros/latex/contrib/threeparttable -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics table notes ++++++ threeparttablex.doc.tar.xz ++++++ ++++++ threeparttablex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/threeparttablex.tlpobj new/tlpkg/tlpobj/threeparttablex.tlpobj --- old/tlpkg/tlpobj/threeparttablex.tlpobj 2016-04-14 19:51:39.000000000 +0200 +++ new/tlpkg/tlpobj/threeparttablex.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/threeparttablex/threeparttablex.sty catalogue-ctan /macros/latex/contrib/threeparttablex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics table notes catalogue-version 0.3 ++++++ thumb.doc.tar.xz ++++++ ++++++ thumb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumb.tlpobj new/tlpkg/tlpobj/thumb.tlpobj --- old/tlpkg/tlpobj/thumb.tlpobj 2016-04-14 19:51:40.000000000 +0200 +++ new/tlpkg/tlpobj/thumb.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/latex/thumb/thumb.sty catalogue-also fancyhdr catalogue-ctan /macros/latex/contrib/thumb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics layout-page catalogue-version 1.0 ++++++ thumbpdf.doc.tar.xz ++++++ ++++++ thumbpdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumbpdf.tlpobj new/tlpkg/tlpobj/thumbpdf.tlpobj --- old/tlpkg/tlpobj/thumbpdf.tlpobj 2016-04-14 19:51:40.000000000 +0200 +++ new/tlpkg/tlpobj/thumbpdf.tlpobj 2017-04-14 18:02:42.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/tex/generic/thumbpdf/thumbpdf.sty texmf-dist/tex/generic/thumbpdf/thumbpdf.tex catalogue-ctan /support/thumbpdf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pdf-feat catalogue-version 3.16 ++++++ thumbs.doc.tar.xz ++++++ ++++++ thumbs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumbs.tlpobj new/tlpkg/tlpobj/thumbs.tlpobj --- old/tlpkg/tlpobj/thumbs.tlpobj 2016-04-14 19:51:41.000000000 +0200 +++ new/tlpkg/tlpobj/thumbs.tlpobj 2017-04-14 18:02:43.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=14 RELOC/tex/latex/thumbs/thumbs.sty catalogue-ctan /macros/latex/contrib/thumbs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout-page catalogue-version 1.0q ++++++ thumby.doc.tar.xz ++++++ ++++++ thumby.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thumby.tlpobj new/tlpkg/tlpobj/thumby.tlpobj --- old/tlpkg/tlpobj/thumby.tlpobj 2016-04-14 19:51:41.000000000 +0200 +++ new/tlpkg/tlpobj/thumby.tlpobj 2017-04-14 18:02:43.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=3 RELOC/tex/latex/thumby/thumby.sty catalogue-ctan /macros/latex/contrib/thumby -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics layout-page catalogue-version 0.1 ++++++ thuthesis.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/Makefile new/doc/latex/thuthesis/Makefile --- old/doc/latex/thuthesis/Makefile 2016-03-02 00:38:54.000000000 +0100 +++ new/doc/latex/thuthesis/Makefile 2017-03-26 23:47:40.000000000 +0200 @@ -106,5 +106,5 @@ @if [ -z "$(version)" ]; then \ echo "Usage: make dist version=[x.y.z | ctan]"; \ else \ - gulp build --version=$(version); \ + npm run build -- --version=$(version); \ fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/README.md new/doc/latex/thuthesis/README.md --- old/doc/latex/thuthesis/README.md 2016-03-02 00:38:54.000000000 +0100 +++ new/doc/latex/thuthesis/README.md 2017-03-26 23:47:40.000000000 +0200 @@ -7,7 +7,7 @@ 此宏包旨在建立一个简单易用的清华大学学位论文LaTeX模板，包括本科综合论文训练、硕士论文、博士论文、博士哲学论文以及博士后出站报告。现在支持本科、硕士、博士论文、博士后出站报告格式，对其它格式（还有么？）的支持会陆续加入。 # 文档 -请下载模板，里面包括具体使用说明以及示例文档： +请[下载](https://github.com/xueruini/thuthesis/releases)模板，里面包括具体使用说明以及示例文档： * 模板使用说明 (thuthesis.pdf) * 示例文档 (main.pdf) @@ -22,13 +22,16 @@ 通过TeX发行版工具自动从[CTAN](http://www.ctan.org/pkg/thuthesis)更新。 ## 手动更新 -从 [GitHub](https://github.com/xueruini/thuthesis)下载放入论文目录，执行命令： +从 [GitHub](https://github.com/xueruini/thuthesis)下载放入论文目录，执行命令（Windows 用户在文件夹空白处按`Shift+鼠标右键`，点击“在此处打开命令行窗口”）： - $ latex thuthesis.ins + latex thuthesis.ins + +即可得到 `thuthesis.cls` 和 `thuthesis.cfg` 等模板文件。 # 提问按推荐顺序排序： +* 先到 [FAQ](https://github.com/xueruini/thuthesis/wiki/FAQ) 看看常见问题 * [Github Issues](http://github.com/xueruini/thuthesis/issues) * [TeX@newsmth](http://www.newsmth.net/nForum/#!board/TeX) * [ThuThesis@Google Groups](http://groups.google.com/group/thuthesis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/data/ack.tex new/doc/latex/thuthesis/data/ack.tex --- old/doc/latex/thuthesis/data/ack.tex 2016-01-19 00:37:47.000000000 +0100 +++ new/doc/latex/thuthesis/data/ack.tex 2017-03-26 23:47:40.000000000 +0200 @@ -1,5 +1,5 @@ % 如果使用声明扫描页，将可选参数指定为扫描后的 PDF 文件名，例如： -% \begin{ack}[scan-statement.pdf] +% \begin{acknowledgement}[scan-statement.pdf] \begin{acknowledgement} 衷心感谢导师 xxx 教授和物理系 xxx 副教授对本人的精心指导。他们的言传身教将使我终生受益。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/dtx-style.sty new/doc/latex/thuthesis/dtx-style.sty --- old/doc/latex/thuthesis/dtx-style.sty 2016-02-02 00:07:09.000000000 +0100 +++ new/doc/latex/thuthesis/dtx-style.sty 2017-03-26 23:47:40.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2016 by Ruini Xue <xueruini(a)gmail.com> +%% Copyright (C) 2005-2017 by Ruini Xue <xueruini(a)gmail.com> %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -127,8 +127,8 @@ \texttt{#2}\IfBooleanF#1{\thu@special@index{file}{#2}}} \newcommand{\myentry}[1]{% \marginpar{\raggedleft\color{purple}\bfseries\strut #1}} -\newcommand{\note}[1]{{% - \color{magenta}{\bfseries 说明：}\emph{#1}}} +\newcommand{\note}[2][Note]{{% + \color{magenta}{\bfseries #1}\emph{#2}}} \def\thuthesis{\textsc{Thu}\-\textsc{Thesis}} \endinput Binary files old/doc/latex/thuthesis/figures/scan-record.pdf and new/doc/latex/thuthesis/figures/scan-record.pdf differ Binary files old/doc/latex/thuthesis/main.pdf and new/doc/latex/thuthesis/main.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thuthesis/main.tex new/doc/latex/thuthesis/main.tex --- old/doc/latex/thuthesis/main.tex 2016-02-02 00:07:09.000000000 +0100 +++ new/doc/latex/thuthesis/main.tex 2017-03-26 23:47:40.000000000 +0200 @@ -68,4 +68,8 @@ %% 个人简历 \include{data/resume} + +%% 本科生进行格式审查是需要下面这个表格，答辩可能不需要。选择性留下。 +% 综合论文训练记录表 +\includepdf[pages=-]{scan-record.pdf} \end{document} Binary files old/doc/latex/thuthesis/shuji.pdf and new/doc/latex/thuthesis/shuji.pdf differ Binary files old/doc/latex/thuthesis/thuthesis.pdf and new/doc/latex/thuthesis/thuthesis.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thuthesis.doc.tlpobj new/tlpkg/tlpobj/thuthesis.doc.tlpobj --- old/tlpkg/tlpobj/thuthesis.doc.tlpobj 2016-04-14 19:51:41.000000000 +0200 +++ new/tlpkg/tlpobj/thuthesis.doc.tlpobj 2017-04-14 18:02:43.000000000 +0200 @@ -1,9 +1,9 @@ name thuthesis.doc category Package -revision 40085 +revision 43609 shortdesc doc files of thuthesis relocated 1 -docfiles size=773 +docfiles size=787 RELOC/doc/latex/thuthesis/Makefile RELOC/doc/latex/thuthesis/README.md RELOC/doc/latex/thuthesis/data/ack.tex @@ -15,6 +15,7 @@ RELOC/doc/latex/thuthesis/data/resume.tex RELOC/doc/latex/thuthesis/dtx-style.sty RELOC/doc/latex/thuthesis/figures/scan-auth.pdf + RELOC/doc/latex/thuthesis/figures/scan-record.pdf RELOC/doc/latex/thuthesis/figures/scan-statement.pdf RELOC/doc/latex/thuthesis/figures/thu-fig-logo.eps RELOC/doc/latex/thuthesis/figures/thu-fig-logo.pdf ++++++ thuthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thuthesis/thuthesis.cfg new/tex/latex/thuthesis/thuthesis.cfg --- old/tex/latex/thuthesis/thuthesis.cfg 2016-03-20 22:19:13.000000000 +0100 +++ new/tex/latex/thuthesis/thuthesis.cfg 2017-03-26 23:47:40.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2016 by Xue Ruini <xueruini(a)gmail.com> +%% Copyright (C) 2005-2017 by Xue Ruini <xueruini(a)gmail.com> %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -23,7 +23,7 @@ %% This is the configuration file of the thuthesis package with LaTeX2e. %% \ProvidesFile{thuthesis.cfg} -[2016/03/20 5.3.1 Tsinghua University Thesis Template] +[2017/03/26 5.3.2 Tsinghua University Thesis Template] \theoremsymbol{\ensuremath{\square}} \newtheorem*{proof}{证明} \theoremstyle{plain} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thuthesis/thuthesis.cls new/tex/latex/thuthesis/thuthesis.cls --- old/tex/latex/thuthesis/thuthesis.cls 2016-03-20 22:19:13.000000000 +0100 +++ new/tex/latex/thuthesis/thuthesis.cls 2017-03-26 23:47:40.000000000 +0200 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2016 by Ruini Xue <xueruini(a)gmail.com> +%% Copyright (C) 2005-2017 by Ruini Xue <xueruini(a)gmail.com> %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -25,10 +25,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{thuthesis} -[2016/03/20 5.3.1 Tsinghua University Thesis Template] +[2017/03/26 5.3.2 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.3.1} +\def\version{5.3.2} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -82,7 +82,7 @@ \RequirePackage{amsmath} \RequirePackage[defaultsups]{newtxtext} \RequirePackage{newtxmath} -\RequirePackage{tgcursor} +\RequirePackage{courier} \RequirePackage{graphicx} \RequirePackage[labelformat=simple]{subcaption} \RequirePackage{pdfpages} @@ -99,15 +99,13 @@ \RequirePackage{pifont} \fi \RequirePackage{CJKfntef} -\ifxetex - \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace} - \defaultfontfeatures{Mapping=tex-text} -\fi \RequirePackage[amsmath,thmmarks,hyperref]{ntheorem} \RequirePackage{array} \RequirePackage{longtable} \RequirePackage{booktabs} \RequirePackage[numbers,super,sort&compress]{natbib} +\patchcmd{\@chapter}{\addtocontents{lof}{\protect\addvspace{10\p@}}}{}{}{} % lof +\patchcmd{\@chapter}{\addtocontents{lot}{\protect\addvspace{10\p@}}}{}{}{} % lot \RequirePackage{hyperref} \ifxetex \hypersetup{% @@ -222,7 +220,7 @@ {Too many footnotes in this page.}{Keep footnote less than 10.} \fi \ifthu@pifootnote% - \ding{\numexpr171+\value{#1}}% + \ding{\the\numexpr\value{#1}+171\relax}% \else% \textcircled{\xiaoliu\arabic{#1}}% \fi} @@ -457,7 +455,7 @@ \newcommand\thu@underline[2][6em]{\hskip1pt\underline{\hb@xt@ #1{\hss#2\hss}}\hskip3pt} \newlength{\thu@title@width} \newcommand{\thu@put@title}[2][\thu@title@width]{% - \begin{CJKfilltwosides}{#1}#2\end{CJKfilltwosides}} + \begin{CJKfilltwosides}[b]{#1}#2\end{CJKfilltwosides}} \def\thu@first@titlepage{% \ifthu@postdoctor\thu@first@titlepage@postdoctor\else\thu@first@titlepage@other\fi} \newcommand{\thu@first@titlepage@postdoctor}{ @@ -535,14 +533,19 @@ \parbox[t][9cm][t]{\paperwidth-8cm}{ \renewcommand{\baselinestretch}{1.3} \begin{center} - \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par - \par\vskip 18bp - \xiaoer[1] \textrm{\thu@apply} + \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par% + \par\vskip 18bp% + \xiaoer[1]\textrm{\thu@apply}% \end{center}} \fi \ifthu@bachelor \vskip1cm - \parbox[t][7.0cm][t]{\textwidth}{% + \ifx\thu@cassosupervisor\@empty% + \def\thu(a)tempa{7.0cm} + \else% + \def\thu(a)tempa{8.0cm} + \fi% + \parbox[t][\thu@tempa][t]{\textwidth}{% {\fangsong\sanhao[1.8]% \hspace*{1.65cm} \setlength{\thu@title@width}{4em} @@ -621,37 +624,38 @@ \parbox[t][5.2cm][t]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.5} \begin{center} - \erhao[1.1]\bfseries\sffamily\thu@etitle + \erhao[1.1]\bfseries\sffamily\thu@etitle% \end{center}} \parbox[t][][t]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.3} \begin{center} - \sanhao + \sanhao% \ifthu@master Thesis \else Dissertation \fi Submitted to\\ {\bfseries Tsinghua University}\\ in partial fulfillment of the requirement\\ for the \ifthu@professional professional \fi degree of\\ - {\bfseries\sffamily\thu@edegree} + {\bfseries\sffamily\thu@edegree}% \ifthu@professional\relax\else \\in\\[3bp] - {\bfseries\sffamily\thu@emajor} + {\bfseries\sffamily\thu@emajor}% \fi \end{center}} \parbox[t][][b]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.3} \begin{center} \sanhao\sffamily by\\[3bp] - \bfseries\thu@eauthor + \bfseries\thu@eauthor% \ifthu@professional \ifx\thu@emajor\empty\relax\else - \\(~\thu@emajor~) + \\(~\thu@emajor~)% \fi\fi \end{center}} \par\vspace{0.9cm} \parbox[t][2.1cm][t]{\paperwidth-7.2cm}{ - \renewcommand{\baselinestretch}{1.2}\xiaosan\centering + \renewcommand{\baselinestretch}{1.2} + \xiaosan\centering \begin{tabular}{rl} \ifthu@master Thesis \else Dissertation \fi Supervisor : & \thu@esupervisor\\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thuthesis.tlpobj new/tlpkg/tlpobj/thuthesis.tlpobj --- old/tlpkg/tlpobj/thuthesis.tlpobj 2016-04-14 19:51:43.000000000 +0200 +++ new/tlpkg/tlpobj/thuthesis.tlpobj 2017-04-14 18:02:44.000000000 +0200 @@ -1,6 +1,6 @@ name thuthesis category Package -revision 40085 +revision 43609 shortdesc Thesis template for Tsinghua University relocated 1 longdesc ThuThesis is a LaTeX thesis template package for Tsinghua @@ -12,7 +12,7 @@ RELOC/tex/latex/thuthesis/thuthesis.cls RELOC/tex/latex/thuthesis/thuthesis.sty catalogue-ctan /macros/latex/contrib/thuthesis -catalogue-date 2016-03-20 20:27:17 +0100 +catalogue-date 2017-03-26 15:08:49 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class chinese -catalogue-version 5.3.1 +catalogue-version 5.3.2 ++++++ ticket.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/README new/doc/latex/ticket/README --- old/doc/latex/ticket/README 2010-12-08 01:31:20.000000000 +0100 +++ new/doc/latex/ticket/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ - - - ticket.sty v0.4b - Making labels, visting cards, pins with LaTeX - - Author: Thomas Emmel <thomas(a)family-emmel.de> - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -This is README.txt, last changed November 30, 2010 - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Idea of ticket: -ticket.sty provides an easy to handle interface to produce -visiting cards, labels for your files, stickers, pins and -other stuff for your office, conferences etc. -All you need is a definition of your "ticket" included in -a ticket definition file and the two commands -\ticketdefault and \ticket. -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Content: - -README.txt ........... this file - -ticket.sty ........... the style file - -doc .................. documentation and examples -doc/manual.xxx ....... a short introduction -doc/ex_.....xxx ...... example files - -tdf .................. ticket definitions - Send me more tdf-files!!! - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -Please read the manual for further info. - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -License: - -The bundle is placed under the LaTeX Project Public License -(macros/latex/base/lppl.txt on CTAN). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/README.txt new/doc/latex/ticket/README.txt --- old/doc/latex/ticket/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ticket/README.txt 2016-11-25 19:30:16.000000000 +0100 @@ -0,0 +1,42 @@ + + + ticket.sty v0.4d + Creation of labels, business cards, pins with LaTeX + + Author: Thomas Emmel <thomas(a)family-emmel.de> + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +This is README.txt, last changed October 11, 2016 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Idea of ticket: +ticket.sty provides an easy to handle interface to create +business cards, labels for your files, stickers, pins and +other stuff for your office, conferences etc. +All you need is a definition of your "ticket" included in +a ticket definition file and the two commands +\ticketdefault and \ticket. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Content: + +README.txt ........... this file + +ticket.sty ........... the style file + +doc .................. documentation and examples +doc/manual.xxx ....... a short introduction +doc/ex_.....xxx ...... example files + +tdf .................. ticket definitions + Send me more tdf-files!!! + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Please read the manual for further reading. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +License: + +The bundle is placed under the LaTeX Project Public License v1.3 +(license/lppl1.3 on CTAN). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/comment new/doc/latex/ticket/comment --- old/doc/latex/ticket/comment 2006-10-07 01:35:29.000000000 +0200 +++ new/doc/latex/ticket/comment 2016-11-25 19:30:16.000000000 +0100 @@ -1,3 +1,3 @@ -Make labels, visiting-cards, pins and flash-cards with LaTeX. -Provides an easy to handle interface to produce visiting-cards, labels for your files, stickers, pins and other stuff for your office, conferences etc. +Make labels, business-cards, pins and flash-cards with LaTeX. +Provides an easy to handle interface to produce business-cards, labels for your files, stickers, pins and other stuff for your office, conferences etc. All you need is a definition of your "ticket" included in a ticket definition file and the two commands \ticketdefault and \ticket. Binary files old/doc/latex/ticket/ex_file.pdf and new/doc/latex/ticket/ex_file.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_file.tex new/doc/latex/ticket/ex_file.tex --- old/doc/latex/ticket/ex_file.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/ticket/ex_file.tex 2016-11-25 19:30:16.000000000 +0100 @@ -16,7 +16,7 @@ % make your default ticket. \ticketdefault is somewhat like a background \renewcommand{\ticketdefault}{% \put(155,5){\begin{sideways}% - \includegraphics[width=35mm]{ifmlogoc}\end{sideways}}% + \includegraphics[width=35mm]{logo}\end{sideways}}% \put(150,50){\begin{rotate}{180}\Huge C O M P U T E R\end{rotate}}% } Binary files old/doc/latex/ticket/ex_flashcard.pdf and new/doc/latex/ticket/ex_flashcard.pdf differ Binary files old/doc/latex/ticket/ex_marks.pdf and new/doc/latex/ticket/ex_marks.pdf differ Binary files old/doc/latex/ticket/ex_pin.pdf and new/doc/latex/ticket/ex_pin.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_pin.tex new/doc/latex/ticket/ex_pin.tex --- old/doc/latex/ticket/ex_pin.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/ticket/ex_pin.tex 2016-11-25 19:30:16.000000000 +0100 @@ -14,7 +14,7 @@ % make your default ticket. \ticketdefault is somewhat like a background \renewcommand{\ticketdefault}{% - \put(50, 3){\includegraphics[width=15mm]{ifmlogoc}} + \put(50, 3){\includegraphics[width=15mm]{logo}} \put( 5, 13){\line(1,0){60}} \put( 7, 10){\scriptsize Animal annual meeting (AAM)} \put( 7, 7){\scriptsize In the gardens} Binary files old/doc/latex/ticket/ex_vcard.pdf and new/doc/latex/ticket/ex_vcard.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/ex_vcard.tex new/doc/latex/ticket/ex_vcard.tex --- old/doc/latex/ticket/ex_vcard.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/ticket/ex_vcard.tex 2016-11-25 19:30:16.000000000 +0100 @@ -24,7 +24,7 @@ % now what do you like to put in your ticket \newcommand{\vcardfront}[5]{\ticket{% - \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{ifmlogoc}} + \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{logo}} \put( 63.2, 2){\color{uni}your logo} \put( 5, 13){\color{uni}\line(1,0){56}} \put( 7, 10){\small your company} Binary files old/doc/latex/ticket/logo.png and new/doc/latex/ticket/logo.png differ Binary files old/doc/latex/ticket/manual.pdf and new/doc/latex/ticket/manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/manual.tex new/doc/latex/ticket/manual.tex --- old/doc/latex/ticket/manual.tex 2010-12-08 01:31:20.000000000 +0100 +++ new/doc/latex/ticket/manual.tex 2016-11-25 19:30:16.000000000 +0100 @@ -1,12 +1,11 @@ -\documentclass[a4paper,KOMA,landscape]{powersem} +\documentclass[aspectratio=1610,hyperref={pdfpagelabels=false}]{beamer} -\usepackage[stmo,button,display]{ifmslide} -%\usepackage[stmo,button]{ifmslide} -%\usepackage[draft]{ifmslide} -\definecolor{background}{gray}{.9} +\usetheme{Bergen} %\nobuttons %% user definitions + +\def\code#1{\texttt{#1}} \newcommand{\ticket}{{\code{ticket.sty}}} \newcommand{\bs}{{\mtt\\}} @@ -22,13 +21,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} -\panelposition{bottom} -\pageTransitionDissolve \sffamily \title{\begin{minipage}[t]{0.98\textwidth}\begin{center} - {\mdseries \ticket{} v0.4b November 30, 2010}\\[1ex] - Making labels, visiting cards, pins and flash-cards with \LaTeX\\[1ex] + {\mdseries \ticket{} v0.4d October 11, 2016}\\[1ex] + Making labels, business cards, pins and flash-cards with \LaTeX\\[1ex] A short introduction \end{center}\end{minipage}} @@ -36,38 +33,35 @@ {thomas(a)family-emmel.de}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\slidepagestyle{empty} -\releasebutton \buttonsize(10mm,4mm)(8,8) \freebutton(263,180)[h] -\begin{slide} +\begin{frame} \maketitle -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\hidebackground -\pageTransitionReplace -\centerslidesfalse -\begin{slide} - \section{A short introduction} +\begin{frame} +\frametitle{A short introduction} - \ticket{} provides a simple interface to produce - visiting (or calling) cards, labels for your files, stickers, pins and +\begin{block}{\ticket{}} + provides a simple interface to produce +\end{block} + business cards, labels for your files, stickers, pins and other stuff for your office, conferences etc.\\[2ex] All you need is a definition of your \lq{}ticket\rq{} included in a ticket definition file (\code{.tdf}),\\ - $\rightarrowtail$ see \hyperlink{tdf}{ticket definition file}\\ +% $\rightarrowtail$ see \hyperlink{tdf}{ticket definition file}\\ and the two commands \code{\bs{}ticketdefault} and \code{\bs{}ticket}.\\ - $\rightarrowtail$ see \hyperlink{ticket}{how to fill your ticket}\\[2ex] +% $\rightarrowtail$ see \hyperlink{ticket}{how to fill your ticket}\\[2ex] See these examples to get an idea what you can get:\\ - $\rightarrowtail$ \href{ex_file.pdf}{\code{ex\_file}} back labels for your files...\\ - $\rightarrowtail$ \href{ex_pin.pdf}{\code{ex\_pin}} pins for a conference...\\ - $\rightarrowtail$ \href{ex_vcard.pdf}{\code{ex\_vcard}} visiting-cards (also business cards, name cards...)\\ - $\rightarrowtail$ \href{ex_marks.pdf}{\code{ex\_marks}} different markers used...\\ - $\rightarrowtail$ \href{ex_flashcard.pdf}{\code{ex\_flashcard}} flash-cards, try it...\\ - $\rightarrowtail$ \href{ex_flashcard_dup.pdf}{\code{ex\_flashcard\_dup}} in duplex mode\\ - $\rightarrowtail$ \href{ex_flashcard_rm.pdf}{\code{ex\_flashcard\_rm}} in rows\\ -\end{slide} + \begin{exampleblock}{\href{ex_file.pdf}{\code{ex\_file}}}back labels for your files...\end{exampleblock} + \begin{exampleblock}{\href{ex_pin.pdf}{\code{ex\_pin}}}pins for a conference...\end{exampleblock} + \begin{exampleblock}{\href{ex_vcard.pdf}{\code{ex\_vcard}}} business-cards...\end{exampleblock} + \begin{exampleblock}{\href{ex_marks.pdf}{\code{ex\_marks}}} different markers used...\end{exampleblock} + \begin{exampleblock}{\href{ex_flashcard.pdf}{\code{ex\_flashcard}}} flash-cards, try it...\end{exampleblock} + \begin{exampleblock}{\href{ex_flashcard_dup.pdf}{\code{ex\_flashcard\_dup}}}in duplex mode\end{exampleblock} + \begin{exampleblock}{\href{ex_flashcard_rm.pdf}{\code{ex\_flashcard\_rm}}}in rows\end{exampleblock} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{How to use it} +\begin{frame} + \frametitle{How to use it} Just add this line to the header of your latex-file: @@ -75,11 +69,11 @@ Use the letter or article documentclass and set up the paper-size that you need. -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{The ticket definition file}\hypertarget{tdf}{} -A sample ticket definition (\code{lz1680.tdf}) for a \lq{}LEITZ\rq{}-product is:\\[-4ex] +\begin{frame}[fragile] + \frametitle{The ticket definition file}\hypertarget{tdf}{} +A sample ticket definition (\code{lz1680.tdf}) for a \lq{}LEITZ\rq{}-product is:\\ \begin{quote} \begin{minipage}[t]{0.5\textwidth} {\scriptsize @@ -89,13 +83,10 @@ %% pre-cutted label for wide files %% \unitlength=1mm - %% tested for an HP5SiMX, adjust it for your printer \hoffset=-16.2mm \voffset=-6.6mm - \ticketNumbers{1}{4} - \ticketSize{189}{56.5} % in unitlength \ticketDistance{0}{9.8} % in unitlength \end{verbatim} @@ -109,10 +100,10 @@ \code{\bs{}ticketSize\{width\}\{height\}} is the size of one ticket and \code{\bs{}ticketDistance\{dist$_x$\}\{dist$_y$\}} are spaces between the tickets. -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{Missing the ticket definition file} +\begin{frame} + \frametitle{Missing the ticket definition file} If you like to test a new ticket definition or you like to create only a single output without reusing those definitions anymore, \ticket{} assumes default values which can be redefined in your file.\\ Simply call \ticket{} without any ticket definition: @@ -120,33 +111,36 @@ \code{\bs{}usepackage[{\itshape other options}]\{ticket\}} and add your definitions directly to the head of the file after loading ticket.sty. -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{How to fill your ticket}\hypertarget{ticket}{}% +\begin{frame}[fragile] + \frametitle{How to fill your ticket}\hypertarget{ticket}{}% \ticket{} enables a picture-environment for all tickets. You can put things into this picture with \code{\color{red}\bs{}ticketdefault} and \code{\color{red}\bs{}ticket}. Both commands offer one argument.\\ - \code{\color{red}\bs{}ticketdefault} is used to put a default and unique background to your ticket, that will be -- of course -- not changed for all tickets unless - you change it with \code{\bs{}renewcommand}:\\[-5ex] - \begin{quote} + \begin{exampleblock}{\code{\bs{}ticketdefault}} + is used to put a default and unique background to your ticket, that will be -- of course -- not changed for all tickets unless + you change it with:\\ +% \begin{quote} \begin{minipage}[t]{.5\textwidth} {\scriptsize \begin{verbatim} \renewcommand{\ticketdefault}{% - \put(100, 5){\includegraphics[width=35mm]{ifmlogoc}}% + \put(100, 5){\includegraphics[width=35mm]{logo}}% \put(100,50){\begin{rotate}{180}\Huge ...\end{rotate}}% } \end{verbatim} \normalsize } \end{minipage} - \end{quote} - \code{\color{red}\bs{}ticket} is used to provide the content which will be changed +% \end{quote} + \end{exampleblock} + \begin{exampleblock}{\code{\bs{}ticket}} + is used to provide the content which will be changed for the individual tickets. The simplest way to do that is to define a new - command like this:\\[-5ex] - \begin{quote} + command like this:\\ +% \begin{quote} \begin{minipage}[t]{0.5\textwidth} {\scriptsize \begin{verbatim} @@ -157,114 +151,97 @@ \end{verbatim} } \end{minipage} - \end{quote} -\end{slide} +% \end{quote} +\end{exampleblock} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\cross{% \begin{picture}(0,0)% \put(-2,0){\line(1,0){4}}\put(0,-2){\line(0,1){4}}% \end{picture}}% -\begin{slide} - \section{Additional Options} +\begin{frame} + \frametitle{Additional Options} Most of the options other than the tdf-file are used to create marks or decorations around the ticket:\\ -\begin{picture}(0,0)(-350,10)\color{red} +\begin{alertblock}{crossmark% +\begin{picture}(23,0)(-5,0)\color{red} \put(0,0){\cross}% - \put(0,10){\cross}% - \put(20,0){\cross}% - \put(20,10){\cross}% -\end{picture}% -\begin{picture}(0,0)(-380,10)\color{red} - \put(0,0){\cross}% - \put(0,10){\cross}% - \put(20,0){\cross}% - \put(20,10){\cross}% -\end{picture}% -{\color{red}\bfseries crossmark \\} -Add a cross at all four corners of the ticket\\ -\begin{picture}(0,0)(-350,10)\color{red} + \put(0,8){\cross}% + \put(17,0){\cross}% + \put(17,8){\cross}% +\end{picture}} +Add a cross at all four corners of the ticket +\end{alertblock} +\begin{alertblock}{circlemark% +\begin{picture}(23,0)(-5,0)\color{red} \put(0,0){\circle{2}}% - \put(0,10){\circle{2}}% - \put(20,0){\circle{2}}% - \put(20,10){\circle{2}}% -\end{picture}% -\begin{picture}(0,0)(-380,10)\color{red} - \put(0,0){\circle{2}}% - \put(0,10){\circle{2}}% - \put(20,0){\circle{2}}% - \put(20,10){\circle{2}}% -\end{picture}% -{\color{red}\bfseries circlemark \\} -Add a circle at all four corners\\ -\begin{picture}(0,0)(-350,10)\color{red} - \put(-1,0){\line(-1,0){2}} - \put(0,-1){\line(0,-1){2}} - \put(-1,10){\line(-1,0){2}} - \put(0,11){\line(0,1){2}} - \put(21,0){\line(1,0){2}} - \put(20,-1){\line(0,-1){2}} - \put(21,10){\line(1,0){2}} - \put(20,11){\line(0,1){2}} + \put(0,8){\circle{2}}% + \put(17,0){\circle{2}}% + \put(17,8){\circle{2}}% \end{picture}% -\begin{picture}(0,0)(-380,10)\color{red} - \put(-1,0){\line(-1,0){2}} - \put(0,-1){\line(0,-1){2}} - \put(-1,10){\line(-1,0){2}} - \put(0,11){\line(0,1){2}} - \put(21,0){\line(1,0){2}} - \put(20,-1){\line(0,-1){2}} - \put(21,10){\line(1,0){2}} - \put(20,11){\line(0,1){2}} -\end{picture}% -{\color{red}\bfseries emptycrossmark \\} -A crossmark where the part of the cross inside the ticket is not visible\\ -\begin{picture}(0,0)(-350,10)\color{red} +} +Add a circle at all four corners +\end{alertblock} +\begin{alertblock}{emptycrossmark% +\begin{picture}(23,0)(-5,0)\color{red} \put(-1,0){\line(-1,0){2}} \put(0,-1){\line(0,-1){2}} - \put(-1,10){\line(-1,0){2}} + \put(-1,8){\line(-1,0){2}} \put(0,11){\line(0,1){2}} - \put(20,-1){\line(0,-1){2}} - \put(20,11){\line(0,1){2}} + \put(18,0){\line(1,0){2}} + \put(17,-1){\line(0,-1){2}} + \put(18,8){\line(1,0){2}} + \put(17,11){\line(0,1){2}} \end{picture}% -\begin{picture}(0,0)(-380,10)\color{red} +} +A crossmark where the part of the cross inside the ticket is not visible +\end{alertblock} +\begin{alertblock}{cutmark% +\begin{picture}(23,0)(-5,0)\color{red} \put(0,-1){\line(0,-1){2}} \put(0,11){\line(0,1){2}} - \put(21,0){\line(1,0){2}} - \put(20,-1){\line(0,-1){2}} - \put(21,10){\line(1,0){2}} - \put(20,11){\line(0,1){2}} + \put(18,0){\line(1,0){2}} + \put(17,-1){\line(0,-1){2}} + \put(18,8){\line(1,0){2}} + \put(17,11){\line(0,1){2}} \end{picture}% -{\color{red}\bfseries cutmark \\} -Just add cutmarks at the outer region of the page\\ -\begin{picture}(0,0)(-350,10)\color{red} - \put(0,0){\line(0,1){10}} - \put(0,0){\line(1,0){20}} - \put(20,10){\line(-1,0){20}} - \put(20,10){\line(0,-1){10}} -\end{picture}% -\begin{picture}(0,0)(-380,10)\color{red} - \put(0,0){\line(0,1){10}} - \put(0,0){\line(1,0){20}} - \put(20,10){\line(-1,0){20}} - \put(20,10){\line(0,-1){10}} +} +Just add cutmarks at the outer region of the page +\end{alertblock} +\begin{alertblock}{boxed% +\begin{picture}(23,0)(-5,0)\color{red} + \put(0,0){\line(0,1){8}} + \put(0,0){\line(1,0){17}} + \put(17,8){\line(-1,0){17}} + \put(17,8){\line(0,-1){8}} \end{picture}% -{\color{red}\bfseries boxed \\} -Add a frame around each ticket\\ -The option {\color{red}\bfseries rowmode} creates the tickets in rows instead of columns, +} +Add a frame around each ticket +\end{alertblock} +\begin{alertblock}{rowmode} +This option creates the tickets in rows instead of columns, which might be useful in some cases. -\end{slide} +\end{alertblock} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{Special commands} -You can add additional page-breaks with \code{\bs{}newpage\bs{}ticketreset}. This clears the ticket-buffers and sets the corresponding values to initial values. - +\begin{frame} + \frametitle{Special commands} +\begin{exampleblock}{reset tickets} + You can add additional page-breaks with \code{\bs{}newpage\bs{}ticketreset}. This clears the ticket-buffers and sets the corresponding values to initial values. This can be used if you create a handful of tickets multiple times. +\end{exampleblock} -The command \code{\bs{}backside} is useful for flash-cards, see the use-cases below. -\end{slide} +\begin{exampleblock}{\code{\bs{}backside}} +is useful for flash-cards, see the use-cases below. +\end{exampleblock} + +\begin{exampleblock}{skip tickets} +Once you printed a series of tickets you mostly end up with some empty stickers on your sheet. In this case use \code{\bs{}ticketskip\{5\}} to skip 5 tickets (New feature) +\end{exampleblock} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{Organising and reading input} +\begin{frame}[fragile] + \frametitle{Organising and reading input} In general it is a good idea to create a file that contains all definitions and the whole latex-setup and a second file that contains only the data that you like to print which can be referenced by \code{\bs{}input}. For example, if you reference a huge database of names of people which are used for the pins of a conference, you can easily write a script (perl, python...) that extracts the data to a file that is itself latex-formated with a \code{\bs{}myticket\{ \}\{ \}\{ \}} on each line. @@ -286,31 +263,34 @@ } \end{minipage} \end{quote} - -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{Use-cases} - Some examples were referenced at the beginning of this manual. I will finish this short introduction with an overview of special examples and their implementations: - -\subsection{Files and pins} -This is a simple example for your files. The same applies to pins. Start with a \code{\bs{}ticketdefault}, with this background: +\begin{frame} + \frametitle{Use-cases} + Some examples were referenced at the beginning of this manual. I will finish this short introduction with an overview of special examples and their implementations... +\end{frame} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{frame}[fragile] +\begin{block}{Files and pins} +This is a simple example for your files. +\end{block} +The same applies to pins. Start with a \code{\bs{}ticketdefault}, with this background: \begin{quote} \begin{minipage}[t]{0.5\textwidth} {\scriptsize \begin{verbatim} \renewcommand{\ticketdefault}{% \put(155,5){\begin{sideways}% - \includegraphics[width=35mm]{ifmlogoc}\end{sideways}}% + \includegraphics[width=35mm]{logo}\end{sideways}}% \put(150,50){\begin{rotate}{180}\Huge C O M P U T E R\end{rotate}}% } \end{verbatim} } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} +\begin{frame}[fragile] \vspace*{10mm} Now, create the content of the \code{\bs{}ticket} which differs: \begin{quote} @@ -338,17 +318,18 @@ \begin{document} ... \filelabel{1}{\LaTeX{} - styles}{Standard styles\\Own styles\\% - \hspace*{5mm}\bfseries ifmslide\\\hspace*{5mm}\bfseries ticket}% + \hspace*{5mm}\bfseries ...\\\hspace*{5mm}\bfseries ticket}% ... \end{verbatim} } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide}\vspace*{-4mm} -\subsection{Visiting-cards} +\begin{frame}[fragile]\vspace*{-4mm} +\begin{block}{Business-cards} In this example, the \code{\bs{}ticketdefault} is empty, since we need a front and and background that differs: +\end{block} \begin{quote} \begin{minipage}[t]{0.5\textwidth} {\scriptsize @@ -356,14 +337,15 @@ \renewcommand{\ticketdefault}{}% \newcommand{\vcardfront}[5]{\ticket{% - \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{ifmlogoc}} + \put( 63, 5){\includegraphics[width=40mm,angle=90,origin=bl]{logo}} \put( 63.2, 2){\color{uni}your logo} \put( 5, 13){\color{uni}\line(1,0){56}} \put( 7, 10){\small your company} \put( 7,6.5){\small street 1}\put( 7, 3){\small xxxxx city and state} \put( 7, 24){\small phone:}\put( 7, 20){\small fax:} \put(6,40){\bfseries\LARGE #1} - \put(7,36){#2}\put(15,24){\small #3}\put(15,20){\small #4}\put( 7,16){\small #5} + \put(7,36){#2}\put(15,24){\small #3} + \put(15,20){\small #4}\put( 7,16){\small #5} }} \newcommand{\vcardback}[1]{\ticket{% @@ -376,9 +358,9 @@ } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide}\vspace*{10mm} +\begin{frame}[fragile]\vspace*{10mm} And fill the tickets: \begin{quote} \begin{minipage}[t]{0.5\textwidth} @@ -392,24 +374,27 @@ % ten cards for the front \whiledo{\thenumcards<10}{% \stepcounter{numcards}% - \vcardfront{Mr. X}{Degree/Profession}{+YY/XXXX/ZZZ ZZ ZZ}{+YY/XXXX/ZZZ ZZ ZZ} + \vcardfront{Mr. X}{Degree/Profession} + {+YY/XXXX/ZZZ ZZ ZZ}{+YY/XXXX/ZZZ ZZ ZZ} {yourmail(a)your-provider.xxx}} \setcounter{numcards}{0} % and ten for the backside \whiledo{\thenumcards<10}{% \stepcounter{numcards}% - \vcardback{phone: ---/HH HH HHH\\fax: ---/HH HH HHH\\homestreet 7\\everywhere}} + \vcardback{phone: ---/HH HH HHH\\fax: ---/HH HH HHH\\% + homestreet 7\\everywhere}} ... \end{verbatim} } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide}\vspace*{-4mm} -\subsection{Flashcards} +\begin{frame}[fragile]\vspace*{-4mm} +\begin{block}{Flashcards} In this case we work with two different \code{\bs{}ticket}-definitions since we have a file with two different commands. However, this can be changed according to your taste: +\end{block} \begin{quote} \begin{minipage}[t]{0.5\textwidth} {\scriptsize @@ -439,9 +424,9 @@ } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide}\vspace*{10mm} +\begin{frame}[fragile]\vspace*{10mm} Now change the command for the backside: \begin{quote} \begin{minipage}[t]{0.5\textwidth} @@ -484,17 +469,19 @@ } \end{minipage} \end{quote} -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{slide} - \section{Acknowledgements...} - Many thanks to those who used ticket.sty for many years and helped +\begin{frame} + \frametitle{Acknowledgements...} + \begin{block}{Many thanks} + to those who used ticket.sty for many years and helped to find some small bugs and those who provided ticket-definition-files (tdf) and suggestions for new features. + \end{block} Many special thanks to Santiago Mejia who created an initial version of the flash-card use-case. -\end{slide} +\end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \end{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ticket/test.tex new/doc/latex/ticket/test.tex --- old/doc/latex/ticket/test.tex 2010-12-08 01:31:20.000000000 +0100 +++ new/doc/latex/ticket/test.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -%%%% -% -% ticket.sty example file for a pin for conferences -% -%%%% -% use the corresponding paper size for your ticket definition -\documentclass[a4paper,10pt]{letter} - -% load ticket.sty with the appropriate ticket definition -\usepackage[freepin,crossmark]{ticket} - -% load misc stuff -\usepackage{graphicx} - -% make your default ticket. \ticketdefault is somewhat like a background -\renewcommand{\ticketdefault}{% - \put(50, 3){\includegraphics[width=15mm]{ifmlogoc}} - \put( 5, 13){\line(1,0){60}} - \put( 7, 10){\scriptsize Animal annual meeting (AAM)} - \put( 7, 7){\scriptsize In the gardens} - \put( 7, 4){\scriptsize April 1, 2000} -} - -% now what do you like to put in your ticket -\newcommand{\confpin}[2]{\ticket{% - \put(35,36){\makebox[0mm]{\bfseries\Large #1}} - \put(35,28){\makebox[0mm]{\bfseries\large #2}}% -}} - - -%% the pins for the partipiciants ... ;-) -%% you can generate this part from a database! -\begin{document} -\sffamily -\confpin{Camelus dromedarius}{North Africa} -\confpin{Urocyon cinereoargenteus}{America} -\confpin{Galago moholi}{South Africa} -\confpin{Dasypus novemcintus}{South America} -\confpin{Rhinocerus sondaicus}{Java} -\confpin{Canis lupus}{Northern sphere} -\confpin{Ramphastus spec.}{South Amerika} -\confpin{Panthera tigris sondaica}{Java} -\confpin{Hippocampus spec.}{the ocean} -\confpin{Anthonomus grandis}{Mexico} -\confpin{Petrogale penicillata}{Australia} -\confpin{Tarsius spec.}{Sumatra} -\end{document} - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticket.doc.tlpobj new/tlpkg/tlpobj/ticket.doc.tlpobj --- old/tlpkg/tlpobj/ticket.doc.tlpobj 2016-04-14 19:51:43.000000000 +0200 +++ new/tlpkg/tlpobj/ticket.doc.tlpobj 2017-04-14 18:02:44.000000000 +0200 @@ -1,10 +1,10 @@ name ticket.doc category Package -revision 20679 +revision 42280 shortdesc doc files of ticket relocated 1 -docfiles size=124 - RELOC/doc/latex/ticket/README +docfiles size=148 + RELOC/doc/latex/ticket/README.txt RELOC/doc/latex/ticket/comment RELOC/doc/latex/ticket/ex_file.pdf RELOC/doc/latex/ticket/ex_file.tex @@ -19,7 +19,7 @@ RELOC/doc/latex/ticket/ex_pin.tex RELOC/doc/latex/ticket/ex_vcard.pdf RELOC/doc/latex/ticket/ex_vcard.tex + RELOC/doc/latex/ticket/logo.png RELOC/doc/latex/ticket/manual.pdf RELOC/doc/latex/ticket/manual.tex - RELOC/doc/latex/ticket/test.tex RELOC/doc/latex/ticket/words.tex ++++++ ticket.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/invite.tdf new/tex/latex/ticket/invite.tdf --- old/tex/latex/ticket/invite.tdf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/ticket/invite.tdf 2016-11-25 19:34:00.000000000 +0100 @@ -0,0 +1,14 @@ +%% +%% ticket for "confirmation invitation" +% +\unitlength=1mm + +%% tested for an HP5SiMX, adjust for your printer +\hoffset=-16.2mm +\voffset=-6.6mm + +\ticketNumbers{1}{6} + +\ticketSize{180.0}{40.0} % in unitlength +\ticketDistance{0}{0} % in unitlength + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/rex23184237.tdf new/tex/latex/ticket/rex23184237.tdf --- old/tex/latex/ticket/rex23184237.tdf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/ticket/rex23184237.tdf 2016-11-25 19:34:00.000000000 +0100 @@ -0,0 +1,15 @@ +%% +%% ticket for "Rex 23184237/PP" +%% pre-cutted label for wide files +%% +\unitlength=1mm + +%% tested for an Epson XP215, adjust for your printer +\hoffset=-19.2mm +\voffset=-8.6mm + +\ticketNumbers{1}{5} + +\ticketSize{188}{53} % in unitlength +\ticketDistance{0}{0} %in unitlength + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ticket/ticket.sty new/tex/latex/ticket/ticket.sty --- old/tex/latex/ticket/ticket.sty 2010-12-08 01:31:20.000000000 +0100 +++ new/tex/latex/ticket/ticket.sty 2016-11-25 19:34:00.000000000 +0100 @@ -2,12 +2,12 @@ %% %% This is file `ticket.sty', %% -%% File: ticket.sty Copyright (c) 1999,2000,2005 Thomas Emmel +%% File: ticket.sty Copyright (c) 1999-2016 Thomas Emmel %% <thomas(a)family-emmel.de> %% %% % This package may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.2 +% 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://www.latex-project.org/lppl.txt @@ -34,12 +34,17 @@ % Santiago Mejia <san_tico at yahoo dot com> % v0.4b added 'rowmode' introduced by Wulf Coulmann % <wulf at coulmann dot de> +% v0.4c added \ticketskip to allow for empty tickets +% at the start such that you can re-use used sheets +% by Maximilian Appel <mail at maxappel dot de> +% v0.4d lost some examples in last package +% no new features % % Many thanks for all contributions % % -\def\fileversion{v0.4b} -\def\filedate{2010/11/30} +\def\fileversion{v0.4d} +\def\filedate{2016/10/11} \ProvidesPackage{ticket}[\filedate\space\fileversion] \typeout{Package: `ticket' \fileversion\space <\filedate> (Thomas Emmel)} @@ -189,6 +194,15 @@ \fi% \fi}% +% by Maximilian Appel 2016 +\newcounter{ticket@skipped} +\newcommand{\ticketskip}[1]{ + \setcounter{ticket@skipped}{0} + \ % space needed to avoid "there is no line here to end" error + \whiledo{\theticket@skipped<#1}{\stepcounter{ticket@skipped}\ticket@counter} +} +% + % default content... % users should renew this command \newcommand{\ticketdefault}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticket.tlpobj new/tlpkg/tlpobj/ticket.tlpobj --- old/tlpkg/tlpobj/ticket.tlpobj 2016-04-14 19:51:44.000000000 +0200 +++ new/tlpkg/tlpobj/ticket.tlpobj 2017-04-14 18:02:44.000000000 +0200 @@ -1,6 +1,6 @@ name ticket category Package -revision 20679 +revision 42280 shortdesc Make labels, visiting-cards, pins with LaTeX relocated 1 longdesc Provides an easy to handle interface to produce visiting cards, @@ -8,7 +8,7 @@ longdesc office, conferences etc. All you need is a definition of your longdesc 'ticket' included in a ticket definition file and the two longdesc commands \ticketdefault and \ticket. -runfiles size=16 +runfiles size=18 RELOC/tex/latex/ticket/aj8414.tdf RELOC/tex/latex/ticket/dura5222.tdf RELOC/tex/latex/ticket/flashCard.tdf @@ -16,15 +16,17 @@ RELOC/tex/latex/ticket/freepin2.tdf RELOC/tex/latex/ticket/freepin3.tdf RELOC/tex/latex/ticket/he4432.tdf + RELOC/tex/latex/ticket/invite.tdf RELOC/tex/latex/ticket/lz1680.tdf RELOC/tex/latex/ticket/lz1681.tdf RELOC/tex/latex/ticket/lz1685.tdf + RELOC/tex/latex/ticket/rex23184237.tdf RELOC/tex/latex/ticket/ticket.sty RELOC/tex/latex/ticket/zw32010.tdf RELOC/tex/latex/ticket/zw3424.tdf RELOC/tex/latex/ticket/zw4752.tdf catalogue-ctan /macros/latex/contrib/ticket -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-10-11 17:37:14 +0200 +catalogue-license lppl1.3 catalogue-topics labels -catalogue-version 0.4b +catalogue-version 0.4d ++++++ ticollege.doc.tar.xz ++++++ ++++++ ticollege.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ticollege.tlpobj new/tlpkg/tlpobj/ticollege.tlpobj --- old/tlpkg/tlpobj/ticollege.tlpobj 2016-04-14 19:51:44.000000000 +0200 +++ new/tlpkg/tlpobj/ticollege.tlpobj 2017-04-14 18:02:44.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=6 RELOC/tex/latex/ticollege/ticollege.sty catalogue-ctan /graphics/pgf/contrib/ticollege -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pgf-tikz doc-supp catalogue-version 1.0 ++++++ tie.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tie.1 new/texmf-dist/doc/man/man1/tie.1 --- old/texmf-dist/doc/man/man1/tie.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/tie.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TIE 1 "7 April 2010" "Web2C 2016" +.TH TIE 1 "7 April 2010" "Web2C 2017" .\"===================================================================== .SH NAME tie \- merge or apply WEB change files Binary files old/texmf-dist/doc/man/man1/tie.man1.pdf and new/texmf-dist/doc/man/man1/tie.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tie.doc.tlpobj new/tlpkg/tlpobj/tie.doc.tlpobj --- old/tlpkg/tlpobj/tie.doc.tlpobj 2016-04-27 03:25:12.000000000 +0200 +++ new/tlpkg/tlpobj/tie.doc.tlpobj 2017-05-04 02:07:17.000000000 +0200 @@ -1,7 +1,7 @@ name tie.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of tie -docfiles size=6 +docfiles size=3 texmf-dist/doc/man/man1/tie.1 texmf-dist/doc/man/man1/tie.man1.pdf

1 0

commit texlive-specs-v for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-v for openSUSE:Factory checked in at 2017-06-25 19:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-v (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-v" Sun Jun 25 19:22:47 2017 rev:30 rq:504812 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.changes 2017-06-08 14:56:24.990798221 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-v.new/texlive-specs-v.changes 2017-06-25 19:29:26.434330477 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- tablefootnote.doc.tar.xz tablefootnote.tar.xz tableof.doc.tar.xz tableof.tar.xz tablestyles.doc.tar.xz tablestyles.tar.xz tablists.doc.tar.xz tablists.tar.xz tablor.doc.tar.xz tablor.tar.xz tabls.doc.tar.xz tabls.tar.xz tabriz-thesis.doc.tar.xz tabriz-thesis.tar.xz tabstackengine.doc.tar.xz tabstackengine.tar.xz tabto-generic.tar.xz tabto-ltx.doc.tar.xz tabto-ltx.tar.xz tabu.doc.tar.xz tabu.tar.xz tabularborder.doc.tar.xz tabularborder.tar.xz tabularcalc.doc.tar.xz tabularcalc.tar.xz tabularew.doc.tar.xz tabularew.tar.xz tabulars-e.doc.tar.xz tabulary.doc.tar.xz tabulary.tar.xz tabvar.doc.tar.xz tabvar.tar.xz tagging.doc.tar.xz tagging.tar.xz tagpair.doc.tar.xz tagpair.tar.xz talk.doc.tar.xz talk.tar.xz tamefloats.doc.tar.xz tamefloats.tar.xz tamethebeast.doc.tar.xz tap.doc.tar.xz tap.tar.xz tapir.doc.tar.xz tapir.tar.xz tasks.doc.tar.xz tasks.tar.xz tcldoc.doc.tar.xz tcldoc.tar.xz tcolorbox.doc.tar.xz tcolorbox.tar.xz tdclock.doc.tar.xz tdclock.tar.xz tds.doc.tar.xz tdsfrmath.doc.tar.xz tdsfrmath.tar.xz technics.doc.tar.xz technics.tar.xz ted.doc.tar.xz ted.tar.xz templates-fenn.doc.tar.xz templates-sommer.doc.tar.xz templatetools.doc.tar.xz templatetools.tar.xz tempora.doc.tar.xz tempora.tar.xz tengwarscript.doc.tar.xz tengwarscript.tar.xz tensor.doc.tar.xz tensor.tar.xz termcal.doc.tar.xz termcal.tar.xz termlist.doc.tar.xz termlist.tar.xz termmenu.doc.tar.xz termmenu.tar.xz testhyphens.doc.tar.xz testhyphens.tar.xz tetex.doc.tar.xz tetex.tar.xz tetex_scripts.dif teubner.doc.tar.xz teubner.tar.xz tex-ewd.doc.tar.xz tex-ewd.tar.xz tex-font-errors-cheatsheet.doc.tar.xz tex-gyre-math.doc.tar.xz tex-gyre-math.tar.xz tex-gyre.doc.tar.xz tex-gyre.tar.xz tex-ini-files.doc.tar.xz tex-ini-files.tar.xz tex-label.doc.tar.xz tex-label.tar.xz tex-overview.doc.tar.xz tex-ps.doc.tar.xz tex-ps.tar.xz tex-refs.doc.tar.xz tex-virtual-academy-pl.doc.tar.xz tex.doc.tar.xz tex4ebook.doc.tar.xz tex4ebook.tar.xz tex4ht.doc.tar.xz tex4ht.tar.xz tex4ht_env.dif texapi.doc.tar.xz texapi.tar.xz texbytopic.doc.tar.xz texconfig.doc.tar.xz texconfig.tar.xz texconfig_scripts.dif texcount.doc.tar.xz texcount.tar.xz texdef.doc.tar.xz texdef.tar.xz texdiff.doc.tar.xz texdiff.tar.xz texdirflatten.doc.tar.xz texdirflatten.tar.xz texdoc.doc.tar.xz texdoc.tar.xz texdoc_cnf.dif texdraw.doc.tar.xz texdraw.tar.xz texdraw_info.dif texfot.doc.tar.xz texfot.tar.xz texilikechaps.tar.xz texilikecover.tar.xz New: ---- simplecd.doc.tar.xz simplecd.tar.xz simplecv.doc.tar.xz simplecv.tar.xz simpler-wick.doc.tar.xz simpler-wick.tar.xz simplewick.doc.tar.xz simplewick.tar.xz simplified-latex.doc.tar.xz simurgh.doc.tar.xz simurgh.tar.xz sitem.doc.tar.xz sitem.tar.xz siunitx.doc.tar.xz siunitx.tar.xz skak.doc.tar.xz skak.tar.xz skaknew.doc.tar.xz skaknew.tar.xz skb.doc.tar.xz skb.tar.xz skdoc.doc.tar.xz skdoc.tar.xz skeycommand.doc.tar.xz skeycommand.tar.xz skeyval.doc.tar.xz skeyval.tar.xz skmath.doc.tar.xz skmath.tar.xz skrapport.doc.tar.xz skrapport.tar.xz skull.tar.xz slantsc.doc.tar.xz slantsc.tar.xz slideshow.doc.tar.xz slideshow.tar.xz smalltableof.doc.tar.xz smalltableof.tar.xz smartdiagram.doc.tar.xz smartdiagram.tar.xz smartref.doc.tar.xz smartref.tar.xz smartunits.doc.tar.xz smartunits.tar.xz snapshot.doc.tar.xz snapshot.tar.xz snotez.doc.tar.xz snotez.tar.xz songbook.doc.tar.xz songbook.tar.xz songs.doc.tar.xz songs.tar.xz sort-by-letters.doc.tar.xz sort-by-letters.tar.xz soton.doc.tar.xz soton.tar.xz soul.doc.tar.xz soul.tar.xz soup.doc.tar.xz soup.tar.xz sourcecodepro.doc.tar.xz sourcecodepro.tar.xz sourcesanspro.doc.tar.xz sourcesanspro.tar.xz sourceserifpro.doc.tar.xz sourceserifpro.tar.xz spalign.doc.tar.xz spalign.tar.xz spanish-mx.doc.tar.xz spanish-mx.tar.xz sparklines.doc.tar.xz sparklines.tar.xz spath3.doc.tar.xz spath3.tar.xz spelling.doc.tar.xz spelling.tar.xz sphdthesis.doc.tar.xz sphdthesis.tar.xz spie.doc.tar.xz spie.tar.xz splines.doc.tar.xz splines.tar.xz splitbib.doc.tar.xz splitbib.tar.xz splitindex.doc.tar.xz splitindex.tar.xz spot.doc.tar.xz spot.tar.xz spotcolor.doc.tar.xz spotcolor.tar.xz spreadtab.doc.tar.xz spreadtab.tar.xz spverbatim.doc.tar.xz spverbatim.tar.xz sr-vorl.doc.tar.xz sr-vorl.tar.xz srbook-mem.doc.tar.xz srbook-mem.tar.xz srcltx.doc.tar.xz srcltx.tar.xz srcredact.doc.tar.xz srcredact.tar.xz sseq.doc.tar.xz sseq.tar.xz sslides.doc.tar.xz sslides.tar.xz stack.tar.xz stackengine.doc.tar.xz stackengine.tar.xz stage.doc.tar.xz stage.tar.xz standalone.doc.tar.xz standalone.tar.xz stanli.doc.tar.xz stanli.tar.xz starfont.doc.tar.xz starfont.tar.xz startex.doc.tar.xz startex.tar.xz statex.doc.tar.xz statex.tar.xz statex2.doc.tar.xz statex2.tar.xz statistik.doc.tar.xz statistik.tar.xz staves.doc.tar.xz staves.tar.xz stdclsdv.doc.tar.xz stdclsdv.tar.xz stdpage.doc.tar.xz stdpage.tar.xz steinmetz.doc.tar.xz steinmetz.tar.xz stellenbosch.doc.tar.xz stellenbosch.tar.xz stex.doc.tar.xz stex.tar.xz stix.doc.tar.xz stix.tar.xz studenthandouts.doc.tar.xz studenthandouts.tar.xz table-fct.doc.tar.xz table-fct.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-v.spec ++++++ ++++ 31037 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-v.new/texlive-specs-v.spec ++++++ stmaryrd.doc.tar.xz ++++++ ++++++ stmaryrd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stmaryrd.tlpobj new/tlpkg/tlpobj/stmaryrd.tlpobj --- old/tlpkg/tlpobj/stmaryrd.tlpobj 2016-04-14 19:47:37.000000000 +0200 +++ new/tlpkg/tlpobj/stmaryrd.tlpobj 2017-04-14 18:00:59.000000000 +0200 @@ -49,6 +49,6 @@ RELOC/tex/latex/stmaryrd/Ustmry.fd RELOC/tex/latex/stmaryrd/stmaryrd.sty catalogue-ctan /fonts/stmaryrd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics comp-theory font font-symbol-maths font-mf font-type1 ++++++ storebox.doc.tar.xz ++++++ ++++++ storebox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/storebox.tlpobj new/tlpkg/tlpobj/storebox.tlpobj --- old/tlpkg/tlpobj/storebox.tlpobj 2016-04-14 19:47:38.000000000 +0200 +++ new/tlpkg/tlpobj/storebox.tlpobj 2017-04-14 18:01:00.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/storebox/storebox-pgf.sty RELOC/tex/latex/storebox/storebox.sty catalogue-ctan /macros/latex/contrib/storebox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pdf-feat macro-supp catalogue-version 1.3a ++++++ storecmd.doc.tar.xz ++++++ ++++++ storecmd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/storecmd.tlpobj new/tlpkg/tlpobj/storecmd.tlpobj --- old/tlpkg/tlpobj/storecmd.tlpobj 2016-04-14 19:47:38.000000000 +0200 +++ new/tlpkg/tlpobj/storecmd.tlpobj 2017-04-14 18:01:00.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/storecmd/storecmd.sty catalogue-ctan /macros/latex/contrib/storecmd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 0.0.2 ++++++ stringstrings.doc.tar.xz ++++++ ++++++ stringstrings.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stringstrings.tlpobj new/tlpkg/tlpobj/stringstrings.tlpobj --- old/tlpkg/tlpobj/stringstrings.tlpobj 2016-04-14 19:47:38.000000000 +0200 +++ new/tlpkg/tlpobj/stringstrings.tlpobj 2017-04-14 18:01:00.000000000 +0200 @@ -15,8 +15,9 @@ longdesc fashion) to achieve rather complex manipulations. runfiles size=15 RELOC/tex/latex/stringstrings/stringstrings.sty +catalogue-also getargs catalogue-ctan /macros/latex/contrib/stringstrings -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics text-manip catalogue-version 1.23 ++++++ struktex.doc.tar.xz ++++++ ++++++ struktex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/struktex.tlpobj new/tlpkg/tlpobj/struktex.tlpobj --- old/tlpkg/tlpobj/struktex.tlpobj 2016-04-14 19:47:39.000000000 +0200 +++ new/tlpkg/tlpobj/struktex.tlpobj 2017-04-14 18:01:00.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/struktex/struktxp.sty catalogue-also pict2e catalogue-ctan /macros/latex/contrib/struktex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics diagram-flow catalogue-version 141 ++++++ sttools.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sttools/README new/doc/latex/sttools/README --- old/doc/latex/sttools/README 2016-02-12 01:21:26.000000000 +0100 +++ new/doc/latex/sttools/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -README for sttools, v1.8 2016/02/08 - -INTRODUCTION -============ - -It is a collection of macro packages historically placed in a bundle -and maintained by Sigitas Tolušis. - -PACKAGES -======== - -* cuted.sty, v1.5 2012/10/04: - – puts some material page width wide at any place on twocolumn page - with existing text reformatted under inserted material; - TODO: add optional rules to separate from text; - -* floatpag.sty, v1.1 2012/05/29: - – sets pagestyle for floats page; - -* flushend.sty, v3.1 2015/04/14: - – balances page in twocolumn mode; - (2014/03/03): totally rewritten with new algorithm to support footnotes, - top floats and column break before one line section title; - (2014/04/24): bugfix version; - (2015/04/08): bugfix version with improved funcionality: - - spreaded or fixed right column height; - - optional old algorithm for backward compatability; - (2015/04/14): set debug option off by default; keeplastbox modified; - -* marginal.sty, v1.1 2012/05/29: - – enlarges room for marginal inserts; - -* midfloat.sty, v1.1 2012/05/29: - – inserts onecolumn stuff in twocolumn page; - TODO: extend to work on both columns; - -* stabular.sty, v2.0 2014/03/20: - – modifies tabular environment; - (2014/03/20): removed extra stuff and left only possibility to break - on page boundary; - added tabular variant from array package; - -* stfloats.sty, v2.0 2016/02/08: - – enriches floats output mechanism; - -* texsort.sty, v1.1 2012/05/29: - - sorts numerical values; - TODO: extend (rewrite) to support alphanumerical values - for sorting. - -INSTALLATION -============ - -Install in a standard way as any other LaTeX macro package. - -AUTHORS/MAINTAINER -================== - -* Sigitas Tolušis -* Vytas Statulevičius (floatpag.sty) - -DOCUMENTATION -============= - -Please see the sttools.pdf for a package list in collection -and <package>.pdf for particular macro package. - -LICENSE -======= - -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://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX -version 2005/12/01 or later. - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sttools/README.md new/doc/latex/sttools/README.md --- old/doc/latex/sttools/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/sttools/README.md 2017-04-04 06:53:44.000000000 +0200 @@ -0,0 +1,85 @@ +README for sttools, v2.0 2017/03/27 + +INTRODUCTION +============ + +It is a collection of macro packages historically placed in a bundle +and maintained by Sigitas Tolušis. + +PACKAGES +======== + +* cuted.sty, v1.5 2012/10/04: + – puts some material page width wide at any place on twocolumn page + with existing text reformatted under inserted material; + TODO: add optional rules to separate from text; + +* floatpag.sty, v1.1 2012/05/29: + – sets pagestyle for floats page; + +* flushend.sty, v3.3 2017/03/27: + – balances page in twocolumn mode; + (2014/03/03): totally rewritten with new algorithm to support footnotes, + top floats and column break before one line section title; + (2014/04/24): bugfix version; + (2015/04/08): bugfix version with improved funcionality: + - spreaded or fixed right column height; + - optional old algorithm for backward compatability; + (2015/04/14): set debug option off by default; keeplastbox modified; + (2016/06/21): bugfix compatibility with luatexja package; + (2017/03/27): bugfix version with new options for some checks on/off; + +* marginal.sty, v1.1 2012/05/29: + – enlarges room for marginal inserts; + (2016/06/28): removed from the bundle; + +* midfloat.sty, v1.1 2012/05/29: + – inserts onecolumn stuff in twocolumn page; + TODO: extend to work on both columns; + +* stabular.sty, v2.0 2014/03/20: + – modifies tabular environment; + (2014/03/20): removed extra stuff and left only possibility to break + on page boundary; + added tabular variant from array package; + +* stfloats.sty, v3.3 2017/03/27: + – enriches floats output mechanism; + (2016/06/28): compatibility bugfix with 2015 latexrelease; + (2017/03/27): compatibility bugfix with 2017-05-01 latexrelease; + +* texsort.sty, v1.1 2012/05/29: + - sorts numerical values; + TODO: extend (rewrite) to support alphanumerical values + for sorting. + +INSTALLATION +============ + +Install in a standard way as any other LaTeX macro package. + +AUTHORS/MAINTAINER +================== + +* Sigitas Tolušis +* Vytas Statulevičius (floatpag.sty) + +DOCUMENTATION +============= + +Please see the sttools.pdf for a package list in collection +and <package>.pdf for particular macro package. + +LICENSE +======= + +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://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. + + + Binary files old/doc/latex/sttools/flushend.pdf and new/doc/latex/sttools/flushend.pdf differ Binary files old/doc/latex/sttools/marginal.pdf and new/doc/latex/sttools/marginal.pdf differ Binary files old/doc/latex/sttools/stfloats.pdf and new/doc/latex/sttools/stfloats.pdf differ Binary files old/doc/latex/sttools/sttools.pdf and new/doc/latex/sttools/sttools.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sttools.doc.tlpobj new/tlpkg/tlpobj/sttools.doc.tlpobj --- old/tlpkg/tlpobj/sttools.doc.tlpobj 2016-04-14 19:47:40.000000000 +0200 +++ new/tlpkg/tlpobj/sttools.doc.tlpobj 2017-04-14 18:01:00.000000000 +0200 @@ -1,14 +1,13 @@ name sttools.doc category Package -revision 39677 +revision 43684 shortdesc doc files of sttools relocated 1 -docfiles size=265 - RELOC/doc/latex/sttools/README +docfiles size=247 + RELOC/doc/latex/sttools/README.md RELOC/doc/latex/sttools/cuted.pdf RELOC/doc/latex/sttools/floatpag.pdf RELOC/doc/latex/sttools/flushend.pdf - RELOC/doc/latex/sttools/marginal.pdf RELOC/doc/latex/sttools/midfloat.pdf RELOC/doc/latex/sttools/stabular.pdf RELOC/doc/latex/sttools/stfloats.pdf ++++++ sttools.tar.xz ++++++ ++++ 2568 lines of diff (skipped) ++++++ stubs.doc.tar.xz ++++++ ++++++ stubs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stubs.tlpobj new/tlpkg/tlpobj/stubs.tlpobj --- old/tlpkg/tlpobj/stubs.tlpobj 2016-04-14 19:47:41.000000000 +0200 +++ new/tlpkg/tlpobj/stubs.tlpobj 2017-04-14 18:01:01.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/stubs/stubs.sty catalogue-ctan /macros/latex/contrib/stubs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics advert catalogue-version 0.1.1 ++++++ sty2dtx.doc.tar.xz ++++++ ++++++ sty2dtx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sty2dtx.tlpobj new/tlpkg/tlpobj/sty2dtx.tlpobj --- old/tlpkg/tlpobj/sty2dtx.tlpobj 2016-04-14 19:47:41.000000000 +0200 +++ new/tlpkg/tlpobj/sty2dtx.tlpobj 2017-04-14 18:01:01.000000000 +0200 @@ -20,7 +20,7 @@ texmf-dist/scripts/sty2dtx/sty2dtx.pl catalogue-also makedtx catalogue-ctan /support/sty2dtx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics package-devel catalogue-version 2.3 ++++++ suanpan.doc.tar.xz ++++++ ++++++ suanpan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suanpan.tlpobj new/tlpkg/tlpobj/suanpan.tlpobj --- old/tlpkg/tlpobj/suanpan.tlpobj 2016-04-14 19:47:41.000000000 +0200 +++ new/tlpkg/tlpobj/suanpan.tlpobj 2017-04-14 18:01:01.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/metapost/suanpan/abacus.mp RELOC/metapost/suanpan/suanpan.mp catalogue-ctan /graphics/metapost/contrib/macros/suanpan -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games mp-use ++++++ subdepth.doc.tar.xz ++++++ ++++++ subdepth.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subdepth.tlpobj new/tlpkg/tlpobj/subdepth.tlpobj --- old/tlpkg/tlpobj/subdepth.tlpobj 2016-04-14 19:47:41.000000000 +0200 +++ new/tlpkg/tlpobj/subdepth.tlpobj 2017-04-14 18:01:01.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/subdepth/subdepth.sty catalogue-ctan /macros/latex/contrib/subdepth -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics subsup-pos maths catalogue-version 0.1 ++++++ subeqn.doc.tar.xz ++++++ ++++++ subeqn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subeqn.tlpobj new/tlpkg/tlpobj/subeqn.tlpobj --- old/tlpkg/tlpobj/subeqn.tlpobj 2016-04-14 19:47:41.000000000 +0200 +++ new/tlpkg/tlpobj/subeqn.tlpobj 2017-04-14 18:01:01.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/subeqn/subeqn.sty catalogue-also subeqnarray catalogue-ctan /macros/latex/contrib/subeqn -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths catalogue-version 2.0b ++++++ subeqnarray.doc.tar.xz ++++++ ++++++ subeqnarray.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subeqnarray.tlpobj new/tlpkg/tlpobj/subeqnarray.tlpobj --- old/tlpkg/tlpobj/subeqnarray.tlpobj 2016-04-14 19:47:42.000000000 +0200 +++ new/tlpkg/tlpobj/subeqnarray.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/subeqnarray/subeqnarray.sty catalogue-also subeqn catalogue-ctan /macros/latex/contrib/subeqnarray -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-syseqn catalogue-version 2.1c ++++++ subfig.doc.tar.xz ++++++ ++++++ subfig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfig.tlpobj new/tlpkg/tlpobj/subfig.tlpobj --- old/tlpkg/tlpobj/subfig.tlpobj 2016-04-14 19:47:42.000000000 +0200 +++ new/tlpkg/tlpobj/subfig.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/subfig/subfig.sty catalogue-also subfloat catalogue-ctan /macros/latex/contrib/subfig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption subfloat catalogue-version 1.3 ++++++ subfigmat.doc.tar.xz ++++++ ++++++ subfigmat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfigmat.tlpobj new/tlpkg/tlpobj/subfigmat.tlpobj --- old/tlpkg/tlpobj/subfigmat.tlpobj 2016-04-14 19:47:43.000000000 +0200 +++ new/tlpkg/tlpobj/subfigmat.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/subfigmat/subfigmat.sty catalogue-ctan /macros/latex/contrib/subfigmat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics matrix float catalogue-version 1.0 ++++++ subfigure.doc.tar.xz ++++++ ++++++ subfigure.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfigure.tlpobj new/tlpkg/tlpobj/subfigure.tlpobj --- old/tlpkg/tlpobj/subfigure.tlpobj 2016-04-14 19:47:43.000000000 +0200 +++ new/tlpkg/tlpobj/subfigure.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/subfigure/subfigure.sty catalogue-also subfloat catalogue-ctan /obsolete/macros/latex/contrib/subfigure -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption subfloat obsolete catalogue-version 2.1.5 ++++++ subfiles.doc.tar.xz ++++++ ++++++ subfiles.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfiles.tlpobj new/tlpkg/tlpobj/subfiles.tlpobj --- old/tlpkg/tlpobj/subfiles.tlpobj 2016-04-14 19:47:43.000000000 +0200 +++ new/tlpkg/tlpobj/subfiles.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/subfiles/subfiles.sty catalogue-also combine standalone catalogue-ctan /macros/latex/contrib/subfiles -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics subdocs catalogue-version 1.1 ++++++ subfloat.doc.tar.xz ++++++ ++++++ subfloat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfloat.tlpobj new/tlpkg/tlpobj/subfloat.tlpobj --- old/tlpkg/tlpobj/subfloat.tlpobj 2016-04-14 19:47:44.000000000 +0200 +++ new/tlpkg/tlpobj/subfloat.tlpobj 2017-04-14 18:01:02.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/subfloat/subfloat.sty catalogue-ctan /macros/latex/contrib/subfloat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics subfloat catalogue-version 2.14 ++++++ substances.doc.tar.xz ++++++ ++++++ substances.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/substances.tlpobj new/tlpkg/tlpobj/substances.tlpobj --- old/tlpkg/tlpobj/substances.tlpobj 2016-05-10 23:51:58.000000000 +0200 +++ new/tlpkg/tlpobj/substances.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/substances/substances-default.def RELOC/tex/latex/substances/substances.sty catalogue-ctan /macros/latex/contrib/substances -catalogue-date 2016-05-09 12:26:19 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chemistry expl3 catalogue-version 0.2a ++++++ substitutefont.doc.tar.xz ++++++ ++++++ substitutefont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/substitutefont.tlpobj new/tlpkg/tlpobj/substitutefont.tlpobj --- old/tlpkg/tlpobj/substitutefont.tlpobj 2016-04-14 19:47:45.000000000 +0200 +++ new/tlpkg/tlpobj/substitutefont.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/substitutefont/substitutefont.sty catalogue-ctan /macros/latex/contrib/substitutefont -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp catalogue-version 0.1.4 ++++++ substr.doc.tar.xz ++++++ ++++++ substr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/substr.tlpobj new/tlpkg/tlpobj/substr.tlpobj --- old/tlpkg/tlpobj/substr.tlpobj 2016-04-14 19:47:45.000000000 +0200 +++ new/tlpkg/tlpobj/substr.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/substr/substr.sty catalogue-ctan /macros/latex/contrib/substr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics macro-supp catalogue-version 1.2 ++++++ subsupscripts.doc.tar.xz ++++++ ++++++ subsupscripts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subsupscripts.tlpobj new/tlpkg/tlpobj/subsupscripts.tlpobj --- old/tlpkg/tlpobj/subsupscripts.tlpobj 2016-04-14 19:47:45.000000000 +0200 +++ new/tlpkg/tlpobj/subsupscripts.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/subsupscripts/subsupscripts.sty catalogue-ctan /macros/latex/contrib/subsupscripts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics subsup-pos maths physics catalogue-version 1.0 ++++++ sudoku.doc.tar.xz ++++++ ++++++ sudoku.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sudoku.tlpobj new/tlpkg/tlpobj/sudoku.tlpobj --- old/tlpkg/tlpobj/sudoku.tlpobj 2016-04-14 19:47:45.000000000 +0200 +++ new/tlpkg/tlpobj/sudoku.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=1 RELOC/tex/latex/sudoku/sudoku.sty catalogue-ctan /macros/latex/contrib/sudoku -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games catalogue-version 1.0 ++++++ sudokubundle.doc.tar.xz ++++++ ++++++ sudokubundle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sudokubundle.tlpobj new/tlpkg/tlpobj/sudokubundle.tlpobj --- old/tlpkg/tlpobj/sudokubundle.tlpobj 2016-04-14 19:47:46.000000000 +0200 +++ new/tlpkg/tlpobj/sudokubundle.tlpobj 2017-04-14 18:01:03.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/sudokubundle/solvesudoku.sty catalogue-also sudoku catalogue-ctan /macros/latex/contrib/sudokubundle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games catalogue-version 1.0a ++++++ suftesi.doc.tar.xz ++++++ ++++++ suftesi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suftesi.tlpobj new/tlpkg/tlpobj/suftesi.tlpobj --- old/tlpkg/tlpobj/suftesi.tlpobj 2016-04-14 19:47:47.000000000 +0200 +++ new/tlpkg/tlpobj/suftesi.tlpobj 2017-04-14 18:01:04.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=21 RELOC/tex/latex/suftesi/suftesi.cls catalogue-ctan /macros/latex/contrib/suftesi -catalogue-date 2016-04-04 15:56:37 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics book-pub class dissertation catalogue-version 2.9 ++++++ sugconf.doc.tar.xz ++++++ ++++++ sugconf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sugconf.tlpobj new/tlpkg/tlpobj/sugconf.tlpobj --- old/tlpkg/tlpobj/sugconf.tlpobj 2016-04-14 19:47:47.000000000 +0200 +++ new/tlpkg/tlpobj/sugconf.tlpobj 2017-04-14 18:01:04.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=2 RELOC/tex/latex/sugconf/sugconf.cls catalogue-ctan /macros/latex/contrib/conferences/sugconf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub ++++++ superiors.doc.tar.xz ++++++ ++++++ superiors.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/superiors.tlpobj new/tlpkg/tlpobj/superiors.tlpobj --- old/tlpkg/tlpobj/superiors.tlpobj 2016-04-14 19:47:48.000000000 +0200 +++ new/tlpkg/tlpobj/superiors.tlpobj 2017-04-14 18:01:04.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/fonts/type1/public/superiors/libertinesups.pfb RELOC/tex/latex/superiors/superiors.sty catalogue-ctan /fonts/superiors -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-symbol font-type1 font-supp catalogue-version 1.05 ++++++ supertabular.doc.tar.xz ++++++ ++++++ supertabular.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/supertabular.tlpobj new/tlpkg/tlpobj/supertabular.tlpobj --- old/tlpkg/tlpobj/supertabular.tlpobj 2016-04-14 19:47:48.000000000 +0200 +++ new/tlpkg/tlpobj/supertabular.tlpobj 2017-04-14 18:01:04.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/supertabular/supertabular.sty catalogue-also xtab catalogue-ctan /macros/latex/contrib/supertabular -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics table table-long catalogue-version 4.1a ++++++ susy.doc.tar.xz ++++++ ++++++ susy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/susy.tlpobj new/tlpkg/tlpobj/susy.tlpobj --- old/tlpkg/tlpobj/susy.tlpobj 2016-04-14 19:47:48.000000000 +0200 +++ new/tlpkg/tlpobj/susy.tlpobj 2017-04-14 18:01:04.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=1 RELOC/tex/latex/susy/susy.sty catalogue-ctan /macros/latex/contrib/susy -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics shortcut physics ++++++ svg-inkscape.doc.tar.xz ++++++ ++++++ svg.doc.tar.xz ++++++ ++++ 3022 lines of diff (skipped) ++++++ svg.tar.xz ++++++ ++++ 2473 lines of diff (skipped) ++++++ svgcolor.doc.tar.xz ++++++ ++++++ svgcolor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svgcolor.tlpobj new/tlpkg/tlpobj/svgcolor.tlpobj --- old/tlpkg/tlpobj/svgcolor.tlpobj 2016-04-14 19:47:50.000000000 +0200 +++ new/tlpkg/tlpobj/svgcolor.tlpobj 2017-04-14 18:01:05.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/svgcolor/svgcolor.sty catalogue-ctan /macros/latex/contrib/svgcolor -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics colour catalogue-version 1.0 ++++++ svn-multi.doc.tar.xz ++++++ ++++++ svn-multi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svn-multi.tlpobj new/tlpkg/tlpobj/svn-multi.tlpobj --- old/tlpkg/tlpobj/svn-multi.tlpobj 2016-04-14 19:47:51.000000000 +0200 +++ new/tlpkg/tlpobj/svn-multi.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -16,7 +16,7 @@ texmf-dist/tex/latex/svn-multi/svnkw.sty catalogue-also svn svninfo catalogue-ctan /macros/latex/contrib/svn-multi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics version-control doc-mgmt catalogue-version 2.4d ++++++ svn-prov.doc.tar.xz ++++++ ++++++ svn-prov.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svn-prov.tlpobj new/tlpkg/tlpobj/svn-prov.tlpobj --- old/tlpkg/tlpobj/svn-prov.tlpobj 2016-04-14 19:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/svn-prov.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/svn-prov/svn-prov.sty catalogue-ctan /macros/latex/contrib/svn-prov -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics version-control doc-mgmt catalogue-version 3.1862 ++++++ svn.doc.tar.xz ++++++ ++++++ svn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svn.tlpobj new/tlpkg/tlpobj/svn.tlpobj --- old/tlpkg/tlpobj/svn.tlpobj 2016-04-14 19:47:51.000000000 +0200 +++ new/tlpkg/tlpobj/svn.tlpobj 2017-04-14 18:01:05.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/svn/svn.sty catalogue-also svninfo svn-multi catalogue-ctan /macros/latex/contrib/svn -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics version-control doc-mgmt catalogue-version 43 ++++++ svninfo.doc.tar.xz ++++++ ++++++ svninfo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svninfo.tlpobj new/tlpkg/tlpobj/svninfo.tlpobj --- old/tlpkg/tlpobj/svninfo.tlpobj 2016-04-14 19:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/svninfo.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/svninfo/svninfo.sty catalogue-also svn svn-multi svn-prov catalogue-ctan /macros/latex/contrib/svninfo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics version-control doc-mgmt catalogue-version 0.7.4 ++++++ svrsymbols.doc.tar.xz ++++++ ++++++ svrsymbols.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svrsymbols.tlpobj new/tlpkg/tlpobj/svrsymbols.tlpobj --- old/tlpkg/tlpobj/svrsymbols.tlpobj 2016-04-14 19:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/svrsymbols.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/fonts/type1/public/svrsymbols/SVRsymbols.pfb RELOC/tex/latex/svrsymbols/svrsymbols.sty catalogue-ctan /fonts/svrsymbols -catalogue-date 2016-04-08 18:55:28 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-maths font-symbol-maths catalogue-version 2.0a ++++++ swebib.doc.tar.xz ++++++ ++++++ swebib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/swebib.tlpobj new/tlpkg/tlpobj/swebib.tlpobj --- old/tlpkg/tlpobj/swebib.tlpobj 2016-04-14 19:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/swebib.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -15,6 +15,6 @@ RELOC/bibtex/bst/swebib/sweplnat.bst RELOC/bibtex/bst/swebib/sweunsrt.bst catalogue-ctan /biblio/bibtex/contrib/swebib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics bibtex-sty swedish ++++++ swimgraf.doc.tar.xz ++++++ ++++++ swimgraf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/swimgraf.tlpobj new/tlpkg/tlpobj/swimgraf.tlpobj --- old/tlpkg/tlpobj/swimgraf.tlpobj 2016-04-14 19:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/swimgraf.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -20,6 +20,6 @@ RELOC/tex/latex/swimgraf/swimgraf.cfg RELOC/tex/latex/swimgraf/swimgraf.sty catalogue-ctan /macros/latex/contrib/swimgraf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics data-disp ++++++ syllogism.doc.tar.xz ++++++ ++++++ syllogism.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/syllogism.tlpobj new/tlpkg/tlpobj/syllogism.tlpobj --- old/tlpkg/tlpobj/syllogism.tlpobj 2016-04-14 19:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/syllogism.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/syllogism/syllogism.sty catalogue-ctan /macros/latex/contrib/syllogism -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics logic catalogue-version 1.2 ++++++ symbol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/symbol.tlpobj new/tlpkg/tlpobj/symbol.tlpobj --- old/tlpkg/tlpobj/symbol.tlpobj 2016-04-14 19:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/symbol.tlpobj 2017-04-14 18:01:06.000000000 +0200 @@ -29,6 +29,6 @@ RELOC/tex/latex/symbol/uusy.fd catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-collection ++++++ sympytexpackage.doc.tar.xz ++++++ ++++++ sympytexpackage.tar.xz ++++++ ++++++ synctex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/synctex.1 new/texmf-dist/doc/man/man1/synctex.1 --- old/texmf-dist/doc/man/man1/synctex.1 2014-04-29 00:59:31.000000000 +0200 +++ new/texmf-dist/doc/man/man1/synctex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.Dd 06/26/2013 \" DATE +.Dd 04/23/2017 \" DATE .Dt synctex 1 \" Program name and manual section number .Sh NAME .Nm synctex @@ -13,17 +13,34 @@ and vice versa. .Pp Run `synctex help' to access the built-in tool documentation. -.Sh SEE ALSO +.Sh TEX ENGINE OPTION -synctex=NUMBER +.It +.Li If NUMBER=0 or no option is given, no synctex file is created. +.It +.Li If NUMBER<0, synctex files are text files. +.It +.Li If NUMBER>0, synctex files are compressed with gz. +.It +.Li If NUMBER&2, no .gz extension is used. +.It +.Li If NUMBER&4, activate form support, useful for pdftex. +.It +.Li If NUMBER&8, better file compression. +.Pp +Use for example `pdftex -synctex=15 foo.tex' to activate all the options. +.Pp +Notice that LuaTeX option is `--synctex=NUMBER' with two dashes. +.Sh SEE ALSO .\" List links in ascending order by section, alphabetically within a section. .\" Please do not reference files that do not exist without filing a bug report -.Xr synctex 5 +.Xr synctex 5 .Xr tex 1 .Sh AUTHOR The Synchronize TeXnology is essentially due to Jerome Laurens, with useful suggestions by some well known actors of the TeX world. .\" .Sh BUGS \" Document known, unremedied bugs .Sh HISTORY \" Document history if command behaves in a unique manner -This document has never been updated. +Revised on Sun Apr 23 09:54:20 UTC 2017. .\" nroff -man synctex.1 | less .\"groff -man -Tascii synctex.1 | less .\"To convert a man page to plain pre-formatted text (e.g for spell checking) use: Binary files old/texmf-dist/doc/man/man1/synctex.man1.pdf and new/texmf-dist/doc/man/man1/synctex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man5/synctex.5 new/texmf-dist/doc/man/man5/synctex.5 --- old/texmf-dist/doc/man/man5/synctex.5 2012-05-28 19:40:26.000000000 +0200 +++ new/texmf-dist/doc/man/man5/synctex.5 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.Dd Mar 13, 2012 +.Dd Apr 22, 2017 .Dt SYNCTEX 5 .Os "Independant" .\" @@ -13,8 +13,7 @@ .Pq synctexs are text files that help input/output synchronization during document preparation with the TeX typesetting system. .Sh BASICS -The structure of this file should not be considered public, in the sense that no one should need to parse its contents, except the synctex command line utility, and the synctex_parser library. -Unless it is absolutely not avoidable, access to the contents of the synctex file should only be made through requests made to the synctex command line utility. +The structure of this file should not be considered public, in the sense that no one should need to parse its contents, except the synctex command line utility, and the synctex_parser library which are both publicly available. Unless it is absolutely not avoidable, access to the contents of the synctex file should only be made through requests made to the synctex command line utility. .\" .Sh STRUCTURE The element structure of a synctex file is a list of text line records as follows. @@ -94,19 +93,21 @@ .Qq Content: <EOL> .It +.Li (<Form(k)>|<Input Line>)* +.It .Li <sheet(1)> .It -.Li <Input Line>* +.Li (<Form(k)>|<Input Line>)* .It .Li <sheet(2)> .It -.Li <Input Line>* +.Li (<Form(k)>|<Input Line>)* .It .Li ... .It .Li <sheet(N)> .It -.Li <Input Line>* +.Li (<Form(k)>|<Input Line>)* .El .It .Li <byte offset record> ::= @@ -123,17 +124,37 @@ .Li <byte offset record> .It .Qq \&{ -<the integer n> <end of record>/ +<the integer n> <end of record> .It -.Li <box content>* +.Li <vbox section>|<hbox section> .It .Li <byte offset record> .It .Qq \&} <the integer n> <end of record> .El +.It +.Li <Form> ::= +.Bl -item -offset indent +.It +.Li <byte offset record> +.It +.Qq \&< +<form tag> <end of record> +.It +.Li <vbox section>|<hbox section> +.It +.Li <byte offset record> +.It +.Qq \&> +<end of record> +.El +.It +.Li <form tag> ::= <integer> .El .Pp +Forms are available with pdfTeX. +All the numbers are integers encoded using the decimal representation with "C" locale. The <box content> describes what is inside a box. It is either a vertical or horizontal box, with some records related to glue, kern or math nodes. @@ -146,7 +167,9 @@ .It .Li |<void vbox record>|<void hbox record> .It -.Li |<current record>|<glue record>|<kern record>|<math record> +.Li |<current record>|<glue record>|<kern record> +.It +.Li |<math record>|<form ref record>|<Form> .El .It .Li <vbox section> ::= @@ -201,6 +224,27 @@ .Qq \&: <size> <end of record> .It +.Li <link> ::= <tag> +.Qq \&, +<line>( +.Qq \&, +<column>)? +.It +.Li <point> ::= <full point>|<compressed point> +.It +.Li <full point> ::= +<integer> +.Qq \&, +<integer> +.It +.Li <compressed point> ::= +<integer> +.Qq \&,= +.It +.Li <line> ::= <integer> +.It +.Li <column> ::= <integer> +.It .Li <size> ::= <Width> .Qq \&, <Height> @@ -212,16 +256,6 @@ .Li <Height> ::= <integer> .It .Li <Depth> ::= <integer> -.It -.Li <link> ::= <tag> -.Qq \&, -<line>( -.Qq \&, -<column>)? -.It -.Li <line> ::= <integer> -.It -.Li <column> ::= <integer> .El .Pp The forthcoming records are basic one liners. @@ -252,6 +286,12 @@ <link> .Qq \&: <point> <end of record> +.It +.Li <form ref record> ::= +.Qq f +<form tag> +.Qq \&: +<point> <end of record> .El .Pp .\" .Sx underline, .Dq double quotes, .Pq enclosed in parenthesis @@ -308,7 +348,22 @@ .Sh USAGE .Pp The <current record> is used to compute the visible size of hbox's. -The byte offset is an implicit anchor to navigate the synctex file from sheet to sheet. +The byte offset is an implicit anchor to navigate the synctex file from sheet to sheet. The second coordinate of +a compressed point has been replaced by a +.Qq = +character which means that it is the second coordinate of the +last full point available above. +.Sh SEE ALSO +.\" List links in ascending order by section, alphabetically within a section. +.\" Please do not reference files that do not exist without filing a bug report +.Xr synctex 1 +.Xr tex 1 +.Sh AUTHOR +The Synchronize TeXnology is essentially due to Jerome Laurens, +with useful suggestions by some well known actors of the TeX world. +.\" .Sh BUGS \" Document known, unremedied bugs +.Sh HISTORY \" Document history if command behaves in a unique manner +This document has been updated on Sat Apr 22 09:57:20 UTC 2017 to include \\pdfxform support. .\" nroff -man synctex.5 | less .\"groff -man -Tascii synctex.5 | less .\"To convert a man page to plain pre-formatted text (e.g for spell checking) use: Binary files old/texmf-dist/doc/man/man5/synctex.man5.pdf and new/texmf-dist/doc/man/man5/synctex.man5.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/synctex.doc.tlpobj new/tlpkg/tlpobj/synctex.doc.tlpobj --- old/tlpkg/tlpobj/synctex.doc.tlpobj 2016-04-27 03:24:55.000000000 +0200 +++ new/tlpkg/tlpobj/synctex.doc.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,8 +1,8 @@ name synctex.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of synctex -docfiles size=15 +docfiles size=11 texmf-dist/doc/man/man1/synctex.1 texmf-dist/doc/man/man1/synctex.man1.pdf texmf-dist/doc/man/man5/synctex.5 ++++++ synproof.doc.tar.xz ++++++ ++++++ synproof.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/synproof.tlpobj new/tlpkg/tlpobj/synproof.tlpobj --- old/tlpkg/tlpobj/synproof.tlpobj 2016-04-14 19:47:57.000000000 +0200 +++ new/tlpkg/tlpobj/synproof.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/synproof/synproof.sty catalogue-ctan /macros/latex/contrib/synproof -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics logic linguistic catalogue-version 1.0 ++++++ syntax.doc.tar.xz ++++++ ++++++ syntax.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/syntax.tlpobj new/tlpkg/tlpobj/syntax.tlpobj --- old/tlpkg/tlpobj/syntax.tlpobj 2016-04-14 19:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/syntax.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/syntax/syntax.tex catalogue-also syntax-mdw catalogue-ctan /macros/latex/contrib/syntax -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-19 09:53:55 +0200 catalogue-license gpl catalogue-topics syntax diagram ++++++ syntrace.doc.tar.xz ++++++ ++++++ syntrace.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/syntrace.tlpobj new/tlpkg/tlpobj/syntrace.tlpobj --- old/tlpkg/tlpobj/syntrace.tlpobj 2016-04-14 19:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/syntrace.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/syntrace/syntrace.sty catalogue-ctan /macros/latex/contrib/syntrace -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics tree catalogue-version 1.1 ++++++ synttree.doc.tar.xz ++++++ ++++++ synttree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/synttree.tlpobj new/tlpkg/tlpobj/synttree.tlpobj --- old/tlpkg/tlpobj/synttree.tlpobj 2016-04-14 19:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/synttree.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=4 RELOC/tex/latex/synttree/synttree.sty catalogue-ctan /macros/latex/contrib/synttree -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics tree linguistic catalogue-version 1.4.2 ++++++ systeme.doc.tar.xz ++++++ ++++++ systeme.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/systeme.tlpobj new/tlpkg/tlpobj/systeme.tlpobj --- old/tlpkg/tlpobj/systeme.tlpobj 2016-04-14 19:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/systeme.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/generic/systeme/systeme.sty RELOC/tex/generic/systeme/systeme.tex catalogue-ctan /macros/generic/systeme -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-23 17:00:38 +0100 catalogue-license lppl1.3 -catalogue-topics maths simplified +catalogue-topics maths maths-syseqn simplified catalogue-version 0.3 ++++++ t-angles.doc.tar.xz ++++++ ++++++ t-angles.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/t-angles.tlpobj new/tlpkg/tlpobj/t-angles.tlpobj --- old/tlpkg/tlpobj/t-angles.tlpobj 2016-04-14 19:47:59.000000000 +0200 +++ new/tlpkg/tlpobj/t-angles.tlpobj 2017-04-14 18:01:08.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=6 RELOC/tex/latex/t-angles/t-angles.sty catalogue-ctan /macros/latex/contrib/t-angles -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths graphics-in-tex ++++++ t2.doc.tar.xz ++++++ ++++++ t2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/t2.tlpobj new/tlpkg/tlpobj/t2.tlpobj --- old/tlpkg/tlpobj/t2.tlpobj 2016-04-14 19:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/t2.tlpobj 2017-04-14 18:01:10.000000000 +0200 @@ -71,6 +71,6 @@ RELOC/tex/latex/t2/mathtext.sty RELOC/tex/latex/t2/misccorr.sty catalogue-ctan /macros/latex/contrib/t2 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics fontenc cyrillic ++++++ tabfigures.doc.tar.xz ++++++ ++++++ tabfigures.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabfigures.tlpobj new/tlpkg/tlpobj/tabfigures.tlpobj --- old/tlpkg/tlpobj/tabfigures.tlpobj 2016-04-14 19:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/tabfigures.tlpobj 2017-04-14 18:01:11.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/tabfigures/tabfigures.sty catalogue-ctan /macros/latex/contrib/tabfigures -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-use typesetting catalogue-version 1.1 ++++++ tableaux.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tableaux.doc.tlpobj new/tlpkg/tlpobj/tableaux.doc.tlpobj --- old/tlpkg/tlpobj/tableaux.doc.tlpobj 2016-04-14 19:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/tableaux.doc.tlpobj 2017-04-14 18:01:11.000000000 +0200 @@ -1,6 +1,6 @@ name tableaux.doc category Package -revision 34843 +revision 42413 shortdesc doc files of tableaux relocated 1 docfiles size=25 ++++++ tableaux.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tableaux.tlpobj new/tlpkg/tlpobj/tableaux.tlpobj --- old/tlpkg/tlpobj/tableaux.tlpobj 2016-04-14 19:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/tableaux.tlpobj 2017-04-14 18:01:11.000000000 +0200 @@ -1,6 +1,6 @@ name tableaux category Package -revision 34843 +revision 42413 shortdesc Construct tables of signs and variations relocated 1 longdesc The package uses PSTricks; the user may define the width of the @@ -12,6 +12,6 @@ RELOC/tex/latex/tableaux/tableau.sty catalogue-also tablor tkz-tab tableauvariations tabvar catalogue-ctan /macros/latex/contrib/tableaux -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-tabvar

1 0

commit texlive-specs-u for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-u for openSUSE:Factory checked in at 2017-06-25 19:22:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-u (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-u.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-u" Sun Jun 25 19:22:42 2017 rev:27 rq:504811 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-u/texlive-specs-u.changes 2017-06-08 14:56:18.135765704 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-u.new/texlive-specs-u.changes 2017-06-25 19:29:07.397019972 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- simplecd.doc.tar.xz simplecd.tar.xz simplecv.doc.tar.xz simplecv.tar.xz simpler-wick.doc.tar.xz simpler-wick.tar.xz simplewick.doc.tar.xz simplewick.tar.xz simplified-latex.doc.tar.xz simurgh.doc.tar.xz simurgh.tar.xz sitem.doc.tar.xz sitem.tar.xz siunitx.doc.tar.xz siunitx.tar.xz skak.doc.tar.xz skak.tar.xz skaknew.doc.tar.xz skaknew.tar.xz skb.doc.tar.xz skb.tar.xz skdoc.doc.tar.xz skdoc.tar.xz skeycommand.doc.tar.xz skeycommand.tar.xz skeyval.doc.tar.xz skeyval.tar.xz skmath.doc.tar.xz skmath.tar.xz skrapport.doc.tar.xz skrapport.tar.xz skull.tar.xz slantsc.doc.tar.xz slantsc.tar.xz slideshow.doc.tar.xz slideshow.tar.xz smalltableof.doc.tar.xz smalltableof.tar.xz smartdiagram.doc.tar.xz smartdiagram.tar.xz smartref.doc.tar.xz smartref.tar.xz smartunits.doc.tar.xz smartunits.tar.xz snapshot.doc.tar.xz snapshot.tar.xz snotez.doc.tar.xz snotez.tar.xz songbook.doc.tar.xz songbook.tar.xz songs.doc.tar.xz songs.tar.xz sort-by-letters.doc.tar.xz sort-by-letters.tar.xz soton.doc.tar.xz soton.tar.xz soul.doc.tar.xz soul.tar.xz sourcecodepro.doc.tar.xz sourcecodepro.tar.xz sourcesanspro.doc.tar.xz sourcesanspro.tar.xz sourceserifpro.doc.tar.xz sourceserifpro.tar.xz spanish-mx.doc.tar.xz spanish-mx.tar.xz sparklines.doc.tar.xz sparklines.tar.xz spath3.doc.tar.xz spath3.tar.xz spelling.doc.tar.xz spelling.tar.xz sphdthesis.doc.tar.xz sphdthesis.tar.xz spie.doc.tar.xz spie.tar.xz splines.doc.tar.xz splines.tar.xz splitbib.doc.tar.xz splitbib.tar.xz splitindex.doc.tar.xz splitindex.tar.xz spot.doc.tar.xz spot.tar.xz spotcolor.doc.tar.xz spotcolor.tar.xz spreadtab.doc.tar.xz spreadtab.tar.xz spverbatim.doc.tar.xz spverbatim.tar.xz sr-vorl.doc.tar.xz sr-vorl.tar.xz srbook-mem.doc.tar.xz srbook-mem.tar.xz srcltx.doc.tar.xz srcltx.tar.xz srcredact.doc.tar.xz srcredact.tar.xz sseq.doc.tar.xz sseq.tar.xz sslides.doc.tar.xz sslides.tar.xz stack.tar.xz stackengine.doc.tar.xz stackengine.tar.xz stage.doc.tar.xz stage.tar.xz standalone.doc.tar.xz standalone.tar.xz starfont.doc.tar.xz starfont.tar.xz startex.doc.tar.xz startex.tar.xz statex.doc.tar.xz statex.tar.xz statex2.doc.tar.xz statex2.tar.xz statistik.doc.tar.xz statistik.tar.xz staves.doc.tar.xz staves.tar.xz stdclsdv.doc.tar.xz stdclsdv.tar.xz stdpage.doc.tar.xz stdpage.tar.xz steinmetz.doc.tar.xz steinmetz.tar.xz stellenbosch.doc.tar.xz stellenbosch.tar.xz stex.doc.tar.xz stex.tar.xz stix.doc.tar.xz stix.tar.xz New: ---- rlepsf.doc.tar.xz rlepsf.tar.xz rmathbr.doc.tar.xz rmathbr.tar.xz rmpage.doc.tar.xz rmpage.tar.xz roboto.doc.tar.xz roboto.tar.xz robustcommand.doc.tar.xz robustcommand.tar.xz robustindex.doc.tar.xz robustindex.tar.xz roex.tar.xz romanbar.doc.tar.xz romanbar.tar.xz romanbarpagenumber.doc.tar.xz romanbarpagenumber.tar.xz romande.doc.tar.xz romande.tar.xz romanneg.doc.tar.xz romanneg.tar.xz romannum.doc.tar.xz romannum.tar.xz rosario.doc.tar.xz rosario.tar.xz rotfloat.doc.tar.xz rotfloat.tar.xz rotpages.doc.tar.xz rotpages.tar.xz roundbox.doc.tar.xz roundbox.tar.xz roundrect.doc.tar.xz roundrect.tar.xz rputover.doc.tar.xz rputover.tar.xz rrgtrees.doc.tar.xz rrgtrees.tar.xz rsc.doc.tar.xz rsc.tar.xz rsfs.doc.tar.xz rsfs.tar.xz rsfso.doc.tar.xz rsfso.tar.xz rterface.doc.tar.xz rterface.tar.xz rtkinenc.doc.tar.xz rtkinenc.tar.xz rtklage.doc.tar.xz rtklage.tar.xz rubik.doc.tar.xz rubik.tar.xz ruhyphen.tar.xz rulercompass.doc.tar.xz rulercompass.tar.xz russ.doc.tar.xz russ.tar.xz rutitlepage.doc.tar.xz rutitlepage.tar.xz rviewport.doc.tar.xz rviewport.tar.xz rvwrite.doc.tar.xz rvwrite.tar.xz ryethesis.doc.tar.xz ryethesis.tar.xz sa-tikz.doc.tar.xz sa-tikz.tar.xz sageep.doc.tar.xz sageep.tar.xz sanitize-umlaut.doc.tar.xz sanitize-umlaut.tar.xz sanskrit-t1.doc.tar.xz sanskrit-t1.tar.xz sanskrit.doc.tar.xz sanskrit.tar.xz sansmath.doc.tar.xz sansmath.tar.xz sansmathaccent.doc.tar.xz sansmathaccent.tar.xz sansmathfonts.doc.tar.xz sansmathfonts.tar.xz sapthesis.doc.tar.xz sapthesis.tar.xz sasnrdisplay.doc.tar.xz sasnrdisplay.tar.xz sauerj.doc.tar.xz sauerj.tar.xz sauter.tar.xz sauterfonts.doc.tar.xz sauterfonts.tar.xz savefnmark.doc.tar.xz savefnmark.tar.xz savesym.tar.xz savetrees.doc.tar.xz savetrees.tar.xz scale.doc.tar.xz scale.tar.xz scalebar.doc.tar.xz scalebar.tar.xz scalerel.doc.tar.xz scalerel.tar.xz scanpages.doc.tar.xz scanpages.tar.xz schemabloc.doc.tar.xz schemabloc.tar.xz schemata.doc.tar.xz schemata.tar.xz schule.doc.tar.xz schule.tar.xz schulschriften.doc.tar.xz schulschriften.tar.xz schwalbe-chess.doc.tar.xz schwalbe-chess.tar.xz sciposter.doc.tar.xz sciposter.tar.xz sclang-prettifier.doc.tar.xz sclang-prettifier.tar.xz scratch.doc.tar.xz scratch.tar.xz screenplay-pkg.doc.tar.xz screenplay-pkg.tar.xz screenplay.doc.tar.xz screenplay.tar.xz scrjrnl.doc.tar.xz scrjrnl.tar.xz scrlttr2copy.doc.tar.xz scrlttr2copy.tar.xz scsnowman.doc.tar.xz scsnowman.tar.xz sdrt.doc.tar.xz sdrt.tar.xz sduthesis.doc.tar.xz sduthesis.tar.xz semantic-markup.doc.tar.xz semantic-markup.tar.xz sesstime.doc.tar.xz sesstime.tar.xz simple-resume-cv.doc.tar.xz simple-resume-cv.tar.xz simple-thesis-dissertation.doc.tar.xz simple-thesis-dissertation.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-u.spec ++++++ ++++ 27676 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-u/texlive-specs-u.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-u.new/texlive-specs-u.spec ++++++ simplecd.doc.tar.xz -> scale.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scale/COPYING new/doc/latex/scale/COPYING --- old/doc/latex/scale/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/scale/COPYING 2016-11-25 19:30:01.000000000 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scale/README new/doc/latex/scale/README --- old/doc/latex/scale/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/scale/README 2016-11-25 19:30:01.000000000 +0100 @@ -0,0 +1,23 @@ +Readme file for the `scale' package v1.1.2 <99/08/13> +----------------------------------------------------- + +This is the file `README', which accompanies the `scale' package +distribution. The package scales a document by \sqrt{2} or by +\magstep2. + +This is useful if you are preparing a document on e.g. A5 paper and +want to print on A4 paper to achieve a better resolution. + +The `scale' package consists of three files: + README - this file + scale.dtx - the macro code and instructions on how to use + the package in `docstrip'-able format. + scale.ins - The installation driver + +To install the `scale' package, just run LaTeX on the file `scale.ins'. + +You may redistributre this package under the terms of the GNU general +public license. Please see the file COPYING for more information. + +Please report bugs to +Soeren Sandmann (sandmann(a)daimi.au.dk). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/simplecd/README new/doc/latex/simplecd/README --- old/doc/latex/simplecd/README 2013-03-02 02:11:41.000000000 +0100 +++ new/doc/latex/simplecd/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -Copyright (C) 2010-2013 by Daniel Majoros - -This file may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either -version 1.2 of this license or (at your option) any later -version. The latest version of this license is in: - -http://www.latex-project.org/lppl.txt - -and version 1.2 or later is part of all distributions of -LaTeX version 1999/12/01 or later. - - -The simplecd package - -The simplecd package provides printable cut-outs for various CD, DVD and other data storage holders. -The name of the package comes form it's implementation and ease of use. - -The simplecd package was created for producing cut-outs for creating covers, inlays(inlets) for -optical disc packaging such as jewel cases, keepcases. Additional data storage cover support were added for -VHS, audio cassette and gramophone records. The covers were aimed for containing only -simple text with different font sizes, but since everything is placed inside a \parbox environment, it can -contain a wide range of things. - -There are also macros which can resize ready-to-print images to the appropriate size. - -The layout macros provide ready-to-use formatting for the covers. - -Covers and labels: - - jewel case front, back and individual spine - - 60 and 80 millimeter jewel case covers - - two-page jewel case front - - slim DVD keepcase - - normal DVD keepcase - - Blu-Ray keepcase - - custom-sized keepcase - - disk sleeve - - sleeve for 60 and 80 millimeter disks - - sleeve for lever arch files - - one sided DVD keepcase inlay - - one sided Blu-Ray keepcase inlay - - custom-sized inlay - - CD-R, CD, DVD disk images - - 60 and 80 millimeter disk images - - 3.5-inch floppy cover - - VHS labels and covers - - Audio cassette label and inlay - - Gramophone record covers - - Zip disk covers - -Layout macros: - - empty layouts for all macros listed below - - driver layout for standard, 60 and 80 millimeter covers - - movie layout for DVD and Blu-ray keepcases - - many jewel case layouts - - -Version history: - -1.4 - 2013/02/28 - - Made unitlength setting local - -1.3 - 2013/01/26 - - Added the nohcenter package option - - Added the jeweltitledlempty layout - - Added the jewelbackIIlempty layout - - Added the singlesheet cover with jewel layout support - - Improved noalign option and layout placement relation - -1.2 - 2012/12/21 - - Added jewelstripeslempty layout - - Added jewelgamel and jewelgamelempty layouts - - Added jewelflaglempty layout - - Added jewellineslempty layout - - Added cover for 3.5-inch floppy disks - - Added the disk macro - - Added VHS labels and covers - - Added audio cassette cover and inlay - - Added gramophone record cover labels - - Added zip disk covers - -1.1 - 2012/11/04 - - Rewrote the drawing mechanism, covers will never be resized based on content - - Added support for 60 and 80 millimeter disks - - Added sleeve for lever arch files - - Added disk images - - Added layouts: ready-to-use designs for cover content - - Added troubleshooting and font size section into the documentation - - Added examples tex and pdf files - -1.0 - 2010/07/01 - - Initial release Binary files old/doc/latex/simplecd/examples.pdf and new/doc/latex/simplecd/examples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/simplecd/examples.tex new/doc/latex/simplecd/examples.tex --- old/doc/latex/simplecd/examples.tex 2012-12-22 00:34:47.000000000 +0100 +++ new/doc/latex/simplecd/examples.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ - -\documentclass[a4paper,10pt,oneside]{article} -\pagestyle{empty} - -%Sets margins in centimetres -\usepackage[left=1cm, top=1cm, right=2cm, bottom=1cm]{geometry} - -\usepackage{simplecd} - -\begin{document} - -\djewel{{\Large Double jewel front frontpage}}{second page} -\newpage -\dvd[backtext]{{\Huge DVD keepcase}}{spine} -\newpage -\bluray{{\Huge Blu-Ray keepcase}}{Spine} -\newpage -\slimdvd[backtext]{{\Huge Slim DVD keepcase}}{spine} -\newpage -\dvdinlay{{\Huge DVD keepcase inlay}} -\newpage -\sleeve{{\Huge Disk Sleeve}} -\newpage -\covers[{\Large Backsheet text}]{{{\Huge Jewel case cover} \\ \vspace{0.5cm} {\large TestSubtitle}}}{TestSpineText} - -\vspace{0.5cm} -\jewelspine{Jewel case spine} -\newpage -\sleevela[Back text]{\jeweldriverl{Lever arch(1)}{sleeve with layout (2)}{2012.20.12 (3)}{123456789 (4)}% - {12-ABC (5)}{Driver \\ Manual (6)}{Driver not compatible with ZYX operating system (7)}} -\newpage -\cddvddisk{{\Huge CD} \\ \vspace{3cm} Left \hspace{7cm} Right \\ \vspace{3cm} TextText} - -\vspace{2cm} - -\LXXXdisk{{\large 80 millmieter disk } \\ \vspace{4cm} Text} -\newpage -\sleeveLXXX[Back text]{\large 80 millimeter sleeve} -\floppyIIIV{3.5-inch floppy}{Back content} - -\zipdisk{Zip disk}{Back content} - -\vspace{1cm} - -\zipdiskII{Zip disk II} - -\vspace{1cm} - -\disk{{\Huge Disk} \\ \vspace{3cm}Left \hspace{7cm} Right \\ \vspace{3cm}TextText} - -\vspace{1cm} - -\vhsspine{\huge VHS spine} - -\vspace{1cm} - -\vhsfront{\huge VHS front} \hspace{1cm} -\cassettecover{{\huge Audio cassette} \\ \vspace{2cm} Lower text} - -\cassetteinlay{\huge Audio cassette inlay}{Spine}{Back} - -\end{document} \ No newline at end of file Binary files old/doc/latex/simplecd/simplecd.pdf and new/doc/latex/simplecd/simplecd.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scale.doc.tlpobj new/tlpkg/tlpobj/scale.doc.tlpobj --- old/tlpkg/tlpobj/scale.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/scale.doc.tlpobj 2017-04-14 18:00:11.000000000 +0200 @@ -0,0 +1,8 @@ +name scale.doc +category Package +revision 15878 +shortdesc doc files of scale +relocated 1 +docfiles size=6 + RELOC/doc/latex/scale/COPYING + RELOC/doc/latex/scale/README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/simplecd.doc.tlpobj new/tlpkg/tlpobj/simplecd.doc.tlpobj --- old/tlpkg/tlpobj/simplecd.doc.tlpobj 2016-04-14 19:46:27.000000000 +0200 +++ new/tlpkg/tlpobj/simplecd.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name simplecd.doc -category Package -revision 29260 -shortdesc doc files of simplecd -relocated 1 -docfiles size=249 - RELOC/doc/latex/simplecd/README - RELOC/doc/latex/simplecd/examples.pdf - RELOC/doc/latex/simplecd/examples.tex - RELOC/doc/latex/simplecd/simplecd.pdf ++++++ simplecd.doc.tar.xz -> scale.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/simplecd/README new/doc/latex/simplecd/README --- old/doc/latex/simplecd/README 2013-03-02 02:11:41.000000000 +0100 +++ new/doc/latex/simplecd/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,92 +0,0 @@ -Copyright (C) 2010-2013 by Daniel Majoros - -This file may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either -version 1.2 of this license or (at your option) any later -version. The latest version of this license is in: - -http://www.latex-project.org/lppl.txt - -and version 1.2 or later is part of all distributions of -LaTeX version 1999/12/01 or later. - - -The simplecd package - -The simplecd package provides printable cut-outs for various CD, DVD and other data storage holders. -The name of the package comes form it's implementation and ease of use. - -The simplecd package was created for producing cut-outs for creating covers, inlays(inlets) for -optical disc packaging such as jewel cases, keepcases. Additional data storage cover support were added for -VHS, audio cassette and gramophone records. The covers were aimed for containing only -simple text with different font sizes, but since everything is placed inside a \parbox environment, it can -contain a wide range of things. - -There are also macros which can resize ready-to-print images to the appropriate size. - -The layout macros provide ready-to-use formatting for the covers. - -Covers and labels: - - jewel case front, back and individual spine - - 60 and 80 millimeter jewel case covers - - two-page jewel case front - - slim DVD keepcase - - normal DVD keepcase - - Blu-Ray keepcase - - custom-sized keepcase - - disk sleeve - - sleeve for 60 and 80 millimeter disks - - sleeve for lever arch files - - one sided DVD keepcase inlay - - one sided Blu-Ray keepcase inlay - - custom-sized inlay - - CD-R, CD, DVD disk images - - 60 and 80 millimeter disk images - - 3.5-inch floppy cover - - VHS labels and covers - - Audio cassette label and inlay - - Gramophone record covers - - Zip disk covers - -Layout macros: - - empty layouts for all macros listed below - - driver layout for standard, 60 and 80 millimeter covers - - movie layout for DVD and Blu-ray keepcases - - many jewel case layouts - - -Version history: - -1.4 - 2013/02/28 - - Made unitlength setting local - -1.3 - 2013/01/26 - - Added the nohcenter package option - - Added the jeweltitledlempty layout - - Added the jewelbackIIlempty layout - - Added the singlesheet cover with jewel layout support - - Improved noalign option and layout placement relation - -1.2 - 2012/12/21 - - Added jewelstripeslempty layout - - Added jewelgamel and jewelgamelempty layouts - - Added jewelflaglempty layout - - Added jewellineslempty layout - - Added cover for 3.5-inch floppy disks - - Added the disk macro - - Added VHS labels and covers - - Added audio cassette cover and inlay - - Added gramophone record cover labels - - Added zip disk covers - -1.1 - 2012/11/04 - - Rewrote the drawing mechanism, covers will never be resized based on content - - Added support for 60 and 80 millimeter disks - - Added sleeve for lever arch files - - Added disk images - - Added layouts: ready-to-use designs for cover content - - Added troubleshooting and font size section into the documentation - - Added examples tex and pdf files - -1.0 - 2010/07/01 - - Initial release Binary files old/doc/latex/simplecd/examples.pdf and new/doc/latex/simplecd/examples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/simplecd/examples.tex new/doc/latex/simplecd/examples.tex --- old/doc/latex/simplecd/examples.tex 2012-12-22 00:34:47.000000000 +0100 +++ new/doc/latex/simplecd/examples.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ - -\documentclass[a4paper,10pt,oneside]{article} -\pagestyle{empty} - -%Sets margins in centimetres -\usepackage[left=1cm, top=1cm, right=2cm, bottom=1cm]{geometry} - -\usepackage{simplecd} - -\begin{document} - -\djewel{{\Large Double jewel front frontpage}}{second page} -\newpage -\dvd[backtext]{{\Huge DVD keepcase}}{spine} -\newpage -\bluray{{\Huge Blu-Ray keepcase}}{Spine} -\newpage -\slimdvd[backtext]{{\Huge Slim DVD keepcase}}{spine} -\newpage -\dvdinlay{{\Huge DVD keepcase inlay}} -\newpage -\sleeve{{\Huge Disk Sleeve}} -\newpage -\covers[{\Large Backsheet text}]{{{\Huge Jewel case cover} \\ \vspace{0.5cm} {\large TestSubtitle}}}{TestSpineText} - -\vspace{0.5cm} -\jewelspine{Jewel case spine} -\newpage -\sleevela[Back text]{\jeweldriverl{Lever arch(1)}{sleeve with layout (2)}{2012.20.12 (3)}{123456789 (4)}% - {12-ABC (5)}{Driver \\ Manual (6)}{Driver not compatible with ZYX operating system (7)}} -\newpage -\cddvddisk{{\Huge CD} \\ \vspace{3cm} Left \hspace{7cm} Right \\ \vspace{3cm} TextText} - -\vspace{2cm} - -\LXXXdisk{{\large 80 millmieter disk } \\ \vspace{4cm} Text} -\newpage -\sleeveLXXX[Back text]{\large 80 millimeter sleeve} -\floppyIIIV{3.5-inch floppy}{Back content} - -\zipdisk{Zip disk}{Back content} - -\vspace{1cm} - -\zipdiskII{Zip disk II} - -\vspace{1cm} - -\disk{{\Huge Disk} \\ \vspace{3cm}Left \hspace{7cm} Right \\ \vspace{3cm}TextText} - -\vspace{1cm} - -\vhsspine{\huge VHS spine} - -\vspace{1cm} - -\vhsfront{\huge VHS front} \hspace{1cm} -\cassettecover{{\huge Audio cassette} \\ \vspace{2cm} Lower text} - -\cassetteinlay{\huge Audio cassette inlay}{Spine}{Back} - -\end{document} \ No newline at end of file Binary files old/doc/latex/simplecd/simplecd.pdf and new/doc/latex/simplecd/simplecd.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/scale/scale.sty new/tex/latex/scale/scale.sty --- old/tex/latex/scale/scale.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/scale/scale.sty 2016-11-25 19:33:58.000000000 +0100 @@ -0,0 +1,71 @@ +%% +%% This is file `scale.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scale.dtx (with options: `package') +%% copyright (C) 1999 Soeren Sandmann Pedersen +%% +%% Please send error reports and suggestions for improvements to +%% Soeren Sandmann (sandmann(a)daimi.au.dk). +%% +%% This program is free software; you can redistribute it and/or modify +%% it under the terms of the GNU General Public License +%% as published by the Free Software Foundation; either version 2 +%% of the License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with this program; if not, write to the Free Software +%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\def\fileversion{v1.1.2} +\def\filedate{1999/08/13} +\NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesPackage{scale} + [\filedate\space\fileversion] +\newcommand\do@scale{} +\DeclareOption{sqrt2}{% + \renewcommand\do@scale{% + \typeout{*** scaling: sqrt(2) = 1.414 ***} + \setlength\(a)tempdima{0.292893219in}% (1-(1/sqrt(2)))in + \addtolength\oddsidemargin{\@tempdima} + \addtolength\evensidemargin{\@tempdima} + \addtolength\topmargin{\@tempdima} + \mag=1414} +} +\DeclareOption{magstep2}{% + \renewcommand\do@scale{% + \typeout{*** scaling: magstep2 = 1.440 (1.2^2) ***} + \setlength\(a)tempdima{0.305555555555556in}% (1-(1/1.2^2))in + \addtolength\oddsidemargin{\@tempdima} + \addtolength\evensidemargin{\@tempdima} + \addtolength\topmargin{\@tempdima} + \mag=\magstep2} +} +\ExecuteOptions{sqrt2} +\ProcessOptions +\AtBeginDocument{\do@scale\global\let\do@scale\@empty} +\endinput +%% +%% End of file `scale.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scale.tlpobj new/tlpkg/tlpobj/scale.tlpobj --- old/tlpkg/tlpobj/scale.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/scale.tlpobj 2017-04-14 18:00:11.000000000 +0200 @@ -0,0 +1,16 @@ +name scale +category Package +revision 15878 +shortdesc Scale document by sqrt(2) or magstep(2) +relocated 1 +longdesc A package to scale a document by sqrt(2) (or by \magstep{2}). +longdesc This is useful if you are preparing a document on, for example, +longdesc A5 paper and want to print on A4 paper to achieve a better +longdesc resolution. +runfiles size=1 + RELOC/tex/latex/scale/scale.sty +catalogue-ctan /macros/latex/contrib/scale +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license gpl +catalogue-topics geometry +catalogue-version 1.1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/simplecd.doc.tlpobj new/tlpkg/tlpobj/simplecd.doc.tlpobj --- old/tlpkg/tlpobj/simplecd.doc.tlpobj 2016-04-14 19:46:27.000000000 +0200 +++ new/tlpkg/tlpobj/simplecd.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name simplecd.doc -category Package -revision 29260 -shortdesc doc files of simplecd -relocated 1 -docfiles size=249 - RELOC/doc/latex/simplecd/README - RELOC/doc/latex/simplecd/examples.pdf - RELOC/doc/latex/simplecd/examples.tex - RELOC/doc/latex/simplecd/simplecd.pdf ++++++ spotcolor.doc.tar.xz -> scalebar.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scalebar/README new/doc/latex/scalebar/README --- old/doc/latex/scalebar/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/scalebar/README 2016-11-25 19:30:01.000000000 +0100 @@ -0,0 +1,41 @@ +THE SCALEBAR PACKAGE + +Abstract + +This package creates scalebars for maps, diagrams or photos. +It was designed for use with cave maps but can be used for +anything from showing a scalebar in kilometers for topographic +maps to a scalebar in micrometers for an electron microscope image. + +To produce the style file run: + latex scalebar.ins + This will produce scalebar.sty which needs to be copied to + a suitable directory under your local texmf directory. + +To produce the documentation run: + latex scalebar.dtx + This will produce scalebar.dvi documentation. + +To produce an index for the documentation: + makeindex -s gind.ist scalebar + latex scalebar.dtx + +To produce a change history for the documentation: + makeindex -s gglo.ist -o scalebar.gls scalebar.glo + latex scalebar.dtx + +Files supplied in this package: + scalebar.ins Batch file, run through LaTeX + scalebar.dtx Docstrip archive, run through LaTeX. + scalebar_examples.pdf + Lots of examples on how to use the macro + already formatted for you in PDF format. + scalebar_examples.tex + LaTeX source for the examples. + README This file + +I hope you find the package useful. + +Mike +mikel(a)speleonics.com.au + Binary files old/doc/latex/scalebar/scalebar_examples.pdf and new/doc/latex/scalebar/scalebar_examples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scalebar/scalebar_examples.tex new/doc/latex/scalebar/scalebar_examples.tex --- old/doc/latex/scalebar/scalebar_examples.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/scalebar/scalebar_examples.tex 2016-11-25 19:30:01.000000000 +0100 @@ -0,0 +1,165 @@ +\documentclass[a4paper,12pt]{article} +\usepackage{scalebar} +\usepackage{tabularx} +\usepackage{moreverb} +\begin{document} +\thispagestyle{empty} + +\setlength{\parindent}{0pt} +\setlength{\parskip}{0.4\baselineskip} + +{\huge \centering Examples for the \texttt{scalebars} Package + +} +\vspace{2\baselineskip} + +{\raggedleft Michael Lake\\ +\small http://www.speleonics.com.au/mikes/\\ +\makeatletter mikeL(a)speleonics.com.au \makeatother + +} +\vspace{2\baselineskip} + +Usage:\\ +\verb+\scalebar[inverse]{length}{minordivs}{majordivs}+\\ +\verb+ {starting No.}{ending No.}{units}+ + +where:\\ +\begin{tabularx}{\textwidth}{lX} +\texttt{length} &the desired length of the scalebar e.g.\ 10cm or 4in\\ +\texttt{minordivs} &number of minor divisions within the first major + division e.g.\ 4 (the first major division will always be + subdivided unless this value is set to 1)\\ +\texttt{majordivs} &number of major divisions e.g.\ 5 \\ +\texttt{starting No.}&the number that the scalebar text will start from + e.g.\ 0 or -0.5\\ +\texttt{ending No.}&the number that the scalebar text will end with + e.g.\ 2.5 or 25\\ +\texttt{units}&the units for the scalebar text e.g.\ $\mu$m or km +\end{tabularx} + + +\section*{Examples} + + +\verb+\scalebar{10cm}{4}{5}{0}{10}{m}+\\ + \scalebar{10cm}{4}{5}{0}{10}{m} +\vspace{\baselineskip} + + +This is how to indent a scalebar:\\ +\verb+\hspace*{2cm}\scalebar{10cm}{4}{5}{0}{10}{m}+\\ + \hspace*{2cm}\scalebar{10cm}{4}{5}{0}{10}{m} +\vspace{\baselineskip} + + +Change the length of the scalebar:\\ +\verb+\scalebar{12cm}{4}{5}{0}{10}{m}+\\ + \scalebar{12cm}{4}{5}{0}{10}{m} + +\newpage + +In the following three examples notice how I have scaled the total +length of the scalebar by roughly the same scale as the font change +to maintain a nice aspect ratio. + +Make a larger scalebar:\\ +I have scaled the length of the scalebar up (10cm to 12cm) by the same +scale as the font change (\verb+\normal+ to \verb+\large+) to maintain +a nice ratio of the length to its height.\\ +\verb+\large\scalebar{12cm}{4}{5}{0}{10}{m}\normalsize+\\ + \large\scalebar{12cm}{4}{5}{0}{10}{m}\normalsize +\vspace{\baselineskip} + + +Make a smaller scalebar:\\ +Here I scale down the length by an amount similar to the font change.\\ +\verb+\small\scalebar{8cm}{4}{5}{0}{10}{m}\normalsize+\\ + \small\scalebar{8cm}{4}{5}{0}{10}{m}\normalsize +\vspace{\baselineskip} + + +Make a tiny scalebar:\\ +Here I have to really reduce the length so I don't get a long, skinny and +ugly looking scalebar.\\ +\verb+\tiny\scalebar{4cm}{4}{5}{0}{10}{m}\normalsize+\\ + \tiny\scalebar{4cm}{4}{5}{0}{10}{m}\normalsize +\vspace{\baselineskip} + + +Change the number of minor and major divisions in the scalebar:\\ +\verb+\scalebar{10cm}{3}{4}{0}{10}{m}+\\ + \scalebar{10cm}{3}{4}{0}{12}{m} +\vspace{\baselineskip} + + +Change the starting and ending numbers:\\ +\verb+\scalebar{10cm}{4}{5}{-2}{8}{m}+\\ + \scalebar{10cm}{4}{5}{-2}{8}{m} +\vspace{\baselineskip} + +Change the units of the scalebar:\\ +\verb+\scalebar{10cm}{4}{5}{0}{10}{$\mu$m}+\\ + \scalebar{10cm}{4}{5}{0}{10}{$\mu$m} +\vspace{\baselineskip} + +\newpage +Use fractional values for starting and ending numbers:\\ +\verb+\scalebar{10cm}{4}{6}{-0.5}{2.5}{m}+\\ + \scalebar{10cm}{4}{6}{-0.5}{2.5}{m} +\vspace{\baselineskip} + + +Supress the minor divisions:\\ +\verb+\scalebar{10cm}{1}{5}{0}{10}{m}+\\ + \scalebar{10cm}{1}{5}{0}{10}{m} +\vspace{\baselineskip} + + +Invert the black/white bars:\\ +\verb+\scalebar[inverse]{10cm}{4}{5}{0}{10}{m}+\\ + \scalebar[inverse]{10cm}{4}{5}{0}{10}{m} +\vspace{\baselineskip} + + +Position a scalebar within a picture environment: +\begin{verbatim} +\setlength{\unitlength}{1mm} +\fbox{\begin{picture}(120,50)% create picture 120mm x 50mm +\put(2,11){Scale 1:200} +\put(2,7){\small\scalebar{5cm}{2}{5}{0}{10}{m}} +\end{picture}} +\end{verbatim} +\setlength{\unitlength}{1mm} +\fbox{\begin{picture}(120,50)% create picture 120mm x 50mm +\put(2,11){Scale 1:200} +\put(2,7){\small\scalebar{5cm}{2}{5}{0}{10}{m}} +\end{picture}} + +\newpage +\section*{Problems} + +If the length of the scalebar is longer than the page width it will break:\\ +(the page width here is: \the\textwidth)\\ +\verb+\scalebar{15cm}{4}{5}{0}{10}{m}+\\ +\scalebar{15cm}{4}{5}{0}{10}{m} +\vspace{\baselineskip} + +Several mathematical operations are performed and silly use of zero in +some parameters will result in a mathematical error. Consult the package +documentation for what is happening. + +Also these math calculations do seem to take +\TeX\ quite a while to perform -- perhaps there is a way to do +these calculations faster. + +If you discover any serious problems please let me know. + + +\vfill + +Michael Lake\\ +\today + +\end{document} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/spotcolor/README new/doc/latex/spotcolor/README --- old/doc/latex/spotcolor/README 2006-11-25 05:22:50.000000000 +0100 +++ new/doc/latex/spotcolor/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -This is the package spotcolor for pdfLaTeX. -It provides procedures for using spot colors in LaTeX documents -and the generated pdf files. Predefined templates for PANTONE and -HKS color spaces are included but new ones can easily be defined. - -For detailed usage information please refer to readme.pdf. - -If you have any suggestions, bug reports, modifications or enhancements, -please let me know: - -Jens Elstner -jens.elstner(a)gmx.net - -This work is published under the LaTeX Project Public License. -See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html -for the details of that license. - Binary files old/doc/latex/spotcolor/readme.pdf and new/doc/latex/spotcolor/readme.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/spotcolor/readme.tcp new/doc/latex/spotcolor/readme.tcp --- old/doc/latex/spotcolor/readme.tcp 2006-05-30 00:35:46.000000000 +0200 +++ new/doc/latex/spotcolor/readme.tcp 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -[FormatInfo] -Type=TeXnicCenterProjectInformation -Version=4 - -[ProjectInfo] -MainFile=readme.tex -UseBibTeX=0 -UseMakeIndex=0 -ActiveProfile=LaTeX => PDF -ProjectLanguage=de -ProjectDialect=DE - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/spotcolor/readme.tex new/doc/latex/spotcolor/readme.tex --- old/doc/latex/spotcolor/readme.tex 2006-11-25 05:22:50.000000000 +0100 +++ new/doc/latex/spotcolor/readme.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -\documentclass{article} -\usepackage[latin1]{inputenc} -\usepackage[T1]{fontenc} -\usepackage[hks,pantone]{spotcolor} -\usepackage{calc} -\usepackage{color} -\usepackage{times} - -\setlength\pdfhorigin{1in} -\setlength\pdfvorigin{1in} -\setlength\hoffset{-1in} -\setlength\voffset{-1in} -\setlength\oddsidemargin{20mm} -\setlength\evensidemargin{20mm} -\setlength\textwidth{\paperwidth - 40mm} - -\begin{document} - \setcounter{page}{1} - \bf\Huge\color{black}\parbox[t]{\textwidth}{\centering spotcolor Package}\newline - \rm\normalsize - \parbox[t]{\textwidth}{\centering\copyright 2006 Jens Elstner, jens.elstner(a)gmx.net}\newline\newline - The purpose of this small package is to add spot color support to pdfLaTeX. I mainly wrote it for myself because at some point I did some work which involved going to print and spot colors were a requirement. This means that I don't consider this package very robust or in any case complete but it worked for me and maybe it will help somebody who has the same problem.\\ - The functions provided here write some native pdf code which may not always work but never failed with all the testing and applications I did. If there should be a bug then contact me and I will try to fix it.\\ - Usage so far is pretty straight forward. First you define a color space that is going to hold the spot colors and will be made known in the pdf. One limitation I couldn't get around yet (because of my limited knowledge of the pdf file format) is that you can only use one color space per page. I will explain the reason why it is a limitation a little further down the page.\\ - Color spaces are created with\\ - \textbf{\string\CreateColorSpace\{SOMECOLORSPACE\}}\\ - The name should of course be unique for every color space.\\ - This creates an empty color space to which colors still have to be added with the command\\ - \textbf{\string\AddSpotColor\{SOMECOLORSPACE\}\\ - \{SOMECOLOR\}\\ - \{Spot\string\SpotSpace\ Color\string\SpotSpace\ Name\string\SpotSpace\ in\string\SpotSpace\ PDF\}\\ - \{1.0\ 0.0\ 0.51\ 0.0\}}\\ - The first parameter denotes the color space to which the color should be added, the second parameter is the name of the color under which it should be accessible by LaTeX. The third parameter is the name that appears in the pdf file. Because I am not incredibly familiar with handling space characters in LaTeX I had to implement spaces that have to appear in the spot color name with \textbf{\string\SpotSpace} so you have to use it whenever you want a space to appear in the name. If you should happen to know a better way please let me know. The last parameter is the cmyk representation of the color that is used when viewing the file in Acrobat. I don't know exactly what the format specifications for this field are but safest should be to use space seperated values (like above). The dot can be omitted though. (ie. '0.0' would give the same result as '0')\\ - To be able to use all the color capabilities of LaTeX there is also a new colorspace called "spotcolor" being defined. When colors have been made known to pdf via "\string\AddSpotColor", new colors can be defined:\\ - \textbf{definecolor\{<NAME>\}\{spotcolor\}\{<SPOTCOLORNAME>,<TINT>\}} where <TINT> is a value in the range 0.0 to 1.0. - - This is everything you have to do to make your colors known to LaTeX. If you want something to appear in one of the colors you have to use\\ - \textbf{\string\SetPageColorSpace\{SOMECOLORSPACE\}}\\ - once for the first page and it will be set for all subsequent pages.\\ - \textbf{\string\SpotColor\{SOMECOLOR\}\{1.0\}}\\ - will then set the color of any object like the usual color directive from the color package. Because colorspaces have to be set for the entire page you can only use one per page. Therefore, if you want to use colors from the Pantone system together with colors from HKS for example you would have to add them to the same color space and activate that for the page.\\ - I have added many of the colors from these two systems already as presets. They can be used by including spotcolor with the option \textbf{PANTONE} and/or the option \textbf{HKS}. The color spaces are named correspondingly. For a complete list of the colors I have included already please refer to spotcolorpantone.tex and spotcolorhks.tex.\\ - Last but not least, some examples.\\ - If there are any questions regarding the package, usage or comments, suggestions, enhancements, please let me know.\\ This work is published under the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. - - \clearpage - \color{blue} - \bf\Huge Blue text color using color package - - \clearpage - \SetPageColorSpace{PANTONE} - \SpotColor{PANTONEVioletPC}{1.0} - \bf\Huge Pantone spot color - - \clearpage - \SetPageColorSpace{HKS} - \SpotColor{HKS68N}{1.0} - \bf\Huge HKS spot color - - \clearpage - \NewSpotColorSpace{SOMECOLORSPACE} - \AddSpotColor{SOMECOLORSPACE}{SOMECOLOR}{Spot\SpotSpace Color\SpotSpace Name\SpotSpace in\SpotSpace PDF}{0.5 1.0 0.51 0} - \SetPageColorSpace{SOMECOLORSPACE} - \definecolor{Spots}{spotcolor}{SOMECOLOR,1.0} - - \SpotColor{SOMECOLOR}{1.0} - \bf\Huge Self defined spot color\\ - Some shades are also possible:\\ - \SpotColor{SOMECOLOR}{1.0}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.9}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.8}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.7}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.6}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.5}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.4}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.3}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.2}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.1}\rule{1cm}{1cm}\\ - \SpotColor{SOMECOLOR}{0.0}\rule{1cm}{1cm} - - \clearpage - \pagecolor{Spots} - \SpotColor{SOMECOLOR}{0.1} - A spotcolor as background color. - - \clearpage - \pagecolor{white} - \colorbox{Spots}{xxx} -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scalebar.doc.tlpobj new/tlpkg/tlpobj/scalebar.doc.tlpobj --- old/tlpkg/tlpobj/scalebar.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/scalebar.doc.tlpobj 2017-04-14 18:00:11.000000000 +0200 @@ -0,0 +1,9 @@ +name scalebar.doc +category Package +revision 15878 +shortdesc doc files of scalebar +relocated 1 +docfiles size=17 + RELOC/doc/latex/scalebar/README + RELOC/doc/latex/scalebar/scalebar_examples.pdf + RELOC/doc/latex/scalebar/scalebar_examples.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spotcolor.doc.tlpobj new/tlpkg/tlpobj/spotcolor.doc.tlpobj --- old/tlpkg/tlpobj/spotcolor.doc.tlpobj 2016-04-14 19:47:11.000000000 +0200 +++ new/tlpkg/tlpobj/spotcolor.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name spotcolor.doc -category Package -revision 15878 -shortdesc doc files of spotcolor -relocated 1 -docfiles size=99 - RELOC/doc/latex/spotcolor/README - RELOC/doc/latex/spotcolor/readme.pdf - RELOC/doc/latex/spotcolor/readme.tcp - RELOC/doc/latex/spotcolor/readme.tex ++++++ spotcolor.tar.xz -> scalebar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/scalebar/scalebar.sty new/tex/latex/scalebar/scalebar.sty --- old/tex/latex/scalebar/scalebar.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/scalebar/scalebar.sty 2016-11-25 19:33:58.000000000 +0100 @@ -0,0 +1,99 @@ +%% +%% This is file `scalebar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scalebar.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2003 by Michael Lake <mikel(a)speleonics.com.au> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.2 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.2 or later is part of all distributions of LaTeX version +%% 1999/12/01 or later. +%% +\ProvidesPackage{scalebar}% + [2003/05/01 v1.0 Scalebars for maps and diagrams] +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\RequirePackage{ifthen} +\RequirePackage{calc} +\RequirePackage{fp} +\newlength{\SB@Length}% +\newcounter{SB@majordivs}% +\newcounter{SB@minordivs}% +\newcounter{SB@evenodd}% +\newcounter{SB@countup}% +\newlength{\SB@Height}% +\newlength{\SB@Thick}% +\newlength{\SB@MajorWidth}% +\newlength{\SB@MinorWidth}% +\newlength{\SB@DivisionWidth}% +\newlength{\SB@TextWidth}% +\newcommand{\SB@unitT}{% +\rule{\SB@DivisionWidth}{\SB@Height}\hspace{-\SB@DivisionWidth}% +\raisebox{-\SB@Height}{\rule{\SB@DivisionWidth}{\SB@Thick}}}% +\newcommand{\SB@unitB}{% +\raisebox{\SB@Height-\SB@Thick}% +{\rule{\SB@DivisionWidth}{\SB@Thick}}\hspace{-\SB@DivisionWidth}% +\raisebox{-\SB@Height}{\rule{\SB@DivisionWidth}{\SB@Height}}}% +\newcommand{\scalebar}[7][]{% +\ifthenelse{\equal{inverse}{#1}}% +{\setcounter{SB@evenodd}{1}}% +{\setcounter{SB@evenodd}{0}}% +\setlength{\SB@Length}{#2}% +\setcounter{SB@minordivs}{#3}% +\setcounter{SB@majordivs}{#4}% +\def\SB@StartNo{#5}% +\def\SB@EndNo{#6}% +\def\SB@TextUnits{#7}% +\setlength{\SB(a)Height}{1.2ex}% +\setlength{\SB(a)Thick}{0.2mm}% +\setlength{\SB@MajorWidth}{\SB@Length / \theSB@majordivs}% +\setlength{\SB@MinorWidth}{\SB@MajorWidth / \theSB@minordivs}% +\raisebox{-\SB@Height}{\rule{\SB@Thick}{2\SB@Height}}% +\setlength{\SB@DivisionWidth}{\SB@MinorWidth}% +\setcounter{SB@countup}{0}% +\whiledo{\not\theSB@countup=\theSB@minordivs}{% +\ifthenelse{\isodd{\value{SB@evenodd}}}{\SB@unitB}{\SB@unitT}% +\addtocounter{SB@evenodd}{1}% +\addtocounter{SB@countup}{1}}% +\setlength{\SB@DivisionWidth}{\SB@MajorWidth}% +\setcounter{SB@countup}{1}% +\whiledo{\not\theSB@countup=\theSB@majordivs}{% +\ifthenelse{\isodd{\value{SB@evenodd}}}{\SB@unitB}{\SB@unitT}% +\addtocounter{SB@evenodd}{1}% +\addtocounter{SB@countup}{1}}% +\raisebox{-\SB@Height}{\rule{\SB@Thick}{2\SB@Height}}% +\FPupn\SBIncrement% +{\the\value{SB@majordivs} \SB@StartNo{} \SB@EndNo{} - /}% +\def\SBRound{0}% +\FPifint\SBIncrement% +\else\def\SBRound{1}\FPupn\SBIncrement{\SBIncrement{} 1 round}\fi% +\FPifint\SB@StartNo% +\else\def\SBRound{1}\FPupn\SB@StartNo{\SB@StartNo{} 1 round}\fi% +\FPifint\SB@EndNo% +\else\def\SBRound{1}\FPupn\SB@EndNo{\SB@EndNo{} 1 round}\fi% +\hspace{-\SB@Length}\hspace{-\SB@Thick}% +\raisebox{-3\SB@Height}{% +\FPset\SBNextNo\SB@StartNo% +\setcounter{SB@countup}{0}% +\whiledo{\not\theSB@countup>\theSB@majordivs}{% +\FPupn\SBNextNo{\SBNextNo{} \SBRound{} round}% +\settowidth{\SB@TextWidth}{\SBNextNo}% +\hspace{-0.5\SB@TextWidth}% +\SBNextNo\hspace{-0.5\SB@TextWidth}\hspace{\SB@MajorWidth}% +\FPupn\SBNextNo{\SBNextNo{} \SBIncrement{} add}% +\addtocounter{SB@countup}{1}}% +\hspace{-\SB@MajorWidth}\hspace{0.5\SB@TextWidth}\,\SB@TextUnits}% +}% +\endinput +%% +%% End of file `scalebar.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/spotcolor/spotcolor.sty new/tex/latex/spotcolor/spotcolor.sty --- old/tex/latex/spotcolor/spotcolor.sty 2008-11-01 01:33:23.000000000 +0100 +++ new/tex/latex/spotcolor/spotcolor.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{spotcolor} - [2006/11/15 v1.2 Package for adding Spot Color support to pdfLaTeX.] - -\newif\ifhks\hksfalse -\newif\ifpantone\pantonefalse -\DeclareOption{hks}{\hkstrue} % preload hks color values into "hks" colorspace -\DeclareOption{pantone}{\pantonetrue} % preload pantone color values into "pantone" colorspace -\ProcessOptions - -\RequirePackage[pdftex]{graphics} -%\RequirePackage{color} - -% -% Erzeugt neuen Colorspace -% -\newcommand\NewSpotColorSpace[1]{% - \expandafter\newtoks\csname #1\endcsname% - \csname #1\endcsname{}% -} - -% -% Colorspace variable, color name, CMYK representation -% Adds a new spot color with the CMYK representation in the 2nd parameter (HEX with values from 00-FF) -% -\catcode`\#=12% -\def\SpotSpace{#20} -\catcode`\#=6% -\gdef\csgrab#1#2{#2\expandafter{\the#2 #1}}% -\newcount{\thecolorprofile} -\newcount{\thecolor} -\newcommand\AddSpotColor[4]{% - \def\obj{ 0 R}% - \pdfobj{<</C0[0 0 0 0]/FunctionType 2/C1[#4]/Domain[0 1]/N 1>>}% - \thecolorprofile=\the\pdflastobj% - \pdfobj{[/Separation/#3 /DeviceCMYK \the\thecolorprofile \obj]}% output color space Info - \thecolor=\the\pdflastobj% - \edef\tempcs{/#2 \the\pdflastobj \obj}% - \expandafter\csgrab\expandafter{\tempcs}{\csname #1\endcsname}% - \pdfrefobj\thecolorprofile% - \pdfrefobj\thecolor% -}% - -% -% Sets a color space for the current page -% -\def\SetPageColorResource#1{% - \edef\act{\noexpand\pdfpageresources={\the\pdfpageresources\space - /ColorSpace<<#1>>}} - \act} -\newcommand\SetPageColorSpace[1]{% - \expandafter\SetPageColorResource\expandafter{\the\csname #1\endcsname}% -}% - -% -% Sets the spot color -% -\def\SpotColor#1#2{% - \pdfliteral{/#1 cs}% - \pdfliteral{/#1 CS}% - \pdfliteral{#2 sc}% - \pdfliteral{#2 SC}% -}% - -% -% Defines a new color space called spotcolor -% The spotcolor has to be set first by using AddSpotColor -% The code is taken and modified from color.sty's pdftex.def -% -\makeatletter -\def\color@spotcolor#1#2{\c@lor@@spotcolor#2\@@#1} -\def\c@lor@@spotcolor#1,#2\@@#3{% - \c@lor@arg{#2}% - \edef#3{/#1 cs /#1 CS #2 sc #2 SC}% -} -\makeatother - -% -% If pantone or hks option specified then load corresponding color tables -% -\ifhks\input{spotcolorhks}\fi -\ifpantone\input{spotcolorpantone}\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/spotcolor/spotcolorhks.tex new/tex/latex/spotcolor/spotcolorhks.tex --- old/tex/latex/spotcolor/spotcolorhks.tex 2008-11-01 01:33:23.000000000 +0100 +++ new/tex/latex/spotcolor/spotcolorhks.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -\NewSpotColorSpace{HKS} -\AddSpotColor {HKS} {HKS05N} {HKS\SpotSpace 05\SpotSpace N} {0.0 0.15 1.0 0.0} -\AddSpotColor {HKS} {HKS14N} {HKS\SpotSpace 14\SpotSpace N} {0.0 0.75 0.7 0.0} -\AddSpotColor {HKS} {HKS17N} {HKS\SpotSpace 17\SpotSpace N} {1.0 0.1 0.6 0.0} -\AddSpotColor {HKS} {HKS24N} {HKS\SpotSpace 24\SpotSpace N} {0.0 0.1 0.3 0.0} -\AddSpotColor {HKS} {HKS38N} {HKS\SpotSpace 38\SpotSpace N} {0.9 0.5 0.15 0.3} -\AddSpotColor {HKS} {HKS49N} {HKS\SpotSpace 49\SpotSpace N} {1.0 0.0 0.08 0.0} -\AddSpotColor {HKS} {HKS57N} {HKS\SpotSpace 57\SpotSpace N} {0.8 0.0 0.6 0.7} -\AddSpotColor {HKS} {HKS68N} {HKS\SpotSpace 68\SpotSpace N} {0.2 0.07 1.0 0.0} -\AddSpotColor {HKS} {HKS74N} {HKS\SpotSpace 74\SpotSpace N} {0.0 0.3 1.0 0.25} -\AddSpotColor {HKS} {HKS92N} {HKS\SpotSpace 92\SpotSpace N} {0.1 0.0 0.1 0.5} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/spotcolor/spotcolorpantone.tex new/tex/latex/spotcolor/spotcolorpantone.tex --- old/tex/latex/spotcolor/spotcolorpantone.tex 2008-11-01 01:33:23.000000000 +0100 +++ new/tex/latex/spotcolor/spotcolorpantone.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,1090 +0,0 @@ -\NewSpotColorSpace{PANTONE} -\AddSpotColor{PANTONE} {PANTONE100PC} {PANTONE\SpotSpace 100\SpotSpace PC} {0 0 0.51 0} -\AddSpotColor{PANTONE} {PANTONE101PC} {PANTONE\SpotSpace 101\SpotSpace PC} {0 0 0.79 0} -\AddSpotColor{PANTONE} {PANTONE102PC} {PANTONE\SpotSpace 102\SpotSpace PC} {0 0 0.95 0} -\AddSpotColor{PANTONE} {PANTONE103PC} {PANTONE\SpotSpace 103\SpotSpace PC} {0 0.03 1 0.18} -\AddSpotColor{PANTONE} {PANTONE104PC} {PANTONE\SpotSpace 104\SpotSpace PC} {0 0.03 1 0.3} -\AddSpotColor{PANTONE} {PANTONE105PC} {PANTONE\SpotSpace 105\SpotSpace PC} {0 0.03 1 0.5} -\AddSpotColor{PANTONE} {PANTONE106PC} {PANTONE\SpotSpace 106\SpotSpace PC} {0 0.02 0.69 0} -\AddSpotColor{PANTONE} {PANTONE107PC} {PANTONE\SpotSpace 107\SpotSpace PC} {0 0.04 0.79 0} -\AddSpotColor{PANTONE} {PANTONE108PC} {PANTONE\SpotSpace 108\SpotSpace PC} {0 0.06 0.95 0} -\AddSpotColor{PANTONE} {PANTONE109PC} {PANTONE\SpotSpace 109\SpotSpace PC} {0 0.1 1 0} -\AddSpotColor{PANTONE} {PANTONE110PC} {PANTONE\SpotSpace 110\SpotSpace PC} {0 0.12 1 0.07} -\AddSpotColor{PANTONE} {PANTONE111PC} {PANTONE\SpotSpace 111\SpotSpace PC} {0 0.11 1 0.27} -\AddSpotColor{PANTONE} {PANTONE112PC} {PANTONE\SpotSpace 112\SpotSpace PC} {0 0.1 1 0.38} -\AddSpotColor{PANTONE} {PANTONE113PC} {PANTONE\SpotSpace 113\SpotSpace PC} {0 0.07 0.66 0} -\AddSpotColor{PANTONE} {PANTONE114PC} {PANTONE\SpotSpace 114\SpotSpace PC} {0 0.08 0.73 0} -\AddSpotColor{PANTONE} {PANTONE115PC} {PANTONE\SpotSpace 115\SpotSpace PC} {0 0.09 0.8 0} -\AddSpotColor{PANTONE} {PANTONE116PC} {PANTONE\SpotSpace 116\SpotSpace PC} {0 0.16 1 0} -\AddSpotColor{PANTONE} {PANTONE117PC} {PANTONE\SpotSpace 117\SpotSpace PC} {0 0.18 1 0.15} -\AddSpotColor{PANTONE} {PANTONE118PC} {PANTONE\SpotSpace 118\SpotSpace PC} {0 0.18 1 0.27} -\AddSpotColor{PANTONE} {PANTONE119PC} {PANTONE\SpotSpace 119\SpotSpace PC} {0 0.12 1 0.49} -\AddSpotColor{PANTONE} {PANTONE120PC} {PANTONE\SpotSpace 120\SpotSpace PC} {0 0.09 0.58 0} -\AddSpotColor{PANTONE} {PANTONE121PC} {PANTONE\SpotSpace 121\SpotSpace PC} {0 0.11 0.69 0} -\AddSpotColor{PANTONE} {PANTONE122PC} {PANTONE\SpotSpace 122\SpotSpace PC} {0 0.17 0.8 0} -\AddSpotColor{PANTONE} {PANTONE123PC} {PANTONE\SpotSpace 123\SpotSpace PC} {0 0.24 0.94 0} -\AddSpotColor{PANTONE} {PANTONE124PC} {PANTONE\SpotSpace 124\SpotSpace PC} {0 0.28 1 0.06} -\AddSpotColor{PANTONE} {PANTONE125PC} {PANTONE\SpotSpace 125\SpotSpace PC} {0 0.26 1 0.26} -\AddSpotColor{PANTONE} {PANTONE126PC} {PANTONE\SpotSpace 126\SpotSpace PC} {0 0.25 1 0.37} -\AddSpotColor{PANTONE} {PANTONE127PC} {PANTONE\SpotSpace 127\SpotSpace PC} {0 0.07 0.5 0} -\AddSpotColor{PANTONE} {PANTONE128PC} {PANTONE\SpotSpace 128\SpotSpace PC} {0 0.11 0.65 0} -\AddSpotColor{PANTONE} {PANTONE129PC} {PANTONE\SpotSpace 129\SpotSpace PC} {0 0.16 0.77 0} -\AddSpotColor{PANTONE} {PANTONE130PC} {PANTONE\SpotSpace 130\SpotSpace PC} {0 0.3 1 0} -\AddSpotColor{PANTONE} {PANTONE131PC} {PANTONE\SpotSpace 131\SpotSpace PC} {0 0.32 1 0.09} -\AddSpotColor{PANTONE} {PANTONE132PC} {PANTONE\SpotSpace 132\SpotSpace PC} {0 0.28 1 0.3} -\AddSpotColor{PANTONE} {PANTONE133PC} {PANTONE\SpotSpace 133\SpotSpace PC} {0 0.2 1 0.56} -\AddSpotColor{PANTONE} {PANTONE134PC} {PANTONE\SpotSpace 134\SpotSpace PC} {0 0.11 0.45 0} -\AddSpotColor{PANTONE} {PANTONE135PC} {PANTONE\SpotSpace 135\SpotSpace PC} {0 0.19 0.6 0} -\AddSpotColor{PANTONE} {PANTONE136PC} {PANTONE\SpotSpace 136\SpotSpace PC} {0 0.27 0.76 0} -\AddSpotColor{PANTONE} {PANTONE137PC} {PANTONE\SpotSpace 137\SpotSpace PC} {0 0.35 0.9 0} -\AddSpotColor{PANTONE} {PANTONE138PC} {PANTONE\SpotSpace 138\SpotSpace PC} {0 0.42 1 0.01} -\AddSpotColor{PANTONE} {PANTONE139PC} {PANTONE\SpotSpace 139\SpotSpace PC} {0 0.37 1 0.23} -\AddSpotColor{PANTONE} {PANTONE140PC} {PANTONE\SpotSpace 140\SpotSpace PC} {0 0.27 1 0.54} -\AddSpotColor{PANTONE} {PANTONE141PC} {PANTONE\SpotSpace 141\SpotSpace PC} {0 0.19 0.51 0} -\AddSpotColor{PANTONE} {PANTONE142PC} {PANTONE\SpotSpace 142\SpotSpace PC} {0 0.28 0.76 0} -\AddSpotColor{PANTONE} {PANTONE143PC} {PANTONE\SpotSpace 143\SpotSpace PC} {0 0.35 0.85 0} -\AddSpotColor{PANTONE} {PANTONE144PC} {PANTONE\SpotSpace 144\SpotSpace PC} {0 0.48 1 0} -\AddSpotColor{PANTONE} {PANTONE145PC} {PANTONE\SpotSpace 145\SpotSpace PC} {0 0.47 1 0.08} -\AddSpotColor{PANTONE} {PANTONE146PC} {PANTONE\SpotSpace 146\SpotSpace PC} {0 0.43 1 0.33} -\AddSpotColor{PANTONE} {PANTONE147PC} {PANTONE\SpotSpace 147\SpotSpace PC} {0 0.28 1 0.56} -\AddSpotColor{PANTONE} {PANTONE148PC} {PANTONE\SpotSpace 148\SpotSpace PC} {0 0.16 0.37 0} -\AddSpotColor{PANTONE} {PANTONE149PC} {PANTONE\SpotSpace 149\SpotSpace PC} {0 0.23 0.47 0} -\AddSpotColor{PANTONE} {PANTONE150PC} {PANTONE\SpotSpace 150\SpotSpace PC} {0 0.35 0.7 0} -\AddSpotColor{PANTONE} {PANTONE151PC} {PANTONE\SpotSpace 151\SpotSpace PC} {0 0.48 0.95 0} -\AddSpotColor{PANTONE} {PANTONE152PC} {PANTONE\SpotSpace 152\SpotSpace PC} {0 0.51 1 0.01} -\AddSpotColor{PANTONE} {PANTONE153PC} {PANTONE\SpotSpace 153\SpotSpace PC} {0 0.46 1 0.18} -\AddSpotColor{PANTONE} {PANTONE154PC} {PANTONE\SpotSpace 154\SpotSpace PC} {0 0.46 1 0.34} -\AddSpotColor{PANTONE} {PANTONE155PC} {PANTONE\SpotSpace 155\SpotSpace PC} {0 0.12 0.28 0} -\AddSpotColor{PANTONE} {PANTONE156PC} {PANTONE\SpotSpace 156\SpotSpace PC} {0 0.22 0.42 0} -\AddSpotColor{PANTONE} {PANTONE157PC} {PANTONE\SpotSpace 157\SpotSpace PC} {0 0.43 0.7 0} -\AddSpotColor{PANTONE} {PANTONE158PC} {PANTONE\SpotSpace 158\SpotSpace PC} {0 0.61 0.97 0} -\AddSpotColor{PANTONE} {PANTONE159PC} {PANTONE\SpotSpace 159\SpotSpace PC} {0 0.66 1 0.07} -\AddSpotColor{PANTONE} {PANTONE160PC} {PANTONE\SpotSpace 160\SpotSpace PC} {0 0.62 1 0.32} -\AddSpotColor{PANTONE} {PANTONE161PC} {PANTONE\SpotSpace 161\SpotSpace PC} {0 0.52 1 0.64} -\AddSpotColor{PANTONE} {PANTONE162PC} {PANTONE\SpotSpace 162\SpotSpace PC} {0 0.15 0.22 0} -\AddSpotColor{PANTONE} {PANTONE163PC} {PANTONE\SpotSpace 163\SpotSpace PC} {0 0.31 0.44 0} -\AddSpotColor{PANTONE} {PANTONE164PC} {PANTONE\SpotSpace 164\SpotSpace PC} {0 0.46 0.73 0} -\AddSpotColor{PANTONE} {PANTONE165PC} {PANTONE\SpotSpace 165\SpotSpace PC} {0 0.59 0.96 0} -\AddSpotColor{PANTONE} {PANTONE166PC} {PANTONE\SpotSpace 166\SpotSpace PC} {0 0.64 1 0} -\AddSpotColor{PANTONE} {PANTONE167PC} {PANTONE\SpotSpace 167\SpotSpace PC} {0 0.6 1 0.17} -\AddSpotColor{PANTONE} {PANTONE168PC} {PANTONE\SpotSpace 168\SpotSpace PC} {0 0.57 1 0.59} -\AddSpotColor{PANTONE} {PANTONE169PC} {PANTONE\SpotSpace 169\SpotSpace PC} {0 0.2 0.2 0} -\AddSpotColor{PANTONE} {PANTONE170PC} {PANTONE\SpotSpace 170\SpotSpace PC} {0 0.4 0.44 0} -\AddSpotColor{PANTONE} {PANTONE171PC} {PANTONE\SpotSpace 171\SpotSpace PC} {0 0.53 0.68 0} -\AddSpotColor{PANTONE} {PANTONE172PC} {PANTONE\SpotSpace 172\SpotSpace PC} {0 0.66 0.88 0} -\AddSpotColor{PANTONE} {PANTONE173PC} {PANTONE\SpotSpace 173\SpotSpace PC} {0 0.69 1 0.04} -\AddSpotColor{PANTONE} {PANTONE174PC} {PANTONE\SpotSpace 174\SpotSpace PC} {0 0.7 1 0.36} -\AddSpotColor{PANTONE} {PANTONE175PC} {PANTONE\SpotSpace 175\SpotSpace PC} {0 0.65 1 0.6} -\AddSpotColor{PANTONE} {PANTONE176PC} {PANTONE\SpotSpace 176\SpotSpace PC} {0 0.25 0.18 0} -\AddSpotColor{PANTONE} {PANTONE177PC} {PANTONE\SpotSpace 177\SpotSpace PC} {0 0.45 0.4 0} -\AddSpotColor{PANTONE} {PANTONE178PC} {PANTONE\SpotSpace 178\SpotSpace PC} {0 0.59 0.56 0} -\AddSpotColor{PANTONE} {PANTONE179PC} {PANTONE\SpotSpace 179\SpotSpace PC} {0 0.79 1 0} -\AddSpotColor{PANTONE} {PANTONE180PC} {PANTONE\SpotSpace 180\SpotSpace PC} {0 0.79 1 0.11} -\AddSpotColor{PANTONE} {PANTONE181PC} {PANTONE\SpotSpace 181\SpotSpace PC} {0 0.74 1 0.47} -\AddSpotColor{PANTONE} {PANTONE182PC} {PANTONE\SpotSpace 182\SpotSpace PC} {0 0.26 0.1 0} -\AddSpotColor{PANTONE} {PANTONE183PC} {PANTONE\SpotSpace 183\SpotSpace PC} {0 0.46 0.21 0} -\AddSpotColor{PANTONE} {PANTONE184PC} {PANTONE\SpotSpace 184\SpotSpace PC} {0 0.68 0.41 0} -\AddSpotColor{PANTONE} {PANTONE185PC} {PANTONE\SpotSpace 185\SpotSpace PC} {0 0.91 0.76 0} -\AddSpotColor{PANTONE} {PANTONE186PC} {PANTONE\SpotSpace 186\SpotSpace PC} {0 1 0.81 0.04} -\AddSpotColor{PANTONE} {PANTONE187PC} {PANTONE\SpotSpace 187\SpotSpace PC} {0 1 0.79 0.2} -\AddSpotColor{PANTONE} {PANTONE188PC} {PANTONE\SpotSpace 188\SpotSpace PC} {0 0.97 1 0.5} -\AddSpotColor{PANTONE} {PANTONE189PC} {PANTONE\SpotSpace 189\SpotSpace PC} {0 0.37 0.1 0} -\AddSpotColor{PANTONE} {PANTONE190PC} {PANTONE\SpotSpace 190\SpotSpace PC} {0 0.55 0.22 0} -\AddSpotColor{PANTONE} {PANTONE191PC} {PANTONE\SpotSpace 191\SpotSpace PC} {0 0.76 0.38 0} -\AddSpotColor{PANTONE} {PANTONE192PC} {PANTONE\SpotSpace 192\SpotSpace PC} {0 1 0.68 0} -\AddSpotColor{PANTONE} {PANTONE193PC} {PANTONE\SpotSpace 193\SpotSpace PC} {0 1 0.66 0.13} -\AddSpotColor{PANTONE} {PANTONE194PC} {PANTONE\SpotSpace 194\SpotSpace PC} {0 1 0.64 0.33} -\AddSpotColor{PANTONE} {PANTONE195PC} {PANTONE\SpotSpace 195\SpotSpace PC} {0 1 0.6 0.55} -\AddSpotColor{PANTONE} {PANTONE196PC} {PANTONE\SpotSpace 196\SpotSpace PC} {0 0.25 0.04 0} -\AddSpotColor{PANTONE} {PANTONE197PC} {PANTONE\SpotSpace 197\SpotSpace PC} {0 0.45 0.1 0} -\AddSpotColor{PANTONE} {PANTONE198PC} {PANTONE\SpotSpace 198\SpotSpace PC} {0 0.78 0.33 0} -\AddSpotColor{PANTONE} {PANTONE199PC} {PANTONE\SpotSpace 199\SpotSpace PC} {0 1 0.62 0} -\AddSpotColor{PANTONE} {PANTONE200PC} {PANTONE\SpotSpace 200\SpotSpace PC} {0 1 0.63 0.12} -\AddSpotColor{PANTONE} {PANTONE201PC} {PANTONE\SpotSpace 201\SpotSpace PC} {0 1 0.63 0.29} -\AddSpotColor{PANTONE} {PANTONE202PC} {PANTONE\SpotSpace 202\SpotSpace PC} {0 1 0.61 0.43} -\AddSpotColor{PANTONE} {PANTONE203PC} {PANTONE\SpotSpace 203\SpotSpace PC} {0 0.34 0.03 0} -\AddSpotColor{PANTONE} {PANTONE204PC} {PANTONE\SpotSpace 204\SpotSpace PC} {0 0.58 0.03 0} -\AddSpotColor{PANTONE} {PANTONE205PC} {PANTONE\SpotSpace 205\SpotSpace PC} {0 0.84 0.09 0} -\AddSpotColor{PANTONE} {PANTONE206PC} {PANTONE\SpotSpace 206\SpotSpace PC} {0 1 0.38 0.03} -\AddSpotColor{PANTONE} {PANTONE207PC} {PANTONE\SpotSpace 207\SpotSpace PC} {0 1 0.43 0.19} -\AddSpotColor{PANTONE} {PANTONE208PC} {PANTONE\SpotSpace 208\SpotSpace PC} {0 1 0.36 0.37} -\AddSpotColor{PANTONE} {PANTONE209PC} {PANTONE\SpotSpace 209\SpotSpace PC} {0 1 0.34 0.53} -\AddSpotColor{PANTONE} {PANTONE210PC} {PANTONE\SpotSpace 210\SpotSpace PC} {0 0.39 0.06 0} -\AddSpotColor{PANTONE} {PANTONE211PC} {PANTONE\SpotSpace 211\SpotSpace PC} {0 0.55 0.08 0} -\AddSpotColor{PANTONE} {PANTONE212PC} {PANTONE\SpotSpace 212\SpotSpace PC} {0 0.72 0.11 0} -\AddSpotColor{PANTONE} {PANTONE213PC} {PANTONE\SpotSpace 213\SpotSpace PC} {0 0.95 0.27 0} -\AddSpotColor{PANTONE} {PANTONE214PC} {PANTONE\SpotSpace 214\SpotSpace PC} {0 1 0.34 0.08} -\AddSpotColor{PANTONE} {PANTONE215PC} {PANTONE\SpotSpace 215\SpotSpace PC} {0 1 0.35 0.27} -\AddSpotColor{PANTONE} {PANTONE216PC} {PANTONE\SpotSpace 216\SpotSpace PC} {0 0.95 0.4 0.49} -\AddSpotColor{PANTONE} {PANTONE217PC} {PANTONE\SpotSpace 217\SpotSpace PC} {0 0.28 0 0} -\AddSpotColor{PANTONE} {PANTONE218PC} {PANTONE\SpotSpace 218\SpotSpace PC} {0.02 0.61 0 0} -\AddSpotColor{PANTONE} {PANTONE219PC} {PANTONE\SpotSpace 219\SpotSpace PC} {0.01 0.88 0 0} -\AddSpotColor{PANTONE} {PANTONE220PC} {PANTONE\SpotSpace 220\SpotSpace PC} {0 1 0.13 0.17} -\AddSpotColor{PANTONE} {PANTONE221PC} {PANTONE\SpotSpace 221\SpotSpace PC} {0 1 0.15 0.3} -\AddSpotColor{PANTONE} {PANTONE222PC} {PANTONE\SpotSpace 222\SpotSpace PC} {0 1 0.1 0.59} -\AddSpotColor{PANTONE} {PANTONE223PC} {PANTONE\SpotSpace 223\SpotSpace PC} {0 0.46 0 0} -\AddSpotColor{PANTONE} {PANTONE224PC} {PANTONE\SpotSpace 224\SpotSpace PC} {0.01 0.63 0 0} -\AddSpotColor{PANTONE} {PANTONE225PC} {PANTONE\SpotSpace 225\SpotSpace PC} {0.01 0.83 0 0} -\AddSpotColor{PANTONE} {PANTONE226PC} {PANTONE\SpotSpace 226\SpotSpace PC} {0 0.99 0 0} -\AddSpotColor{PANTONE} {PANTONE227PC} {PANTONE\SpotSpace 227\SpotSpace PC} {0 1 0.07 0.19} -\AddSpotColor{PANTONE} {PANTONE228PC} {PANTONE\SpotSpace 228\SpotSpace PC} {0 1 0.04 0.41} -\AddSpotColor{PANTONE} {PANTONE229PC} {PANTONE\SpotSpace 229\SpotSpace PC} {0 1 0.15 0.6} -\AddSpotColor{PANTONE} {PANTONE230PC} {PANTONE\SpotSpace 230\SpotSpace PC} {0 0.34 0 0} -\AddSpotColor{PANTONE} {PANTONE231PC} {PANTONE\SpotSpace 231\SpotSpace PC} {0.01 0.52 0 0} -\AddSpotColor{PANTONE} {PANTONE232PC} {PANTONE\SpotSpace 232\SpotSpace PC} {0.03 0.67 0 0} -\AddSpotColor{PANTONE} {PANTONE233PC} {PANTONE\SpotSpace 233\SpotSpace PC} {0.11 1 0 0} -\AddSpotColor{PANTONE} {PANTONE234PC} {PANTONE\SpotSpace 234\SpotSpace PC} {0.06 1 0 0.26} -\AddSpotColor{PANTONE} {PANTONE235PC} {PANTONE\SpotSpace 235\SpotSpace PC} {0.05 1 0 0.4} -\AddSpotColor{PANTONE} {PANTONE236PC} {PANTONE\SpotSpace 236\SpotSpace PC} {0.01 0.3 0 0} -\AddSpotColor{PANTONE} {PANTONE237PC} {PANTONE\SpotSpace 237\SpotSpace PC} {0.03 0.49 0 0} -\AddSpotColor{PANTONE} {PANTONE238PC} {PANTONE\SpotSpace 238\SpotSpace PC} {0.06 0.63 0 0} -\AddSpotColor{PANTONE} {PANTONE239PC} {PANTONE\SpotSpace 239\SpotSpace PC} {0.11 0.79 0 0} -\AddSpotColor{PANTONE} {PANTONE240PC} {PANTONE\SpotSpace 240\SpotSpace PC} {0.18 0.94 0 0} -\AddSpotColor{PANTONE} {PANTONE241PC} {PANTONE\SpotSpace 241\SpotSpace PC} {0.27 1 0 0.02} -\AddSpotColor{PANTONE} {PANTONE242PC} {PANTONE\SpotSpace 242\SpotSpace PC} {0.1 1 0 0.49} -\AddSpotColor{PANTONE} {PANTONE243PC} {PANTONE\SpotSpace 243\SpotSpace PC} {0.05 0.29 0 0} -\AddSpotColor{PANTONE} {PANTONE244PC} {PANTONE\SpotSpace 244\SpotSpace PC} {0.09 0.38 0 0} -\AddSpotColor{PANTONE} {PANTONE245PC} {PANTONE\SpotSpace 245\SpotSpace PC} {0.14 0.53 0 0} -\AddSpotColor{PANTONE} {PANTONE246PC} {PANTONE\SpotSpace 246\SpotSpace PC} {0.29 0.9 0 0} -\AddSpotColor{PANTONE} {PANTONE247PC} {PANTONE\SpotSpace 247\SpotSpace PC} {0.36 1 0 0} -\AddSpotColor{PANTONE} {PANTONE248PC} {PANTONE\SpotSpace 248\SpotSpace PC} {0.4 1 0 0.02} -\AddSpotColor{PANTONE} {PANTONE249PC} {PANTONE\SpotSpace 249\SpotSpace PC} {0.4 1 0 0.28} -\AddSpotColor{PANTONE} {PANTONE250PC} {PANTONE\SpotSpace 250\SpotSpace PC} {0.05 0.18 0 0} -\AddSpotColor{PANTONE} {PANTONE251PC} {PANTONE\SpotSpace 251\SpotSpace PC} {0.13 0.39 0 0} -\AddSpotColor{PANTONE} {PANTONE252PC} {PANTONE\SpotSpace 252\SpotSpace PC} {0.24 0.56 0 0} -\AddSpotColor{PANTONE} {PANTONE253PC} {PANTONE\SpotSpace 253\SpotSpace PC} {0.43 0.95 0 0} -\AddSpotColor{PANTONE} {PANTONE254PC} {PANTONE\SpotSpace 254\SpotSpace PC} {0.5 1 0 0} -\AddSpotColor{PANTONE} {PANTONE255PC} {PANTONE\SpotSpace 255\SpotSpace PC} {0.51 1 0 0.25} -\AddSpotColor{PANTONE} {PANTONE256PC} {PANTONE\SpotSpace 256\SpotSpace PC} {0.07 0.2 0 0} -\AddSpotColor{PANTONE} {PANTONE257PC} {PANTONE\SpotSpace 257\SpotSpace PC} {0.14 0.34 0 0} -\AddSpotColor{PANTONE} {PANTONE258PC} {PANTONE\SpotSpace 258\SpotSpace PC} {0.43 0.76 0 0} -\AddSpotColor{PANTONE} {PANTONE259PC} {PANTONE\SpotSpace 259\SpotSpace PC} {0.55 1 0 0.15} -\AddSpotColor{PANTONE} {PANTONE260PC} {PANTONE\SpotSpace 260\SpotSpace PC} {0.52 1 0 0.26} -\AddSpotColor{PANTONE} {PANTONE261PC} {PANTONE\SpotSpace 261\SpotSpace PC} {0.48 1 0 0.4} -\AddSpotColor{PANTONE} {PANTONE262PC} {PANTONE\SpotSpace 262\SpotSpace PC} {0.45 1 0 0.55} -\AddSpotColor{PANTONE} {PANTONE263PC} {PANTONE\SpotSpace 263\SpotSpace PC} {0.1 0.14 0 0} -\AddSpotColor{PANTONE} {PANTONE264PC} {PANTONE\SpotSpace 264\SpotSpace PC} {0.26 0.28 0 0} -\AddSpotColor{PANTONE} {PANTONE265PC} {PANTONE\SpotSpace 265\SpotSpace PC} {0.54 0.56 0 0} -\AddSpotColor{PANTONE} {PANTONE266PC} {PANTONE\SpotSpace 266\SpotSpace PC} {0.79 0.9 0 0} -\AddSpotColor{PANTONE} {PANTONE267PC} {PANTONE\SpotSpace 267\SpotSpace PC} {0.89 1 0 0} -\AddSpotColor{PANTONE} {PANTONE268PC} {PANTONE\SpotSpace 268\SpotSpace PC} {0.82 1 0 0.12} -\AddSpotColor{PANTONE} {PANTONE269PC} {PANTONE\SpotSpace 269\SpotSpace PC} {0.78 1 0 0.33} -\AddSpotColor{PANTONE} {PANTONE270PC} {PANTONE\SpotSpace 270\SpotSpace PC} {0.31 0.27 0 0} -\AddSpotColor{PANTONE} {PANTONE271PC} {PANTONE\SpotSpace 271\SpotSpace PC} {0.43 0.37 0 0} -\AddSpotColor{PANTONE} {PANTONE272PC} {PANTONE\SpotSpace 272\SpotSpace PC} {0.58 0.48 0 0} -\AddSpotColor{PANTONE} {PANTONE273PC} {PANTONE\SpotSpace 273\SpotSpace PC} {1 0.96 0 0.08} -\AddSpotColor{PANTONE} {PANTONE274PC} {PANTONE\SpotSpace 274\SpotSpace PC} {1 1 0 0.28} -\AddSpotColor{PANTONE} {PANTONE275PC} {PANTONE\SpotSpace 275\SpotSpace PC} {0.98 1 0 0.43} -\AddSpotColor{PANTONE} {PANTONE276PC} {PANTONE\SpotSpace 276\SpotSpace PC} {1 1 0 0.58} -\AddSpotColor{PANTONE} {PANTONE277PC} {PANTONE\SpotSpace 277\SpotSpace PC} {0.27 0.07 0 0} -\AddSpotColor{PANTONE} {PANTONE278PC} {PANTONE\SpotSpace 278\SpotSpace PC} {0.39 0.14 0 0} -\AddSpotColor{PANTONE} {PANTONE279PC} {PANTONE\SpotSpace 279\SpotSpace PC} {0.68 0.34 0 0} -\AddSpotColor{PANTONE} {PANTONE280PC} {PANTONE\SpotSpace 280\SpotSpace PC} {1 0.72 0 0.18} -\AddSpotColor{PANTONE} {PANTONE281PC} {PANTONE\SpotSpace 281\SpotSpace PC} {1 0.72 0 0.32} -\AddSpotColor{PANTONE} {PANTONE282PC} {PANTONE\SpotSpace 282\SpotSpace PC} {1 0.68 0 0.54} -\AddSpotColor{PANTONE} {PANTONE283PC} {PANTONE\SpotSpace 283\SpotSpace PC} {0.35 0.09 0 0} -\AddSpotColor{PANTONE} {PANTONE284PC} {PANTONE\SpotSpace 284\SpotSpace PC} {0.55 0.19 0 0} -\AddSpotColor{PANTONE} {PANTONE285PC} {PANTONE\SpotSpace 285\SpotSpace PC} {0.89 0.43 0 0} -\AddSpotColor{PANTONE} {PANTONE286PC} {PANTONE\SpotSpace 286\SpotSpace PC} {1 0.66 0 0.02} -\AddSpotColor{PANTONE} {PANTONE287PC} {PANTONE\SpotSpace 287\SpotSpace PC} {1 0.68 0 0.12} -\AddSpotColor{PANTONE} {PANTONE288PC} {PANTONE\SpotSpace 288\SpotSpace PC} {1 0.67 0 0.23} -\AddSpotColor{PANTONE} {PANTONE289PC} {PANTONE\SpotSpace 289\SpotSpace PC} {1 0.64 0 0.6} -\AddSpotColor{PANTONE} {PANTONE290PC} {PANTONE\SpotSpace 290\SpotSpace PC} {0.25 0.02 0 0} -\AddSpotColor{PANTONE} {PANTONE291PC} {PANTONE\SpotSpace 291\SpotSpace PC} {0.33 0.03 0 0} -\AddSpotColor{PANTONE} {PANTONE292PC} {PANTONE\SpotSpace 292\SpotSpace PC} {0.49 0.11 0 0} -\AddSpotColor{PANTONE} {PANTONE293PC} {PANTONE\SpotSpace 293\SpotSpace PC} {1 0.57 0 0.02} -\AddSpotColor{PANTONE} {PANTONE294PC} {PANTONE\SpotSpace 294\SpotSpace PC} {1 0.58 0 0.21} -\AddSpotColor{PANTONE} {PANTONE295PC} {PANTONE\SpotSpace 295\SpotSpace PC} {1 0.57 0 0.4} -\AddSpotColor{PANTONE} {PANTONE296PC} {PANTONE\SpotSpace 296\SpotSpace PC} {1 0.46 0 0.7} -\AddSpotColor{PANTONE} {PANTONE297PC} {PANTONE\SpotSpace 297\SpotSpace PC} {0.49 0.01 0 0} -\AddSpotColor{PANTONE} {PANTONE298PC} {PANTONE\SpotSpace 298\SpotSpace PC} {0.69 0.07 0 0} -\AddSpotColor{PANTONE} {PANTONE299PC} {PANTONE\SpotSpace 299\SpotSpace PC} {0.85 0.19 0 0} -\AddSpotColor{PANTONE} {PANTONE300PC} {PANTONE\SpotSpace 300\SpotSpace PC} {1 0.44 0 0} -\AddSpotColor{PANTONE} {PANTONE301PC} {PANTONE\SpotSpace 301\SpotSpace PC} {1 0.45 0 0.18} -\AddSpotColor{PANTONE} {PANTONE302PC} {PANTONE\SpotSpace 302\SpotSpace PC} {1 0.25 0 0.5} -\AddSpotColor{PANTONE} {PANTONE303PC} {PANTONE\SpotSpace 303\SpotSpace PC} {1 0.11 0 0.74} -\AddSpotColor{PANTONE} {PANTONE304PC} {PANTONE\SpotSpace 304\SpotSpace PC} {0.3 0 0.08 0} -\AddSpotColor{PANTONE} {PANTONE305PC} {PANTONE\SpotSpace 305\SpotSpace PC} {0.51 0 0.09 0} -\AddSpotColor{PANTONE} {PANTONE306PC} {PANTONE\SpotSpace 306\SpotSpace PC} {0.75 0 0.07 0} -\AddSpotColor{PANTONE} {PANTONE307PC} {PANTONE\SpotSpace 307\SpotSpace PC} {1 0.16 0 0.27} -\AddSpotColor{PANTONE} {PANTONE308PC} {PANTONE\SpotSpace 308\SpotSpace PC} {1 0.05 0 0.47} -\AddSpotColor{PANTONE} {PANTONE309PC} {PANTONE\SpotSpace 309\SpotSpace PC} {1 0 0.09 0.72} -\AddSpotColor{PANTONE} {PANTONE310PC} {PANTONE\SpotSpace 310\SpotSpace PC} {0.43 0 0.1 0} -\AddSpotColor{PANTONE} {PANTONE311PC} {PANTONE\SpotSpace 311\SpotSpace PC} {0.63 0 0.12 0} -\AddSpotColor{PANTONE} {PANTONE312PC} {PANTONE\SpotSpace 312\SpotSpace PC} {0.96 0 0.11 0} -\AddSpotColor{PANTONE} {PANTONE313PC} {PANTONE\SpotSpace 313\SpotSpace PC} {1 0 0.08 0.13} -\AddSpotColor{PANTONE} {PANTONE314PC} {PANTONE\SpotSpace 314\SpotSpace PC} {1 0 0.09 0.3} -\AddSpotColor{PANTONE} {PANTONE315PC} {PANTONE\SpotSpace 315\SpotSpace PC} {1 0 0.12 0.43} -\AddSpotColor{PANTONE} {PANTONE316PC} {PANTONE\SpotSpace 316\SpotSpace PC} {1 0 0.27 0.68} -\AddSpotColor{PANTONE} {PANTONE317PC} {PANTONE\SpotSpace 317\SpotSpace PC} {0.18 0 0.08 0} -\AddSpotColor{PANTONE} {PANTONE318PC} {PANTONE\SpotSpace 318\SpotSpace PC} {0.38 0 0.15 0} -\AddSpotColor{PANTONE} {PANTONE319PC} {PANTONE\SpotSpace 319\SpotSpace PC} {0.52 0 0.19 0} -\AddSpotColor{PANTONE} {PANTONE320PC} {PANTONE\SpotSpace 320\SpotSpace PC} {1 0 0.31 0.07} -\AddSpotColor{PANTONE} {PANTONE321PC} {PANTONE\SpotSpace 321\SpotSpace PC} {1 0 0.31 0.23} -\AddSpotColor{PANTONE} {PANTONE322PC} {PANTONE\SpotSpace 322\SpotSpace PC} {1 0 0.33 0.35} -\AddSpotColor{PANTONE} {PANTONE323PC} {PANTONE\SpotSpace 323\SpotSpace PC} {1 0 0.38 0.47} -\AddSpotColor{PANTONE} {PANTONE324PC} {PANTONE\SpotSpace 324\SpotSpace PC} {0.28 0 0.12 0} -\AddSpotColor{PANTONE} {PANTONE325PC} {PANTONE\SpotSpace 325\SpotSpace PC} {0.56 0 0.26 0} -\AddSpotColor{PANTONE} {PANTONE326PC} {PANTONE\SpotSpace 326\SpotSpace PC} {0.87 0 0.38 0} -\AddSpotColor{PANTONE} {PANTONE327PC} {PANTONE\SpotSpace 327\SpotSpace PC} {1 0 0.44 0.17} -\AddSpotColor{PANTONE} {PANTONE328PC} {PANTONE\SpotSpace 328\SpotSpace PC} {1 0 0.45 0.32} -\AddSpotColor{PANTONE} {PANTONE329PC} {PANTONE\SpotSpace 329\SpotSpace PC} {1 0 0.46 0.46} -\AddSpotColor{PANTONE} {PANTONE330PC} {PANTONE\SpotSpace 330\SpotSpace PC} {1 0 0.48 0.6} -\AddSpotColor{PANTONE} {PANTONE331PC} {PANTONE\SpotSpace 331\SpotSpace PC} {0.24 0 0.16 0} -\AddSpotColor{PANTONE} {PANTONE332PC} {PANTONE\SpotSpace 332\SpotSpace PC} {0.3 0 0.2 0} -\AddSpotColor{PANTONE} {PANTONE333PC} {PANTONE\SpotSpace 333\SpotSpace PC} {0.43 0 0.27 0} -\AddSpotColor{PANTONE} {PANTONE334PC} {PANTONE\SpotSpace 334\SpotSpace PC} {1 0 0.6 0.03} -\AddSpotColor{PANTONE} {PANTONE335PC} {PANTONE\SpotSpace 335\SpotSpace PC} {1 0 0.65 0.3} -\AddSpotColor{PANTONE} {PANTONE336PC} {PANTONE\SpotSpace 336\SpotSpace PC} {1 0 0.67 0.47} -\AddSpotColor{PANTONE} {PANTONE337PC} {PANTONE\SpotSpace 337\SpotSpace PC} {0.31 0 0.2 0} -\AddSpotColor{PANTONE} {PANTONE338PC} {PANTONE\SpotSpace 338\SpotSpace PC} {0.47 0 0.32 0} -\AddSpotColor{PANTONE} {PANTONE339PC} {PANTONE\SpotSpace 339\SpotSpace PC} {0.84 0 0.56 0} -\AddSpotColor{PANTONE} {PANTONE340PC} {PANTONE\SpotSpace 340\SpotSpace PC} {1 0 0.66 0.09} -\AddSpotColor{PANTONE} {PANTONE341PC} {PANTONE\SpotSpace 341\SpotSpace PC} {1 0 0.67 0.29} -\AddSpotColor{PANTONE} {PANTONE342PC} {PANTONE\SpotSpace 342\SpotSpace PC} {1 0 0.71 0.43} -\AddSpotColor{PANTONE} {PANTONE343PC} {PANTONE\SpotSpace 343\SpotSpace PC} {0.98 0 0.72 0.61} -\AddSpotColor{PANTONE} {PANTONE344PC} {PANTONE\SpotSpace 344\SpotSpace PC} {0.27 0 0.23 0} -\AddSpotColor{PANTONE} {PANTONE345PC} {PANTONE\SpotSpace 345\SpotSpace PC} {0.38 0 0.32 0} -\AddSpotColor{PANTONE} {PANTONE346PC} {PANTONE\SpotSpace 346\SpotSpace PC} {0.55 0 0.47 0} -\AddSpotColor{PANTONE} {PANTONE347PC} {PANTONE\SpotSpace 347\SpotSpace PC} {1 0 0.86 0.03} -\AddSpotColor{PANTONE} {PANTONE348PC} {PANTONE\SpotSpace 348\SpotSpace PC} {1 0 0.85 0.24} -\AddSpotColor{PANTONE} {PANTONE349PC} {PANTONE\SpotSpace 349\SpotSpace PC} {1 0 0.91 0.42} -\AddSpotColor{PANTONE} {PANTONE350PC} {PANTONE\SpotSpace 350\SpotSpace PC} {0.79 0 1 0.75} -\AddSpotColor{PANTONE} {PANTONE351PC} {PANTONE\SpotSpace 351\SpotSpace PC} {0.17 0 0.16 0} -\AddSpotColor{PANTONE} {PANTONE352PC} {PANTONE\SpotSpace 352\SpotSpace PC} {0.27 0 0.25 0} -\AddSpotColor{PANTONE} {PANTONE353PC} {PANTONE\SpotSpace 353\SpotSpace PC} {0.38 0 0.36 0} -\AddSpotColor{PANTONE} {PANTONE354PC} {PANTONE\SpotSpace 354\SpotSpace PC} {0.8 0 0.9 0} -\AddSpotColor{PANTONE} {PANTONE355PC} {PANTONE\SpotSpace 355\SpotSpace PC} {0.94 0 1 0} -\AddSpotColor{PANTONE} {PANTONE356PC} {PANTONE\SpotSpace 356\SpotSpace PC} {0.95 0 1 0.27} -\AddSpotColor{PANTONE} {PANTONE357PC} {PANTONE\SpotSpace 357\SpotSpace PC} {0.8 0 1 0.56} -\AddSpotColor{PANTONE} {PANTONE358PC} {PANTONE\SpotSpace 358\SpotSpace PC} {0.27 0 0.38 0} -\AddSpotColor{PANTONE} {PANTONE359PC} {PANTONE\SpotSpace 359\SpotSpace PC} {0.36 0 0.49 0} -\AddSpotColor{PANTONE} {PANTONE360PC} {PANTONE\SpotSpace 360\SpotSpace PC} {0.58 0 0.8 0} -\AddSpotColor{PANTONE} {PANTONE361PC} {PANTONE\SpotSpace 361\SpotSpace PC} {0.69 0 1 0} -\AddSpotColor{PANTONE} {PANTONE362PC} {PANTONE\SpotSpace 362\SpotSpace PC} {0.7 0 1 0.09} -\AddSpotColor{PANTONE} {PANTONE363PC} {PANTONE\SpotSpace 363\SpotSpace PC} {0.68 0 1 0.24} -\AddSpotColor{PANTONE} {PANTONE364PC} {PANTONE\SpotSpace 364\SpotSpace PC} {0.65 0 1 0.42} -\AddSpotColor{PANTONE} {PANTONE365PC} {PANTONE\SpotSpace 365\SpotSpace PC} {0.12 0 0.29 0} -\AddSpotColor{PANTONE} {PANTONE366PC} {PANTONE\SpotSpace 366\SpotSpace PC} {0.2 0 0.44 0} -\AddSpotColor{PANTONE} {PANTONE367PC} {PANTONE\SpotSpace 367\SpotSpace PC} {0.32 0 0.59 0} -\AddSpotColor{PANTONE} {PANTONE368PC} {PANTONE\SpotSpace 368\SpotSpace PC} {0.57 0 1 0} -\AddSpotColor{PANTONE} {PANTONE369PC} {PANTONE\SpotSpace 369\SpotSpace PC} {0.59 0 1 0.07} -\AddSpotColor{PANTONE} {PANTONE370PC} {PANTONE\SpotSpace 370\SpotSpace PC} {0.56 0 1 0.27} -\AddSpotColor{PANTONE} {PANTONE371PC} {PANTONE\SpotSpace 371\SpotSpace PC} {0.43 0 1 0.56} -\AddSpotColor{PANTONE} {PANTONE372PC} {PANTONE\SpotSpace 372\SpotSpace PC} {0.1 0 0.33 0} -\AddSpotColor{PANTONE} {PANTONE373PC} {PANTONE\SpotSpace 373\SpotSpace PC} {0.16 0 0.46 0} -\AddSpotColor{PANTONE} {PANTONE374PC} {PANTONE\SpotSpace 374\SpotSpace PC} {0.24 0 0.57 0} -\AddSpotColor{PANTONE} {PANTONE375PC} {PANTONE\SpotSpace 375\SpotSpace PC} {0.41 0 0.78 0} -\AddSpotColor{PANTONE} {PANTONE376PC} {PANTONE\SpotSpace 376\SpotSpace PC} {0.5 0 1 0} -\AddSpotColor{PANTONE} {PANTONE377PC} {PANTONE\SpotSpace 377\SpotSpace PC} {0.45 0 1 0.24} -\AddSpotColor{PANTONE} {PANTONE378PC} {PANTONE\SpotSpace 378\SpotSpace PC} {0.34 0 1 0.6} -\AddSpotColor{PANTONE} {PANTONE379PC} {PANTONE\SpotSpace 379\SpotSpace PC} {0.09 0 0.58 0} -\AddSpotColor{PANTONE} {PANTONE380PC} {PANTONE\SpotSpace 380\SpotSpace PC} {0.13 0 0.72 0} -\AddSpotColor{PANTONE} {PANTONE381PC} {PANTONE\SpotSpace 381\SpotSpace PC} {0.2 0 0.91 0} -\AddSpotColor{PANTONE} {PANTONE382PC} {PANTONE\SpotSpace 382\SpotSpace PC} {0.29 0 1 0} -\AddSpotColor{PANTONE} {PANTONE383PC} {PANTONE\SpotSpace 383\SpotSpace PC} {0.2 0 1 0.19} -\AddSpotColor{PANTONE} {PANTONE384PC} {PANTONE\SpotSpace 384\SpotSpace PC} {0.18 0 1 0.31} -\AddSpotColor{PANTONE} {PANTONE385PC} {PANTONE\SpotSpace 385\SpotSpace PC} {0.03 0 1 0.58} -\AddSpotColor{PANTONE} {PANTONE386PC} {PANTONE\SpotSpace 386\SpotSpace PC} {0.06 0 0.56 0} -\AddSpotColor{PANTONE} {PANTONE387PC} {PANTONE\SpotSpace 387\SpotSpace PC} {0.1 0 0.74 0} -\AddSpotColor{PANTONE} {PANTONE388PC} {PANTONE\SpotSpace 388\SpotSpace PC} {0.14 0 0.79 0} -\AddSpotColor{PANTONE} {PANTONE389PC} {PANTONE\SpotSpace 389\SpotSpace PC} {0.2 0 0.85 0} -\AddSpotColor{PANTONE} {PANTONE390PC} {PANTONE\SpotSpace 390\SpotSpace PC} {0.22 0 1 0.08} -\AddSpotColor{PANTONE} {PANTONE391PC} {PANTONE\SpotSpace 391\SpotSpace PC} {0.13 0 1 0.33} -\AddSpotColor{PANTONE} {PANTONE392PC} {PANTONE\SpotSpace 392\SpotSpace PC} {0.07 0 1 0.49} -\AddSpotColor{PANTONE} {PANTONE393PC} {PANTONE\SpotSpace 393\SpotSpace PC} {0.03 0 0.55 0} -\AddSpotColor{PANTONE} {PANTONE394PC} {PANTONE\SpotSpace 394\SpotSpace PC} {0.06 0 0.76 0} -\AddSpotColor{PANTONE} {PANTONE395PC} {PANTONE\SpotSpace 395\SpotSpace PC} {0.08 0 0.85 0} -\AddSpotColor{PANTONE} {PANTONE396PC} {PANTONE\SpotSpace 396\SpotSpace PC} {0.11 0 0.94 0} -\AddSpotColor{PANTONE} {PANTONE397PC} {PANTONE\SpotSpace 397\SpotSpace PC} {0.1 0 1 0.11} -\AddSpotColor{PANTONE} {PANTONE398PC} {PANTONE\SpotSpace 398\SpotSpace PC} {0.07 0 1 0.28} -\AddSpotColor{PANTONE} {PANTONE399PC} {PANTONE\SpotSpace 399\SpotSpace PC} {0 0 1 0.43} -\AddSpotColor{PANTONE} {PANTONE400PC} {PANTONE\SpotSpace 400\SpotSpace PC} {0 0.03 0.06 0.16} -\AddSpotColor{PANTONE} {PANTONE401PC} {PANTONE\SpotSpace 401\SpotSpace PC} {0 0.05 0.11 0.23} -\AddSpotColor{PANTONE} {PANTONE402PC} {PANTONE\SpotSpace 402\SpotSpace PC} {0 0.06 0.14 0.31} -\AddSpotColor{PANTONE} {PANTONE403PC} {PANTONE\SpotSpace 403\SpotSpace PC} {0 0.07 0.17 0.43} -\AddSpotColor{PANTONE} {PANTONE404PC} {PANTONE\SpotSpace 404\SpotSpace PC} {0 0.08 0.22 0.56} -\AddSpotColor{PANTONE} {PANTONE405PC} {PANTONE\SpotSpace 405\SpotSpace PC} {0 0.1 0.33 0.72} -\AddSpotColor{PANTONE} {PANTONE406PC} {PANTONE\SpotSpace 406\SpotSpace PC} {0 0.05 0.06 0.16} -\AddSpotColor{PANTONE} {PANTONE407PC} {PANTONE\SpotSpace 407\SpotSpace PC} {0 0.08 0.09 0.26} -\AddSpotColor{PANTONE} {PANTONE408PC} {PANTONE\SpotSpace 408\SpotSpace PC} {0 0.1 0.11 0.34} -\AddSpotColor{PANTONE} {PANTONE409PC} {PANTONE\SpotSpace 409\SpotSpace PC} {0 0.13 0.15 0.45} -\AddSpotColor{PANTONE} {PANTONE410PC} {PANTONE\SpotSpace 410\SpotSpace PC} {0 0.18 0.21 0.56} -\AddSpotColor{PANTONE} {PANTONE411PC} {PANTONE\SpotSpace 411\SpotSpace PC} {0 0.27 0.36 0.72} -\AddSpotColor{PANTONE} {PANTONE412PC} {PANTONE\SpotSpace 412\SpotSpace PC} {0 0.3 0.66 0.98} -\AddSpotColor{PANTONE} {PANTONE413PC} {PANTONE\SpotSpace 413\SpotSpace PC} {0 0 0.09 0.2} -\AddSpotColor{PANTONE} {PANTONE414PC} {PANTONE\SpotSpace 414\SpotSpace PC} {0 0 0.1 0.3} -\AddSpotColor{PANTONE} {PANTONE415PC} {PANTONE\SpotSpace 415\SpotSpace PC} {0 0 0.12 0.41} -\AddSpotColor{PANTONE} {PANTONE416PC} {PANTONE\SpotSpace 416\SpotSpace PC} {0 0 0.16 0.5} -\AddSpotColor{PANTONE} {PANTONE417PC} {PANTONE\SpotSpace 417\SpotSpace PC} {0.01 0 0.25 0.65} -\AddSpotColor{PANTONE} {PANTONE418PC} {PANTONE\SpotSpace 418\SpotSpace PC} {0.03 0 0.31 0.75} -\AddSpotColor{PANTONE} {PANTONE419PC} {PANTONE\SpotSpace 419\SpotSpace PC} {0.29 0 0.36 1} -\AddSpotColor{PANTONE} {PANTONE420PC} {PANTONE\SpotSpace 420\SpotSpace PC} {0 0 0 0.15} -\AddSpotColor{PANTONE} {PANTONE421PC} {PANTONE\SpotSpace 421\SpotSpace PC} {0 0 0 0.26} -\AddSpotColor{PANTONE} {PANTONE422PC} {PANTONE\SpotSpace 422\SpotSpace PC} {0 0 0 0.33} -\AddSpotColor{PANTONE} {PANTONE423PC} {PANTONE\SpotSpace 423\SpotSpace PC} {0 0 0 0.44} -\AddSpotColor{PANTONE} {PANTONE424PC} {PANTONE\SpotSpace 424\SpotSpace PC} {0 0 0 0.61} -\AddSpotColor{PANTONE} {PANTONE425PC} {PANTONE\SpotSpace 425\SpotSpace PC} {0 0 0 0.77} -\AddSpotColor{PANTONE} {PANTONE426PC} {PANTONE\SpotSpace 426\SpotSpace PC} {0 0 0 0.99} -\AddSpotColor{PANTONE} {PANTONE427PC} {PANTONE\SpotSpace 427\SpotSpace PC} {0 0 0 0.11} -\AddSpotColor{PANTONE} {PANTONE428PC} {PANTONE\SpotSpace 428\SpotSpace PC} {0.02 0 0 0.18} -\AddSpotColor{PANTONE} {PANTONE429PC} {PANTONE\SpotSpace 429\SpotSpace PC} {0.03 0 0 0.32} -\AddSpotColor{PANTONE} {PANTONE430PC} {PANTONE\SpotSpace 430\SpotSpace PC} {0.05 0 0 0.45} -\AddSpotColor{PANTONE} {PANTONE431PC} {PANTONE\SpotSpace 431\SpotSpace PC} {0.11 0.01 0 0.64} -\AddSpotColor{PANTONE} {PANTONE432PC} {PANTONE\SpotSpace 432\SpotSpace PC} {0.23 0.02 0 0.77} -\AddSpotColor{PANTONE} {PANTONE433PC} {PANTONE\SpotSpace 433\SpotSpace PC} {0.33 0.03 0 0.95} -\AddSpotColor{PANTONE} {PANTONE434PC} {PANTONE\SpotSpace 434\SpotSpace PC} {0.07 0.09 0.1 0} -\AddSpotColor{PANTONE} {PANTONE435PC} {PANTONE\SpotSpace 435\SpotSpace PC} {0.13 0.15 0.15 0} -\AddSpotColor{PANTONE} {PANTONE436PC} {PANTONE\SpotSpace 436\SpotSpace PC} {0.24 0.25 0.26 0} -\AddSpotColor{PANTONE} {PANTONE437PC} {PANTONE\SpotSpace 437\SpotSpace PC} {0.46 0.45 0.49 0} -\AddSpotColor{PANTONE} {PANTONE438PC} {PANTONE\SpotSpace 438\SpotSpace PC} {0.75 0.68 1 0.1} -\AddSpotColor{PANTONE} {PANTONE439PC} {PANTONE\SpotSpace 439\SpotSpace PC} {0.8 0.73 1 0.2} -\AddSpotColor{PANTONE} {PANTONE440PC} {PANTONE\SpotSpace 440\SpotSpace PC} {0.82 0.76 1 0.3} -\AddSpotColor{PANTONE} {PANTONE441PC} {PANTONE\SpotSpace 441\SpotSpace PC} {0.06 0 0.07 0.09} -\AddSpotColor{PANTONE} {PANTONE442PC} {PANTONE\SpotSpace 442\SpotSpace PC} {0.08 0 0.09 0.19} -\AddSpotColor{PANTONE} {PANTONE443PC} {PANTONE\SpotSpace 443\SpotSpace PC} {0.12 0 0.12 0.3} -\AddSpotColor{PANTONE} {PANTONE444PC} {PANTONE\SpotSpace 444\SpotSpace PC} {0.15 0 0.15 0.42} -\AddSpotColor{PANTONE} {PANTONE445PC} {PANTONE\SpotSpace 445\SpotSpace PC} {0.2 0 0.2 0.65} -\AddSpotColor{PANTONE} {PANTONE446PC} {PANTONE\SpotSpace 446\SpotSpace PC} {0.21 0 0.23 0.75} -\AddSpotColor{PANTONE} {PANTONE447PC} {PANTONE\SpotSpace 447\SpotSpace PC} {0.16 0 0.31 0.82} -\AddSpotColor{PANTONE} {PANTONE448PC} {PANTONE\SpotSpace 448\SpotSpace PC} {0.65 0.58 1 0.35} -\AddSpotColor{PANTONE} {PANTONE449PC} {PANTONE\SpotSpace 449\SpotSpace PC} {0.65 0.55 1 0.28} -\AddSpotColor{PANTONE} {PANTONE450PC} {PANTONE\SpotSpace 450\SpotSpace PC} {0.6 0.5 1 0.22} -\AddSpotColor{PANTONE} {PANTONE451PC} {PANTONE\SpotSpace 451\SpotSpace PC} {0.33 0.28 0.58 0} -\AddSpotColor{PANTONE} {PANTONE452PC} {PANTONE\SpotSpace 452\SpotSpace PC} {0.24 0.18 0.42 0} -\AddSpotColor{PANTONE} {PANTONE453PC} {PANTONE\SpotSpace 453\SpotSpace PC} {0.14 0.1 0.27 0} -\AddSpotColor{PANTONE} {PANTONE454PC} {PANTONE\SpotSpace 454\SpotSpace PC} {0.09 0.06 0.17 0} -\AddSpotColor{PANTONE} {PANTONE455PC} {PANTONE\SpotSpace 455\SpotSpace PC} {0 0.17 1 0.65} -\AddSpotColor{PANTONE} {PANTONE456PC} {PANTONE\SpotSpace 456\SpotSpace PC} {0 0.15 1 0.43} -\AddSpotColor{PANTONE} {PANTONE457PC} {PANTONE\SpotSpace 457\SpotSpace PC} {0 0.15 1 0.28} -\AddSpotColor{PANTONE} {PANTONE458PC} {PANTONE\SpotSpace 458\SpotSpace PC} {0.1 0.1 0.73 0} -\AddSpotColor{PANTONE} {PANTONE459PC} {PANTONE\SpotSpace 459\SpotSpace PC} {0.06 0.07 0.55 0} -\AddSpotColor{PANTONE} {PANTONE460PC} {PANTONE\SpotSpace 460\SpotSpace PC} {0.04 0.05 0.44 0} -\AddSpotColor{PANTONE} {PANTONE461PC} {PANTONE\SpotSpace 461\SpotSpace PC} {0.03 0.03 0.35 0} -\AddSpotColor{PANTONE} {PANTONE462PC} {PANTONE\SpotSpace 462\SpotSpace PC} {0.5 0.58 1 0.45} -\AddSpotColor{PANTONE} {PANTONE463PC} {PANTONE\SpotSpace 463\SpotSpace PC} {0.3 0.56 1 0.37} -\AddSpotColor{PANTONE} {PANTONE464PC} {PANTONE\SpotSpace 464\SpotSpace PC} {0.1 0.49 1 0.35} -\AddSpotColor{PANTONE} {PANTONE465PC} {PANTONE\SpotSpace 465\SpotSpace PC} {0.2 0.32 0.58 0} -\AddSpotColor{PANTONE} {PANTONE466PC} {PANTONE\SpotSpace 466\SpotSpace PC} {0.12 0.22 0.43 0} -\AddSpotColor{PANTONE} {PANTONE467PC} {PANTONE\SpotSpace 467\SpotSpace PC} {0.09 0.15 0.34 0} -\AddSpotColor{PANTONE} {PANTONE468PC} {PANTONE\SpotSpace 468\SpotSpace PC} {0.06 0.09 0.23 0} -\AddSpotColor{PANTONE} {PANTONE469PC} {PANTONE\SpotSpace 469\SpotSpace PC} {0 0.52 1 0.62} -\AddSpotColor{PANTONE} {PANTONE470PC} {PANTONE\SpotSpace 470\SpotSpace PC} {0 0.58 1 0.33} -\AddSpotColor{PANTONE} {PANTONE471PC} {PANTONE\SpotSpace 471\SpotSpace PC} {0 0.59 1 0.18} -\AddSpotColor{PANTONE} {PANTONE472PC} {PANTONE\SpotSpace 472\SpotSpace PC} {0 0.34 0.52 0} -\AddSpotColor{PANTONE} {PANTONE473PC} {PANTONE\SpotSpace 473\SpotSpace PC} {0 0.23 0.36 0} -\AddSpotColor{PANTONE} {PANTONE474PC} {PANTONE\SpotSpace 474\SpotSpace PC} {0 0.15 0.26 0} -\AddSpotColor{PANTONE} {PANTONE475PC} {PANTONE\SpotSpace 475\SpotSpace PC} {0 0.11 0.2 0} -\AddSpotColor{PANTONE} {PANTONE476PC} {PANTONE\SpotSpace 476\SpotSpace PC} {0.57 0.8 1 0.45} -\AddSpotColor{PANTONE} {PANTONE477PC} {PANTONE\SpotSpace 477\SpotSpace PC} {0.5 0.85 1 0.35} -\AddSpotColor{PANTONE} {PANTONE478PC} {PANTONE\SpotSpace 478\SpotSpace PC} {0.4 0.86 1 0.3} -\AddSpotColor{PANTONE} {PANTONE479PC} {PANTONE\SpotSpace 479\SpotSpace PC} {0.3 0.48 0.57 0} -\AddSpotColor{PANTONE} {PANTONE480PC} {PANTONE\SpotSpace 480\SpotSpace PC} {0.15 0.29 0.33 0} -\AddSpotColor{PANTONE} {PANTONE481PC} {PANTONE\SpotSpace 481\SpotSpace PC} {0.09 0.19 0.23 0} -\AddSpotColor{PANTONE} {PANTONE482PC} {PANTONE\SpotSpace 482\SpotSpace PC} {0.05 0.11 0.15 0} -\AddSpotColor{PANTONE} {PANTONE483PC} {PANTONE\SpotSpace 483\SpotSpace PC} {0 0.91 1 0.6} -\AddSpotColor{PANTONE} {PANTONE484PC} {PANTONE\SpotSpace 484\SpotSpace PC} {0 0.95 1 0.29} -\AddSpotColor{PANTONE} {PANTONE485PC} {PANTONE\SpotSpace 485\SpotSpace PC} {0 0.95 1 0} -\AddSpotColor{PANTONE} {PANTONE486PC} {PANTONE\SpotSpace 486\SpotSpace PC} {0 0.47 0.41 0} -\AddSpotColor{PANTONE} {PANTONE487PC} {PANTONE\SpotSpace 487\SpotSpace PC} {0 0.35 0.28 0} -\AddSpotColor{PANTONE} {PANTONE488PC} {PANTONE\SpotSpace 488\SpotSpace PC} {0 0.26 0.19 0} -\AddSpotColor{PANTONE} {PANTONE489PC} {PANTONE\SpotSpace 489\SpotSpace PC} {0 0.15 0.11 0} -\AddSpotColor{PANTONE} {PANTONE490PC} {PANTONE\SpotSpace 490\SpotSpace PC} {0 0.74 1 0.72} -\AddSpotColor{PANTONE} {PANTONE491PC} {PANTONE\SpotSpace 491\SpotSpace PC} {0 0.79 1 0.52} -\AddSpotColor{PANTONE} {PANTONE492PC} {PANTONE\SpotSpace 492\SpotSpace PC} {0 0.7 0.66 0.3} -\AddSpotColor{PANTONE} {PANTONE493PC} {PANTONE\SpotSpace 493\SpotSpace PC} {0 0.46 0.23 0.05} -\AddSpotColor{PANTONE} {PANTONE494PC} {PANTONE\SpotSpace 494\SpotSpace PC} {0 0.33 0.13 0} -\AddSpotColor{PANTONE} {PANTONE495PC} {PANTONE\SpotSpace 495\SpotSpace PC} {0 0.24 0.11 0} -\AddSpotColor{PANTONE} {PANTONE496PC} {PANTONE\SpotSpace 496\SpotSpace PC} {0 0.16 0.09 0} -\AddSpotColor{PANTONE} {PANTONE497PC} {PANTONE\SpotSpace 497\SpotSpace PC} {0 0.7 1 0.78} -\AddSpotColor{PANTONE} {PANTONE498PC} {PANTONE\SpotSpace 498\SpotSpace PC} {0 0.64 1 0.6} -\AddSpotColor{PANTONE} {PANTONE499PC} {PANTONE\SpotSpace 499\SpotSpace PC} {0 0.58 1 0.49} -\AddSpotColor{PANTONE} {PANTONE500PC} {PANTONE\SpotSpace 500\SpotSpace PC} {0 0.38 0.21 0.11} -\AddSpotColor{PANTONE} {PANTONE501PC} {PANTONE\SpotSpace 501\SpotSpace PC} {0 0.27 0.13 0.03} -\AddSpotColor{PANTONE} {PANTONE502PC} {PANTONE\SpotSpace 502\SpotSpace PC} {0 0.18 0.1 0.01} -\AddSpotColor{PANTONE} {PANTONE503PC} {PANTONE\SpotSpace 503\SpotSpace PC} {0 0.11 0.08 0} -\AddSpotColor{PANTONE} {PANTONE504PC} {PANTONE\SpotSpace 504\SpotSpace PC} {0.65 1 1 0.35} -\AddSpotColor{PANTONE} {PANTONE505PC} {PANTONE\SpotSpace 505\SpotSpace PC} {0.5 1 1 0.25} -\AddSpotColor{PANTONE} {PANTONE506PC} {PANTONE\SpotSpace 506\SpotSpace PC} {0.45 1 1 0.15} -\AddSpotColor{PANTONE} {PANTONE507PC} {PANTONE\SpotSpace 507\SpotSpace PC} {0.11 0.45 0.22 0} -\AddSpotColor{PANTONE} {PANTONE508PC} {PANTONE\SpotSpace 508\SpotSpace PC} {0.04 0.34 0.11 0} -\AddSpotColor{PANTONE} {PANTONE509PC} {PANTONE\SpotSpace 509\SpotSpace PC} {0 0.24 0.07 0} -\AddSpotColor{PANTONE} {PANTONE510PC} {PANTONE\SpotSpace 510\SpotSpace PC} {0 0.17 0.06 0} -\AddSpotColor{PANTONE} {PANTONE511PC} {PANTONE\SpotSpace 511\SpotSpace PC} {0.6 1 0.45 0.3} -\AddSpotColor{PANTONE} {PANTONE512PC} {PANTONE\SpotSpace 512\SpotSpace PC} {0.5 1 0.15 0.1} -\AddSpotColor{PANTONE} {PANTONE513PC} {PANTONE\SpotSpace 513\SpotSpace PC} {0.44 0.83 0 0} -\AddSpotColor{PANTONE} {PANTONE514PC} {PANTONE\SpotSpace 514\SpotSpace PC} {0.15 0.5 0 0} -\AddSpotColor{PANTONE} {PANTONE515PC} {PANTONE\SpotSpace 515\SpotSpace PC} {0.07 0.38 0 0} -\AddSpotColor{PANTONE} {PANTONE516PC} {PANTONE\SpotSpace 516\SpotSpace PC} {0.03 0.27 0 0} -\AddSpotColor{PANTONE} {PANTONE517PC} {PANTONE\SpotSpace 517\SpotSpace PC} {0 0.18 0 0} -\AddSpotColor{PANTONE} {PANTONE518PC} {PANTONE\SpotSpace 518\SpotSpace PC} {0.7 1 0.55 0.25} -\AddSpotColor{PANTONE} {PANTONE519PC} {PANTONE\SpotSpace 519\SpotSpace PC} {0.67 1 0.3 0.1} -\AddSpotColor{PANTONE} {PANTONE520PC} {PANTONE\SpotSpace 520\SpotSpace PC} {0.64 1 0.12 0} -\AddSpotColor{PANTONE} {PANTONE521PC} {PANTONE\SpotSpace 521\SpotSpace PC} {0.27 0.47 0 0} -\AddSpotColor{PANTONE} {PANTONE522PC} {PANTONE\SpotSpace 522\SpotSpace PC} {0.17 0.37 0 0} -\AddSpotColor{PANTONE} {PANTONE523PC} {PANTONE\SpotSpace 523\SpotSpace PC} {0.1 0.26 0 0} -\AddSpotColor{PANTONE} {PANTONE524PC} {PANTONE\SpotSpace 524\SpotSpace PC} {0.06 0.15 0 0} -\AddSpotColor{PANTONE} {PANTONE525PC} {PANTONE\SpotSpace 525\SpotSpace PC} {0.84 1 0.45 0.05} -\AddSpotColor{PANTONE} {PANTONE526PC} {PANTONE\SpotSpace 526\SpotSpace PC} {0.76 1 0.07 0} -\AddSpotColor{PANTONE} {PANTONE527PC} {PANTONE\SpotSpace 527\SpotSpace PC} {0.73 1 0 0} -\AddSpotColor{PANTONE} {PANTONE528PC} {PANTONE\SpotSpace 528\SpotSpace PC} {0.41 0.55 0 0} -\AddSpotColor{PANTONE} {PANTONE529PC} {PANTONE\SpotSpace 529\SpotSpace PC} {0.26 0.4 0 0} -\AddSpotColor{PANTONE} {PANTONE530PC} {PANTONE\SpotSpace 530\SpotSpace PC} {0.18 0.31 0 0} -\AddSpotColor{PANTONE} {PANTONE531PC} {PANTONE\SpotSpace 531\SpotSpace PC} {0.1 0.2 0 0} -\AddSpotColor{PANTONE} {PANTONE532PC} {PANTONE\SpotSpace 532\SpotSpace PC} {1 0.8 0.7 0.25} -\AddSpotColor{PANTONE} {PANTONE533PC} {PANTONE\SpotSpace 533\SpotSpace PC} {1 0.83 0.46 0.13} -\AddSpotColor{PANTONE} {PANTONE534PC} {PANTONE\SpotSpace 534\SpotSpace PC} {1 0.8 0.3 0.05} -\AddSpotColor{PANTONE} {PANTONE535PC} {PANTONE\SpotSpace 535\SpotSpace PC} {0.42 0.27 0.07 0} -\AddSpotColor{PANTONE} {PANTONE536PC} {PANTONE\SpotSpace 536\SpotSpace PC} {0.31 0.2 0.05 0} -\AddSpotColor{PANTONE} {PANTONE537PC} {PANTONE\SpotSpace 537\SpotSpace PC} {0.22 0.12 0.03 0} -\AddSpotColor{PANTONE} {PANTONE538PC} {PANTONE\SpotSpace 538\SpotSpace PC} {0.12 0.07 0.02 0} -\AddSpotColor{PANTONE} {PANTONE539PC} {PANTONE\SpotSpace 539\SpotSpace PC} {1 0.49 0 0.7} -\AddSpotColor{PANTONE} {PANTONE540PC} {PANTONE\SpotSpace 540\SpotSpace PC} {1 0.55 0 0.55} -\AddSpotColor{PANTONE} {PANTONE541PC} {PANTONE\SpotSpace 541\SpotSpace PC} {1 0.57 0 0.38} -\AddSpotColor{PANTONE} {PANTONE542PC} {PANTONE\SpotSpace 542\SpotSpace PC} {0.62 0.22 0 0.03} -\AddSpotColor{PANTONE} {PANTONE543PC} {PANTONE\SpotSpace 543\SpotSpace PC} {0.41 0.11 0 0} -\AddSpotColor{PANTONE} {PANTONE544PC} {PANTONE\SpotSpace 544\SpotSpace PC} {0.3 0.06 0 0} -\AddSpotColor{PANTONE} {PANTONE545PC} {PANTONE\SpotSpace 545\SpotSpace PC} {0.22 0.03 0 0} -\AddSpotColor{PANTONE} {PANTONE546PC} {PANTONE\SpotSpace 546\SpotSpace PC} {0.95 0.09 0 0.83} -\AddSpotColor{PANTONE} {PANTONE547PC} {PANTONE\SpotSpace 547\SpotSpace PC} {1 0.19 0 0.75} -\AddSpotColor{PANTONE} {PANTONE548PC} {PANTONE\SpotSpace 548\SpotSpace PC} {1 0.24 0 0.64} -\AddSpotColor{PANTONE} {PANTONE549PC} {PANTONE\SpotSpace 549\SpotSpace PC} {0.52 0.06 0 0.25} -\AddSpotColor{PANTONE} {PANTONE550PC} {PANTONE\SpotSpace 550\SpotSpace PC} {0.38 0.04 0 0.19} -\AddSpotColor{PANTONE} {PANTONE551PC} {PANTONE\SpotSpace 551\SpotSpace PC} {0.27 0.03 0 0.13} -\AddSpotColor{PANTONE} {PANTONE552PC} {PANTONE\SpotSpace 552\SpotSpace PC} {0.15 0 0 0.09} -\AddSpotColor{PANTONE} {PANTONE553PC} {PANTONE\SpotSpace 553\SpotSpace PC} {0.59 0 0.53 0.8} -\AddSpotColor{PANTONE} {PANTONE554PC} {PANTONE\SpotSpace 554\SpotSpace PC} {0.78 0 0.63 0.67} -\AddSpotColor{PANTONE} {PANTONE555PC} {PANTONE\SpotSpace 555\SpotSpace PC} {0.75 0 0.6 0.55} -\AddSpotColor{PANTONE} {PANTONE556PC} {PANTONE\SpotSpace 556\SpotSpace PC} {0.42 0 0.33 0.27} -\AddSpotColor{PANTONE} {PANTONE557PC} {PANTONE\SpotSpace 557\SpotSpace PC} {0.3 0 0.2 0.15} -\AddSpotColor{PANTONE} {PANTONE558PC} {PANTONE\SpotSpace 558\SpotSpace PC} {0.19 0 0.14 0.09} -\AddSpotColor{PANTONE} {PANTONE559PC} {PANTONE\SpotSpace 559\SpotSpace PC} {0.14 0 0.1 0.06} -\AddSpotColor{PANTONE} {PANTONE560PC} {PANTONE\SpotSpace 560\SpotSpace PC} {0.8 0 0.63 0.75} -\AddSpotColor{PANTONE} {PANTONE561PC} {PANTONE\SpotSpace 561\SpotSpace PC} {0.85 0 0.54 0.52} -\AddSpotColor{PANTONE} {PANTONE562PC} {PANTONE\SpotSpace 562\SpotSpace PC} {0.85 0 0.5 0.31} -\AddSpotColor{PANTONE} {PANTONE563PC} {PANTONE\SpotSpace 563\SpotSpace PC} {0.52 0 0.32 0.01} -\AddSpotColor{PANTONE} {PANTONE564PC} {PANTONE\SpotSpace 564\SpotSpace PC} {0.37 0 0.2 0} -\AddSpotColor{PANTONE} {PANTONE565PC} {PANTONE\SpotSpace 565\SpotSpace PC} {0.23 0 0.13 0} -\AddSpotColor{PANTONE} {PANTONE566PC} {PANTONE\SpotSpace 566\SpotSpace PC} {0.14 0 0.1 0} -\AddSpotColor{PANTONE} {PANTONE567PC} {PANTONE\SpotSpace 567\SpotSpace PC} {0.82 0 0.64 0.7} -\AddSpotColor{PANTONE} {PANTONE568PC} {PANTONE\SpotSpace 568\SpotSpace PC} {0.88 0 0.57 0.36} -\AddSpotColor{PANTONE} {PANTONE569PC} {PANTONE\SpotSpace 569\SpotSpace PC} {0.98 0 0.57 0.17} -\AddSpotColor{PANTONE} {PANTONE570PC} {PANTONE\SpotSpace 570\SpotSpace PC} {0.48 0 0.29 0} -\AddSpotColor{PANTONE} {PANTONE571PC} {PANTONE\SpotSpace 571\SpotSpace PC} {0.32 0 0.19 0} -\AddSpotColor{PANTONE} {PANTONE572PC} {PANTONE\SpotSpace 572\SpotSpace PC} {0.23 0 0.14 0} -\AddSpotColor{PANTONE} {PANTONE573PC} {PANTONE\SpotSpace 573\SpotSpace PC} {0.14 0 0.09 0} -\AddSpotColor{PANTONE} {PANTONE574PC} {PANTONE\SpotSpace 574\SpotSpace PC} {0.34 0 0.81 0.71} -\AddSpotColor{PANTONE} {PANTONE575PC} {PANTONE\SpotSpace 575\SpotSpace PC} {0.48 0 1 0.53} -\AddSpotColor{PANTONE} {PANTONE576PC} {PANTONE\SpotSpace 576\SpotSpace PC} {0.49 0 1 0.39} -\AddSpotColor{PANTONE} {PANTONE577PC} {PANTONE\SpotSpace 577\SpotSpace PC} {0.24 0 0.46 0.1} -\AddSpotColor{PANTONE} {PANTONE578PC} {PANTONE\SpotSpace 578\SpotSpace PC} {0.2 0 0.4 0.06} -\AddSpotColor{PANTONE} {PANTONE579PC} {PANTONE\SpotSpace 579\SpotSpace PC} {0.17 0 0.34 0.03} -\AddSpotColor{PANTONE} {PANTONE580PC} {PANTONE\SpotSpace 580\SpotSpace PC} {0.12 0 0.26 0.02} -\AddSpotColor{PANTONE} {PANTONE581PC} {PANTONE\SpotSpace 581\SpotSpace PC} {0.02 0 1 0.72} -\AddSpotColor{PANTONE} {PANTONE582PC} {PANTONE\SpotSpace 582\SpotSpace PC} {0.13 0 1 0.46} -\AddSpotColor{PANTONE} {PANTONE583PC} {PANTONE\SpotSpace 583\SpotSpace PC} {0.23 0 1 0.17} -\AddSpotColor{PANTONE} {PANTONE584PC} {PANTONE\SpotSpace 584\SpotSpace PC} {0.12 0 0.79 0.06} -\AddSpotColor{PANTONE} {PANTONE585PC} {PANTONE\SpotSpace 585\SpotSpace PC} {0.11 0 0.66 0.02} -\AddSpotColor{PANTONE} {PANTONE586PC} {PANTONE\SpotSpace 586\SpotSpace PC} {0.09 0 0.53 0} -\AddSpotColor{PANTONE} {PANTONE587PC} {PANTONE\SpotSpace 587\SpotSpace PC} {0.05 0 0.4 0} -\AddSpotColor{PANTONE} {PANTONE600PC} {PANTONE\SpotSpace 600\SpotSpace PC} {0 0 0.29 0} -\AddSpotColor{PANTONE} {PANTONE601PC} {PANTONE\SpotSpace 601\SpotSpace PC} {0 0 0.4 0} -\AddSpotColor{PANTONE} {PANTONE602PC} {PANTONE\SpotSpace 602\SpotSpace PC} {0 0 0.5 0} -\AddSpotColor{PANTONE} {PANTONE603PC} {PANTONE\SpotSpace 603\SpotSpace PC} {0 0 0.69 0.01} -\AddSpotColor{PANTONE} {PANTONE604PC} {PANTONE\SpotSpace 604\SpotSpace PC} {0 0 0.88 0.03} -\AddSpotColor{PANTONE} {PANTONE605PC} {PANTONE\SpotSpace 605\SpotSpace PC} {0 0.02 1 0.07} -\AddSpotColor{PANTONE} {PANTONE606PC} {PANTONE\SpotSpace 606\SpotSpace PC} {0 0.04 1 0.12} -\AddSpotColor{PANTONE} {PANTONE607PC} {PANTONE\SpotSpace 607\SpotSpace PC} {0 0 0.18 0.01} -\AddSpotColor{PANTONE} {PANTONE608PC} {PANTONE\SpotSpace 608\SpotSpace PC} {0 0 0.32 0.02} -\AddSpotColor{PANTONE} {PANTONE609PC} {PANTONE\SpotSpace 609\SpotSpace PC} {0 0 0.46 0.04} -\AddSpotColor{PANTONE} {PANTONE610PC} {PANTONE\SpotSpace 610\SpotSpace PC} {0 0 0.58 0.06} -\AddSpotColor{PANTONE} {PANTONE611PC} {PANTONE\SpotSpace 611\SpotSpace PC} {0 0.01 0.92 0.11} -\AddSpotColor{PANTONE} {PANTONE612PC} {PANTONE\SpotSpace 612\SpotSpace PC} {0 0.02 1 0.2} -\AddSpotColor{PANTONE} {PANTONE613PC} {PANTONE\SpotSpace 613\SpotSpace PC} {0 0.04 1 0.3} -\AddSpotColor{PANTONE} {PANTONE614PC} {PANTONE\SpotSpace 614\SpotSpace PC} {0 0 0.2 0.04} -\AddSpotColor{PANTONE} {PANTONE615PC} {PANTONE\SpotSpace 615\SpotSpace PC} {0 0.01 0.27 0.06} -\AddSpotColor{PANTONE} {PANTONE616PC} {PANTONE\SpotSpace 616\SpotSpace PC} {0 0.02 0.35 0.09} -\AddSpotColor{PANTONE} {PANTONE617PC} {PANTONE\SpotSpace 617\SpotSpace PC} {0 0.02 0.48 0.17} -\AddSpotColor{PANTONE} {PANTONE618PC} {PANTONE\SpotSpace 618\SpotSpace PC} {0 0.03 0.87 0.3} -\AddSpotColor{PANTONE} {PANTONE619PC} {PANTONE\SpotSpace 619\SpotSpace PC} {0 0.04 1 0.43} -\AddSpotColor{PANTONE} {PANTONE620PC} {PANTONE\SpotSpace 620\SpotSpace PC} {0 0.05 1 0.53} -\AddSpotColor{PANTONE} {PANTONE621PC} {PANTONE\SpotSpace 621\SpotSpace PC} {0.13 0 0.1 0.02} -\AddSpotColor{PANTONE} {PANTONE622PC} {PANTONE\SpotSpace 622\SpotSpace PC} {0.24 0 0.19 0.04} -\AddSpotColor{PANTONE} {PANTONE623PC} {PANTONE\SpotSpace 623\SpotSpace PC} {0.32 0 0.24 0.1} -\AddSpotColor{PANTONE} {PANTONE624PC} {PANTONE\SpotSpace 624\SpotSpace PC} {0.44 0 0.35 0.2} -\AddSpotColor{PANTONE} {PANTONE625PC} {PANTONE\SpotSpace 625\SpotSpace PC} {0.56 0 0.44 0.33} -\AddSpotColor{PANTONE} {PANTONE626PC} {PANTONE\SpotSpace 626\SpotSpace PC} {0.76 0 0.64 0.62} -\AddSpotColor{PANTONE} {PANTONE627PC} {PANTONE\SpotSpace 627\SpotSpace PC} {0.9 0 0.75 0.83} -\AddSpotColor{PANTONE} {PANTONE628PC} {PANTONE\SpotSpace 628\SpotSpace PC} {0.19 0 0.06 0} -\AddSpotColor{PANTONE} {PANTONE629PC} {PANTONE\SpotSpace 629\SpotSpace PC} {0.34 0 0.09 0} -\AddSpotColor{PANTONE} {PANTONE630PC} {PANTONE\SpotSpace 630\SpotSpace PC} {0.47 0 0.11 0} -\AddSpotColor{PANTONE} {PANTONE631PC} {PANTONE\SpotSpace 631\SpotSpace PC} {0.67 0 0.12 0.02} -\AddSpotColor{PANTONE} {PANTONE632PC} {PANTONE\SpotSpace 632\SpotSpace PC} {0.92 0 0.15 0.05} -\AddSpotColor{PANTONE} {PANTONE633PC} {PANTONE\SpotSpace 633\SpotSpace PC} {1 0 0.1 0.25} -\AddSpotColor{PANTONE} {PANTONE634PC} {PANTONE\SpotSpace 634\SpotSpace PC} {1 0 0.09 0.4} -\AddSpotColor{PANTONE} {PANTONE635PC} {PANTONE\SpotSpace 635\SpotSpace PC} {0.32 0 0.08 0} -\AddSpotColor{PANTONE} {PANTONE636PC} {PANTONE\SpotSpace 636\SpotSpace PC} {0.45 0 0.09 0} -\AddSpotColor{PANTONE} {PANTONE637PC} {PANTONE\SpotSpace 637\SpotSpace PC} {0.55 0 0.09 0} -\AddSpotColor{PANTONE} {PANTONE638PC} {PANTONE\SpotSpace 638\SpotSpace PC} {0.83 0 0.1 0} -\AddSpotColor{PANTONE} {PANTONE639PC} {PANTONE\SpotSpace 639\SpotSpace PC} {1 0 0.05 0.05} -\AddSpotColor{PANTONE} {PANTONE640PC} {PANTONE\SpotSpace 640\SpotSpace PC} {1 0 0 0.22} -\AddSpotColor{PANTONE} {PANTONE641PC} {PANTONE\SpotSpace 641\SpotSpace PC} {1 0.04 0 0.3} -\AddSpotColor{PANTONE} {PANTONE642PC} {PANTONE\SpotSpace 642\SpotSpace PC} {0.16 0.04 0 0.02} -\AddSpotColor{PANTONE} {PANTONE643PC} {PANTONE\SpotSpace 643\SpotSpace PC} {0.25 0.07 0 0.04} -\AddSpotColor{PANTONE} {PANTONE644PC} {PANTONE\SpotSpace 644\SpotSpace PC} {0.42 0.15 0 0.06} -\AddSpotColor{PANTONE} {PANTONE645PC} {PANTONE\SpotSpace 645\SpotSpace PC} {0.55 0.24 0 0.09} -\AddSpotColor{PANTONE} {PANTONE646PC} {PANTONE\SpotSpace 646\SpotSpace PC} {0.65 0.3 0 0.11} -\AddSpotColor{PANTONE} {PANTONE647PC} {PANTONE\SpotSpace 647\SpotSpace PC} {1 0.56 0 0.23} -\AddSpotColor{PANTONE} {PANTONE648PC} {PANTONE\SpotSpace 648\SpotSpace PC} {1 0.62 0 0.52} -\AddSpotColor{PANTONE} {PANTONE649PC} {PANTONE\SpotSpace 649\SpotSpace PC} {0.1 0.04 0 0.01} -\AddSpotColor{PANTONE} {PANTONE650PC} {PANTONE\SpotSpace 650\SpotSpace PC} {0.24 0.09 0 0.02} -\AddSpotColor{PANTONE} {PANTONE651PC} {PANTONE\SpotSpace 651\SpotSpace PC} {0.38 0.18 0 0.06} -\AddSpotColor{PANTONE} {PANTONE652PC} {PANTONE\SpotSpace 652\SpotSpace PC} {0.5 0.25 0 0.1} -\AddSpotColor{PANTONE} {PANTONE653PC} {PANTONE\SpotSpace 653\SpotSpace PC} {1 0.62 0 0.2} -\AddSpotColor{PANTONE} {PANTONE654PC} {PANTONE\SpotSpace 654\SpotSpace PC} {1 0.67 0 0.38} -\AddSpotColor{PANTONE} {PANTONE655PC} {PANTONE\SpotSpace 655\SpotSpace PC} {1 0.68 0 0.52} -\AddSpotColor{PANTONE} {PANTONE656PC} {PANTONE\SpotSpace 656\SpotSpace PC} {0.14 0.03 0 0} -\AddSpotColor{PANTONE} {PANTONE657PC} {PANTONE\SpotSpace 657\SpotSpace PC} {0.24 0.07 0 0} -\AddSpotColor{PANTONE} {PANTONE658PC} {PANTONE\SpotSpace 658\SpotSpace PC} {0.3 0.15 0 0} -\AddSpotColor{PANTONE} {PANTONE659PC} {PANTONE\SpotSpace 659\SpotSpace PC} {0.55 0.3 0 0} -\AddSpotColor{PANTONE} {PANTONE660PC} {PANTONE\SpotSpace 660\SpotSpace PC} {0.9 0.57 0 0} -\AddSpotColor{PANTONE} {PANTONE661PC} {PANTONE\SpotSpace 661\SpotSpace PC} {1 0.69 0 0.09} -\AddSpotColor{PANTONE} {PANTONE662PC} {PANTONE\SpotSpace 662\SpotSpace PC} {1 0.71 0 0.18} -\AddSpotColor{PANTONE} {PANTONE663PC} {PANTONE\SpotSpace 663\SpotSpace PC} {0.07 0.06 0 0} -\AddSpotColor{PANTONE} {PANTONE664PC} {PANTONE\SpotSpace 664\SpotSpace PC} {0.11 0.09 0 0} -\AddSpotColor{PANTONE} {PANTONE665PC} {PANTONE\SpotSpace 665\SpotSpace PC} {0.2 0.17 0 0.02} -\AddSpotColor{PANTONE} {PANTONE666PC} {PANTONE\SpotSpace 666\SpotSpace PC} {0.31 0.3 0 0.07} -\AddSpotColor{PANTONE} {PANTONE667PC} {PANTONE\SpotSpace 667\SpotSpace PC} {0.52 0.49 0 0.14} -\AddSpotColor{PANTONE} {PANTONE668PC} {PANTONE\SpotSpace 668\SpotSpace PC} {0.65 0.64 0 0.3} -\AddSpotColor{PANTONE} {PANTONE669PC} {PANTONE\SpotSpace 669\SpotSpace PC} {0.76 0.78 0 0.47} -\AddSpotColor{PANTONE} {PANTONE670PC} {PANTONE\SpotSpace 670\SpotSpace PC} {0 0.13 0 0} -\AddSpotColor{PANTONE} {PANTONE671PC} {PANTONE\SpotSpace 671\SpotSpace PC} {0.01 0.2 0 0} -\AddSpotColor{PANTONE} {PANTONE672PC} {PANTONE\SpotSpace 672\SpotSpace PC} {0.03 0.34 0 0} -\AddSpotColor{PANTONE} {PANTONE673PC} {PANTONE\SpotSpace 673\SpotSpace PC} {0.06 0.49 0 0} -\AddSpotColor{PANTONE} {PANTONE674PC} {PANTONE\SpotSpace 674\SpotSpace PC} {0.09 0.67 0 0} -\AddSpotColor{PANTONE} {PANTONE675PC} {PANTONE\SpotSpace 675\SpotSpace PC} {0.17 1 0 0.03} -\AddSpotColor{PANTONE} {PANTONE676PC} {PANTONE\SpotSpace 676\SpotSpace PC} {0.06 1 0 0.22} -\AddSpotColor{PANTONE} {PANTONE677PC} {PANTONE\SpotSpace 677\SpotSpace PC} {0.02 0.13 0 0} -\AddSpotColor{PANTONE} {PANTONE678PC} {PANTONE\SpotSpace 678\SpotSpace PC} {0.03 0.21 0 0} -\AddSpotColor{PANTONE} {PANTONE679PC} {PANTONE\SpotSpace 679\SpotSpace PC} {0.05 0.27 0 0} -\AddSpotColor{PANTONE} {PANTONE680PC} {PANTONE\SpotSpace 680\SpotSpace PC} {0.1 0.43 0 0.02} -\AddSpotColor{PANTONE} {PANTONE681PC} {PANTONE\SpotSpace 681\SpotSpace PC} {0.21 0.61 0 0.04} -\AddSpotColor{PANTONE} {PANTONE682PC} {PANTONE\SpotSpace 682\SpotSpace PC} {0.25 0.79 0 0.12} -\AddSpotColor{PANTONE} {PANTONE683PC} {PANTONE\SpotSpace 683\SpotSpace PC} {0.11 1 0 0.43} -\AddSpotColor{PANTONE} {PANTONE684PC} {PANTONE\SpotSpace 684\SpotSpace PC} {0 0.17 0 0.02} -\AddSpotColor{PANTONE} {PANTONE685PC} {PANTONE\SpotSpace 685\SpotSpace PC} {0 0.25 0 0.03} -\AddSpotColor{PANTONE} {PANTONE686PC} {PANTONE\SpotSpace 686\SpotSpace PC} {0 0.3 0 0.05} -\AddSpotColor{PANTONE} {PANTONE687PC} {PANTONE\SpotSpace 687\SpotSpace PC} {0.02 0.44 0 0.12} -\AddSpotColor{PANTONE} {PANTONE688PC} {PANTONE\SpotSpace 688\SpotSpace PC} {0.05 0.57 0 0.19} -\AddSpotColor{PANTONE} {PANTONE689PC} {PANTONE\SpotSpace 689\SpotSpace PC} {0.07 0.77 0 0.34} -\AddSpotColor{PANTONE} {PANTONE690PC} {PANTONE\SpotSpace 690\SpotSpace PC} {0 0.97 0 0.59} -\AddSpotColor{PANTONE} {PANTONE691PC} {PANTONE\SpotSpace 691\SpotSpace PC} {0 0.15 0.08 0.01} -\AddSpotColor{PANTONE} {PANTONE692PC} {PANTONE\SpotSpace 692\SpotSpace PC} {0 0.23 0.1 0.02} -\AddSpotColor{PANTONE} {PANTONE693PC} {PANTONE\SpotSpace 693\SpotSpace PC} {0 0.3 0.12 0.06} -\AddSpotColor{PANTONE} {PANTONE694PC} {PANTONE\SpotSpace 694\SpotSpace PC} {0 0.36 0.21 0.1} -\AddSpotColor{PANTONE} {PANTONE695PC} {PANTONE\SpotSpace 695\SpotSpace PC} {0 0.5 0.28 0.2} -\AddSpotColor{PANTONE} {PANTONE696PC} {PANTONE\SpotSpace 696\SpotSpace PC} {0 0.6 0.36 0.32} -\AddSpotColor{PANTONE} {PANTONE697PC} {PANTONE\SpotSpace 697\SpotSpace PC} {0 0.68 0.47 0.42} -\AddSpotColor{PANTONE} {PANTONE698PC} {PANTONE\SpotSpace 698\SpotSpace PC} {0 0.16 0.08 0} -\AddSpotColor{PANTONE} {PANTONE699PC} {PANTONE\SpotSpace 699\SpotSpace PC} {0 0.24 0.1 0} -\AddSpotColor{PANTONE} {PANTONE700PC} {PANTONE\SpotSpace 700\SpotSpace PC} {0 0.36 0.14 0} -\AddSpotColor{PANTONE} {PANTONE701PC} {PANTONE\SpotSpace 701\SpotSpace PC} {0 0.45 0.2 0} -\AddSpotColor{PANTONE} {PANTONE702PC} {PANTONE\SpotSpace 702\SpotSpace PC} {0 0.69 0.34 0.05} -\AddSpotColor{PANTONE} {PANTONE703PC} {PANTONE\SpotSpace 703\SpotSpace PC} {0 0.83 0.54 0.16} -\AddSpotColor{PANTONE} {PANTONE704PC} {PANTONE\SpotSpace 704\SpotSpace PC} {0 0.9 0.72 0.29} -\AddSpotColor{PANTONE} {PANTONE705PC} {PANTONE\SpotSpace 705\SpotSpace PC} {0 0.09 0.06 0} -\AddSpotColor{PANTONE} {PANTONE706PC} {PANTONE\SpotSpace 706\SpotSpace PC} {0 0.17 0.1 0} -\AddSpotColor{PANTONE} {PANTONE707PC} {PANTONE\SpotSpace 707\SpotSpace PC} {0 0.3 0.14 0} -\AddSpotColor{PANTONE} {PANTONE708PC} {PANTONE\SpotSpace 708\SpotSpace PC} {0 0.46 0.22 0} -\AddSpotColor{PANTONE} {PANTONE709PC} {PANTONE\SpotSpace 709\SpotSpace PC} {0 0.66 0.38 0} -\AddSpotColor{PANTONE} {PANTONE710PC} {PANTONE\SpotSpace 710\SpotSpace PC} {0 0.79 0.58 0} -\AddSpotColor{PANTONE} {PANTONE711PC} {PANTONE\SpotSpace 711\SpotSpace PC} {0 1 0.8 0.02} -\AddSpotColor{PANTONE} {PANTONE712PC} {PANTONE\SpotSpace 712\SpotSpace PC} {0 0.14 0.31 0} -\AddSpotColor{PANTONE} {PANTONE713PC} {PANTONE\SpotSpace 713\SpotSpace PC} {0 0.19 0.41 0} -\AddSpotColor{PANTONE} {PANTONE714PC} {PANTONE\SpotSpace 714\SpotSpace PC} {0 0.27 0.55 0} -\AddSpotColor{PANTONE} {PANTONE715PC} {PANTONE\SpotSpace 715\SpotSpace PC} {0 0.36 0.71 0} -\AddSpotColor{PANTONE} {PANTONE716PC} {PANTONE\SpotSpace 716\SpotSpace PC} {0 0.45 0.91 0} -\AddSpotColor{PANTONE} {PANTONE717PC} {PANTONE\SpotSpace 717\SpotSpace PC} {0 0.53 1 0.02} -\AddSpotColor{PANTONE} {PANTONE718PC} {PANTONE\SpotSpace 718\SpotSpace PC} {0 0.56 1 0.08} -\AddSpotColor{PANTONE} {PANTONE719PC} {PANTONE\SpotSpace 719\SpotSpace PC} {0 0.1 0.25 0} -\AddSpotColor{PANTONE} {PANTONE720PC} {PANTONE\SpotSpace 720\SpotSpace PC} {0 0.15 0.36 0.01} -\AddSpotColor{PANTONE} {PANTONE721PC} {PANTONE\SpotSpace 721\SpotSpace PC} {0 0.24 0.52 0.03} -\AddSpotColor{PANTONE} {PANTONE722PC} {PANTONE\SpotSpace 722\SpotSpace PC} {0 0.36 0.76 0.09} -\AddSpotColor{PANTONE} {PANTONE723PC} {PANTONE\SpotSpace 723\SpotSpace PC} {0 0.43 0.97 0.17} -\AddSpotColor{PANTONE} {PANTONE724PC} {PANTONE\SpotSpace 724\SpotSpace PC} {0 0.51 1 0.36} -\AddSpotColor{PANTONE} {PANTONE725PC} {PANTONE\SpotSpace 725\SpotSpace PC} {0 0.53 1 0.48} -\AddSpotColor{PANTONE} {PANTONE726PC} {PANTONE\SpotSpace 726\SpotSpace PC} {0 0.08 0.23 0.02} -\AddSpotColor{PANTONE} {PANTONE727PC} {PANTONE\SpotSpace 727\SpotSpace PC} {0 0.15 0.34 0.05} -\AddSpotColor{PANTONE} {PANTONE728PC} {PANTONE\SpotSpace 728\SpotSpace PC} {0 0.21 0.48 0.1} -\AddSpotColor{PANTONE} {PANTONE729PC} {PANTONE\SpotSpace 729\SpotSpace PC} {0 0.31 0.62 0.18} -\AddSpotColor{PANTONE} {PANTONE730PC} {PANTONE\SpotSpace 730\SpotSpace PC} {0 0.38 0.78 0.29} -\AddSpotColor{PANTONE} {PANTONE731PC} {PANTONE\SpotSpace 731\SpotSpace PC} {0 0.52 1 0.54} -\AddSpotColor{PANTONE} {PANTONE732PC} {PANTONE\SpotSpace 732\SpotSpace PC} {0 0.55 1 0.64} -\AddSpotColor{PANTONE} {PANTONE1205PC} {PANTONE\SpotSpace 1205\SpotSpace PC} {0 0.05 0.31 0} -\AddSpotColor{PANTONE} {PANTONE1215PC} {PANTONE\SpotSpace 1215\SpotSpace PC} {0 0.09 0.45 0} -\AddSpotColor{PANTONE} {PANTONE1225PC} {PANTONE\SpotSpace 1225\SpotSpace PC} {0 0.17 0.62 0} -\AddSpotColor{PANTONE} {PANTONE1235PC} {PANTONE\SpotSpace 1235\SpotSpace PC} {0 0.29 0.91 0} -\AddSpotColor{PANTONE} {PANTONE1245PC} {PANTONE\SpotSpace 1245\SpotSpace PC} {0 0.28 1 0.18} -\AddSpotColor{PANTONE} {PANTONE1255PC} {PANTONE\SpotSpace 1255\SpotSpace PC} {0 0.27 1 0.34} -\AddSpotColor{PANTONE} {PANTONE1265PC} {PANTONE\SpotSpace 1265\SpotSpace PC} {0 0.27 1 0.51} -\AddSpotColor{PANTONE} {PANTONE1345PC} {PANTONE\SpotSpace 1345\SpotSpace PC} {0 0.14 0.47 0} -\AddSpotColor{PANTONE} {PANTONE1355PC} {PANTONE\SpotSpace 1355\SpotSpace PC} {0 0.2 0.56 0} -\AddSpotColor{PANTONE} {PANTONE1365PC} {PANTONE\SpotSpace 1365\SpotSpace PC} {0 0.29 0.72 0} -\AddSpotColor{PANTONE} {PANTONE1375PC} {PANTONE\SpotSpace 1375\SpotSpace PC} {0 0.4 0.9 0} -\AddSpotColor{PANTONE} {PANTONE1385PC} {PANTONE\SpotSpace 1385\SpotSpace PC} {0 0.44 1 0.07} -\AddSpotColor{PANTONE} {PANTONE1395PC} {PANTONE\SpotSpace 1395\SpotSpace PC} {0 0.41 1 0.37} -\AddSpotColor{PANTONE} {PANTONE1405PC} {PANTONE\SpotSpace 1405\SpotSpace PC} {0 0.36 1 0.63} -\AddSpotColor{PANTONE} {PANTONE1485PC} {PANTONE\SpotSpace 1485\SpotSpace PC} {0 0.27 0.54 0} -\AddSpotColor{PANTONE} {PANTONE1495PC} {PANTONE\SpotSpace 1495\SpotSpace PC} {0 0.33 0.67 0} -\AddSpotColor{PANTONE} {PANTONE1505PC} {PANTONE\SpotSpace 1505\SpotSpace PC} {0 0.42 0.77 0} -\AddSpotColor{PANTONE} {PANTONE1525PC} {PANTONE\SpotSpace 1525\SpotSpace PC} {0 0.58 1 0.1} -\AddSpotColor{PANTONE} {PANTONE1535PC} {PANTONE\SpotSpace 1535\SpotSpace PC} {0 0.53 1 0.38} -\AddSpotColor{PANTONE} {PANTONE1545PC} {PANTONE\SpotSpace 1545\SpotSpace PC} {0 0.53 1 0.72} -\AddSpotColor{PANTONE} {PANTONE1555PC} {PANTONE\SpotSpace 1555\SpotSpace PC} {0 0.22 0.34 0} -\AddSpotColor{PANTONE} {PANTONE1565PC} {PANTONE\SpotSpace 1565\SpotSpace PC} {0 0.34 0.49 0} -\AddSpotColor{PANTONE} {PANTONE1575PC} {PANTONE\SpotSpace 1575\SpotSpace PC} {0 0.45 0.72 0} -\AddSpotColor{PANTONE} {PANTONE1585PC} {PANTONE\SpotSpace 1585\SpotSpace PC} {0 0.56 0.9 0} -\AddSpotColor{PANTONE} {PANTONE1595PC} {PANTONE\SpotSpace 1595\SpotSpace PC} {0 0.59 1 0.05} -\AddSpotColor{PANTONE} {PANTONE1605PC} {PANTONE\SpotSpace 1605\SpotSpace PC} {0 0.56 1 0.3} -\AddSpotColor{PANTONE} {PANTONE1615PC} {PANTONE\SpotSpace 1615\SpotSpace PC} {0 0.56 1 0.43} -\AddSpotColor{PANTONE} {PANTONE1625PC} {PANTONE\SpotSpace 1625\SpotSpace PC} {0 0.31 0.37 0} -\AddSpotColor{PANTONE} {PANTONE1635PC} {PANTONE\SpotSpace 1635\SpotSpace PC} {0 0.39 0.48 0} -\AddSpotColor{PANTONE} {PANTONE1645PC} {PANTONE\SpotSpace 1645\SpotSpace PC} {0 0.49 0.66 0} -\AddSpotColor{PANTONE} {PANTONE1655PC} {PANTONE\SpotSpace 1655\SpotSpace PC} {0 0.63 0.91 0} -\AddSpotColor{PANTONE} {PANTONE1665PC} {PANTONE\SpotSpace 1665\SpotSpace PC} {0 0.68 1 0} -\AddSpotColor{PANTONE} {PANTONE1675PC} {PANTONE\SpotSpace 1675\SpotSpace PC} {0 0.67 1 0.28} -\AddSpotColor{PANTONE} {PANTONE1685PC} {PANTONE\SpotSpace 1685\SpotSpace PC} {0 0.68 1 0.44} -\AddSpotColor{PANTONE} {PANTONE1765PC} {PANTONE\SpotSpace 1765\SpotSpace PC} {0 0.38 0.21 0} -\AddSpotColor{PANTONE} {PANTONE1767PC} {PANTONE\SpotSpace 1767\SpotSpace PC} {0 0.27 0.12 0} -\AddSpotColor{PANTONE} {PANTONE1775PC} {PANTONE\SpotSpace 1775\SpotSpace PC} {0 0.47 0.29 0} -\AddSpotColor{PANTONE} {PANTONE1777PC} {PANTONE\SpotSpace 1777\SpotSpace PC} {0 0.58 0.36 0} -\AddSpotColor{PANTONE} {PANTONE1785PC} {PANTONE\SpotSpace 1785\SpotSpace PC} {0 0.67 0.5 0} -\AddSpotColor{PANTONE} {PANTONE1787PC} {PANTONE\SpotSpace 1787\SpotSpace PC} {0 0.76 0.6 0} -\AddSpotColor{PANTONE} {PANTONE1788PC} {PANTONE\SpotSpace 1788\SpotSpace PC} {0 0.84 0.88 0} -\AddSpotColor{PANTONE} {PANTONE1795PC} {PANTONE\SpotSpace 1795\SpotSpace PC} {0 0.94 1 0} -\AddSpotColor{PANTONE} {PANTONE1797PC} {PANTONE\SpotSpace 1797\SpotSpace PC} {0 1 0.99 0.04} -\AddSpotColor{PANTONE} {PANTONE1805PC} {PANTONE\SpotSpace 1805\SpotSpace PC} {0 0.91 1 0.23} -\AddSpotColor{PANTONE} {PANTONE1807PC} {PANTONE\SpotSpace 1807\SpotSpace PC} {0 1 0.96 0.28} -\AddSpotColor{PANTONE} {PANTONE1815PC} {PANTONE\SpotSpace 1815\SpotSpace PC} {0 0.9 1 0.51} -\AddSpotColor{PANTONE} {PANTONE1817PC} {PANTONE\SpotSpace 1817\SpotSpace PC} {0 0.9 1 0.66} -\AddSpotColor{PANTONE} {PANTONE1895PC} {PANTONE\SpotSpace 1895\SpotSpace PC} {0 0.28 0.07 0} -\AddSpotColor{PANTONE} {PANTONE1905PC} {PANTONE\SpotSpace 1905\SpotSpace PC} {0 0.41 0.09 0} -\AddSpotColor{PANTONE} {PANTONE1915PC} {PANTONE\SpotSpace 1915\SpotSpace PC} {0 0.71 0.2 0} -\AddSpotColor{PANTONE} {PANTONE1925PC} {PANTONE\SpotSpace 1925\SpotSpace PC} {0 1 0.55 0} -\AddSpotColor{PANTONE} {PANTONE1935PC} {PANTONE\SpotSpace 1935\SpotSpace PC} {0 1 0.57 0.05} -\AddSpotColor{PANTONE} {PANTONE1945PC} {PANTONE\SpotSpace 1945\SpotSpace PC} {0 1 0.56 0.19} -\AddSpotColor{PANTONE} {PANTONE1955PC} {PANTONE\SpotSpace 1955\SpotSpace PC} {0 1 0.6 0.37} -\AddSpotColor{PANTONE} {PANTONE2365PC} {PANTONE\SpotSpace 2365\SpotSpace PC} {0.02 0.27 0 0} -\AddSpotColor{PANTONE} {PANTONE2375PC} {PANTONE\SpotSpace 2375\SpotSpace PC} {0.1 0.57 0 0} -\AddSpotColor{PANTONE} {PANTONE2385PC} {PANTONE\SpotSpace 2385\SpotSpace PC} {0.19 0.79 0 0} -\AddSpotColor{PANTONE} {PANTONE2395PC} {PANTONE\SpotSpace 2395\SpotSpace PC} {0.27 0.95 0 0} -\AddSpotColor{PANTONE} {PANTONE2405PC} {PANTONE\SpotSpace 2405\SpotSpace PC} {0.34 1 0 0} -\AddSpotColor{PANTONE} {PANTONE2415PC} {PANTONE\SpotSpace 2415\SpotSpace PC} {0.33 1 0 0.08} -\AddSpotColor{PANTONE} {PANTONE2425PC} {PANTONE\SpotSpace 2425\SpotSpace PC} {0.37 1 0 0.26} -\AddSpotColor{PANTONE} {PANTONE2562PC} {PANTONE\SpotSpace 2562\SpotSpace PC} {0.19 0.35 0 0} -\AddSpotColor{PANTONE} {PANTONE2563PC} {PANTONE\SpotSpace 2563\SpotSpace PC} {0.22 0.33 0 0} -\AddSpotColor{PANTONE} {PANTONE2567PC} {PANTONE\SpotSpace 2567\SpotSpace PC} {0.29 0.36 0 0} -\AddSpotColor{PANTONE} {PANTONE2572PC} {PANTONE\SpotSpace 2572\SpotSpace PC} {0.3 0.47 0 0} -\AddSpotColor{PANTONE} {PANTONE2573PC} {PANTONE\SpotSpace 2573\SpotSpace PC} {0.3 0.43 0 0} -\AddSpotColor{PANTONE} {PANTONE2577PC} {PANTONE\SpotSpace 2577\SpotSpace PC} {0.4 0.45 0 0} -\AddSpotColor{PANTONE} {PANTONE2582PC} {PANTONE\SpotSpace 2582\SpotSpace PC} {0.46 0.72 0 0} -\AddSpotColor{PANTONE} {PANTONE2583PC} {PANTONE\SpotSpace 2583\SpotSpace PC} {0.46 0.63 0 0} -\AddSpotColor{PANTONE} {PANTONE2587PC} {PANTONE\SpotSpace 2587\SpotSpace PC} {0.59 0.66 0 0} -\AddSpotColor{PANTONE} {PANTONE2592PC} {PANTONE\SpotSpace 2592\SpotSpace PC} {0.6 0.9 0 0} -\AddSpotColor{PANTONE} {PANTONE2593PC} {PANTONE\SpotSpace 2593\SpotSpace PC} {0.61 0.89 0 0} -\AddSpotColor{PANTONE} {PANTONE2597PC} {PANTONE\SpotSpace 2597\SpotSpace PC} {0.85 1 0 0} -\AddSpotColor{PANTONE} {PANTONE2602PC} {PANTONE\SpotSpace 2602\SpotSpace PC} {0.63 1 0 0.03} -\AddSpotColor{PANTONE} {PANTONE2603PC} {PANTONE\SpotSpace 2603\SpotSpace PC} {0.69 1 0 0.02} -\AddSpotColor{PANTONE} {PANTONE2607PC} {PANTONE\SpotSpace 2607\SpotSpace PC} {0.81 1 0 0.07} -\AddSpotColor{PANTONE} {PANTONE2612PC} {PANTONE\SpotSpace 2612\SpotSpace PC} {0.64 1 0 0.14} -\AddSpotColor{PANTONE} {PANTONE2613PC} {PANTONE\SpotSpace 2613\SpotSpace PC} {0.63 1 0 0.15} -\AddSpotColor{PANTONE} {PANTONE2617PC} {PANTONE\SpotSpace 2617\SpotSpace PC} {0.79 1 0 0.15} -\AddSpotColor{PANTONE} {PANTONE2622PC} {PANTONE\SpotSpace 2622\SpotSpace PC} {0.57 0.98 0 0.46} -\AddSpotColor{PANTONE} {PANTONE2623PC} {PANTONE\SpotSpace 2623\SpotSpace PC} {0.59 1 0 0.32} -\AddSpotColor{PANTONE} {PANTONE2627PC} {PANTONE\SpotSpace 2627\SpotSpace PC} {0.77 1 0 0.31} -\AddSpotColor{PANTONE} {PANTONE2635PC} {PANTONE\SpotSpace 2635\SpotSpace PC} {0.28 0.27 0 0} -\AddSpotColor{PANTONE} {PANTONE2645PC} {PANTONE\SpotSpace 2645\SpotSpace PC} {0.4 0.36 0 0} -\AddSpotColor{PANTONE} {PANTONE2655PC} {PANTONE\SpotSpace 2655\SpotSpace PC} {0.54 0.49 0 0} -\AddSpotColor{PANTONE} {PANTONE2665PC} {PANTONE\SpotSpace 2665\SpotSpace PC} {0.62 0.6 0 0} -\AddSpotColor{PANTONE} {PANTONE2685PC} {PANTONE\SpotSpace 2685\SpotSpace PC} {0.96 1 0 0.1} -\AddSpotColor{PANTONE} {PANTONE2695PC} {PANTONE\SpotSpace 2695\SpotSpace PC} {0.91 1 0 0.49} -\AddSpotColor{PANTONE} {PANTONE2705PC} {PANTONE\SpotSpace 2705\SpotSpace PC} {0.4 0.3 0 0} -\AddSpotColor{PANTONE} {PANTONE2706PC} {PANTONE\SpotSpace 2706\SpotSpace PC} {0.19 0.09 0 0} -\AddSpotColor{PANTONE} {PANTONE2707PC} {PANTONE\SpotSpace 2707\SpotSpace PC} {0.17 0.06 0 0} -\AddSpotColor{PANTONE} {PANTONE2708PC} {PANTONE\SpotSpace 2708\SpotSpace PC} {0.26 0.1 0 0} -\AddSpotColor{PANTONE} {PANTONE2715PC} {PANTONE\SpotSpace 2715\SpotSpace PC} {0.57 0.45 0 0} -\AddSpotColor{PANTONE} {PANTONE2716PC} {PANTONE\SpotSpace 2716\SpotSpace PC} {0.45 0.29 0 0} -\AddSpotColor{PANTONE} {PANTONE2717PC} {PANTONE\SpotSpace 2717\SpotSpace PC} {0.29 0.12 0 0} -\AddSpotColor{PANTONE} {PANTONE2718PC} {PANTONE\SpotSpace 2718\SpotSpace PC} {0.67 0.41 0 0} -\AddSpotColor{PANTONE} {PANTONE2725PC} {PANTONE\SpotSpace 2725\SpotSpace PC} {0.77 0.68 0 0} -\AddSpotColor{PANTONE} {PANTONE2726PC} {PANTONE\SpotSpace 2726\SpotSpace PC} {0.79 0.66 0 0} -\AddSpotColor{PANTONE} {PANTONE2727PC} {PANTONE\SpotSpace 2727\SpotSpace PC} {0.71 0.42 0 0} -\AddSpotColor{PANTONE} {PANTONE2728PC} {PANTONE\SpotSpace 2728\SpotSpace PC} {0.96 0.69 0 0} -\AddSpotColor{PANTONE} {PANTONE2735PC} {PANTONE\SpotSpace 2735\SpotSpace PC} {1 0.95 0 0.03} -\AddSpotColor{PANTONE} {PANTONE2736PC} {PANTONE\SpotSpace 2736\SpotSpace PC} {1 0.91 0 0} -\AddSpotColor{PANTONE} {PANTONE2738PC} {PANTONE\SpotSpace 2738\SpotSpace PC} {1 0.87 0 0.02} -\AddSpotColor{PANTONE} {PANTONE2745PC} {PANTONE\SpotSpace 2745\SpotSpace PC} {1 0.95 0 0.15} -\AddSpotColor{PANTONE} {PANTONE2746PC} {PANTONE\SpotSpace 2746\SpotSpace PC} {1 0.92 0 0.1} -\AddSpotColor{PANTONE} {PANTONE2747PC} {PANTONE\SpotSpace 2747\SpotSpace PC} {1 0.85 0 0.13} -\AddSpotColor{PANTONE} {PANTONE2748PC} {PANTONE\SpotSpace 2748\SpotSpace PC} {1 0.88 0 0.14} -\AddSpotColor{PANTONE} {PANTONE2755PC} {PANTONE\SpotSpace 2755\SpotSpace PC} {1 0.97 0 0.3} -\AddSpotColor{PANTONE} {PANTONE2756PC} {PANTONE\SpotSpace 2756\SpotSpace PC} {1 0.94 0 0.29} -\AddSpotColor{PANTONE} {PANTONE2757PC} {PANTONE\SpotSpace 2757\SpotSpace PC} {1 0.82 0 0.3} -\AddSpotColor{PANTONE} {PANTONE2758PC} {PANTONE\SpotSpace 2758\SpotSpace PC} {1 0.8 0 0.26} -\AddSpotColor{PANTONE} {PANTONE2765PC} {PANTONE\SpotSpace 2765\SpotSpace PC} {1 0.97 0 0.45} -\AddSpotColor{PANTONE} {PANTONE2766PC} {PANTONE\SpotSpace 2766\SpotSpace PC} {1 0.94 0 0.47} -\AddSpotColor{PANTONE} {PANTONE2767PC} {PANTONE\SpotSpace 2767\SpotSpace PC} {1 0.78 0 0.54} -\AddSpotColor{PANTONE} {PANTONE2768PC} {PANTONE\SpotSpace 2768\SpotSpace PC} {1 0.78 0 0.44} -\AddSpotColor{PANTONE} {PANTONE2905PC} {PANTONE\SpotSpace 2905\SpotSpace PC} {0.41 0.02 0 0} -\AddSpotColor{PANTONE} {PANTONE2915PC} {PANTONE\SpotSpace 2915\SpotSpace PC} {0.59 0.07 0 0} -\AddSpotColor{PANTONE} {PANTONE2925PC} {PANTONE\SpotSpace 2925\SpotSpace PC} {0.85 0.24 0 0} -\AddSpotColor{PANTONE} {PANTONE2935PC} {PANTONE\SpotSpace 2935\SpotSpace PC} {1 0.46 0 0} -\AddSpotColor{PANTONE} {PANTONE2945PC} {PANTONE\SpotSpace 2945\SpotSpace PC} {1 0.45 0 0.14} -\AddSpotColor{PANTONE} {PANTONE2955PC} {PANTONE\SpotSpace 2955\SpotSpace PC} {1 0.45 0 0.37} -\AddSpotColor{PANTONE} {PANTONE2965PC} {PANTONE\SpotSpace 2965\SpotSpace PC} {1 0.38 0 0.64} -\AddSpotColor{PANTONE} {PANTONE2975PC} {PANTONE\SpotSpace 2975\SpotSpace PC} {0.3 0 0.05 0} -\AddSpotColor{PANTONE} {PANTONE2985PC} {PANTONE\SpotSpace 2985\SpotSpace PC} {0.59 0 0.06 0} -\AddSpotColor{PANTONE} {PANTONE2995PC} {PANTONE\SpotSpace 2995\SpotSpace PC} {0.9 0.11 0 0} -\AddSpotColor{PANTONE} {PANTONE3005PC} {PANTONE\SpotSpace 3005\SpotSpace PC} {1 0.34 0 0.02} -\AddSpotColor{PANTONE} {PANTONE3015PC} {PANTONE\SpotSpace 3015\SpotSpace PC} {1 0.3 0 0.2} -\AddSpotColor{PANTONE} {PANTONE3025PC} {PANTONE\SpotSpace 3025\SpotSpace PC} {1 0.17 0 0.51} -\AddSpotColor{PANTONE} {PANTONE3035PC} {PANTONE\SpotSpace 3035\SpotSpace PC} {1 0 0.05 0.72} -\AddSpotColor{PANTONE} {PANTONE3105PC} {PANTONE\SpotSpace 3105\SpotSpace PC} {0.43 0 0.12 0} -\AddSpotColor{PANTONE} {PANTONE3115PC} {PANTONE\SpotSpace 3115\SpotSpace PC} {0.63 0 0.18 0} -\AddSpotColor{PANTONE} {PANTONE3125PC} {PANTONE\SpotSpace 3125\SpotSpace PC} {0.83 0 0.21 0} -\AddSpotColor{PANTONE} {PANTONE3135PC} {PANTONE\SpotSpace 3135\SpotSpace PC} {1 0 0.16 0.09} -\AddSpotColor{PANTONE} {PANTONE3145PC} {PANTONE\SpotSpace 3145\SpotSpace PC} {1 0 0.19 0.23} -\AddSpotColor{PANTONE} {PANTONE3155PC} {PANTONE\SpotSpace 3155\SpotSpace PC} {1 0 0.24 0.38} -\AddSpotColor{PANTONE} {PANTONE3165PC} {PANTONE\SpotSpace 3165\SpotSpace PC} {1 0 0.28 0.65} -\AddSpotColor{PANTONE} {PANTONE3242PC} {PANTONE\SpotSpace 3242\SpotSpace PC} {0.37 0 0.18 0} -\AddSpotColor{PANTONE} {PANTONE3245PC} {PANTONE\SpotSpace 3245\SpotSpace PC} {0.34 0 0.19 0} -\AddSpotColor{PANTONE} {PANTONE3248PC} {PANTONE\SpotSpace 3248\SpotSpace PC} {0.43 0 0.24 0} -\AddSpotColor{PANTONE} {PANTONE3252PC} {PANTONE\SpotSpace 3252\SpotSpace PC} {0.47 0 0.24 0} -\AddSpotColor{PANTONE} {PANTONE3255PC} {PANTONE\SpotSpace 3255\SpotSpace PC} {0.49 0 0.28 0} -\AddSpotColor{PANTONE} {PANTONE3258PC} {PANTONE\SpotSpace 3258\SpotSpace PC} {0.59 0 0.33 0} -\AddSpotColor{PANTONE} {PANTONE3262PC} {PANTONE\SpotSpace 3262\SpotSpace PC} {0.71 0 0.33 0} -\AddSpotColor{PANTONE} {PANTONE3265PC} {PANTONE\SpotSpace 3265\SpotSpace PC} {0.69 0 0.37 0} -\AddSpotColor{PANTONE} {PANTONE3268PC} {PANTONE\SpotSpace 3268\SpotSpace PC} {0.9 0 0.49 0} -\AddSpotColor{PANTONE} {PANTONE3272PC} {PANTONE\SpotSpace 3272\SpotSpace PC} {1 0 0.44 0} -\AddSpotColor{PANTONE} {PANTONE3275PC} {PANTONE\SpotSpace 3275\SpotSpace PC} {0.95 0 0.47 0} -\AddSpotColor{PANTONE} {PANTONE3278PC} {PANTONE\SpotSpace 3278\SpotSpace PC} {1 0 0.55 0.05} -\AddSpotColor{PANTONE} {PANTONE3282PC} {PANTONE\SpotSpace 3282\SpotSpace PC} {1 0 0.46 0.15} -\AddSpotColor{PANTONE} {PANTONE3285PC} {PANTONE\SpotSpace 3285\SpotSpace PC} {1 0 0.5 0.07} -\AddSpotColor{PANTONE} {PANTONE3288PC} {PANTONE\SpotSpace 3288\SpotSpace PC} {1 0 0.54 0.2} -\AddSpotColor{PANTONE} {PANTONE3292PC} {PANTONE\SpotSpace 3292\SpotSpace PC} {1 0 0.49 0.46} -\AddSpotColor{PANTONE} {PANTONE3295PC} {PANTONE\SpotSpace 3295\SpotSpace PC} {1 0 0.53 0.21} -\AddSpotColor{PANTONE} {PANTONE3298PC} {PANTONE\SpotSpace 3298\SpotSpace PC} {1 0 0.57 0.42} -\AddSpotColor{PANTONE} {PANTONE3302PC} {PANTONE\SpotSpace 3302\SpotSpace PC} {1 0 0.54 0.69} -\AddSpotColor{PANTONE} {PANTONE3305PC} {PANTONE\SpotSpace 3305\SpotSpace PC} {1 0 0.61 0.61} -\AddSpotColor{PANTONE} {PANTONE3308PC} {PANTONE\SpotSpace 3308\SpotSpace PC} {1 0 0.6 0.72} -\AddSpotColor{PANTONE} {PANTONE3375PC} {PANTONE\SpotSpace 3375\SpotSpace PC} {0.35 0 0.25 0} -\AddSpotColor{PANTONE} {PANTONE3385PC} {PANTONE\SpotSpace 3385\SpotSpace PC} {0.45 0 0.33 0} -\AddSpotColor{PANTONE} {PANTONE3395PC} {PANTONE\SpotSpace 3395\SpotSpace PC} {0.61 0 0.45 0} -\AddSpotColor{PANTONE} {PANTONE3405PC} {PANTONE\SpotSpace 3405\SpotSpace PC} {0.85 0 0.65 0} -\AddSpotColor{PANTONE} {PANTONE3415PC} {PANTONE\SpotSpace 3415\SpotSpace PC} {1 0 0.77 0.22} -\AddSpotColor{PANTONE} {PANTONE3425PC} {PANTONE\SpotSpace 3425\SpotSpace PC} {1 0 0.78 0.42} -\AddSpotColor{PANTONE} {PANTONE3435PC} {PANTONE\SpotSpace 3435\SpotSpace PC} {1 0 0.81 0.66} -\AddSpotColor{PANTONE} {PANTONE3935PC} {PANTONE\SpotSpace 3935\SpotSpace PC} {0.01 0 0.68 0} -\AddSpotColor{PANTONE} {PANTONE3945PC} {PANTONE\SpotSpace 3945\SpotSpace PC} {0.03 0 0.85 0} -\AddSpotColor{PANTONE} {PANTONE3955PC} {PANTONE\SpotSpace 3955\SpotSpace PC} {0.06 0 1 0} -\AddSpotColor{PANTONE} {PANTONE3965PC} {PANTONE\SpotSpace 3965\SpotSpace PC} {0.08 0 1 0} -\AddSpotColor{PANTONE} {PANTONE3975PC} {PANTONE\SpotSpace 3975\SpotSpace PC} {0 0 1 0.29} -\AddSpotColor{PANTONE} {PANTONE3985PC} {PANTONE\SpotSpace 3985\SpotSpace PC} {0 0.03 1 0.41} -\AddSpotColor{PANTONE} {PANTONE3995PC} {PANTONE\SpotSpace 3995\SpotSpace PC} {0 0.03 1 0.64} -\AddSpotColor{PANTONE} {PANTONE4485PC} {PANTONE\SpotSpace 4485\SpotSpace PC} {0 0.26 1 0.69} -\AddSpotColor{PANTONE} {PANTONE4495PC} {PANTONE\SpotSpace 4495\SpotSpace PC} {0 0.2 0.95 0.46} -\AddSpotColor{PANTONE} {PANTONE4505PC} {PANTONE\SpotSpace 4505\SpotSpace PC} {0 0.15 0.78 0.36} -\AddSpotColor{PANTONE} {PANTONE4515PC} {PANTONE\SpotSpace 4515\SpotSpace PC} {0 0.09 0.5 0.24} -\AddSpotColor{PANTONE} {PANTONE4525PC} {PANTONE\SpotSpace 4525\SpotSpace PC} {0 0.07 0.39 0.17} -\AddSpotColor{PANTONE} {PANTONE4535PC} {PANTONE\SpotSpace 4535\SpotSpace PC} {0 0.04 0.3 0.11} -\AddSpotColor{PANTONE} {PANTONE4545PC} {PANTONE\SpotSpace 4545\SpotSpace PC} {0 0.03 0.19 0.06} -\AddSpotColor{PANTONE} {PANTONE4625PC} {PANTONE\SpotSpace 4625\SpotSpace PC} {0 0.6 1 0.79} -\AddSpotColor{PANTONE} {PANTONE4635PC} {PANTONE\SpotSpace 4635\SpotSpace PC} {0 0.48 0.96 0.44} -\AddSpotColor{PANTONE} {PANTONE4645PC} {PANTONE\SpotSpace 4645\SpotSpace PC} {0 0.37 0.68 0.28} -\AddSpotColor{PANTONE} {PANTONE4655PC} {PANTONE\SpotSpace 4655\SpotSpace PC} {0 0.26 0.45 0.18} -\AddSpotColor{PANTONE} {PANTONE4665PC} {PANTONE\SpotSpace 4665\SpotSpace PC} {0 0.18 0.32 0.1} -\AddSpotColor{PANTONE} {PANTONE4675PC} {PANTONE\SpotSpace 4675\SpotSpace PC} {0 0.11 0.21 0.06} -\AddSpotColor{PANTONE} {PANTONE4685PC} {PANTONE\SpotSpace 4685\SpotSpace PC} {0 0.07 0.14 0.04} -\AddSpotColor{PANTONE} {PANTONE4695PC} {PANTONE\SpotSpace 4695\SpotSpace PC} {0 0.81 1 0.77} -\AddSpotColor{PANTONE} {PANTONE4705PC} {PANTONE\SpotSpace 4705\SpotSpace PC} {0 0.62 0.71 0.49} -\AddSpotColor{PANTONE} {PANTONE4715PC} {PANTONE\SpotSpace 4715\SpotSpace PC} {0 0.42 0.45 0.34} -\AddSpotColor{PANTONE} {PANTONE4725PC} {PANTONE\SpotSpace 4725\SpotSpace PC} {0 0.32 0.35 0.25} -\AddSpotColor{PANTONE} {PANTONE4735PC} {PANTONE\SpotSpace 4735\SpotSpace PC} {0 0.22 0.23 0.15} -\AddSpotColor{PANTONE} {PANTONE4745PC} {PANTONE\SpotSpace 4745\SpotSpace PC} {0 0.17 0.18 0.1} -\AddSpotColor{PANTONE} {PANTONE4755PC} {PANTONE\SpotSpace 4755\SpotSpace PC} {0 0.1 0.12 0.06} -\AddSpotColor{PANTONE} {PANTONE4975PC} {PANTONE\SpotSpace 4975\SpotSpace PC} {0 0.73 1 0.8} -\AddSpotColor{PANTONE} {PANTONE4985PC} {PANTONE\SpotSpace 4985\SpotSpace PC} {0 0.59 0.48 0.48} -\AddSpotColor{PANTONE} {PANTONE4995PC} {PANTONE\SpotSpace 4995\SpotSpace PC} {0 0.48 0.38 0.34} -\AddSpotColor{PANTONE} {PANTONE5005PC} {PANTONE\SpotSpace 5005\SpotSpace PC} {0 0.38 0.27 0.23} -\AddSpotColor{PANTONE} {PANTONE5015PC} {PANTONE\SpotSpace 5015\SpotSpace PC} {0 0.25 0.15 0.11} -\AddSpotColor{PANTONE} {PANTONE5025PC} {PANTONE\SpotSpace 5025\SpotSpace PC} {0 0.18 0.12 0.07} -\AddSpotColor{PANTONE} {PANTONE5035PC} {PANTONE\SpotSpace 5035\SpotSpace PC} {0 0.1 0.09 0.03} -\AddSpotColor{PANTONE} {PANTONE5115PC} {PANTONE\SpotSpace 5115\SpotSpace PC} {0.75 1 0.7 0.15} -\AddSpotColor{PANTONE} {PANTONE5125PC} {PANTONE\SpotSpace 5125\SpotSpace PC} {0.65 0.86 0.49 0} -\AddSpotColor{PANTONE} {PANTONE5135PC} {PANTONE\SpotSpace 5135\SpotSpace PC} {0.47 0.64 0.28 0} -\AddSpotColor{PANTONE} {PANTONE5145PC} {PANTONE\SpotSpace 5145\SpotSpace PC} {0.3 0.44 0.13 0} -\AddSpotColor{PANTONE} {PANTONE5155PC} {PANTONE\SpotSpace 5155\SpotSpace PC} {0.17 0.29 0.08 0} -\AddSpotColor{PANTONE} {PANTONE5165PC} {PANTONE\SpotSpace 5165\SpotSpace PC} {0.08 0.17 0.05 0} -\AddSpotColor{PANTONE} {PANTONE5175PC} {PANTONE\SpotSpace 5175\SpotSpace PC} {0.05 0.1 0.03 0} -\AddSpotColor{PANTONE} {PANTONE5185PC} {PANTONE\SpotSpace 5185\SpotSpace PC} {0.8 1 0.85 0.25} -\AddSpotColor{PANTONE} {PANTONE5195PC} {PANTONE\SpotSpace 5195\SpotSpace PC} {0.72 0.9 0.75 0.15} -\AddSpotColor{PANTONE} {PANTONE5205PC} {PANTONE\SpotSpace 5205\SpotSpace PC} {0.5 0.58 0.5 0} -\AddSpotColor{PANTONE} {PANTONE5215PC} {PANTONE\SpotSpace 5215\SpotSpace PC} {0.28 0.35 0.24 0} -\AddSpotColor{PANTONE} {PANTONE5225PC} {PANTONE\SpotSpace 5225\SpotSpace PC} {0.17 0.25 0.15 0} -\AddSpotColor{PANTONE} {PANTONE5235PC} {PANTONE\SpotSpace 5235\SpotSpace PC} {0.1 0.15 0.1 0} -\AddSpotColor{PANTONE} {PANTONE5245PC} {PANTONE\SpotSpace 5245\SpotSpace PC} {0.06 0.08 0.07 0} -\AddSpotColor{PANTONE} {PANTONE5255PC} {PANTONE\SpotSpace 5255\SpotSpace PC} {1 0.8 0 0.55} -\AddSpotColor{PANTONE} {PANTONE5265PC} {PANTONE\SpotSpace 5265\SpotSpace PC} {0.77 0.7 0 0.4} -\AddSpotColor{PANTONE} {PANTONE5275PC} {PANTONE\SpotSpace 5275\SpotSpace PC} {0.6 0.47 0 0.3} -\AddSpotColor{PANTONE} {PANTONE5285PC} {PANTONE\SpotSpace 5285\SpotSpace PC} {0.31 0.27 0 0.2} -\AddSpotColor{PANTONE} {PANTONE5295PC} {PANTONE\SpotSpace 5295\SpotSpace PC} {0.2 0.15 0 0.1} -\AddSpotColor{PANTONE} {PANTONE5305PC} {PANTONE\SpotSpace 5305\SpotSpace PC} {0.14 0.1 0 0.06} -\AddSpotColor{PANTONE} {PANTONE5315PC} {PANTONE\SpotSpace 5315\SpotSpace PC} {0.06 0.06 0 0.05} -\AddSpotColor{PANTONE} {PANTONE5395PC} {PANTONE\SpotSpace 5395\SpotSpace PC} {1 0.44 0 0.76} -\AddSpotColor{PANTONE} {PANTONE5405PC} {PANTONE\SpotSpace 5405\SpotSpace PC} {0.58 0.17 0 0.46} -\AddSpotColor{PANTONE} {PANTONE5415PC} {PANTONE\SpotSpace 5415\SpotSpace PC} {0.42 0.08 0 0.4} -\AddSpotColor{PANTONE} {PANTONE5425PC} {PANTONE\SpotSpace 5425\SpotSpace PC} {0.3 0.04 0 0.31} -\AddSpotColor{PANTONE} {PANTONE5435PC} {PANTONE\SpotSpace 5435\SpotSpace PC} {0.13 0.03 0 0.17} -\AddSpotColor{PANTONE} {PANTONE5445PC} {PANTONE\SpotSpace 5445\SpotSpace PC} {0.08 0.01 0 0.13} -\AddSpotColor{PANTONE} {PANTONE5455PC} {PANTONE\SpotSpace 5455\SpotSpace PC} {0.06 0 0 0.09} -\AddSpotColor{PANTONE} {PANTONE5463PC} {PANTONE\SpotSpace 5463\SpotSpace PC} {1 0 0.18 0.83} -\AddSpotColor{PANTONE} {PANTONE5467PC} {PANTONE\SpotSpace 5467\SpotSpace PC} {1 0 0.33 0.94} -\AddSpotColor{PANTONE} {PANTONE5473PC} {PANTONE\SpotSpace 5473\SpotSpace PC} {0.82 0 0.28 0.52} -\AddSpotColor{PANTONE} {PANTONE5477PC} {PANTONE\SpotSpace 5477\SpotSpace PC} {0.55 0 0.27 0.73} -\AddSpotColor{PANTONE} {PANTONE5483PC} {PANTONE\SpotSpace 5483\SpotSpace PC} {0.62 0 0.21 0.31} -\AddSpotColor{PANTONE} {PANTONE5487PC} {PANTONE\SpotSpace 5487\SpotSpace PC} {0.35 0 0.16 0.54} -\AddSpotColor{PANTONE} {PANTONE5493PC} {PANTONE\SpotSpace 5493\SpotSpace PC} {0.43 0 0.14 0.21} -\AddSpotColor{PANTONE} {PANTONE5497PC} {PANTONE\SpotSpace 5497\SpotSpace PC} {0.17 0 0.09 0.63} -\AddSpotColor{PANTONE} {PANTONE5503PC} {PANTONE\SpotSpace 5503\SpotSpace PC} {0.29 0 0.1 0.14} -\AddSpotColor{PANTONE} {PANTONE5507PC} {PANTONE\SpotSpace 5507\SpotSpace PC} {0.1 0 0.06 0.27} -\AddSpotColor{PANTONE} {PANTONE5513PC} {PANTONE\SpotSpace 5513\SpotSpace PC} {0.18 0 0.07 0.05} -\AddSpotColor{PANTONE} {PANTONE5517PC} {PANTONE\SpotSpace 5517\SpotSpace PC} {0.08 0 0.05 0.17} -\AddSpotColor{PANTONE} {PANTONE5523PC} {PANTONE\SpotSpace 5523\SpotSpace PC} {0.11 0 0.05 0.03} -\AddSpotColor{PANTONE} {PANTONE5527PC} {PANTONE\SpotSpace 5527\SpotSpace PC} {0.06 0 0.04 0.11} -\AddSpotColor{PANTONE} {PANTONE5535PC} {PANTONE\SpotSpace 5535\SpotSpace PC} {0.66 0 0.57 0.82} -\AddSpotColor{PANTONE} {PANTONE5545PC} {PANTONE\SpotSpace 5545\SpotSpace PC} {0.59 0 0.5 0.52} -\AddSpotColor{PANTONE} {PANTONE5555PC} {PANTONE\SpotSpace 5555\SpotSpace PC} {0.43 0 0.34 0.38} -\AddSpotColor{PANTONE} {PANTONE5565PC} {PANTONE\SpotSpace 5565\SpotSpace PC} {0.3 0 0.24 0.26} -\AddSpotColor{PANTONE} {PANTONE5575PC} {PANTONE\SpotSpace 5575\SpotSpace PC} {0.2 0 0.16 0.17} -\AddSpotColor{PANTONE} {PANTONE5585PC} {PANTONE\SpotSpace 5585\SpotSpace PC} {0.12 0 0.11 0.1} -\AddSpotColor{PANTONE} {PANTONE5595PC} {PANTONE\SpotSpace 5595\SpotSpace PC} {0.07 0 0.08 0.07} -\AddSpotColor{PANTONE} {PANTONE5605PC} {PANTONE\SpotSpace 5605\SpotSpace PC} {0.65 0 0.56 0.94} -\AddSpotColor{PANTONE} {PANTONE5615PC} {PANTONE\SpotSpace 5615\SpotSpace PC} {0.49 0 0.44 0.64} -\AddSpotColor{PANTONE} {PANTONE5625PC} {PANTONE\SpotSpace 5625\SpotSpace PC} {0.28 0 0.29 0.48} -\AddSpotColor{PANTONE} {PANTONE5635PC} {PANTONE\SpotSpace 5635\SpotSpace PC} {0.13 0 0.18 0.33} -\AddSpotColor{PANTONE} {PANTONE5645PC} {PANTONE\SpotSpace 5645\SpotSpace PC} {0.07 0 0.11 0.23} -\AddSpotColor{PANTONE} {PANTONE5655PC} {PANTONE\SpotSpace 5655\SpotSpace PC} {0.06 0 0.09 0.16} -\AddSpotColor{PANTONE} {PANTONE5665PC} {PANTONE\SpotSpace 5665\SpotSpace PC} {0.05 0 0.07 0.1} -\AddSpotColor{PANTONE} {PANTONE5743PC} {PANTONE\SpotSpace 5743\SpotSpace PC} {0.33 0 0.85 0.82} -\AddSpotColor{PANTONE} {PANTONE5747PC} {PANTONE\SpotSpace 5747\SpotSpace PC} {0.32 0 1 0.79} -\AddSpotColor{PANTONE} {PANTONE5753PC} {PANTONE\SpotSpace 5753\SpotSpace PC} {0.25 0 0.81 0.67} -\AddSpotColor{PANTONE} {PANTONE5757PC} {PANTONE\SpotSpace 5757\SpotSpace PC} {0.27 0 0.95 0.55} -\AddSpotColor{PANTONE} {PANTONE5763PC} {PANTONE\SpotSpace 5763\SpotSpace PC} {0.16 0 0.74 0.57} -\AddSpotColor{PANTONE} {PANTONE5767PC} {PANTONE\SpotSpace 5767\SpotSpace PC} {0.15 0 0.68 0.39} -\AddSpotColor{PANTONE} {PANTONE5773PC} {PANTONE\SpotSpace 5773\SpotSpace PC} {0.09 0 0.43 0.38} -\AddSpotColor{PANTONE} {PANTONE5777PC} {PANTONE\SpotSpace 5777\SpotSpace PC} {0.1 0 0.49 0.28} -\AddSpotColor{PANTONE} {PANTONE5783PC} {PANTONE\SpotSpace 5783\SpotSpace PC} {0.06 0 0.28 0.27} -\AddSpotColor{PANTONE} {PANTONE5787PC} {PANTONE\SpotSpace 5787\SpotSpace PC} {0.07 0 0.31 0.13} -\AddSpotColor{PANTONE} {PANTONE5793PC} {PANTONE\SpotSpace 5793\SpotSpace PC} {0.04 0 0.21 0.18} -\AddSpotColor{PANTONE} {PANTONE5797PC} {PANTONE\SpotSpace 5797\SpotSpace PC} {0.05 0 0.24 0.09} -\AddSpotColor{PANTONE} {PANTONE5803PC} {PANTONE\SpotSpace 5803\SpotSpace PC} {0.02 0 0.12 0.11} -\AddSpotColor{PANTONE} {PANTONE5807PC} {PANTONE\SpotSpace 5807\SpotSpace PC} {0.02 0 0.14 0.03} -\AddSpotColor{PANTONE} {PANTONE5815PC} {PANTONE\SpotSpace 5815\SpotSpace PC} {0 0 0.91 0.79} -\AddSpotColor{PANTONE} {PANTONE5825PC} {PANTONE\SpotSpace 5825\SpotSpace PC} {0 0.02 0.87 0.59} -\AddSpotColor{PANTONE} {PANTONE5835PC} {PANTONE\SpotSpace 5835\SpotSpace PC} {0 0.02 0.67 0.4} -\AddSpotColor{PANTONE} {PANTONE5845PC} {PANTONE\SpotSpace 5845\SpotSpace PC} {0 0.01 0.47 0.3} -\AddSpotColor{PANTONE} {PANTONE5855PC} {PANTONE\SpotSpace 5855\SpotSpace PC} {0 0 0.31 0.18} -\AddSpotColor{PANTONE} {PANTONE5865PC} {PANTONE\SpotSpace 5865\SpotSpace PC} {0 0 0.25 0.13} -\AddSpotColor{PANTONE} {PANTONE5875PC} {PANTONE\SpotSpace 5875\SpotSpace PC} {0 0 0.26 0.11} -\AddSpotColor{PANTONE} {PANTONE7401PC} {PANTONE\SpotSpace 7401\SpotSpace PC} {0 0.04 0.18 0} -\AddSpotColor{PANTONE} {PANTONE7402PC} {PANTONE\SpotSpace 7402\SpotSpace PC} {0 0.06 0.3 0} -\AddSpotColor{PANTONE} {PANTONE7403PC} {PANTONE\SpotSpace 7403\SpotSpace PC} {0 0.1 0.5 0} -\AddSpotColor{PANTONE} {PANTONE7404PC} {PANTONE\SpotSpace 7404\SpotSpace PC} {0 0.09 0.79 0} -\AddSpotColor{PANTONE} {PANTONE7405PC} {PANTONE\SpotSpace 7405\SpotSpace PC} {0 0.1 0.99 0} -\AddSpotColor{PANTONE} {PANTONE7406PC} {PANTONE\SpotSpace 7406\SpotSpace PC} {0 0.18 1 0} -\AddSpotColor{PANTONE} {PANTONE7407PC} {PANTONE\SpotSpace 7407\SpotSpace PC} {0 0.22 0.85 0.11} -\AddSpotColor{PANTONE} {PANTONE7408PC} {PANTONE\SpotSpace 7408\SpotSpace PC} {0 0.25 0.95 0} -\AddSpotColor{PANTONE} {PANTONE7409PC} {PANTONE\SpotSpace 7409\SpotSpace PC} {0 0.3 0.95 0} -\AddSpotColor{PANTONE} {PANTONE7410PC} {PANTONE\SpotSpace 7410\SpotSpace PC} {0 0.3 0.55 0} -\AddSpotColor{PANTONE} {PANTONE7411PC} {PANTONE\SpotSpace 7411\SpotSpace PC} {0 0.35 0.69 0} -\AddSpotColor{PANTONE} {PANTONE7412PC} {PANTONE\SpotSpace 7412\SpotSpace PC} {0 0.42 1 0.07} -\AddSpotColor{PANTONE} {PANTONE7413PC} {PANTONE\SpotSpace 7413\SpotSpace PC} {0 0.53 1 0.04} -\AddSpotColor{PANTONE} {PANTONE7414PC} {PANTONE\SpotSpace 7414\SpotSpace PC} {0 0.46 1 0.11} -\AddSpotColor{PANTONE} {PANTONE7415PC} {PANTONE\SpotSpace 7415\SpotSpace PC} {0 0.18 0.15 0} -\AddSpotColor{PANTONE} {PANTONE7416PC} {PANTONE\SpotSpace 7416\SpotSpace PC} {0 0.6 0.6 0} -\AddSpotColor{PANTONE} {PANTONE7417PC} {PANTONE\SpotSpace 7417\SpotSpace PC} {0 0.75 0.75 0} -\AddSpotColor{PANTONE} {PANTONE7418PC} {PANTONE\SpotSpace 7418\SpotSpace PC} {0 0.7 0.6 0.05} -\AddSpotColor{PANTONE} {PANTONE7419PC} {PANTONE\SpotSpace 7419\SpotSpace PC} {0 0.6 0.45 0.18} -\AddSpotColor{PANTONE} {PANTONE7420PC} {PANTONE\SpotSpace 7420\SpotSpace PC} {0 0.8 0.42 0.2} -\AddSpotColor{PANTONE} {PANTONE7421PC} {PANTONE\SpotSpace 7421\SpotSpace PC} {0 1 0.3 0.61} -\AddSpotColor{PANTONE} {PANTONE7422PC} {PANTONE\SpotSpace 7422\SpotSpace PC} {0 0.09 0.05 0} -\AddSpotColor{PANTONE} {PANTONE7423PC} {PANTONE\SpotSpace 7423\SpotSpace PC} {0 0.55 0.23 0} -\AddSpotColor{PANTONE} {PANTONE7424PC} {PANTONE\SpotSpace 7424\SpotSpace PC} {0 0.75 0.3 0} -\AddSpotColor{PANTONE} {PANTONE7425PC} {PANTONE\SpotSpace 7425\SpotSpace PC} {0 0.9 0.3 0.07} -\AddSpotColor{PANTONE} {PANTONE7426PC} {PANTONE\SpotSpace 7426\SpotSpace PC} {0 1 0.45 0.18} -\AddSpotColor{PANTONE} {PANTONE7427PC} {PANTONE\SpotSpace 7427\SpotSpace PC} {0 1 0.65 0.28} -\AddSpotColor{PANTONE} {PANTONE7428PC} {PANTONE\SpotSpace 7428\SpotSpace PC} {0 0.8 0.45 0.55} -\AddSpotColor{PANTONE} {PANTONE7429PC} {PANTONE\SpotSpace 7429\SpotSpace PC} {0 0.18 0.03 0} -\AddSpotColor{PANTONE} {PANTONE7430PC} {PANTONE\SpotSpace 7430\SpotSpace PC} {0.02 0.31 0 0} -\AddSpotColor{PANTONE} {PANTONE7431PC} {PANTONE\SpotSpace 7431\SpotSpace PC} {0 0.38 0.02 0.05} -\AddSpotColor{PANTONE} {PANTONE7432PC} {PANTONE\SpotSpace 7432\SpotSpace PC} {0 0.55 0.03 0.1} -\AddSpotColor{PANTONE} {PANTONE7433PC} {PANTONE\SpotSpace 7433\SpotSpace PC} {0 0.75 0.15 0.15} -\AddSpotColor{PANTONE} {PANTONE7434PC} {PANTONE\SpotSpace 7434\SpotSpace PC} {0 0.8 0.15 0.2} -\AddSpotColor{PANTONE} {PANTONE7435PC} {PANTONE\SpotSpace 7435\SpotSpace PC} {0 1 0.1 0.35} -\AddSpotColor{PANTONE} {PANTONE7436PC} {PANTONE\SpotSpace 7436\SpotSpace PC} {0.03 0.08 0 0} -\AddSpotColor{PANTONE} {PANTONE7437PC} {PANTONE\SpotSpace 7437\SpotSpace PC} {0.06 0.2 0 0} -\AddSpotColor{PANTONE} {PANTONE7438PC} {PANTONE\SpotSpace 7438\SpotSpace PC} {0.15 0.35 0 0} -\AddSpotColor{PANTONE} {PANTONE7439PC} {PANTONE\SpotSpace 7439\SpotSpace PC} {0.2 0.35 0 0} -\AddSpotColor{PANTONE} {PANTONE7440PC} {PANTONE\SpotSpace 7440\SpotSpace PC} {0.3 0.4 0 0} -\AddSpotColor{PANTONE} {PANTONE7441PC} {PANTONE\SpotSpace 7441\SpotSpace PC} {0.36 0.5 0 0} -\AddSpotColor{PANTONE} {PANTONE7442PC} {PANTONE\SpotSpace 7442\SpotSpace PC} {0.5 0.7 0 0} -\AddSpotColor{PANTONE} {PANTONE7443PC} {PANTONE\SpotSpace 7443\SpotSpace PC} {0.06 0.05 0 0} -\AddSpotColor{PANTONE} {PANTONE7444PC} {PANTONE\SpotSpace 7444\SpotSpace PC} {0.2 0.17 0 0} -\AddSpotColor{PANTONE} {PANTONE7445PC} {PANTONE\SpotSpace 7445\SpotSpace PC} {0.3 0.2 0 0.03} -\AddSpotColor{PANTONE} {PANTONE7446PC} {PANTONE\SpotSpace 7446\SpotSpace PC} {0.43 0.38 0 0} -\AddSpotColor{PANTONE} {PANTONE7447PC} {PANTONE\SpotSpace 7447\SpotSpace PC} {0.6 0.58 0 0.19} -\AddSpotColor{PANTONE} {PANTONE7448PC} {PANTONE\SpotSpace 7448\SpotSpace PC} {0.32 0.42 0 0.55} -\AddSpotColor{PANTONE} {PANTONE7449PC} {PANTONE\SpotSpace 7449\SpotSpace PC} {0.72 1 0.77 0.4} -\AddSpotColor{PANTONE} {PANTONE7450PC} {PANTONE\SpotSpace 7450\SpotSpace PC} {0.2 0.1 0 0} -\AddSpotColor{PANTONE} {PANTONE7451PC} {PANTONE\SpotSpace 7451\SpotSpace PC} {0.4 0.21 0 0} -\AddSpotColor{PANTONE} {PANTONE7452PC} {PANTONE\SpotSpace 7452\SpotSpace PC} {0.5 0.32 0 0} -\AddSpotColor{PANTONE} {PANTONE7453PC} {PANTONE\SpotSpace 7453\SpotSpace PC} {0.5 0.26 0 0} -\AddSpotColor{PANTONE} {PANTONE7454PC} {PANTONE\SpotSpace 7454\SpotSpace PC} {0.5 0.24 0 0.1} -\AddSpotColor{PANTONE} {PANTONE7455PC} {PANTONE\SpotSpace 7455\SpotSpace PC} {0.8 0.53 0 0} -\AddSpotColor{PANTONE} {PANTONE7456PC} {PANTONE\SpotSpace 7456\SpotSpace PC} {0.55 0.35 0 0.07} -\AddSpotColor{PANTONE} {PANTONE7457PC} {PANTONE\SpotSpace 7457\SpotSpace PC} {0.12 0 0.02 0} -\AddSpotColor{PANTONE} {PANTONE7458PC} {PANTONE\SpotSpace 7458\SpotSpace PC} {0.4 0 0.05 0.06} -\AddSpotColor{PANTONE} {PANTONE7459PC} {PANTONE\SpotSpace 7459\SpotSpace PC} {0.57 0 0.06 0.13} -\AddSpotColor{PANTONE} {PANTONE7460PC} {PANTONE\SpotSpace 7460\SpotSpace PC} {1 0 0 0.05} -\AddSpotColor{PANTONE} {PANTONE7461PC} {PANTONE\SpotSpace 7461\SpotSpace PC} {0.78 0.28 0 0} -\AddSpotColor{PANTONE} {PANTONE7462PC} {PANTONE\SpotSpace 7462\SpotSpace PC} {1 0.5 0 0.1} -\AddSpotColor{PANTONE} {PANTONE7463PC} {PANTONE\SpotSpace 7463\SpotSpace PC} {1 0.43 0 0.65} -\AddSpotColor{PANTONE} {PANTONE7464PC} {PANTONE\SpotSpace 7464\SpotSpace PC} {0.25 0 0.1 0} -\AddSpotColor{PANTONE} {PANTONE7465PC} {PANTONE\SpotSpace 7465\SpotSpace PC} {0.5 0 0.25 0} -\AddSpotColor{PANTONE} {PANTONE7466PC} {PANTONE\SpotSpace 7466\SpotSpace PC} {0.7 0 0.23 0} -\AddSpotColor{PANTONE} {PANTONE7467PC} {PANTONE\SpotSpace 7467\SpotSpace PC} {0.95 0 0.25 0} -\AddSpotColor{PANTONE} {PANTONE7468PC} {PANTONE\SpotSpace 7468\SpotSpace PC} {1 0.1 0 0.28} -\AddSpotColor{PANTONE} {PANTONE7469PC} {PANTONE\SpotSpace 7469\SpotSpace PC} {1 0.2 0 0.4} -\AddSpotColor{PANTONE} {PANTONE7470PC} {PANTONE\SpotSpace 7470\SpotSpace PC} {0.8 0.15 0 0.45} -\AddSpotColor{PANTONE} {PANTONE7471PC} {PANTONE\SpotSpace 7471\SpotSpace PC} {0.28 0 0.14 0} -\AddSpotColor{PANTONE} {PANTONE7472PC} {PANTONE\SpotSpace 7472\SpotSpace PC} {0.52 0 0.25 0} -\AddSpotColor{PANTONE} {PANTONE7473PC} {PANTONE\SpotSpace 7473\SpotSpace PC} {0.7 0 0.38 0.08} -\AddSpotColor{PANTONE} {PANTONE7474PC} {PANTONE\SpotSpace 7474\SpotSpace PC} {0.9 0 0.28 0.22} -\AddSpotColor{PANTONE} {PANTONE7475PC} {PANTONE\SpotSpace 7475\SpotSpace PC} {0.5 0 0.25 0.3} -\AddSpotColor{PANTONE} {PANTONE7476PC} {PANTONE\SpotSpace 7476\SpotSpace PC} {1 0 0.43 0.6} -\AddSpotColor{PANTONE} {PANTONE7477PC} {PANTONE\SpotSpace 7477\SpotSpace PC} {0.8 0 0.1 0.68} -\AddSpotColor{PANTONE} {PANTONE7478PC} {PANTONE\SpotSpace 7478\SpotSpace PC} {0.18 0 0.14 0} -\AddSpotColor{PANTONE} {PANTONE7479PC} {PANTONE\SpotSpace 7479\SpotSpace PC} {0.55 0 0.5 0} -\AddSpotColor{PANTONE} {PANTONE7480PC} {PANTONE\SpotSpace 7480\SpotSpace PC} {0.6 0 0.5 0} -\AddSpotColor{PANTONE} {PANTONE7481PC} {PANTONE\SpotSpace 7481\SpotSpace PC} {0.6 0 0.55 0} -\AddSpotColor{PANTONE} {PANTONE7482PC} {PANTONE\SpotSpace 7482\SpotSpace PC} {0.8 0 0.75 0} -\AddSpotColor{PANTONE} {PANTONE7483PC} {PANTONE\SpotSpace 7483\SpotSpace PC} {0.85 0 1 0.55} -\AddSpotColor{PANTONE} {PANTONE7484PC} {PANTONE\SpotSpace 7484\SpotSpace PC} {1 0 0.85 0.5} -\AddSpotColor{PANTONE} {PANTONE7485PC} {PANTONE\SpotSpace 7485\SpotSpace PC} {0.06 0 0.1 0} -\AddSpotColor{PANTONE} {PANTONE7486PC} {PANTONE\SpotSpace 7486\SpotSpace PC} {0.2 0 0.3 0} -\AddSpotColor{PANTONE} {PANTONE7487PC} {PANTONE\SpotSpace 7487\SpotSpace PC} {0.3 0 0.45 0} -\AddSpotColor{PANTONE} {PANTONE7488PC} {PANTONE\SpotSpace 7488\SpotSpace PC} {0.43 0 0.6 0} -\AddSpotColor{PANTONE} {PANTONE7489PC} {PANTONE\SpotSpace 7489\SpotSpace PC} {0.6 0 0.8 0.07} -\AddSpotColor{PANTONE} {PANTONE7490PC} {PANTONE\SpotSpace 7490\SpotSpace PC} {0.45 0 0.8 0.35} -\AddSpotColor{PANTONE} {PANTONE7491PC} {PANTONE\SpotSpace 7491\SpotSpace PC} {0.32 0 1 0.4} -\AddSpotColor{PANTONE} {PANTONE7492PC} {PANTONE\SpotSpace 7492\SpotSpace PC} {0.12 0 0.5 0.07} -\AddSpotColor{PANTONE} {PANTONE7493PC} {PANTONE\SpotSpace 7493\SpotSpace PC} {0.14 0 0.36 0.1} -\AddSpotColor{PANTONE} {PANTONE7494PC} {PANTONE\SpotSpace 7494\SpotSpace PC} {0.25 0 0.4 0.15} -\AddSpotColor{PANTONE} {PANTONE7495PC} {PANTONE\SpotSpace 7495\SpotSpace PC} {0.25 0 0.8 0.3} -\AddSpotColor{PANTONE} {PANTONE7496PC} {PANTONE\SpotSpace 7496\SpotSpace PC} {0.4 0 1 0.38} -\AddSpotColor{PANTONE} {PANTONE7497PC} {PANTONE\SpotSpace 7497\SpotSpace PC} {0.4 0.3 0.7 0.25} -\AddSpotColor{PANTONE} {PANTONE7498PC} {PANTONE\SpotSpace 7498\SpotSpace PC} {0.25 0 1 0.8} -\AddSpotColor{PANTONE} {PANTONE7499PC} {PANTONE\SpotSpace 7499\SpotSpace PC} {0 0.02 0.15 0} -\AddSpotColor{PANTONE} {PANTONE7500PC} {PANTONE\SpotSpace 7500\SpotSpace PC} {0 0.02 0.15 0.03} -\AddSpotColor{PANTONE} {PANTONE7501PC} {PANTONE\SpotSpace 7501\SpotSpace PC} {0 0.04 0.2 0.06} -\AddSpotColor{PANTONE} {PANTONE7502PC} {PANTONE\SpotSpace 7502\SpotSpace PC} {0 0.08 0.35 0.1} -\AddSpotColor{PANTONE} {PANTONE7503PC} {PANTONE\SpotSpace 7503\SpotSpace PC} {0 0.12 0.35 0.25} -\AddSpotColor{PANTONE} {PANTONE7504PC} {PANTONE\SpotSpace 7504\SpotSpace PC} {0 0.25 0.45 0.4} -\AddSpotColor{PANTONE} {PANTONE7505PC} {PANTONE\SpotSpace 7505\SpotSpace PC} {0 0.3 0.7 0.55} -\AddSpotColor{PANTONE} {PANTONE7506PC} {PANTONE\SpotSpace 7506\SpotSpace PC} {0 0.05 0.15 0} -\AddSpotColor{PANTONE} {PANTONE7507PC} {PANTONE\SpotSpace 7507\SpotSpace PC} {0 0.1 0.3 0} -\AddSpotColor{PANTONE} {PANTONE7508PC} {PANTONE\SpotSpace 7508\SpotSpace PC} {0 0.15 0.4 0.04} -\AddSpotColor{PANTONE} {PANTONE7509PC} {PANTONE\SpotSpace 7509\SpotSpace PC} {0 0.2 0.5 0.05} -\AddSpotColor{PANTONE} {PANTONE7510PC} {PANTONE\SpotSpace 7510\SpotSpace PC} {0 0.3 0.72 0.11} -\AddSpotColor{PANTONE} {PANTONE7511PC} {PANTONE\SpotSpace 7511\SpotSpace PC} {0 0.45 1 0.25} -\AddSpotColor{PANTONE} {PANTONE7512PC} {PANTONE\SpotSpace 7512\SpotSpace PC} {0 0.46 1 0.33} -\AddSpotColor{PANTONE} {PANTONE7513PC} {PANTONE\SpotSpace 7513\SpotSpace PC} {0 0.18 0.28 0.03} -\AddSpotColor{PANTONE} {PANTONE7514PC} {PANTONE\SpotSpace 7514\SpotSpace PC} {0 0.24 0.38 0.05} -\AddSpotColor{PANTONE} {PANTONE7515PC} {PANTONE\SpotSpace 7515\SpotSpace PC} {0 0.35 0.5 0.12} -\AddSpotColor{PANTONE} {PANTONE7516PC} {PANTONE\SpotSpace 7516\SpotSpace PC} {0 0.52 1 0.35} -\AddSpotColor{PANTONE} {PANTONE7517PC} {PANTONE\SpotSpace 7517\SpotSpace PC} {0 0.6 1 0.44} -\AddSpotColor{PANTONE} {PANTONE7518PC} {PANTONE\SpotSpace 7518\SpotSpace PC} {0 0.4 0.55 0.6} -\AddSpotColor{PANTONE} {PANTONE7519PC} {PANTONE\SpotSpace 7519\SpotSpace PC} {0.5 0.6 1 0.48} -\AddSpotColor{PANTONE} {PANTONE7520PC} {PANTONE\SpotSpace 7520\SpotSpace PC} {0 0.16 0.19 0} -\AddSpotColor{PANTONE} {PANTONE7521PC} {PANTONE\SpotSpace 7521\SpotSpace PC} {0 0.25 0.2 0.1} -\AddSpotColor{PANTONE} {PANTONE7522PC} {PANTONE\SpotSpace 7522\SpotSpace PC} {0 0.4 0.3 0.16} -\AddSpotColor{PANTONE} {PANTONE7523PC} {PANTONE\SpotSpace 7523\SpotSpace PC} {0 0.4 0.35 0.2} -\AddSpotColor{PANTONE} {PANTONE7524PC} {PANTONE\SpotSpace 7524\SpotSpace PC} {0 0.55 0.6 0.27} -\AddSpotColor{PANTONE} {PANTONE7525PC} {PANTONE\SpotSpace 7525\SpotSpace PC} {0 0.45 0.5 0.3} -\AddSpotColor{PANTONE} {PANTONE7526PC} {PANTONE\SpotSpace 7526\SpotSpace PC} {0 0.65 1 0.35} -\AddSpotColor{PANTONE} {PANTONE7527PC} {PANTONE\SpotSpace 7527\SpotSpace PC} {0 0.02 0.06 0.07} -\AddSpotColor{PANTONE} {PANTONE7528PC} {PANTONE\SpotSpace 7528\SpotSpace PC} {0 0.03 0.1 0.1} -\AddSpotColor{PANTONE} {PANTONE7529PC} {PANTONE\SpotSpace 7529\SpotSpace PC} {0 0.04 0.12 0.17} -\AddSpotColor{PANTONE} {PANTONE7530PC} {PANTONE\SpotSpace 7530\SpotSpace PC} {0 0.08 0.21 0.32} -\AddSpotColor{PANTONE} {PANTONE7531PC} {PANTONE\SpotSpace 7531\SpotSpace PC} {0 0.1 0.27 0.5} -\AddSpotColor{PANTONE} {PANTONE7532PC} {PANTONE\SpotSpace 7532\SpotSpace PC} {0 0.17 0.5 0.65} -\AddSpotColor{PANTONE} {PANTONE7533PC} {PANTONE\SpotSpace 7533\SpotSpace PC} {0 0.22 0.85 0.85} -\AddSpotColor{PANTONE} {PANTONE7534PC} {PANTONE\SpotSpace 7534\SpotSpace PC} {0 0.02 0.08 0.1} -\AddSpotColor{PANTONE} {PANTONE7535PC} {PANTONE\SpotSpace 7535\SpotSpace PC} {0 0.03 0.15 0.2} -\AddSpotColor{PANTONE} {PANTONE7536PC} {PANTONE\SpotSpace 7536\SpotSpace PC} {0 0.04 0.22 0.32} -\AddSpotColor{PANTONE} {PANTONE7537PC} {PANTONE\SpotSpace 7537\SpotSpace PC} {0.03 0 0.1 0.2} -\AddSpotColor{PANTONE} {PANTONE7538PC} {PANTONE\SpotSpace 7538\SpotSpace PC} {0.09 0 0.13 0.3} -\AddSpotColor{PANTONE} {PANTONE7539PC} {PANTONE\SpotSpace 7539\SpotSpace PC} {0.02 0 0.09 0.36} -\AddSpotColor{PANTONE} {PANTONE7540PC} {PANTONE\SpotSpace 7540\SpotSpace PC} {0 0 0 0.72} -\AddSpotColor{PANTONE} {PANTONE7541PC} {PANTONE\SpotSpace 7541\SpotSpace PC} {0.02 0 0 0.05} -\AddSpotColor{PANTONE} {PANTONE7542PC} {PANTONE\SpotSpace 7542\SpotSpace PC} {0.1 0 0.03 0.16} -\AddSpotColor{PANTONE} {PANTONE7543PC} {PANTONE\SpotSpace 7543\SpotSpace PC} {0.07 0 0 0.3} -\AddSpotColor{PANTONE} {PANTONE7544PC} {PANTONE\SpotSpace 7544\SpotSpace PC} {0.1 0.01 0 0.4} -\AddSpotColor{PANTONE} {PANTONE7545PC} {PANTONE\SpotSpace 7545\SpotSpace PC} {0.23 0.02 0 0.63} -\AddSpotColor{PANTONE} {PANTONE7546PC} {PANTONE\SpotSpace 7546\SpotSpace PC} {0.33 0.04 0 0.72} -\AddSpotColor{PANTONE} {PANTONE7547PC} {PANTONE\SpotSpace 7547\SpotSpace PC} {0.35 0.04 0 0.94} -\AddSpotColor{PANTONE} {PANTONEBlack2PC} {PANTONE\SpotSpace Black\SpotSpace 2\SpotSpace PC} {0 0.03 0.55 0.87} -\AddSpotColor{PANTONE} {PANTONEBlack3PC} {PANTONE\SpotSpace Black\SpotSpace 3\SpotSpace PC} {0.6 0 0.6 0.91} -\AddSpotColor{PANTONE} {PANTONEBlack4PC} {PANTONE\SpotSpace Black\SpotSpace 4\SpotSpace PC} {0 0.22 1 0.89} -\AddSpotColor{PANTONE} {PANTONEBlack5PC} {PANTONE\SpotSpace Black\SpotSpace 5\SpotSpace PC} {0 0.4 0.22 0.87} -\AddSpotColor{PANTONE} {PANTONEBlack6PC} {PANTONE\SpotSpace Black\SpotSpace 6\SpotSpace PC} {1 0.35 0 1} -\AddSpotColor{PANTONE} {PANTONEBlack7PC} {PANTONE\SpotSpace Black\SpotSpace 7\SpotSpace PC} {0 0 0.15 0.82} -\AddSpotColor{PANTONE} {PANTONEBlackPC} {PANTONE\SpotSpace Black\SpotSpace PC} {0 0.13 0.49 0.98} -\AddSpotColor{PANTONE} {PANTONEBlue072PC} {PANTONE\SpotSpace Blue\SpotSpace 072\SpotSpace PC} {1 0.88 0 0.05} -\AddSpotColor{PANTONE} {PANTONECoolGray1PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 1\SpotSpace PC} {0 0 0 0.06} -\AddSpotColor{PANTONE} {PANTONECoolGray2PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 2\SpotSpace PC} {0 0 0 0.1} -\AddSpotColor{PANTONE} {PANTONECoolGray3PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 3\SpotSpace PC} {0 0 0 0.17} -\AddSpotColor{PANTONE} {PANTONECoolGray4PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 4\SpotSpace PC} {0 0 0 0.24} -\AddSpotColor{PANTONE} {PANTONECoolGray5PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 5\SpotSpace PC} {0 0 0 0.29} -\AddSpotColor{PANTONE} {PANTONECoolGray6PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 6\SpotSpace PC} {0 0 0 0.31} -\AddSpotColor{PANTONE} {PANTONECoolGray7PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 7\SpotSpace PC} {0 0 0 0.37} -\AddSpotColor{PANTONE} {PANTONECoolGray8PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 8\SpotSpace PC} {0 0.01 0 0.43} -\AddSpotColor{PANTONE} {PANTONECoolGray9PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 9\SpotSpace PC} {0 0.01 0 0.51} -\AddSpotColor{PANTONE} {PANTONECoolGray10PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 10\SpotSpace PC} {0 0.02 0 0.6} -\AddSpotColor{PANTONE} {PANTONECoolGray11PC} {PANTONE\SpotSpace Cool\SpotSpace Gray\SpotSpace 11\SpotSpace PC} {0 0.02 0 0.68} -\AddSpotColor{PANTONE} {PANTONEGreenPC} {PANTONE\SpotSpace Green\SpotSpace PC} {1 0 0.59 0} -\AddSpotColor{PANTONE} {PANTONEOrange021PC} {PANTONE\SpotSpace Orange\SpotSpace 021\SpotSpace PC} {0 0.53 1 0} -\AddSpotColor{PANTONE} {PANTONEProc.BlackPC} {PANTONE\SpotSpace Proc.\SpotSpace Black\SpotSpace PC} {0 0 0 1} -\AddSpotColor{PANTONE} {PANTONEProc.BluePC} {PANTONE\SpotSpace Proc.\SpotSpace Blue\SpotSpace PC} {1 0.1 0 0.1} -\AddSpotColor{PANTONE} {PANTONEProc.CyanPC} {PANTONE\SpotSpace Proc.\SpotSpace Cyan\SpotSpace PC} {1 0 0 0} -\AddSpotColor{PANTONE} {PANTONEProc.Magen.PC} {PANTONE\SpotSpace Proc.\SpotSpace Magen.\SpotSpace PC} {0 1 0 0} -\AddSpotColor{PANTONE} {PANTONEProc.YellowPC} {PANTONE\SpotSpace Proc.\SpotSpace Yellow\SpotSpace PC} {0 0 1 0} -\AddSpotColor{PANTONE} {PANTONEPurplePC} {PANTONE\SpotSpace Purple\SpotSpace PC} {0.38 0.88 0 0} -\AddSpotColor{PANTONE} {PANTONERed032PC} {PANTONE\SpotSpace Red\SpotSpace 032\SpotSpace PC} {0 0.9 0.86 0} -\AddSpotColor{PANTONE} {PANTONERef.BluePC} {PANTONE\SpotSpace Ref.\SpotSpace Blue\SpotSpace PC} {1 0.73 0 0.02} -\AddSpotColor{PANTONE} {PANTONERhod.RedPC} {PANTONE\SpotSpace Rhod.\SpotSpace Red\SpotSpace PC} {0.03 0.89 0 0} -\AddSpotColor{PANTONE} {PANTONERub.RedPC} {PANTONE\SpotSpace Rub.\SpotSpace Red\SpotSpace PC} {0 1 0.15 0.04} -\AddSpotColor{PANTONE} {PANTONEVioletPC} {PANTONE\SpotSpace Violet\SpotSpace PC} {0.98 1 0 0} -\AddSpotColor{PANTONE} {PANTONEWarmGray1PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 1\SpotSpace PC} {0 0.02 0.03 0.06} -\AddSpotColor{PANTONE} {PANTONEWarmGray2PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 2\SpotSpace PC} {0 0.02 0.05 0.09} -\AddSpotColor{PANTONE} {PANTONEWarmGray3PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 3\SpotSpace PC} {0 0.04 0.08 0.17} -\AddSpotColor{PANTONE} {PANTONEWarmGray4PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 4\SpotSpace PC} {0 0.04 0.09 0.24} -\AddSpotColor{PANTONE} {PANTONEWarmGray5PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 5\SpotSpace PC} {0 0.05 0.1 0.29} -\AddSpotColor{PANTONE} {PANTONEWarmGray6PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 6\SpotSpace PC} {0 0.06 0.12 0.31} -\AddSpotColor{PANTONE} {PANTONEWarmGray7PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 7\SpotSpace PC} {0 0.08 0.14 0.38} -\AddSpotColor{PANTONE} {PANTONEWarmGray8PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 8\SpotSpace PC} {0 0.09 0.16 0.43} -\AddSpotColor{PANTONE} {PANTONEWarmGray9PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 9\SpotSpace PC} {0 0.11 0.2 0.47} -\AddSpotColor{PANTONE} {PANTONEWarmGray10PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 10\SpotSpace PC} {0 0.14 0.28 0.55} -\AddSpotColor{PANTONE} {PANTONEWarmGray11PC} {PANTONE\SpotSpace Warm\SpotSpace Gray\SpotSpace 11\SpotSpace PC} {0 0.17 0.34 0.62} -\AddSpotColor{PANTONE} {PANTONEWarmRedPC} {PANTONE\SpotSpace Warm\SpotSpace Red\SpotSpace PC} {0 0.75 0.9 0} -\AddSpotColor{PANTONE} {PANTONEYellowPC} {PANTONE\SpotSpace Yellow\SpotSpace PC} {0 0.01 1 0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scalebar.tlpobj new/tlpkg/tlpobj/scalebar.tlpobj --- old/tlpkg/tlpobj/scalebar.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/scalebar.tlpobj 2017-04-14 18:00:11.000000000 +0200 @@ -0,0 +1,17 @@ +name scalebar +category Package +revision 15878 +shortdesc Create scalebars for maps, diagrams or photos +relocated 1 +longdesc This is a small package to create scalebars for maps, diagrams +longdesc or photos. It was designed for use with cave maps but can be +longdesc used for anything from showing a scalebar in kilometres for +longdesc topographic maps to a scalebar in micrometres for an electron +longdesc microscope image. +runfiles size=1 + RELOC/tex/latex/scalebar/scalebar.sty +catalogue-ctan /macros/latex/contrib/scalebar +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics misc-support +catalogue-version 1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spotcolor.tlpobj new/tlpkg/tlpobj/spotcolor.tlpobj --- old/tlpkg/tlpobj/spotcolor.tlpobj 2016-04-14 19:47:11.000000000 +0200 +++ new/tlpkg/tlpobj/spotcolor.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -name spotcolor -category Package -revision 15878 -shortdesc Spot colours for pdfLaTeX -relocated 1 -longdesc This package provides procedures for using spot colours in -longdesc LaTeX documents and the generated pdf files. Predefined -longdesc templates for PANTONE and HKS colour spaces are included but -longdesc new ones can easily be defined. -runfiles size=27 - RELOC/tex/latex/spotcolor/spotcolor.sty - RELOC/tex/latex/spotcolor/spotcolorhks.tex - RELOC/tex/latex/spotcolor/spotcolorpantone.tex -catalogue-ctan /macros/latex/contrib/spotcolor -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl -catalogue-topics colour -catalogue-version 1.2 ++++++ skrapport.doc.tar.xz -> sdrt.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sdrt/README new/doc/latex/sdrt/README --- old/doc/latex/sdrt/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/sdrt/README 2016-11-25 19:30:02.000000000 +0100 @@ -0,0 +1,17 @@ +This is the file README for sdrt.sty. You'll find complete documentation in sdrt-doc.pdf + +This package is designed to help authors typesetting +papers related to Segmented Discourse Representation Theory (SDRT) +and formal semantics in general. Macros are provided to +draw the usual boxes, trees, and (hopefully) all the symbols +of that theory, whose commands are easy to remember and +avoid endless search through catalogues of math symbols. + +It requires xyling.sty (already available on some distributions +or downloadable through CTAN) to draw trees and thus xypic.sty. + +Licensing of this package is covered by LPPL. + +Any reaction is welcome: zappathustra(a)free.fr + +Paul Isambert Binary files old/doc/latex/sdrt/sdrt-doc.pdf and new/doc/latex/sdrt/sdrt-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sdrt/sdrt-doc.tex new/doc/latex/sdrt/sdrt-doc.tex --- old/doc/latex/sdrt/sdrt-doc.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/sdrt/sdrt-doc.tex 2016-11-25 19:30:02.000000000 +0100 @@ -0,0 +1,616 @@ +\documentclass[a4paper]{article} +\usepackage[latin9]{inputenc} +\usepackage[OT1]{fontenc} +\usepackage{sdrt} +\usepackage[margin=3cm]{geometry} +\usepackage{supertabular} +\usepackage{amsfonts} +\usepackage{wasysym} +\usepackage{xytree} +\begin{document} +\title{\textbf{The package} \texttt{sdrt.sty}}\author{Paul Isambert\\zappathustra@free.fr\\http://paulisambert.free.fr/} + +\fontfamily{ptm} +\selectfont +\maketitle +\setcounter{section}{-1} + +\begin{abstract} +This package is designed to help authors typesetting papers addressing SDRT (Segmented Discourse Representation Theory). Since SDRT is formal semantics, many of the macros in this package will be useful for logic in general (and DRT in particular, of course). Actually, I just wrote some simple macros to make life simpler, and gathered many useful symbols, that I rename for them to be easier to remember and to work both in math mode and in text. +\end{abstract} + +\tableofcontents + +\section{Installation} +This package must be installed and loaded in the usual way. It requires the \verb+xyling.sty+ package (already available in some \LaTeX\ distribution, like MiKTeK 2.5) to be installed (but not loaded in your preamble), in order to draw trees. If, for some reason, you don't want to download it, just put \% before \verb+RequiresPackage{xyling}+ at the beginning of \verb+sdrt.sty+. You won't be able to draw trees anymore. + +Apart from that, \verb+xyling.sty+ uses \verb+xypic+ with the \verb+dvips+ option to draw coloured branches. But then, when building directly to PDF, branches of the tree disappear, which is somewhat annoying. Thus, either you suppress the \verb+dvips+ option in line 57 of \verb+xyling.sty+, keeping in mind that you won't be able to draw coloured branches anymore (and actually all branches will look ugly), or you create your PDF file via DVI PS, for instance (as I did for this documentation: to get everything as nice as possible, especially tables without bold lines, you should convert your .ps file via GSview, using \emph{File}$>$\emph{Convert}, with \emph{Type: pdfwrite}, \emph{Resolution: 300} - better resolution yields ugly tables; finally, don't forget to add the extension .pdf to the name of the output file, since it is not automatic). Anyway, the fine conversion to a PDF file is a problem in itself, to which I don't know any complete solution. For instance, horizontal lines in the boxes of this documentation are sometimes a bit too long in PDF (as can be seen in the first box above), though they are fine in PS, ending exactly at the vertical line. +\section{Boxes} + +\subsection{Renaming pi} + +In SDRT, clauses are referred to with $\pi$ and a subscript and/or a superscript. Thus, to print, for instance, $\pi^{\prime}_{1}$, one has to write \verb+$\pi^{\prime}_{1}$+, which is not impossible, but boring when typing it ten times a page. So I designed \verb+\lab[]{}+ (for \emph{label}), which takes two arguments, to do the job. In the optional first argument (hence the brackets) you can place as many bars as you want, and the second one refers to the subscript. The subscript might be anything, and if you want none, leave this argument empty (but don't forget the braces). + +Now, most labels have either a superscript, which is rarely more than four bars, or a subscript, which in general is a number from 0 to 9. So I wrote some commands to make life easier. Their names are easy to remember : \verb+\labzero+, \verb+labone+... \verb+labnine+ yield \labzero, \labone... \labnine, and \verb+\labprime+, \verb+\labsecond+, \verb+\labthird+, \verb+\labfourth+ print \labprime, \labsecond, \labthird, \labfourth. This avoids excessive braces, and this will prove useful when building \scshape sdrs\upshape s. However, those commands eats subsequent space. When drawing a box or a tree, this won't be a problem, since in general they're followed by either a punctuation mark or nothing. Thus, no special care is required. On the other hand, in the course of a paragraph, gobbling of subsequent space is always annoying. If you want to use them anyway, a simple solution is to add a backslash at the end of the command. Thus, write \verb+\labone\ is fine+ to yield `\labone\ is fine'. Of course, don't use that backslash before a punctuation mark. + +\subsection{Building SDRSs} +\subsubsection{Boxes} +An SDRS look like this: +\begin{center} +\SDRS{\labzero}{\SDRS[\labzero]{\labone, \labsecond}{\klabone, Elaboration(\labone, \labsecond)\\\SDRS[\labsecond]{\labtwo, \labfive, \labprime}{\klabstartwo, \klabstarfive,\\Narration(\labtwo, \labfive)\\Elaboration(\labtwo, \labprime)\\\SDRS[\labprime]{\labthree, \labfour}{\klabstarthree, \klabstarfour\\Narration(\labthree, \labfour)}}}} +\end{center} +(This is the famous ``Max's great night'' example.) We need the following command: \verb+\SDRS+\footnote{\texttt{$\backslash$drs} and \texttt{$\backslash$sdrs} were part of the \texttt{covington.sty} package. I modified the code slightly and rewrote it for \texttt{sdrt.sty}, since I wanted better alignment in the boxes and generalized math mode. Moreover, \texttt{$\backslash$sdrs} just printed a sentence above the box, and didn't handle what \texttt{$\backslash$SDRS} does. Finally, my command is written in capital letters, so it won't conflict with \texttt{$\backslash$sdrs} if you also use \texttt{covington.sty}.}. It takes two mandatory argument and an optional one. In the first mandatory argument, you put the so-called Universe of the (S)DRS (that is, the upper part of the box), and in the second one, the Conditions (the lower part of the box). Thus, \verb+\SDRS{Universe}+ \verb+{Conditions}+ will yield: +\begin{center} +\SDRS{Universe}{Conditions} +\end{center} +In the Universe and in the Conditions, you can put commas between the elements. However, although there is no big risk with the Universe, you might create ugly long lines in the Conditions, so you'd better break them with \verb+\\+. So, instead of \verb+\SDRS{Universe}+\verb+{Condition1, Condition2+, \verb+Condition3, Condition4}+, which gives: +\begin{center} +\SDRS{Universe}{Condition1, Condition2, Condition3, Condition4} +\end{center} +write \verb+\SDRS{Universe}+\verb+{Condition1, Condition2,\\+\verb+Condition3, Condition4}+ and you'll get : +\begin{center} +\SDRS{Universe}{Condition1, Condition2,\\ Condition3, Condition4} +\end{center} +Moreover, Conditions in SDRT are on their own line in general, though you may put two on the same to save space. Whatever you decide, remember that legibility must be the rule, hence always write a condition containing another sub-box on a line alone, just like in the example above. + +The optional argument (between brackets) is the label which is defined by the box. Thus, \newline \verb+\SDRS[\labone]{Universe}{Conditions}+ for example prints the following: +\begin{center} +\SDRS[\labone]{Universe}{Conditions} +\end{center} +Of course, you can put any structure into another one by writing it among the Conditions. So, for example, you can write \verb+\SDRS{\labone}{\SDRS[\labone]+\verb+{Universe}{Conditions}}+ and yield: +\begin{center} +\SDRS{\labone}{\SDRS[\labone]{Universe}{Conditions}} +\end{center} + +Now, you have to be aware of the fact that everything in (S)DRSs is in math mode. And in math mode, everything is in italics and spaces between words is suppressed. It is exactly what we need when drawing usual (S)DRSs, but this might be problematic if we want something like this: + +\begin{center} +\SDRS{\labone}{\labone: [$John loves Mary$]} +\end{center} +If we just write \verb+\SDRS{\labone}{\labone: [John loves Mary]}+, well, this will yield: + +\begin{center} +\SDRS{\labone}{\labone: [John loves Mary]} +\end{center} +All we have to do is to add \$'s around the sentence. Since math mode is defined by \$...\$ (automatically in this package), it is obvious that embedding another pair of \$'s in the latter will produce two math modes with text mode in between. Thus, just write \verb+\SDRS{\labone}{\labone: [$John loves Mary$]}+ and everything will be fine. On the other hand, never write something like \verb+$\alpha$+ in a (S)DRS, since it would suppress the math mode greek letters need, for exactly the same reason. So just remember that (S)DRS are `automatic math environment'. + +\subsubsection{Conditions} +Now, we can build boxes as we want. But we must be able to write conditions of the form \klabtwo easily. The command for this is \verb+\klab+, which works just like \verb+\lab+, i.e. takes two arguments, one for the superscript (optional) and one for the subscript. Thus, \klab{2} is typed out with \verb+\klab{2}+. Just like \verb+\lab+, \verb+\klabzero+, \verb+\klabone+... \verb+\klabnine+ will print \klabzero, \klabone... \klabnine. There is also the `starred' version, when some underspecification is at stake : \klabstar{3}. So there's the code \verb+\klabstar+, which works exactly like \verb+\klab+, with the easy version too, that is \verb+\klabstarzero+, \verb+\klabstarone+, and so on\footnote{I didn't designed \texttt{$\backslash$klabprime} or \texttt{$\backslash$klabstarprime} an so on like I did with \texttt{$\backslash$labprime}, since barred labels in general refer to SDRSs and not to clauses. But they are easy to write with the \texttt{$\backslash$klab} or \texttt{$\backslash$klabstar} commands : \texttt{$\backslash$klabstar[''']\{\}} for instance will print \klabstar[''']{}.}. + +Finally, conditions of the form $Narration(\labtwo, \labfive)$ are simply written with \verb+Narration(\labtwo, \labfive)+. Since (S)DRSs are in math mode, you don't need to emphazise the name of the relation. This also means that in the course of your text, you have to add math mode, hence \verb+$Narration(\labtwo, \labfive)$+ to yield the same thing. If the arguments of you relation have only subscripts, there is a command, namely \verb+\dr{Relation}{subscript1}{subscript2}+, which automatically produce the right form. Thus \verb+\dr{Narration}{3}{5}+ yields \dr{Narration}{3}{5} in any environment. + +\subsubsection{Back to our example} +With all these commands, we can build our example. Here is the code with the result : +\noindent +\begin{verbatim} +\SDRS{\labzero} + {\SDRS[\labzero] + {\labone, \labsecond}{\klabone, Elaboration(\labone, \labsecond)\\ + \SDRS[\labsecond] + {\labtwo, \labfive, \labprime}{\klabstartwo, \klabstarfive,\\ + Narration(\labtwo, \labfive\\ + Elaboration(\labtwo, \labprime)\\ + \SDRS[\labprime] + {\labthree, \labfour}{\klabstarthree, \klabstarfour\\ + \dr{Narration}{3}{4}}}}} +\end{verbatim} +\begin{center} +\SDRS{\labzero}{\SDRS[\labzero]{\labone, \labsecond}{\klabone, Elaboration(\labone, \labsecond)\\\SDRS[\labsecond]{\labtwo, \labfive, \labprime}{\klabstartwo, \klabstarfive,\\Narration(\labtwo, \labfive)\\Elaboration(\labtwo, \labprime)\\\SDRS[\labprime]{\labthree, \labfour}{\klabstarthree, \klabstarfour\\\dr{Narration}{3}{4}}}}} +\end{center} +This might seem complicated at first sight, but actually it's rather easy if you pay attention to braces. Of course you don't need to write the code with all these indents like I did here for visual convenience. + +\subsubsection{Some more stuff} +There is a `presupposed' version of \verb+SDRS+ to produce boxes like the following: +\begin{center} +\PSDRS{x, \varsub{e}{3}}{dog(x)\\own(\varsub{e}{3}, j, x)} +\PSDRS[\lab{d}]{x, \varsub{e}{3}}{dog(x)\\own(\varsub{e}{3}, j, x)} +\end{center} +\verb+\PSDRS+ is that command, and it works just like \verb+\SDRS+, taking the same three arguments. If you want to use presupposition in text, type \verb+\pres+, which takes one argument : for instance, \verb+\pres{\varsub{K}{\lab{p}}}+ yields \pres{\varsub{K}{\lab{p}}}. + +In this latter code there is an additional command \verb+\varsub{}{}+. It is useful to type any kind of variable (or actually anything else) with a subscript. The first argument is the variable, the second is the subscript. Of course, it is recursive, so you can typeset \varsub{A}{\varsub{B}{\varsub{C}{D}}} with \verb+\varsub{A}{\varsub{B}{\varsub{C}{D}}}+. Thus, \varsub{e}{3} in the boxes above is produced by \verb+\varsub{e}{3}+. + +Finally, predicates are created like discourse relations, that is \verb+own(\varsub{e}{3},j,x)+ for instance (if you aren't in a (S)DRS, you must add math mode, of course, to get the italics, or add them yourself). Note that you don't have to add a space after the comma, since math mode handle it as needed. Now we can produce an SDRS like the following: +\begin{center} +\SDRS{\labsecond}{\SDRS[\labsecond]{\lab{d}}{\PSDRS[\lab{d}]{x, \varsub{e}{3}}{dog(x)\\own(\varsub{e}{3},j,x)}\\R(u, v)\\R=?\ u=?\ v=?\\i-scopes(\labsecond, \lab{d})}} +\end{center} +Here is the code: +\begin{verbatim} +\SDRS{\labsecond} + {\SDRS[\labsecond] + {\lab{d}}{\PSDRS[\lab{d}] + {x, \varsub{e}{3}}{dog(x)\\ + own(\varsub{e}{3},j,x)}\\ + R(u, v)\\ + R=?\ u=?\ v=?\\ + i-scopes(\labsecond, \lab{d})}} +\end{verbatim} +Note that $\backslash$ is necessary between $R=?$, $u=?$ and $v=?$, otherwise math mode will eat spaces between those conditions. + +\section{Trees} +\subsection{The commands} +The most powerful package I know to draw trees is Ralf Vogel's \texttt{xyling.sty}. It is powerful but it needs some care. For instance, you can't produce an SDRT tree without adjusting the length of the branches and the alignment of the labels, otherwise you get something like this : +\begin{center} +\Tree{&&\K{\labzero}\B{d}\\ +&&\K{\labone}\AR{d}^{Elaboration}\\ +&&\K{\labsecond}\B{dl}\B{dr}\\ +&\K{\labtwo}\D\AR{rr}^{Narration}&&\K{\labfive}\\ +&\K{\labprime}\DL\DR\\ +\K{\labthree}\AR{rr}^{Narration}&&\K{\labfour}\\} +\end{center} +Obviously, that's not what we want to do. So I wrote some macros with the right adjustment. Before devising them, we need to know how exactly \texttt{xyling} works (for details, see the documentation of that package). A tree is made of nodes placed in a grid, which is like a tabular : \& marks the passage to another column, while \verb+\\+ begins another row. Here is an example to compare the output with the underlying grid: +\begin{center} +\begin{tabular}{c c} +\Tree{&\K{A}\\\K{B}&&\K{C}}& +\begin{tabular}{c} +\\\\\\\Large +\verb+ & A & \\+\\ +\\\\\Large +\verb+ B & & C+ +\normalsize +\end{tabular} +\end{tabular} +\end{center} + +In general, the code for the branches is written with the starting node (the mother or the leftmost sister), and the target node is specified as an argument. Now, here are the commands. \verb+\sdrtree{}+ is a kind of environment. The argument is the structure of the tree. \verb+\LAB{}+ denotes the node, whose name is the argument. Thus, for instance, with +\begin{center} +\begin{verbatim} +\sdrtree{ + &\LAB{\labzero} \\ + &\LAB{\labone} \\ +\LAB{\lab['']{p}}& &\LAB{\labsecond} +} +\end{verbatim} +\end{center} +we produce the following tree (I displayed the code with spaces for visual convenience, but of course you could write it on a single line with no space at all... although such a presentation avoids many errors with big trees): +\begin{center} +\sdrtree{&\LAB{\labzero}\\&\LAB{\labone}\\\LAB{\lab['']{p}}&&\LAB{\labsecond}} +\end{center} +Now we have to draw branches. \verb+\cons+ draws a vertical line from the mother (like \labzero\ in this example) to the sister (like \labone). \verb+\consl+ draws a line between a mother and a sister on the left (like between \lab{1} and \lab['']{p}) and \verb+\consr+ does the same with a sister on the right (like \labsecond\ if \lab{1} is the mother). \verb+\srel{}+, \verb+\srell{}+ and \verb+\srelr{}+ work the same, except that they draw an arrow from the starting node to the target, and take an argument, which is the name of the (subordinating) discourse relation between the labels at the nodes\footnote{If there is a subordinating relation between, say \labone\ and \labtwo, and the same relation between \lab{1} and \lab{3}, usually in SDRT this relation holds between \lab{1} and an intermediate label like \labprime, which in turn is made of \lab{2} and \lab{3} linked by at least a \emph{Continuation} relation. So, in general, we have the first tree below but not the second one:\\\sdrtree{&\LAB{\labone}\srel{Relation}\\&\LAB{\labprime}\consl\consr\\\LAB{\labtwo}\crel{Continuation}&&\LAB{\labthree}}\sdrtree{&\LAB{\labone}\srell{Relation}\srelr{Relation}\\\LAB{\labtwo}\crel{Continuation}&&\LAB{\labthree}}\\Thus, \textit{$\backslash$srell} and \textit{$\backslash$srelr} should be useless. But they aren't, since the analysis above might be discussed or at least might use trees like the second one to illustrate the demonstration.}. Finally, \verb+\crel{}+ draws a horizontal arrow between two sisters with the name of the (coordinating) relation as the argument. Then, with the following code we have the following tree: +\begin{center} +\begin{verbatim} +\sdrtree{ + &\LAB{\labzero}\srel{Explanation} \\ + &\LAB{\labone}\consl\consr \\ +\LAB{\lab['']{p}}\crel{Continuation}& &\LAB{\labsecond} +} +\end{verbatim} +\sdrtree{&\LAB{\labzero}\srel{Explanation}\\&\LAB{\labone}\consl\consr\\\LAB{\lab['' ]{p}}\crel{Continuation}&&\LAB{\labsecond}} +\end{center} +And here is the tree drawn from our first big box: +\begin{center} +\sdrtree{&&\LAB{\labzero}\cons\\ +&&\LAB{\labone}\srel{Elaboration}\\ +&&\LAB{\labsecond}\consl\consr\\ +&\LAB{\labtwo}\cons\crel{Narration}&&\LAB{\labfive}\\ +&\LAB{\labone}\consl\consr\\ +\LAB{\labthree}\crel[rr]{Narration}&&\LAB{\labfour}\\ +} +\end{center} +And here is the code: +\scriptsize +\begin{verbatim} +\sdrtree{ & &\LAB{\labzero}\cons\\ + & &\LAB{\labone}\srel{Elaboration}\\ + & &\LAB{\labsecond}\consl\consr\\ + &\LAB{\labtwo}\cons\crel{Narration}& &\LAB{\labfive}\\ + &\LAB{\labone}\consl\consr\\ +\LAB{\labthree}\crel[rr]{Narration}& &\LAB{\labfour}\\ +} +\end{verbatim} +\normalsize + +\subsection{The problem} +We can see that the code for a tree graphically simulates the structure of that tree: for instance, \labzero\ in the previous example is above \labone, which can be seen from the fact that they have the same number of \&'s on the left. On the other hand, \labtwo\ is a left sister of \labsecond, and thus is one column left, i.e. \labsecond\ have one more \& on its left. This is convenient, but it is also problematic. \verb+xyling.sty+, and thus \verb+sdrt.sty+, does not handle possible conflicts between nodes. To illustrate this, observe the following grid: + +\large +\begin{verbatim} + & & A & & + & B & & C & + D & & X & & E +\end{verbatim} +\normalsize +Obviously, X is B's right daughter and C's left one at the same time. If we create a tree with that structure, i.e. if we type the following code: +\footnotesize +\begin{verbatim} +\sdrtree{ & &\LAB{\labone}\consl\consr\\ + &\LAB{\labtwo}\consl\consr& &\LAB{\labthree}\consl\consr\\ +\LAB{\labfour}& &\LAB{\lab{}{X}} & &\LAB{\labfive}\\ +} +\end{verbatim} +\normalsize +we produce the following tree: +\begin{center} +\sdrtree{ & &\LAB{\labone}\consl\consr\\ + &\LAB{\labtwo}\consl\consr& &\LAB{\labthree}\consl\consr\\ +\LAB{\labfour}& &\LAB{\lab{X}}& &\LAB{\labfive}\\ +} +\end{center} +It is a nice tree but ovbiously not of the kind that we need. So the question is: how can we draw a right daughter for \lab{2} and a left one for \lab{3} without merging them together? The answer is straightforward: add columns. That is, create the following grid: + +\large +\begin{verbatim} + & & & A & & & + & B & & & & C & + D & & X & & Y & & E +\end{verbatim} +\normalsize +Up to now, this is ok. But branches have to be adjusted, otherwise they won't be able to reach their target. For instance, \verb+\consl+ starting from A won't reach B, but the position on the right of it (and an error message will be displayed, since there is no node here). Likewise, you won't be able to draw an arrow from B to C without modification. That is why \verb+\cons+, \verb+\srel+ and \verb+\crel+ all have an optional argument between brackets. This argument is made of d's, l's and r's for `down', `left' and `right' respectively: that's all we need to find the target. One d and you go down one row, two d's and you go down two rows, three r's and you go three columns right... In the grid above B is two columns left from A and one row below. So if you want a simple line from A to B, you type \verb+\cons[dll]+ next to A's node. If you want an arrow from B to C, you write \verb+\crel[rrrr]{Relation}+ next to B. Here is an example: +\begin{center} +\sdrtree{&&&\LAB{\labone}\cons[dll]\srel[drr]{Relation}\\ +&\LAB{\labtwo}\consl\srelr{Relation}\crel[rrrr]{Relation}&&&&\LAB{\labthree}\consl\consr\\ +\LAB{\labfour}\crel{Relation}&&\LAB{\labfive}&&\LAB{\labsix}\crel{Relation}&&\LAB{\labseven}\\ +} +\end{center} +And here is the code: +\begin{verbatim} +\sdrtree{&&&\LAB{\labone}\cons[dll]\srel[drr]{Relation}\\ +&\LAB{\labtwo}\consl\srelr{Relation}\crel[rrrr]{Relation}&&&&\LAB{\labthree}\consl\consr\\ +\LAB{\labfour}\crel{Relation}&&\LAB{\labfive}&&\LAB{\labsix}\crel{Relation}&&\LAB{\labseven}\\ +} +\end{verbatim} +Of course, if \lab{5} had a right daughter and \lab{6} a left one, they would both be in the same column as \lab{1} and thus would merge together. In fact, you have to calculate the relative position of the nodes \emph{before} you draw the tree, in order to know how many columns will be used. Fortunately, trees for discourse structures aren't syntactic trees and are in general far more simple, so drawing them is rather easy. + +\subsection{Definitions of the commands} +(This section might be skipped if you don't want to know how trees are defined in terms of the \verb+xyling.sty+ package and how to modify the adjustment.) + +Here is the code for the commands above. +\begin{verbatim} +\newcommand{\sdrtree}[1]{\Treek[1]{2}{#1}} +\newcommand{\LAB}[1]{\K{ #1}} +\newcommand{\cons}[1][d]{\Bk{.5}{-2}{#1}} +\newcommand{\consl}{\Bk{1}{-2}{dl}} +\newcommand{\consr}{\Bk{1}{-2}{dr}} +\newcommand{\srel}[2][d]{\ARk{.5}{-2}{#1}^{$#2$}} +\newcommand{\srell}[1]{\ARk{1}{-2}{dl}_{$#1$}} +\newcommand{\srelr}[1]{\ARk{1}{-2}{dr}^{$#1$}} +\newcommand{\crel}[2][rr]{\GBkk{3,2.5}{-1.7,-3.5}{#1}{->}_{$#2$}} +\end{verbatim} +I defined \verb+\sdrtree+ to have good-looking depth and width of the tree. If you want to modify them because they aren't satisfying to you, use \verb+\Treek[width]{depth}{tree}+ instead. For instance, here's the previous tree with a modified width: +\begin{center} +\Treek{2}{&&&\LAB{\labone}\cons[dll]\srel[drr]{Relation}\\ +&\LAB{\labtwo}\consl\srelr{Relation}\crel[rrrr]{Relation}&&&&\LAB{\labthree}\consl\consr\\ +\LAB{\labfour}\crel{Relation}&&\LAB{\labfive}&&\LAB{\labsix}\crel{Relation}&&\LAB{\labseven}\\ +} +\end{center} +I just replaced \verb+\sdrtree+ with \verb+\Treek{2}+: since the width is an optional argument, not specifying it makes it 0. Thus, \verb+\Treek{2}+ is equivalent to \verb+\Treek[0]{2}+. Note that negative values are allowed. + +\verb+\cons+, \verb+\consl+\verb+\consr+ are made of \verb+\Bk+ which takes three arguments: vertical alignment of the starting node, vertical alignment of the target, and the direction as discussed above. \verb+ARk+ works the same. Finally, \verb+\GBkk+, which is used to define \verb+\crel+, has the following structure: the first argument specify the horizontal and vertical alignment of the starting node (seperated by a comma), the second argument specify the same thing for the target, the third argument is the direction, the fourth is the form of the arrow, and the last is the name of the relation. Finally, notice that \verb+\LAB+ has a space before its argument. In \verb+xyling+, nodes are centered, but that centering don't look good with \lab{} when it has a superscript or a subscript. That extra space makes it look better, although it won't be nice with a bare \lab{}. In general, nodes in SDRT all have a sub- or superscript, so it's fine. However, if you don't want that space, juste use the original \verb+\K+ command, which is the usual one for nodes in \verb+xyling+. Finally, note that the name of the relations are in math mode to get the right italics. + +\section{List of symbols used in SDRT} + +\subsection{Notation index} +I won't explain every symbol. Rather, I will reproduce the `notation index' of Asher \& Lascarides' \emph{Logics of Conversation}, with the corresponding code. Comments in the left column are theirs. +\begin{center} +\tabletail{\hline} +\tablehead{\hline} +\begin{mpsupertabular}{|p{5cm}|p{2.5cm}|p{6cm}|} +\hline +\multicolumn{3}{|c|}{\textbf{1. Information Content: Object Language}}\\ +\hline +Variables denoting individuals&$x$, $y$,...&Use \verb+$x$+, \verb+$y$+ and so on (math mode is useless in a (S)DRS, since it is automatically in math mode). If there is a subscript, use \verb+\varsub{variable}{subscript}+.\\ +\hline +Variables denoting eventualities&\varsub{e}{1}, \varsub{e}{2},...&Use \verb+\varsub{variable}{subscript}+.\\ +\hline +Action terms&\varsub{a}{1}, \varsub{a}{2},...&Use \verb+\varsub{variable}{subscript}+.\\ +\hline +Propositional terms&$p$, \varsub{p}{1},...&Use \verb+\varsub{variable}{subscript}+ or simply \verb+$p$+.\\ +\hline +The logical connectives and operators&&I did not write any special macro for these, since they are very common. Moreover, a new command usually gobbles subsequent space and might conflict with other existing commands (since they're renamed in many packages). Don't forget math mode, or \LaTeX\ will moan, except in a (S)DRS.\\ +&$\wedge$&\verb+$\wedge$+\\ +&$\vee$&\verb+$\vee$+\\ +&$\Rightarrow$&\verb+$\Rightarrow$+\\ +&$>$&\verb+$>$+ (if you don't use math mode it will produce >).\\ +&$\neg$&\verb+$\neg$+\\ +&$\square$&\verb+$\square$+ (you have to load the \verb+amsfonts+ package in your preamble)\\ +&$\Diamond$&\verb+$\Diamond$+ (you have to load the \verb+wasysym+ package in your preamble)\\ +\hline +The proposition expressed by the formula $K$&\intens{K}&\verb+\intens{K}+ or anything you want in the argument.\\ +&&\\ +This symbol is not in the `notation index' but it is the counterpart of the previous one, so it might be useful in formal semantics in general&\extens{K}&\verb+\extens{K}+ or anything you want as the argument.\\ +\hline +(S)DRSs&\varsub{K}{1}, \varsub{K}{2},...&Use \verb+\varsub{variable}{subscript}+.\\ +\hline +The universe of discourse referents of the DRS $K$&\varsub{U}{K}&\verb+\varsub{U}{K}+.\\ +\hline +The set of conditions of the DRS $K$&\varsub{C}{K}&\verb+\varsub{C}{K}+. Of course, with this one or the previous one, you could type something like \varsub{C}{\lab[']{2}} by putting \verb+\lab[]{}+ in the second argument hole.\\ +\hline +The action of bringing it about that $K$ is true&\true{K}&\verb+\true{K}+ or anything you want as the argument.\\ +\hline +A formula, conveying: if $a$ (or \true{K}) is performed, the $\phi$ necessarily (or possibly for \possib{a}{\phi}) follows.&\necess{a}{\phi}, \necess{\true{K}}{\phi}, \possib{a}{\phi}, \possib{\true{K}}{\phi}&\verb+\necess{a}{\phi}+ and \verb+\possib{a}{\phi}+\\ +\hline +$K$ is a DRS, $\gamma$ is a DRS condition, and $\append{K}{\gamma}\varsub{=}{def} \langle \varsub{U}{K}, \varsub{Con}{K} \cup \gamma\rangle$&\append{K}{\gamma}&\verb+\append{K}{\gamma}+. $\varsub{=}{def}$ is just \verb+\varsub{=}{def}+, $\langle$ and $\rangle$ are \verb+\langle+ and \verb+\rangle+, all of them in math mode.\\ +\hline +A DRS which summarises the content in $K$ and $K'$&$K \summary K'$&\verb+\summary+\\ +\hline +labels for DRSs and action terms&$\alpha, \beta,...$, \lab{1}, \lab{2},...&Use greek letters (in math mode) or \verb+\lab+\\ +\hline +An SDRS: $A$ is a set of labels, $\mathcal{F}$ is a function which assigns labels in $A$ SDRS-formulae, ans $LAST \in A$&\aflast&\verb+\aflast+. $A$ and $LAST$ are of course the same letters in math mode, while $\mathcal{F}$ is \verb+$\mathcal{F}$+, and $\in$ is \verb+$\in$+\\ +\hline +\end{mpsupertabular} +\end{center} +\textbf{About $\mathcal{F}$}: An expression like \flab{2} may be useful. So we have \verb+flab[]{}+, which works once again exactly like \verb+\lab+, i.e. optional primes as the first argument and subscript as the second. Similarly, \verb+\fklab[']{2}+, for instance, yields \fklab[']{2}, just like \verb+\klab[]{}+. Finally, there is also an `easy' version for both of them, namely \verb+\flabone+, \verb+\flabtwo+... \verb+\flabnine+ and \verb+\fklabone+, \verb+\fklabtwo+... \verb+\fklabnine+. They also eats subsequent space, so use $\backslash$ (e.g. \verb+\flabnine\+) when needed. + +Now, let's get back to our notation index: +\begin{center} +\tabletail{\hline} +\tablehead{\hline} +\begin{mpsupertabular}{|p{5cm}|p{2.5cm}|p{6cm}|} +\hline +The formula \flab{\alpha}, that's labelled by $\alpha$&\varsub{K}{\alpha}&Use \verb+\varsub+. No math mode needed for $\alpha$, since \verb+varsub+ automatically launches it when needed.\\ +\hline +The main eventuality that's introduced in \varsub{K}{\alpha}&\varsub{e}{\alpha}&Use \verb+\varsub+\\ +\hline +Rhetorical relations&\topic, \emph{Narration}, \emph{Contrast},...&\topic\ is produced by \verb+\topic+, but it gobbles subsequent space. So add a $\backslash$ when it might be a problem. Other relations are just text in math mode.\\ +\hline +The disputed counterpart to the relation $R$&$Dis(R)$&Simply \verb+Dis(R)+ in math mode, i.e. \verb+$Dis(R)$+.\\ +\hline +Label $\phi$ labels formula $K$ (i.e., $\flab{} = K$)&$\lab{} : K$&This `bare' version is simply \verb+$\lab{} : K$+. For more elaborated stuff (i.e. with sub- and/or superscript), use \verb+\klab+ and \verb+\klabstar+.\\ +\hline +The formula representing the `extra content', over and above \varsub{K}{\alpha} and \varsub{K}{\beta}, that must be true (or, more accurately, that must update the context) for $R(\alpha, \beta)$ to update the context&$\varsub{\phi}{R}(\alpha, \beta)$&\verb+\varsub{\phi}{R}(\alpha, \beta)+ in math mode.\\ +\hline +An individual term denoting the agent who conveyed/uttered the content that's labelled $\alpha$&$S(\alpha)$&\verb+S(\alpha)+ in math mode\\ +\hline +Agent $A$ believes that $K$&\believes[K]{A}&\verb+\believes[content]{agent}+. The content is optional since we will need \believes{A} later. By the way, $\mathcal{B}$ is produced with \verb+\mathcal{B}+ in math mode.\\ +\hline +Agent $A$ intends the action $a$&\intends[a]{A}&\verb+\intends[action]{agent}+. the action is optional for the same reason as above. $\mathcal{I}$ is produced with \verb+\mathcal{I}+ in math mode.\\ +\hline +The speech act related goal of the utterance labelled $\alpha$ is the action \true\extens{p}&\sarg{\alpha}{p}&\verb+\sarg{\alpha}{p}+. This command won't work in math mode, because of small capitals. So, although you might never use it, here is the code: + +\verb+\scshape sarg\upshape\ensuremath{(#1, #2)}+. When in math mode, just add a \$ before \verb+\scshape+ and between \verb+\upshape+ and \verb+\ensuremath+.\\ +\hline +\multicolumn{3}{|c|}{\textbf{2. Information Content: Metalanguage}}\\ +\hline +Possible worlds (in the model)&$w, w'$, \varsub{w}{1}, \varsub{w}{2},...&Use \verb+$w$+, \verb+$w'$+ or \verb+\varsub+.\\ +\hline +Variable assignment functions&$f, g,...$&Use math mode.\\ +\hline +The domaine of $f$&$dom(f)$&\verb+dom(f)+ in math mode.\\ +\hline +$g$ extends $f$. + +I.e., $dom(f) \subseteq dom(g)$ and $\forall x \in dom(f), f(x) = g(x)$&$f \extends g$&Write \verb+f \extends g+. By the way, the code for $\forall x$ is \verb+\forall x+ and the one for $\exists x$ is \verb+\exists x+, both in math mode.\\ +\hline +The formula (or action term) $K$ relates the input context $(w, f)$ with the output context $(w', g)$&\tiny \ccp[M]{w, f}{K}{w', g}\normalsize&Use \footnotesize\verb+\ccp[optional world index]+ \verb+{input pair}{formula}{output pair}+\normalsize. If you happen to need \Lbracket and \Rbracket, I designed \verb+\Lbracket+ and \verb+Rbracket+, so you won't have to load any package.\\ +\hline +$\Gamma$ monotonically entails $\phi$ (model theory)&$\Gamma \entm \phi$ or $\Gamma \entm[f] \phi$&Use \verb+\entm[]+ whose optional argument is the subscript.\\ +\hline +$\Gamma$ monotonically entails $\phi$ (proof theory)&$\Gamma \entp \phi$ or $\Gamma \entp[f] \phi$&Use \verb+\entp[]+ whose optional argument is the subscript.\\ +\hline +\multicolumn{3}{|c|}{\textbf{3. Underspecified Information Content: The Language \lulf}}\\ +\hline +&&First of all, \lulf\ is typed with \verb+\lulf+, which eats subsequent space, so use an extra $\backslash$.\\ +\hline +The translation function form the \scshape ulf\upshape s to the unlabelled language&$\trfunc$&\verb+\trfunc+\\ +\hline +Labels&\varsub{l}{1}, \varsub{l}{2},...&Use \verb+\varsub+.\\ +\hline +Variables over labels&\varsub{?}{1}, \varsub{?}{2},...&Use \verb+\varsub+.\\ +\hline +Higher order variables&$X, Y, R...$&\verb+X, Y, R+ in math mode or \verb+\varsub+ if there is a subscript.\\ +\hline +The predicate corresponding to the constructor $f$ from the base (unlabelled) language&\varsub{R}{f}&Use \verb+\varsub+.\\ +\hline +A notational variant of \varsub{R}{f}(\varsub{l}{1},..., \varsub{l}{n+1}), where \varsub{l}{i} labels \varsub{x}{i}, $1\leq i\leq n$; e.g., $l: \wedge(p,q)$ is shorthand for \varsub{R}{\wedge}(\varsub{l}{q}, \varsub{l}{p}, l) $\wedge$ $p$(\varsub{l}{p}) $\wedge$ $q$(\varsub{l}{q})&\varsub{l}{n+1} : $f$(\varsub{x}{1},..., \varsub{x}{n})&All those notations are just an efficient use of \verb+varsub+. Note that you can write anything as the second argument, so for instance \verb+\varsub{R}{\wedge}+ produce \varsub{R}{\wedge}.\\ +\hline +Gloss for $\exists Y$(\varsub{R}{=}(\varsub{l}{x}, \varsub{l}{y}, $l$) $\wedge$ \varsub{R}{x}(\varsub{l}{x}) $\wedge$ $Y$(\varsub{l}{y}))&$x =?$&Simply \verb+$x =?$+, and once again \verb+varsub+ for the notations in the left column.\\ +\hline +Label $l$ outscopes $l'$&$l\outscopes l'$&\verb+\outscopes+.\\ +\hline +The conditions in $l$ are accessible to those in $l'$&$l\varsub{\outscopes}{a} l'$&\verb+\varsub{\outscopes}{a}+\\ +\hline +\multicolumn{3}{|c|}{\textbf{4. Underspecified Information Content: Metalanguage}}\\ +\hline +The set of all labels in the model&$U$&Just \verb+U+ in math mode.\\ +\hline +Successor relation on labels (corresponds to \emph{immediately outscopes}).&\varsub{Succ}{}, \varsub{Succ}{D}&Use \verb+Succ+ in math mode or \verb+\varsub+.\\ +\hline +The interpretation fonction&$I$&Just \verb+I+ in math mode.\\ +\hline +The satisfaction relations of the labelled language (this is different from \entm[f])&\entm[l]&\verb+\entm[l]+.\\ +\hline +\multicolumn{3}{|c|}{\textbf{5. Glue Logic: Object Language}}\\ +\hline +A \scshape ulf \upshape (which in the glue language forms a one-place predicate)&$\ulf$&\verb+\ulf+\\ +\hline +Individual variables&$x, y,...$&Use math mode.\\ +\hline +Labels&\lab{1}, \lab{2}, $\alpha, \beta...$&\verb+\lab+ and greek letters.\\ +\hline +An example of a formula that's transferred via \entp{tr} into the glue language from other more expressive languages (e.g., from the logic of information content)&$push(e, x, y, \labtwo)$&Use math mode and simply write your text.\\ +\hline +The \scshape SDRS\upshape \varsub{K}{l} (i.e., $\mathcal(\lambda)$) includes as a conjunct some rhetorical relation connecting $\alpha$ and $\beta$&$?(\alpha, \beta, \lambda)$&Same as above: math mode!\\ +\hline +in the \scshape SDRS\upshape $\langle A, \mathcal{F}\rangle$, where $l \in A$, $\mathcal{F}(\lambda)$ includes $R(\alpha, \beta)$ as one of its conjuncts.&$R(\alpha, \beta, \lambda)$&Once again: math mode!\\ +\hline +As in the language of information content&$\wedge, \vee, \rightarrow, \neg, >$&As above, except that $\rightarrow$ is \verb+\rightarrow+ (i.e., without a capital letter).\\ +\hline +The information about content that's transferred from $\mathcal{K}$ into the glue logic, where $\mathcal{K}$ is a set of formulae of the \scshape ULF\upshape-logic&$Info(\mathcal{K})$&\verb+Info(\mathcal{K})+ in math mode.\\ +\hline +$\sigma$ outscopes $\alpha$ and nothing outscopes $\sigma$&$Top(\sigma, \alpha)$&Simple text in math mode.\\ +\hline +There is evidence in the discourse $\sigma$ that $\alpha$ is a subtype of $\beta$; similarly for $\varsub{cause}{D}(\sigma, \alpha, \beta)$&$\varsub{subtype}{D}(\sigma, \alpha, \beta)$&Use \verb+varsub+\\ +\hline +A schema, which one can replace with the aktionsart of $\alpha$ and $\beta$, whatever their values&$Aspect(\alpha, \beta)$&Text in math mode.\\ +\hline +The formula $\alpha'$ labels is just like that labelled by $\alpha$, save that the former resolves some or all of the underspecifications that's present in the latter.&$\alpha \resolves \alpha'$&This arrow is produced with \verb+\resolves+.\\ +\hline +A \scshape DRS \upshape which is the same as $K$, save that some of the underspecified conditions in $K$ are resolved in $K^{+}$&\kstar&Use \verb+\kstar+, which can be an argument of \verb+\varsub+, so you can write, for instance, \varsub{\kstar}{\lab[']{5}} with \verb+\varsub{\kstar}{\lab[']{5}}+.\\ +\hline +At the part labelled \varsub{\lambda}{2} in the discourse structure, the content \varsub{K}{\varsub{\lambda}{1}} that \varsub{\lambda}{1} labels (and which in turn is outscoped by \varsub{\lambda}{2}) is settled.&$settled(\varsub{\lambda}{1}, \varsub{\lambda}{2})$&Use text in math mode and \verb+\varsub+.\\ +\hline +Type declarations, respectively: $\alpha$ labels an indicative, interrogative, imperative&$\alpha :|, \alpha :?, \alpha :!$&Simple math mode once again.\\ +\hline +\multicolumn{3}{|c|}{\textbf{6. Glue Logic: Metalanguage}}\\ +\hline +$\Gamma$ monotonically entails $\phi$ (model theory)&$\Gamma \entm \phi$ or $\Gamma \entm[g] \phi$&Use \verb+\entm+ with optional subscript (between brackets).\\ +\hline +$\Gamma$ monotonically entails $\phi$ (proof theory)&$\Gamma \entp \phi$ or $\Gamma \entp[g] \phi$&Use \verb+\entp+ with optional subscript (between brackets).\\ +\hline +$\Gamma$ nonmonotonically entails $\phi$ (model theory)&$\Gamma \nmentm \phi$ or $\Gamma \nmentm[g] \phi$&Use \verb+\nmentm+ with optional subscript (between brackets).\\ +\hline +$\Gamma$ nonmonotonically entails $\phi$ (proof theory)&$\Gamma \nmentp \phi$ or $\Gamma \nmentp[g] \phi$&Use \verb+\nmentp+ with optional subscript (between brackets).\\ +\hline +An extension of the theory $T$&\thext&\verb+\thext+, which of course can be argument of \verb+\varsub+ to produce things like \varsub{\thext}{max} as usual.\\ +\hline +$Ant(T)\varsub{=}{def}\{C:T\entp C>D\}$&$Ant(T)$&Here is how to write the formula in the left column: + +\verb+Ant(T)\varsub{=}{def}\{C:T\entp C>D\}+ The whole in math mode, of course. As you can see, the only thing you have to pay attention to is the braces, which are one of the special characters of \LaTeX. To typeset them, you have to write \verb+\{+ and \verb+\}+.\\ +\hline +\multicolumn{3}{|c|}{\textbf{7. Discourse Update}}\\ +\hline +The transfer relation from (richer) sources of information to the glue language&\entp[tr]&\verb+\entp[tr]+\\ +\hline +The set of labels to which $\beta$ is attached&$att-sites(\beta)$&Text in math mode.\\ +\hline +The set of available attachment sites in the set of \scshape sdrs\upshape s $\sigma$&$avail-sites(\sigma)$&Text in math mode.\\ +\hline +$\{\langle \alpha, l\rangle : \alpha\in avail-sites(\sigma)$ and $\varsub{Succ}{D}(l, \alpha)\}$&$avail-pairs(\sigma)$&Text in math mode. The left column is written just like the definition of $Ant(A)$. Note that `and' mustn't be in math mode, so you have to stop it before and start it again after.\\ +\hline +The set of all possible sequences of all possible subsets of $avail-pairs(\sigma)$&$\mathcal{P}(avail-pairs(\sigma))$&$\mathcal{P}$ is \verb+\mathcal{P}+ in math mode, and you must have guessed how the rest was typed...\\ +\hline +The \scshape sdrt \upshape update function from an old context and new information to a new context.&\update&Use \verb+\update+. Note that this was designed thanks to the \verb+subscript.sty+ package. I rewrote that part of the code in \verb+sdrt.sty+ so you won't have to (down)load it. By the way, this won't work in math mode. To yield \bestupdate, write \verb+\bestupdate+.\\ +\hline +A set of \scshape sdrs\upshape s&$\sigma$&Greek letter sigma.\\ +\hline +The set of all \scshape ulf\upshape -formulae $\phi$ such that for all \scshape sdrs\upshape s in $\sigma$, $s\entm[l]\phi$&$Th(\sigma)$&Math mode\\ +\hline +The simple update of $\sigma$ with the (assumption about) attachment $?(\alpha, \beta, \lambda)$&$\sigma+?(\alpha, \beta, \lambda)$&Math mode.\\ +\hline +The sequence of simple updates of $\sigma$ with $?(\alpha, \beta, \lambda)$ for each $\langle \alpha, l\rangle \in X$&$\varsub{\Sigma}{X}(\sigma, \varsub{\mathcal{K}}{\beta})$&This might seem complicated, but this is not. Here is the code: + +\verb+\varsub{\Sigma}{X}+ \verb+(\sigma, \varsub{\mathcal{K}}{\beta})+\\ +\hline +Downdating: the set of the biggest bits of $\sigma$ that you can retain while ensuring that the result does not entail $\phi$.&$\sigma\downdate\phi$&Use \verb+\downdate+ to draw \downdate.\\ +\hline +$\sigma$ with all $R(\gamma, \alpha, \lambda)$ where $\phi(R)$ retracted, and replaced with $Dis(R)(\gamma, \alpha, \lambda)$&$\sigma \varsub{\topic}{\phi} \alpha$&Use \verb+\varsub{\topic}{\phi}+ to yield \varsub{\topic}{\phi}.\\ +\hline +Simple revision (which generalises update)&$\sigma\revision?(\alpha, \beta, \lambda)$&\verb+\revision+ to produce \revision.\\ +\hline +\multicolumn{3}{|c|}{\textbf{8. Cognitive Modelling Language}}\\ +\hline +\multicolumn{3}{|p{13cm}|}{There is nothing new in that section. Everything is made of \texttt{$\backslash$varsub} or math mode. You already know that $\mathcal{B}$ is \texttt{$\backslash$mathcal\{B\}} in math mode.}\\ +\hline +Propositional variables&$\varsub{p}{1}, \varsub{p}{2}, q, q'$,...&\\ +\hline +Action terms&\varsub{a}{1}, \varsub{a}{2},...&\\ +\hline +Labelled propositional variables&\varsub{p}{\alpha}, \varsub{p}{\lab{}}&Of course, you could write something like \varsub{p}{\lab[']{r}} with \verb+\varsub{p}{\lab[']{r}}+.\\ +\hline +Labelled action terms&\varsub{a}{\alpha}, \varsub{a}{\lab{}}&Same comment.\\ +\hline +An action term, corresponding to the action of seeing to it that $\phi$ is true&\true{\phi}&\verb+\true{}+ as above.\\ +\hline +The speaker who conveyed the content associated with $\alpha$; and the hearer of that content&$S(\alpha), H(\alpha)$&\\ +\hline +Agent $A$ believes that; Agent $A$ intends that; $A$ and $B$ mutually believe that&\believes{A}, \intends{A}, \varsub{MB}{A,B}&Use \verb+believes{agent}+ and \verb+\intends{agent}+ without the optional argument. \varsub{MB}{A,B} is simply \verb+\varsub{MB}{A,B}+.\\ +\hline +$A$'s choice for fulfilling the action \true{\psi} is to carry out the action \true{\phi}&$\varsub{choice}{A}(\phi, \psi)$&\verb+\varsub+ and math mode.\\ +\hline +The action of $S(\alpha)$ uttering $\alpha$&$Say(\alpha)$&Use math mode.\\ +\hline +The action $a$ has been performed&$Done(a)$&Use math mode.\\ +\hline +$p$ is an answer to the question labelled by $\alpha$&$Sanswer(\alpha, p)$&Use math mode.\\ +\end{mpsupertabular} +\end{center} + +\subsection{Additional symbols} +Wandering through \emph{Logics of Conversation}, one can realize that the above notation index is not sufficient to typeset all formulae in \scshape sdrt \upshape. So here are some more useful symbols. + +First of all, a `superscript' variant of \verb+\varsub{}{}+ will be interesting. It is simply \verb+\varsup{}{}+. So you can type, for instance, \varsup{\ulf}{sup} with \verb+\varsup{\ulf}{sup}+. Note that \verb+\varsub+ and \verb+\varsup+ can be arguments of each other. So you can type complex stuff like \varsub{\varsup{\ulf}{sup}}{sub} with \verb+\varsub{\varsup{\ulf}{sup}}{sub}+. Note that \verb+\varsup{\varsub{\ulf}{sub}}{sup}+ will yield exactly the same thing. + +Now, here are some more symbols, with the code: + +\begin{center} +\begin{tabular}{l l} +$\cup$&\verb+\cup+ in math mode\\ +$\circ$ (to define $\Lbracket\varsub{a}{1};\varsub{a}{2}\Rbracket$)&\verb+\circ+ in math mode\\ +$\varsub{K}{1} \access \varsub{K}{2}$ (accessibility relation)&\verb+\access+\\ +$K := Definition$&Simply \verb+:=+\\ +$\ell$ (in models for \lulf)&\verb+\ell+ in math mode\\ +$e \tempprec now$ (temporal precedence)&\verb+\tempprec+\\ +$\mathcal{X}$&\verb+\mathcal{X}+ in math mode\\ +$\frac{\varsub{R}{f}}{Y}$(in the interpretation of the labelled language)&\verb+frac{above}{below}+ in math mode\\ +Negated versions of inference operators:&\\ +\Nentm&\verb+\Nentm+\\ +\Nentp&\verb+\Nentp+\\ +\Nnmentm&\verb+\Nnmentm+\\ +\Nnmentp&\verb+\Nnmentp+\\ +\union{{X \in \varsub{\mathcal{S}}{\sigma}}} (in SDRT Update)&\verb+\union{limit}+\\ +$\alpha \merging \beta$&\verb+\merging+\\ +$x \subtype y$&\verb+\subtype+\\ +\end{tabular} +\end{center} +Many relations can be negated with the prefix \verb+\not+ (which needs math mode). Thus \verb+\not\extends+ yields $\not\extends$ and \verb+\not\in+ yields $\not\in$. Finally, if you want to draw HPSG-like AVMs for lexical semantics, use Christopher Manning's \verb+avm.sty+ package. + +\section{Math mode or not?} + +I am aware of the fact that the many mentions of `math mode' might be very confusing, and that in the end you might not know when to use it. Moreover, maybe you are a new \LaTeX\ user and you ignore what math mode is and why so many \$ are appearing here and there along these pages. So first of all, a definition: math mode is a pair of \$ between which math formulae are nicely formatted. So it is good. However, there is another feature that I can't explain to me: some commands (those in the menu item named `math' in TeXnicCenter) \emph{need} math mode. Greek letters for instance. If you write \verb+\alpha is a nice letter+, it will type `$\alpha$ is a nice letter', but, since \verb+\alpha+ is not surrounded by \$, \LaTeX\ will moan `\verb+Missing $ inserted+', and you'll have two errors. Fortunately, all the macros in this package `control' their `math-modality'\footnote{Thanks to the \texttt{$\backslash$ensuremath} command.}. + +The following commands don't need math mode, nor do their argument(s) need it. For instance, \verb+varsub{}{}+ don't need math mode and you don't need to write \verb+\alpha+ between \$ if you want $\alpha$ as one of the arguments. +\newline +\newline +\noindent\verb+\lab[]{}+, and all its variants: \verb+\labone+, \verb+\klab+, \verb+\flab+, etc. +\begin{verbatim} +\SDRS \PSDRS +\varsub{}{} \varsup{}{} +\intens{} \extens{} \true{} +\necess{}{} \possib{}{} +\append{}{} +\summary +\aflast +\topic +\believes[]{} \intends[]{} +\sarg{}{} +\extends +\ccp[]{}{}{} +\entm[] \entp[] \nmentm[] \nmentp[] \Nentm[] \Nentp[] \Nnmentm[] \Nnmentp[] +\lulf +\trfunc +\outscopes +\ulf +\resolves +\kstar +\thext +\downdate \revision \access \tempprec +\union{} +\merging +\subtype +\end{verbatim} +As we have seen above with (S)DRSs, math mode has side-effects that you might want to avoid. For instance, normal text will be in italics and without space between words. So you have to interrupt math mode when needed (though normally you won't need it much in SDRT), with additional \$. Thus, for instance, \believes[$my sentence$]{A} is typeset with \verb+\believes[$my sentence$]{A}+. + +On the other hand, greek letters, logical connectors, various calligraphic letters (i.e. produced with \verb+\mathcal{}+) and the symbols $\in$ (\verb+\in+), $\cup$ (\verb+\cup+), $\circ$ (\verb+\circ+), $\ell$ (\verb+\ell+) $\frac{above}{below}$ (\verb+\frac{above}{below}+) need math mode. That is, either they're written between \$ or they're arguments of one of the commands above. Thus you'll write \verb+\intens{\alpha}+ and \emph{never} \verb+\intens{$\alpha$}+, or \verb+$\alpha \outscopes \beta$+ (although \verb+\outscopes+ doesn't need it, it won't cause any trouble). + +The advantage of automatic math mode is that those commands are launched in the same way in math environment or in text: \verb+\outscopes+ produces \outscopes\ in the last example and in a phrase like `The \outscopes\ relation'. Just note that in text, those commands that don't take arguments will eat subsequent space, so actually you have to write `\verb+the \outscopes\ relation+' when space is needed. Finally, variables without \verb+\varsub+ or \verb+\varsup+, as well as predicates, need math mode (or any of the commands above) to be typed properly, i.e. if you write just \verb+own(x, y)+, you will get `own(x, j)' and not `$own(x, j)$'. + +\section{Bugs and enhancements} + +\subsection{Problems} +I made the symbols for non-monotonic entailment out of two other symbols: $|$ and $\approx$ for \nmentm\ and $|$ and $\sim$ for \nmentp. I looked for them everywhere, but I wasn't able to find them, that's why I designed them that way (since I don't know how to draw glyphs). They seem to work well, but they might sometimes mess up when \LaTeX\ adjusts the filling of a line, especially in tables, so you might have to work out some adjustment yourself. Note that it sometimes moves from PS to PDF. That's the reason why I did not designed a nicer \entp\ whose branches would be of the same lenghth as those of \entm\ (notice by the way that in every SDRT papers that I read, \entp\ never matched the lenghth of \entm; but \emph{Logics of Conversation}, at least, was explicitely done with \LaTeX). The same holds for \Lbracket\ and \Rbracket. Although they exist in some packages, they didn't look good to me, and anyway I wanted to avoid requiring many packages. + +There is another problem, but this one seems to pervade through \TeX\ in general, namely the `double subscript' problem. If you want to print a complex stuff like \entm\ \varsup{\varsub{}{l}}{\varsup{g}{\frac{\ell}{v}}} (which is needed in the interpretation of the labelled language), you can type \verb+\varsup{\varsub{\entm}{l}}{\varsup{g}{\frac{\ell}{v}}}+, but you will have one error (`double subscript'). Moreover, the sub- and the superscripts are not next to the entailment symbol. If you `recreate' \entm\ out of $|$ and = (as I did for \nmentp\ and \nmentm), however, you will have no problem. \verb+\varsup{\varsub{|\hspace{-5pt}=}{l}}{\,\varsup{g}{\frac{\ell}{v}}}+ will print \varsup{\varsub{|\hspace{-5pt}=}{l}}{\varsup{g}{\frac{\ell}{v}}}. + +\subsection{Things that could be improved} + +A `generalized' math mode could be interesting. I didn't renamed the logical operators nor the greek letters, since you might use many packages, and it could conflict with them. But here is a simple way to use math symbols in both math and text modes. Imagine you want $\alpha$ to work so, for instance. Then create a new command, namely \verb+\newcommand{\Alpha}{\ensuremath{\alpha}}+. Of course, you could name it whatever you want, and `\verb+\Alpha+' is just an example. With that command, you won't have to bother with math mode anymore, it will be automatic when needed. Notice that a command of the form \verb+\newcommand{\Alpha}{$\alpha$}+ would not do: in math mode, it would create an inner pair of \$ that would interrupt it, and thus the greek letter would be in text mode. On the contrary, \verb+\ensuremath{}+ does not launch math mode when already in it. The only problem is that commands of that kind (without argument) eat subsequent space (and thus may require a suffixed $\backslash$). You could use the \verb+xspace.sty+ package, that controls when subsequent space is needed or not. I didn't use it because it yielded bad results with predicates (the right parenthesis was preceded by a blank). + +Apart from that, you might have noticed that the arrowheads in trees don't resemble the ones in SDRT. There is no such arrowheads in \verb+xypic+, and I'm not able to draw them. This would be nice however if it could be done, but it would require another drawing package, and hence rewriting another code for the trees. + +Finally, I did not attempt at drawing the diamond-shaped box that one encounters in DRT to handle donkey sentences, because I was not able to draw them properly. Note however that the \verb+xytree.sty+ package, which requires \verb+xypic+ too, has a command \verb+\drsdiabox+ to draw them. There are two problems with \verb+xytree.sty+: first, its \verb+\drsdiabox+ command yields a shivering box. I think the reason is that this package requires \verb+xypic+ \emph{without} the dvips option. Thus, there is no problem with PDFTeX, but all diagonal lines are ugly. Moreover, the diamond box is not stuck to the other boxes, as it should be. I think however that it is easy to fix. The second problem is the following. Compare those two boxes: + +\begin{center} +\drsbox{x, j}{dog(x)\\own(j,x)} +\SDRS{x, j}{dog(x)\\own(j,x)} +\end{center} +The boxes themselves are not at stake. But if you take a look at the shape of the text, you can observe that there are two kinds of italics. The ones in the left box (made with \verb+xytree+) are produced with the \verb+\itshape+ command, while the italics in the right box (made with \verb+sdrt+) are the result of math mode. The fact is that all italics in SDRT papers, either in a box or in text, are produced with math mode, and not with \verb+\itshape+ or \verb+\emph{}+. See the difference: + +\begin{tabular}{ll} +\verb+$background$+&$background$\\ +\verb+\emph{background}+, \verb+\itshape background+ and \verb+\textit{background}+&\emph{background}\\ +\verb+\slshape background+&\slshape background\\ +\end{tabular} + +\noindent Math mode also prevents parentheses from being in italics, as usual with math formulae. Thus, \verb+xytree+ is not adequate to draw proper boxes. + +\end{document} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skrapport/README new/doc/latex/skrapport/README --- old/doc/latex/skrapport/README 2015-07-21 00:09:40.000000000 +0200 +++ new/doc/latex/skrapport/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -%% skrapport Skånings rapportklass -%% -%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson(a)gmail.com> -%% -%% 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://www.latex-project.org/lppl.txt -%% 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 Simon Sigurdhsson. -%% -%% This work consists of the file skrapport.tex and the derived files: -%% * skrapport.cls -%% * skrapport-colortheme-default.sty -%% * skrapport-colortheme-unscathed.sty -%% * skrapport-colortheme-violet.sty -%% * skrapport-colortheme-cruelwater.sty -%% * skrapport-colortheme-skdoc.sty -%% * skrapport-size-common.sty -%% * skrapport-size10pt.clo -%% * skrapport-size11pt.clo -%% * skrapport-size12pt.clo - -This is version 0.12e of the skrapport document class, intended for simple -reports submitted by the author at Chalmers University of Technology. - -The following files are enclosed. - - README - This file - Makefile - GNU Makefile for making the package and documentation - skrapport.tex - LaTeX source code of the class and documentation - skrapport.pdf - PDF version of the documentation - -Installation notes: -The easiest way to install this package, assuming you have obtained the -source code from Github or CTAN, is to simply run `make install`. This -will generate package code and documentation, install it into TEXMFHOME -and run `mktexlsr`. If you wish to compile the package but not install -it, run `make all` instead. If you insist on doing it manually, remember -that you must use `pdflatex` (not `tex` or `latex`). Binary files old/doc/latex/skrapport/skrapport.pdf and new/doc/latex/skrapport/skrapport.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sdrt.doc.tlpobj new/tlpkg/tlpobj/sdrt.doc.tlpobj --- old/tlpkg/tlpobj/sdrt.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/sdrt.doc.tlpobj 2017-04-14 18:00:15.000000000 +0200 @@ -0,0 +1,9 @@ +name sdrt.doc +category Package +revision 15878 +shortdesc doc files of sdrt +relocated 1 +docfiles size=61 + RELOC/doc/latex/sdrt/README + RELOC/doc/latex/sdrt/sdrt-doc.pdf + RELOC/doc/latex/sdrt/sdrt-doc.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skrapport.doc.tlpobj new/tlpkg/tlpobj/skrapport.doc.tlpobj --- old/tlpkg/tlpobj/skrapport.doc.tlpobj 2016-04-14 19:46:41.000000000 +0200 +++ new/tlpkg/tlpobj/skrapport.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name skrapport.doc -category Package -revision 37911 -shortdesc doc files of skrapport -relocated 1 -docfiles size=62 - RELOC/doc/latex/skrapport/README - RELOC/doc/latex/skrapport/skrapport.pdf ++++++ skrapport.tar.xz -> sdrt.tar.xz ++++++ ++++ 2664 lines of diff (skipped) ++++++ secdot.doc.tar.xz ++++++ ++++++ secdot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/secdot.tlpobj new/tlpkg/tlpobj/secdot.tlpobj --- old/tlpkg/tlpobj/secdot.tlpobj 2016-04-14 19:45:56.000000000 +0200 +++ new/tlpkg/tlpobj/secdot.tlpobj 2017-04-14 18:00:16.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/secdot/secdot.sty catalogue-ctan /macros/latex/contrib/secdot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics headings catalogue-version 1.0 ++++++ section.doc.tar.xz ++++++ ++++++ section.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/section.tlpobj new/tlpkg/tlpobj/section.tlpobj --- old/tlpkg/tlpobj/section.tlpobj 2016-04-14 19:45:56.000000000 +0200 +++ new/tlpkg/tlpobj/section.tlpobj 2017-04-14 18:00:16.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=8 RELOC/tex/latex/section/section.sty catalogue-ctan /macros/latex/contrib/section -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics headings ++++++ sectionbox.doc.tar.xz ++++++ ++++++ sectionbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sectionbox.tlpobj new/tlpkg/tlpobj/sectionbox.tlpobj --- old/tlpkg/tlpobj/sectionbox.tlpobj 2016-04-14 19:45:57.000000000 +0200 +++ new/tlpkg/tlpobj/sectionbox.tlpobj 2017-04-14 18:00:16.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/sectionbox/sectionbox.sty catalogue-ctan /macros/latex/contrib/sectionbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics decoration catalogue-version 1.01 ++++++ sectsty.doc.tar.xz ++++++ ++++++ sectsty.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sectsty.tlpobj new/tlpkg/tlpobj/sectsty.tlpobj --- old/tlpkg/tlpobj/sectsty.tlpobj 2016-04-14 19:45:57.000000000 +0200 +++ new/tlpkg/tlpobj/sectsty.tlpobj 2017-04-14 18:00:16.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/sectsty/sectsty.sty catalogue-also titlesec catalogue-ctan /macros/latex/contrib/sectsty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics headings catalogue-version 2.0.2 ++++++ seealso.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/seealso/README new/doc/latex/seealso/README --- old/doc/latex/seealso/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/seealso/README 2017-03-24 23:27:33.000000000 +0100 @@ -0,0 +1,11 @@ +The seealso package + +Copyright (C) 2014, 2017 by Leo Liu <leoliu.pku(a)gmail.com> + +The package amends the \see and \seealso macros that are used in building +indexes with makeindex, to deal with repetitions, and to ensure page numbers +are present in the actual index entries. + +This work is released under the LPPL v1.3c or later. + +The project is hosted on https://github.com/leo-liu/tex-pkg Binary files old/doc/latex/seealso/seealso.pdf and new/doc/latex/seealso/seealso.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seealso.doc.tlpobj new/tlpkg/tlpobj/seealso.doc.tlpobj --- old/tlpkg/tlpobj/seealso.doc.tlpobj 2016-04-14 19:45:57.000000000 +0200 +++ new/tlpkg/tlpobj/seealso.doc.tlpobj 2017-04-14 18:00:17.000000000 +0200 @@ -1,7 +1,8 @@ name seealso.doc category Package -revision 33449 +revision 43595 shortdesc doc files of seealso relocated 1 -docfiles size=40 +docfiles size=64 + RELOC/doc/latex/seealso/README RELOC/doc/latex/seealso/seealso.pdf ++++++ seealso.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/seealso/seealso.sty new/tex/latex/seealso/seealso.sty --- old/tex/latex/seealso/seealso.sty 2014-04-15 00:52:27.000000000 +0200 +++ new/tex/latex/seealso/seealso.sty 2017-03-24 23:27:33.000000000 +0100 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Leo Liu <leoliu.pku(a)gmail.com> +%% Copyright (C) 2014, 2017 by Leo Liu <leoliu.pku(a)gmail.com> %% -------------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -20,8 +20,20 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{seealso} - [2014/04/10 v1.1 makeidx's see and seealso with page number support.] + [2017/03/23 v1.2 makeidx's see and seealso with page number support.] \RequirePackage{etoolbox} +\long\def\seealso@ifinlist@#1#2#3#4{% + \def\next{#4}% + \def\do##1{% + \ifstrequal{##1}{#2} + {\def\next{#3}\listbreak} + {}}% + \dolistloop{#1}% + \next} +\protected\long\def\seealso@ifinlist#1#2{% + \seealso@ifinlist@{#2}{#1}} +\protected\long\def\seealso@ifinlistcs#1#2{% + \expandafter\seealso@ifinlist@\csname #2\endcsname{#1}} \RequirePackage{kvoptions} \SetupKeyvalOptions{ family=seealso@opt, @@ -62,7 +74,7 @@ \newcommand\DeclareSeealsoMacro[3]{% \newcommand#1[2]{% \seealso@setactivecr - \ifinlistcs{##1}{seealso@#2@list} + \seealso@ifinlistcs{##1}{seealso@#2@list} {} {\listcsgadd{seealso@#2@list}{##1}}% \csuse{seealso@#2@pageformat}{##2}}% @@ -114,7 +126,7 @@ \fi} \let\seealso@enditemlist\empty \def\seealso@enditemlistadd#1{% - \ifinlist{#1}\seealso@enditemlist + \seealso@ifinlist{#1}\seealso@enditemlist {} {\listadd\seealso@enditemlist{#1}}} \define@key{seealso}{enditem}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seealso.tlpobj new/tlpkg/tlpobj/seealso.tlpobj --- old/tlpkg/tlpobj/seealso.tlpobj 2016-04-14 19:45:57.000000000 +0200 +++ new/tlpkg/tlpobj/seealso.tlpobj 2017-04-14 18:00:17.000000000 +0200 @@ -1,6 +1,6 @@ name seealso category Package -revision 33449 +revision 43595 shortdesc Improve the performance of \see macros with makeindex relocated 1 longdesc The package amends the \see and \seealso macros that are used @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/seealso/seealso.sty catalogue-ctan /macros/latex/contrib/seealso -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-24 05:46:05 +0100 catalogue-license lppl1.3 catalogue-topics index -catalogue-version 1.1 +catalogue-version 1.2 ++++++ seetexk.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/dvibook.man1.pdf and new/texmf-dist/doc/man/man1/dvibook.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/dviconcat.man1.pdf and new/texmf-dist/doc/man/man1/dviconcat.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/dviselect.man1.pdf and new/texmf-dist/doc/man/man1/dviselect.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/dvitodvi.man1.pdf and new/texmf-dist/doc/man/man1/dvitodvi.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seetexk.doc.tlpobj new/tlpkg/tlpobj/seetexk.doc.tlpobj --- old/tlpkg/tlpobj/seetexk.doc.tlpobj 2016-04-27 03:24:54.000000000 +0200 +++ new/tlpkg/tlpobj/seetexk.doc.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,8 +1,8 @@ name seetexk.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of seetexk -docfiles size=27 +docfiles size=14 texmf-dist/doc/man/man1/dvibook.1 texmf-dist/doc/man/man1/dvibook.man1.pdf texmf-dist/doc/man/man1/dviconcat.1 ++++++ selectp.doc.tar.xz ++++++ ++++++ selectp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/selectp.tlpobj new/tlpkg/tlpobj/selectp.tlpobj --- old/tlpkg/tlpobj/selectp.tlpobj 2016-04-14 19:46:01.000000000 +0200 +++ new/tlpkg/tlpobj/selectp.tlpobj 2017-04-14 18:00:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/selectp/selectp.sty catalogue-also selectpage pagesel catalogue-ctan /macros/latex/contrib/selectp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics page-control catalogue-version 1.0 ++++++ selnolig.doc.tar.xz ++++++ ++++++ selnolig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/selnolig.tlpobj new/tlpkg/tlpobj/selnolig.tlpobj --- old/tlpkg/tlpobj/selnolig.tlpobj 2016-04-14 19:46:02.000000000 +0200 +++ new/tlpkg/tlpobj/selnolig.tlpobj 2017-04-14 18:00:18.000000000 +0200 @@ -29,7 +29,7 @@ RELOC/tex/lualatex/selnolig/selnolig.lua RELOC/tex/lualatex/selnolig/selnolig.sty catalogue-ctan /macros/luatex/latex/selnolig -catalogue-date 2015-10-26 21:00:20 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting luatex catalogue-version 0.302 ++++++ semantic.doc.tar.xz ++++++ ++++++ semantic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semantic.tlpobj new/tlpkg/tlpobj/semantic.tlpobj --- old/tlpkg/tlpobj/semantic.tlpobj 2016-04-14 19:46:02.000000000 +0200 +++ new/tlpkg/tlpobj/semantic.tlpobj 2017-04-14 18:00:19.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/semantic/shrthand.sty RELOC/tex/latex/semantic/tdiagram.sty catalogue-ctan /macros/latex/contrib/semantic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics comp-sci catalogue-version 2.0 ++++++ semaphor.doc.tar.xz ++++++ ++++++ semaphor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semaphor.tlpobj new/tlpkg/tlpobj/semaphor.tlpobj --- old/tlpkg/tlpobj/semaphor.tlpobj 2016-04-14 19:46:03.000000000 +0200 +++ new/tlpkg/tlpobj/semaphor.tlpobj 2017-04-14 18:00:19.000000000 +0200 @@ -138,6 +138,6 @@ RELOC/tex/latex/semaphor/semaf.fd RELOC/tex/plain/semaphor/semaf.tex catalogue-ctan /fonts/semaphor -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-mf font-type1 font-otf font-specialist ++++++ seminar.doc.tar.xz ++++++ ++++++ seminar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seminar.tlpobj new/tlpkg/tlpobj/seminar.tlpobj --- old/tlpkg/tlpobj/seminar.tlpobj 2016-04-14 19:46:05.000000000 +0200 +++ new/tlpkg/tlpobj/seminar.tlpobj 2017-04-14 18:00:19.000000000 +0200 @@ -32,7 +32,7 @@ RELOC/tex/latex/seminar/tvz-user.sty catalogue-also foiltex slidenotes catalogue-ctan /macros/latex/contrib/seminar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics presentation catalogue-version 1.62 ++++++ semioneside.doc.tar.xz ++++++ ++++++ semioneside.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semioneside.tlpobj new/tlpkg/tlpobj/semioneside.tlpobj --- old/tlpkg/tlpobj/semioneside.tlpobj 2016-04-14 19:46:06.000000000 +0200 +++ new/tlpkg/tlpobj/semioneside.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/semioneside/semioneside.sty catalogue-ctan /macros/latex/contrib/semioneside -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout catalogue-version 0.41 ++++++ semproc.doc.tar.xz ++++++ ++++++ semproc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semproc.tlpobj new/tlpkg/tlpobj/semproc.tlpobj --- old/tlpkg/tlpobj/semproc.tlpobj 2016-04-14 19:46:06.000000000 +0200 +++ new/tlpkg/tlpobj/semproc.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/semproc/semproc.cls catalogue-ctan /macros/latex/contrib/semproc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics semproc catalogue-version 0.1 ++++++ sepfootnotes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sepfootnotes/README new/doc/latex/sepfootnotes/README --- old/doc/latex/sepfootnotes/README 2014-07-24 00:06:48.000000000 +0200 +++ new/doc/latex/sepfootnotes/README 2016-11-25 19:30:02.000000000 +0100 @@ -5,6 +5,9 @@ achieved with commands \sepfootnotecontent and \sepfootnote; the former defines the content of a note, while the latter typesets that note. +2016/07/18 v0.3c + * Package options Note definitions may take global scope + 2014/07/22 v0.3b * Documentation Minor formatting changes to page 4 @@ -38,7 +41,7 @@ *See sepfootnotes.pdf -------------------------------------------------------------------------------- -Copyright (C) 2013, 2014 Eduardo C. Lourenço de Lima +Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html Binary files old/doc/latex/sepfootnotes/sepfootnotes.pdf and new/doc/latex/sepfootnotes/sepfootnotes.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sepfootnotes/sepfootnotes.tex new/doc/latex/sepfootnotes/sepfootnotes.tex --- old/doc/latex/sepfootnotes/sepfootnotes.tex 2014-07-24 00:06:48.000000000 +0200 +++ new/doc/latex/sepfootnotes/sepfootnotes.tex 2016-11-25 19:30:02.000000000 +0100 @@ -1,4 +1,4 @@ -% Copyright (C) 2013, 2014 Eduardo C. Lourenço de Lima +% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -44,11 +44,11 @@ {\begin{center}\begin{minipage}[t]{0.5\linewidth}} {\end{minipage}\end{center}} \newcommand\TODO{\texttt{Todo:}} -\newcommand\fileversion{0.3b} -\newcommand\filedate{July 22, 2014} +\newcommand\fileversion{0.3c} +\newcommand\filedate{July 18, 2016} \begin{document} \title{The \textsf{\color{myblue} sepfootnotes} package,\thanks{This document corresponds to \textsf{sepfootnotes}~\fileversion, dated~\filedate. -I am grateful to Michael Sellhoff and Sam Foster for their valuable feedback on \texttt{sepfootnotes}, and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}} +I am grateful to Michael Sellhoff, Sam Foster, Mats, and David Carlisle for their valuable feedback on \texttt{sepfootnotes} and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}} \author{Eduardo C. Louren\c{c}o de Lima \\ \texttt{elourenco(a)phi.pro.br}} \maketitle @@ -276,6 +276,7 @@ \item[|warn|] Print warning messages. (Default.) \item[|error|] Print warning messages, halt, and wait for user input. \item[|quiet|] Suppress warning and error messages. +\item[|global|] Notes defined within environments and groups take global scope and become available throughout, as if they were defined in the preamble. \end{list} \section{Examples} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sepfootnotes.doc.tlpobj new/tlpkg/tlpobj/sepfootnotes.doc.tlpobj --- old/tlpkg/tlpobj/sepfootnotes.doc.tlpobj 2016-04-14 19:46:06.000000000 +0200 +++ new/tlpkg/tlpobj/sepfootnotes.doc.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -1,6 +1,6 @@ name sepfootnotes.doc category Package -revision 34705 +revision 41732 shortdesc doc files of sepfootnotes relocated 1 docfiles size=59 ++++++ sepfootnotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sepfootnotes/sepfootnotes.sty new/tex/latex/sepfootnotes/sepfootnotes.sty --- old/tex/latex/sepfootnotes/sepfootnotes.sty 2014-07-24 00:06:48.000000000 +0200 +++ new/tex/latex/sepfootnotes/sepfootnotes.sty 2016-11-25 19:33:58.000000000 +0100 @@ -1,4 +1,4 @@ -%% Copyright (C) 2013, 2014 Eduardo C. Lourenço de Lima +%% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -10,18 +10,20 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% -\NeedsTeXFormat{LaTeX2e}[1996/06/01] -\ProvidesPackage{sepfootnotes}[2014/07/22 v0.3b Footnotes in separate file] +\NeedsTeXFormat {LaTeX2e} [1996/06/01] +\ProvidesPackage {sepfootnotes} [2016/07/18 v0.3c Footnotes in separate file] \newcommand\sep@packagename{sepfootnotes} \DeclareOption {quiet} {\sep@opt@quiettrue} \DeclareOption {warn} {\sep@opt@warntrue} \DeclareOption {error} {\sep@opt@errortrue} +\DeclareOption {global} {\sep@opt@globaltrue} \newif \ifsep@opt@quiet \newif \ifsep@opt@warn \newif \ifsep@opt@error +\newif \ifsep@opt@global \sep@opt@warntrue @@ -131,7 +133,7 @@ \newcommand\sep@namedef [3] {\@ifundefined{sepfootnotes@text@#1@#2} - {\@namedef{sepfootnotes@text@#1@#2}{#3}} + {\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}} {\ifsep@opt@error \PackageError {\sep@packagename} {`#2' is already in use} {`#2' is already in use.\MessageBreak @@ -142,7 +144,7 @@ \PackageWarning {\sep@packagename} {`#2' is already in use} \fi}} -\newcommand\sep@namereplace [3] {\@namedef{sepfootnotes@text@#1@#2}{#3}} +\newcommand\sep@namereplace [3] {\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}} % ---------------------------------- marks ------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sepfootnotes.tlpobj new/tlpkg/tlpobj/sepfootnotes.tlpobj --- old/tlpkg/tlpobj/sepfootnotes.tlpobj 2016-04-14 19:46:06.000000000 +0200 +++ new/tlpkg/tlpobj/sepfootnotes.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -1,6 +1,6 @@ name sepfootnotes category Package -revision 34705 +revision 41732 shortdesc Support footnotes and endnotes from separate files relocated 1 longdesc The package supports footnotes and endnotes from separate @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/sepfootnotes/sepfootnotes.sty catalogue-ctan /macros/latex/contrib/sepfootnotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-19 16:05:59 +0200 catalogue-license lppl1.3 catalogue-topics footnote -catalogue-version 0.3b +catalogue-version 0.3c ++++++ sepnum.doc.tar.xz ++++++ ++++++ sepnum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sepnum.tlpobj new/tlpkg/tlpobj/sepnum.tlpobj --- old/tlpkg/tlpobj/sepnum.tlpobj 2016-04-14 19:46:07.000000000 +0200 +++ new/tlpkg/tlpobj/sepnum.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/sepnum/sepnum.sty catalogue-also comma numprint catalogue-ctan /macros/latex/contrib/sepnum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics numbers catalogue-version 2.0 ++++++ seqsplit.doc.tar.xz ++++++ ++++++ seqsplit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seqsplit.tlpobj new/tlpkg/tlpobj/seqsplit.tlpobj --- old/tlpkg/tlpobj/seqsplit.tlpobj 2016-04-14 19:46:07.000000000 +0200 +++ new/tlpkg/tlpobj/seqsplit.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/seqsplit/seqsplit.sty catalogue-ctan /macros/latex/contrib/seqsplit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyph-pseudo catalogue-version 0.1 ++++++ serbian-apostrophe.doc.tar.xz ++++++ ++++++ serbian-apostrophe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-apostrophe.tlpobj new/tlpkg/tlpobj/serbian-apostrophe.tlpobj --- old/tlpkg/tlpobj/serbian-apostrophe.tlpobj 2016-04-14 19:46:07.000000000 +0200 +++ new/tlpkg/tlpobj/serbian-apostrophe.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=18 RELOC/tex/latex/serbian-apostrophe/serbian-apostrophe.sty catalogue-ctan /language/serbian/filipovic/serbian-apostrophe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics serbian ++++++ serbian-date-lat.doc.tar.xz ++++++ ++++++ serbian-date-lat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-date-lat.tlpobj new/tlpkg/tlpobj/serbian-date-lat.tlpobj --- old/tlpkg/tlpobj/serbian-date-lat.tlpobj 2016-04-14 19:46:08.000000000 +0200 +++ new/tlpkg/tlpobj/serbian-date-lat.tlpobj 2017-04-14 18:00:20.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/serbian-date-lat/serbian-date-lat.sty catalogue-ctan /language/serbian/filipovic/serbian-date-lat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics serbian ++++++ serbian-def-cyr.doc.tar.xz ++++++ ++++++ serbian-def-cyr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-def-cyr.tlpobj new/tlpkg/tlpobj/serbian-def-cyr.tlpobj --- old/tlpkg/tlpobj/serbian-def-cyr.tlpobj 2016-04-14 19:46:08.000000000 +0200 +++ new/tlpkg/tlpobj/serbian-def-cyr.tlpobj 2017-04-14 18:00:21.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/serbian-def-cyr/serbian-def-cyr.sty catalogue-ctan /macros/latex/contrib/serbian-def-cyr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics serbian ++++++ serbian-lig.doc.tar.xz ++++++ ++++++ serbian-lig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-lig.tlpobj new/tlpkg/tlpobj/serbian-lig.tlpobj --- old/tlpkg/tlpobj/serbian-lig.tlpobj 2016-04-14 19:46:08.000000000 +0200 +++ new/tlpkg/tlpobj/serbian-lig.tlpobj 2017-04-14 18:00:21.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=19 RELOC/tex/latex/serbian-lig/serbian-lig.sty catalogue-ctan /language/serbian/filipovic/serbian-lig -catalogue-date 2015-12-07 21:47:01 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics serbian ++++++ sesamanuel.doc.tar.xz ++++++ ++++++ sesamanuel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sesamanuel.tlpobj new/tlpkg/tlpobj/sesamanuel.tlpobj --- old/tlpkg/tlpobj/sesamanuel.tlpobj 2016-04-14 19:46:10.000000000 +0200 +++ new/tlpkg/tlpobj/sesamanuel.tlpobj 2017-04-14 18:00:21.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/sesamanuel/sesamanuel.sty RELOC/tex/latex/sesamanuel/sesamanuelTIKZ.sty catalogue-ctan /macros/latex/contrib/sesamanuel -catalogue-date 2015-08-13 17:20:27 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths catalogue-version 0.6 ++++++ setdeck.doc.tar.xz ++++++ ++++++ setdeck.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/setdeck.tlpobj new/tlpkg/tlpobj/setdeck.tlpobj --- old/tlpkg/tlpobj/setdeck.tlpobj 2016-04-19 17:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/setdeck.tlpobj 2017-04-14 18:00:21.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=12 RELOC/tex/latex/setdeck/setdeck.sty catalogue-ctan /graphics/pgf/contrib/setdeck -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics games pgf-tikz catalogue-version 0.1 ++++++ setspace.doc.tar.xz ++++++ ++++++ setspace.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/setspace.tlpobj new/tlpkg/tlpobj/setspace.tlpobj --- old/tlpkg/tlpobj/setspace.tlpobj 2016-04-14 19:46:10.000000000 +0200 +++ new/tlpkg/tlpobj/setspace.tlpobj 2017-04-14 18:00:21.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=6 RELOC/tex/latex/setspace/setspace.sty catalogue-ctan /macros/latex/contrib/setspace -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics line-space catalogue-version 6.7a ++++++ seuthesis.doc.tar.xz ++++++ ++++++ seuthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seuthesis.tlpobj new/tlpkg/tlpobj/seuthesis.tlpobj --- old/tlpkg/tlpobj/seuthesis.tlpobj 2016-04-14 19:46:13.000000000 +0200 +++ new/tlpkg/tlpobj/seuthesis.tlpobj 2017-04-14 18:00:22.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/bibtex/bst/seuthesis/seuthesis.bst catalogue-also seuthesix catalogue-ctan /macros/latex/contrib/seuthesis -catalogue-date 2016-01-22 18:36:52 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics dissertation class catalogue-version 2.1.2 ++++++ seuthesix.doc.tar.xz ++++++ ++++++ seuthesix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seuthesix.tlpobj new/tlpkg/tlpobj/seuthesix.tlpobj --- old/tlpkg/tlpobj/seuthesix.tlpobj 2016-04-14 19:46:17.000000000 +0200 +++ new/tlpkg/tlpobj/seuthesix.tlpobj 2017-04-14 18:00:24.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/seuthesix/seuthesix.cls catalogue-also seuthesis catalogue-ctan /macros/latex/contrib/seuthesix -catalogue-date 2016-03-20 08:01:32 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics dissertation class catalogue-version 1.0.1 ++++++ sf298.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sf298/Makefile new/doc/latex/sf298/Makefile --- old/doc/latex/sf298/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/sf298/Makefile 2016-11-25 19:30:03.000000000 +0100 @@ -0,0 +1,95 @@ +PACKAGE = sf298 +######################################################################## +## LaTeX2e Makefile +## +## Update the following defines for your local configuration, +## +CONTRIB = /usr/share/texmf/tex/latex/misc +## +CP = cp +DVIPS = dvips -t letter +GZIP = gzip +LATEX = latex +MAKEINDEX = makeindex +PDFLATEX = pdflatex +PS2PDF = ps2pdf +RM = rm +TAR = tar +######################################################################## +## make [all] Generates the style (.sty) file, the doc and +## test files (.ps) and cleans up the directory. +## make [un]install Install or uninstall the style (.sty) file from +## the CONTRIB area. +## make [very]clean Clean out various auxillary files. "veryclean" +## cleans out more stuff. +######################################################################## +## make dvi Generate the *.dvi version of the documentation. +## make [full]ps Generate the documentation. The "fullps" version +## adds the change log and the cross-references. +## make idx Generate the change log and the cross-references +## (for fullps -- requires MAKEINDEX). +## make sty Generate the style (.sty) file. +## make pdf Generate the *.pdf version of the documentation. +######################################################################## +## make test Runs test program(s). +## make distribtion Builds a distribution (.tar.gz) file. +######################################################################## + +all: pdf test clean + +install: sty + $(CP) $(PACKAGE).sty $(CONTRIB) +uninstall: ; -$(RM) -f $(CONTRIB)/$(PACKAGE).sty +clean: ; -$(RM) -f *.dvi *.log *.aux *.lof *.lot *.lom *.toc + -$(RM) -f *.idx *.ind *.glo *.gls *.ilg *.out *~ +veryclean: clean + -$(RM) -f *.sty *.cls *.ps *.pdf *.gz *pk ltxdoc.cfg + +dvi: $(PACKAGE).dvi +fullps: dvi idx ps +idx: $(PACKAGE).ind $(PACKAGE).gls + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx +ps: $(PACKAGE).ps +sty: $(PACKAGE).sty +pdf: fullps + $(PS2PDF) $(PACKAGE).ps > $(PACKAGE).pdf + +test: $(PACKAGE).sty + $(LATEX) sample298.tex + $(LATEX) sample298.tex + $(DVIPS) -o sample298.ps sample298.dvi + +distribution: ; mkdir $(PACKAGE) + $(CP) -p Makefile $(PACKAGE).pdf $(PACKAGE) + $(CP) -p $(PACKAGE).dtx $(PACKAGE).ins $(PACKAGE) + $(TAR) -cvf $(PACKAGE).tar ./$(PACKAGE) + $(RM) -rf $(PACKAGE) + $(GZIP) -9 $(PACKAGE).tar + + +$(PACKAGE).aux: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).dvi: $(PACKAGE).dtx $(PACKAGE).sty $(PACKAGE).aux + $(LATEX) $(PACKAGE).dtx + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).glo: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).gls: $(PACKAGE).glo + -$(MAKEINDEX) -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo + +$(PACKAGE).idx: $(PACKAGE).dtx $(PACKAGE).sty + $(LATEX) $(PACKAGE).dtx + +$(PACKAGE).ind: $(PACKAGE).idx + -$(MAKEINDEX) -s gind.ist $(PACKAGE).idx + +$(PACKAGE).ps: $(PACKAGE).dvi + $(DVIPS) -o $(PACKAGE).ps $(PACKAGE).dvi + +$(PACKAGE).sty: $(PACKAGE).dtx $(PACKAGE).ins + $(LATEX) $(PACKAGE).ins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sf298/README.txt new/doc/latex/sf298/README.txt --- old/doc/latex/sf298/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/sf298/README.txt 2016-11-25 19:30:03.000000000 +0100 @@ -0,0 +1,55 @@ +sf298 package +------------- + +Authors +------- +Steven Douglas Cochran +SVC HS Information Technology, M200 Scaife Hall +3550 Terrace Street +Pittsburgh, PA 15261, USA +email: sdc18(a)pitt.edu +(Original Author, versions 1.1 & 1.2) + +and + +Peter Andrew Rochford +Acorn Science & Innovation, Inc. +1616 Anderson Road, Suite 213 +McLean, VA 22102, USA +email: prochford(a)acornsi.com +(Author, version 1.3) + +Purpose +------- +The sf298 package provides for creating a filled-in copy of the standard form +298 (Rev. 8/98), ``Report Documentation Page''. This form is used in announcing +and cataloging reports submitted as deliverables on contracts with the U.S. +Government. It is important that the information on the sf298 page be +consistent with the rest of the report, particularly the cover and title page. +Instructions for filling in each block of the form are given in the documentation +file (sf298.pdf) distributed with the package. The macro \MakeRptDocPage causes +the page to be printed. If the "twoside" option is specified in the +documentclass, then it is printed as a separate page with a blank back. The +macro \GeneralInstructions causes the page of general instructions that +accompanies the form to be printed. This is typically inserted after the +sf298 form. + +License +------- +Copyright (C) 2000,2004 Steven Douglas Cochran. + +The copyright remains with the above author. + +The sf298 package may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.2 +of this license or (at your option) any later version. The latest +version of this license is in: + http://www.latex-project.org/lppl.txt +and version 1.2 or later is part of all distributions of LaTeX +version 1999/12/01 or later. + +The sf298 package is distributed in the hope that it will be +useful, but `as is', WITHOUT WARRANTY OF ANY KIND, either expressed +or implied, including, but not limited to, the implied warranties of +MERCHANTABILITY and FITNESS FOR A PARTICULAR PURPOSE. See the LaTeX +Project Public License for more details. Binary files old/doc/latex/sf298/sample298.pdf and new/doc/latex/sf298/sample298.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sf298/sample298.tex new/doc/latex/sf298/sample298.tex --- old/doc/latex/sf298/sample298.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/sf298/sample298.tex 2016-11-25 19:30:03.000000000 +0100 @@ -28,6 +28,13 @@ %% \documentclass[twoside]{article} \usepackage{sf298} + + \setlength{\parindent}{5ex} + \setlength{\paperwidth}{8.5in} + \setlength{\textwidth}{6.5in} + \setlength{\oddsidemargin}{0in} + \setlength{\evensidemargin}{0in} + \makeatletter \renewcommand{\@maketitle}{% \newpage @@ -51,10 +58,6 @@ \newcommand{\showabstract}{% \noindent \sf@Abstract} -\newcommand{\ReportDescription}{% - \global\let\thanks\@gobble - \MakeRptDocPage - \global\let\thanks\relax} \makeatother \date{June 1996} \ReportDate{10--06--1996} @@ -119,6 +122,8 @@ \ReportDescription +\GeneralInstructions{small} + \tableofcontents \cleardoublepage \pagenumbering{arabic} Binary files old/doc/latex/sf298/sf298.pdf and new/doc/latex/sf298/sf298.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sf298.doc.tlpobj new/tlpkg/tlpobj/sf298.doc.tlpobj --- old/tlpkg/tlpobj/sf298.doc.tlpobj 2016-04-14 19:46:17.000000000 +0200 +++ new/tlpkg/tlpobj/sf298.doc.tlpobj 2017-04-14 18:00:24.000000000 +0200 @@ -1,9 +1,10 @@ name sf298.doc category Package -revision 15878 +revision 41653 shortdesc doc files of sf298 relocated 1 -docfiles size=89 - RELOC/doc/latex/sf298/sample298.pdf +docfiles size=106 + RELOC/doc/latex/sf298/Makefile + RELOC/doc/latex/sf298/README.txt RELOC/doc/latex/sf298/sample298.tex RELOC/doc/latex/sf298/sf298.pdf ++++++ sf298.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sf298/sf298.sty new/tex/latex/sf298/sf298.sty --- old/tex/latex/sf298/sf298.sty 2006-01-13 01:06:31.000000000 +0100 +++ new/tex/latex/sf298/sf298.sty 2016-11-25 19:33:58.000000000 +0100 @@ -8,6 +8,8 @@ %% %% Copyright (C) 2000,2005 Steven Douglas Cochran. %% +%% The copyright remains with the above author. +%% %% This file is NOT the source for sf298, because almost all comments %% have been stripped from it. It is NOT the preferred form of sf298 for %% making modifications to it. @@ -27,11 +29,20 @@ %% Project Public License for more details. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sf298}[2004/12/22 Standard Form 298] -\typeout{Package: sf298 2004/12/22 v1.2)} +\ProvidesPackage{sf298}[2016/07/07 Standard Form 298] +\typeout{Package: sf298 2016/07/07 v1.3)} +\providecommand{\eg}{{\it e.g.\/\ }} \IfFileExists{totpages.sty}{% \usepackage{totpages} \newcounter{sf@page}}{} +\IfFileExists{multicol.sty}{% + \usepackage{multicol}} + {\PackageError {sf298}{The multicol package was not found.} + {Install the multicol package on your system.}} +\IfFileExists{fancyhdr.sty}{% + \usepackage{fancyhdr}} + {\PackageError {sf298}{The fancyhdr package was not found.} + {Install the fancyhdr package on your system.}} \newcommand\ReportDate[1]{\renewcommand\sf@ReportDate{#1}} \newcommand\sf@ReportDate{\number\day--\number\month--\number\year} \newcommand\ReportType[1]{\renewcommand\sf@ReportType{#1}} @@ -96,6 +107,9 @@ \newcommand\sf@NumberPages{\relax} \newcommand\sf@SNumberPages[1]{\renewcommand\sf@ExtraPages{#1}} \newcommand\sf@ExtraPages{0} +\fancypagestyle{sf298FormIDStyle} +{\fancyhf{}\renewcommand{\headrulewidth}{0pt} +\fancyfoot[R]{\footnotesize {\bfseries Standard Form 298 Back} (Rev.\ 8/98)} } \DeclareOption{config}{\def\sf@config{Y}} \DeclareOption{noconfig}{\def\sf@config{N}} \newif\ifsf@floatlongboxes @@ -134,6 +148,10 @@ \newcommand{\sf@settitlefontF}{\sf@setfont{\sf@titlefontF}{9.5pt}} \DeclareFixedFont{\sf@entryfont}{OT1}{\rmdefault}{m}{n}{\@xpt} \newcommand{\sf@setentryfont}{\sf@setfont{\sf@entryfont}{11pt}} +\DeclareFixedFont{\sf@revfontbold}{OT1}{\sfdefault}{bx}{n}{9pt} +\newcommand{\sf@setrevfontbold}{\sf@setfont{\sf@revfontbold}{10pt}} +\DeclareFixedFont{\sf@revfont}{OT1}{\sfdefault}{m}{n}{9pt} +\newcommand{\sf@setrevfont}{\sf@setfont{\sf@revfont}{10pt}} \newif\ifsf@undef \sf@undeffalse \newcommand{\sf@undefined}[1][\@empty]{% @@ -156,6 +174,10 @@ \sf@undefined[#1] \fi} \AtEndDocument{\sf@undefined} +\newcommand{\ReportDescription}{% + \global\let\thanks\@gobble + \MakeRptDocPage + \global\let\thanks\relax} \newcommand\MakeRptDocPage{% \newpage \if@twoside\ifodd\c@page\else @@ -287,6 +309,10 @@ \global\let\sf@settitlefontF\relax \global\let\sf@entryfont\relax \global\let\sf@setentryfont\relax + \global\let\sf@revfontbold\relax + \global\let\sf@setrevfontbold\relax + \global\let\sf@revfont\relax + \global\let\sf@setrevfont\relax \global\let\sf@checkfield\relax \global\let\sf@parbox\relax \global\let\sf@drawform\relax @@ -438,10 +464,10 @@ \put(324, 0){\makebox(215, 24)[tl]{% \sf@settitlefontE\sf@strut 19b.\ TELEPHONE NUMBER \sf@settitlefontF (include area code)}} - \put(415,-17){\makebox(123, 17)[bl]{% + \put(405,-25){\makebox(123, 17)[bl]{% \shortstack[l]{% - {\sf@settitlefontE Standard Form 298 (Rev.\ 8--98)}\\[-2pt]% - {\sf@settitlefontD Prescribed by ANSI Std.\ Z39.18}}}} + {{\sf@setrevfontbold Standard Form 298} \sf@setrevfont (Rev.\ 8/98)}\\[-2pt]% + {\sf@setrevfont Prescribed by ANSI Std.\ Z39.18}}}} % Fill in form \put( 4,614){\makebox(0,0)[bl]{\sf@ReportDate}} \put(148,614){\makebox(0,0)[bl]{\sf@ReportType}} @@ -513,6 +539,126 @@ \put(328, 33){\makebox(0,0)[l]{\sf@ResponsiblePerson}} \put(328, 9){\makebox(0,0)[l]{\sf@RPTelephone}} \end{picture}} +\newcommand\GeneralInstructions[1]{% + \global\let\thanks\@gobble + \MakeGenInsPage{#1} + \global\let\thanks\relax} +\newcommand\MakeGenInsPage[1]{% + \newpage + \if@twoside\ifodd\c@page\else + \null + \thispagestyle{empty}% + \newpage + \fi\fi + \vspace{1ex} + + \thispagestyle{sf298FormIDStyle} % insert document code in footer +\begin{#1} % set font size +\noindent +\fbox{\begin{minipage}{\textwidth} +\vspace{3ex} +\begin{center} +\textbf{INSTRUCTIONS FOR COMPLETING SF 298} +\end{center} + +\vspace{1ex} + +\setlength{\columnsep}{0.8cm} +\setlength{\columnseprule}{0.2pt} +\vspace{-4ex} + +\begin{multicols}{2} +\noindent +\textbf{1.~REPORT DATE.} Full publication date including day, month, +and year, if available. Must cite at least the year and be Year 2000 +compliant, \eg 30-06-1998; xx-06-1998; xx-xx-1998.\hfill +\\ \\ \noindent +\textbf{2.~REPORT TYPE.} State the type of report, such as final, +technical, interim, memorandum, master's thesis, progress, quarterly, +research, special, group study, etc.\hfill +\\ \\ \noindent +\textbf{3.~DATE COVERED.} Indicate the time during which the work was +performed and the report was written, \eg, Jun 1997 - Jun 1998; +1-10 Jun 1996; May - Nov 1998; Nov 1998.\hfill +\\ \\ \noindent +\textbf{4.~TITLE.} Enter title and subtitle with volume number and part +number, if applicable. On classified documents, enter the title +classification in parentheses.\hfill +\\ \\ \noindent +\textbf{5a.~CONTRACT NUMBER.} Enter all contract numbers as they +appear in the report, \eg F33315-86-C-5169.\hfill +\\ \\ \noindent +\textbf{5b.~GRANT NUMBER.} Enter all grant numbers as they appear in the +report. \eg AFOSR-82-1234.\hfill +\\ \\ \noindent +\textbf{5c.~PROGRAM ELEMENT NUMBER.} Enter all program element numbers +as they appear in the report, \eg 61101A.\hfill +\\ \\ \noindent +\textbf{5e.~TASK NUMBER.} Enter all task numbers as they appear in the +report, \eg 05; RF0330201; T4112.\hfill +\\ \\ \noindent +\textbf{5f.~WORK UNIT NUMBER.} Enter all work unit numbers as they +appear in the report, \eg 001; AFAPL30480105.\hfill +\\ \\ \noindent +\textbf{6.~AUTHOR(S).} Enter name(s) of person(s) responsible +for writing the report, performing the research, or credited with the +content of the report. The form of entry is the last name, first name, +middle initial, and additional qualifiers separated by commas, \eg Smith, +Richard, J, Jr.\hfill +\\ \\ \noindent +\textbf{7.~PERFORMING ORGANIZATION NAME(S) AND ADDRESS(ES).} Self-explanatory. \hfill +\vfill +\columnbreak + +\noindent +\textbf{8.~PERFORMING ORGANIZATION REPORT NUMBER.} Enter all unique +alphanumeric report numbers assigned by the performing organization, +\eg BRL-1234; AFWL-TR-85-4017-Vol-21-PT-2.\hfill +\\ \\ \noindent +\textbf{9.~SPONSORING/MONITORING AGENCY NAME(S) AND ADDRESS(ES).} Enter +the name and address of the organization(s) financially responsible for +and monitoring the work.\hfill +\\ \\ \noindent +\textbf{10.~SPONSOR/MONITOR'S ACRONYM(S).} Enter, if available, \eg BRL, +ARDEC, NADC.\hfill +\\ \\ \noindent +\textbf{11.~SPONSOR/MONITOR'S REPORT NUMBER(S).} Enter report number as +assigned by the sponsoring/ monitoring agency, if available, \eg BRL-TR-829; +-215.\hfill +\\ \\ \noindent +\textbf{12.~DISTRIBUTION/AVAILABILITY STATEMENT.} Use agency-mandated +availability statements to indicate the public availability or distribution + limitations of the report. If additional limitations/ restrictions or + special markings are indicated, follow agency authorization procedures, + \eg RD/FRD, PROPIN, ITAR, etc. Include copyright information.\hfill +\\ \\ \noindent +\textbf{13.~SUPPLEMENTARY NOTES.} Enter information not included elsewhere +such as: prepared in cooperation with; translation of; report supersedes; +old edition number, etc.\hfill +\\ \\ \noindent +\textbf{14.~ABSTRACT.} A brief (approximately 200 words) factual summary +of the most significant information.\hfill +\\ \\ \noindent +\textbf{15.~SUBJECT TERMS.} Key words or phrases identifying major concepts +in the report.\hfill +\\ \\ \noindent +\textbf{16.~SECURITY CLASSIFICATION.} Enter security classification in +accordance with security classification regulations, \eg U, C, S, etc. If +this form contains classified information, stamp classification level on +the top and bottom of this page.\hfill +\\ \\ \noindent +\textbf{17.~LIMITATION OF ABSTRACT.} This block must be completed to assign +a distribution limitation to the abstract. Enter UU (Unclassified Unlimited) +or SAR (Same as Report). An entry in this block is necessary if the abstract +is to be limited. \hfill + +\end{multicols} +\end{minipage} +} +\end{#1} + +\normalsize % return font to normal size +} \endinput %% %% End of file `sf298.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sf298.tlpobj new/tlpkg/tlpobj/sf298.tlpobj --- old/tlpkg/tlpobj/sf298.tlpobj 2016-04-14 19:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/sf298.tlpobj 2017-04-14 18:00:24.000000000 +0200 @@ -1,16 +1,16 @@ name sf298 category Package -revision 15878 +revision 41653 shortdesc Standard form 298 relocated 1 longdesc A LaTeX package for generating a completed standard form 298 longdesc (Rev. 8-98) as prescribed by ANSI Std. Z39.18 for report longdesc documentation as part of a document delivered, for instance, on longdesc a U.S. government contract. -runfiles size=6 +runfiles size=7 RELOC/tex/latex/sf298/sf298.sty catalogue-ctan /macros/latex/contrib/sf298 -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-07-07 19:37:12 +0200 +catalogue-license lppl1.2 catalogue-topics report-like -catalogue-version 1.2 +catalogue-version 1.3 ++++++ sffms.doc.tar.xz ++++++ ++++++ sffms.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sffms.tlpobj new/tlpkg/tlpobj/sffms.tlpobj --- old/tlpkg/tlpobj/sffms.tlpobj 2016-04-14 19:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/sffms.tlpobj 2017-04-14 18:00:24.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/sffms/sffms.cls RELOC/tex/latex/sffms/sffsmart.sty catalogue-ctan /macros/latex/contrib/sffms -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class publisher catalogue-version 2.0 ++++++ sfg.doc.tar.xz ++++++ ++++++ sfg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sfg.tlpobj new/tlpkg/tlpobj/sfg.tlpobj --- old/tlpkg/tlpobj/sfg.tlpobj 2016-04-14 19:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/sfg.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=6 RELOC/tex/latex/sfg/sfg.sty catalogue-ctan /macros/latex/contrib/sfg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram pstricks catalogue-version 0.91 ++++++ sfmath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sfmath.tlpobj new/tlpkg/tlpobj/sfmath.tlpobj --- old/tlpkg/tlpobj/sfmath.tlpobj 2016-04-14 19:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/sfmath.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/sfmath/sfmath.sty catalogue-also sansmath catalogue-ctan /macros/latex/contrib/sfmath/sfmath.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-maths maths catalogue-version 0.8 ++++++ sgame.doc.tar.xz ++++++ ++++++ sgame.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sgame.tlpobj new/tlpkg/tlpobj/sgame.tlpobj --- old/tlpkg/tlpobj/sgame.tlpobj 2016-04-14 19:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/sgame.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/sgame/sgame.sty RELOC/tex/latex/sgame/sgamevar.sty catalogue-ctan /macros/latex/contrib/sgame -catalogue-date 2015-09-01 06:39:04 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games catalogue-version 2.15 ++++++ shade.doc.tar.xz ++++++ ++++++ shade.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shade.tlpobj new/tlpkg/tlpobj/shade.tlpobj --- old/tlpkg/tlpobj/shade.tlpobj 2016-04-14 19:46:19.000000000 +0200 +++ new/tlpkg/tlpobj/shade.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/shade/shade.tex catalogue-also shadebox catalogue-ctan /macros/generic/shade -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics decoration catalogue-version 1 ++++++ shadethm.doc.tar.xz ++++++ ++++++ shadethm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shadethm.tlpobj new/tlpkg/tlpobj/shadethm.tlpobj --- old/tlpkg/tlpobj/shadethm.tlpobj 2016-04-14 19:46:19.000000000 +0200 +++ new/tlpkg/tlpobj/shadethm.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/latex/shadethm/shadein.sth RELOC/tex/latex/shadethm/shadethm.sty catalogue-ctan /macros/latex/contrib/shadethm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-theorem decoration ++++++ shadow.doc.tar.xz ++++++ ++++++ shadow.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shadow.tlpobj new/tlpkg/tlpobj/shadow.tlpobj --- old/tlpkg/tlpobj/shadow.tlpobj 2016-04-14 19:46:19.000000000 +0200 +++ new/tlpkg/tlpobj/shadow.tlpobj 2017-04-14 18:00:25.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/latex/shadow/shadow.sty catalogue-also fancybox catalogue-ctan /macros/latex/contrib/shadow -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics decoration ++++++ shadowtext.doc.tar.xz ++++++ ++++++ shadowtext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shadowtext.tlpobj new/tlpkg/tlpobj/shadowtext.tlpobj --- old/tlpkg/tlpobj/shadowtext.tlpobj 2016-04-14 19:46:19.000000000 +0200 +++ new/tlpkg/tlpobj/shadowtext.tlpobj 2017-04-14 18:00:26.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/shadowtext/shadowtext.sty catalogue-ctan /macros/latex/contrib/shadowtext -catalogue-date 2016-01-22 18:39:47 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics decoration catalogue-version 0.3 ++++++ shapepar.doc.tar.xz ++++++ ++++++ shapepar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shapepar.tlpobj new/tlpkg/tlpobj/shapepar.tlpobj --- old/tlpkg/tlpobj/shapepar.tlpobj 2016-04-14 19:46:20.000000000 +0200 +++ new/tlpkg/tlpobj/shapepar.tlpobj 2017-04-14 18:00:26.000000000 +0200 @@ -24,7 +24,7 @@ RELOC/tex/generic/shapepar/shapepar.sty RELOC/tex/generic/shapepar/triangleshapes.def catalogue-ctan /macros/latex/contrib/shapepar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics micro-layout catalogue-version 2.2 ++++++ shapes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shapes.doc.tlpobj new/tlpkg/tlpobj/shapes.doc.tlpobj --- old/tlpkg/tlpobj/shapes.doc.tlpobj 2016-04-14 19:46:20.000000000 +0200 +++ new/tlpkg/tlpobj/shapes.doc.tlpobj 2017-04-14 18:00:26.000000000 +0200 @@ -1,6 +1,6 @@ name shapes.doc category Package -revision 38024 +revision 42428 shortdesc doc files of shapes relocated 1 docfiles size=51 ++++++ shapes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shapes.tlpobj new/tlpkg/tlpobj/shapes.tlpobj --- old/tlpkg/tlpobj/shapes.tlpobj 2016-04-14 19:46:20.000000000 +0200 +++ new/tlpkg/tlpobj/shapes.tlpobj 2017-04-14 18:00:26.000000000 +0200 @@ -1,6 +1,6 @@ name shapes category Package -revision 38024 +revision 42428 shortdesc Draw polygons, reentrant stars, and fractions in circles with MetaPost relocated 1 longdesc The shapes set of macros allows drawing regular polygons; their @@ -10,7 +10,7 @@ runfiles size=2 RELOC/metapost/shapes/shapes.mp catalogue-ctan /graphics/metapost/contrib/macros/shapes -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths catalogue-version 1.1 ++++++ shdoc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shdoc/README new/doc/latex/shdoc/README --- old/doc/latex/shdoc/README 2016-05-03 01:56:09.000000000 +0200 +++ new/doc/latex/shdoc/README 2016-11-25 19:30:04.000000000 +0100 @@ -1,4 +1,4 @@ - Copyright 2015 Simon M. Laube + Copyright 2016 Simon M. Laube This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -16,7 +16,7 @@ environment that can be used to document operations or command executions of a terminal session on a shell. - The current version of the package is v2.1. + The current version of the package is v2.1b. To create the package (*.sty) from source open a command line prompt, change to the package directory and type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shdoc/README.txt new/doc/latex/shdoc/README.txt --- old/doc/latex/shdoc/README.txt 2016-05-03 01:56:09.000000000 +0200 +++ new/doc/latex/shdoc/README.txt 2016-11-25 19:30:04.000000000 +0100 @@ -1,4 +1,4 @@ - Copyright 2015 Simon M. Laube + Copyright 2016 Simon M. Laube This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -16,7 +16,7 @@ environment that can be used to document operations or command executions of a terminal session on a shell. - The current version of the package is v2.1. + The current version of the package is v2.1b. To create the package (*.sty) from source open a command line prompt, change to the package directory and type Binary files old/doc/latex/shdoc/shdoc.pdf and new/doc/latex/shdoc/shdoc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shdoc/shreformat.sh new/doc/latex/shdoc/shreformat.sh --- old/doc/latex/shdoc/shreformat.sh 2016-05-03 01:56:09.000000000 +0200 +++ new/doc/latex/shdoc/shreformat.sh 2016-11-25 19:30:04.000000000 +0100 @@ -4,6 +4,6 @@ # the LaTeX package 'shdoc' (see ctan.org/pkg/shdoc) # 1. read from shrun.tmp and substitute double tabs with two spaces -# 2. substitute single tabs with a single space +# 2. substitute single tabs with single spaces # 3. remove all leading spaces and save the output to shrun-formatted.tmp sed 's/\t\t/ /' <shrun.tmp | sed 's/\t/ /' | sed -e 's/^[ \t]*//' >shrun-formatted.tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shdoc.doc.tlpobj new/tlpkg/tlpobj/shdoc.doc.tlpobj --- old/tlpkg/tlpobj/shdoc.doc.tlpobj 2016-05-03 03:19:22.000000000 +0200 +++ new/tlpkg/tlpobj/shdoc.doc.tlpobj 2017-04-14 18:00:26.000000000 +0200 @@ -1,6 +1,6 @@ name shdoc.doc category Package -revision 40848 +revision 41991 shortdesc doc files of shdoc relocated 1 docfiles size=137 ++++++ shdoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shdoc/shdoc.sty new/tex/latex/shdoc/shdoc.sty --- old/tex/latex/shdoc/shdoc.sty 2016-05-03 01:56:09.000000000 +0200 +++ new/tex/latex/shdoc/shdoc.sty 2016-11-25 19:33:58.000000000 +0100 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2015 Simon M. Laube +%% Copyright 2016 Simon M. Laube %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -23,7 +23,7 @@ %% The Current Maintainer of this work is S. M. Laube %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{shdoc}[2015/05/24 v2.1 Package for documenting shell operations] +\ProvidesPackage{shdoc}[2016/09/04 v2.1b Package for documenting shell operations] \RequirePackage[dvipsnames]{xcolor} \RequirePackage{float} \RequirePackage{caption} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shdoc.tlpobj new/tlpkg/tlpobj/shdoc.tlpobj --- old/tlpkg/tlpobj/shdoc.tlpobj 2016-05-03 03:19:22.000000000 +0200 +++ new/tlpkg/tlpobj/shdoc.tlpobj 2017-04-14 18:00:27.000000000 +0200 @@ -1,6 +1,6 @@ name shdoc category Package -revision 40848 +revision 41991 shortdesc Float environment to document the shell commands of a terminal session relocated 1 longdesc The package provides a simple, though fancy float environment @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/shdoc/shdoc.sty catalogue-ctan /macros/latex/contrib/shdoc -catalogue-date 2016-04-29 09:53:12 +0200 +catalogue-date 2016-09-04 18:33:35 +0200 catalogue-license lppl1.3 -catalogue-topics synt-hlt -catalogue-version 2.1 +catalogue-topics synt-hlt float listing +catalogue-version 2.1b ++++++ shipunov.doc.tar.xz ++++++ ++++++ shipunov.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shipunov.tlpobj new/tlpkg/tlpobj/shipunov.tlpobj --- old/tlpkg/tlpobj/shipunov.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/shipunov.tlpobj 2017-04-14 18:00:28.000000000 +0200 @@ -43,7 +43,7 @@ RELOC/tex/latex/shipunov/sltables.sty RELOC/tex/latex/shipunov/starfn.sty catalogue-ctan /macros/latex/contrib/shipunov -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics collection catalogue-version 1.1 ++++++ shorttoc.doc.tar.xz ++++++ ++++++ shorttoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shorttoc.tlpobj new/tlpkg/tlpobj/shorttoc.tlpobj --- old/tlpkg/tlpobj/shorttoc.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/shorttoc.tlpobj 2017-04-14 18:00:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/shorttoc/shorttoc.sty catalogue-ctan /macros/latex/contrib/shorttoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics toc-etc catalogue-version 1.3 ++++++ show2e.doc.tar.xz ++++++ ++++++ show2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/show2e.tlpobj new/tlpkg/tlpobj/show2e.tlpobj --- old/tlpkg/tlpobj/show2e.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/show2e.tlpobj 2017-04-14 18:00:28.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/show2e/show2e.sty catalogue-ctan /macros/latex/contrib/show2e -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics debug-supp catalogue-version 1.0 ++++++ showcharinbox.doc.tar.xz ++++++ ++++++ showcharinbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showcharinbox.tlpobj new/tlpkg/tlpobj/showcharinbox.tlpobj --- old/tlpkg/tlpobj/showcharinbox.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/showcharinbox.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/showcharinbox/showcharinbox.sty catalogue-ctan /macros/latex/contrib/showcharinbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-devel catalogue-version 0.1 ++++++ showdim.doc.tar.xz ++++++ ++++++ showdim.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showdim.tlpobj new/tlpkg/tlpobj/showdim.tlpobj --- old/tlpkg/tlpobj/showdim.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/showdim.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/showdim/showdim.sty catalogue-ctan /macros/latex/contrib/showdim/showdim.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics debug-supp catalogue-version 1.2 ++++++ showexpl.doc.tar.xz ++++++ Binary files old/doc/latex/showexpl/showexpl-test.pdf and new/doc/latex/showexpl/showexpl-test.pdf differ Binary files old/doc/latex/showexpl/showexpl.pdf and new/doc/latex/showexpl/showexpl.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showexpl.doc.tlpobj new/tlpkg/tlpobj/showexpl.doc.tlpobj --- old/tlpkg/tlpobj/showexpl.doc.tlpobj 2016-04-14 19:46:23.000000000 +0200 +++ new/tlpkg/tlpobj/showexpl.doc.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -1,9 +1,9 @@ name showexpl.doc category Package -revision 32737 +revision 42677 shortdesc doc files of showexpl relocated 1 -docfiles size=149 +docfiles size=150 RELOC/doc/latex/showexpl/README RELOC/doc/latex/showexpl/result-picture.pdf RELOC/doc/latex/showexpl/showexpl-test.pdf ++++++ showexpl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/showexpl/showexpl.sty new/tex/latex/showexpl/showexpl.sty --- old/tex/latex/showexpl/showexpl.sty 2014-01-21 00:17:40.000000000 +0100 +++ new/tex/latex/showexpl/showexpl.sty 2016-12-12 00:01:12.000000000 +0100 @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{showexpl} - [2014/01/19 v0.3l Typesetting example code (RN)] + [2016/12/11 v0.3o Typesetting example code (RN)] \DeclareOption{final}{% \PassOptionsToPackage{\CurrentOption}{graphicx}% \PassOptionsToPackage{\CurrentOption}{listings}% @@ -71,6 +71,9 @@ }% }% \newbox\SX@ResBox +\newcommand\ResultBox{} \let\ResultBox=\fbox +\newdimen\ResultBoxSep \ResultBoxSep=\fboxsep +\newdimen\ResultBoxRule \ResultBoxRule=\fboxrule \newcommand*\SX@pos{} \newcommand*\SX@width{} \newcommand*\SX@hsep{} @@ -167,20 +170,19 @@ {\vskip-\belowcaptionskip}{}% \fi } -\lstnewenvironment{LTXexample}[1][] -{% +\lstnewenvironment{LTXexample}[1][]{% \@temptokena{#1}% \begingroup - \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne - \expandafter\lstset\expandafter{\SX@explpreset,#1}% - \edef\x{\endgroup - \def\noexpand\SX@codefile{\SX@codefile}% - \def\noexpand\SX@graphicname{\SX@graphicname}% - \def\noexpand\SX@graphicparam{\SX@graphicparam}}% + \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne + \expandafter\lstset\expandafter{\SX@explpreset,#1}% + \edef\x{\endgroup + \def\noexpand\SX@codefile{\SX@codefile}% + \def\noexpand\SX@graphicname{\SX@graphicname}% + \def\noexpand\SX@graphicparam{\SX@graphicparam}}% \x - \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile, + \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile,% graphic={[\SX@graphicparam]{\SX@graphicname}}}% - \setbox\@tempboxa=\hbox\bgroup% Warum noetig? + \setbox\@tempboxa=\hbox\bgroup \lst@BeginWriteFile{\SX@codefile}% } {% @@ -218,8 +220,8 @@ \ifx\SX@rframe\@empty \long\def\SX@frame##1{##1}% \else - \let\SX@frame\fbox - \setlength\@tempdima{\SX@width-2\fboxsep-2\fboxrule}% + \let\SX@frame\ResultBox + \setlength\@tempdima{\SX@width-2\ResultBoxSep-2\ResultBoxRule}% \edef\SX@width{\the\@tempdima}% \fi \isSX@odd{\def\@tempa{l}}{\def\@tempa{r}}% @@ -228,10 +230,11 @@ \let\@addtofilelist\@gobble \let\lst@ifdisplaystyle=\iftrue \SX@KillAboveCaptionskip\lst@MakeCaption{t}% - \lst@belowskip=\z@ \let\SX@MakeCaption\lst@MakeCaption \let\lst@MakeCaption\@gobble{} \setbox\SX@ResBox\hbox{% + \fboxsep=\ResultBoxSep + \fboxrule=\ResultBoxRule \SX@frame{% \@nameuse{\if@SX@varwidth varwidth\else minipage\fi}% \SX@width\relax @@ -366,8 +369,8 @@ \g@addto@macro\SX@@explpreset{,xleftmargin=0pt,xrightmargin=0pt}% \fi \SX@Info - \expandafter\lstinputlisting\expandafter% - [\SX@@explpreset,nolol=true,caption={}]{\SX@codefile}% + \expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,% + caption={},belowskip=\z@,aboveskip=\z@]{\SX@codefile}% \endgroup }% \newcommand*\LTXinputExample[2][]{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showexpl.tlpobj new/tlpkg/tlpobj/showexpl.tlpobj --- old/tlpkg/tlpobj/showexpl.tlpobj 2016-04-14 19:46:24.000000000 +0200 +++ new/tlpkg/tlpobj/showexpl.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -1,6 +1,6 @@ name showexpl category Package -revision 32737 +revision 42677 shortdesc Typesetting LaTeX source code relocated 1 longdesc This package provides a way to typeset LaTeX source code and @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/showexpl/showexpl.sty catalogue-ctan /macros/latex/contrib/showexpl -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-12-11 13:56:29 +0100 +catalogue-license lppl1.2 catalogue-topics listing -catalogue-version 0.3l +catalogue-version 0.3o ++++++ showhyphens.doc.tar.xz ++++++ ++++++ showhyphens.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showhyphens.tlpobj new/tlpkg/tlpobj/showhyphens.tlpobj --- old/tlpkg/tlpobj/showhyphens.tlpobj 2016-04-14 19:46:24.000000000 +0200 +++ new/tlpkg/tlpobj/showhyphens.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/lualatex/showhyphens/showhyphens.sty catalogue-ctan /macros/luatex/latex/showhyphens -catalogue-date 2016-02-19 15:31:25 +0100 -catalogue-license other-free +catalogue-date 2016-12-18 08:34:28 +0100 +catalogue-license mit catalogue-topics hyph-gen luatex catalogue-version 0.5c ++++++ showlabels.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/showlabels/README new/doc/latex/showlabels/README --- old/doc/latex/showlabels/README 2015-12-12 00:19:23.000000000 +0100 +++ new/doc/latex/showlabels/README 2016-11-25 19:30:04.000000000 +0100 @@ -4,7 +4,7 @@ Put the names of `\labels` and other commands into the margins of a draft document. -Version 1.7, 2015 December 8, http://purl.org/nxg/dist/showlabels. +Version 1.8, 2016 June 9, http://purl.org/nxg/dist/showlabels. This class option helps you keep track of all the labels in your documents, by putting the name of the new label into the margin @@ -25,8 +25,12 @@ The source code for the package is maintained at [bitbucket.org](https://bitbucket.org/nxg/showlabels). This site -includes an issue tracker, where you can report bugs (or just mail -me). +includes an issue tracker, where you can report bugs (or just mail me). + +This work is Copyright 1999, 2001-09, 2013-16, Norman Gray, and may be +distributed and/or modified under the conditions of the LaTeX Project +Public Licence, either version 1.3 of this licence or (at your option) +any later version. See the distributed file lppl.txt for details. For more information, see showlabels.html in the distribution. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/showlabels/VERSION new/doc/latex/showlabels/VERSION --- old/doc/latex/showlabels/VERSION 2015-12-12 00:19:23.000000000 +0100 +++ new/doc/latex/showlabels/VERSION 2016-11-25 19:30:04.000000000 +0100 @@ -1 +1 @@ -showlabels-1.7 +1.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/showlabels/showlabels.html new/doc/latex/showlabels/showlabels.html --- old/doc/latex/showlabels/showlabels.html 2015-12-12 00:19:23.000000000 +0100 +++ new/doc/latex/showlabels/showlabels.html 2016-11-25 19:30:04.000000000 +0100 @@ -4,8 +4,269 @@ <head> <title>Showlabels</title> <link href="http://nxg.me.uk" rev="author"/> -<link type="text/css" rel="stylesheet" - href="style.css"/> + +<style type='text/css'> +body { + color: #333; + background: white; + margin-left: +30%; + width: 50%; /* body is 50% of screen width */ + padding: 0.5em; /* this will make a difference if I decide to + have the background a different colour */ + /* I can't decide on font: Optima's always nice, but Gill looks + agreeably intense. Helvetica's a decent fallback. */ + font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif; + /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */ + /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */ + /* I seem to have used 11pt at some point in the past, but this + is far too big -- did I ever have a reason for that, or is it + just due to browser changes? */ + font-size: 10pt; + line-height: 150%; +} + +/* adapt to wider screens */ +@media screen and (min-width: 700pt) { + body { + margin-left: 210pt; + width: 350pt; + } +} + +/* The following appears not to work in Safari or Chrome + -- don't know why, yet. +@media print { + @page :right { + size: auto; + body { + margin-top: 2cm; + margin-bottom: 3cm; + margin-left: 10%; + width: 60%; + margin-right: 30%; + color: #d33; + } + } + @page :left { + size: auto; + body { + margin-top: 2cm; + margin-bottom: 3cm; + margin-left: 30%; + width: 60%; + margin-right: 10%; + color: #33d; + } + } +} +*/ + +div.topsidebar { + float: right; + width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */ + font-size: smaller; + margin-left: 1em; + padding-left: 1em; + border-left: solid thin #AAA; +} + +/* On wider screens, move the sidebar out to the right hand side */ +/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */ +@media screen and (min-width: 700pt) and (max-width: 850pt) { + body { + margin-left: 210pt; + width: 350pt; /* 50% of 700pt */ + margin-right: auto; + } + div.topsidebar { + position: absolute; + /* I feel this size should be 595pt (350 + 210 + 0.05*700), + but that's clearly not right -- I don't think I understand what the -5% + in the h1 spec below is actually 5% of! */ + left: 570pt; + width: auto; + margin-left: 0pt; + padding-left: 0pt; + border: none; + } +} +/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge. + When the screen is 850pt wide (expanding from the @media case above), + the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/ +@media screen and (min-width: 850pt) { + body { + margin-right: 290pt; /* 290 = 850-(210+350) */ + width: 350pt; + margin-left: auto; /* ...takes up the slack */ + } + div.topsidebar { + position: absolute; + width: 290pt; /* same 290pt as above */ + left: auto; + right: 0%; + padding-left: 0pt; + border: none; + } +} + + +code, pre { + font-family: Monaco, fixed; + font-size: 9pt; +} + +a { text-decoration: none; } +a:link { color: #66C; } +a:visited { color: #669; } +a[href]:hover { background: #EEE; } + +div.abstract { + font-style: oblique; + text-align: left; +} +div.abstract em { font-style: normal; } +div.abstract code { + font-style: normal; + font-size: 80%; +} + +h1, h2, h3, h4, h5, h6 { + color: #822; + font-weight: 100; /* few fonts have ultra-light weights */ + line-height: 100%; /* no need to spread out titles */ +} +h1 { + margin-left: -40%; + margin-right: -5%; + padding: 0.5em; + border: solid thin #666; + text-align: right; +} +h2 { + margin-left: -40%; + margin-right: -5%; + padding: 0.2em; + border-top: solid thin #666; + clear: both; +} + +h2.appendices { + margin-top: 10ex; + border-top: double medium #666; +} +h3 { + margin-left: -30%; + float: left; + width: 25%; + display: block; + text-align: right; + vertical-align: bottom; + padding-top: 0pt; + padding-right: 0.5em; + margin-top: 0pt; + line-height: 120%; +} + +/* +h4 { + color: #C66; +} +*/ + +pre, table { background: #dde; } + +pre { + padding: 1em; + line-height: 130%; +} + +table { + font-size: smaller; +} +td { + padding: 0.5ex; +} + +Q:before { content: "“"; } +Q:after { content: "”"; } + +img.smallimage { + float: right; + margin: 24pt; + margin-right: -30%; +} + +div.signature { + margin-left: -40%; + margin-right: -5%; + margin-top: 4ex; + text-align: right; + border: solid thin #666; + padding: 0.3em; + clear: both; +} + +/* ============================================================ + * Some other curiosities of my one-time formatting for web pages + */ +.doc-history { + font-size: xx-small; + background: #eee; + line-height: 100%; +} + +div.subtoc, div.subsubtoc { display: none; } + +/* ============================================================ + * Special formatting for ToC + */ + +/* + If there's significant amount of text in front of the first subsection, + then the following are good to put in the per-document stylesheet: + width: 25%; + float: right; +*/ +div#toc { + color: #888; + padding: 0; + font-size: smaller; + text-align: right; +} +div#toc a:link { color: #888; } +div#toc > ul { + padding: 0pt; + margin: 0pt; + list-style: none; +} +div#toc li { + padding: 0pt; + display: inline-block; +} +div#toc li:before { + content: "§ "; + margin-left: 1em; +} +/* the following elements aren't currently generated by structure.lx */ +div#toc li ul { + padding-left: 1em; + margin-left: 0; + font-style: italic; + display: inline; +} +div#toc li ul:before { + content: "( "; +} +div#toc li ul:after { + content: " ) "; +} +div#toc li li { + padding-left: 0pt; +} +div#toc li li:after { + content: "; "; +} +</style> <style type='text/css'> /* a span/div style for attracting attention */ .attention { @@ -19,8 +280,8 @@ <div class="abstract"> <p>Put the names of <code>\label</code>s and other commands into the margins of a draft document.</p> - -<p>Version 1.7, 2015 December 8, + +<p>Version 1.8, 2016 June 9, <a href='http://purl.org/nxg/dist/showlabels' ><code>http://purl.org/nxg/dist/showlabels</code></a>.</p> </div> @@ -35,7 +296,7 @@ <p>You invoke this package with the command <code>\usepackage{showlabels}</code> in the preamble. You can control -where the labels appear -- in the margins or in the interline gaps -- +where the labels appear – in the margins or in the interline gaps – and you can change the appearance of the formatted labels to some extent.</p> @@ -49,12 +310,6 @@ <code>[inner]</code> and <code>[outer]</code> will be ignored, and the label will be placed in the nearer margin.</p> -<p>The source code for the package is maintained at -<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>, -which also includes an -<a href='https://bitbucket.org/nxg/showlabels/issues' >issue tracker</a>, -where you can report bugs (or you can just mail me).</p> - <h3>Compatibility and problems</h3> <p>For reasonably obvious reasons, this package will <em>not</em> work at @@ -62,19 +317,19 @@ reasons, it won't work with the <code>[leqno]</code> option either (at some point it should be modified to at least recognise and warn of the conflict in either case). The package can occasionally place labels -in the wrong margins, near the top of a page -- see the documentation +in the wrong margins, near the top of a page – see the documentation for a discussion of this.</p> <h3>Download and installation</h3> <ol> <li>Download the file -<a href="showlabels-1.7.tar.gz" >showlabels-1.7.tar.gz</a> +<a href="showlabels-1.8.tar.gz" >showlabels-1.8.tar.gz</a> or -<a href="showlabels-1.7.zip" >showlabels-1.7.zip</a> +<a href="showlabels-1.8.zip" >showlabels-1.8.zip</a> and unpack it.</li> -<li>Run LaTeX on the file <code>showlabels.ins</code> -- this will +<li>Run LaTeX on the file <code>showlabels.ins</code> – this will unpack the style file <code>showlabels.sty</code> amongst other files. Place this somewhere where TeX can find it. </li> @@ -82,26 +337,43 @@ documentation.</li> </ol> -<p>On CTAN: -<a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/showlabels/' - >/tex-archive/macros/latex/contrib/showlabels/</a></p> - -<p>On the web +<p>Links:</p> +<ul> +<li>Canonical package home page: <a href="http://purl.org/nxg/dist/showlabels" - ><code>http://purl.org/nxg/dist/showlabels</code></a></p> + ><code>http://purl.org/nxg/dist/showlabels</code></a></li> + +<li>On CTAN: +<a href='https://www.ctan.org/pkg/showlabels' + >macros/latex/contrib/showlabels</a></li> -<p>The sources are in a Mercurial repository at -<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>.</p> +<li>The source code for the package is maintained at +<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>, +which also includes an +<a href='https://bitbucket.org/nxg/showlabels/issues' >issue tracker</a>, +where you can report bugs (or you can just mail me).</li> + +</ul> + +<p>This work is Copyright 1999, 2001-09, 2013-16, Norman Gray, and may be distributed and/or modified under the +conditions of the <a href='http://www.latex-project.org/lppl.txt'>LaTeX Project Public Licence</a>, +either version 1.3 of this licence or (at your option) any later version.</p> <h3>History</h3> <dl> -<dt><span class='attention'><strong>1.7, 2015 December 8</strong></span></dt> +<dt><span class='attention'><strong>1.8, 2016 June 9</strong></span></dt> +<dd>The <code>ntheorem</code> package exposed an apparently +long-standing incompleteness in the handling of <code>amsmath</code> +documents. +Fixes <a href='https://bitbucket.org/nxg/showlabels/issues/9/'>issue 9</a>.</dd> + +<dt><strong>1.7, 2015 December 8</strong></dt> <dd>Release v1.7.</dd> <dt>1.7b2, 2015 December 7</dt> <dd>Make the combination of amsmath and [inline] mode work (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/8/'>issue 8</a> -– thanks to A L Dukeman for the report; +– thanks to A L Dukeman for the report; what is it about showlabels and 6 December?!).</dd> <dt>1.7b1, 2014 December 6</dt> @@ -110,22 +382,22 @@ <ul> <li>Give <code>\showlabels</code> an optional formatting argument (implements <a href='https://bitbucket.org/nxg/showlabels/issue/1/'>issue 1</a> -– thanks to Francesco Biccari for the suggestion).</li> +– thanks to Francesco Biccari for the suggestion).</li> <li>Special-case the IEEEtrantools package (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/2/'>issue 2</a> -– thanks to Boris Kheyfets for the report and test case, and to +– thanks to Boris Kheyfets for the report and test case, and to Ben William Carabelli for additional analysis and a draft fix).</li> <li>The <code>[final]</code> option now works with the <code>{amsmath}</code> package (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/3/'>issue 3</a> -– thanks to Guillermo Garza and Enno Nagel for the report, and to +– thanks to Guillermo Garza and Enno Nagel for the report, and to Guillermo for the test case).</li> <li>Handle the hyperref package's <code>\ref*{label}</code> variant (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/4/'>issue 4</a> -– thanks to Alex Watson for the report and test case).</li> +– thanks to Alex Watson for the report and test case).</li> <li>Handle the case where a label is in a display, but not in maths mode (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/5/'>issue 5</a> -– thanks to ‘bartgol’ on Stackexchange for the report and test case).</li> +– thanks to ‘bartgol’ on Stackexchange for the report and test case).</li> </ul></dd> <dt>1.6.6, 2013 December 6</dt> @@ -141,7 +413,7 @@ <dt>1.6.5, 2009 May 27</dt> <dd>Fixed a bug in the way that labels including underscores (and -other 'exotic' characters) were displayed.</dd> +other ‘exotic’ characters) were displayed.</dd> <dt>1.6.4, 2008 October 10</dt> <dd>Fixed another poor interaction between eqnarray and amsart. Now @@ -225,7 +497,7 @@ will be warmly appreciated.</li> <li>I haven't worried too much about the precise formatting of the -labels -- this is, after all, supposed to be a draft-only +labels – this is, after all, supposed to be a draft-only package.</li> </ul> </dd> @@ -240,18 +512,25 @@ after the <code>\usepackage{amsmath}</code> if it is to detect that you are using the amsmath package. Note also that, since these additions appeared, AMS-LaTeX and the <code>amstex</code> package seem -to have been declared `obsolete' in favour of the <code>amsmath</code> +to have been declared ‘obsolete’ in favour of the <code>amsmath</code> package. This package now claims conformance with the <code>amsmath</code> package alone, though it will probably work with older versions in fact. </dd> +<dt>Original release</dt> +<dd>The package was originally released by me on 1991 September 21, under the name +<code>labels.sty</code>. +On 1992 January 29, Darrel Hankerson +(<code>hank(a)ducvax.auburn.edu</code>), made the update to NFSS, and +changed the name to <code>showlabel.sty</code>.</dd> + </dl> <div class="signature"> <a href="http://www.astro.gla.ac.uk/users/norman/" >Norman Gray</a><br/> -2015 December 8 +2016 June 9 </div> </body> Binary files old/doc/latex/showlabels/showlabels.pdf and new/doc/latex/showlabels/showlabels.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showlabels.doc.tlpobj new/tlpkg/tlpobj/showlabels.doc.tlpobj --- old/tlpkg/tlpobj/showlabels.doc.tlpobj 2016-04-14 19:46:24.000000000 +0200 +++ new/tlpkg/tlpobj/showlabels.doc.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -1,9 +1,9 @@ name showlabels.doc category Package -revision 39083 +revision 41322 shortdesc doc files of showlabels relocated 1 -docfiles size=51 +docfiles size=53 RELOC/doc/latex/showlabels/README RELOC/doc/latex/showlabels/VERSION RELOC/doc/latex/showlabels/lppl.txt ++++++ showlabels.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/showlabels/showlabels.sty new/tex/latex/showlabels/showlabels.sty --- old/tex/latex/showlabels/showlabels.sty 2015-12-12 00:19:23.000000000 +0100 +++ new/tex/latex/showlabels/showlabels.sty 2016-11-25 19:33:58.000000000 +0100 @@ -8,12 +8,12 @@ %% Showlabels: Style to display labels in the margin %% This is the showlabels package %% -%%%% Copyright 1999, 2001--09, 2013--15, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-16, Norman Gray %% %% 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 +%% conditions of the LaTeX Project Public Licence, either version 1.3 +%% of this licence or (at your option) any later version. +%% The latest version of this licence is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. @@ -23,11 +23,15 @@ %% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk> %% %% This work consists of the files showlabels.dtx and showlabels.ins, -%% and the derived file showlabels.cls. +%% and the derived file showlabels.sty. + +%%%% File: showlabels.dtx +%%%% Source: 95a544e6b41b, 2016-06-09T16:51:03+01:00 + \def\filename{showlabels} -\def\fileversion{1.7} -\def\filedate{2015/12/08} -\def\docdate{2015 December 8} +\def\fileversion{1.8} +\def\filedate{2016/06/09} +\def\docdate{2016 June 9} \def\filemaintainer{norman(a)astro.gla.ac.uk} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showlabels}[\filedate\space v\fileversion] @@ -55,9 +59,7 @@ \fi \global\let\SL@labelname\relax}} \ifSL@AMS - \let\SL@orig@maketag@@@=\maketag@@@ - \def\SL@maketag@@@#1{% - \SL@orig@maketag@@@{#1}% + \def\SL@setlabel@ams{% \ifx\df@label\@empty \ifx\SL@labelname\relax % do nothing @@ -69,6 +71,16 @@ \fi \global\let\SL@labelname\relax } + \let\SL@orig@maketag@@@=\maketag@@@ + \def\SL@maketag@@@#1{% + \SL@orig@maketag@@@{#1}% + \SL@setlabel@ams + } + \let\SL@orig@tagform@\tagform@ + \def\SL@tagform@#1{% + \SL@orig@tagform@{#1}% + \SL@setlabel@ams + } \else %% \let\SL@eqnnum=\@eqnnum %% \def\@eqnnum{% @@ -330,7 +342,9 @@ \ifx\showlabels\@gobble % do nothing -- we're in [final] mode (see test case t13) \else - \let\maketag@@@\SL@maketag@@@ + \AtBeginDocument{% + \let\maketag@@@\SL@maketag@@@ + \let\tagform@\SL@tagform@} \fi \fi \@ifundefined{theIEEEsubequationdis}\relax % and \theequationdis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showlabels.tlpobj new/tlpkg/tlpobj/showlabels.tlpobj --- old/tlpkg/tlpobj/showlabels.tlpobj 2016-04-14 19:46:24.000000000 +0200 +++ new/tlpkg/tlpobj/showlabels.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -1,6 +1,6 @@ name showlabels category Package -revision 39083 +revision 41322 shortdesc Show label commands in the margin relocated 1 longdesc This package helps you keep track of all the labels you define, @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/showlabels/showlabels.sty catalogue-ctan /macros/latex/contrib/showlabels -catalogue-date 2015-12-09 06:19:16 +0100 -catalogue-license gpl +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 catalogue-topics label-ref bibtex-supp macro-supp -catalogue-version 1.7 +catalogue-version 1.8 ++++++ showtags.doc.tar.xz ++++++ ++++++ showtags.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/showtags.tlpobj new/tlpkg/tlpobj/showtags.tlpobj --- old/tlpkg/tlpobj/showtags.tlpobj 2016-04-14 19:46:25.000000000 +0200 +++ new/tlpkg/tlpobj/showtags.tlpobj 2017-04-14 18:00:29.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=2 RELOC/tex/latex/showtags/showtags.sty catalogue-ctan /macros/latex/contrib/showtags -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics bibtex-supp catalogue-version 1.05 ++++++ shuffle.doc.tar.xz ++++++ ++++++ shuffle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shuffle.tlpobj new/tlpkg/tlpobj/shuffle.tlpobj --- old/tlpkg/tlpobj/shuffle.tlpobj 2016-04-14 19:46:25.000000000 +0200 +++ new/tlpkg/tlpobj/shuffle.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/shuffle/Ushuffle.fd RELOC/tex/latex/shuffle/shuffle.sty catalogue-ctan /fonts/shuffle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics maths physics catalogue-version 1.0 ++++++ sidecap.doc.tar.xz ++++++ ++++++ sidecap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sidecap.tlpobj new/tlpkg/tlpobj/sidecap.tlpobj --- old/tlpkg/tlpobj/sidecap.tlpobj 2016-04-14 19:46:25.000000000 +0200 +++ new/tlpkg/tlpobj/sidecap.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/sidecap/sidecap.sty catalogue-ctan /macros/latex/contrib/sidecap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption rotation catalogue-version 1.6f ++++++ sidenotes.doc.tar.xz ++++++ ++++++ sidenotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sidenotes.tlpobj new/tlpkg/tlpobj/sidenotes.tlpobj --- old/tlpkg/tlpobj/sidenotes.tlpobj 2016-04-22 01:26:45.000000000 +0200 +++ new/tlpkg/tlpobj/sidenotes.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/sidenotes/sidenotes.sty catalogue-also footmisc catalogue-ctan /macros/latex/contrib/sidenotes -catalogue-date 2016-04-21 18:50:37 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics marginal catalogue-version 1.00 ++++++ sides.doc.tar.xz ++++++ ++++++ sides.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sides.tlpobj new/tlpkg/tlpobj/sides.tlpobj --- old/tlpkg/tlpobj/sides.tlpobj 2016-04-14 19:46:26.000000000 +0200 +++ new/tlpkg/tlpobj/sides.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/sides/sides.cls catalogue-also dramatist catalogue-ctan /macros/latex/contrib/sides -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics drama-script ++++++ signchart.doc.tar.xz ++++++ ++++++ signchart.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/signchart.tlpobj new/tlpkg/tlpobj/signchart.tlpobj --- old/tlpkg/tlpobj/signchart.tlpobj 2016-04-14 19:46:26.000000000 +0200 +++ new/tlpkg/tlpobj/signchart.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/signchart/signchart.sty catalogue-ctan /macros/latex/contrib/signchart -catalogue-date 2016-02-13 06:26:10 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths catalogue-version 1.01 ++++++ silence.doc.tar.xz ++++++ ++++++ silence.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/silence.tlpobj new/tlpkg/tlpobj/silence.tlpobj --- old/tlpkg/tlpobj/silence.tlpobj 2016-04-14 19:46:26.000000000 +0200 +++ new/tlpkg/tlpobj/silence.tlpobj 2017-04-14 18:00:30.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=5 RELOC/tex/latex/silence/silence.sty catalogue-ctan /macros/latex/contrib/silence -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics compilation catalogue-version 1.5b

1 0

commit texlive-specs-t for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-t for openSUSE:Factory checked in at 2017-06-25 19:22:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-t (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-t.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-t" Sun Jun 25 19:22:35 2017 rev:26 rq:504810 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.changes 2017-06-08 14:56:12.764523774 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-t.new/texlive-specs-t.changes 2017-06-25 19:28:43.160443979 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- rlepsf.doc.tar.xz rlepsf.tar.xz rmathbr.doc.tar.xz rmathbr.tar.xz rmpage.doc.tar.xz rmpage.tar.xz roboto.doc.tar.xz roboto.tar.xz robustcommand.doc.tar.xz robustcommand.tar.xz robustindex.doc.tar.xz robustindex.tar.xz roex.tar.xz romanbar.doc.tar.xz romanbar.tar.xz romanbarpagenumber.doc.tar.xz romanbarpagenumber.tar.xz romande.doc.tar.xz romande.tar.xz romanneg.doc.tar.xz romanneg.tar.xz romannum.doc.tar.xz romannum.tar.xz rosario.doc.tar.xz rosario.tar.xz rotating.doc.tar.xz rotating.tar.xz rotfloat.doc.tar.xz rotfloat.tar.xz rotpages.doc.tar.xz rotpages.tar.xz roundbox.doc.tar.xz roundbox.tar.xz roundrect.doc.tar.xz roundrect.tar.xz rrgtrees.doc.tar.xz rrgtrees.tar.xz rsc.doc.tar.xz rsc.tar.xz rsfs.doc.tar.xz rsfs.tar.xz rsfso.doc.tar.xz rsfso.tar.xz rterface.doc.tar.xz rterface.tar.xz rtkinenc.doc.tar.xz rtkinenc.tar.xz rtklage.doc.tar.xz rtklage.tar.xz rubik.doc.tar.xz rubik.tar.xz ruhyphen.tar.xz rulercompass.doc.tar.xz rulercompass.tar.xz russ.doc.tar.xz russ.tar.xz rviewport.doc.tar.xz rviewport.tar.xz rvwrite.doc.tar.xz rvwrite.tar.xz ryethesis.doc.tar.xz ryethesis.tar.xz sa-tikz.doc.tar.xz sa-tikz.tar.xz sageep.doc.tar.xz sageep.tar.xz sanskrit-t1.doc.tar.xz sanskrit-t1.tar.xz sanskrit.doc.tar.xz sanskrit.tar.xz sansmath.doc.tar.xz sansmath.tar.xz sansmathaccent.doc.tar.xz sansmathaccent.tar.xz sansmathfonts.doc.tar.xz sansmathfonts.tar.xz sapthesis.doc.tar.xz sapthesis.tar.xz sasnrdisplay.doc.tar.xz sasnrdisplay.tar.xz sauerj.doc.tar.xz sauerj.tar.xz sauter.tar.xz sauterfonts.doc.tar.xz sauterfonts.tar.xz savefnmark.doc.tar.xz savefnmark.tar.xz savesym.tar.xz savetrees.doc.tar.xz savetrees.tar.xz scale.doc.tar.xz scale.tar.xz scalebar.doc.tar.xz scalebar.tar.xz scalerel.doc.tar.xz scalerel.tar.xz scanpages.doc.tar.xz scanpages.tar.xz schemabloc.doc.tar.xz schemabloc.tar.xz schemata.doc.tar.xz schemata.tar.xz schule.doc.tar.xz schule.tar.xz schulschriften.doc.tar.xz schulschriften.tar.xz schwalbe-chess.doc.tar.xz schwalbe-chess.tar.xz sciposter.doc.tar.xz sciposter.tar.xz sclang-prettifier.doc.tar.xz sclang-prettifier.tar.xz screenplay-pkg.doc.tar.xz screenplay-pkg.tar.xz screenplay.doc.tar.xz screenplay.tar.xz scrjrnl.doc.tar.xz scrjrnl.tar.xz scrlttr2copy.doc.tar.xz scrlttr2copy.tar.xz sdrt.doc.tar.xz sdrt.tar.xz sduthesis.doc.tar.xz sduthesis.tar.xz New: ---- pst-ovl.doc.tar.xz pst-ovl.tar.xz pst-pad.doc.tar.xz pst-pad.tar.xz pst-pdf.doc.tar.xz pst-pdf.tar.xz pst-pdgr.doc.tar.xz pst-pdgr.tar.xz pst-perspective.doc.tar.xz pst-perspective.tar.xz pst-platon.doc.tar.xz pst-platon.tar.xz pst-plot.doc.tar.xz pst-plot.tar.xz pst-poly.doc.tar.xz pst-poly.tar.xz pst-pulley.doc.tar.xz pst-pulley.tar.xz pst-qtree.doc.tar.xz pst-qtree.tar.xz pst-rubans.doc.tar.xz pst-rubans.tar.xz pst-shell.doc.tar.xz pst-shell.tar.xz pst-sigsys.doc.tar.xz pst-sigsys.tar.xz pst-slpe.doc.tar.xz pst-slpe.tar.xz pst-solarsystem.doc.tar.xz pst-solarsystem.tar.xz pst-solides3d.doc.tar.xz pst-solides3d.tar.xz pst-soroban.doc.tar.xz pst-soroban.tar.xz pst-spectra.doc.tar.xz pst-spectra.tar.xz pst-spinner.doc.tar.xz pst-spinner.tar.xz pst-spirograph.doc.tar.xz pst-spirograph.tar.xz pst-stru.doc.tar.xz pst-stru.tar.xz pst-support.doc.tar.xz pst-text.doc.tar.xz pst-text.tar.xz pst-thick.doc.tar.xz pst-thick.tar.xz pst-tools.doc.tar.xz pst-tools.tar.xz pst-tree.doc.tar.xz pst-tree.tar.xz pst-tvz.doc.tar.xz pst-tvz.tar.xz pst-uml.doc.tar.xz pst-uml.tar.xz pst-vectorian.doc.tar.xz pst-vectorian.tar.xz pst-vehicle.doc.tar.xz pst-vehicle.tar.xz pst-vowel.doc.tar.xz pst-vowel.tar.xz pst-vue3d.doc.tar.xz pst-vue3d.tar.xz pst2pdf.doc.tar.xz pst2pdf.tar.xz pstool.doc.tar.xz pstool.tar.xz pstools.doc.tar.xz pstools.tar.xz pstricks-add.doc.tar.xz pstricks-add.tar.xz pstricks.doc.tar.xz pstricks.tar.xz pstricks_calcnotes.doc.tar.xz pstring.doc.tar.xz pstring.tar.xz psu-thesis.doc.tar.xz psu-thesis.tar.xz ptex-base.doc.tar.xz ptex-base.tar.xz ptex-fontmaps.doc.tar.xz ptex-fontmaps.tar.xz ptex-fonts.doc.tar.xz ptex-fonts.tar.xz ptex.doc.tar.xz ptex.tar.xz ptex2pdf.doc.tar.xz ptex2pdf.tar.xz ptext.doc.tar.xz ptext.tar.xz ptptex.doc.tar.xz ptptex.tar.xz punk-latex.doc.tar.xz punk-latex.tar.xz punk.doc.tar.xz punk.tar.xz punknova.doc.tar.xz punknova.tar.xz purifyeps.doc.tar.xz purifyeps.tar.xz pxbase.doc.tar.xz pxbase.tar.xz pxchfon.doc.tar.xz pxchfon.tar.xz pxcjkcat.doc.tar.xz pxcjkcat.tar.xz pxfonts.doc.tar.xz pxfonts.tar.xz pxgreeks.doc.tar.xz pxgreeks.tar.xz pxjahyper.doc.tar.xz pxjahyper.tar.xz pxpgfmark.doc.tar.xz pxpgfmark.tar.xz pxrubrica.doc.tar.xz pxrubrica.tar.xz pxtatescale.doc.tar.xz pxtatescale.tar.xz pxtxalfa.doc.tar.xz pxtxalfa.tar.xz pygmentex.doc.tar.xz pygmentex.tar.xz python.doc.tar.xz python.tar.xz pythonhighlight.doc.tar.xz pythonhighlight.tar.xz pythontex.doc.tar.xz pythontex.tar.xz quicktype.doc.tar.xz quicktype.tar.xz randomlist.doc.tar.xz randomlist.tar.xz revquantum.doc.tar.xz revquantum.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-t.spec ++++++ ++++ 26890 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-t.new/texlive-specs-t.spec ++++++ qcircuit.doc.tar.xz ++++++ Binary files old/doc/latex/qcircuit/Qtutorial.pdf and new/doc/latex/qcircuit/Qtutorial.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/qcircuit/Qtutorial.tex new/doc/latex/qcircuit/Qtutorial.tex --- old/doc/latex/qcircuit/Qtutorial.tex 2016-04-07 22:47:22.000000000 +0200 +++ new/doc/latex/qcircuit/Qtutorial.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,722 +0,0 @@ -\documentclass[twocolumn,nofootinbib]{revtex4} -\usepackage[bookmarks = true, pdfpagemode = None, pdfstartview = FitH, colorlinks = true, urlcolor = blue]{hyperref} -\usepackage[braket, qm]{qcircuit} -\usepackage{amsmath} -\usepackage{listings} -\renewcommand{\arraystretch}{1.5} - -\begin{document} -\lstset{language=TeX} - -\title{qcircuit 2.5.2 Tutorial} - -\author{Original authors: Bryan Eastin, Steve T Flammia\\ Edits: Travis L Scholten} -\affiliation{Department of Physics and Astronomy, University of New -Mexico, Albuquerque, New Mexico 87131-0001, USA} - -\begin{abstract}qcircuit is a list of macros that greatly simplifies the construction of -quantum circuit diagrams (QCDs) in \LaTeX \ with the help of the \Xy-pic -package. This tutorial should help the reader acquire -the skill to render arbitrary QCDs in a matter of minutes. The source code for qcircuit is available for free\footnote{The qcircuit package is distributed under the GNU public license.} on the \href{CQuIC GitHub page}{https://github.com/CQuIC/qcircuit}. -\end{abstract} - -\maketitle - -\section{Introduction} -\setcounter{footnote}{1} -Ever tried to use \LaTeX\ to typeset something like this? -\[ -\Qcircuit @C=.5em @R=0em @!R { -& \ctrl{1} & \qw & & & \qw & \ctrl{1} & \qw & \ctrl{1} & \ctrl{2} & \qw\\ -& \ctrl{1} & \qw & \push{\rule{.3em}{0em}=\rule{.3em}{0em}} & & \ctrl{1} & \targ & \ctrl{1} & \targ & \qw & \qw\\ -& \gate{U} & \qw & & & \gate{V} & \qw & \gate{V^\dag} & \qw & \gate{V} & \qw -} -\] -\noindent Or maybe this? -\[ -\Qcircuit @C=.7em @R=.4em @! { -\lstick{\ket{\psi}} & \qw & \qw & \ctrl{1} & \gate{H} & \meter & \control \cw\\ -\lstick{\ket{0}} & \qw & \targ & \targ & \qw & \meter & \cwx\\ -\lstick{\ket{0}} & \gate{H} & \ctrl{-1} & \qw & \qw & \gate{X} \cwx & \gate{Z} \cwx & \rstick{\ket{\psi}} \qw -} -\] -\noindent Or how about\footnote{Code for these circuits is given in Appendix \ref{S:code}.} -\[ -\Qcircuit @C=1.3em @R=.6em { - & & & & & & \mbox{Syndrome Measurement} & & & & - \mbox{Recovery}\\ - & \qw & \qw & \ctrl{3} & \qw & \qw & \qw & - \ctrl{5} & \qw & \qw & - \multigate{2}{\ \mathcal{R}\ } & \qw\\ - & \qw & \qw & \qw & \ctrl{2} & \ctrl{3} & \qw & - \qw & \qw & \qw & \ghost{\ \mathcal{R}\ } \qw & - \qw\\ - & \qw & \qw & \qw & \qw & \qw & \ctrl{2} & \qw & - \ctrl{3} & \qw & \ghost{\ \mathcal{R}\ } \qw & - \qw\\ - & & \lstick{\ket{0}} & \targ \qw & \targ \qw & - \qw & \qw & \qw & \qw & \measure{M_a} & - \control \cw \cwx\\ - & & \lstick{\ket{0}} & \qw & \qw & \targ \qw & - \targ \qw & \qw & \qw & \measure{M_b} & - \control \cw \cwx\\ - & & \lstick{\ket{0}} & \qw & \qw & \qw & \qw & - \targ \qw & \targ \qw & \measure{M_c} - \gategroup{2}{2}{7}{10}{.8em}{--} & - \control \cw \cwx -} -\] - -Typesetting quantum circuit diagrams using standard \LaTeX\ graphics packages is a difficult and time consuming business. qcircuit is a high level macro package designed to change that. With qcircuit, drawing quantum circuit diagrams is as easy as constructing an array. In a matter of minutes you can learn the basic syntax and start producing circuits of your own. - -This tutorial teaches you to use qcircuit from the ground up. Many readers will find that they've learned everything they need to know by the end of \S\ref{S:basics}, but plenty of material is included for those that wish to typeset more complicated circuits. - -\section{Getting Started} - -To install qcircuit, place the file \verb=qcircuit.sty= somewhere your \TeX\ distribution can find it and run the appropriate command to update your \TeX\ tree. To use it, place the command -{\small \begin{verbatim}\usepackage[options]{qcircuit}\end{verbatim}} -\noindent in the preamble of your document. \verb=qcircuit.sty= loads the \verb=amsmath= and \verb=xy= packages and implements a set of circuit commands. If need be, you can obtain the necessary packages at \href{http://www.ctan.org/}{http://www.ctan.org/}. - -qcircuit comes with two options - \verb=braket= and \verb=qm= - which provide defined commands for bras, kets, inner and outer products, matrix elements, and expectation values. By default, these options are not enabled, allowing you to define your own commands if you wish. - -\section{Special Commands} -As mentioned above, qcircuit comes with predefined commands for some commonly used functions. We have chosen to use the \verb=ensuremath= command, meaning you do not need to put dollar signs around the calls to these commands. - -We demonstrate the commands below along with their respective outputs: - -\begin{center} -\begin{tabular}{l c l c} -\begin{lstlisting} -\ket{A} -\end{lstlisting} & \ket{A} & \begin{lstlisting} -\bra{B} -\end{lstlisting} & \bra{B}\\ -\begin{lstlisting} -\ip{A}{B} -\end{lstlisting} & \ip{A}{B} & \begin{lstlisting} -\op{A}{B} -\end{lstlisting} & \op{A}{B}\\ -\begin{lstlisting} -\melem{j}{B}{k} -\end{lstlisting} & \melem{j}{B}{k} & -\begin{lstlisting} -\expval{B} -\end{lstlisting} & \expval{B}\\ -\end{tabular} -\end{center} - -\section{Simple Quantum Circuits\label{S:basics}} - -To begin, suppose the reader would like to typeset the following -simple circuit: -\[ \Qcircuit @C=1em @R=.7em { - & \gate{X} & \qw -}\] - -This was typeset using -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \gate{X} & \qw -}\end{verbatim}} - -The command \verb=\Qcircuit= is simply a disguised \verb=\xymatrix= command -with a default parameter set. For readers unfamiliar with the \verb=xymatrix= environment, it suffices -to know that it behaves more or less like the \verb=array= environment. -That is, new columns are denoted by \verb=&= and new rows by \verb=\\=, -as in the following example: -\[ \Qcircuit @C=1.4em @R=1.2em { - a & i \\ - 1 & x -} \] -which was typeset using -{\small \begin{verbatim}\Qcircuit @C=1.4em @R=1.2em { - a & i \\ - 1 & x -} \end{verbatim}} -The parameters \verb?(a)C=1.4em? and \verb?(a)R=1.2em? that appear after \verb=\Qcircuit= specify the spacing between the columns and the rows of the circuit, respectively. They may take any length as an argument. Additional parameters are discussed in \S\ref{S:spaces}. - -\subsection{Wires and gates} - -The command \verb=\qw= draws a wire between two columns of -a QCD. The command derives its name from an abbreviation of `quantum wire'. -\[ \Qcircuit @C=1em @R=.7em { - & \gate{H} & \gate{Z} & \gate{H} & \qw \\ - & \qw & \gate{X} & \qw & \qw -} \] - -The diagram above was drawn using -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \gate{H} & \gate{Z} & \gate{H} & \qw \\ - & \qw & \gate{X} & \qw & \qw -}\end{verbatim}} -\noindent Note that \verb=\qw= is used to connect a wire {\it towards the left}. - -The \verb=\gate= command draws the argument of the function inside a -framed box and extends a wire {\it back to the previous column}. When using the -\verb=\gate= and \verb=\qw= commands, make sure there is another column -entry to the left of the current column entry in your QCD, otherwise the wire will not -connect to anything (and you'll get an error), as in the following example code: - -{\small \begin{verbatim} (**Wrong!**) -\Qcircuit @C=1em @R=.7em { - \gate{U} & \qw \\ - \gate{U^\dag} & \qw -} \end{verbatim}} - -The proper way to render this circuit would be to include space for the incoming -wires at the beginning by inserting the \verb=&= character at the start of each new line: -\[ \Qcircuit @C=1em @R=.7em { - & \gate{U} & \qw \\ - & \gate{U^\dag} & \qw -} \] - -{\small \begin{verbatim}\[ \Qcircuit @C=1em @R=.7em { - & \gate{U} & \qw \\ - & \gate{U^\dag} & \qw -} \]\end{verbatim}} - -The only difference between these two codes is that the correct code has an ampersand (\verb=&=) at the start of each new line.\\ - -To indicate the end of a circuit simply use the \verb=\qwa= command as the last wire. - -\[ \Qcircuit @C=1em @R=.7em { - & \gate{U} & \qwa \\ - & \gate{U^\dag} & \qwa -} \] - -{\small \begin{verbatim}\[ \Qcircuit @C=1em @R=.7em { - & \gate{U} & \qwa \\ - & \gate{U^\dag} & \qwa -} \]\end{verbatim}} - -\subsection{CNOT and other controlled single qubit gates \label{S:CNOT}} - -With just these few commands, one can already render a circuit with an arbitrary number of wires and single qubit gates. In this section, we'll learn how to draw CNOT -gates and controlled single qubit gates with an arbitrary number -of controls. - -A simple circuit with two CNOT gates in it is -\[ \Qcircuit @C=1em @R=.7em { - & \ctrl{1} & \targ & \qw \\ - & \targ & \ctrl{-1} & \qw -}\] -which was typeset by -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \ctrl{1} & \targ & \qw \\ - & \targ & \ctrl{-1} & \qw -}\end{verbatim}} -In this circuit, the command \verb=\targ= draws the target gate on the -wire, and the \verb=\ctrl{#1}= puts a bullet down, and connects to the -target which is \verb=#1= array elements \textit{below} the control. -Hence, to connect the second CNOT gate properly, we used -1. - -A more complicated circuit with multiple controls and arbitrary gates -might look like -\[ \Qcircuit @C=1em @R=.7em { - & \ctrl{2} & \targ & \gate{U} & \qw \\ - & \qw & \ctrl{-1} & \qw & \qw \\ - & \targ & \ctrl{-1} & \ctrl{-2} & \qw \\ - & \qw & \ctrl{-1} & \qw & \qw -}\] -which was drawn using -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \ctrl{2} & \targ & \gate{U} & \qw \\ - & \qw & \ctrl{-1} & \qw & \qw \\ - & \targ & \ctrl{-1} & \ctrl{-2} & \qw \\ - & \qw & \ctrl{-1} & \qw & \qw -}\end{verbatim}} - -In the first gate, the control bit connects to the -target on wire 3. In the second gate, each control connects to the object -directly above it. Finally, the third gate is an example of how to do -controls on arbitrary gates; simply place the desired gate where you would -normally put a target. - -\subsection{Vertical wires} - -Suppose we want to typeset the following circuit: -\[ \Qcircuit @C=1em @R=1.2em { - & \gate{U_1} & \qw \\ - & \ctrl{1} \qwx & \qw \\ - & \gate{U_2} & \qw \\ -}\] -so that the middle control has to connect to more than one gate. The way -to accomplish this is with the \verb=\qwx= command. The command -\verb=\qwx[#1]= takes an optional input, \verb=#1=, and connects from -the current position to a position \verb=#1= entries {\it below} -the current position. The default argument is -1. Thus, one way to -typeset the above diagram is with the following code: -{\small \begin{verbatim}\Qcircuit @C=1em @R=1.2em { - & \gate{U_1} & \qw \\ - & \ctrl{-1} \qwx[1] & \qw \\ - & \gate{U_2} & \qw \\ -}\end{verbatim}} -\noindent or, equivalently, -{\small \begin{verbatim}\Qcircuit @C=1em @R=1.2em { - & \gate{U_1} & \qw \\ - & \ctrl{1} \qwx & \qw \\ - & \gate{U_2} & \qw \\ -}\end{verbatim}} -\noindent which is what the author used. - -Note that wire commands must not precede the gate command in an entry. -Also, remember that commands taking an optional -argument use {\it square} braces rather than curly braces. - -\subsection{Labelling input and output states \label{S:labels}} -The last element we need for simple circuits is the ability to add labels. We'll look at input and output labels here, other kinds of labels are discussed in \S\ref{S:labels2}. - -When labelling input and output qubits, one should use the \verb=\lstick= and \verb=\rstick= commands. These commands ensure that the labels and the wires connecting to them line up correctly. The \verb=\lstick= command is used for input labels (on the left of the diagram), and the \verb=\rstick= command is used for output labels (on the right of the diagram). Placement rules are the same as those for gates with the exception that \verb=\lstick= and \verb=\rstick= can be inserted in the leftmost column of the array. Here is an example circuit: -\[ \Qcircuit @C=1em @R=1em { -\lstick{\ket{1}} & \targ & \rstick{\ket{0}} \qw \\ -\lstick{\ket{1}} & \ctrl{-1} & \rstick{\ket{1}} \qw -}\] -typeset with -{\small \begin{verbatim}\Qcircuit @C=1em @R=1em { - \lstick{\ket{1}} & \targ & \rstick{\ket{0}} \qw \\ - \lstick{\ket{1}} & \ctrl{-1} & \rstick{\ket{1}} \qw -}\end{verbatim}} - -There are a few options for labelling multi-qubit input states, as well. - - -\[ \Qcircuit @C=1em @R=1.6em { - \lstick{} & \qw & \qw \\ - \lstick{} & \qw & \qw \inputgroup{1}{2}{.75em}{\ket{0^k}}\\ - \lstick{} & \qw & \qw \\ - \lstick{} & \qw & \qw \inputgroupv{3}{4}{.8em}{.8em}{\ket{\psi}}\\ - \lstick{A} & \qw & \qw \\ - \lstick{B} & \qw & \qw \inputgrouph{5}{6}{.75em}{\ket{\psi}}{2.2em} - }\] -typeset with -{\small \begin{verbatim}\Qcircuit @C=1em @R=1.6em { - \lstick{} & \qw & \qw \\ - \lstick{} & \qw & \qw - \inputgroup{1}{2}{.75em}{\ket{0^k}}\\ - \lstick{} & \qw & \qw \\ - \lstick{} & \qw & \qw - \inputgroupv{3}{4}{.8em}{.8em}{\ket{\psi}}\\ - \lstick{A} & \qw & \qw \\ - \lstick{B} & \qw & \qw - \inputgrouph{5}{6}{.75em}{\ket{\psi}}{2.2em} - }\end{verbatim}} - -\section{More Complicated Circuits: Multiple Qubit Gates and Beyond} - -So far, we have seen how to make arbitrary QCDs involving single qubit gates and controlled gates, including CNOT. Since this is known to be universal for computation, we could just stop here! Of course, many circuit diagrams use more complicated structures such as multi-qubit gates, measurements, classical wires, and swaps. We will learn how to use Q-circuit to make all of these in this section. - -\subsection{Multiple qubit gates \label{S:multigate}} - -Let's look at an example, and then we'll explain the code. -\[ \Qcircuit @C=1em @R=.7em { - & \multigate{2}{U^\dag} & \qw \\ - & \ghost{U^\dag}& \qw \\ - & \ghost{U^\dag} & \qw -}\] -The 3-qubit gate above was typeset with -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \multigate{2}{U^\dag} & \qw \\ - & \ghost{U^\dag}& \qw \\ - & \ghost{U^\dag} & \qw -}\end{verbatim}} -First let's go over the \verb=\multigate= command. -\verb=\multigate{#1}{#2}= is a two argument gate that takes the -\textit{depth} of the -gate for the first argument and the \textit{label} of the gate for the -second argument. In the above example, \verb=#1= equals 2 because the 3-qubit gate -extends two rows below the position of \verb=\multigate=. On the other two lines, -the \verb=\ghost= command is used to get the spacing and connections right. \verb=\ghost= behaves like an invisible gate that allows the quantum wires on either side of your multigate to connect correctly. - -The generalization to an arbitrarily large gate is now obvious. Let's look at a 6-qubit gate. The code -{\small \begin{verbatim}\Qcircuit @C=1em @R=0em { - & \multigate{5}{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw -}\end{verbatim}} -\noindent yields -\[ \Qcircuit @C=1em @R=0em { - & \multigate{5}{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw \\ - & \ghost{\mathcal{F}} & \qw -}\] -Thus, for every entry below the top, a \verb=\ghost= command -with the label for the gate is needed. Strictly speaking, the name of the gate is not necessary inside the \verb=\ghost= command. Since \verb=\ghost= is just an invisible place holder, anything with the same width as the label specified in multigate will work as well. In practice, however, it is usually easiest to use the same argument. - -Note that controls to multiple qubit gates work the same as for single -qubit gates, using \verb=\ctrl= and \verb=\qwx=. - -Sometimes a multi-qubit gate must be applied to qubits which are \emph{not} on adjacent rows (and as such, the \verb=\multigate= command is not suitable). To account for this, the \verb=\sgate= command can be used to ``hook together'' the application of a multi-qubit gate on non-adjacent qubits: - -{\scriptsize \begin{verbatim}\\Qcircuit @C=1em @R=.7em { - & \multigate{1}{\mathcal{F}} & \sgate{\mathcal{G}}{2} & \qw \\ - & \ghost{\mathcal{F}} & \qw & \qw\\ - & \qw & \gate{\mathcal{G}} & \qw \\ -}\end{verbatim}} -\noindent which yields -\[ \Qcircuit @C=1em @R=.7em { - & \multigate{1}{\mathcal{F}} & \sgate{\mathcal{G}}{2} & \qw \\ - & \ghost{\mathcal{F}} & \qw & \qw\\ - & \qw & \gate{\mathcal{G}} & \qw \\ -}\] - -Such notation may be a bit confusing, admittedly. An alternative circuit which does use the \verb=\multigate= command would have a step where qubits 2 and 3 above were swapped, then the two-qubit gate $\mathcal{G}$ was applied, and finally the qubits were swapped back. - -\subsection{Measurements and classical bits} - -Measurement gates are typeset just like ordinary gates, but they typically have some sort of decoration to indicate that measurement has occurred. At present, Q-circuit supports the following single qubit measurement gates. -{\small \begin{center} - \begin{tabular}{l | l | l} - \multicolumn{1}{c}{\itshape Example} & \multicolumn{1}{c}{\itshape Command} & \multicolumn{1}{c}{\itshape Example Code }\\ \hline - \Qcircuit @C=1em @R=.7em {& \meter} - & \verb=\meter= & \verb=\meter=\\ - \Qcircuit @C=1em @R=.7em {& \measure{\mbox{Basis}}} - & \verb=\measure = & \verb=\measure{\mbox{Basis}}=\\ - \Qcircuit @C=1em @R=.7em {& \measuretab{M_{ijk}}} \hspace{.5em} - & \verb=\measuretab= & \verb=\measuretab{M_{ijk}}=\\ - \Qcircuit @C=1em @R=.7em {& \measureD{\chi}} - & \verb=\measureD= & \verb=\measureD{\chi}=\\\\ - \Qcircuit @C=1em @R=1.5em{ &\meterB{\ket{\xi_\pm}}} - & \verb=\meterB= & \verb=\meterB{\ket{\xi_\pm}}=\\ - \Qcircuit @C=1em @R=1.5em{ &\metersymb} - & \verb=\metersymb= & \verb=\metersymb= - \end{tabular} -\end{center}} - -Often we want to condition some gate on the output of a measurement. One convenient way illustrate this is with the classical wire commands, \verb=\cw= and \verb=\cwx=. The classical wire commands work exactly like the quantum wire commands, but they draw double instead of single lines. - -Here is an example using measurement gates and classical wires and the corresponding code. -\[\Qcircuit @C=1em @R=.7em { - & \qw & \measure{\mbox{Codebit}} \cwx[1] \\ - & \qw & \gate{\chi} & \meter & \rstick{\cdots} \cw -}\] -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \qw & \measure{\mbox{Codebit}} \cwx[1] \\ - & \qw & \gate{\chi} & \meter & - \rstick{\cdots} \cw -}\end{verbatim}} - -If you are using a special basis for your measurements the \verb=\meterB= command allows you to indicate the basis. -\[\Qcircuit @C=1em @R=1.5em { - \lstick{\ket{\psi}} & \meterB{\ket{\xi_\pm}} & \cw -}\] -{\small \begin{verbatim}\Qcircuit @C=1em @R=1.5em { - \lstick{\ket{\psi}} & \meterB{\ket{\xi_\pm}} & \cw -}\end{verbatim}} - -Q-circuit also includes the commands \verb=\multimeasure= and \verb=\multimeasureD= for typesetting measurements on multiple qubits. The syntax for these commands exactly parallels that of the \verb=\multigate= command (see \S\ref{S:multigate}). An example is shown below. -\[\Qcircuit @C=1em @R=.7em { - & \multimeasureD{1}{\text{Bell}} \\ - & \ghost{\text{Bell}} -}\] -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \multimeasureD{1}{\text{Bell}} \\ - & \ghost{\text{Bell}} -}\end{verbatim}} - - In addition, if the measurement must be done on qubits which are \emph{not} adjacent, Q-circuit provides for the \verb=\smeterB= command, which, similar to the \verb=\sgate= command, allows one to split the measurement: - - \[ \Qcircuit @C=1em @R=.7em { - & \smeterB{\ket{\xi_{\pm}}}{2} & \qw \\ - & \qw & \qw\\ - & \gate{\ket{\xi_{\pm}}} & \qw \\ -}\] -{\small \begin{verbatim} \Qcircuit @C=1em @R=.7em { - & \smeterB{\ket{\xi_{\pm}}}{2} & \qw \\ - & \qw & \qw\\ - & \gate{\ket{\xi_{\pm}}} & \qw \\ -}\end{verbatim}} - -\subsection{Non-gate inserts, forcing space, and swap \label{S:inserts}} - -In addition to the gates defined by Q-circuit, standard \LaTeX\ can function as a gate if enclosed in curly brackets. By default, inputs are assumed to have zero size, so no space will be made for the resulting object and any wires connecting to it will run straight to the object's middle. Standard \LaTeX\ entries can serve as labels or wire decorations. - -To force an object to take up space, you should use the \verb=\push= command. \verb=\push= is most useful in conjunction with the \LaTeX\ command \verb=\rule=. Together they can be used to construct various sorts of invisible props and struts. - -Q-circuit implements a gate command called \verb=\qswap= that is equivalent to the text \verb={\times} \qw=. The effect of \verb=\qswap= is to insert half of a swap gate (that is a $\times$) which can then be connected (using \verb=\qwx=) to another instance of \verb=\qswap= to create a swap gate. - -Here is a circuit that shows how to construct swap, decorate wires, and use \verb=\push= to make an invisible prop. -\[\Qcircuit @C=1em @R=.3em { - & & \mbox{Defective Circuit}\\ - & \qswap & \qw & \push{\rule{0em}{1em}} \qw \\ - & \qswap \qwx & \push{X} \qw & \qw \\ - & {/} \qw & \gate{H^{\otimes n}} & \qw -}\] -{\small \begin{verbatim}\Qcircuit @C=1em @R=.3em { - & & \mbox{Defective Circuit}\\ - & \qswap & \qw & \push{\rule{0em}{1em}} \qw \\ - & \qswap \qwx & \push{X} \qw & \qw \\ - & {/} \qw & \gate{H^{\otimes n}} & \qw -}\end{verbatim}} - -To indicate a generalized circuit with $n$ iterations of something, you could use the \verb=\cds= command. -\[\Qcircuit @C=1em @R=.7em { - & \targ & \targ & \cds{4}{\cdots} & \targ & \qw\\ - & \ctrl{-1} & \qw &\qw & \qw & \qw \\ - & \qw & \ctrl{-2} & \qw & \qw & \qw \\ - & & & & & \\ - & \qw & \qw & \qw & \ctrl{-4} & \qw \\ -}\] -{\small \begin{verbatim}\Qcircuit @C=1em @R=.3em { - & \targ & \targ & \cds{4}{\cdots} & \targ & \qw\\ - & \ctrl{-1} & \qw &\qw & \qw & \qw \\ - & \qw & \ctrl{-2} & \qw & \qw & \qw \\ - & & & & & \\ - & \qw & \qw & \qw & \ctrl{-4} & \qw \\ -}\end{verbatim}} - -\subsection{How to control anything} - -Controlled-Z gates, wires with bends, and gates that control-on-zero can all be made using the extended family of control commands. The complete family of control commands is \verb=\ctrl=, \verb=\cctrl=, \verb=\ctrlo=, \verb=\cctrlo=, \verb=\control=, and \verb=\controlo=. - -\verb=\ctrlo= is identical to the \verb=\ctrl= command (see \S\ref{S:CNOT}) except that it draws an open bullet (indicating control-on-zero). Both commands place a wire to the left and take one argument indicating which wire to connect to. - -The commands \verb=\cctrl= and \verb=\cctrlo= are identical to the \verb=\ctrl= and \verb=\ctrlo= commands, respectively, except they use \emph{classical wires} instead of quantum ones to do the controlling. These commands may be useful for writing circuits where the gates are conditioned on classical outputs. - -The commands \verb=\control= and \verb=\controlo= are isolated controls; they don't automatically connect to anything. Isolated controls allow you to decide exactly what connections are made to your control operator, which makes them very useful for working with classical wires and rendering things like the controlled-Z. - -Here is an example circuit using various controls. -\[ \Qcircuit @C=1em @R=.7em { - & \ctrl{2} & \ctrlo{1} & \ctrl{1} & \qw & \multigate{1}{U} & \qw \\ - & \qw & \targ & \ctrlo{2} \qw & \ctrl{1} & \ghost{U} & \qw\\ - & \control \qw & \ctrl{1} & \qw & \meter & \cctrlo{-1} &\\ - & \qw & \control \qw & \gate{H} & \meter & \cctrl{-1} -}\] - -{\small \begin{verbatim}\Qcircuit @C=1em @R=.7em { - & \ctrl{2} & \ctrlo{1} & \ctrl{1} - & \qw & \multigate{1}{U} & \qw \\ - & \qw & \targ & \ctrlo{2} \qw - & \ctrl{1} & \ghost{U} & \qw \\ - & \control \qw & \ctrl{1} & \qw - & \meter & \cctrlo{-1} \\ - & \qw & \control \qw & \gate{H} - & \meter & \cctrl{-1} -}\end{verbatim}} - -Note that we, the authors, have used a pair of controls connected by a wire to denote the controlled-Z gate. This isn't standard notation, but we feel it is a logically consistent and concise notation, and it illustrates nicely the symmetry of the controlled-Z gate. We hope to encourage the readers to adopt this notation in their own QCDs. - -\section{Bells and Whistles: Tweaking Your Diagram to Perfection} - -By now, the reader should be able to quickly and easily typeset almost any QCD. Nonetheless, it may occasionally be desirable to decorate or modify a circuit in ways not yet discussed. This section presents additional tricks, options, and commands for putting the final polish on your QCDs. - -\subsection{Spacing\label{S:spaces}} - -The Q-circuit parameters \verb+@R+ and \verb+@C+ were introduced in \S\ref{S:basics}; they are examples of a family of spacing parameters that can appear between the text \verb=\Qcircuit= and the opening curly brace. A more complete list of available parameters is given in the table below. - -{\small \begin{center} - \begin{tabular}{l | l } - \multicolumn{1}{c}{\itshape Parameter} & \multicolumn{1}{c}{\itshape Effect }\\ \hline - \verb+@R=#1+ & Sets the spacing between rows to \verb=#1=.\\ - \verb+@C=#1+ & Sets the spacing between columns to \verb=#1=.\\ - \verb+@!R+ & \parbox[t]{6cm}{Sets all rows to the height of the tallest object in the circuit.}\\ - \verb+@!C+ & \parbox[t]{6cm}{Sets all columns to the width of the widest object in the circuit.}\\ - \verb+@!+ & \parbox[t]{6cm}{Sets all entries to the size of the largest object in the circuit.} - \end{tabular} -\end{center}} - -The \verb=@R= and \verb=@C= parameters adjust the separation between elements, allowing you to dictate the compactness of your QCD. \verb=@!R=, \verb=@!C=, and \verb=@!= force the elements of your circuit to have uniform sizes, this helps to prevent bunching that may occur when a particular row or column contains many small elements. \verb=@!R= is particularly useful for forcing wires to be evenly spaced, as in the following example. -\[ \Qcircuit @C=.7em @R=.3em @!R { - & \qswap & \qw & \qswap & \qw\\ - & \qswap \qwx & \ctrl{1} & \qswap \qwx & \qw \\ - & \qw & \gate{T^\dag} & \qw & \qw -}\] - -{\small \begin{verbatim}\Qcircuit @C=.7em @R=.3em @!R { - & \qswap & \qw & \qswap & \qw\\ - & \qswap \qwx & \ctrl{1} & \qswap \qwx & \qw \\ - & \qw & \gate{T^\dag} & \qw & \qw -}\end{verbatim}} - -\subsection{Labelling \label{S:labels2}} - -A label can be placed anywhere that a gate command might normally appear. Unlike gates, however, Q-circuit treats labels as having zero size when determining the layout of a QCD. This prevents large labels from bending your circuit out of whack, but it also means that labels can overlap with other components. - -Normally an element whose size is set to zero is drawn centered on it's entry. This is what happens when you insert text directly using curly brackets (see \S\ref{S:inserts}). For most labelling, however, it is more useful to have one edge of the label fixed in the center of an entry. For this reason Q-circuit provides a set of label commands, \verb=\lstick=, \verb=\rstick=, \verb=\ustick=, and \verb=\dstick=. The stick commands each cause their contents to ``stick out" from the center of an entry in a different direction. \verb=\lstick=, \verb=\rstick=, \verb=\ustick=, and \verb=\dstick= produce labels that project out to the left, right, top, and bottom respectively. - -Proper usage of \verb=\lstick= and \verb=\rstick= was demonstrated in \S\ref{S:labels}, so the following example focuses on \verb=\ustick= and \verb=\dstick=. -\[ \Qcircuit @C=.7em @R=.3em { - & \ustick{a} \qw & \qw & \qw & \qw & \meter \\ - & \ustick{b} \qw & \qw & \qw & \meter \\ - & & & & \dstick{B} \cwx & \dstick{A} \cwx[-2] -}\] -\\ -{\small \begin{verbatim}\Qcircuit @C=.7em @R=.3em { - & \ustick{a} \qw & \qw & \qw & \qw & \meter \\ - & \ustick{b} \qw & \qw & \qw & \meter \\ - & & & & \dstick{B} \cwx & \dstick{A} \cwx[-2] -}\end{verbatim}} - -\subsection{Grouping} - -It is sometimes useful to box off sections of a circuit to indicate a subcircuit, as in the following example. -\[ \Qcircuit @C=1em @R=1em { - & \ctrl{2} & \qw & \gate{H} & \ctrl{1} & \gate{H} & \qw \\ - & \qw & \ctrl{1} & \gate{H} & \targ & \gate{H} & \qw \\ - & \targ & \targ & \gate{Z} & \qw & \ctrl{-1} & \qw \gategroup{1}{4}{2}{6}{.7em}{--} -}\] -which was typeset using -{\small \begin{verbatim}\Qcircuit @C=1em @R=1em { - & \ctrl{2} & \qw & \gate{H} & \ctrl{1} & - \gate{H} & \qw \\ - & \qw & \ctrl{1} & \gate{H} & \targ & - \gate{H} & \qw \\ - & \targ & \targ & \gate{Z} & \qw & \ctrl{-1} & - \qw \gategroup{1}{4}{2}{6}{.7em}{--} -}\end{verbatim}} -The command that made the dashed box is in the last line of code and is called \verb=\gategroup=. The \verb=\gategroup= command can be placed following any non-empty entry, but, for clarity, it is perhaps best to put it at the end. - -Because it takes six arguments, \verb=\gategroup= looks intimidating, but it is actually relatively easy to use. \verb=\gategroup{#1}{#2}{#3}{#4}{#5}{#6}= highlights the entries between rows \verb=#1= and \verb=#3= and columns \verb=#2= and \verb=#4= by adding a box or a bracket. Argument \verb=#6= selects between various highlights, with the available options being: -\begin{center} {\small \verb=-- . _\} ^\} \{ \} _) ^) ( )=} \end{center} -These options produce a dashed box, a dotted box, a curly brace on the bottom, top, left, or right, and a normal brace on the bottom, top, left, or right. Argument \verb=#5= is twice the spacing from the nearest gate to the box. - -\verb=\gategroup= only checks that the gates at the four corners of the requested region are properly enclosed. As a result, gates along the boundary that are bigger than the corner gates will tend to stick out. This is especially unsightly when the corner entries are wires, though in that case the problem can be fixed by inserting an invisible prop of the desired height (see \S\ref{S:inserts}). - -\section{Acknowledgments} - -The authors would like to thank Aaron Smith, Joe Renes, and Andrew Silberfarb for useful discussions, ideas, and debugging. Thanks to Carl Caves and Michael Nielsen for encouragement on this project. An extra thanks to Michael Nielsen for suggesting some useful \LaTeX \ resources. - -The development of Q-circuit was supported in part by the National Security Agency (NSA) and the Advanced Research and Developement Activity (ARDA) under the Army Research Office (ARO) contract numbers DAAD19-01-1-0648 and W911NF-04-1-0242. - -\appendix -\section{Positioning Q-circuit diagrams in \LaTeX} -Q-circuit produces \TeX\ graphics objects. In theory these objects should act like any symbol or character. Thus, they can be placed in equation environments, arrays, and figures. In practice there are a few, largely unexplained, complications. - -One of these is vertical centering in a line of text. To center the top line of a circuit, it is sufficient to invoke it in inline math mode using \verb=$=. To center the entire circuit, place it inside an array. - -Horizontal centering within figures is also problematic. Typically this can be corrected by placing the \verb=\Qcircuit= command inside a \verb=\centerline= command, an \verb=\mbox= command, or an equation environment. For some \LaTeX\ distributions the commands \verb=\leavevmode= and \verb=\centering= must be added to center a figure. - -Finally, circuits using large labels often appear a bit off center. This is because labels are not included when calculating the size of a circuit. The best solution is probably to add white space (see \S\ref{S:inserts}) until the labels all fit within the boundaries of the circuit. - -\section{Bugs and Future Work} - -\begin{enumerate} -\item Wires often end just short of curved surfaces. -\item \verb=\gategroup= needs to check all the boundary gates when determining the highlighted area. -\item Targets look poor when the font size is set to small. -\item It would be nice if the \verb=\ghost= command could read the argument of the \verb=\multigate= command automatically. -\item Larger issues of centering within \LaTeX\ need to be addressed. -\end{enumerate} - -\section{Code for the Introduction\label{S:code}} -The first QCD depicts a way of decomposing doubly controlled unitaries. -It was typeset with -{\small \begin{verbatim}\Qcircuit @C=.5em @R=0em @!R { - & \ctrl{1} & \qw & & & \qw & \ctrl{1} & \qw & - \ctrl{1} & \ctrl{2} & \qw\\ - & \ctrl{1} & \qw & - \push{\rule{.3em}{0em}=\rule{.3em}{0em}} & & - \ctrl{1} & \targ & \ctrl{1} & \targ & \qw & - \qw\\ - & \gate{U} & \qw & & & \gate{V} & \qw & - \gate{V^\dag} & \qw & \gate{V} & \qw -} -\end{verbatim}} - -The second QCD depicts quantum teleportation and was typeset with -{\small \begin{verbatim}\Qcircuit @C=.7em @R=.4em @! { - \lstick{\ket{\psi}} & \qw & \qw & \ctrl{1} & - \gate{H} & \meter & \control \cw\\ - \lstick{\ket{0}} & \qw & \targ & \targ & \qw & - \meter & \cwx\\ - \lstick{\ket{0}} & \gate{H} & \ctrl{-1} & \qw & - \qw & \gate{X} \cwx & \gate{Z} \cwx & - \rstick{\ket{\psi}} \qw -} -\end{verbatim}} - -The third QCD depicts quantum error correction on the bit flip code. It was typeset with -{\small \begin{verbatim}\Qcircuit @C=1.3em @R=.6em { - & & & & & & \mbox{Syndrome Measurement} & & & & - \mbox{Recovery}\\ - & \qw & \qw & \ctrl{3} & \qw & \qw & \qw & - \ctrl{5} & \qw & \qw & - \multigate{2}{\ \mathcal{R}\ } & \qw\\ - & \qw & \qw & \qw & \ctrl{2} & \ctrl{3} & \qw & - \qw & \qw & \qw & \ghost{\ \mathcal{R}\ } \qw & - \qw\\ - & \qw & \qw & \qw & \qw & \qw & \ctrl{2} & \qw & - \ctrl{3} & \qw & \ghost{\ \mathcal{R}\ } \qw & - \qw\\ - & & \lstick{\ket{0}} & \targ \qw & \targ \qw & - \qw & \qw & \qw & \qw & \measure{M_a} & - \control \cw \cwx\\ - & & \lstick{\ket{0}} & \qw & \qw & \targ \qw & - \targ \qw & \qw & \qw & \measure{M_b} & - \control \cw \cwx\\ - & & \lstick{\ket{0}} & \qw & \qw & \qw & \qw & - \targ \qw & \targ \qw & \measure{M_c} - \gategroup{2}{2}{7}{10}{.8em}{--} & - \control \cw \cwx -} -\end{verbatim}} - -\pagebreak - -\section{Table of Commands} - -The following table is grouped according to the effect of each command.\\ - -{\small \begin{center} - \begin{tabular}{l | l } - \multicolumn{1}{c}{\itshape Subject} & \multicolumn{1}{c}{\itshape Command }\\ \hline - Loading Q-circuit \hspace{.5em} & \verb=\input{Qcircuit}= \\ - Making Circuits & \verb=\Qcircuit= \\ - Spacing & \parbox[t]{6cm}{\tt - @C=\#1 \\ - @R=\#1 \\ - @!R \\ - @!C \\ - @! \\ - \char92 push\{\#1\} \\ - \char92 cds\{\#1\}\{\#2\}}\\ - Wires & \parbox[t]{6cm}{\tt - \char92 qw[\#1] \\ - \char92 qwx[\#1] \\ - \char92 qwa[\#1] \\ - \char92 cw[\#1] \\ - \char92 cwa[\#1] \\ - \char92 cwx[\#1] }\\ - Gates & \parbox[t]{6cm}{\tt - \char92 gate\{\#1\} \\ - \char92 targ \\ - \char92 qswap \\ - \char92 multigate\{\#1\}\{\#2\} \\ - \char92 sgate\{\#1\}\{\#2\}\\ - \char92 ghost\{\#1\} }\\ - Controls & \parbox[t]{6cm}{\tt - \char92 ctrl\{\#1\} \\ - \char92 ctrlo\{\#1\} \\ - \char92 cctrl\{\#1\} \\ - \char92 cctrlo\{\#1\} \\ - \char92 control \\ - \char92 controlo } \\ - Measurements & \parbox[t]{6cm}{\tt - \char92 meter \\ - \char92 meterB\{\#1\} \\ - \char92 smeterB\{\#1\}\{\#2\} \\ - \char92 measure\{\#1\} \\ - \char92 measureD\{\#1\} \\ - \char92 measuretab\{\#1\} \\ - \char92 multimeasure\{\#1\}\{\#2\} \\ - \char92 multimeasureD\{\#1\}\{\#2\} } \\ - Labels & \parbox[t]{6cm}{\tt - \char92 lstick\{\#1\} \\ - \char92 rstick\{\#1\} \\ - \char92 ustick\{\#1\} \\ - \char92 dstick\{\#1\} \\ - \char92 bra\{\#1\} \\ - \char92 ket\{\#1\} \\ - \char92 gategroup\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}\{\#6\}\\ - \char92 inputgroup\{\#1\}\{\#2\}\{\#3\}\{\#4\}\\ - \char92 inputgroupv\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}\\ - \char92 inputgrouph\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}\\ - } - \end{tabular} -\end{center}} - -\end{document} Binary files old/doc/latex/qcircuit/qcircuit.pdf and new/doc/latex/qcircuit/qcircuit.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qcircuit.doc.tlpobj new/tlpkg/tlpobj/qcircuit.doc.tlpobj --- old/tlpkg/tlpobj/qcircuit.doc.tlpobj 2016-04-14 19:44:22.000000000 +0200 +++ new/tlpkg/tlpobj/qcircuit.doc.tlpobj 2017-04-14 17:59:35.000000000 +0200 @@ -1,9 +1,8 @@ name qcircuit.doc category Package -revision 40319 +revision 42816 shortdesc doc files of qcircuit relocated 1 -docfiles size=87 - RELOC/doc/latex/qcircuit/Qtutorial.pdf - RELOC/doc/latex/qcircuit/Qtutorial.tex +docfiles size=74 RELOC/doc/latex/qcircuit/README.md + RELOC/doc/latex/qcircuit/qcircuit.pdf ++++++ qcircuit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/qcircuit/qcircuit.sty new/tex/latex/qcircuit/qcircuit.sty --- old/tex/latex/qcircuit/qcircuit.sty 2016-04-07 22:47:22.000000000 +0200 +++ new/tex/latex/qcircuit/qcircuit.sty 2016-12-31 05:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -% qcircuit version 2.5.2 +% qcircuit version 2.5.3 % Contributors: Steve Flammia, Bryan Eastin, Travis Scholten % 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 @@ -19,7 +19,7 @@ % Thanks also to Dave Clader, Andrew Childs, Rafael Possignolo, Tyson Williams, % Sergio Boixo, Cris Moore, Jonas Anderson, and Stephan Mertens for helping us test % and/or develop the new version. -\ProvidesPackage{qcircuit}[2016/04/06] +\ProvidesPackage{qcircuit}[2016/12/29] \RequirePackage{xy} \DeclareOption{braket}{ @@ -28,11 +28,11 @@ } \DeclareOption{qm}{ - \newcommand{\ip}[2]{\ensuremath{\left\langle{#1}\right\vert{#2}\rangle}} - \newcommand{\melem}[3]{\ensuremath{\left\langle{#1}\right\vert{#2}\vert{#3}\rangle}} + \newcommand{\ip}[2]{\ensuremath{\left\langle{#1}\middle\vert{#2}\right\rangle}} + \newcommand{\melem}[3]{\ensuremath{\left\langle{#1}\middle\vert{#2}\middle\vert{#3}\right\rangle}} \newcommand{\expval}[1]{\ensuremath{\left\langle #1 \right\rangle}} - \newcommand{\op}[2]{\ensuremath{\vert{#1}\rangle\langle{#2}\vert}} - } + \newcommand{\op}[2]{\ensuremath{\left\vert{#1}\middle\rangle\middle\langle{#2}\right\vert}} +} \ProcessOptions\relax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qcircuit.tlpobj new/tlpkg/tlpobj/qcircuit.tlpobj --- old/tlpkg/tlpobj/qcircuit.tlpobj 2016-04-14 19:44:22.000000000 +0200 +++ new/tlpkg/tlpobj/qcircuit.tlpobj 2017-04-14 17:59:35.000000000 +0200 @@ -1,6 +1,6 @@ name qcircuit category Package -revision 40319 +revision 42816 shortdesc Macros to generate quantum ciruits relocated 1 longdesc The package supports those within the quantum information @@ -9,7 +9,7 @@ runfiles size=4 RELOC/tex/latex/qcircuit/qcircuit.sty catalogue-ctan /graphics/qcircuit -catalogue-date 2016-04-07 05:38:11 +0200 +catalogue-date 2016-12-29 23:31:35 +0100 catalogue-license gpl2 catalogue-topics diagram-circ graphics-in-tex -catalogue-version 2.5.2 +catalogue-version 2.5.3 ++++++ qcm.doc.tar.xz ++++++ ++++++ qcm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qcm.tlpobj new/tlpkg/tlpobj/qcm.tlpobj --- old/tlpkg/tlpobj/qcm.tlpobj 2016-04-14 19:44:23.000000000 +0200 +++ new/tlpkg/tlpobj/qcm.tlpobj 2017-04-14 17:59:35.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/qcm/qcm.cls RELOC/tex/latex/qcm/qcm.sty catalogue-ctan /macros/latex/contrib/qcm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics exam catalogue-version 2.1 ++++++ qobitree.doc.tar.xz ++++++ ++++++ qobitree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qobitree.tlpobj new/tlpkg/tlpobj/qobitree.tlpobj --- old/tlpkg/tlpobj/qobitree.tlpobj 2016-04-14 19:44:23.000000000 +0200 +++ new/tlpkg/tlpobj/qobitree.tlpobj 2017-04-14 17:59:35.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=6 RELOC/tex/latex/qobitree/qobitree.tex catalogue-ctan /macros/latex/contrib/qobitree -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics tree ++++++ qpxqtx.doc.tar.xz ++++++ ++++++ qpxqtx.tar.xz ++++++ ++++++ qrcode.doc.tar.xz ++++++ ++++++ qrcode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qrcode.tlpobj new/tlpkg/tlpobj/qrcode.tlpobj --- old/tlpkg/tlpobj/qrcode.tlpobj 2016-04-14 19:44:23.000000000 +0200 +++ new/tlpkg/tlpobj/qrcode.tlpobj 2017-04-14 17:59:35.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/qrcode/qrcode.sty catalogue-also pst-barcode catalogue-ctan /macros/latex/contrib/qrcode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics barcode qrcode rule catalogue-version 1.51 ++++++ qstest.doc.tar.xz ++++++ ++++++ qstest.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qstest.tlpobj new/tlpkg/tlpobj/qstest.tlpobj --- old/tlpkg/tlpobj/qstest.tlpobj 2016-04-14 19:44:24.000000000 +0200 +++ new/tlpkg/tlpobj/qstest.tlpobj 2017-04-14 17:59:36.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/latex/qstest/makematch.sty RELOC/tex/latex/qstest/qstest.sty catalogue-ctan /macros/latex/contrib/qstest -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics units ++++++ qsymbols.doc.tar.xz ++++++ ++++++ qsymbols.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qsymbols.tlpobj new/tlpkg/tlpobj/qsymbols.tlpobj --- old/tlpkg/tlpobj/qsymbols.tlpobj 2016-04-14 19:44:24.000000000 +0200 +++ new/tlpkg/tlpobj/qsymbols.tlpobj 2017-04-14 17:59:36.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=7 RELOC/tex/latex/qsymbols/qsymbols.sty catalogue-ctan /macros/latex/contrib/qsymbols -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics shortcut ++++++ qtree.doc.tar.xz ++++++ ++++++ qtree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/qtree.tlpobj new/tlpkg/tlpobj/qtree.tlpobj --- old/tlpkg/tlpobj/qtree.tlpobj 2016-04-14 19:44:24.000000000 +0200 +++ new/tlpkg/tlpobj/qtree.tlpobj 2017-04-14 17:59:36.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/qtree/qtree.sty catalogue-also tree-dvips catalogue-ctan /macros/latex/contrib/qtree -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics tree linguistic catalogue-version 3.1b ++++++ quattrocento.doc.tar.xz ++++++ ++++++ quattrocento.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quattrocento.tlpobj new/tlpkg/tlpobj/quattrocento.tlpobj --- old/tlpkg/tlpobj/quattrocento.tlpobj 2016-04-14 19:44:25.000000000 +0200 +++ new/tlpkg/tlpobj/quattrocento.tlpobj 2017-04-14 17:59:36.000000000 +0200 @@ -247,6 +247,6 @@ RELOC/tex/latex/quattrocento/TS1QuattrocentoSans-TLF.fd RELOC/tex/latex/quattrocento/quattrocento.sty catalogue-ctan /fonts/quattrocento -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-sans font-serif font-type1 font-otf ++++++ quotchap.doc.tar.xz ++++++ ++++++ quotchap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quotchap.tlpobj new/tlpkg/tlpobj/quotchap.tlpobj --- old/tlpkg/tlpobj/quotchap.tlpobj 2016-04-14 19:44:28.000000000 +0200 +++ new/tlpkg/tlpobj/quotchap.tlpobj 2017-04-14 17:59:37.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/quotchap/quotchap.sty catalogue-ctan /macros/latex/contrib/quotchap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics headings catalogue-version 1.1 ++++++ quoting.doc.tar.xz ++++++ ++++++ quoting.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quoting.tlpobj new/tlpkg/tlpobj/quoting.tlpobj --- old/tlpkg/tlpobj/quoting.tlpobj 2016-04-14 19:44:28.000000000 +0200 +++ new/tlpkg/tlpobj/quoting.tlpobj 2017-04-14 17:59:37.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/quoting/quoting.sty catalogue-ctan /macros/latex/contrib/quoting -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics quotation catalogue-version 0.1c ++++++ quotmark.doc.tar.xz ++++++ ++++++ quotmark.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quotmark.tlpobj new/tlpkg/tlpobj/quotmark.tlpobj --- old/tlpkg/tlpobj/quotmark.tlpobj 2016-04-14 19:44:28.000000000 +0200 +++ new/tlpkg/tlpobj/quotmark.tlpobj 2017-04-14 17:59:38.000000000 +0200 @@ -49,7 +49,7 @@ RELOC/tex/latex/quotmark/quotmark-welsh.def RELOC/tex/latex/quotmark/quotmark.sty catalogue-ctan /macros/latex/contrib/quotmark -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics quotation catalogue-version 1.0 ++++++ quran.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/README new/doc/xelatex/quran/README --- old/doc/xelatex/quran/README 2016-05-16 00:11:54.000000000 +0200 +++ new/doc/xelatex/quran/README 2017-02-28 23:01:04.000000000 +0100 @@ -1,6 +1,6 @@ _____________________ The quran package -v1.14 +v1.252 The package is prepared for typesetting the Holy Quran. This work is inspired by lipsum and ptext packages, provides several macros for typesetting the whole or @@ -8,12 +8,12 @@ For more information, please see the documentation. -Current version release date: 2016/05/15 +Current version release date: 2017/02/28 ___________________ Seiied-Mohammad-Javad Razvian javadr(a)gmail.com -Copyright © 2015-2016 +Copyright © 2015-2017 It may be distributed and/or modified under the LaTeX Project Public License, version 1.3c or higher (your choice). The latest version of this license is at: http://www.latex-project.org/lppl.txt Binary files old/doc/xelatex/quran/defaulttext.pdf and new/doc/xelatex/quran/defaulttext.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/defaulttext.tex new/doc/xelatex/quran/defaulttext.tex --- old/doc/xelatex/quran/defaulttext.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/xelatex/quran/defaulttext.tex 2016-11-25 19:30:55.000000000 +0100 @@ -0,0 +1,13 @@ +\documentclass{standalone} + +\usepackage{quran} +\usepackage{xepersian} +\settextfont{Scheherazade} + +\begin{document} + +\begin{minipage}{.45\textwidth} +{\quransurah*[1]} +\end{minipage} + +\end{document} Binary files old/doc/xelatex/quran/quran-doc.pdf and new/doc/xelatex/quran/quran-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/quran-doc.tex new/doc/xelatex/quran/quran-doc.tex --- old/doc/xelatex/quran/quran-doc.tex 2016-05-16 00:11:54.000000000 +0200 +++ new/doc/xelatex/quran/quran-doc.tex 2017-02-28 23:01:04.000000000 +0100 @@ -1,5 +1,6 @@ \documentclass{ltxdoc} -%\usepackage{pgffor} + +%\usepackage{caption} \usepackage{forloop} \usepackage{pgf} %\usepackage{pgfcalendar} @@ -11,7 +12,12 @@ \usepackage{tikz} \usetikzlibrary{calc} \usepackage{fontspec} -\newfontfamily\quran{Scheherazade} +\newfontfamily\quran[Script=Arabic]{Scheherazade} +% because of definition of \XeTeX and \XeLaTeX symbols in bidi, I should undef these macro that are also defined in holtxdoc package. +\makeatletter +\bidi@undef\XeTeX +\bidi@undef\XeLaTeX +\makeatother \usepackage{bidi} \makeatletter \bidi@preto\qurantext{\quran} @@ -64,17 +70,18 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{document} \title{\includegraphics[scale=.3]{quran.png}\\ The \xpackage{quran} Package\footnote{to one who has devoted his life to Quran}} \author{Seiied Mohammad Javad Razavian\\\xemail{javadr(a)gmail.com}} -\date{May 15, 2016} +\date{February 28, 2017} + +\begin{document} \maketitle \begin{framed} This manual is incomplete and the package is under development. \par -\centerline{ver 1.14} +\centerline{ver 1.252} \end{framed} \tableofcontents @@ -92,7 +99,7 @@ terminal and to the log file, too. The information is something like: \begin{lstlisting}[style=BashInputStyle, language=tex] -Package: quran 2016/05/15 v1.14 An easy way to typeset the whole or any part of The Holy Quran +Package: quran 2016/12/25 v1.251 An easy way to typeset the whole or any part of The Holy Quran \end{lstlisting} \section{Typesetting The Holy Quran} @@ -106,8 +113,8 @@ e.g. both of \cs{quransurah[1]} and \cs{quransurah[Al-Fatiha]} have the same effect. For using surah's name instead of their order see table~\ref{tab1}. \marginpar{\cs{quransurah[1]}}\marginpar{\cs{quransurah[Al-Fatiha]}} - \hbox{\mx{quransurah[94]}{\quransurah[94]}\hfill - \mx{quransurah[At-Tin]}{\quransurah[At-Tin]}} + \centerline{\hbox{\mx{quransurah[94]}{\quransurah[94]}\hfill + \mx{quransurah[At-Tin]}{\quransurah[At-Tin]}}} \begin{declcs}{quransurah}\oarg{m-n} \end{declcs} @@ -118,8 +125,8 @@ In this case m and n are tranliterations of surah's names, e.g. \cs{quransurah[An-Nasr--An-Nas]}. \marginpar{\cs{quransurah[An-Nasr--An-Nas]}} - \hbox{\mx{quransurah[109-110]}{\quransurah[109-110]}\hfill - \mx{quransurah[Al-Masadd--Al-Ikhlas]}{\quransurah[Al-Masadd--Al-Ikhlas]}} + \centerline{\hbox{\mx{quransurah[109-110]}{\quransurah[109-110]}\hfill + \mx{quransurah[Al-Masadd--Al-Ikhlas]}{\quransurah[Al-Masadd--Al-Ikhlas]}}} \newcounter{ct} \def\mycell#1{ @@ -166,15 +173,15 @@ \end{declcs} The above macro typeset the \textit{n}$^{th}$ Ayah of \textit{l}$^{th}$ Surah. - \hbox{\mx{quranayah[33][33]}{\quranayah[33][33]}\hfill - \mx{quranayah[Al-Ahzab][33]}{\quranayah[Al-Ahzab][33]}} + \centerline{\hbox{\mx{quranayah[33][33]}{\quranayah[33][33]}\hfill + \mx{quranayah[Al-Ahzab][33]}{\quranayah[Al-Ahzab][33]}}} If you just typeset the first Ayah of any Surah, then the Basmalah will not be printed. In this case if you need Basmalah, then you can use the \cs{basmalah} macro before. \marginpar{\cs{basmalah}} - \hbox{\mx{quranayah[Ibrahim][1]}{\quranayah[Ibrahim][1]}\hfill - \mx{basmalah\textbackslash{}quranayah[14][1]}{\quran\basmalah\quranayah[14][1]}} + \centerline{\hbox{\mx{quranayah[Ibrahim][1]}{\quranayah[Ibrahim][1]}\hfill + \mx{basmalah\textbackslash{}quranayah[14][1]}{\quran\basmalah\quranayah[14][1]}}} \begin{declcs}{quranayah}\oarg{l}\oarg{m-n} \end{declcs} @@ -188,8 +195,8 @@ \textit{n} is diffirent by every Surah and it relies on the number of the Surah's verses. \textit{m} should be between 1 and a number less than \textit{n}. - \hbox{\mx{quranayah[Ash-Shura][22-26]}{\quranayah[Ash-Shura][22-26]}\hfill - \mx{quranayah[42][22-26]}{\quranayah[42][22-26]}} + \centerline{\hbox{\mx{quranayah[Ash-Shura][22-26]}{\quranayah[Ash-Shura][22-26]}\hfill + \mx{quranayah[42][22-26]}{\quranayah[42][22-26]}}} \subsection{Page/Pages} \begin{declcs}{quranpage}\oarg{n} @@ -201,9 +208,9 @@ \end{declcs} The numbers should be between $1$ to $604$, based on Uthmani text. - \hboxR{\mx{quranpage*[249]}{\quranpage*[249]} + \centerline{\hboxR{\mx{quranpage*[249]}{\quranpage*[249]} \hfill - \mx{quranpage*[250]}{\quranpage*[250]}} + \mx{quranpage*[250]}{\quranpage*[250]}}} * starred version of macros are explained in page~\pageref{starred}; concisely it means typesetting that part of the Holy Quran in one paragraph. @@ -335,9 +342,9 @@ \end{declcs} This macro returns the arabic name of \textit{m}$^{th}$ Surah. - \hbox{\mx{surahname[19]}{\surahname[19]} + \centerline{\hbox{\mx{surahname[19]}{\surahname[19]} \hfill - \mx{surahname*[19]}{\quran\surahname*[19]}} + \mx{surahname*[19]}{\quran\surahname*[19]}}} \subsection{Basmalah} \begin{declcs}{basmalah} @@ -372,6 +379,14 @@ \centerline{\mxf{ToggleAyahNumber\textbackslash{}quransurah*[89]} {\ToggleAyahNumber\quransurah*[89]}} +By default, the package typesets the text of The Holy Quran in simple script, but if you prefer the Uthmani script you can use \texttt{uthmani} \marginpar{uthmani} +option. Compare the following text to figure out the differences between default and uthmani script. + \centerline{\hbox{ + \mx{quransurah*[1] (default)}{\includegraphics{defaulttext.pdf}} + \hfill + \mx{quransurah*[1] (uthmani)}{\includegraphics{uthmanitext.pdf}} + }} + \section{Acknowledgment} At first, I should appreciate Vafa Khaligi by preparing such adorable packages --\xpackage{bidi} and \xpackage{xepersian}. Secondly, the costly \url{http://tanzil.net/} for providing the text of The Holy Quran that @@ -380,23 +395,35 @@ \section{Frequently Asked Questions} \subsection{What is the best font for typesetting quran text?} - We strongly recommend you to use "Scheherazade" font.% - \footnote{\url{http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=scheherazade}} + We strongly recommend you to use "Scheherazade"% + \footnote{\url{http://software.sil.org/scheherazade/}} + and "Amiri"% + \footnote{\url{http://www.amirifont.org/}} fonts. + Scheherazade is released under the SIL Open Font License (OFL), version 1.1. Copyright (c) 2004-2015, SIL International (http://scripts.sil.org/) with Reserved Font Names "Scheherazade" and "SIL". Therefore you can freely download it. All examples in this document use this font. + Amiri is a classical Arabic typeface in Naskh style for typesetting books and other running text. + Amiri is a revival of the beautiful typeface pioneered in early 20th century by Bulaq Press in Cairo, + also known as Amiria Press, after which the font is named. + Amiri is a free, open source project that everyone is encouraged to use and modify. + \subsection{How to use \xpackage{quran} package?} As you've noticed, for typesetting quran text you need a package that can typeset text - in RTL mode in additon to using UTF8 fonts. The \xpackage{polyglossia}, + in RTL mode in additon to using UTF8 fonts, because \xpackage{quran} draws its text from a + unicoded databases. The \xpackage{polyglossia}, \xpackage{fontspec}, and \xpackage{bidi} will do that for you. - You can also use \xpackage{xepersian} that depends on \xpackage{fontspec}, too. - Below, we demonstrated two examples for both approaches: + You can also use \xpackage{xepersian} that relies on \xpackage{fontspec}, too. + Another choices are \xpackage{arabxetex} and \xpackage{arabluatex} that the latter just + works with \LuaLaTeX{} while former + ways work with \XeLaTeX. \xpackage{arabxetex} and \xpackage{arabluatex} use Amiri font by default. + The following demonstrates examples for all four approaches: \begin{lstlisting}[style=BashInputStyle, language=tex, title=``example: with polyglossia{,} fontspec{,} and bidi"] -\documentclass[12pt]{article} +\documentclass{article} \usepackage{quran} @@ -420,7 +447,7 @@ \begin{lstlisting}[style=BashInputStyle, language=tex, title=``example: with xepersian"] -\documentclass[12pt]{article} +\documentclass{article} \usepackage{quran} @@ -434,6 +461,36 @@ \end{document} \end{lstlisting} + +\begin{lstlisting}[style=BashInputStyle, language=tex, title=``example: with arabxetex"] +\documentclass{article} + +\usepackage{arabxetex} % for typesetting Arabic text in Rigth-To-Left direction +\usepackage{quran} + +\begin{document} + +\begin{arab}[utf] + \quransurah +\end{arab} + +\end{document} +\end{lstlisting} + +\begin{lstlisting}[style=BashInputStyle, language=tex, title=``example: with arabluatex"] +\documentclass{article} + +\usepackage{arabluatex} % for typesetting Arabic text in Rigth-To-Left direction +\usepackage{quran} + +\begin{document} + +\begin{txarab} + \quransurah +\end{txarab} + +\end{document} +\end{lstlisting} \subsection{How to set quran default font?} If you want to automatically change the font of quran text in your document, you Binary files old/doc/xelatex/quran/quran-test1.pdf and new/doc/xelatex/quran/quran-test1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/quran-test1.tex new/doc/xelatex/quran/quran-test1.tex --- old/doc/xelatex/quran/quran-test1.tex 2016-05-16 00:11:54.000000000 +0200 +++ new/doc/xelatex/quran/quran-test1.tex 2016-11-25 19:30:55.000000000 +0100 @@ -1,6 +1,6 @@ \documentclass[12pt]{article} -\usepackage{quran} +\usepackage[uthmani]{quran} %%% for typesetting arabic text \usepackage{polyglossia} \setotherlanguage{arabic} Binary files old/doc/xelatex/quran/uthmanitext.pdf and new/doc/xelatex/quran/uthmanitext.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/uthmanitext.tex new/doc/xelatex/quran/uthmanitext.tex --- old/doc/xelatex/quran/uthmanitext.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/xelatex/quran/uthmanitext.tex 2016-11-25 19:30:55.000000000 +0100 @@ -0,0 +1,13 @@ +\documentclass{standalone} + +\usepackage[uthmani]{quran} +\usepackage{xepersian} +\settextfont{Scheherazade} + +\begin{document} + +\begin{minipage}{.45\textwidth} +{\quransurah*[1]} +\end{minipage} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quran.doc.tlpobj new/tlpkg/tlpobj/quran.doc.tlpobj --- old/tlpkg/tlpobj/quran.doc.tlpobj 2016-05-16 00:52:40.000000000 +0200 +++ new/tlpkg/tlpobj/quran.doc.tlpobj 2017-04-14 17:59:38.000000000 +0200 @@ -1,10 +1,12 @@ name quran.doc category Package -revision 41165 +revision 43360 shortdesc doc files of quran relocated 1 -docfiles size=89 +docfiles size=112 RELOC/doc/xelatex/quran/README + RELOC/doc/xelatex/quran/defaulttext.pdf + RELOC/doc/xelatex/quran/defaulttext.tex RELOC/doc/xelatex/quran/quran-doc.pdf RELOC/doc/xelatex/quran/quran-doc.tex RELOC/doc/xelatex/quran/quran-test.pdf @@ -14,3 +16,5 @@ RELOC/doc/xelatex/quran/quran-test2.pdf RELOC/doc/xelatex/quran/quran-test2.tex RELOC/doc/xelatex/quran/quran.png + RELOC/doc/xelatex/quran/uthmanitext.pdf + RELOC/doc/xelatex/quran/uthmanitext.tex ++++++ quran.tar.xz ++++++ ++++ 37895 lines of diff (skipped) ++++++ r_und_s.doc.tar.xz ++++++ ++++++ r_und_s.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/r_und_s.tlpobj new/tlpkg/tlpobj/r_und_s.tlpobj --- old/tlpkg/tlpobj/r_und_s.tlpobj 2016-04-14 19:44:31.000000000 +0200 +++ new/tlpkg/tlpobj/r_und_s.tlpobj 2017-04-14 17:59:39.000000000 +0200 @@ -21,7 +21,7 @@ RELOC/tex/latex/r_und_s/r_und_s.tex catalogue-also mhchem catalogue-ctan /macros/latex/contrib/r_und_s -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics safety-notice catalogue-version 1.3i ++++++ raleway.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/raleway/LPPL.txt new/doc/latex/raleway/LPPL.txt --- old/doc/latex/raleway/LPPL.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/raleway/LPPL.txt 2016-12-04 00:01:03.000000000 +0100 @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % 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://www.latex-project.org/lppl.txt + % 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 M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Binary files old/doc/latex/raleway/raleway.pdf and new/doc/latex/raleway/raleway.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/raleway/raleway.tex new/doc/latex/raleway/raleway.tex --- old/doc/latex/raleway/raleway.tex 2015-05-14 23:23:49.000000000 +0200 +++ new/doc/latex/raleway/raleway.tex 2016-12-04 00:01:03.000000000 +0100 @@ -18,8 +18,7 @@ } \author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}} -\date{Documentation for raleway v1.3.\\ \today} -\listfiles +\date{Documentation for raleway v1.4.\\ \today} \begin{document} \maketitle \begin{multicols}{2} @@ -117,6 +116,11 @@ \textbf{Please note:} to use italic smallcaps the \texttt{slantsc} package is required. \section{Version history} +\subsection*{1.4} +\begin{itemize*} + \item Johannes Choo: have sfdefault set ItalicFont and BoldItalicFont (Fixes \href{https://github.com/silkeh/latex-raleway/issues/1}{issue~\#1}). +\end{itemize*} + \subsection*{1.3} \begin{itemize*} \item Fixed scaling issue. @@ -183,4 +187,3 @@ (list generated with otfinfo) \end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/raleway.doc.tlpobj new/tlpkg/tlpobj/raleway.doc.tlpobj --- old/tlpkg/tlpobj/raleway.doc.tlpobj 2016-04-14 19:44:31.000000000 +0200 +++ new/tlpkg/tlpobj/raleway.doc.tlpobj 2017-04-14 17:59:39.000000000 +0200 @@ -1,9 +1,10 @@ name raleway.doc category Package -revision 37394 +revision 42629 shortdesc doc files of raleway relocated 1 -docfiles size=87 +docfiles size=92 + RELOC/doc/latex/raleway/LPPL.txt RELOC/doc/latex/raleway/OFL.txt RELOC/doc/latex/raleway/raleway-otf-specimen.pdf RELOC/doc/latex/raleway/raleway-otf-specimen.tex ++++++ raleway.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/raleway/raleway.sty new/tex/latex/raleway/raleway.sty --- old/tex/latex/raleway/raleway.sty 2015-05-14 23:23:49.000000000 +0200 +++ new/tex/latex/raleway/raleway.sty 2016-12-04 00:01:02.000000000 +0100 @@ -8,7 +8,7 @@ % Licenced under the LPPL v1.3 or higher. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{raleway}[2015/01/11 v1.3 Matt McInerney’s Raleway family] +\ProvidesPackage{raleway}[2016/12/03 v1.4 Matt McInerney’s Raleway family] \RequirePackage{ifxetex,ifluatex,xkeyval} @@ -122,7 +122,10 @@ \ifraleway@sfdefault \setsansfont [ UprightFont = *-\raleway@regstyle , - BoldFont = *-\raleway@boldstyle ] + ItalicFont = *-\raleway@regstyle-Italic , + BoldFont = *-\raleway@boldstyle , + BoldItalicFont = *-\raleway@boldstyle-Italic + ] {Raleway} \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/raleway.tlpobj new/tlpkg/tlpobj/raleway.tlpobj --- old/tlpkg/tlpobj/raleway.tlpobj 2016-04-14 19:44:31.000000000 +0200 +++ new/tlpkg/tlpobj/raleway.tlpobj 2017-04-14 17:59:39.000000000 +0200 @@ -1,6 +1,6 @@ name raleway category Package -revision 37394 +revision 42629 shortdesc Use Raleway with TeX(-alike) systems relocated 1 longdesc The package provides the Raleway family in an easy to use way. @@ -754,7 +754,7 @@ RELOC/tex/latex/raleway/raleway-type1-autoinst.sty RELOC/tex/latex/raleway/raleway.sty catalogue-ctan /fonts/raleway -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-12-03 18:07:41 +0100 catalogue-license ofl catalogue-topics font font-sans font-type1 font-otf font-supp -catalogue-version 1.3 +catalogue-version 1.4 ++++++ ran_toks.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/README.md new/doc/latex/ran_toks/README.md --- old/doc/latex/ran_toks/README.md 2016-02-12 01:26:01.000000000 +0100 +++ new/doc/latex/ran_toks/README.md 2017-05-19 23:06:02.000000000 +0200 @@ -1,7 +1,6 @@ The ran_toks Package Author: D. P. Story -Dated: 2016/02/06 -Version: v1.0e +Dated: 2017/05/04 This short package, with minimal requirements, defines macros for randomizing a list of tokens. There are two approaches: @@ -38,15 +37,16 @@ \useRanTok{4}, and {\useRanTok{5}} to obtain a random listing of the tokens in the myList list. -For user of AeB or eqexam, the latter structure can be used to randomize +For users of AeB or eqexam, the latter structure can be used to randomize the order of the questions on a quiz or exam. -If the ran_toks.sty file is not provided in the distribution, then tex (not latex) -the file ran_toks.dtx. +What's new in v1.1: Added the convenience command \useTheseDBs to input files for +an application to constructing exams (using eqexam) from a series of DB files. Refer to the +new demo file mc-db.tex. Enjoy! Now, I must get back to my retirement. dps -2016/02/08 + Binary files old/doc/latex/ran_toks/doc/rantoks_man.pdf and new/doc/latex/ran_toks/doc/rantoks_man.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/doc/rantoks_man.tex new/doc/latex/ran_toks/doc/rantoks_man.tex --- old/doc/latex/ran_toks/doc/rantoks_man.tex 2016-02-12 01:26:01.000000000 +0100 +++ new/doc/latex/ran_toks/doc/rantoks_man.tex 2017-05-19 23:06:02.000000000 +0200 @@ -7,13 +7,15 @@ ]{aeb_pro} \usepackage{ran_toks} -%\useThisSeed{1441984427} +\useThisSeed{1441984427} %\useLastAsSeed -\useThisSeed{2001383846} +%\useThisSeed{2001383846} %2001383846 % initializing seed value %1629639958 % last random number used +\let\pkg\textsf +\let\env\texttt %\rtdebugtrue %\ranToksOn @@ -41,11 +43,13 @@ \makeatother \def\anglemeta#1{$\langle\textit{\texttt{#1}}\rangle$} +\let\ameta\anglemeta \def\meta#1{\textit{\texttt{#1}}} \def\darg#1{\texttt{\{#1\}}} \def\takeMeasure{\bgroup\obeyspaces\takeMeasurei} \def\takeMeasurei#1{\global\setbox\webtempboxi\hbox{\ttfamily#1}\egroup} \def\bxSize{\wd\webtempboxi+2\fboxsep+2\fboxrule} + \usepackage[active]{srcltx} \let\amtIndent\leftmargini @@ -68,7 +72,7 @@ email={dpstory(a)acrotex.net}, subject=Documentation for the ran\_toks package, talksite={\url{www.acrotex.net}}, - version={1.0e}, + version={1.1}, Keywords={LaTeX,PDF,random, tokens, JavaScript,Adobe Acrobat}, copyrightStatus=True, copyrightNotice={Copyright (C) \the\year, D. P. Story}, @@ -94,17 +98,52 @@ %\pagestyle{empty} %\parindent0pt\parskip\medskipamount - -\definePath\bgPath{"C:/Users/Public/Documents/% - ManualBGs/Manual_BG_Print_AeB.pdf"} +\chngDocObjectTo{\newDO}{doc} \begin{docassembly} -\addWatermarkFromFile({% - bOnTop: false, - cDIPath: \bgPath -}) -\executeSave() +var titleOfManual="The ran_toks Package"; +var manualfilename="Manual_BG_Print_rt.pdf"; +var manualtemplate="Manual_BG_Brown.pdf"; // Blue, Green, Brown +var _pathToBlank="C:/Users/Public/Documents/ManualBGs/"+manualtemplate; +var doc; +var buildIt=false; +if ( buildIt ) { + console.println("Creating new " + manualfilename + " file."); + doc = \appopenDoc({cPath: _pathToBlank, bHidden: true}); + var _path=this.path; + var pos=_path.lastIndexOf("/"); + _path=_path.substring(0,pos)+"/"+manualfilename; + \docSaveAs\newDO ({ cPath: _path }); + doc.closeDoc(); + doc = \appopenDoc({cPath: manualfilename, oDoc:this, bHidden: true}); + f=doc.getField("ManualTitle"); + f.value=titleOfManual; + doc.flattenPages(); + \docSaveAs\newDO({ cPath: manualfilename }); + doc.closeDoc(); +} else { + console.println("Using the current "+manualfilename+" file."); +} +var _path=this.path; +var pos=_path.lastIndexOf("/"); +_path=_path.substring(0,pos)+"/"+manualfilename; +\addWatermarkFromFile({ + bOnTop:false, + bOnPrint:false, + cDIPath:_path +}); +\executeSave(); \end{docassembly} +%\definePath\bgPath{"C:/Users/Public/Documents/% +% ManualBGs/Manual_BG_Print_AeB.pdf"} +%\begin{docassembly} +%\addWatermarkFromFile({% +% bOnTop: false, +% cDIPath: \bgPath +%}) +%\executeSave() +%\end{docassembly} + \begin{document} \maketitle @@ -123,12 +162,18 @@ \newtopic\noindent\exSrc The \texttt{examples} folder contains three demonstration files: \begin{enumerate} \item \texttt{ran\_toks.tex} reproduces the sample code of this manual. - \item \texttt{random\_tst.tex} shows how to use \textsf{ran\_toks} to + \item \texttt{random\_tst.tex} shows how to use \pkg{ran\_toks} to randomize the \emph{questions} of an exam document created by the - \textsf{eqexam} package. + \pkg{eqexam} package. \item \texttt{random\_tst\_qz.tex} shows how to randomize choices of a - multiple choice field in a \texttt{quiz} environment of the - \textsf{exerquiz} package, when the choices contain verbatim text. + multiple choice field in a \env{quiz} environment of the + \pkg{exerquiz} package, when the choices contain verbatim text. + \item \texttt{mc-db.tex} is an \pkg{eqexam} file that draws from the + database files \texttt{db1.tex}, \texttt{db2.tex}, + \texttt{db3.tex}, and \texttt{db4.tex}, to construct the questions + of the exam. The questions are drawn at random from the DB files. Refer + to \hyperref[s:DBConcept]{Section~\ref*{s:DBConcept}} for a few more details. + \end{enumerate} \section{The Preamble and Package Options} @@ -144,7 +189,7 @@ The requirements for \textsf{ran\_toks} are the \textsf{verbatim} package (part of the standard {\LaTeX} distribution, and the macro file -\texttt{random.tex} by Donald Arseneau +\texttt{random.tex} by Donald Arseneau. \section{The main commands and environments}\label{rtmain} @@ -153,8 +198,7 @@ using either the \cs{ranToks} command or the \cs{bRTVToks}/\cs{eRTVToks} pair. Each of these is discussed in the next two subsections. -\subsection{The \texorpdfstring{\protect\cs{ranToks} -command}{\CMD{ranToks}} command} +\subsection{The \texorpdfstring{\protect\cs{ranToks}}{\CMD{ranToks}} command} The \cs{ranToks} command was the original concept; declare a series of tokens to be randomized. @@ -234,15 +278,41 @@ Repeating the sentence yields, ``I have {\nToksFor{myPals}} pals, they are \useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4}, -{\useRanTok{5}} and \useRanTok{6}'' the exact same random order. To obtain -a different order, re-execute the \cs{ranToks} command with the same -arguments. Doing just that, \ranToks{myPals}{{Jim}{Richard}{Don} +{\useRanTok{5}} and \useRanTok{6}'', which is the exact same random order. To +obtain a different order, re-execute the \cs{ranToks} command with the same +arguments.\footnote{{\ttfamily\string\ranToks\darg{myPals}\darg{\darg{Jim}\darg{Richard}\darg{Don}\darg{Alex}\darg{Tom}\darg{J\string\"\darg{u}rgen}}} in this example.} Doing just that, \ranToks{myPals}{{Jim}{Richard}{Don} {Alex}{Tom}{J\"{u}rgen}}we obtain, ``I have {\nToksFor{myPals}} pals, they are \useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4}, -{\useRanTok{5}} and \useRanTok{6}.'' A new order? For most applications, -re-randomizing the same token list in the same document is not very likely -something you need to do. +{\useRanTok{5}} and \useRanTok{6}.'' A new order? +An alternative to re-executing \cs{ranToks} is to use the \cs{reorderRanToks} command: +\bVerb\takeMeasure{\string\reorderRanToks\darg{\meta{name}}}% +\begin{minipage}{\bxSize}\kern0pt +\begin{Verbatim}[frame=single,commandchars=!()] +\reorderRanToks{!meta(name)} +\end{Verbatim} +\end{minipage}\eVerb Now, executing \verb~\reorderRanToks{myPals}~ and compiling the sentence again yields, +``I have {\nToksFor{myPals}} pals, they are +\useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4}, +{\useRanTok{5}} and \useRanTok{6}.'' For most applications, re-randomizing +the same token list in the same document is not very likely something you +need to do. + +The \cs{reorderRanToks\darg{\meta{name}}} rearranges the list of tokens +associated with \ameta{name}, which may not be what you want; the +\cs{copyRanToks} command, on the other hand, makes a (randomized) copy of its +first required argument \ameta{name\SUB1} and saves it as \ameta{name\SUB2}, without +effecting the order of \ameta{name\SUB1}. +\bVerb\takeMeasure{\string\copyRanToks\darg{\ameta{name\SUB1}}\darg{\ameta{name\SUB2}}}% +\begin{minipage}{\bxSize}\kern0pt +\begin{Verbatim}[frame=single,commandchars=!()] +\copyRanToks{!ameta(name!SUB1)}{!ameta(name!SUB2)} +\end{Verbatim} +\end{minipage}\eVerb Thus, if \verb!\copyRanToks{myPals}{myPals1}! is executed, the token list name +\texttt{myPals1} contains the names of my pals in another randomized order, +while maintaining the same order of \texttt{myPals}. + +\newtopic My original application for this, the one that motivated writing this package at long last, was the need to arrange several form buttons randomly on the page. My point is that the listing given in the argument @@ -252,25 +322,25 @@ \subsection{The \texorpdfstring{\protect\cs{bRTVToks}/\protect\cs{eRTVToks}} - {\CMD{bRTVToks}/\CMD{eRTVToks}} pair of commands} + {\CMD{bRTVToks}/\CMD{eRTVToks}} pair of commands}\label{ss:RTVToks} Sometimes the content to be randomized is quite large or contains verbatim text. For this, it may be more convenient to use the \cs{bRTVToks}/\penalty0\cs{eRTVToks} command pair. The syntax is \bVerb\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad}% \edef\WIDTH{\the\wd\webtempboxi}% -\def\1{\rlap{\hspace*{\WIDTH}\texttt{\% End token listing}}}% -\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad\% <- Begin token listing}% +\def\1{\rlap{\hspace*{\WIDTH}\texttt{\% <-{\sffamily{ End token listing}}}}}% +\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad\% <-{\sffamily{ Begin token listing}}}% \begin{minipage}{\bxSize}\kern0pt \begin{Verbatim}[frame=single,commandchars=!()] -\bRTVToks{!meta(name)}!quad% <- Begin token listing +\bRTVToks{!meta(name)}!quad% <-!sffamily( Begin token listing) \begin{rtVW} - !anglemeta(content!SUB(1)) +!qquad!ameta(content!SUB(1)) \end{rtVW} ... ... \begin{rtVW} - !anglemeta(content!SUB(n)) +!qquad!ameta(content!SUB(n)) \end{rtVW} !1\eRTVToks \end{Verbatim} @@ -278,7 +348,7 @@ The \cs{bRTVToks}\texttt{\{\meta{name}\}} command begins the (pseudo) environment and is ended by \cs{eRTVToks}. Between these two are a series of \texttt{rtVW} (random toks verbatim write) environments. When the document is -compiled, the contents (\anglemeta{content\SUB{i}}) of each of these environments +compiled, the contents (\ameta{content\SUB{i}}) of each of these environments are written to the computer hard drive and saved under a different name (based on the parameter \meta{name}). Later, using the \cs{useRanTok} commands, they are input back into the document in a random order. @@ -349,6 +419,14 @@ \item \useRanTok{3} \end{enumerate} \end{Verbatim} +The \cs{reorderRanToks} works for lists created by the \cs{bRTVToks}/\penalty0\cs{bRTVToks} construct. +If we say \cs{reorderRanToks\darg{myThoughts}} and reissue the above list, we obtain, +\begin{enumerate}\ranToksOn\reorderRanToks{myThoughts} + \displayListRandomly[\item]{myThoughts} +\end{enumerate} +The command \cs{copyRanToks} works for list created by +\cs{bRTVToks}/\penalty0\cs{bRTVToks} as well. + \paragraph*{On the \cs{displayListRandomly} command.}\label{para:DLR} In the enumerate example immediately above, the items in the list are @@ -359,18 +437,49 @@ \displayListRandomly[\item]{myThoughts} \end{enumerate} \end{Verbatim} -The \cs{displayListRandomly} has the syntax, -\bVerb\takeMeasure{\string\displayListRandomly[\anglemeta{prior}]\darg{\meta{name}}}% +The full syntax for \cs{displayListRandomly} is displayed next. +\bVerb\takeMeasure{\string\displayListRandomly[\ameta{prior}][\ameta{post}]\darg{\meta{name}}}% \begin{minipage}{\bxSize}\kern0pt \begin{Verbatim}[frame=single,commandchars=!()] -\displayListRandomly[!anglemeta(prior)]{!meta(name)} +\displayListRandomly[!ameta(prior)][!ameta(post)]{!meta(name)} \end{Verbatim} \end{minipage} \eVerb The action of \cs{displayListRandomly} is to expand all tokens that -are listed in the \meta{name} token list, each entry is displayed with -\anglemeta{prior}\cs{useRanTok\darg{i}}, where \texttt{i} goes from~1 to -\cs{nToksFor\darg{\meta{name}}}. In the example above, \meta{prior} is -\cs{item}, but normally, its default is empty. +are listed in the \meta{name} token list, each entry is displayed as +\ameta{prior}\cs{useRanTok\darg{i}}\ameta{post}, where \texttt{i} +goes from~1 to \cs{nToksFor\darg{\meta{name}}}. In the example above, +\meta{prior} is \cs{item}, but normally, its default is empty. The defaults +for \ameta{prior} and \ameta{post} are both empty. + +\subparagraph*{The optional arguments.} When only one optional argument is present, +if is interpreted as \ameta{prior}. To obtain a \ameta{post} with no \ameta{prior} +use the syntax, +\begin{quote} +\cs{displayListRandomly[][\ameta{post}]\darg{\ameta{name}}} +\end{quote} +Within \emph{each optional argument}, the four commands \cs{i}, +\cs{first}, \cs{last}, and \cs{lessone} are (locally) defined. The \cs{i} command is the index +counter of the token currently being typeset; \cs{first} is the index of the +first item; \cs{last} is the index of the last item; and \cs{lessone} is one +less than \cs{last}. The two optional arguments and the four commands may use +to perform logic on the token as it is being typeset. For example: +\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small] +List of pals: \displayListRandomly + [\ifnum\i=\last and \fi] + [\ifnum\i=\last.\else, \fi]{myPals} +\end{Verbatim} +yields, +\begin{quote} +List of pals: \displayListRandomly + [\ifnum\i=\last and \fi] + [\ifnum\i=\last.\else, \fi]{myPals} +\end{quote} +The optional arguments are wrapped to the next line to keep them within the margins, cool. + +The example above shows the list of my pals with an Oxford comma. How would +you modify the optional argument to get the same listing without the Oxford +comma? (\displayListRandomly[\ifnum\i=\last and \fi][\ifnum\i=\last.\else\ifnum\i=\lessone\relax\space\else, \fi\fi]{myPals}) +Hint: a solution involves the other command \cs{lessone}. @@ -390,11 +499,11 @@ inclusive. The optional argument is useful in special circumstances when you want to mix two random lists together. -\newtopic\noindent To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{1} +\newtopic\noindent To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2} \newtopic\noindent The verbatim listing is \begin{Verbatim}[xleftmargin=\amtIndent] -To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{1} +To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2} \end{Verbatim} The typeset version looks a little strange, but recall, the text of \texttt{myThoughts} were each put in a \texttt{minipage} of width \texttt{.67\cs{linewidth}}. @@ -440,6 +549,29 @@ `\ranToksOff\ranToks{integers}{ {1}{2}{3}{4}}\ranToksOn $\useRanTok{3} = \rtTokByNum{3} = 3 $'? As anticipated. +To create a non-randomized list of tokens that already have been created (and randomized), use +\cs{copyRanToks}: +\begin{Verbatim}[xleftmargin=\amtIndent] +\ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn +\end{Verbatim} +Then, using \cs{displayListRandomly} in a clever way, +\begin{Verbatim}[xleftmargin=\amtIndent] +\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~] + [\ifnum\i=\last.\else,\fi\space]{myOriginalPals} +\end{Verbatim} +we obtain: \ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn +\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myOriginalPals} +The original list for \texttt{myPals} remains unchanged: +\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myPals} + +The \cs{useRanTok} command---whether it operates on a randomized token list +or not---behaves similarly to an array. Thus, if we wanted the extract +the third entry of the non-randomized token list (array) +\texttt{myOriginalPals}, we do so by expanding the command +\verb!\useRanTok[myOriginalPals]{3}! to produce +\useRanTok[myOriginalPals]{3}. + +\subparagraph*{Document preparation.} The command \cs{ranToksOff} is probably best in the preamble to turn off all randomization while the rest of the document is being composed. @@ -515,6 +647,36 @@ \end{Verbatim} Again, this goes in the preamble. +\section{Commands to support a DB application}\label{s:DBConcept} + +One user wanted to create exams using \pkg{eqexam}, but wanted to randomly +select questions from a series of `database' files. My thought was that +\pkg{ran\_toks} would do the job for him. After setting up a demo for him, I +added the new command \cs{useTheseDBs} to \pkg{ran\_toks}: +\bVerb\takeMeasure{\string\useTheseDBs\darg{\ameta{db\SUB{1}},\ameta{db\SUB{2}},...,\ameta{db\SUB{n}}}}% +\begin{minipage}{\bxSize}\kern0pt +\begin{Verbatim}[frame=single,commandchars=!()] +\useTheseDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))} +\useProbDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))} +\end{Verbatim} +\end{minipage}\eVerb The argument of \cs{useTheseDBs} is a comma-delimited +list of file names. Each file name contains a +\cs{bRTVToks}/\penalty0\cs{eRTVToks} construct. Within this pair are +\env{rtVW} environments, as described in +\hyperref[ss:RTVToks]{Section~\ref*{ss:RTVToks}}. The \cs{useTheseDBs} +command inputs the files listed in its comma-delimited argument; a warning is +emitted if one or more of the files are not found. The default extension is +\texttt{.tex}, \cs{useTheseDBs\darg{db1,db2}} inputs the files +\texttt{db1.tex} and \texttt{db2.tex}, if they exist, while +\cs{useTheseDBs\darg{db1.def,db2.db}} inputs the files \texttt{db1.def} and +\texttt{db2.db}, if they exist. The command \cs{useProbDBs} is an alias for +\cs{useTheseDBs}. + +The placement of \cs{useTheseDBs} is anywhere prior to the insertion of the +problems into the document, usually in the preamble. + +Refer to the demonstration file \texttt{mc-db.tex} for an example. + \newtopic\noindent Now, I simply must get back to my retirement. \dps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/db1.tex new/doc/latex/ran_toks/examples/db1.tex --- old/doc/latex/ran_toks/examples/db1.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ran_toks/examples/db1.tex 2017-05-19 23:06:02.000000000 +0200 @@ -0,0 +1,76 @@ +% +% First DB, uses ran_toks and eqexam +% +\bRTVToks{DB1-} + +\begin{rtVW} +\begin{problem}[5] +DB1: First: Which is correct? +\begin{answers}{4} +\bChoices[nCols=1,random,label=db1-1] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\begin{solution} +It is obvious that the answer is `\useSavedAns{db1-1}', that is, alternative \useSavedAlts{db1-1} is correct. +\end{solution} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB1: Second: Which is correct? +\begin{answers}{4} +\bChoices[nCols=1,random,label=db1-2] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\begin{solution} +According to the guy sitting next to me, the answer might be \useSavedAlts{db1-2} +\end{solution} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB1: Third: Which is correct? +\begin{answers}{4} +\bChoices[nCols=1,random,label=db1-3] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\begin{solution} +I know the answer in advance to be \useSavedAlts{db1-3}, but don't tell anyone. +\end{solution} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB1: Fourth: Which is correct? +\begin{answers}{4} +\bChoices[nCols=1,random,label=db1-4] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\begin{solution} +After meditating in the lotus position on this question for many hours, we determine that the correct answer is \textbf{\useSavedAltsAns{db1-4}}. +\end{solution} +\end{problem} +\end{rtVW} + +\eRTVToks + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/db2.tex new/doc/latex/ran_toks/examples/db2.tex --- old/doc/latex/ran_toks/examples/db2.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ran_toks/examples/db2.tex 2017-05-19 23:06:02.000000000 +0200 @@ -0,0 +1,65 @@ +% +% Second DB, uses ran_toks and eqexam +% + +\bRTVToks{DB2-} + +\begin{rtVW} +\begin{problem}[5] +DB2: First: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB2: Second: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB2: Third: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB2: Fourth: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\eRTVToks + +\endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/db3.tex new/doc/latex/ran_toks/examples/db3.tex --- old/doc/latex/ran_toks/examples/db3.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ran_toks/examples/db3.tex 2017-05-19 23:06:02.000000000 +0200 @@ -0,0 +1,65 @@ +% +% Third DB, uses ran_toks and eqexam +% + +\bRTVToks{DB3-} + +\begin{rtVW} +\begin{problem}[5] +DB3: First: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB3: Second: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB3: Third: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB3: Fourth: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\eRTVToks + +\endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/db4.tex new/doc/latex/ran_toks/examples/db4.tex --- old/doc/latex/ran_toks/examples/db4.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ran_toks/examples/db4.tex 2017-05-19 23:06:02.000000000 +0200 @@ -0,0 +1,65 @@ +% +% Fourth DB, uses ran_toks and eqexam +% + +\bRTVToks{DB4-} + +\begin{rtVW} +\begin{problem}[5] +DB4: First: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB4: Second: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB4: Third: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\begin{rtVW} +\begin{problem}[5] +DB4: Fourth: Which is correct? +\begin{answers}{4} +\bChoices[nCols=2,random] + \Ans1 True\eAns + \Ans0 False\eAns + \Ans0 Maybe\eAns + \Ans0 Perhaps\eAns +\eChoices +\end{answers} +\end{problem} +\end{rtVW} + +\eRTVToks + +\endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/mc-db.tex new/doc/latex/ran_toks/examples/mc-db.tex --- old/doc/latex/ran_toks/examples/mc-db.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ran_toks/examples/mc-db.tex 2017-05-19 23:06:02.000000000 +0200 @@ -0,0 +1,75 @@ +\documentclass{article} +\usepackage[allowrandomize,nosolutions, + forpaper,pointsonleft,noparttotals]{eqexam} +\usepackage{ran_toks} + +\useLastAsSeed +% To reproduce the same pseudo-random sequence, you need to supply a seed +%\useThisSeed{1125676795} + +\examNum{1} +\title[T\nExam]{Test \nExam} +\author{D. P. Story} +\subject[MC]{My Course} +\date{Spring \the\year} +\keywords{Test~\nExam, Section 001} + +\university +{% + THE UNIVERSITY OF AKRON\\ + Theoretical and Applied Mathematics +} +\email{dpstory(a)uakron.edu} + +% Input the DB files used in the demo file +\useTheseDBs{db1,db2,db3,db4} + + +\begin{document} +\maketitle + +\begin{exam}{Part1} + +\begin{instructions} +Solve each without error. Passing is 100\%. + +\medskip\noindent +This part demonstrates how to not only randomly pull problems (two from each of the DB files) at random, but +to randomize the order they are listed in the exam. +\end{instructions} + +\ranToks{myExam}{% + {\useRanTok[DB1-]{1}} + {\useRanTok[DB1-]{2}} + {\useRanTok[DB2-]{1}} + {\useRanTok[DB2-]{2}} + {\useRanTok[DB3-]{1}} + {\useRanTok[DB3-]{2}} + {\useRanTok[DB4-]{1}} + {\useRanTok[DB4-]{2}} +} +\displayListRandomly{myExam} + +\end{exam} + +\begin{exam}{Part2} + +\begin{instructions} +In this part, we take the same two problems from each of the four DB files, but do not randomize +the order of the questions. +\end{instructions} + +\useRanTok[DB1-]{1} +\useRanTok[DB1-]{2} +\useRanTok[DB2-]{1} +\useRanTok[DB2-]{2} +\useRanTok[DB3-]{1} +\useRanTok[DB3-]{2} +\useRanTok[DB4-]{1} +\useRanTok[DB4-]{2} + +\end{exam} + +\end{document} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/ran_toks.tex new/doc/latex/ran_toks/examples/ran_toks.tex --- old/doc/latex/ran_toks/examples/ran_toks.tex 2016-02-12 01:26:01.000000000 +0100 +++ new/doc/latex/ran_toks/examples/ran_toks.tex 2017-05-19 23:06:02.000000000 +0200 @@ -1,14 +1,16 @@ \documentclass{article} \usepackage{ran_toks} +\usepackage{ifthen} -%\useThisSeed{606574325} -\useLastAsSeed -%\rtdebugtrue -%\ranToksOn +\useThisSeed{606574325} % comment out this line, and uncomment next line to get ... +%\useLastAsSeed % a new pseudo-random sequence each time you compile. + +% Other useful switches +%\ranToksOn % the default %\ranToksOff \parindent0pt \parskip6pt - +\def\cs#1{\texttt{\char`\\#1}} \begin{document} \begin{center}\bfseries @@ -26,8 +28,8 @@ \useRanTok{3}, \useRanTok{4}, {\useRanTok{5}} and \useRanTok{6}. (Listed in the order of best friend to least best friend.) -Test of the \verb!\bRTVToks!/\verb!\eRTVToks! pair of commands and of the -\texttt{rtVW} environment. +Test of the \verb!\bRTVToks!/\verb!\eRTVToks! pair of commands, which encloses +\texttt{rtVW} environments. \bRTVToks{myThoughts}% \begin{rtVW} @@ -53,11 +55,8 @@ \end{rtVW} \eRTVToks \begin{enumerate} - \item \useRanTok{1} - \item \useRanTok{2} - \item \useRanTok{3} + \displayListRandomly[\item]{myThoughts} \end{enumerate} - Use \verb!\useRTName! command when another list separates the current position from the list you want to use. Here we want to use the list named \texttt{myPals}, but since that definition, a new list named @@ -70,8 +69,27 @@ For mixing lists. it might be easier to use the optional parameter: {\useRanTok[myPals]{1}} and \useRanTok[myThoughts]{1} -The \verb!\rtTokByNum! can retrieve an item from the list, in its declared -order; eg, from the \texttt{myPals} list, the first and last are {\rtTokByNum[myPals]{1}} -and \rtTokByNum[myPals]{\nToksFor{myPals}}. +The \cs{rtTokByNum} can retrieve an item from the list in its declared order; +eg, from the \texttt{myPals} list, the first and last are +{\rtTokByNum[myPals]{1}} and \rtTokByNum[myPals]{\nToksFor{myPals}}. + +We demonstrate the command \cs{reorderRanToks} and the optional parameters of \cs{displayListRandomly}: +\begin{quote}\reorderRanToks{myPals}% +List of pals: \displayListRandomly[\ifnum\i=\last\space and \fi][\ifnum\i=\last.\else,\fi\space]{myPals} +\end{quote} +The reordering is global, so \displayListRandomly[\ifnum\i=\last\space and \fi][\ifnum\i=\last\else, \fi]{myPals} +are listed in the same order as above, and different from the original random order seen in the second paragraph +of this document. + +Without the Oxford comma: My pals are +\displayListRandomly[\ifnum\i=\last and \fi][\ifnum\i=\last.\else\ifnum\i=\lessone\relax\space\else, \fi\fi]{myPals} + +The following is the same logic but uses the syntax of the \textsf{ifthen} package: My pals are +\displayListRandomly[\ifthenelse{\i=\last}{and }{}][\ifthenelse{\i=\last}{.}{\ifthenelse{\i=\lessone}{\space}{, }}]{myPals} + +Test the \cs{copyRanToks} command: +\copyRanToks{myPals}{myPals1}\displayListRandomly[\ifthenelse{\i=\last}{and }{}][\ifthenelse{\i=\last}{.}{\ifthenelse{\i=\lessone}{\space}{, }}]{myPals1} +This does not change the order of the \texttt{myPals} list, which is still +\displayListRandomly[\ifnum\i=\last\space and \fi][\ifnum\i=\last.\else,\fi\space]{myPals} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ran_toks.doc.tlpobj new/tlpkg/tlpobj/ran_toks.doc.tlpobj --- old/tlpkg/tlpobj/ran_toks.doc.tlpobj 2016-04-14 19:44:38.000000000 +0200 +++ new/tlpkg/tlpobj/ran_toks.doc.tlpobj 2017-05-19 23:41:35.000000000 +0200 @@ -1,12 +1,17 @@ name ran_toks.doc category Package -revision 39684 +revision 44429 shortdesc doc files of ran_toks relocated 1 -docfiles size=30 +docfiles size=72 RELOC/doc/latex/ran_toks/README.md RELOC/doc/latex/ran_toks/doc/rantoks_man.pdf RELOC/doc/latex/ran_toks/doc/rantoks_man.tex + RELOC/doc/latex/ran_toks/examples/db1.tex + RELOC/doc/latex/ran_toks/examples/db2.tex + RELOC/doc/latex/ran_toks/examples/db3.tex + RELOC/doc/latex/ran_toks/examples/db4.tex + RELOC/doc/latex/ran_toks/examples/mc-db.tex RELOC/doc/latex/ran_toks/examples/mytext.verb RELOC/doc/latex/ran_toks/examples/ran_toks.tex RELOC/doc/latex/ran_toks/examples/random_tst.tex ++++++ ran_toks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ran_toks/ran_toks.sty new/tex/latex/ran_toks/ran_toks.sty --- old/tex/latex/ran_toks/ran_toks.sty 2016-02-12 01:26:01.000000000 +0100 +++ new/tex/latex/ran_toks/ran_toks.sty 2017-05-19 23:06:02.000000000 +0200 @@ -7,8 +7,8 @@ %% ran_toks.dtx (with options: `copyright,package') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% ran_toks.sty package, 2013/08/03 %% -%% Copyright (C) 2012 D. P. Story %% +%% Web package, %% +%% Copyright (C) 1999-2017 D. P. Story %% %% dpstory(a)uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -17,9 +17,9 @@ %% macros/latex/base/lppl.txt; either version 1 of the %% %% License, or (at your option) any later version. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{ran_toks} - [2016/02/06 v1.0e Randomizing tokens] + [2017/05/04 v1.1 Randomizing tokens (dps)] \RequirePackage{verbatim} \(a)ifundefined{nextrandom}{\input{random.tex}}{} \def\nextrandom{\begingroup @@ -89,47 +89,38 @@ \def\endverbatimwrite{\@esphack} \def\rt@IWVO{\immediate\write\verbatim@out} \def\InitSeedValue{\the\randomi} -\def\rt@writeSeedData{% - \ifsaveseed - \@ifundefined{saveseedinfo}{\newwrite\saveseedinfo}{} - \immediate\openout \saveseedinfo \jobname_rt.sav - \let\verbatim@out\saveseedinfo - \def\rt@msgi{initializing seed value}% - \def\rt@msgii{last random number used}% - \uccode`c=`\%\uppercase{% - \rt@IWVO{\InitSeedValue\space c \rt@msgi}% - \rt@IWVO{\the\randomi\space c \rt@msgii}% - }\immediate\closeout\saveseedinfo - \fi -} +\def\rt@writeSeedData{\ifsaveseed + \@ifundefined{saveseedinfo}{\newwrite\saveseedinfo}{} + \immediate\openout \saveseedinfo \jobname_rt.sav + \let\verbatim@out\saveseedinfo + \def\rt@msgi{initializing seed value}% + \def\rt@msgii{last random number used}% + \uccode`c=`\%\uppercase{% + \rt@IWVO{\InitSeedValue\space c \rt@msgi}% + \rt@IWVO{\the\randomi\space c \rt@msgii}}\immediate + \closeout\saveseedinfo\fi} \AtEndDocument{\rt@writeSeedData}% -\def\rt@populateList#1{% - \rt@listIn={}% - \rt@nCnt=0 - \@whilenum\rt@nCnt<#1\do{% - \advance\rt@nCnt1 +\def\rt@populateList#1{\rt@listIn={}\rt@nCnt\z@ + \@whilenum\rt@nCnt<#1\do{\advance\rt@nCnt\@ne \edef\rt@listInHold{\the\rt@listIn\noexpand\\{\the\rt@nCnt}}% - \rt@listIn=\expandafter{\rt@listInHold}% - }% -} -\def\rt@RandomizeList#1{% - \global\rt@listIn={}\global\rt@newListIn={}\global\rt@listOut={}% + \rt@listIn=\expandafter{\rt@listInHold}}} +\def\rt@RandomizeList#1{\global + \rt@listIn={}\global\rt@newListIn={}\global\rt@listOut={}% \rt@nMax=#1\relax\rt@populateList{\the\rt@nMax}% \ifwerandomize \expandafter\rt@randomizeList\else \global\rt@listOut=\expandafter{\the\rt@listIn}\fi -} -\def\rt@randomizeList{% - \let\\=\rt@processi + \global\rt@nameedef{\rt@BaseName-List}{\the\rt@listOut}} +\def\rt@randomizeList{\let\\=\rt@processi \setrannum{\rt@getRanNum}{1}{\the\rt@nMax}% \ifrtdebug\typeout{\string\rt@getRanNum=\the\rt@getRanNum}\fi - \rt@nCnt=0\relax + \rt@nCnt\z@ \ifrtdebug\typeout{LISTING: \the\rt@listIn}\fi \the\rt@listIn \rt@loopTest } -\def\rt@loopTest{\advance\rt@nMax-1\relax - \ifnum\rt@nMax>0\relax +\def\rt@loopTest{\advance\rt@nMax\m@ne + \ifnum\rt@nMax>\z@ \def\rt@next{% \rt@listIn=\expandafter{\the\rt@newListIn}% \rt@newListIn={}\rt@randomizeList}% @@ -140,7 +131,7 @@ \fi \rt@next } -\def\rt@processi#1{\advance\rt@nCnt1 +\def\rt@processi#1{\advance\rt@nCnt\@ne \ifnum\rt@nCnt=\rt@getRanNum \edef\rt@listOutHold{\the\rt@listOut}% \global\rt@listOut=\expandafter{\rt@listOutHold\\{#1}}% @@ -152,28 +143,49 @@ \ifrtdebug\typeout{\string\rt@newListIn: \the\rt@newListIn}\fi \fi } +\def\rt@modarith#1#2{\count\z@=#1\relax\count\tw@=#1\relax + \advance\count\z@\m@ne\divide\count\z@ #2\relax + \multiply\count\z@ #2\relax + \advance\count\tw@-\count\z@ + \edef\rt@mod{\the\count\tw@}} +\def\rt@badIndex#1#2{\PackageWarningNoLine{ran_toks} + {The argument of \string\useRanTok{#1} on line + \the\inputlineno\space is\MessageBreak + greater than \string\nToksFor{#2} (\nToksFor{#2}), + instead will use\MessageBreak + \string\useRanTok{\rt@mod}, obtained from modular + arithmetic.\MessageBreak + You might want to fix this} +} +\def\rt@badTokName#1{% + \PackageWarningNoLine{ran_toks} + {The token list `#1' on line \the\inputlineno\space + is undefined,\MessageBreak + possibly simply mispelled; check spelling.\MessageBreak + If undefined, use \string\ranToks\space or \string\bRTVToks/% + \string\eRTVToks\space\MessageBreak + to define a list with the name `#1'}% +} +\def\rt@warnTokName#1{% + \PackageWarningNoLine{ran_toks} + {The token list `#1' on line \the\inputlineno\space + is already defined,\MessageBreak + will overwrite this list}% +} \def\ranToks#1{\begingroup \useRTName{#1}% \r@nToks } -\long\def\r@nToks#1{% - \rt@nMax=0 - \r@ndToks#1\rt@NIL -} +\long\def\r@nToks#1{\rt@nMax\z@\r@ndToks#1\rt@NIL} \def\rt@NIL{@nil} \newcommand{\useRTName}[1]{\gdef\rt@BaseName{#1}}% \let\rt@BaseName\@empty -\newcommand{\bRTVToks}[1]{% - \rt@nCnt=0 - \useRTName{#1}% -} -\newcommand{\eRTVToks}{% - \global\rt@nameedef{\rt@BaseName Cnt}{\the\rt@nCnt}% - \expandafter\r@nVToks\expandafter{\rt@BaseName}% -} +\newcommand{\bRTVToks}[1]{\rt@nCnt\z@\useRTName{#1}} +\newcommand{\eRTVToks}{\global + \rt@nameedef{\rt@BaseName Cnt}{\the\rt@nCnt}% + \expandafter\r@nVToks\expandafter{\rt@BaseName}} \def\reVerbEnd{\ifhmode\unskip\fi} -\newenvironment{rtVW}{% - \global\advance\rt@nCnt1 +\newenvironment{rtVW}{\global\advance\rt@nCnt\@ne \immediate\openout\rt@Verb@write \jobname_\rt@BaseName\the\rt@nCnt.cut \let\verbatim@out\rt@Verb@write @@ -187,45 +199,104 @@ \gdef\rt@BaseName{#1}% \expandafter\rt@nMax\@nameuse{#1Cnt}% \rt@listIn={}\rt@nCnt=0\relax\let\rt@listInHold\@empty - \@whilenum\rt@nCnt<\rt@nMax\do{% - \advance\rt@nCnt1 - \edef\rt@listInHold{% - \the\rt@listIn{\noexpand\rt@inputVerb{#1\the\rt@nCnt}}}% - \rt@listIn=\expandafter{\rt@listInHold}% - }% -\ifrtdebug\typeout{\string\r@nVToks: \the\rt@listIn}\fi - \expandafter\r@nToks\expandafter{\the\rt@listIn}% -} + \@whilenum\rt@nCnt<\rt@nMax\do{\advance\rt@nCnt\@ne + \edef\rt@listInHold{% + \the\rt@listIn{\noexpand\rt@inputVerb{#1\the\rt@nCnt}}}% + \rt@listIn=\expandafter{\rt@listInHold}}\ifrtdebug + \typeout{\string\r@nVToks: \the\rt@listIn}\fi + \expandafter\r@nToks\expandafter{\the\rt@listIn}} \def\rt(a)inputVerb#1{\input{\jobname_#1.cut}} \def\rt@PAR{\par} \long\def\r@ndToks#1{\def\rt@rgi{#1}% \ifx\rt@rgi\rt@PAR\def\rt@next{\r@ndToks}\else - \advance\rt@nMax1\relax + \advance\rt@nMax\@ne \global\@namedef{rtTok\the\rt@nMax\rt@BaseName}{#1}% \def\rt@next{\@ifnextchar\rt@NIL - {\rt@endToks\@gobble}{\r@ndToks}}% - \fi\rt@next -} -\def\rt@endToks{% - \global\rt@nameedef{nMax4\rt@BaseName}{\the\rt@nMax}% - \rt@RandomizeList{\the\rt@nMax}% - \rt@nCnt=0 - \let\\\assignRanToks - \the\rt@listOut - \endgroup -} -\def\assignRanToks#1{\advance\rt@nCnt1 - \global\rt@nameedef{rtRanTok\the\rt@nCnt\rt@BaseName}% - {\noexpand\@nameuse{rtTok#1\rt@BaseName}}% -} -\newcommand{\nToksFor}[1]{\@nameuse{nMax4#1}} -\newcommand{\rtTokByNum}[2][\rt@BaseName]{\@nameuse{rtTok#2#1}% - \ignorespaces} -\newcommand{\useRanTok}[2][\rt@BaseName]{\@nameuse{rtRanTok#2#1}} -\newcommand{\displayListRandomly}[2][]{\rt@nCnt=0\relax - \@whilenum\rt@nCnt<\nToksFor{#2}\advance\rt@nCnt1\relax - \do{#1\useRanTok{\the\rt@nCnt}}% -} + {\rt@endToks\@gobble}{\r@ndToks}}\fi\rt@next} +\def\rt@performRanDefns#1{% + \rt@RandomizeList{#1}\rt@nCnt\z@ + \let\\\rt@ssign\the\rt@listOut} +\def\rt@endToks{\global + \rt@nameedef{nMax4\rt@BaseName}{\the\rt@nMax}% + \rt@performRanDefns{\the\rt@nMax}\endgroup} +\def\reorderRanToks#1{\begingroup\useRTName{#1}\expandafter + \ifx\csname nMax4#1\endcsname\relax + \rt@badTokName{#1}\else + \rt@performRanDefns{\@nameuse{nMax4#1}}\fi +\endgroup} +\newcommand\copyRanToks[2]{\begingroup\expandafter + \ifx\csname nMax4#1\endcsname\relax + \rt@badTokName{#1}% + \else\expandafter + \ifx\csname nMax4#2\endcsname\relax + \useRTName{#2}\global + \rt@nameedef{nMax4#2}{\@nameuse{nMax4#1}}% + \rt@nCnt=\csname nMax4#2\endcsname\relax + \@whilenum\rt@nCnt>\z@\do{\global + \rt@nameedef{rtTok\the\rt@nCnt#2}% + {\noexpand\@nameuse{rtTok\the\rt@nCnt#1}}% + \advance\rt@nCnt\m@ne}% + \rt@performRanDefns{\@nameuse{nMax4#2}}\else + \rt@warnTokName{#2}\fi + \fi +\endgroup} +\def\rt@ssign#1{\advance\rt@nCnt\@ne\global + \rt@nameedef{rtRanTok\the\rt@nCnt\rt@BaseName}{\noexpand + \@nameuse{rtTok#1\rt@BaseName}}} +\newcommand{\nToksFor}[1]{\expandafter + \ifx\csname nMax4#1\endcsname\relax + \textbf{??}\rt@badTokName{#1}\else + \@nameuse{nMax4#1}\fi} +\newcommand{\rtTokByNum}[2][\rt@BaseName]{\expandafter + \ifx\csname nMax4#1\endcsname\relax + \textbf{??}\rt@badTokName{#1}\else + \@nameuse{rtTok#2#1}\expandafter\ignorespaces\fi} +\newcommand{\useRanTok}[2][\rt@BaseName]{\bgroup + \expandafter\ifx\csname nMax4#1\endcsname\relax + \rt@badTokName{#1}\else + \ifnum#2>\nToksFor{#1}\rt@modarith{#2}{\nToksFor{#1}}% + \rt@badIndex{#2}{#1}\@nameuse{rtRanTok\rt@mod#1}\else + \@nameuse{rtRanTok#2#1}\fi\fi\egroup} +\newcommand{\displayListRandomly}[1][]{\bgroup\def\rt@prior{#1}% + \displ@yListRandomly} +\newcommand{\displ@yListRandomly}[2][]{\rt@nCnt\z@ + \expandafter\ifx\csname nMax4#2\endcsname\relax + \rt@rgi\space\textbf{??}\rt@badTokName{#2}#1% + \else + \def\rt@post{#1}\useRTName{#2}\let\i\rt@nCnt + \def\first{1}\edef\last{\@nameuse{nMax4#2}}% + \@tempcnta\last \advance\@tempcnta\m@ne + \edef\lessone{\the\@tempcnta}% + \@whilenum\rt@nCnt<\last\advance\rt@nCnt\@ne + \do{\rt@prior\useRanTok{\the\rt@nCnt}\rt@post}% + \fi\egroup +} +\def\rt@gettonil#1\@nil{\def\to@nilarg{#1}} +\def\rt@ifspc{\ifx\@let@token\@sptoken + \let\rt@next\rt@xifspc\else + \let\rt@next\rt@gettonil\fi\rt@next} +\begingroup +\def\:{\rt@xifspc} +\expandafter\gdef\: {\futurelet\@let@token\rt@ifspc} +\endgroup +\def\rt@strpspcs{\futurelet\@let@token\rt@ifspc} +\def\ProbDBWarningMsg#1{\filename@parse{#1} + \PackageWarning{ran_toks} + {The file \filename@area\filename@base.\ifx\filename@ext\relax + tex\else\filename@ext\fi\space cannot be found}} +\def\useTheseDBs#1{\def\rt@dblist{#1}\ifx\rt@dblist\@empty\else + \let\rt@DB@List\@empty + \edef\temp@expand{\noexpand\@for\noexpand\@@tmp:=\rt@dblist}% + \temp@expand\do{\ifx\@@tmp\@empty\else + \expandafter\rt@strpspcs\@@tmp\@nil\edef\@@tmp{\to@nilarg}% + \edef\rt@nextDB{\noexpand + \InputIfFileExists{\@@tmp}{}{\noexpand + \ProbDBWarningMsg{\@@tmp}}}% + \toks\tw@=\expandafter{\rt@DB@List}% + \toks@=\expandafter{\rt@nextDB}% + \edef\rt@DB@List{\the\toks\tw@\space\the\toks@}\fi + }\expandafter\rt@DB@List\fi} +\let\useProbDBs\useTheseDBs \endinput %% %% End of file `ran_toks.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ran_toks.tlpobj new/tlpkg/tlpobj/ran_toks.tlpobj --- old/tlpkg/tlpobj/ran_toks.tlpobj 2016-04-14 19:44:38.000000000 +0200 +++ new/tlpkg/tlpobj/ran_toks.tlpobj 2017-05-19 23:41:35.000000000 +0200 @@ -1,6 +1,6 @@ name ran_toks category Package -revision 39684 +revision 44429 shortdesc Randomise token strings relocated 1 longdesc The package provides means of randomising lists of tokens, or @@ -10,10 +10,10 @@ longdesc commands delimit a collection of tokens for randomising; each longdesc group inside a rtVw constitutes one of these (typically larger) longdesc token sets. -runfiles size=2 +runfiles size=3 RELOC/tex/latex/ran_toks/ran_toks.sty catalogue-ctan /macros/latex/contrib/ran_toks -catalogue-date 2016-02-10 16:03:10 +0100 +catalogue-date 2017-05-18 22:38:32 +0200 catalogue-license lppl1 catalogue-topics macro-supp -catalogue-version 1.0e +catalogue-version 1.1 ++++++ randbild.doc.tar.xz ++++++ ++++++ randbild.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/randbild.tlpobj new/tlpkg/tlpobj/randbild.tlpobj --- old/tlpkg/tlpobj/randbild.tlpobj 2016-04-14 19:44:39.000000000 +0200 +++ new/tlpkg/tlpobj/randbild.tlpobj 2017-04-14 17:59:42.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/randbild/randbild.sty catalogue-ctan /macros/latex/contrib/randbild -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use catalogue-version 0.2 ++++++ randomwalk.doc.tar.xz ++++++ ++++++ randomwalk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/randomwalk.tlpobj new/tlpkg/tlpobj/randomwalk.tlpobj --- old/tlpkg/tlpobj/randomwalk.tlpobj 2016-04-14 19:44:39.000000000 +0200 +++ new/tlpkg/tlpobj/randomwalk.tlpobj 2017-04-14 17:59:42.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/randomwalk/randomwalk.sty catalogue-ctan /macros/latex/contrib/randomwalk -catalogue-date 2015-09-20 05:44:37 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex calculation random expl3 catalogue-version 0.4 ++++++ randtext.doc.tar.xz ++++++ ++++++ randtext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/randtext.tlpobj new/tlpkg/tlpobj/randtext.tlpobj --- old/tlpkg/tlpobj/randtext.tlpobj 2016-04-14 19:44:39.000000000 +0200 +++ new/tlpkg/tlpobj/randtext.tlpobj 2017-04-14 17:59:42.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=2 RELOC/tex/latex/randtext/randtext.sty catalogue-ctan /macros/latex/contrib/randtext -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics security ++++++ rccol.doc.tar.xz ++++++ ++++++ rccol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rccol.tlpobj new/tlpkg/tlpobj/rccol.tlpobj --- old/tlpkg/tlpobj/rccol.tlpobj 2016-04-14 19:44:39.000000000 +0200 +++ new/tlpkg/tlpobj/rccol.tlpobj 2017-04-14 17:59:42.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/rccol/rccol.sty catalogue-ctan /macros/latex/contrib/rccol -catalogue-date 2016-01-22 18:25:34 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics table maths catalogue-version 1.2c ++++++ rcs-multi.doc.tar.xz ++++++ ++++++ rcs-multi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rcs-multi.tlpobj new/tlpkg/tlpobj/rcs-multi.tlpobj --- old/tlpkg/tlpobj/rcs-multi.tlpobj 2016-04-14 19:44:40.000000000 +0200 +++ new/tlpkg/tlpobj/rcs-multi.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/rcs-multi/rcs-multi.sty catalogue-also rcs rcsinfo catalogue-ctan /macros/latex/contrib/rcs-multi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics version-control doc-mgmt catalogue-version 0.1a ++++++ rcs.doc.tar.xz ++++++ ++++++ rcs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rcs.tlpobj new/tlpkg/tlpobj/rcs.tlpobj --- old/tlpkg/tlpobj/rcs.tlpobj 2016-04-14 19:44:40.000000000 +0200 +++ new/tlpkg/tlpobj/rcs.tlpobj 2017-04-14 17:59:42.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/tex/latex/rcs/rcs.sty catalogue-also rcsinfo catalogue-ctan /macros/latex/contrib/rcs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics version-control doc-mgmt ++++++ rcsinfo.doc.tar.xz ++++++ ++++++ rcsinfo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rcsinfo.tlpobj new/tlpkg/tlpobj/rcsinfo.tlpobj --- old/tlpkg/tlpobj/rcsinfo.tlpobj 2016-04-14 19:44:41.000000000 +0200 +++ new/tlpkg/tlpobj/rcsinfo.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/rcsinfo/rcsinfo.sty catalogue-also rcs catalogue-ctan /macros/latex/contrib/rcsinfo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics version-control doc-mgmt catalogue-version 1.11 ++++++ readarray.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/readarray/README new/doc/latex/readarray/README --- old/doc/latex/readarray/README 2013-04-20 01:41:18.000000000 +0200 +++ new/doc/latex/readarray/README 2016-11-25 19:29:56.000000000 +0100 @@ -1,12 +1,28 @@ The readarray package allows one to input formatted data into elements -of a 2-D or 3-D array and to recall that data at will by individual cell -number. The data can be but need not be numerical in nature. It can -be, for example, formatted text. +of a 2-D or 3-D array (or a 1-D file-record array). Subsequently, that +data may be recalled at will using an array-cell indexing nomenclature. +The data can be but need not be numerical in nature. It can be, for +example, formatted text. In this regard, the array stores the +unexpanded data from the file, if macros are present in the data. + +As of V2.0, the separator by which data is parsed may be customized by +the user. A totally new package syntax has also been introduced (the +prior syntax is retained as deprecated macros). Various levels of bound +checking are now available to the user. While the package can be used for any application where indexed data is called for, the package proves particularly useful when elements of multiple arrays must be recallable and dynamically combined at time of compilation, rather than in advance. -When data is read from an input file, it may also be accessed by file -record (1-D access), in addition to 2-D or 3-D array-cell access. +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://www.latex-project.org/lppl.txt + +and version 1.3c or later is part of all distributions of LaTeX +version 2005/12/01 or later. + +The Current Maintainer of this work is Steven B. Segletes. Binary files old/doc/latex/readarray/readarray.pdf and new/doc/latex/readarray/readarray.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/readarray/readarray.tex new/doc/latex/readarray/readarray.tex --- old/doc/latex/readarray/readarray.tex 2013-05-15 23:52:42.000000000 +0200 +++ new/doc/latex/readarray/readarray.tex 2016-11-25 19:29:56.000000000 +0100 @@ -1,5 +1,4 @@ \documentclass{article} -\def\version{1.2} %% Copyright 2013 Steven B. Segletes % % This work may be distributed and/or modified under the @@ -20,13 +19,55 @@ % -Added \arrayij and \arrayijk, which can be put into \edef % -Used \romannumeral in preference to \roman{}, when possible, % to avoid unnecessary use of counters. - +% v1.3 -Moved \newread outside of \readdef, so as not to exhaust the +% 16 allotted file streams (Thanks to Ken Kubota for the tip). +\usepackage{tabstackengine}[2016-10-04] +\usepackage{lmodern} +\usepackage[T1]{fontenc} \parskip 1em \parindent 0em \newcommand\rl{\rule{1em}{0in}} \def\rdar{\textsf{readarray}} +\def\loi{\textsf{listofitems}} +\def\cmd#1{\texttt{\string\ \unskip#1}} \usepackage{readarray} \usepackage{verbatimbox} +\usepackage{filecontents} +\begin{filecontents*}{file1data.txt} +A111 A112 A113 A114 +A121 A122 A123 A124 +A131 A132 A133 A134 + +A211 A212 A213 A214 +A221 A222 A223 A224 +A231 A232 A233 A234 +\end{filecontents*} +\begin{filecontents*}{file2data.txt} +\def{\dataA}{% +A111 A112 A113 A114 +A121 A122 A123 A124 +A131 A132 A133 A134 +% +A211 A212 A213 A214 +A221 A222 A223 A224 +A231 A232 A233 A234 +} +\end{filecontents*} +\begin{filecontents*}{file3data.txt} +\textit{am} , \textit{are}, have \textit{been}, have \textit{been} +\textit{are}, \textit{are} , have \textit{been}, have \textit{been} +\textit{is} , \textit{are} , has \textit{been} , have \textit{been} + +\textit{was} , \textit{were}, had \textit{been}, had \textit{been} +\textit{were}, \textit{were}, had \textit{been}, had \textit{been} +\textit{was} , \textit{were}, had \textit{been}, had \textit{been} + +will \textit{be}, will \textit{be}, will have \textit{been}, will have \textit{been} +will \textit{be}, will \textit{be}, will have \textit{been}, will have \textit{been} +will \textit{be}, will \textit{be}, will have \textit{been}, will have \textit{been} +\end{filecontents*} + + \let\vb\verb \def\bs{{\ttfamily\char'134}} \reversemarginpar @@ -37,112 +78,211 @@ \begin{center} \LARGE The {\rdar} Package\\ \rule{0em}{.7em}\small Routines for inputting formatted array data and -recalling it on an element-by-element basis.\\Currently supports 2-D -and 3-D array structures\\ +recalling it on an element-by-element basis.\\ \rule{0em}{2.7em}\large Steven B. Segletes\\ steven.b.segletes.civ(a)mail.mil\\ -\rule{0em}{1.7em}\today\\ -v\version +\rule{0em}{1.7em}\readarrayPackageDate\\ +V\readarrayPackageVersion \end{center} +\section*{Comments About Version 2.0} + +Version 2.0 of the \rdar{} package has brought major changes, + including a \textit{new and improved} syntax. +Functionally, the data-reading/parsing code of the package + has been revised to use the powerful \loi{} package. +This has two primary advantages: 1) the data that is read is no + longer expanded prior to the read, so that macros can be read + and stored in the data arrays using their unexpanded tokens; and 2) + list separators other than a space may now be employed + to parse the data into array cells. + +While a newer preferred syntax has been introduced for reading and + recalling arrays, the deprecated syntax is still supported. +The user will also note other small changes, such as the fact that errors + arising from array-boundary violations now appear in the log file + rather than the document itself. + \section{Description and Commands} -The {\rdar} package allows for the inputting of data arrays (numeric, -string, or even formatted) in either file form or \vb|\def| form, such -that the elements of multiple arrays can be specified and later recalled -in an orderly fashion, on a cell-by-cell basis. Routines have been -developed to support the storage and recall of both 2-D and 3-D arrays. - -The commands included in this package help the user input data, define -it in terms of array elements and recall those elements at will. Those -commands are:\\\itshape -\rl\vb|\readdef{|filename\vb|}{|token\vb|}|\\ -\rl\vb|\showrecord[|error\vb|]{|record number\vb|}|\\ -\rl\vb|\copyrecords{|identifier\vb|}|\\ -\rl\vb|\readArrayij{|token\vb|}{|identifier\vb|}{|columns\vb|}|\\ -\rl\vb|\readArrayijk{|token\vb|}{|identifier\vb|}{|rows\vb|}{|columns\vb|}|\\ -\rl\vb|\Arrayij[|error\vb|]{|identifier\vb|}{|row\vb|}{|column\vb|}|\\ -\rl\vb|\Arrayijk[|error\vb|]{|identifier\vb|}{|plane\vb|}{|row\vb|}{|% - column\vb|}|\\ -\rl\vb|\arrayij{|identifier\vb|}{|row\vb|}{|column\vb|}|\\ -\rl\vb|\arrayijk{|identifier\vb|}{|plane\vb|}{|row\vb|}{|% - column\vb|}|\upshape +The {\rdar} package allows for the creation of data arrays (numeric, + string, or even formatted) using either file contents or \vb|\def| + format for input, such that the elements of multiple arrays can be + set and later recalled in an orderly fashion, on a cell-by-cell basis. +Routines have been developed to support the storage and recall of both + 2-D and 3-D arrays, as well as 1-D file-record arrays.% +\footnote{ +Note: for 1-D arrays that are to be simply parsed on the basis of a + specified separator, the \loi{} package is already prepared + to do this, without the help of this package. +} + +\clearpage +The commands included in this package help the user to input data, define +it in terms of array elements, and recall those elements at will. Those +commands are: + + +\itshape +\textup{To place file data into a data macro:}\\ +\rl\vb|\readdef{|filename\vb|}\|data-macro\\ +\textup{To place file data into a 1-D file-record array:}\\ +\rl\vb|\readrecordarray{|filename\vb|}\|array-identifier\\ +\textup{To parse a data macro and place the results into a 2-D or 3-D array:}\\ +\rl\vb|\readarray\|data-macro\vb|\|array-identifier\vb|[-,|columns\vb|]|% + \hfill\textup{(2-D)}\\ +\rl\vb|\readarray\|data-macro\vb|\|array-identifier\vb|[-,|rows\vb|,|columns\vb|]|% + \hfill\textup{(3-D)}\\ +\textup{Same as above, with leading/trailing spaces removed from array cells:}\\ +\rl\vb|\readarray*\|data-macro\vb|\|array-identifier\vb|[-,|columns\vb|]|% + \hfill\textup{(2-D)}\\ +\rl\vb|\readarray*\|data-macro\vb|\|array-identifier\vb|[-,|rows\vb|,|columns\vb|]|% + \hfill\textup{(3-D)}\\ +\textup{Recall data from indexed array cell:}\\ +\rl\vb|\|array-identifier\vb|[|row\vb|,|column\vb|]|% + \hfill\textup{(2-D)}\\ +\rl\vb|\|array-identifier\vb|[|plane\vb|,|row\vb|,|column\vb|]|% + \hfill\textup{(3-D)}\\ +\textup{To place the actual tokens of an array cell into a macro:}\\ +\rl\vb|\arraytomacro\|array-identifier\vb|[-,|columns\vb|]\|macro% + \hfill\textup{(2-D)}\\ +\rl\vb|\arraytomacro\|array-identifier\vb|[-,|rows\vb|,|columns\vb|]\|macro% + \hfill\textup{(3-D)}\\ +\textup{To change the array-parsing separator character:}\\ +\rl\vb|\readarraysepchar{|parsing-separator-char\vb|}|\\ +\textup{To select the level of bounds checking on array cell recall:}\\ +\rl\vb|\nocheckbounds|\hfill OR\hfill% +\vb|\checkbounds|\hfill OR\hfill% +\vb|\hypercheckbounds| +\upshape + +In these commands, \cmd{}\textit{data-macro} is a command sequence into + which the contents of \texttt{filename} are set into a \cmd{def}. +The \textit{array-identifier} is a sequence of + (catcode 11) letters that identify the array. +The starred version of the commands are used if, during the array + creation, it is desired to automatically excise the array data of + leading and trailing spaces. + +Unlike earlier versions of this package, where error messages were + output into the typeset document, error messages are now + set in the log file. +The level of error messaging is defined by the level of bounds checking, + with \cmd{hypercheckbounds} providing the + most intense level of error checking. +When a bounds-checking error is found in an array invocation, in addition + to the error message in the log file, a ``?'' is typeset in the document, + unless bound checking is disabled with \cmd{nocheckbounds}. + + +Several strings of fixed name are defined through the use the +\cmd{readdef} command, which are accessible to the user: -Several strings of fixed name are defined through the use of this -package which are accessible to the user:\\ +\itshape \rl\vb|\nrows|\\ \rl\vb|\ncols|\\ \rl\vb|\nrecords|\\ -\rl\vb|\record|\textit{index} +\rl\vb|\ArrayRecord[|record\vb|]|% + \hfill\textup{(to retrieve record from most recent \cmd{readdef})}\upshape -In addition to the strings of fixed name, there are various strings -created whose name is a function of the user-specified data, such -as\\\itshape -\rl\vb|\|identifier\vb|CELLS|\\ -\rl\vb|\|identifier\vb|PLANES|\\ -\rl\vb|\|identifier\vb|ROWS|\\ -\rl\vb|\|identifier\vb|COLS|\\\upshape -where \textit{identifier} is the alphabetic-character string by which -you have designated a particular array. They will be discussed in -relation to the commands that create these strings. +The macros \cmd{nrows} and \cmd{ncols}, which were gleaned from the file + structure, may be used in the subsequent \cmd{readarray} + invocation to specify the array dimensions. +Alternately, those values may be manually overridden by specifying + the desired values in the \cmd{readarray} invocation. +Individual records of the original file, from the most recent + \cmd{readdef}, may be recalled with the + \cmd{ArrayRecord} macro. + +In addition to the strings of fixed name created during the + \cmd{readdef}, there are various strings created during + the \cmd{readarray} whose name is a function of the + \textit{array-identifier}, such as + +\itshape +\rl\vb|\|array-identifier\vb|CELLS|\\ +\rl\vb|\|array-identifier\vb|PLANES|\\ +\rl\vb|\|array-identifier\vb|ROWS|\\ +\rl\vb|\|array-identifier\vb|COLS|\upshape + +where \textit{array-identifier} is the alphabetic-character string by which +you have designated a particular array. +Their meaning will be discussed later in this document. Support routines which are generally not required directly by the user for the specification and recall of data arrays, but which are -useful to this package and in a variety of other circumstances include -the following:\\\itshape -\rl\vb|\getargsC{|token {\upshape or} string\vb|}|\\ -\rl\vb|\arg|index\\ -\rl\vb|\narg|\\ -\rl\vb|\showargs[|number\vb|]|\\\upshape -\rl\vb|\def\converttilde{|T or F\vb|}|\upshape +useful for debugging include +the following: + +\itshape + +\rl\vb|\arraydump\|array-identifier\\% +\rl\vb|\scalardump\|array-identifier% +\upshape + +These macros print out the complete array, in either a structured or + unstructured form, respectively. -\begin{center} -\vfill -[\textsc{This Space Intentionally Left Blank}] -\vfill -\end{center} -\clearpage \section{Data Structure} The first requirement is to lay out a format for the data interface to -this package. The {\rdar} package is set up to digest space-separated data. -The format for the data organization is as follows, for 2-D arrays: - -\( -\begin{array}{lllll} -A_{11} &A_{12} &A_{13} & \ldots & A_{1\mathrm{(columns)}} \\ -A_{21} &A_{22} & \ldots && \\ + this package. +The {\rdar} package is set up to digest data separated by a user-defined + separator character. +The default separator is a space character but, as of V2.0, the separator + may be specified by way of \vb|\readarraysepchar{|\textit{separator}\vb|}|. +The format for the data organization to be digested is as follows, + for 2-D arrays: + +\TABstackTextstyle{\tiny} +\setstackgap{L}{3pt} +\newcommand\SEP{\,\langle\smash{\raisebox{1pt}{\tabbedCenterstack{s\\e\\p}}}\rangle\,} +\renewcommand\arraystretch{1.1} +{\arraycolsep=3pt\relax\small$ +\begin{array}{lll@{\hspace{2pt}}ll} +A_{11}\SEP &A_{12}\SEP &A_{13}\SEP & \ldots & A_{1\mathrm{(columns)}} \\ +A_{21}\SEP &A_{22}\SEP & \ldots && \\ \vdots&&&&\\ -A_{\mathrm{(rows)}1} &A_{\mathrm{(rows)}2} &A_{\mathrm{(rows)}3} & +A_{\mathrm{(rows)}1}\SEP &A_{\mathrm{(rows)}2}\SEP &A_{\mathrm{(rows)}3}\SEP & \ldots & A_{\mathrm{(rows)}\mathrm{(columns)}} \\ \end{array} -$ +\)} -and for 3-D arrays: +For 3-D arrays, the following structure is employed: -\( -\begin{array}{lllll} -A_{111} &A_{112} &A_{113} & \ldots & A_{11\mathrm{(columns)}} \\ -A_{121} &A_{122} & \ldots && \\ +{\arraycolsep=3pt\relax\small\( +\begin{array}{lll@{\hspace{2pt}}ll} +A_{111}\SEP &A_{112}\SEP &A_{113}\SEP & \ldots & A_{11\mathrm{(columns)}} \\ +A_{121}\SEP &A_{122}\SEP & \ldots && \\ \vdots&&&&\\ -A_{1\mathrm{(rows)}1} &A_{1\mathrm{(rows)}2} &A_{1\mathrm{(rows)}3} & +A_{1\mathrm{(rows)}1}\SEP &A_{1\mathrm{(rows)}2}\SEP &A_{1\mathrm{(rows)}3}\SEP & \ldots & A_{1\mathrm{(rows)}\mathrm{(columns)}} \\ -&&&&\\ -A_{211} &A_{212} &A_{213} & \ldots & A_{21\mathrm{(columns)}} \\ -A_{221} &A_{222} & \ldots && \\ +\rlap{\scriptsize$<$blank line$>$}&&&&\\ +A_{211}\SEP &A_{212}\SEP &A_{213} & \ldots & A_{21\mathrm{(columns)}} \\ +A_{221}\SEP &A_{222}\SEP & \ldots && \\ \vdots&&&&\\ -A_{2\mathrm{(rows)}1} &A_{2\mathrm{(rows)}2} &A_{2\mathrm{(rows)}3} & +A_{2\mathrm{(rows)}1}\SEP &A_{2\mathrm{(rows)}2}\SEP &A_{2\mathrm{(rows)}3}\SEP & \ldots & A_{2\mathrm{(rows)}\mathrm{(columns)}} \\ &&&&\\ \vdots&&&&\\ &&&&\\ -A_{\mathrm{(planes)}11} &A_{\mathrm{(planes)}12} &A_{\mathrm{(planes)}13} & \ldots & A_{\mathrm{(planes)}1\mathrm{(columns)}} \\ -A_{\mathrm{(planes)}21} &A_{\mathrm{(planes)}22} & \ldots && \\ +A_{\mathrm{(planes)}11}\SEP &A_{\mathrm{(planes)}12}\SEP &A_{\mathrm{(planes)}13}\SEP & \ldots & A_{\mathrm{(planes)}1\mathrm{(columns)}} \\ +A_{\mathrm{(planes)}21}\SEP &A_{\mathrm{(planes)}22}\SEP & \ldots && \\ \vdots&&&&\\ -A_{\mathrm{(planes)}\mathrm{(rows)}1} &A_{\mathrm{(planes)}\mathrm{(rows)}2} &A_{\mathrm{(planes)}\mathrm{(rows)}3} & +A_{\mathrm{(planes)}\mathrm{(rows)}1}\SEP &A_{\mathrm{(planes)}\mathrm{(rows)}2}\SEP &A_{\mathrm{(planes)}\mathrm{(rows)}3}\SEP & \ldots & A_{\mathrm{(planes)}\mathrm{(rows)}\mathrm{(columns)}} \\ \end{array} -\) +\)} + + +Here,\,$\SEP${}\,is the data separator that is used to parse the input. +Terms like $A_{\mathrm{(plane)}\mathrm{(row)}\mathrm{(column)}}$ refers + to the \LaTeX{}-formatted data to be associated with the particlar plane, + row, and column of data. +Note, that for 3-D arrays, a blank line can be used to signify to the + parsing algorithm the size of a data plane (alternately, the number of + rows per data plane can be explicitly provided to the \cmd{readarray} + command). \section{Getting Data into Array Structures\label{s:ex}} @@ -151,41 +291,56 @@ \vb|\def|. If one chooses the external file approach, the command \vb|\readdef|\margcmd{readdef} is the command which can achieve this result. The command takes two arguments. The first is the file in -which the data is stored, while the second is the token into which the -data will be placed, for example +which the data is stored, while the second is the data macro into which the +file's data will be placed, for example -\rl\vb|\readdef{data.txt}{\dataA}| +\rl\vb|\readdef{data.txt}{\dataA}|\readdef{file1data.txt}{\dataA} In this case, the contents of the file \vb|data.txt| will be placed -into the token \vb|\dataA|. At this point, the data is still not -digested into a data ``array,'' but merely stuffed into a \vb|\def| (a -\vb|\protected@edef| actually). Thus, there is no -\textit{requirement} that carriage returns be part of the input file -after each row of data, nor that blank lines exist between planes of -data (if the data is 3-D). \textit{However}, there is a reason to do so, -nonetheless. In particular, for datafiles that are organized in the + into the data macro \vb|\dataA|. +Two alterations to the format occur during this conversion from file + to \cmd{def}: 1) blank lines in the file are ignored; and + 2) a data separator replaces the end-of-line. +At this point, the data is still not digested into a 2-D or 3-D data + ``array.'' +However, two things have been accomplished: 1) the file contents are \cmd{def}'ed + into the data macro \cmd{dataA}; and 2) they are also placed into a 1-D + file record array, \cmd{ArrayRecord}. + +There is no +\textit{requirement} that the input file be organized with structured rows + of data corresponding to individual file records, nor that blank + lines exist between planes of data (if the data is 3-D). +\textit{However}, there is a reason to do so, nonetheless. +In particular, for datafiles that are organized in the preferred fashion, for example: -\begin{verbbox} -A111 A112 A113 A114 -A121 A122 A123 A124 -A131 A132 A133 A134 +\verbfilebox{file1data.txt} +\rl\theverbbox -A211 A212 A213 A214 -A221 A222 A223 A224 -A231 A232 A233 A234 -\end{verbbox} -\tabcolsep 1em\begin{tabular}{l} -\theverbbox -\end{tabular} - -a \vb|\readdef| will cause the following strings to be set: -\vb|\ncols|\margcmd{ncols} and \vb|\nrows|\margcmd{nrows}, in this -case to values of \vb|4| and \vb|3|, respectively. Such data could -prove useful if the array size is not known in advance. -When \verb|\readdef| is invoked, a string -\verb|\nrecords|\margcmd{nrecords} will also be set to the number of -file records processed by the \vb|\readdef| command. +a \vb|\readdef| attempts to estimate the number columns, and + rows-per-plane of the dataset by analyzing the data structure. +These estimates are given by + \vb|\ncols|\margcmd{ncols} and \vb|\nrows|\margcmd{nrows}, in this + case to values of \texttt{\ncols} and \texttt{\nrows}, respectively. +Such data could prove useful if the array size is not known in advance. +When \verb|\readdef| is invoked, a string + \verb|\nrecords|\margcmd{nrecords} will also be set to the number of + file records processed by the \vb|\readdef| command, in this case, + to \texttt{\nrecords}. +Finally, the 1-D file-record array, \cmd{ArrayRecord}\margcmd{ArrayRecord}, + is created to allow access to the most recently read file records. +For example, \vb|\ArrayRecord[3]| produces: ``\ArrayRecord[3]''. +Note, however, that the array, \cmd{ArrayRecord}, will be overwritten on + the subsequent invocation of \cmd{readdef}. + +Because \cmd{ArrayRecord} is only a 1-D file-record array, the + \textit{actual} array metrics, given by \cmd{ArrayRecordCOLS}, + \cmd{ArrayRecordROWS}, \cmd{ArrayRecordPLANES}, and + \cmd{ArrayRecordCELLS} are + \ArrayRecordCOLS, \ArrayRecordROWS, \ArrayRecordPLANES, and + \ArrayRecordCELLS, respectively, which do not align with the + estimations provided by \cmd{ncols} and \cmd{nrows}. In lieu of \verb|\readdef|, a generally less preferred, but viable way to make the data available is to cut and paste into a \vb|\def|. @@ -195,303 +350,450 @@ \verb|\def| example at the top of the following page. Note that the \vb|%| is also required at the end of the line containing \vb|\def|, in order to guarantee that, in this case, \vb|A111| is the first element of -data (and not a linebreak). However, unlike \vb|\readdef|, this -definition will set the values of neither \vb|\ncols| nor \vb|\nrows|. +data (and not a space separator). However, unlike \vb|\readdef|, this +definition will neither set the value of \vb|\ncols| nor \vb|\nrows|. -\begin{verbbox}[] -\def{\dataA}{% -A111 A112 A113 A114 -A121 A122 A123 A124 -A131 A132 A133 A134 -% -A211 A212 A213 A214 -A221 A222 A223 A224 -A231 A232 A233 A234 -} +\verbfilebox{file2data.txt} +\rl\theverbbox + +Once the data to be placed into an array is available in a macro, + by way of either + \vb|\readdef| or \vb|\def|, the command to digest the data into an + array is \vb|\readarray| for the case of 2-D or 3-D data. +For 1-D file-record arrays, in contrast, the \cmd{readrecordarray} + command is used to go directly from a file into the 1-D array, + bypassing the intermediate step of a data macro. + +\subsection{1-D File-Record Arrays} + +If the desire is merely to parse a string of data based on a common + data separator, such as a comma or any other character, there is + no need to use the \rdar{} package. +The \loi{} package, which is employed by \rdar, already has those provisions + and should be used directly.% +\begin{verbbox}[\footnotesize] +\setsepchar{ } +\readlist\oneDlist{\dataA} +\oneDlistlen{} list items, 12th item is ``\oneDlist[12]''. \end{verbbox} -\begin{tabular}{l} -\theverbbox -\end{tabular} - -Once the data to be placed into an array is available by way of either -\vb|\readdef| or \vb|\def|, the command to digest the data into an array -is either \vb|\readArrayij| (or \verb|\copyrecords|), in the case of 2-D -data, or \vb|\readArrayijk|, for 3-D data. - -\subsection{Creating 2-D Arrays} - -In the case of \vb|\readArrayij|\margcmd{readArrayij}, the command -takes three arguments. The first is the token into which the data had -previously been stuffed. The second is an alphabetic-string identifier -for the array, which can be one or more characters in length. Finally, -the last argument is the number of columns in the array. If the data -had been read by way of \vb|\readdef|, the string \vb|\ncols| -may be used to signify this value. - -\subsection{Creating Pseudo-1-D Arrays} - -While the {\rdar} package has no explicit provisions for 1-D arrays, one -could use the 2-D \verb|\readArrayij| command, with the third argument set -to a value of unity \{1\}, instead of \verb|\ncols|. In this way, each -space-separated word of the input file will be set to a new data row. -While this approach is useful for sticking each ``word'' of input data -into its own single-column data row, the command -\verb|\copyrecords|\margcmd{copyrecords} can be used to stick the -individual ``file records'' from the most recent \verb|\readdef| into a -2-D array of \textbf{single-column width}. The \verb|\copyrecords| command takes -as its argument an alphabetic string identifier to associate with the -array of data. Its use accomplishes two things: 1) it allows records -(rather than words) of a file to be accessed using the general -\verb|\Arrayij| nomenclature to be discussed shortly; and 2) it saves -the most recently read file data into its own data structure, so that it -is not overwritten by a subsequent invocation of \verb|\readdef|. - -\subsection{Creating 3-D Arrays} - -For the 3-D case, \vb|\readArrayijk|\margcmd{readArrayijk} takes an -additional argument, in comparison to \verb|\readArrayij|. The first two -arguments are identical to \vb|\readArrayij|; namely, the token containing -the data and an identifier for the array. The third argument is the -number of rows in the array, while the fourth argument is the number of -columns. Likewise, if \vb|\readdef| had been used on a properly formed +\footnote{% +For a simple 1-D list punctuated by data separators, one may use the +\loi{} package directly:\\ +\rl\theverbbox\\ +which produces the following output: +\setsepchar{ }% +\readlist\oneDlist{\dataA}% +\oneDlistlen{} list items, 12th item is ``\oneDlist[12]''. +} + +On the other hand, if one wishes a 1-D file-record array, in which each + array element corresponds to the record from a file, then \rdar{} + can be used. +The command \cmd{readrecordarray} can be used to stick the individual + ``file records'' from a designated file into a 1-D array. + +The \cmd{readrecordarray} command takes two arguments: a file + name containing data records, and the name of a 1-D record-array + into which to place the file records. + +So, for example, with the invocation of + \vb|\readrecordarray{data.txt}\oneD|, the data from the file + \texttt{data.txt} is now saved in the \cmd{oneD} array, and can + be retrieved, for example, the 3rd record, with \cmd{oneD[3]}, which + returns \readrecordarray{file1data.txt}\oneD``\oneD[3]''. + +If an array name is reutilized, its prior definitions are cleared, + so that ``old'' data is not inadvertantly retrieved following the + reutilization. + + +\subsection{Creating 2-D and 3-D Arrays} + +The \cmd{readarray}\margcmd{readarray} command, used to convert + raw parsable data into data arrays, + takes three arguments. +The first is the data macro into which the unarrayed raw data had + previously been stuffed (e.g., by way of \cmd{readdef} or \cmd{def}). +The second is array-identifier macro into which the parsed data is to + be placed. +Finally, the last compound argument, enclosed in square brackets, denotes the + rank and range of the array to be created. + +There is a starred version of the command, \cmd{readarray*}, which is used + to remove leading/trailing spaces from the array elements, when parsed. +This option, is only relevant when the data separator is not already a + space. + +If an array name is reutilized, its prior definitions are cleared, + so that ``old'' data is not inadvertantly retrieved following the + reutilization. + +\subsubsection{2-D Arrays} + +\begin{sloppypar} +For a 2-D array, this last argument of \cmd{readarray} will be + of the form \vb|[-,<columns>]|. +If the data had recently been read by way of \vb|\readdef|, the + string \vb|\ncols| may be used to signify the \vb|<columns>| value. +The \texttt{-} (or any other character before the initial comma) + reminds us that the range of row numbers is not specified in advance, + but is dictated by the length of the data macro containing the raw + file data. +For such a 2-D array, only the column range is specified. +\end{sloppypar} + +Consider, for example, the previously discussed file, \texttt{dataA.txt}, + which had been digested into the data macro \cmd{dataA}. +One can process that as a 2-D array with an invocation of + \vb|\readarray\dataA\twoD[-,\ncols]|, since \cmd{ncols} had been + set to a value of \texttt{\ncols}, based on the prior \cmd{readdef}. +Thereafter, data may be retieved, for example the 3rd row, 2nd column, + with \cmd{twoD[3,2]}, to give +\readarray\dataA\twoD[-,\ncols] +``\twoD[3,2]''. + +The actual array size is given by +\cmd{twoDROWS}, \cmd{twoDCOLS}, \cmd{twoDCELLS} +as +\twoDROWS, \twoDCOLS, and \twoDCELLS, respectively. +The number of rows in the array is fewer than the number of file records, + \oneDCELLS, because blank rows in the input file are ignored. +One should also note that if the end of the data stream results in a + partial final row of data, the partial row will be discarded. + +\subsubsection{3-D Arrays} + +For the 3-D case, the only difference in the invocation of + \vb|\readarray| is in the 3rd argument, in which the + rank and range of the array is specified. +This last argument will be of the form + \vb|[-,<rows>,<columns>]|. +As before, the \vb|-| denotes the fact that the range of the planes + of data is unknown before the fact, and governed by the length + of data in the dataset. +Only the range of rows and columns are specifiable here. +If \vb|\readdef| had been used on a properly formed input file, both \vb|\nrows| and \vb|\ncols| may be used to supply the -third and fourth arguments. +range arguments of the 3-D array. + +For example, using the same \cmd{dataA} dataset, but reading it as a + 3-D array can be accomplished with + \vb|\readarray\dataA\threeD[-,\nrows,\ncols]|.% +\readarray\dataA\threeD[-,\nrows,\ncols] +This results in an array with \threeDPLANES{} planes, + \threeDROWS{} rows, and \threeDCOLS{} columns +(\threeDCELLS{} data cells total). +Data from the 2nd plane, 1st row, 2nd column can be obtained via +\cmd{threeD[2,1,2]} as ``\threeD[2,1,2]''. + +If, perchance, a row or plane is only partially defined by + \cmd{readarray}, the partial data is discarded from the array. + +\subsubsection{Array Parsing Separator} While it may be easily envisioned that the array data is numerical, this -need not be the case. The data may be text, and even formatted text. + need not be the case. +The array data may be text, and even formatted text. + Furthermore, one may introduce space characters into the data of -individual cells through the use of hardspaces (\vb|~|), since -normal white space would otherwise be interpreted as a data separator. -Thus, given the following definitions and array initialization, - -\begin{verbbox}[] -\def\I#1{\textit{#1}} -\def\dataC{% -\I{am} \I{are} have~\I{been} have~\I{been} -\I{are} \I{are} have~\I{been} have~\I{been} -\I{is} \I{are} has~\I{been} have~\I{been} -% -\I{was} \I{were} had~\I{been} had~\I{been} -\I{were} \I{were} had~\I{been} had~\I{been} -\I{was} \I{were} had~\I{been} had~\I{been} -% -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -} -\readArrayijk{\dataC}{tobeConjugation}{3}{4} -\end{verbbox} -\begin{tabular}{l} -\theverbbox -\end{tabular} - -\def\I#1{\textit{#1}} -\def\dataC{% -\I{am} \I{are} have~\I{been} have~\I{been} -\I{are} \I{are} have~\I{been} have~\I{been} -\I{is} \I{are} has~\I{been} have~\I{been} -% -\I{was} \I{were} had~\I{been} had~\I{been} -\I{were} \I{were} had~\I{been} had~\I{been} -\I{was} \I{were} had~\I{been} had~\I{been} -% -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -will~\I{be} will~\I{be} will~have~\I{been} will~have~\I{been} -} -\readArrayijk{\dataC}{tobeConjugation}{3}{4} -multi-word sequences will be placed into the individual array elements -of an array identified as ``tobeConjugation,'' with the appropriate -italic emphases applied to the words. - -If, perchance, a row is only partially defined by \vb|\readArrayij| or -a plane is only partially defined by \vb|\readArrayijk|, the partial -data is discarded. - -\subsection{Treatment of Hardspaces} - -For either the 2-D or 3-D \verb|\readArray| commands, the interpretation -of hardspaces (\vb|~|) as data is specifically designed to allow -multi-word data entries. However, one may choose to turn this feature -off by setting the flag + individual cells simply by resetting the \rdar{} parsing separator + to something other than the default space, ``~''. +This can be done, for example employing a comma as the separator, + by way of \vb|\readarraysepchar{,}|.\margcmd{readarraysepchar} + +Note also, using the facilities of the underlying \loi{} package, + that compound separators are possible. +For example, \textit{either} a comma \textit{or} a period may be used + for the data parsing, by specifying a + \textbf{logical-OR} (\vb+||+) separated list: \vb:\readarraysepchar{,||.}:. +Similarly, a multicharacter separator is possible, so that setting + \vb|\readarraysepchar{!!}| will cause \cmd{readarray} to look for + instances of ``!!'' to divide the data into separate array elements. + +Consider the following comma-separated input in, let us say, the file + \textsf{conjugation.txt}. -\rl\vb|\def\converttilde{T}| +\verbfilebox[\footnotesize]{file3data.txt} +\rl\theverbbox + +The sequence of commands + +\begin{verbbox} +\readarraysepchar{,} +\readdef{conjugation.txt}\dataC +\readarray*\dataC\tobeConjugation[-,\nrows,\ncols] +\end{verbbox} +\rl\theverbbox +\readarraysepchar{,} +\readdef{file3data.txt}\dataC +\readarray*\dataC\tobeConjugation[-,\nrows,\ncols] + +will employ a comma separator to parse the file. +It will then create a 3-D array using data from the file, placed into the + array \cmd{tobeConjugation}. +Leading/trailing spaces will be removed from the data, with the use of the + star form of the \cmd{readarray} command. +Data can then be directly accessed, so that, for example +\cmd{tobeConjugation[1,3,3]} will yield the entry from the + 1st plane, 3rd row, 3rd column as ``\tobeConjugation[1,3,3]''. + +The 3-D array metrics are \cmd{tobeConjugationPLANES}, + \cmd{tobeConjugationROWS}, \cmd{tobeConjugationCOLS}, and + \cmd{tobeConjugationCELLS}, which are + here given as \tobeConjugationPLANES, + \tobeConjugationROWS, \tobeConjugationCOLS, and + \tobeConjugationCELLS. + respectively. -which will have the effect of converting hardspaces to regular space -tokens. \section{Recalling Data from Array Structures} -While one has specified the number of columns and/or rows associated -with the \vb|\readArray...| initialization, those numbers may not yet +\begin{sloppypar} +While one must specify the number of columns and/or rows associated +with the \vb|\readarray| invocation, those numbers may not yet be known to the user, if the values employed came from the -\vb|\readdef| initializations of -\vb|\ncols| and \vb|\nrows|. Therefore, the \vb|\readArray...| -\margcmd{{\rmfamily\itshape identifier}CELLS}% -\margcmd{{\rmfamily\itshape identifier}PLANES}% -\margcmd{{\rmfamily\itshape identifier}ROWS}% -\margcmd{{\rmfamily\itshape identifier}COLS}% -commands also set the following strings: -\itshape\vb|\|identifier\vb|CELLS|, \vb|\|identifier\vb|PLANES|% , -\vb|\|identifier\vb|ROWS|{\upshape, and} -\vb|\|identifier\vb|COLS|\upshape, where -\textit{identifier} is the array identifier string that was supplied to -the \verb|\readarray...| command. Note that it is the -case, for 3-D arrays, that - -\rl\itshape\vb|\|identifier\vb|CELLS| $=$ \vb|\|identifier\vb|PLANES| -$\times$ \vb|\|identifier\vb|ROWS| $\times$ -\vb|\|identifier\vb|COLS|\upshape +\vb|\readdef| estimations of +\vb|\ncols| and \vb|\nrows|. Therefore, the \cmd{readrray} +\margcmd{{\rmfamily\itshape array-identifier}CELLS}% +\margcmd{{\rmfamily\itshape array-identifier}PLANES}% +\margcmd{{\rmfamily\itshape array-identifier}ROWS}% +\margcmd{{\rmfamily\itshape array-identifier}COLS}% +command variants also define the following strings: +\itshape\vb|\|array-identifier\vb|CELLS|, \vb|\|array-identifier\vb|PLANES|, +\vb|\|array-identifier\vb|ROWS|{\upshape, and} +\vb|\|array-identifier\vb|COLS|\upshape, where +\cmd{array-identifier} is the array name supplied to +the \cmd{readarray} command. Note, for 3-D arrays, that +\end{sloppypar} + +\rl\itshape\vb|\|array-identifier\vb|CELLS| $=$ \\\rl\quad + \vb|\|array-identifier\vb|PLANES| $\times$ \vb|\|array-identifier\vb|ROWS| + $\times$ \vb|\|array-identifier\vb|COLS|\upshape -For the ``tobeConjugation'' example of the prior section, +For the \cmd{tobeConjugation} example of the prior section, \tobeConjugationCELLS $=$\tobeConjugationPLANES $\times$\tobeConjugationROWS $\times$% \tobeConjugationCOLS. Likewise, for 2-D arrays -\rl\itshape\vb|\|identifier\vb|CELLS| $=$ \vb|\|identifier\vb|ROWS| -$\times$ \vb|\|identifier\vb|COLS|\upshape +\rl\itshape\vb|\|array-identifier\vb|CELLS| $=$ \vb|\|array-identifier\vb|ROWS| +$\times$ \vb|\|array-identifier\vb|COLS|\upshape -To retrieve the data from the array, one need employ either the -\vb|\Arrayij| -\margcmd{Arrayij} -or \vb|\Arrayijk| -\margcmd{Arrayijk} -commands, depending on whether the array is 2-D or 3-D. The first -mandatory argument to either of these commands is the array identifer. -The remaining arguments to these commands are simply the row and column, -in the case of the 2-D \vb|\Arrayij|, or else the plane, row, and -column, in the case of the 3-D \vb|\Arrayijk|. +To retrieve the data from the array, one merely supplies the + array name in the form of + \cmd{}\textit{array-identifier}\margcmd{\rmfamily\itshape array-identifier% + \upshape\ttfamily[...]}, + along with the array-cell nomenclature in the form of + \textit{\texttt{\upshape[}plane\texttt{\upshape,}row\texttt{\upshape,}% + column\texttt{\upshape]}} for 3-D arrays, + \textit{\texttt{\upshape[}row\texttt{\upshape,}% + column\texttt{\upshape]}} for 2-D arrays, and + \textit{\texttt{\upshape[}row\texttt{\upshape]}} for 1-D arrays. Thus, in the case of the earlier example involving conjugation of the verb \textit{to be}, the second-person future-perfect tense of the verb -is given by\\ -\rl\vb|\Arrayijk{tobeConjugation}{3}{2}{4}|,\\ -which yields ``\Arrayijk{tobeConjugation}{3}{2}{4}.'' - -For pseudo-1-D arrays, either created with \verb|\copyrecords| or else -using the \verb|\readarray| command with the third argument set to -unity, access to these arrays is achieved by way of \verb|\Arrayij|, -setting the column argument to unity. - -There are also strings defined, one for each record that was read from -the file, with the name -\verb|\record|\textit{index}\margcmd{record\itshape\rmfamily index}, -where \textit{index} is the record number expressed in roman numerals. -Thus in the example from section~\ref{s:ex}, \vb|\recordii| would -contain the string ``\vb|A121 A122 A123 A124|''. However, such syntax -provides no bounds checking. - -An alternate (perhaps preferred) way to access one of the file records -read during the most recent \verb|\readdef|, in a way which provides -bounds checking, is to use the \verb|\showrecord| -command\margcmd{showrecord}. For the section~\ref{s:ex} example, the -alternative to executing \vb|\recordii| would be to use -\verb|\showrecord{2}|. The optional argument to this command provides -an alternative error message if the record requested is out of bounds. -The default error messages for negative or excessive record numbers are, -respectively: - -\def\nrecords{1} -\rl\showrecord{-1}\\ -\rl\showrecord{10} - -Unlike the \vb|\Arrayij| and \verb|\Arrayijk| commands already -discussed, the record data from a given file read will only be available -until the next invocation of \verb|\readdef|. For this reason, the -command \verb|\copyrecords| was introduced to convert file-record data -into an array data structure. +is given by + +\rl\cmd{tobeConjugation[3,2,4]} -While the user is developing his application involving the {\rdar} +which yields ``\tobeConjugation[3,2,4]''. + +\section{Bounds Checking} + +While the user is developing his or her application involving the {\rdar} package, there may accidentally arise the unintended circumstance where -an array element is asked for which falls outside the array bounds. -Like \verb|\showrecord|, the \verb|\Arrayij| and \verb|\Arrayijk| -commands also employ bounds checking. These commands check for -four error conditions that, by default, produce the following error -messages:\\ -\rl\Arrayijk{tobeConjugation}{-3}{2}{4}\\ -\rl\Arrayijk{tobeConjugation}{9}{2}{4}\\ -\rl\Arrayijk{tobeConjugation}{3}{9}{4}\\ -\rl\Arrayijk{tobeConjugation}{3}{2}{9} - -which are written in lieu of a valid array element datum. While such -messages help in debugging, the user may desire an error tailored to the -application. The optional argument to both \vb|\Arrayij| and -\vb|\Arrayijk| replaces the default error messages and is to be printed -if any error condition arises. It could be a blank \vb|[]|, a black -box \vb|[\rule{1ex}{1ex}]|, or anything else that makes sense for the -application. - -\section{Alternate Accessing Commands if \texttt{\bs edef} is Required} - -The\verb|\Arrayij| and \verb|\Arrayijk| commands may, of course, be -placed as arguments of \verb|\def| commands. They, cannot, however, be -placed into an \verb|\edef|. If the user has need to place the -array-element content into an \verb|\edef| (and assuming that the -actual array-element content is suitable for an \verb|\edef|), the user -should employ the \verb|\arrayij| and \verb|\arrayijk| commands, as -alternatives. -\margcmd{arrayij}\margcmd{arrayijk}% -These commands do not perform any bounds checking (thus eliminating the -need for an optional argument). Their advantage, however, is that they -may be freely placed into an -\verb|\edef|. +an array element is requested which falls outside the array bounds. +In general, when a non-existent array element is requested in the + absence of bounds checking, the call will expand to \cmd{relax}. + +The package provides three declarations to set the manner in + which array bounds are be monitored. +The setting \cmd{nocheckbounds}\margcmd{nocheckbounds} is used when bounds + are not to be checked. +This is the default behavior for \rdar. +For some bounds checking, \cmd{checkbounds}\margcmd{checkbounds} + may be set. +With this setting, bounds violations are noted, but no guidance is + provided as to the allowable index range for the array. +However, with \cmd{hypercheckbounds}\margcmd{hypercheckbounds} set, + full bounds checking is possible. +With this setting, not only are violations noted, but a description + of the actual array range is provided. + +As of V2.0, bounds violations are noted in the log file, rather than the + document itself. +However, if an array bound is violated when bounds checking is turned on, +a ``?'' shows up in the document itself. + + +\section{Accessing Array Cells if Full Expansion is Required + (e.g., placed in an \texttt{\bs edef}) } + +If full expansion is required of array cell contents (and assuming the cell + content is expandable), it is advisable to set \cmd{nocheckbounds}% + , so that the error checking code is not + included in the expansion. +Results may be also expanded even with \cmd{checkbounds} + set, though the error-checking code is part of the expansion. +However, with \cmd{hypercheckbounds} set, full + expansion of array cells is no longer possible. + +\section{Accessing Array Cells if No Expansion is Required} + +With the normal use of \cmd{\rmfamily\itshape array-identifier} syntax + for accessing array cells, + several levels of expansion are required to directly recover the original + tokens of the cell, and then only when bounds checking is disabled. +When the actual unexpanded tokens of cell are required, the use of the + \cmd{arraytomacro}\margcmd{arraytomacro} command provides the means + to accomplish this. +The command takes the array name and index as the initial arguments followed + by a generic macro name into which to place the unexpanded tokens of the + indexed array cell. + +So, for example \vb|\arraytomacro\tobeConjugation[2,2,3]\thiscell| will + place the cell's original tokens in the macro \cmd{thiscell}. +Upon detokenization, \cmd{thiscell} contains +\arraytomacro\tobeConjugation[2,2,3]\thiscell +``\texttt{\detokenize\expandafter{\thiscell}}''. \section{Support Routines} -The engine for the {\rdar} package is the \vb|\getargsC| -\margcmd{getargsC} command, based on the \vb|\getargs| command found -in the \textsf{stringstrings} package. This command has been herein -rewritten for speed. The \vb|\getargsC| command takes a string or -token as its argument and separates each of the space-separated words of -it into individual strings, named with roman numerals as -\vb|\argi|\margcmd{arg\itshape\rmfamily index}, \vb|\argii|, -\textit{etc}. The total number of arguments that are separated is given -by the string \vb|\narg|\margcmd{narg}. This command can be useful -for a variety of applications outside of \rdar. While generally used -only for diagnostic purposes, the command -\vb|\showargs|\margcmd{showargs} is used print out all the arguments -recently digested by an invocation of \vb|\getargsC|, separated by -small black blocks. The optional argument to \vb|\showargs| is the -number of individual arguments to place on a single line of output, -before issuing a linefeed. Thus, the command +The package provides two commands that can help one understand how a + data set has been parsed into an array. +Both of these commands dump the specified array to the document. +In the case of \cmd{arraydump}\margcmd{arraydump}, the array is formatted + in the structure of the array, broken up by columns, rows, and planes. +In the case of \cmd{scalardump}\margcmd{scalardump}, however, the elements + of the array are dumped sequentially, without reference to the array's + heirarchy. + +For the case of 1-D record array \cmd{oneD} employed in prior sections, for + example, the invocations of + +\rl\vb|\arraydump\oneD|\\ +\rl\vb|\scalardump\oneD| + +results in + +\arraydump\oneD +\scalardump\oneD + +\clearpage + +The \cmd{twoD} equivalent, resulting from parsing the same data file as + a 2-D, rather than a 1-D record array, is + +\rl\vb|\arraydump\twoD|\\ +\rl\vb|\scalardump\twoD| + +\arraydump\twoD +\scalardump\twoD + +For the case of the 3-D array (earlier read as \cmd{threeD}), +the \cmd{arraydump} would appear as + +\rl\vb|\arraydump\threeD|\\ +\rl\vb|\scalardump\threeD| + +\arraydump\threeD +\scalardump\threeD + +Note that the \cmd{scalardump} of \cmd{threeD} is indistinguishable from + that of \cmd{twoD}, since both arrays are comprised of the same data + cells, though arrayed into different plane/row/column structures. + +\clearpage +For comparison, the \cmd{arraydump} of \cmd{tobeConjugation} is + +\arraydump\tobeConjugation + + +\section{Deprecated, Vestigial, and Defunct Features} + +\textbf{Deprecated} + +The following commands are supplied, but are no longer the preferred +embodiment of package syntax. + +\itshape +\rl\vb|\copyrecords{|array-identifier\vb|}|% +\\ +\rl\vb|\readArrayij{\|data-macro\vb|}{|array-identifier\vb|}{|columns\vb|}|% +\\ +\rl\vb|\readArrayij*{\|data-macro\vb|}{|array-identifier\vb|}{|columns\vb|}|% +\\ +\rl\vb|\readArrayijk{\|data-macro\vb|}{|array-identifier\vb|}{|rows\vb|}{|columns\vb|}|% +\\ +\rl\vb|\readArrayijk*{\|data-macro\vb|}{|array-identifier\vb|}{|rows\vb|}{|columns\vb|}|% +\\ +\rl\vb|\showrecord[|error\vb|]{|record number\vb|}|\\ +\rl\vb|\Arrayij[|error\vb|]{|array-identifier\vb|}{|row\vb|}{|column\vb|}|\\ +\rl\vb|\Arrayijk[|error\vb|]{|array-identifier\vb|}{|plane\vb|}{|row\vb|}{|% + column\vb|}|\\ +\rl\vb|\arrayij{|array-identifier\vb|}{|row\vb|}{|column\vb|}|\\ +\rl\vb|\arrayijk{|array-identifier\vb|}{|plane\vb|}{|row\vb|}{|% + column\vb|}|\upshape + +\textbf{Vestigial} + +The following support macros are provided but no longer recommended. +Their capability is more fully served by way of the \loi{} package. + +\itshape +\rl\vb|\getargsC{\|macro {\upshape or} string\vb|}|\\ +\rl\vb|\arg|index\\ +\rl\vb|\narg|\\ +\rl\vb|\showargs|% +\upshape + +Note that whereas \cmd{getargs} could previously (pre-V2.0 \rdar) employ + only a space as the parsing separator, \cmd{getargs} now respects the + currently set value of separator, as (re)defined by \cmd{readarraysepchar}. + +\textbf{Defunct} + +The following macros are no longer supported. + +\itshape +\rl\vb|\converttilde|\\ +\rl\vb|\record|index +\upshape + +Since the package now supports arbitrary parsing separators, + there is no need for the function of \cmd{converttilde}. +However, were one desiring to parse, while treating hard spaces as spaces, + this can be simply achieved under V2.0 \rdar{} by setting the + parsing character as either a space or a hard space, using + \vb:readarraysepchar{ ||~}:. +Likewise, the indirect addressing (using a romannumeral \textit{index}) + provided by the internal command \cmd{record}\textit{index} is fully + superceded by the ability to directly address any record of \rdar's + 1-D record arrays. -\begin{verbbox}[] -\showargs[4] -\end{verbbox} -\begin{tabular}{l} -\theverbbox -\end{tabular} - -yields the following result: - -\showargs[4] - -Note that the 37$^{th}$ argument is non-printing and represents the -residual linefeed left over fromt he \vb|\def| of \vb|\dataC|. A -similar residual argument is also left by the \vb|\readdef| command. -It can be eliminated if the last record of the \vb|\readdef| input -file (or the last record of the \vb|\def| command) ends with a -\vb|%| symbol, so as to discard the final linefeed prior to the -end-of-file (or \vb|}|). - -As mentioned earlier, the flag -\vb|converttilde|\margcmd{converttilde}, by default ``false,'' can be -set to \vb|\def\converttilde{T}| so as to tell \vb|\getargsC| to -treat hardspaces as ordinary spaces. \section{Acknowledgements} -The author would like to thank Dr. David Carlisle for his assistance in +I am profoundly thankful to Christian Tellechea for using + my simplistic (read ``deficient'') \textsf{getargs} package to + inspire his effort in creating the powerful \loi{} package. +It is precisely the tool I have sought for a long time, and I have + adapted its use into the workings of this package. + +I would like to thank Dr. David Carlisle for his assistance in helping the author rewrite the \vb|\getargs| command, originally found in the \textsf{stringstrings} package. To distinguish the two versions, -and in deference to him, it is herein named \vb|\getargsC|. +and in deference to him, it is herein named \vb|\getargsC|. However, +as of V2.0, its presence is vestigial, having instead been superceded with +the \loi{} package macros. + +I am likewise grateful to Ken Kubota, who suggested moving the + \vb|\newread| outside of \vb|\readdef|, so as not to prematurely + exhaust the 16 available file streams. \clearpage - \section{Code Listing} -\verbatiminput{readarray.sty} - +\verbfilenobox[\footnotesize]{readarray.sty} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/readarray.doc.tlpobj new/tlpkg/tlpobj/readarray.doc.tlpobj --- old/tlpkg/tlpobj/readarray.doc.tlpobj 2016-04-14 19:44:41.000000000 +0200 +++ new/tlpkg/tlpobj/readarray.doc.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -1,9 +1,9 @@ name readarray.doc category Package -revision 30489 +revision 42467 shortdesc doc files of readarray relocated 1 -docfiles size=63 +docfiles size=132 RELOC/doc/latex/readarray/README RELOC/doc/latex/readarray/readarray.pdf RELOC/doc/latex/readarray/readarray.tex ++++++ readarray.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/readarray/readarray.sty new/tex/latex/readarray/readarray.sty --- old/tex/latex/readarray/readarray.sty 2013-05-15 23:52:42.000000000 +0200 +++ new/tex/latex/readarray/readarray.sty 2016-11-25 19:33:58.000000000 +0100 @@ -1,7 +1,9 @@ +\def\readarrayPackageVersion{2.0} +\def\readarrayPackageDate{2016/11/07} \ProvidesPackage{readarray} -[2013/05/09 v1.2 -Routines for inputting array data and recalling it on an -element-by-element basis. Currently supports 2-D and 3-D array] +[\readarrayPackageDate\ \readarrayPackageVersion\ % +Routines for inputting 2D and 3D array data and recalling it on an +element-by-element basis.] % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -16,14 +18,23 @@ % The Current Maintainer of this work is Steven B. Segletes. % % Revisions: -% v1.01 Documentation revision -% v1.1 Added \csname record\roman{@row}\endcsname to \readdef +% v1.01 -Documentation revision +% v1.1 -Added \csname record\roman{@row}\endcsname to \readdef % v1.2 -Corrected the [truncated] LPPL license info % -Added \arrayij and \arrayijk, which can be put into \edef % -Used \romannumeral in preference to \roman{}, when possible, % to avoid unnecessary use of counters. -\usepackage{ifthen} -\usepackage{ifnextok} +% v1.3 -Moved \newread outside of \readdef, so as not to exhaust the +% 16 allotted file streams (Thanks to Ken Kubota for the tip). +% v2.0 -Converted parsing to listofitems package. This allows for +% ANY parsing character or combination of characters (via logical OR). +% -Replaced all \protected@edef's with appropriately expanded \def's. +% -Use listofitems package in preference to \getargsC. +% -Deprecated \Arrayijk, \arrayijk, \Arrayij, & \arrayij. Direct +% access now preferred, e.g., \xyz[2,3,1]. +% -Deprecated most other commands in favor of a more natural syntax. +\RequirePackage{ifthen} +\RequirePackage{listofitems}[2016-10-22] % \newcounter{@index} \newcounter{@plane} @@ -31,20 +42,156 @@ \newcounter{@col} \newcounter{use@args} \newcounter{@record} -\def\the(a)rule{\rule{.8ex}{1.6ex}}% +\newcounter{arg@index} +\newcounter{break@count} +\newcounter{index@count} +\newcounter{loop@count} +\newtoks\Arg@toks +\newtoks\@arrayident@toks +\newread\rdar@file +% +\newcommand\readdef[2]{\@readdef{#1}{#2}{ArrayRecord}} +% +\newcommand\readrecordarray[2]{% + \edef\@arrayident{\rdar@macroname#2}% + \def\ra@TermA{\@readdef{#1}}% + \def\ra@TermB{\expandafter\ra@TermA\csname\@arrayident def\endcsname}% + \expandafter\ra@TermB\expandafter{\@arrayident}% +} +% +\newcommand\readarray{\@ifstar{\read@array@newsyntax[*]}{\read@array@newsyntax[]}} +% +\def\arraytomacro#1[#2]#3{% + \edef\@arrayident{\rdar@macroname#1[#2]}% + \@arrayident@toks=\expandafter\expandafter\expandafter{\csname\@arrayident\endcsname}% + \expandafter\def\expandafter#3\expandafter{\the\@arrayident@toks}% +} +% +\newcommand\readarraysepchar[1]{\def\read@array@sepchar{#1}} +% +\def\nocheckbounds{\def\rootmacro@aux##1##2##3{##1% + }\typeout{readarray: bounds checking OFF}% +} +% +\def\checkbounds{\def\rootmacro@aux##1##2##3{##1% + \expandafter\ifx##1\relax\readarrayboundfailmsg% + \setbox0=\hbox{\typeout{readarray Warning: ##1 out of bounds.}}% + \fi% + }\typeout{readarray: bounds checking ON}% +} % -\newcommand\readArrayijk[4]{% - \getargsC{#1}% - \setcounter{@plane}{\numexpr(\narg/#4/#3)}% - \setcounter{use@args}{\numexpr\arabic{@plane}*#3*#4}% - \ifthenelse{\arabic{use@args} > \narg}{% +\def\hypercheckbounds{\def\rootmacro@aux##1##2##3{##1% + \expandafter\ifx##1\relax\readarrayboundfailmsg% + \typeout{readarray Warning: ##1 out of bounds:}% + \fi% + \setcounter{index@count}{0}% + \parse@index##3,\relax% + \setcounter{loop@count}{0}% + \whiledo{\value{loop@count}<\value{index@count}}{% + \stepcounter{loop@count}% + \ifnum\csname parsed@index[\theloop@count]\endcsname<0% + \relax\typeout{\nonposmessage{##2}{##3}}\fi% + }% + \ifnum \value{index@count}=1\relax% + \ifnum\csname parsed@index[1]\endcsname>% + \csname##2CELLS\endcsname\relax\typeout{\recordmessage{##2}{##3}}\fi% + \fi + \ifnum \value{index@count}=2\relax% + \ifnum\csname parsed@index[1]\endcsname>% + \csname##2ROWS\endcsname\relax\typeout{\rowmessage{##2}{% + \csname parsed@index[1]\endcsname}}\fi% + \ifnum\csname parsed@index[2]\endcsname>% + \csname##2COLS\endcsname\relax\typeout{\colmessage{##2}{% + \csname parsed@index[2]\endcsname}}\fi% + \fi + \ifnum \value{index@count}=3\relax% + \ifnum\csname parsed@index[1]\endcsname>% + \csname##2PLANES\endcsname\relax\typeout{\planemessage{##2}{% + \csname parsed@index[1]\endcsname}}\fi% + \ifnum\csname parsed@index[2]\endcsname>% + \csname##2ROWS\endcsname\relax\typeout{\rowmessage{##2}{% + \csname parsed@index[2]\endcsname}}\fi% + \ifnum\csname parsed@index[2]\endcsname>% + \csname##2COLS\endcsname\relax\typeout{\colmessage{##2}{% + \csname parsed@index[3]\endcsname}}\fi% + \fi% + }\typeout{readarray: bounds hyperchecking ON}% +} +% +\def\rdar@macroname{\expandafter\@gobble\string} +% +\def\getArg@toks[#1]{\Arg@toks\expandafter\expandafter\expandafter{\Arg@list[#1]}} +% +\newcommand\@readdef[3]{% + \clear@array{#3}% + \edef\former@recordcount{\csname #3CELLS\endcsname}% + \def\first@row{T}% + \def\first@plane{T}% + \catcode\endlinechar=9 % + \def#2{}% + \setcounter{@record}{0}% + \openin\rdar@file=#1% + \loop\unless\ifeof\rdar@file% + \read\rdar@file to\rdar@fileline % Reads a line of the file into \rdar@fileline% + \addtocounter{@record}{1}% + \expandafter\g@addto@macro\expandafter#2\expandafter{\rdar@fileline}% + \ifthenelse{\equal{\rdar@fileline}{}}{}{\expandafter\g@addto@macro% + \expandafter#2\expandafter{\read@array@sepchar}}% + \if T\first@row\read@array{#2}\setcounter{@col}{\numexpr(\Arg@listlen-1)}% + \edef\ncols{\arabic{@col}}\def\first@row{F}\setcounter{@row}{1}% + \else% + \if T\first@plane% + \ifthenelse{\equal{\rdar@fileline}{}}{% + \edef\nrows{\arabic{@row}}\def\first@plane{F}% + }{% + \addtocounter{@row}{1}% + }% + \fi% + \fi% + \def\record@name{\csname #3[\the@record]\endcsname}% + \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter% + \expandafter\def\expandafter\record@name\expandafter{\rdar@fileline}% + \repeat% + \edef\nrecords{\arabic{@record}}% + \expandafter\edef\csname #3PLANES\endcsname{0}% + \expandafter\edef\csname #3ROWS\endcsname{\nrecords}% + \expandafter\edef\csname #3COLS\endcsname{0}% + \expandafter\edef\csname #3CELLS\endcsname{\nrecords}% + \closein\rdar@file% + \catcode\endlinechar=5 % + \define@rootmacro{#3}% +} +% +\def\read@array@newsyntax[#1]#2#3[#4,#5]{% + \edef\@arrayident{\rdar@macroname#3}% + \setcounter{index@count}{0}% + \parse@index#5,\relax% + \ifnum\value{index@count}=1\relax% + \def\ra@TermA{\readArrayij#1{#2}}% + \edef\ra@TermB{{\@arrayident}{\csname parsed@index[1]\endcsname}}% + \expandafter\ra@TermA\ra@TermB% + \else + \ifnum\value{index@count}=2\relax% + \def\ra@TermA{\readArrayijk#1{#2}}% + \edef\ra@TermB{{\@arrayident}{\csname parsed@index[1]\endcsname}% + {\csname parsed@index[2]\endcsname}}% + \expandafter\ra@TermA\ra@TermB% + \fi\fi +} +% +\newcommand\read@Arrayijk[5][]{% + \clear@array{#3}% + \read@array[#1]{#2}% + \setcounter{@plane}{\numexpr(\Arg@listlen/#5/#4)}% + \setcounter{use@args}{\numexpr\arabic{@plane}*#4*#5}% + \ifthenelse{\arabic{use@args} > \Arg@listlen}{% \addtocounter{@plane}{-1}% - \setcounter{use@args}{\numexpr\arabic{@plane}*#3*#4}% + \setcounter{use@args}{\numexpr\arabic{@plane}*#4*#5}% }{}% - \expandafter\edef\csname#2PLANES\endcsname{\arabic{@plane}}% - \expandafter\edef\csname#2ROWS\endcsname{#3}% - \expandafter\edef\csname#2COLS\endcsname{#4}% - \expandafter\edef\csname#2CELLS\endcsname{\arabic{use@args}}% + \expandafter\edef\csname#3PLANES\endcsname{\arabic{@plane}}% + \expandafter\edef\csname#3ROWS\endcsname{#4}% + \expandafter\edef\csname#3COLS\endcsname{#5}% + \expandafter\edef\csname#3CELLS\endcsname{\arabic{use@args}}% \setcounter{@index}{0}% \setcounter{@plane}{1}% \setcounter{@row}{1}% @@ -52,193 +199,229 @@ \whiledo{\value{@index} < \value{use@args}}{% \addtocounter{@index}{1}% \addtocounter{@col}{1}% - \ifthenelse{\value{@col} > #4}% + \ifthenelse{\value{@col} > #5}% {\addtocounter{@row}{1}% - \addtocounter{@col}{-#4}}% + \addtocounter{@col}{-#5}}% {}% - \ifthenelse{\value{@row} > #3}% + \ifthenelse{\value{@row} > #4}% {\addtocounter{@plane}{1}% - \addtocounter{@row}{-#3}}% + \addtocounter{@row}{-#4}}% {}% - \expandafter\protected@edef% - \csname#2X\roman{@plane}X\roman{@row}X\roman{@col}\endcsname% - {\expandafter\csname arg\roman{@index}\endcsname}% + \def\arg@name{\csname#3[\the@plane,\the@row,\the@col]\endcsname}% + \getArg@toks[\the@index]% + \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter% + \expandafter\def\expandafter\arg@name\expandafter{\the\Arg@toks}% }% + \define@rootmacro{#3}% } % -\newcommand\readArrayij[3]{% - \getargsC{#1}% - \setcounter{@row}{\numexpr(\narg/#3)}% - \setcounter{use@args}{\numexpr\arabic{@row}*#3}% - \ifthenelse{\arabic{use@args} > \narg}{% +\newcommand\read@Arrayij[4][]{% + \clear@array{#3}% + \read@array[#1]{#2}% + \setcounter{@row}{\numexpr(\Arg@listlen/#4)}% + \setcounter{use@args}{\numexpr\arabic{@row}*#4}% + \ifthenelse{\arabic{use@args} > \Arg@listlen}{% \addtocounter{@row}{-1}% - \setcounter{use@args}{\numexpr\arabic{@row}*#3}% + \setcounter{use@args}{\numexpr\arabic{@row}*#4}% }{}% - \expandafter\edef\csname#2PLANES\endcsname{1}% - \expandafter\edef\csname#2ROWS\endcsname{\arabic{@row}}% - \expandafter\edef\csname#2COLS\endcsname{#3}% - \expandafter\edef\csname#2CELLS\endcsname{\arabic{use@args}}% + \expandafter\edef\csname#3PLANES\endcsname{0}% + \expandafter\edef\csname#3ROWS\endcsname{\arabic{@row}}% + \expandafter\edef\csname#3COLS\endcsname{#4}% + \expandafter\edef\csname#3CELLS\endcsname{\arabic{use@args}}% \setcounter{@index}{0}% \setcounter{@row}{1}% \setcounter{@col}{0}% \whiledo{\value{@index} < \value{use@args}}{% \addtocounter{@index}{1}% \addtocounter{@col}{1}% - \ifthenelse{\value{@col} > #3}% + \ifthenelse{\value{@col} > #4}% {\addtocounter{@row}{1}% - \addtocounter{@col}{-#3}}% + \addtocounter{@col}{-#4}}% {}% - \expandafter\protected@edef% - \csname#2X\roman{@row}X\roman{@col}\endcsname% - {\expandafter\csname arg\roman{@index}\endcsname}% + \def\arg@name{\csname#3[\the@row,\the@col]\endcsname}% + \getArg@toks[\the@index]% + \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter% + \expandafter\def\expandafter\arg@name\expandafter{\the\Arg@toks}% }% + \define@rootmacro{#3}% } % -\def\nonposrecordmessage{{\tiny Only positive showrecords permitted}} -\def\recordmessage#1{{\tiny RECORD=#1 exceeds records read}} -% -\def\nonposmessage{{\tiny Only positive array indices permitted}} -\def\planemessage#1#2{{\tiny PLANE=#2 exceeds limit for #1}} -\def\rowmessage#1#2{{\tiny ROW=#2 exceeds limit for #1}} -\def\colmessage#1#2{{\tiny COL=#2 exceeds limit for #1}} -% -\newcommand\arrayijk[4]{% - \csname#1X\romannumeral#2X\romannumeral#3X\romannumeral#4\endcsname% -} -% -\newcommand\Arrayijk[5][$]{% - \ifthenelse{\value{@plane}<1 \OR \value{@row}<1 \OR \value{@col}<1}{% - \if$#1\nonposmessage\else#1\fi}{% - \ifthenelse{#3 > \csname#2PLANES\endcsname}{% - \if$#1\planemessage{#2}{#3}\else#1\fi}{% - \ifthenelse{#4 > \csname#2ROWS\endcsname}{% - \if$#1\rowmessage{#2}{#4}\else#1\fi}{% - \ifthenelse{#5 > \csname#2COLS\endcsname}{% - \if$#1\colmessage{#2}{#5}\else#1\fi}{% - \csname#2X\romannumeral#3X\romannumeral#4X\romannumeral#5\endcsname}% +\newcommand\clear@array[1]{% + \expandafter\ifx\csname #1\endcsname\relax\else% + \setcounter{@row}{0}% + \whiledo{\value{@row}<\csname #1ROWS\endcsname}{% + \stepcounter{@row}% + \ifnum\csname #1COLS\endcsname=0\relax% + \expandafter\let\csname #1[\the@row]\endcsname\relax% + \else + \setcounter{@col}{0}% + \whiledo{\value{@col}<\csname #1COLS\endcsname}{% + \stepcounter{@col}% + \ifnum\csname #1PLANES\endcsname=0\relax% + \expandafter\let\csname #1[\the@row,\the@col]\endcsname\relax% + \else + \setcounter{@plane}{0}% + \whiledo{\value{@plane}<\csname #1PLANES\endcsname}{% + \stepcounter{@plane}% + \expandafter% + \let\csname #1[\the@plane,\the@row,\the@col]\endcsname\relax% + }% + \fi% }% - }% - }% -} -% -\newcommand\arrayij[3]{% - \csname#1X\romannumeral#2X\romannumeral#3\endcsname% + \fi% + }% + \fi% } % -\newcommand\Arrayij[4][$]{% - \ifthenelse{\value{@row}<1 \OR \value{@col}<1}{% - \if$#1\nonposmessage\else#1\fi}{% - \ifthenelse{#3 > \csname#2ROWS\endcsname}{% - \if$#1\rowmessage{#2}{#3}\else#1\fi}{% - \ifthenelse{#4 > \csname#2COLS\endcsname}{% - \if$#1\colmessage{#2}{#4}\else#1\fi}{% - \csname#2X\romannumeral#3X\romannumeral#4\endcsname}% - }% - }% +\newcommand\read@array[2][]{% + \bgroup% + \expandafter\setsepchar\expandafter{\read@array@sepchar}% + \greadlist#1\Arg@list{#2}% + \egroup% + \edef\Arg@listCELLS{\Arg@listlen}% +} +% +\def\define@rootmacro#1{% + \expandafter\def\csname#1\endcsname[##1]{% + \expandafter\rootmacro@aux\csname #1[##1]\endcsname{#1}{##1}}% +} +% +\def\parse@index#1,#2\relax{% + \stepcounter{index@count}% + \expandafter\gdef\csname parsed@index[\theindex@count]\endcsname{#1}% + \ifx\relax#2\relax\else\parse@index#2\relax\fi% +} +% INITIALIZATION +\readarraysepchar{ } +\nocheckbounds +% +\def\nonposmessage#1#2{Negative index [#2] impermissable for #1.} +\def\recordmessage#1#2{RECORD=#2 exceeds bounds(=\csname#1CELLS\endcsname) for #1.} +\def\planemessage#1#2{PLANE=#2 exceeds bounds(=\csname#1PLANES\endcsname) for #1.} +\def\rowmessage#1#2{ROW=#2 exceeds bounds(=\csname#1ROWS\endcsname) for #1.} +\def\colmessage#1#2{COL=#2 exceeds bounds(=\csname#1COLS\endcsname) for #1.} +% +\def\the@showargs@rule{\kern.2pt\rule{.8ex}{1.6ex}\hspace{.2pt}}% +\def\readarrayboundfailmsg{?}% DISPLAYED WHEN ARRAY CALL OUT OF BOUNDS +% +% SUPPORT/DEBUG ROUTINES +% +% \arraydump INITIALIZATIONS +\def\row@spacer{\\} +\def\row@msg{\the@showargs@rule\hfill{\scriptsize\scshape$<$\row@sign~\arabic{@row}$>$}} +\def\header@msg{{\bfseries\ra@rank:}~} +\def\last@row{\\} +\def\plane@msg{\plane@sign\hrulefill\mbox{}\\} +\def\close@out{} +% +\newcommand\arraydump[1]{% + \edef\@arrayident{\rdar@macroname#1}% + \expandafter\ifx\csname\@arrayident\endcsname\relax\else% + \edef\ra@TmpA{\csname\@arrayident PLANES\endcsname}% + \edef\ra@TmpB{\csname\@arrayident COLS\endcsname}% + \def\ra@rank{3-D}% + \ifnum\ra@TmpA=0\relax\def\ra@TmpA{1}\def\plane@sign{\mbox{}}\def\ra@rank{2-D}% + \else\def\plane@sign{{\scriptsize\scshape Plane \arabic{@plane}}}\fi% + \ifnum\ra@TmpB=0\relax\def\ra@TmpB{1}\def\row@sign{Record}\def\ra@rank{1-D}% + \else\def\row@sign{Row}\fi% + \par\noindent\header@msg% + \setcounter{@plane}{0}% + \whiledo{\value{@plane}<\ra@TmpA}{% + \stepcounter{@plane}% + \plane@msg% + \setcounter{@row}{0}% + \whiledo{\value{@row}<\csname\@arrayident ROWS\endcsname}{% + \ifnum\value{@row}=0\relax\else\row@spacer\fi% + \stepcounter{@row}% + \setcounter{@col}{0}% + \whiledo{\value{@col}<\ra@TmpB}{% + \the@showargs@rule% + \stepcounter{@col}% + \ifnum\csname\@arrayident COLS\endcsname=0\relax% + #1[\the@row]% + \else% + \ifnum\csname\@arrayident PLANES\endcsname=0\relax% + #1[\the@row,\the@col]% + \else% + #1[\the@plane,\the@row,\the@col]% + \fi% + \fi% + }\row@msg% + }\last@row% + }\close@out\mbox{}\hrulefill\mbox{}\par% + \fi% +} +% +\newcommand\scalardump[1]{\bgroup% + \def\row@spacer{}% + \def\row@msg{}% + \def\header@msg{{\bfseries\csname\@arrayident CELLS\endcsname\ ELEMENTS:}% + ~\hrulefill\mbox{}\\}% + \def\last@row{}% + \def\plane@msg{}% + \def\close@out{\the@showargs@rule\\}% + \arraydump#1\egroup% +} +% +% DEPRECATED COMMANDS (NOT PREFERRED EMBODIMENT OF PACKAGE SYNTAX) +% +\newcommand\readArrayijk{\@ifstar{\read@Arrayijk[*]}{\read@Arrayijk}} +\newcommand\readArrayij{\@ifstar{\read@Arrayij[*]}{\read@Arrayij}} +\newcommand\arrayijk[4]{\csname#1[#2,#3,#4]\endcsname} +\newcommand\arrayij[3]{\csname#1[#2,#3]\endcsname} +\newcommand\Arrayijk[5][\relax]{% + \bgroup% + \ifx\relax#1\else\def\readarrayboundfailmsg{#1}\fi\csname#2\endcsname[#3,#4,#5]% + \egroup% +} +\newcommand\Arrayij[4][\relax]{% + \bgroup% + \ifx\relax#1\else\def\readarrayboundfailmsg{#1}\fi\csname#2\endcsname[#3,#4]% + \egroup% } -% \newcommand\copyrecords[1]{% + \clear@array{#1}% + \edef\former@recordcount{\csname #1CELLS\endcsname}% \setcounter{@record}{0}% \whiledo{\value{@record} < \nrecords}{% \addtocounter{@record}{1}% - \expandafter\protected@edef\csname#1X\roman{@record}Xi\endcsname{% - \csname record\roman{@record}\endcsname}% + \def\arg@name{\csname#1[\the@record]\endcsname}% + \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter% + \expandafter\def\expandafter\arg@name\expandafter{% + \csname ArrayRecord[\the@record]\endcsname}% }% - \expandafter\edef\csname#1PLANES\endcsname{1}% + \expandafter\edef\csname#1PLANES\endcsname{0}% \expandafter\edef\csname#1ROWS\endcsname{\nrecords}% - \expandafter\edef\csname#1COLS\endcsname{1}% + \expandafter\edef\csname#1COLS\endcsname{0}% \expandafter\edef\csname#1CELLS\endcsname{\nrecords}% + \define@rootmacro{#1}% } -% -\newcommand\showrecord[2][$]{% - \ifthenelse{#2<1}{% - \if$#1\nonposrecordmessage\else#1\fi}{% - \ifthenelse{#2 > \nrecords}{% - \if$#1\recordmessage{#2}\else#1\fi}{% - \csname record\romannumeral#2\endcsname}% - }% -} -% -\newcommand\readdef[2]{% -\def\first@row{T}% -\def\first@plane{T}% -\catcode\endlinechar=10\relax% -\def#2{}% -\setcounter{@record}{0}% -\newread\file% -\openin\file=#1% -\loop\unless\ifeof\file% - \read\file to\fileline % Reads a line of the file into \fileline% - \addtocounter{@record}{1}% - \protected@edef#2{#2\fileline}% - \if T\first@row\getargsC{#2}\setcounter{@col}{\numexpr(\narg-1)}% - \edef\ncols{\arabic{@col}}\def\first@row{F}\setcounter{@row}{1}% - \else% - \if T\first@plane\getargsC{\fileline}\ifthenelse{\equal{\narg}{1}}{% - \edef\nrows{\arabic{@row}}\def\first@plane{F}}{% - \addtocounter{@row}{1}}% - \fi% - \fi% - \expandafter\protected@edef\csname record\roman{@record}\endcsname{% - \fileline}% -\repeat% -\edef\nrecords{\arabic{@record}}% -\closein\file% -\catcode\endlinechar=5\relax% -} -% -\newcommand\showargs[1][0]{% - narg=\narg:~% - \the@rule% - \setcounter{arg@index}{0}% - \setcounter{break@count}{0}% - \whiledo{\value{arg@index} < \narg}{% - \addtocounter{arg@index}{1}% - \addtocounter{break@count}{1}% - \csname arg\roman{arg@index}\endcsname% - \the@rule% - \ifthenelse{\equal{#1}{\value{break@count}}}{% - \ifthenelse{\equal{\value{arg@index}}{\narg}}{}{% - \newline\the@rule\addtocounter{break@count}{-#1}}% - }% - {}% +\newcommand\showargs[1][0]{\bgroup% + \def\Arg@listPLANES{0}% + \def\Arg@listCOLS{0}% + \let\Arg@listROWS\Arg@listCELLS% + \scalardump\Arg@list\egroup% +} +\newcommand\showrecord[2][\relax]{% + \bgroup\ifx\relax#1\else\def\readarrayboundfailmsg{#1}\fi\ArrayRecord[#2]\egroup% +} +% The support routine \getargs{} is provided for backward compatibility. +% It is preferable to directly use facilities of the +% listofitems package to accomplish these tasks. +\def\getargsC#1{% + \bgroup% + \expandafter\setsepchar\expandafter{\read@array@sepchar}% + \greadlist\Arg@list{#1}% + \egroup% + \edef\narg{\Arg@listlen}% + \let\Arg@listCELLS\narg% + \setcounter{@index}{0}% + \whiledo{\value{@index}<\narg}{% + \stepcounter{@index}% + \expandafter\edef\csname arg\romannumeral\value{@index}\endcsname{% + \Arg@list[\value{@index}]}% }% - \setcounter{arg@index}{0}% } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% The \getargsC macro mimics the behavior of the \getargs macro -% of the stringstrings package, but runs faster, and can handle -% arbitrary tokens. For the development of \getargsC, significant -% assistance was provided by David Carlisle, for which the author is -% most appreciative. -% http://tex.stackexchange.com/questions/101604/ -% parsing-strings-containing-diacritical-marks-macros -% -\def\string@end{$\SaveHardspace} -\def\converttilde{F} -\newcounter{arg@index} -\newcounter{break@count} -\let\SaveHardspace~%%% -% -\def\getargsC#1{% - \if T\converttilde\def~{ }\else\catcode`~=12\fi - \protected@edef\the@string{#1}% - \setcounter{arg@index}{0}% - \lowercase{\expandafter\parse@Block\the@string} \string@end - \let~\SaveHardspace% - \catcode`~=13 -} -% -\def\parse@Block#1 {% - \stepcounter{arg@index}% - \@namedef{arg\roman{arg@index}}{#1}% - \futurelet\tmp\parse@Block@} -% -\def\parse@Block@{% -\ifx\tmp\string@end\edef\narg{\thearg@index}\expandafter\@gobble -\else\expandafter\parse@Block\fi} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/readarray.tlpobj new/tlpkg/tlpobj/readarray.tlpobj --- old/tlpkg/tlpobj/readarray.tlpobj 2016-04-14 19:44:41.000000000 +0200 +++ new/tlpkg/tlpobj/readarray.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -1,6 +1,6 @@ name readarray category Package -revision 30489 +revision 42467 shortdesc Read, store and recall array-formatted data relocated 1 longdesc The package allows the user to input formatted data into @@ -11,10 +11,11 @@ longdesc data is called for, the package proves particularly useful when longdesc elements of multiple arrays must be recallable and dynamically longdesc combined at time of compilation, rather than in advance. -runfiles size=2 +runfiles size=4 RELOC/tex/latex/readarray/readarray.sty +catalogue-also getargs catalogue-ctan /macros/latex/contrib/readarray -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-15 23:30:18 +0100 catalogue-license lppl1.3 catalogue-topics data-manip -catalogue-version 1.2 +catalogue-version 2.0 ++++++ realboxes.doc.tar.xz ++++++ ++++++ realboxes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/realboxes.tlpobj new/tlpkg/tlpobj/realboxes.tlpobj --- old/tlpkg/tlpobj/realboxes.tlpobj 2016-04-14 19:44:41.000000000 +0200 +++ new/tlpkg/tlpobj/realboxes.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=3 RELOC/tex/latex/realboxes/realboxes.sty catalogue-ctan /macros/latex/contrib/realboxes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics boxing catalogue-version 0.2 ++++++ realscripts.doc.tar.xz ++++++ ++++++ realscripts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/realscripts.tlpobj new/tlpkg/tlpobj/realscripts.tlpobj --- old/tlpkg/tlpobj/realscripts.tlpobj 2016-04-14 19:44:41.000000000 +0200 +++ new/tlpkg/tlpobj/realscripts.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/latex/realscripts/realscripts.sty catalogue-ctan /macros/latex/contrib/realscripts -catalogue-date 2016-02-13 06:59:36 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics off catalogue-version 0.3d ++++++ rec-thy.doc.tar.xz ++++++ ++++++ rec-thy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rec-thy.tlpobj new/tlpkg/tlpobj/rec-thy.tlpobj --- old/tlpkg/tlpobj/rec-thy.tlpobj 2016-04-14 19:44:42.000000000 +0200 +++ new/tlpkg/tlpobj/rec-thy.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=10 RELOC/tex/latex/rec-thy/rec-thy.sty catalogue-ctan /macros/latex/contrib/rec-thy -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics maths catalogue-version 1.3 ++++++ recipe.doc.tar.xz ++++++ ++++++ recipe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recipe.tlpobj new/tlpkg/tlpobj/recipe.tlpobj --- old/tlpkg/tlpobj/recipe.tlpobj 2016-04-14 19:44:42.000000000 +0200 +++ new/tlpkg/tlpobj/recipe.tlpobj 2017-04-14 17:59:43.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/recipe/recipe.cls catalogue-also recipecard recipebook catalogue-ctan /macros/latex/contrib/recipe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics cooking catalogue-version 0.9 ++++++ recipebook.doc.tar.xz ++++++ ++++++ recipebook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recipebook.tlpobj new/tlpkg/tlpobj/recipebook.tlpobj --- old/tlpkg/tlpobj/recipebook.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/recipebook.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/recipebook/RecipeBook.cls catalogue-also recipe recipecard catalogue-ctan /macros/latex/contrib/recipebook -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cooking class ++++++ recipecard.doc.tar.xz ++++++ ++++++ recipecard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recipecard.tlpobj new/tlpkg/tlpobj/recipecard.tlpobj --- old/tlpkg/tlpobj/recipecard.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/recipecard.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/recipecard/recipecard.cls catalogue-also recipe recipebook catalogue-ctan /macros/latex/contrib/recipecard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cooking catalogue-version 2.0 ++++++ rectopma.doc.tar.xz ++++++ ++++++ rectopma.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rectopma.tlpobj new/tlpkg/tlpobj/rectopma.tlpobj --- old/tlpkg/tlpobj/rectopma.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/rectopma.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/rectopma/rectopma.sty catalogue-ctan /macros/latex/contrib/rectopma -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp ++++++ recycle.doc.tar.xz ++++++ ++++++ recycle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recycle.tlpobj new/tlpkg/tlpobj/recycle.tlpobj --- old/tlpkg/tlpobj/recycle.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/recycle.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/fonts/type1/public/recycle/recycle.pfb RELOC/tex/latex/recycle/recycle.sty catalogue-ctan /fonts/recycle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-mf font-type1 font-specialist ++++++ refcheck.doc.tar.xz ++++++ ++++++ refcheck.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/refcheck.tlpobj new/tlpkg/tlpobj/refcheck.tlpobj --- old/tlpkg/tlpobj/refcheck.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/refcheck.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/refcheck/refcheck.sty catalogue-ctan /macros/latex/contrib/refcheck -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics label-ref debug-supp catalogue-version 1.9.1 ++++++ refenums.doc.tar.xz ++++++ Binary files old/doc/latex/refenums/README.pdf and new/doc/latex/refenums/README.pdf differ Binary files old/doc/latex/refenums/demo.pdf and new/doc/latex/refenums/demo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/refenums.doc.tlpobj new/tlpkg/tlpobj/refenums.doc.tlpobj --- old/tlpkg/tlpobj/refenums.doc.tlpobj 2016-04-14 19:44:43.000000000 +0200 +++ new/tlpkg/tlpobj/refenums.doc.tlpobj 2017-05-01 02:08:35.000000000 +0200 @@ -1,11 +1,12 @@ name refenums.doc category Package -revision 32562 +revision 44131 shortdesc doc files of refenums relocated 1 -docfiles size=25 +docfiles size=56 RELOC/doc/latex/refenums/LICENSE RELOC/doc/latex/refenums/README.md + RELOC/doc/latex/refenums/README.pdf RELOC/doc/latex/refenums/demo.pdf RELOC/doc/latex/refenums/demo.tex RELOC/doc/latex/refenums/test/demo-sec-param.tex ++++++ refenums.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/refenums.tlpobj new/tlpkg/tlpobj/refenums.tlpobj --- old/tlpkg/tlpobj/refenums.tlpobj 2016-04-14 19:44:44.000000000 +0200 +++ new/tlpkg/tlpobj/refenums.tlpobj 2017-05-01 02:08:35.000000000 +0200 @@ -1,6 +1,6 @@ name refenums category Package -revision 32562 +revision 44131 shortdesc Define reference labels items with names of their own relocated 1 longdesc The package provides commands to define enumerable items with a @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/refenums/refenums.sty catalogue-ctan /macros/latex/contrib/refenums -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license lppl1.3 catalogue-topics label-ref -catalogue-version 1.1.1 +catalogue-version 1.1.2 ++++++ reflectgraphics.doc.tar.xz ++++++ ++++++ reflectgraphics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/reflectgraphics.tlpobj new/tlpkg/tlpobj/reflectgraphics.tlpobj --- old/tlpkg/tlpobj/reflectgraphics.tlpobj 2016-04-19 17:46:18.000000000 +0200 +++ new/tlpkg/tlpobj/reflectgraphics.tlpobj 2017-04-14 17:59:44.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/reflectgraphics/reflectgraphics.sty catalogue-ctan /macros/latex/contrib/reflectgraphics -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-manip catalogue-version 0.2c ++++++ refman.doc.tar.xz ++++++ ++++++ refman.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/refman.tlpobj new/tlpkg/tlpobj/refman.tlpobj --- old/tlpkg/tlpobj/refman.tlpobj 2016-04-14 19:44:45.000000000 +0200 +++ new/tlpkg/tlpobj/refman.tlpobj 2017-04-14 17:59:45.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/refman/refart.cls RELOC/tex/latex/refman/refrep.cls catalogue-ctan /macros/latex/contrib/refman -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class catalogue-version 2.0e ++++++ refstyle.doc.tar.xz ++++++ ++++++ refstyle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/refstyle.tlpobj new/tlpkg/tlpobj/refstyle.tlpobj --- old/tlpkg/tlpobj/refstyle.tlpobj 2016-04-14 19:44:46.000000000 +0200 +++ new/tlpkg/tlpobj/refstyle.tlpobj 2017-04-14 17:59:46.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/refstyle/refstyle.cfg RELOC/tex/latex/refstyle/refstyle.sty catalogue-ctan /macros/latex/contrib/refstyle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics label-ref catalogue-version 0.5 ++++++ regcount.doc.tar.xz ++++++ ++++++ regcount.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/regcount.tlpobj new/tlpkg/tlpobj/regcount.tlpobj --- old/tlpkg/tlpobj/regcount.tlpobj 2016-04-14 19:44:46.000000000 +0200 +++ new/tlpkg/tlpobj/regcount.tlpobj 2017-04-14 17:59:46.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/regcount/regcount.sty catalogue-ctan /macros/latex/contrib/regcount -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics debug-supp catalogue-version 1.0 ++++++ regexpatch.doc.tar.xz ++++++ ++++++ regexpatch.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/regexpatch.tlpobj new/tlpkg/tlpobj/regexpatch.tlpobj --- old/tlpkg/tlpobj/regexpatch.tlpobj 2016-05-17 03:19:57.000000000 +0200 +++ new/tlpkg/tlpobj/regexpatch.tlpobj 2017-04-14 17:59:46.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=7 RELOC/tex/latex/regexpatch/regexpatch.sty catalogue-ctan /macros/latex/contrib/regexpatch -catalogue-date 2016-05-15 21:45:49 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 0.2b ++++++ register.doc.tar.xz ++++++ ++++++ register.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/register.tlpobj new/tlpkg/tlpobj/register.tlpobj --- old/tlpkg/tlpobj/register.tlpobj 2016-04-14 19:44:47.000000000 +0200 +++ new/tlpkg/tlpobj/register.tlpobj 2017-04-14 17:59:47.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=3 RELOC/tex/latex/register/register.sty catalogue-ctan /macros/latex/contrib/register -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics engineering comp-sci comp-net catalogue-version 1.6 ++++++ regstats.doc.tar.xz ++++++ ++++++ regstats.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/regstats.tlpobj new/tlpkg/tlpobj/regstats.tlpobj --- old/tlpkg/tlpobj/regstats.tlpobj 2016-04-14 19:44:47.000000000 +0200 +++ new/tlpkg/tlpobj/regstats.tlpobj 2017-04-14 17:59:47.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/regstats/regstats.sty catalogue-also regcount catalogue-ctan /macros/latex/contrib/regstats -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics debug-supp catalogue-version 1.0h ++++++ reledmac.doc.tar.xz ++++++ ++++ 1668 lines of diff (skipped) ++++++ reledmac.tar.xz ++++++ ++++ 5337 lines of diff (skipped) ++++++ relenc.doc.tar.xz ++++++ ++++++ relenc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/relenc.tlpobj new/tlpkg/tlpobj/relenc.tlpobj --- old/tlpkg/tlpobj/relenc.tlpobj 2016-04-14 19:44:51.000000000 +0200 +++ new/tlpkg/tlpobj/relenc.tlpobj 2017-04-14 17:59:49.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/latex/relenc/t1renc.def RELOC/tex/latex/relenc/t1rzcm.fd catalogue-ctan /macros/latex/contrib/relenc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics font-devel ++++++ relsize.doc.tar.xz ++++++ ++++++ relsize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/relsize.tlpobj new/tlpkg/tlpobj/relsize.tlpobj --- old/tlpkg/tlpobj/relsize.tlpobj 2016-04-14 19:44:51.000000000 +0200 +++ new/tlpkg/tlpobj/relsize.tlpobj 2017-04-14 17:59:49.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=4 RELOC/tex/latex/relsize/relsize.sty catalogue-ctan /macros/latex/contrib/relsize -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font-sel macro-supp catalogue-version 4.1 ++++++ reotex.doc.tar.xz ++++++ ++++++ reotex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/reotex.tlpobj new/tlpkg/tlpobj/reotex.tlpobj --- old/tlpkg/tlpobj/reotex.tlpobj 2016-04-14 19:44:52.000000000 +0200 +++ new/tlpkg/tlpobj/reotex.tlpobj 2017-04-14 17:59:49.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=6 RELOC/tex/latex/reotex/reotex.sty catalogue-ctan /graphics/pgf/contrib/reotex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram pgf-tikz catalogue-version 1.1 ++++++ repeatindex.doc.tar.xz ++++++ ++++++ repeatindex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/repeatindex.tlpobj new/tlpkg/tlpobj/repeatindex.tlpobj --- old/tlpkg/tlpobj/repeatindex.tlpobj 2016-04-14 19:44:52.000000000 +0200 +++ new/tlpkg/tlpobj/repeatindex.tlpobj 2017-04-14 17:59:49.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/makeindex/repeatindex/repeatindex.ist RELOC/tex/latex/repeatindex/repeatindex.sty catalogue-ctan /macros/latex/contrib/repeatindex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics index catalogue-version 0.01 ++++++ repere.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/repere/README new/doc/metapost/repere/README --- old/doc/metapost/repere/README 2013-12-20 23:01:27.000000000 +0100 +++ new/doc/metapost/repere/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -repere.mp - -This package provides MetaPost macros for drawing in a coordinate system : -- axis, grids -- points, vectors -- functions (curves, tangents, integrals, sequences) -- statistic diagrams - -The doc is in french, sorry for that - -License LPPL - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/repere/README.md new/doc/metapost/repere/README.md --- old/doc/metapost/repere/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/metapost/repere/README.md 2017-05-12 00:45:29.000000000 +0200 @@ -0,0 +1,13 @@ +Package repere - Version 17.05 - May 10, 2017 + +This package provides MetaPost macros for drawing secondary school mathematics figures in a coordinate system : +- axis, grids +- points, vectors +- functions (curves, tangents, integrals, sequences) +- statistic diagrams +- plane geometry (polygons, circles) + +The doc is in french... + +License LPPL 1.3 + Binary files old/doc/metapost/repere/repere-doc.pdf and new/doc/metapost/repere/repere-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/repere/repere-doc.tex new/doc/metapost/repere/repere-doc.tex --- old/doc/metapost/repere/repere-doc.tex 2013-12-20 23:01:27.000000000 +0100 +++ new/doc/metapost/repere/repere-doc.tex 2017-05-12 00:45:29.000000000 +0200 @@ -1,5 +1,8 @@ \documentclass[11pt,a4paper,french]{article} -% to compile this doc (needs geometriesyr16.mp http://melusine.eu.org/syracuse/poulecl/macros/): +% Needs geometriesyr16.mp +%http://melusine.eu.org/syracuse/poulecl/geometriesyr16/distrib/geometriesyr16-050408.tgz + +% To compile: % (pdf)latex repere-doc.tex % mpost repere-doc.mp % mpost repere-doc.mp @@ -11,9 +14,12 @@ \usepackage[T1]{fontenc} \usepackage{lmodern} \usepackage{textcomp} + \usepackage{mathtools} \usepackage{geometry} \geometry{twoside,hmargin=2cm,vmargin={1.5cm,1.8cm},includefoot} + + \usepackage[bottom]{footmisc} \usepackage{mflogo} @@ -51,7 +57,8 @@ \lstset{columns=flexible,% language=MetaPost,% showstringspaces=false,% - basicstyle=\ttfamily} + basicstyle=\ttfamily, + literate={é}{{\'e}}1} \usepackage{babel} @@ -219,7 +226,7 @@ \title{Documentation de \texttt{repere.mp}} \date{\today} \author{Olivier \textsc{Péault}% -\footnote{E-mail : \href{mailto:o.peault@gmail.com}{\texttt{o.peault@gmail.com}}}} +\footnote{E-mail : \href{mailto:o.peault@posteo.net}{\texttt{o.peault@posteo.net}}}} \maketitle \setcounter{tocdepth}{2} @@ -233,7 +240,6 @@ \begin{codecache} input geometriesyr16; -input latexmp; input repere; \end{codecache} @@ -241,12 +247,12 @@ \section{Utilisation du fichier} Les macros du fichier \verb+repere.mp+ ont pour but de simplifier la création de figures dans un repère du plan avec \MP{}. L'idée de départ est de coller le plus possibles aux besoins de l'enseignement secondaire de mathématiques. -Il est possible d'utiliser \verb+repere+ et \verb+geometriesyr+ (les macros de Christophe \textsc{Poulain} pour la géométrie disponibles à l'adresse \url{http://melusine.eu.org/syracuse/poulecl/macros/}) dans une même figure comme le montrent les exemples page \pageref{exgeom}. +Il est possible d'utiliser \verb+repere+ et \verb+geometriesyr+ (les macros de Christophe \textsc{Poulain} pour la géométrie disponibles à l'adresse \url{http://melusine.eu.org/syracuse/poulecl/macros/}) dans une même figure comme le montre l'exemple page \pageref{exgeom}. -Le fichier \verb+repere.mp+ doit être placé dans un répertoire accessible à \MP{} (Par ex. le répertoire \verb+metapost+ du \verb+texmf+ local). De plus, la ligne \verb+input repere;+ doit apparaître dans le document contenant les figures. +Le fichier \verb+repere.mp+ doit être placé dans un répertoire accessible à \MP{} (Par ex. le répertoire \verb+metapost+ du \verb+texmf+). De plus, la ligne \verb+input repere;+ doit apparaître dans le document contenant les figures. -Certaines des étiquettes (noms de points, de courbes, de vecteurs...) sont composées automatiquement au format \LaTeX{} mais la compilation peut devenir assez longue pour un nombre important de figures car un fichier est créé et compilé automatiquement par \MP{} pour chaque étiquette. Il est alors possible d'utiliser le fichier \verb+latexmp.mp+ à condition de placer l'instruction \verb+input latexmp;+ avant l'instruction \verb+input repere;+. Attention, utiliser \verb+latexmp.mp+ oblige à compiler deux fois les documents. +Les étiquettes (noms de points, de courbes, de vecteurs...) sont composées automatiquement au format \LaTeX{} avec le package \verb+latexmp.mp+. Il est donc nécessaire de compiler deux fois les documents. \section{Repère utilisateur} @@ -325,8 +331,6 @@ \end{description} -Les axes sont dessinés, gradués et étiquetés par défaut sur toute la longueur du repère utilisateur. Pour des valeurs différentes on peut utiliser les macros suivantes : - \begin{exemple} @@ -362,6 +366,9 @@ fin; \end{exemple} + + + \subsubsection{Réglages des axes} Les axes sont dessinés, gradués et étiquetés par défaut sur toute la longueur du repère utilisateur. Pour des valeurs différentes on peut utiliser les macros suivantes : @@ -438,6 +445,8 @@ \begin{description} \item[axexpart.pos(x1,lab1,x2,lab2,...)] graduation et étiquetage partiels de l'axe des abscisses pour les valeurs \verb+x1+, \verb+x2+... et les étiquettes \verb+lab1+, \verb+lab2+... à la position \verb+pos+. Si \verb+pos+ est omis, les étiquettes sont placées à la position \verb+bot+. Les étiquettes peuvent être soit des chaînes de caractères ("aa", "bonjour"), soit des expressions du type \verb+btex $\pi$ etex+ (ou \verb|LaTeX("$\pi$")| voir page \pageref{latex}), soit d'autres figures. Si \verb+labn+ est omis, la valeur de \verb+xn+ sera utilisée comme étiquette. Pour obtenir une graduation sans étiquette, on peut utiliser la chaîne vide \verb+""+. +On peut désactiver le dessin de la graduation en donnant la valeur \verb|false| à \verb|boolgradxpart|. + \item[axeypart.pos(y1,lab1,y2,lab2,...)] même chose sur l'axe des ordonnées. Si \verb+pos+ est omis, les étiquettes sont placées à la position \verb+lft+. \end{description} @@ -560,12 +569,15 @@ fin; \end{exemple} + + + \section{Points, vecteurs} \subsection{Points} \label{points} \begin{description} -\item[\_c(x,y)] désigne le point (ou le vecteur) de coordonnées cartésiennes \verb+x+ et \verb+y+ dans le repère utilisateur. +\item[(x,y)] désigne le point (ou le vecteur) de coordonnées cartésiennes \verb+x+ et \verb+y+ dans le repère utilisateur. \item[pol(r,t)] désigne le point (ou le vecteur) de coordonnées $(r\cos t;r\sin t)$ dans le repère utilisateur. @@ -587,8 +599,8 @@ \begin{exemple}[0.6] repere(-3,3,0.9cm,-2.5,5,0.9cm); pair A,B,C[],D,E,F; -A=_c(1,1);B=_c(2,3); -D=_c(-2,-1);E=_c(-1,-1);F=_c(-1,-2); +A=(1,1);B=(2,3); +D=(-2,-1);E=(-1,-1);F=(-1,-2); draw axes(1,0); marque_p:="";drawoptions(withcolor magenta); nomme.llft(A);nomme.top(B);draw A--B; @@ -596,16 +608,19 @@ pointe(D,E,F); marque_p:="creux";drawoptions(withcolor orange); nomme.bot(pol(sqrt(2),-pi/4), - LaTeX("$\sqrt{2}e^{-i\frac{\pi}{4}}$")); -nomme.bot(_c(-1.5,1),LaTeX("$(-1,5;1)$")); + "$\sqrt{2}e^{-i\frac{\pi}{4}}$"); +nomme.bot((-1.5,1),"$(-1,5;1)$"); marque_p:="plein";drawoptions(withcolor violet); for i=2 upto 4: - C[i]=_c(-3+i/2,i);nomme.lft(C[i]); + C[i]=(-3+i/2,i);nomme.lft(C[i]); endfor draw cadre; fin; \end{exemple} + + + \subsection{Vecteurs} \begin{description} \item[vecteur.pos(A,u,nom)] figure formée du représentant du vecteur \verb+u+ d'origine \verb+A+ ainsi que de \verb+nom+ placé à la position \verb+pos+ par rapport au milieu de la flèche. Si \verb+nom+ est une chaine de caractère, il sera affiché avec une flèche. Si \verb+nom+ est omis, \verb+u+ surmonté d'une flèche est utilisé. S'il s'agit d'un élément d'un tableau de points (\verb+u1+, \verb+u2+...), le nombre est affiché en indice. @@ -615,8 +630,8 @@ \begin{exemple}[0.6] repere(-1,5.5,0.7cm,-4,4,0.8cm); pair A,B,C[],u,v,w[]; -u=_c(2,2);v=_c(2,-1); -A=_c(1,1);B=A+u; +u=(2,2);v=(2,-1); +A=(1,1);B=A+u; draw axes(1,0); draw base(O,i,j); drawoptions(withcolor cyan); @@ -627,7 +642,7 @@ LaTeX("$\vect{u}+\vect{v}$")); drawoptions(withcolor marine); for i=1 upto 3: - C[i]=_c(1,i-4);w[i]=_c(1.5,0.5*i-1); + C[i]=(1,i-4);w[i]=(1.5,0.5*i-1); draw vecteur.bot(C[i],w[i]); endfor draw cadre; @@ -635,6 +650,7 @@ \end{exemple} + \section{Droites, courbes...} \subsection{Droites} @@ -652,7 +668,7 @@ \begin{exemple}[0.65] repere(-2,3,1cm,-2,3,1cm); pair A,B; -A=_c(-0.5,-1);B=_c(1.5,1.5); +A=(-0.5,-1);B=(1.5,1.5); draw axes(1,0); nomme.ulft(A); nomme.lrt(B); @@ -669,9 +685,13 @@ \verb|vardef f(expr x)=2x+1 enddef;|) et de définir des courbes passant par des points donnés (\verb+A..B..C+). Ces possibilités sont utilisées dans les macros qui suivent. \begin{description} -\item[courbefonc(f,xmin,xmax,n) ou courbefonc(f)(xmin,xmax,n)] courbe représentant la fonction \verb+f+ entre \verb+xmin+ et \verb+xmax+ en utilisant \verb+n+ points d'interpolation. +\item[courbefonc(f)()] courbe représentant la fonction $f$ sur l'intervalle définissant le repère. -\item[courbepoints(f,xmin,xmax,n)] ne trace que les \verb+n+ points sans les relier. Les points sont dessinés en fonction de la valeur de \verb+marque_p+ (voir \ref{points}). +\item[courbefonc(f)(xmin,xmax)] courbe représentant la fonction $f$ sur l'intervalle $[xmin;xmax]$. + +\item[courbefonc(f)(xmin,xmax,n)] courbe représentant la fonction $f$ sur l'intervalle $[xmin;xmax]$ en utilisant \verb+n+ points d'interpolation. La valeur par défaut de \verb|n| est 60. + +\item[courbepoints(f)(xmin,xmax,n)] ne trace que les \verb+n+ points sans les relier. Les points sont dessinés en fonction de la valeur de \verb+marque_p+ (voir \ref{points}). \item[fonccourbe.p(x)] image de \verb+x+ par la fonction dont la courbe représentative est le chemin \verb+p+. La macro renvoie 0 si la fonction n'est pas définie. @@ -686,11 +706,11 @@ path C_f; draw axes(1,1); drawoptions(withcolor moutarde); -C_f=courbefonc(f)(-2,5,50); +C_f= courbefonc(f)(); draw C_f withpen pencircle scaled 1; nomme.llft(C_f,4.7); drawoptions(withcolor beige); -draw courbepoints(g,0,4,9); +draw courbepoints(g)(0,4,9); fin; \end{exemple} @@ -708,10 +728,10 @@ path p,C_f; pair I[],A[]; vardef f(expr x)= x**2-2x enddef; -p=_c(-2,-2).._c(-1,1).._c(0,2).._c(1,1) - .._c(2,-2).._c(3,-3).._c(3.5,-2.5) - .._c(4,-1); -C_f=courbefonc(f,-2,4,40); +p=(-2,-2)..(-1,1)..(0,2)..(1,1) + ..(2,-2)..(3,-3)..(3.5,-2.5) + ..(4,-1); +C_f= courbefonc(f)(-2,2.5); draw axes(1,1); drawoptions(withpen pencircle scaled 1); draw p withcolor bleu; @@ -729,7 +749,7 @@ \begin{description} \item[marquepointcourbe(p,x1,x2,...)] marque les points de la courbe \verb+p+ d'abscisses \verb+x1+, \verb+x2+... La marque dépend de la valeur de \verb+marque_p+. -\item[marquepointchemin(p,n1,n2,...)] dans le cas d'un chemin défini par \verb+A..B..C..+, marque le \verb+n1+ème point, le \verb+n2+ième point... La marque dépend de la valeur de \verb+marque_p+. Attention, le premier point est numéroté 0. +\item[marquepointchemin(p,n1,n2,...)] dans le cas d'un chemin défini par \verb+A..B..C..+, marque le \verb+n1+-ième point, le \verb+n2+-ième point... La marque dépend de la valeur de \verb+marque_p+. Attention, le premier point est numéroté 0. \end{description} @@ -740,10 +760,10 @@ path p,C_f; pair I[],A[]; vardef f(expr x)= x**2-2x enddef; -p=_c(-2,-2).._c(-1,1).._c(0,2) - .._c(1,1).._c(2,-2).._c(3,-3) - .._c(3.5,-2.5).._c(4,-1); -C_f=courbefonc(f,-2,4,40); +p=(-2,-2)..(-1,1)..(0,2) + ..(1,1)..(2,-2)..(3,-3) + ..(3.5,-2.5)..(4,-1); +C_f= courbefonc(f)(-2,3); draw axes(1,1); drawoptions(withpen pencircle scaled 1); draw p withcolor bleu; @@ -755,6 +775,45 @@ \end{exemple} +\subsection{Nommage automatique des courbes} +\begin{description} +\item[nomme(p,nom)] affiche \verb|nom| au niveau d'un point d'intersection de \verb|p| et du contour de la figure. Ce point est choisi en fonction de la chaine \verb|prefnomme| qui peut prendre les valeurs \verb|"right"| (valeur par défaut), \verb|"left"|, \verb|"top"| ou \verb|"bottom"|. +\end{description} + +\begin{exemple} +prefnomme:="left"; + +repere(-5,5,0.7cm,-5,5,0.7cm); +path d,C_f; +d=droite(-1,3); +vardef f(expr x)=0.5(x**2)-x -4 enddef; +C_f=courbefonc(f)(); +draw axes(1,1); +draw d epaisseur 1 couleur bleu; +draw C_f epaisseur 1 couleur bleu; +nomme(d,"$d_2$") couleur bleu; +nomme(C_f) couleur bleu; +draw cadre; +fin; +\end{exemple} + +\begin{exemple} +prefnomme:="bottom"; + +repere(-5,5,0.7cm,-5,5,0.7cm); +path d,C_f; +d=droite(-1,3); +vardef f(expr x)=0.5(x**2)-x -4 enddef; +C_f=courbefonc(f)(); +draw axes(1,1); +draw d epaisseur 1 couleur bleu; +draw C_f epaisseur 1 couleur bleu; +nomme(d,"$d_2$") couleur bleu; +nomme(C_f) couleur bleu; +draw cadre; +fin; +\end{exemple} + \subsection{Dérivée et tangentes} \begin{description} \item[der.p(x)] image de \verb+x+ par la dérivée de la fonction dont la courbe représentative est \verb+p+. @@ -773,16 +832,16 @@ \begin{exemple} repere(-2.5,4.5,1cm,-3.5,2.5,1cm); path p,q; -p=_c(-2,-2){dir 60}.._c(-1,1) - .._c(0,2){right}.._c(1,1).._c(2,-2) - .._c(3,-3){right}.._c(4,-2){(1,2)}; -q=courbefonc(der.p,-1,4,40); +p=(-2,-2){dir 60}..(-1,1) + ..(0,2){right}..(1,1)..(2,-2) + ..(3,-3){right}..(4,-2){(1,2)}; +q= courbefonc(der.p)(-1,4); draw axes(1,1); drawoptions(withpen pencircle scaled 1); draw p withcolor bleu; -nomme.rt(p,0.7,LaTeX("$y=f(x)$")); +nomme.rt(p,0.7,"$y=f(x)$"); draw q withcolor rouge; -nomme.lft(q,3.7,LaTeX("$y=f'(x)$")); +nomme.lft(q,3.7,"$y=f'(x)$"); drawoptions(withpen pencircle scaled 1 withcolor violet); draw tangente.double(p,0); @@ -823,7 +882,7 @@ repere(-2,4.5,1cm,-1,4,1cm); vardef f(expr x)=sqrt(2*x+4) enddef; path C_f,sr; -C_f=courbefonc(f,-2,5,50); +C_f= courbefonc(f)(); sr=suiterec(f,0,3,-1.2); draw axes(1,0); drawoptions(withpen pencircle scaled 1); @@ -840,7 +899,7 @@ repere(-0.5,5,1cm,-0.5,5,1cm); vardef f(expr x)=4-0.8*x enddef; path C_f,sr; -C_f=courbefonc(f,-1,5,10); +C_f= courbefonc(f)(); sr=suiterec(f,0,5,0.2); draw axes(1,0); drawoptions(withpen pencircle scaled 1); @@ -858,7 +917,6 @@ - \section{Surfaces} \subsection{Calcul intégral} @@ -874,8 +932,8 @@ vardef f(expr x)= -(x/4)**3+0.75x enddef; vardef g(expr x)= -((x-2)**2)/9+4 enddef; path C_f,C_g,p,q; -C_f:=courbefonc(f,-3.5,6,40); -C_g:=courbefonc(g,-3.5,6,40); +C_f:= courbefonc(f)(); +C_g:= courbefonc(g)(); p:=entrecourbes(C_f,C_g,-2,1); q:=souscourbe(C_f,3,5); fill p withcolor 0.5Violet; @@ -902,7 +960,7 @@ -((x-2)**4)/32+((x-2)**2)/2+1 enddef; path Cf,r[]; -Cf=courbefonc(f,-2.5,6.5,50); +Cf= courbefonc(f)(); r1=rectangles.max(Cf,2,5.5,8); r2=rectangles.min(Cf,2,5.5,8); r3=rectangles.droite(Cf,-2,1,10); @@ -947,50 +1005,7 @@ fin; \end{exemple} -\subsection{Remplissage} -Pour remplir des chemins fermés avec autre chose que de la couleur, \verb+repere+ permet l'utilisation de la syntaxe \verb+fill p avec motif+ où \verb+motif+ est un des motifs décrits ci-dessous. Cette instruction peut être complétée par des options de dessin (\verb+withpen+, \verb+withcolor+...). - -\begin{description} -\item[hachures(pas,angle)] hachures espacées de \verb+pas+ et formant un angle en degrés de \verb+angle+ avec l'horizontale. Si les valeurs sont omises, \verb|pas| vaut 5 et \verb+angle+ vaut 60. - - -\item[briques(larg,haut,dec)] briques de largeur \verb+larg+, de hauteur \verb+haut+ et décalées d'une ligne à l'autre de \verb+dec+. Si les valeurs sont omises, \verb|larg| vaut 12, \verb|haut| vaut 6 et \verb+dec+ vaut 6. - -\item[vagues(per,amp,dec)] (d'après le manuel de l'utilisateur) \og vagues \fg{} de période \verb+per+, d'amplitude \verb+amp+ et décalées d'une ligne à l'autre de \verb+dec+. Si les valeurs sont omises, \verb|per| vaut 20, \verb|amp| vaut 3 et \verb+dec+ vaut 10. -\end{description} - - - -\begin{exemple}[0.55] -repere(-1.5,4.5,1cm,-1.5,7.5,1cm); -path c[];picture lab;numeric u;u:=3cm; -c1=fullcircle scaled 2.5cm; -for k=1 upto 6: - i:=(k-1) mod 2;j:=(k-1) div 2; - c[k]:=c1 shifted (u*i,u*j); -endfor; -fill c1 withcolor lime; -fill c1 avec hachures(10,30) dashed evenly; -fill c2 withcolor lime; -fill c2 avec hachures(); -fill c3 withcolor (0,0.65,0.8,0.48); -fill c3 avec briques(15,5,4); -fill c4 withcolor (0,0.65,0.8,0.48); -fill c4 avec briques(); -fill c5 withcolor (1,0,0,0.2); -fill c5 avec vagues(30,10,20) - withpen pencircle scaled 2; -fill c6 withcolor (1,0,0,0.2); -fill c6 avec vagues(); -for k=1 upto 6: - i:=(k-1) mod 2;j:=(k-1) div 2; - draw c[k]; - lab:=thelabel("c"&decimal(k),u*(i,j)); - unfill bbox lab;draw lab; -endfor; -fin; -\end{exemple} @@ -1015,15 +1030,14 @@ repere(-1.5,3.5,1cm,-2.2,2.5,1cm); path Cf; pair A[]; vardef f(expr x)= x**2-2x-0.5 enddef; -Cf=courbefonc(f,-2,4,40); +Cf= courbefonc(f)(); ptantecedents(A,2,Cf); draw axes(1,1); draw Cf withpen pencircle scaled 1 withcolor bleu; drawoptions(dashed evenly withcolor rouge); -draw projectionaxes(_c(1.3,f(1.3)), - LaTeX("$x$"),LaTeX("$f(x)$")); -draw projectionx.urt(A1,LaTeX("$x_1$")); -draw projectionx.llft(A2,LaTeX("$x_2$"),-6); +draw projectionaxes((1.3,f(1.3)),"$x$","$f(x)$"); +draw projectionx.urt(A1,"$x_1$"); +draw projectionx.llft(A2,"$x_2$",-6); draw A1--A2; fin; \end{exemple} @@ -1040,23 +1054,23 @@ repere(-1,5,0.9cm,-1,4.5,1cm); vardef f(expr x)=x**2-5x+7 enddef; draw axes(1,1); -draw courbefonc(f,-1,5,50) +draw courbefonc(f)() withpen pencircle scaled 1 withcolor bleu; drawoptions(dashed evenly withcolor rouge); -draw projectionx.bot(_c(1,f(1))); -draw projectiony.llft(_c(2.5,f(2.5)),"0,75"); -draw projectionaxes(_c(4,f(4))); +draw projectionx.bot((1,f(1))); +draw projectiony.llft((2.5,f(2.5)),"0,75"); +draw projectionaxes((4,f(4))); drawoptions(withcolor violet); draw intervallex.OF(1,4); draw intervalley.FF(0.75,3); -label(LaTeX("$f(]1;4])=[0,75;3]$"),_c(2.5,4)); +label("$f(]1;4])=[0,75;3]$",(2.5,4)); draw cadre; fin; \end{exemple} -\section{Statistiques} +\section{Statistiques et probabilités} \subsection{Boite à moustache} \begin{description} @@ -1086,27 +1100,322 @@ draw projboitemoustache.bot(1) dashed evenly; drawoptions(withcolor blue); draw boitemoustache(0,3.14,6,8,10,2cm,0.7cm); - draw projboitemoustache.bot(0.00456,"$\pi$","$\num{2x3}$","$x$","Max") - dashed evenly; + draw projboitemoustache.bot(0.0456,"$\pi$","$\num{2x3}$","$x$","Max") dashed evenly; fin; \end{exemplev} + +\subsection{Diagrammes} +\begin{description} +\item[diagrammebatons((v1,e1),(v2,e2),...(vn,en))] Figure formée des \verb|n| segments joignant les points \verb|(v1,e1),(v2,e2),...(vn,en)| et leur projeté sur l'axe des abscisses. Les bâtons sont surmontés d'un point dont le diamètre est égal à la largeur des segments multiplié par \verb|diampointsbatons|. \verb|diampointsbatons| est égal à 5 par défaut. On peut lui donner la valeur 0 pour ne pas avoir ces points. +\end{description} + +\begin{exemple}[0.6] +repere(-0.5,5,1cm,-0.5,5,1cm); + picture diag; + draw axes(1,1); + diag:=diagrammebatons((1,2),(2,4),(3,2),(4,1)); + draw diag epaisseur 2 withcolor rouge; +fin +\end{exemple} + + +\begin{description} +\item[diagrammebarres((a1,h1),(a2,h2),...(an,hn))] Figure formée de \verb|n| barres rectangulaires de hauteurs \verb|h1| \dots \verb|hn| aux abscisses \verb|a1| \dots \verb|an|. La largeur de ces barres est le nombre \verb|largbarres| qui vaut \verb|20bp| par défaut. +\end{description} + +\begin{exemple}[0.6] +repere(-0.5,5,1cm,-0.5,5,1cm); + path diag; + draw axey(1,1); + diag:=diagrammebarres((1,2),(2,4),(3,2),(4,1)); + fill diag withcolor cyan; + draw diag epaisseur 1 withcolor marine; + flecheaxe:=false; + draw axex(0,0); + boolgradxpart:=false; + draw axexpart.bot(1,"A",2,"B",3,"C",4,"D"); +fin +\end{exemple} + +\subsection{Probabilités} + +Quelques fonctions mathématiques sont proposées. Pour les grandes valeurs, on dépasse rapidement les capacités de \MP. Il est dans ce cas conseillé de compiler en utilisant la ligne de commande \verb|mpost -numbersystem="decimal" <fichier>.mp|. + + +\begin{description} +\item[factorielle(n)] Entier égal à $n!$. +\item[binom(n,k)] Entier égal à $\binom{n}{k}$. +\item[binomiale(n,p,k)] $P(X=k)$ pour $X$ suivant la loi binomiale de paramètres $n$ et $p$. +\item[diagrammebinomiale(n,p)] Diagramme en bâtons de la loi binomiale de paramètres $n$ et $p$. +\item[diagrammeuniforme(n,m)] Diagramme en bâtons de la loi uniforme discrète sur les entiers consécutifs de \verb|n| à \verb|m|. +\item[diagrammegeometrique(p)] Diagramme en bâtons de la loi géométrique de paramètre \verb|p|. +\item[diagrammepoisson(lambda)] Diagramme en bâtons de la loi de Poisson de moyenne \verb|lambda|. +\end{description} + + +\begin{exemple} +repere(-2,16,0.45cm,-0.1,0.25,15cm); +setall(0,16,0,0.25); +draw axex(1,1); +draw axey(0.1,0.1); +picture diag; +diampointsbatons:=0; +diag:=diagrammebinomiale(15,0.6); +draw diag withcolor vertfonce epaisseur 4; +fin; +\end{exemple} + +\begin{codecache} +diampointsbatons:=5; +\end{codecache} + +\begin{exemple} +repere.larg(-2,10,8cm,-0.1,0.5,6cm); + setall(0,10,0,0.5); + draw axex(1,1); + draw axey(0.05,0.05); + draw diagrammegeometrique(0.4) + epaisseur 2 couleur bleu; +fin; +\end{exemple} + +\begin{exemple} +repere(-2,16,0.45cm,-0.1,0.25,15cm); +setall(0,16,0,0.25); +draw axex(1,1); +draw axey(0.1,0.1); +picture diag; +diampointsbatons:=0; +diag:=diagrammepoisson(6); +draw diag withcolor orange epaisseur 4; +fin; +\end{exemple} + +\begin{description} +\item[densitenormale(mu,sigma,a,b)] Courbe représentant la densité de la loi normale de moyenne \verb|mu| et d'écart type \verb|sigma| entre \verb|a| et \verb|b|. Si \verb|a| et \verb|b| sont omis, le tracé est fait sur l'intervalle définissant le repère. +\item[densiteexponentielle(lambda)] Courbe représentant la densité de la loi normale de paramètre \verb|lambda|. +\end{description} + +\begin{codecache} +prefnomme:="top"; +\end{codecache} + +\begin{exemple}[0.45] +repere(-4,32,0.23cm,-0.01,0.12,46cm); + draw axex(2,2); + draw axey(0.02,0.02); + path C,d; + C=densitenormale(16,4); + fill souscourbe(C,0,14) couleur gris; + draw souscourbe(C,0,14); + draw C epaisseur 2 couleur rouge; + d=droite(16); + draw d dashed evenly; + drawarrow (5,0.06)--(11,0.02); + label.top("$P(X\leq 14)$",(5,0.06)); + nomme(d,"$\mu$"); +fin; +\end{exemple} + +\begin{exemple} +repere.larg(-1,9,8cm,-0.05,0.6,6cm); + setall(0,9,0,0.6); + draw axex(1,1); + draw axey(0.1,0.1); + path C,D; + C=densiteexponentielle(0.5); + D=densiteexponentielle(0.3); + draw C epaisseur 2 couleur rouge; + draw D epaisseur 2 couleur violet; +fin; +\end{exemple} + + +\section{Géométrie} +Certaines des macros suivantes sont largement inspirées des macros de \verb|geometriesyr16.mp| de Christophe \bsc{Poulain}. + +\subsection{Polygones} +\begin{description} +\item[polygone(A,B,C,...)] Chemin fermé représentant le polygone $ABC...$ + +\item[triangle(A,B,C)] Cas particulier du précédent. Chemin fermé représentant le triangle $ABC$. + +\item[parallélogramme(A,B,C)] Chemin fermé représentant $ABCD$ où $D$ est le quatrième point du parallélogramme. + +\item[polygoneregulier(A,B,n)] Chemin fermé représentant le polygone régulier de sens direct à $n$ côtés dont un des côtés est $[AB]$. + +\item[equilateral(A,B)] Cas particulier du précédent. Triangle équilatéral de sens direct de côté $[AB]$. + +\item[carre(A,B)] Autre cas particulier. Carré de sens direct de côté $[AB]$. + +\item[sommetpolygoneregulier(A,B,n,i)] Sommet numéro $i$ du polygone régulier à $n$ côtés dont un des côtés est $[AB]$. $A$ est le sommet numéro 1 et $B$ est le sommet numéro 2. +\end{description} + +\begin{exemple}[0.51] +repere(-1,5,1cm,-1,4,1cm); +draw axes(1,1); +pair A,B,C,D,E,F,G; +A=(0,1);B=(2,0);C=(4,2);D=(3,3);E=(1,3); +F=(4,0);G=(3,2); +fill triangle(A,F,G) withcolor orange; +draw triangle(A,F,G); +draw polygone(A,B,C,D,E); +draw parallelogramme(D,G,E) withcolor vert; +fin; +\end{exemple} + + +\begin{exemple}[0.53] +repere(-1,5,1cm,-1,4,1cm); +draw axes(1,1); +pair A,B,M; +A=(1,1);B=(3,0.5); +fill polygoneregulier(A,B,5) withcolor bleu; +fill equilateral(A,B) withcolor cyan; +draw polygoneregulier(A,B,5); +M=sommetpolygoneregulier(A,B,5,3); +nomme.rt(M); +draw equilateral(A,B); +fin; +\end{exemple} + +\subsection{Cercles et arcs} + +\begin{description} +\item[cercle(A,B,C)] Cercle circonscrit au triangle $ABC$. +\item[cercle(O,A)] Cercle de centre $O$ passant par $A$. +\item[cercle(O,r)] Cercle de centre $O$ et de rayon $r$. L'unité de longueur est l'unité de l'axe des abscisses. +\item[arccercle(A,O,B)] Arc de cercle de sens direct de centre $O$, passant par $A$ et s'appuyant sur la demi-droite $[OB)$. +\end{description} + + +\begin{exemple} +repere(-1,5,1cm,-0.5,4,1cm); +draw axes(1,1); +pair A,B,C; +A=(1,1);B=(2,0);C=(3.5,2); +nomme.lft(A);nomme.urt(C);nomme.top(B); +draw triangle(A,B,C) withcolor bleu; +draw cercle(A,B,C) withcolor marine; +draw A--B withcolor rouge epaisseur 1; +draw cercle(A,B) withcolor rouge; +fin; +\end{exemple} + + +\begin{exemple} +repere(-1,5,1cm,-2,8,0.5cm); +draw axes(1,1); +pair A,M,B; +A=(2,2);M=(2,6);B=(3,2); +nomme.bot(A);nomme.rt(B);nomme.top(M); +draw B--A--M; +draw cercle(A,2); +draw arccercle(B,A,M); +fin; +\end{exemple} + + + +\subsection{Codage des segments et des angles} + +\begin{description} +\item[marqueangle(A,O,B,n)] Figure formée de \verb|n| arcs de cercle de centre $O$ et de rayon moyen \verb|taille_marque_a| (qui vaut par défaut \verb|0.4cm|) permettant de marquer l'angle géométrique $\widehat{AOB}$. Les arcs son séparés de \verb|sep_marque_a| qui vaut par défaut \verb|1.5|. + +Il s'agit d'un chemin fermé qui peut donc être rempli. + +\item[marqueangle(A,O,B)] Arc de cercle de centre \verb|O| et de rayon \verb|taille_marque_a| permettant de marquer l'angle orienté avec \verb|drawarrow|. + +\item[nomme.pos(A,O,B,texte)] Place le texte entre \verb|A| et \verb|B|, à une distance \verb|taille_marque_a| du centre, à la position \verb|pos|. +\end{description} + + +\begin{exemple} +repere(-2,12,0.4cm,-2,10,0.4cm); +pair A,B,C; +A=(1,2);B=(11,2);C=(8,9); +draw axes(0,0); +draw triangle(A,B,C); +nomme.llft(A);nomme.lrt(B);nomme.top(C); +fill marqueangle(C,B,A,3) withcolor red; +draw marqueangle(C,B,A,3); +drawarrow marqueangle(A,C,B); +fill marqueangle(B,A,C,1) withcolor vert; +draw marqueangle(B,A,C,1); +nomme.rt(B,A,C,"\ang{45}"); +fin; +\end{exemple} + +\begin{description} +\item[marqueangledroit(A,O,B)] Chemin fermé permettant de marquer l'angle droit $\widehat{AOB}$ sous forme d'un losange (il s'agit donc d'un carré si l'angle est réellement droit). Le côté du losange est \verb|taille_marque_ad| et vaut \verb|0.3cm| par défaut. +\item[marquesegment(A,B,n)] Figure formées de \verb|n| marques sur le segment $[AB]$. Ces marques ont une taille de \verb|taille_marque_s| (\verb|0.3cm| par défaut), forment un angle en degrés de \verb|angle_marque_s| avec le segment (\verb|60| par défaut) et sont séparées de \verb|sep_marque_s| (\verb|2| par défaut). +\end{description} + +\begin{exemple}[0.6] +repere(-1,10,0.5cm,-1,9,0.5cm); +pair A,B,C,A',B',C',u; +A=(3,1);B=(5,2);C=(1,5);u=(3,3); +A'-A=B'-B=C'-C=u; +draw projectionaxes(A,"$x_A$","$y_A$") dashed evenly; +draw axes(0,0); +drawoptions(withcolor pourpre); +draw triangle(A,B,C);draw triangle(A',B',C'); +draw marqueangledroit(B,A,C); +draw marqueangledroit(B',A',C'); +draw marquesegment(B,C,2); +draw marquesegment(B',C',2); +nomme.llft(A);nomme.lrt(B);nomme.ulft(C); +nomme.llft(A');nomme.lrt(B');nomme.ulft(C'); +drawoptions(withcolor vertfonce); +draw vecteur.lrt(B,u);draw vecteur.lrt(C,u); +fin; +\end{exemple}% + \section{Divers} \subsection{Composition des étiquettes} -Tous les textes et étiquettes peuvent être composés en utilisant la macro ci-dessous. Cette macro utilise \verb+latexmp+ si ce fichier est chargé ou l'écriture dans un fichier externe (adaptation de la macro \verb+TEX+) dans le cas contraire. +Tous les textes et étiquettes peuvent être composés en utilisant la macro ci-dessous. \begin{description} - \item[LaTeX(ch)] \label{latex} Figure formée de la chaîne \verb+ch+ composée avec \LaTeX. Il est donc possible d'utiliser la macro \verb|decimal()| de \MP. + \item[LaTeX(ch)] \label{latex} Figure formée de la chaîne \verb+ch+ composée avec \LaTeX{} et mise à l'échelle \verb|defaultscale|. Cette macro utilise la commande \verb|textext| de \verb|luamplib| dans le cas de l'utilsation de Lua\LaTeX{} et \verb|textext| de \verb|latexmp| dans le cas d'une compilation \MP{} \og standard \fg. Ce dernier cas nécessite alors deux compilations. \end{description} \begin{exemple}[0.65] repere(-1,7,1cm,-1,1,1cm); for i=2 upto 6: -label(LaTeX("$\frac{1}{"&decimal(i)&"}$"),(i*cm,0)); +label(LaTeX("$\frac{1}{"&decimal(i)&"}$"),(i,0)); endfor fin; \end{exemple} +\begin{description} +\item[label.pos(fig,point)] Commande de \MP{} qui permet de placer la figure \verb|fig| au niveau du point \verb|point|. +\end{description} + +\begin{exemple}[0.55] +repere(-1,5,1cm,-1,4,1cm); +draw axes(1,1); +label.ulft("Abscisses",(5,0.1)); +label.lrt("Ordonnées",(0.1,4)); +label("$f(x)=\pi^2\sqrt{x}$",(2,2)); +fin; +\end{exemple} + +\begin{description} +\item[legende.pos(fig,p)] Figure formée du chemin \verb|p| dessiné avec une flèche et de la figure ou de la chaine \verb|fig| située à la position \verb|pos| par rapport au premier point du chemin. +\end{description} + +\begin{exemple}[0.6] +repere(-0.5,5,1cm,-0.5,4,1cm); + draw axes(1,1); + pair A,B; + A=(2,1);B=(2,2); + nomme.rt(A) couleur rouge; + nomme.top(B) couleur rouge; + legende.top("Le point $A$",(1,3){down}..{down}A); + legende.bot("Le point $B$",(4,1)--B); +fin; +\end{exemple} \subsection{Couleurs} Certaines couleurs sont définies par leur nom et peuvent être utilisées directement : @@ -1117,11 +1426,11 @@ path rectangle; save a,b,dech,decv; a:=25;b:=12;dech:=70;decv:=-20; - rectangle = (0,0)--(a,0)--(a,b)--(0,b)--cycle; + rectangle = ((0,0)--(a,0)--(a,b)--(0,b)--cycle) transformed inverse _T; vardef couleur(expr t)= image(% fill rectangle withcolor scantokens(t); - label.rt(LaTeX("\smash{" & t & "}"),(a,b/4)) + label.rt(LaTeX("\smash{" & t & "}"),(a,b/4) transformed inverse _T) ) enddef; draw couleur("rouge"); @@ -1151,6 +1460,54 @@ Toutes ces couleurs sont définies selon le modèle \og rgb \fg. Pour les obtenir selon le modèle \og cmyk \fg, remplacer la première lettre par une majuscule. + +\subsection{Remplissage} +Pour remplir des chemins fermés avec autre chose que de la couleur, \verb+repere+ permet l'utilisation de la syntaxe \verb+fill p avec motif+ où \verb+motif+ est un des motifs décrits ci-dessous. Cette instruction peut être complétée par des options de dessin (\verb+withpen+, \verb+withcolor+...). + +\begin{description} +\item[hachures(pas,angle)] hachures espacées de \verb+pas+ et formant un angle en degrés de \verb+angle+ avec l'horizontale. Si les valeurs sont omises, \verb|pas| vaut 5 et \verb+angle+ vaut 60. + + +\item[briques(larg,haut,dec)] briques de largeur \verb+larg+, de hauteur \verb+haut+ et décalées d'une ligne à l'autre de \verb+dec+. Si les valeurs sont omises, \verb|larg| vaut 12, \verb|haut| vaut 6 et \verb+dec+ vaut 6. + + +\item[vagues(per,amp,dec)] (d'après le manuel de l'utilisateur) \og vagues \fg{} de période \verb+per+, d'amplitude \verb+amp+ et décalées d'une ligne à l'autre de \verb+dec+. Si les valeurs sont omises, \verb|per| vaut 20, \verb|amp| vaut 3 et \verb+dec+ vaut 10. +\end{description} + + + +\begin{exemple}[0.55] +repere(-1.5,4.5,1cm,-1.5,7.5,1cm); +path c[];picture lab; +c1=fullcircle scaled 2.5; +for k=1 upto 6: + i:=(k-1) mod 2;j:=(k-1) div 2; + c[k]:=c1 shifted (3*i,3*j); +endfor; +fill c1 withcolor lime; +fill c1 avec hachures(10,30) dashed evenly; +fill c2 withcolor lime; +fill c2 avec hachures(); +fill c3 withcolor (0,0.65,0.8,0.48); +fill c3 avec briques(15,5,4); +fill c4 withcolor (0,0.65,0.8,0.48); +fill c4 avec briques(); +fill c5 withcolor (1,0,0,0.2); +fill c5 avec vagues(30,10,20) + withpen pencircle scaled 2; +fill c6 withcolor (1,0,0,0.2); +fill c6 avec vagues(); +for k=1 upto 6: + i:=(k-1) mod 2;j:=(k-1) div 2; + draw c[k]; + lab:=thelabel("c"&decimal(k),3*(i,j)); + unfill bbox lab;draw lab; +endfor; +fin; +\end{exemple} + + + \subsection{Figures pour une présentation} \begin{description} \item[figureinter] exporte la figure telle qu'elle est au moment où cette commande apparait. La numérotation est incrémentée et la figure peut continuer. @@ -1161,12 +1518,12 @@ repere(-3,3,0.7cm,-1,5,0.7cm); path C_f; vardef f(expr x)=x**2 enddef; - C_f=courbefonc(f,-3,3,50); + C_f= courbefonc(f)(); draw quadrillage(1,1); draw axes(1,1); draw cadre; figureinter; - draw courbepoints(f,-2,2,9) withcolor rouge; + draw courbepoints(f)(-2,2,9) withcolor rouge; figureinter; draw C_f withcolor bleu withpen pencircle scaled 1; fin; @@ -1193,6 +1550,9 @@ \end{minipage} \end{center} + + + \subsection{Code embarqué dans un document \LaTeX} Certains packages permettent d'écrire du code \MP{} directement dans un document \LaTeX. \verb|repere| est compatible avec, entre autres, \verb|emp| et \verb|mpgraphics|. @@ -1223,13 +1583,12 @@ \begin{document} \begin{empfile} \begin{empcmds} - input latexmp; input repere; \end{empcmds} \begin{emp}(0,0) - repere(-3,3,0.8cm,-2.5,2.5,1cm); - draw axes(1,1); - fin; + repere(-3,3,1cm,-2,2,1cm); + draw axes(1,1); + fin; \end{emp} \end{empfile} \end{document} @@ -1247,41 +1606,77 @@ \usepackage[runs=2]{mpgraphics} \begin{document} \begin{mpdefs} - input latexmp; input repere; \end{mpdefs} \begin{mpdisplay} - repere(-3,3,0.8cm,-2.5,2.5,1cm); - draw axes(1,1); - fin; + repere(-3,3,1cm,-2,2,1cm); + draw axes(1,1); + fin; \end{mpdisplay} \end{document} \end{lstlisting} \end{minipage} -\section{Exemples d'utilisation simultanée de \texttt{repere} et \texttt{geometriesyr}} +Il est aussi possible d'utiliser Lua\LaTeX{} avex le package \verb|luamplib|. Il faut alors charger les packages \verb|siunitx| et \verb|esvect| utilisés par \verb|repere|. -\label{exgeom}Il est possible, dans une figure créée avec \verb+repere+, d'utiliser certaines macros de \verb+geometriesyr+. Il faut alors charger \verb+geometriesyr+ \emph{avant} \verb|repere|. +\begin{center} +\begin{minipage}[t]{0.5\linewidth} +{\centering \textbf{Utilisation de Lua\LaTeX}\par} -\begin{exemple}[0.6] -repere(-1,10,0.5cm,-1,9,0.5cm); -pair A,B,C,A',B',C',u; -A=_c(3,1);B=_c(5,2);C=_c(1,5);u=_c(3,3); -A'-A=B'-B=C'-C=u; -draw projectionaxes(A,LaTeX("$x_A$"), - LaTeX("$y_A$")) dashed evenly; -draw axes(0,0); -drawoptions(withcolor pourpre); -draw triangle(A,B,C);draw triangle(A',B',C'); -draw codeperp(B,A,C,7);draw codeperp(B',A',C',7); -draw codesegments(B,C,B',C',2); -nomme.llft(A);nomme.lrt(B);nomme.ulft(C); -nomme.llft(A');nomme.lrt(B');nomme.ulft(C'); + +\verb|lualatex monfichier.tex| + +\begin{lstlisting}[frame=single,frameround=tttt,backgroundcolor=\color{LightSteelBlue},language={[LaTeX]TeX}] +\documentclass{article} +\usepackage{fontspec} +\usepackage{siunitx} +\usepackage{esvect} +\usepackage{luamplib} +\mplibnumbersystem{double} % Si nécessaire +\begin{document} +\everymplib{input repere;} +\begin{mplibcode} + repere(-3,3,1cm,-2,2,1cm); + draw axes(1,1); +fin; +\end{mplibcode} +\end{document} +\end{lstlisting} +\end{minipage} +\end{center} + +\section{Dessin à main levée avec \texttt{geometriesyr}} + +\label{exgeom}Il est possible, dans une figure créée avec \verb+repere+, d'utiliser le \og dessin à main levée \fg{} de \verb+geometriesyr+. Il faut alors charger \verb+geometriesyr+ \emph{avant} \verb|repere| et utiliser les fonctions de dessin telles que \verb|cercles|, \verb|triangle|... + +\begin{exemple} +repere(-0.5,5,1cm,-0.5,5,1cm); +pair A,B,C,D; +A=(0.5,0.5);B=(4,1);C=(3,4); +typetrace:="mainlevee"; +draw axes(1,1); +drawoptions(withcolor violet); +draw triangle(A,B,C); +nomme.llft(A);nomme.lrt(B); +nomme.top(C); +draw marqueangle(B,A,C,1); drawoptions(withcolor vertfonce); -draw vecteur.lrt(B,u);draw vecteur.lrt(C,u); +draw cercles(CentreCercleC(A,B,C),A); fin; -\end{exemple}% +\end{exemple} + + + +\begin{codecache} +end +\end{codecache} + +\makeatletter +\immediate\closeout\verbatim@out +\makeatother +\end{document} + \vspace{2em} @@ -1357,7 +1752,6 @@ \makeatletter \immediate\closeout\verbatim@out \makeatother -%\addtocontents{toc}{\protect\end{multicols}} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/repere.doc.tlpobj new/tlpkg/tlpobj/repere.doc.tlpobj --- old/tlpkg/tlpobj/repere.doc.tlpobj 2016-04-14 19:44:52.000000000 +0200 +++ new/tlpkg/tlpobj/repere.doc.tlpobj 2017-05-12 02:07:16.000000000 +0200 @@ -1,9 +1,9 @@ name repere.doc category Package -revision 32455 +revision 44298 shortdesc doc files of repere relocated 1 -docfiles size=165 - RELOC/doc/metapost/repere/README +docfiles size=179 + RELOC/doc/metapost/repere/README.md RELOC/doc/metapost/repere/repere-doc.pdf RELOC/doc/metapost/repere/repere-doc.tex ++++++ repere.tar.xz ++++++ ++++ 1904 lines of diff (skipped) ++++++ repltext.doc.tar.xz ++++++ ++++++ repltext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/repltext.tlpobj new/tlpkg/tlpobj/repltext.tlpobj --- old/tlpkg/tlpobj/repltext.tlpobj 2016-04-14 19:44:52.000000000 +0200 +++ new/tlpkg/tlpobj/repltext.tlpobj 2017-04-14 17:59:50.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/repltext/repltext.sty catalogue-ctan /macros/latex/contrib/repltext -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pdf-feat catalogue-version 1.0 ++++++ resphilosophica.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/Makefile new/doc/latex/resphilosophica/Makefile --- old/doc/latex/resphilosophica/Makefile 2015-08-23 23:43:54.000000000 +0200 +++ new/doc/latex/resphilosophica/Makefile 2017-03-28 22:37:59.000000000 +0200 @@ -3,7 +3,7 @@ # # This file is in public domain # -# $Id: Makefile,v 1.9 2015/01/16 17:56:02 boris Exp $ +# $Id: Makefile,v 1.10 2017/03/28 16:39:12 boris Exp $ # PACKAGE=resphilosophica diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/README new/doc/latex/resphilosophica/README --- old/doc/latex/resphilosophica/README 2015-11-16 00:38:50.000000000 +0100 +++ new/doc/latex/resphilosophica/README 2017-03-28 22:37:59.000000000 +0200 @@ -7,6 +7,12 @@ Changes + version 1.31 Changed formatting of doi according to the new rules + + version 1.30 Allowed URLs to be split on hyphens + + version 1.29 Added \manuscriptid and used it to form doi + version 1.28 Commands enquote and ensquote work correctly in the case of embedded quotations Binary files old/doc/latex/resphilosophica/resphilosophica.pdf and new/doc/latex/resphilosophica/resphilosophica.pdf differ Binary files old/doc/latex/resphilosophica/rpsample.pdf and new/doc/latex/resphilosophica/rpsample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/rpsample.tex new/doc/latex/resphilosophica/rpsample.tex --- old/doc/latex/resphilosophica/rpsample.tex 2015-11-16 00:38:50.000000000 +0100 +++ new/doc/latex/resphilosophica/rpsample.tex 2016-12-17 22:01:05.000000000 +0100 @@ -14,6 +14,7 @@ \publicationmonth[Jan--Feb]{January--February} \papernumber{2} \onlinedate{January 1 2013} +\manuscriptid{A31245} %\doinumber{} \paperUrl{http://borisv.lk.net/paper12} \author{Boris Veytsman} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.doc.tlpobj new/tlpkg/tlpobj/resphilosophica.doc.tlpobj --- old/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2016-04-14 19:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2017-04-14 17:59:50.000000000 +0200 @@ -1,6 +1,6 @@ name resphilosophica.doc category Package -revision 38862 +revision 43631 shortdesc doc files of resphilosophica relocated 1 docfiles size=139 ++++++ resphilosophica.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/resphilosophica/resphilosophica.bst new/bibtex/bst/resphilosophica/resphilosophica.bst --- old/bibtex/bst/resphilosophica/resphilosophica.bst 2015-11-16 00:38:50.000000000 +0100 +++ new/bibtex/bst/resphilosophica/resphilosophica.bst 2017-03-28 22:37:59.000000000 +0200 @@ -1738,7 +1738,7 @@ write$ newline$ "\providecommand{\urlprefix}{}" write$ newline$ - "\providecommand{\doi}[1]{\url{http://dx.doi.org/#1}}" + "\providecommand{\doi}[1]{\url{https://doi.org/#1}}" write$ newline$ "\makeatletter\newif\if@suppresscomma\@suppresscommafalse" write$ newline$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/resphilosophica/resphilosophica.cls new/tex/latex/resphilosophica/resphilosophica.cls --- old/tex/latex/resphilosophica/resphilosophica.cls 2015-11-16 00:38:50.000000000 +0100 +++ new/tex/latex/resphilosophica/resphilosophica.cls 2017-03-28 22:37:59.000000000 +0200 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{resphilosophica} -[2015/11/14 v1.28 Typesetting articles for Res Philosophica] +[2017/03/28 v1.31 Typesetting articles for Res Philosophica] \RequirePackage{xkeyval} \newif\ifRESP@fontauto \RESP@fontautotrue @@ -75,6 +75,7 @@ \LoadClass[noamsfonts,twoside]{amsart} \RequirePackage{microtype, fancyhdr, xcolor, lastpage, collect} \RequirePackage[bottom,multiple]{footmisc} +\PassOptionsToPackage{hyphens}{url} \RequirePackage[hyperfootnotes=false]{hyperref} \urlstyle{rm} \ifRESP@manuscript\hypersetup{colorlinks,allcolors=blue}\else @@ -209,8 +210,14 @@ \publicationmonth{} \def\papernumber#1{\def\currentpaper{#1}} \papernumber{0000} +\def\manuscriptid#1{\gdef\@manuscriptid{#1}} +\manuscriptid{} \def\doinumber#1{\gdef\@doinumber{#1}} -\doinumber{10.11612/resphil.\currentyear.\currentvolume.\currentissue.\currentpaper} +\doinumber{\ifx\@manuscriptid\@empty + 10.11612/resphil.\currentyear.\currentvolume.\currentissue.\currentpaper + \else + 10.11612/resphil.\@manuscriptid + \fi} \def\paperUrl#1{\gdef\@paperUrl{#1}} \paperUrl{} \def\startpage#1{\pagenumbering{arabic}\setcounter{page}{#1}% @@ -525,7 +532,7 @@ \def\Hy@endcolorlink{\endgroup}% \color{#1}##1\egroup}}% \fi} -\def\doi#1{\url{http://dx.doi.org/#1}} +\def\doi#1{\url{https://doi.org/#1}} \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} \def\@makefntext{\noindent\@makefnmark \if@enddoc\else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.tlpobj new/tlpkg/tlpobj/resphilosophica.tlpobj --- old/tlpkg/tlpobj/resphilosophica.tlpobj 2016-04-14 19:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/resphilosophica.tlpobj 2017-04-14 17:59:50.000000000 +0200 @@ -1,6 +1,6 @@ name resphilosophica category Package -revision 38862 +revision 43631 shortdesc Typeset articles for the journal Res Philosophica relocated 1 longdesc The bundle provides a class for typesetting articles for the @@ -10,7 +10,7 @@ RELOC/bibtex/bst/resphilosophica/resphilosophica.bst RELOC/tex/latex/resphilosophica/resphilosophica.cls catalogue-ctan /macros/latex/contrib/resphilosophica -catalogue-date 2015-11-15 07:10:16 +0100 +catalogue-date 2017-03-28 20:59:52 +0200 catalogue-license lppl1.3 catalogue-topics journalpub class -catalogue-version 1.28 +catalogue-version 1.31 ++++++ resumecls.doc.tar.xz ++++++ ++++++ resumecls.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resumecls.tlpobj new/tlpkg/tlpobj/resumecls.tlpobj --- old/tlpkg/tlpobj/resumecls.tlpobj 2016-04-14 19:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/resumecls.tlpobj 2017-04-14 17:59:50.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/xelatex/resumecls/resumecls.cls catalogue-ctan /macros/xetex/latex/resumecls -catalogue-date 2015-09-20 22:08:14 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv chinese class catalogue-version 0.3.2 ++++++ resumemac.doc.tar.xz ++++++ ++++++ resumemac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resumemac.tlpobj new/tlpkg/tlpobj/resumemac.tlpobj --- old/tlpkg/tlpobj/resumemac.tlpobj 2016-04-14 19:44:53.000000000 +0200 +++ new/tlpkg/tlpobj/resumemac.tlpobj 2017-04-14 17:59:50.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=2 RELOC/tex/plain/resumemac/resumemac.tex catalogue-ctan /macros/plain/contrib/resumemac -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics cv plain-ext ++++++ reverxii.doc.tar.xz ++++++ ++++++ revtex.doc.tar.xz ++++++ ++++++ revtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/revtex.tlpobj new/tlpkg/tlpobj/revtex.tlpobj --- old/tlpkg/tlpobj/revtex.tlpobj 2016-04-14 19:44:59.000000000 +0200 +++ new/tlpkg/tlpobj/revtex.tlpobj 2017-04-14 17:59:52.000000000 +0200 @@ -28,7 +28,7 @@ RELOC/tex/latex/revtex/revtex4-1.cls catalogue-also revtex4-0 catalogue-ctan /macros/latex/contrib/revtex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics physics journalpub catalogue-version 4.1r ++++++ revtex4.doc.tar.xz ++++++ ++++++ revtex4.tar.xz ++++++ ++++++ ribbonproofs.doc.tar.xz ++++++ ++++++ ribbonproofs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ribbonproofs.tlpobj new/tlpkg/tlpobj/ribbonproofs.tlpobj --- old/tlpkg/tlpobj/ribbonproofs.tlpobj 2016-04-14 19:45:02.000000000 +0200 +++ new/tlpkg/tlpobj/ribbonproofs.tlpobj 2017-04-14 17:59:53.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=14 RELOC/tex/latex/ribbonproofs/ribbonproofs.sty catalogue-ctan /macros/latex/contrib/ribbonproofs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics proof catalogue-version 1.0 ++++++ rjlparshap.doc.tar.xz ++++++ ++++++ rjlparshap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rjlparshap.tlpobj new/tlpkg/tlpobj/rjlparshap.tlpobj --- old/tlpkg/tlpobj/rjlparshap.tlpobj 2016-04-14 19:45:03.000000000 +0200 +++ new/tlpkg/tlpobj/rjlparshap.tlpobj 2017-04-14 17:59:54.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/rjlparshap/rjlpshap.sty catalogue-ctan /macros/latex/contrib/rjlparshap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics micro-layout catalogue-version 1.0

1 0

commit texlive-specs-s for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-s for openSUSE:Factory checked in at 2017-06-25 19:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-s (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-s.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-s" Sun Jun 25 19:22:30 2017 rev:26 rq:504809 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.changes 2017-06-08 14:56:04.141740750 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-s.new/texlive-specs-s.changes 2017-06-25 19:28:17.288099062 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- pst-ovl.doc.tar.xz pst-ovl.tar.xz pst-pad.doc.tar.xz pst-pad.tar.xz pst-pdf.doc.tar.xz pst-pdf.tar.xz pst-pdgr.doc.tar.xz pst-pdgr.tar.xz pst-perspective.doc.tar.xz pst-perspective.tar.xz pst-platon.doc.tar.xz pst-platon.tar.xz pst-plot.doc.tar.xz pst-plot.tar.xz pst-poly.doc.tar.xz pst-poly.tar.xz pst-pulley.doc.tar.xz pst-pulley.tar.xz pst-qtree.doc.tar.xz pst-qtree.tar.xz pst-rubans.doc.tar.xz pst-rubans.tar.xz pst-sigsys.doc.tar.xz pst-sigsys.tar.xz pst-slpe.doc.tar.xz pst-slpe.tar.xz pst-solarsystem.doc.tar.xz pst-solarsystem.tar.xz pst-solides3d.doc.tar.xz pst-solides3d.tar.xz pst-soroban.doc.tar.xz pst-soroban.tar.xz pst-spectra.doc.tar.xz pst-spectra.tar.xz pst-spirograph.doc.tar.xz pst-spirograph.tar.xz pst-stru.doc.tar.xz pst-stru.tar.xz pst-support.doc.tar.xz pst-text.doc.tar.xz pst-text.tar.xz pst-thick.doc.tar.xz pst-thick.tar.xz pst-tools.doc.tar.xz pst-tools.tar.xz pst-tree.doc.tar.xz pst-tree.tar.xz pst-tvz.doc.tar.xz pst-tvz.tar.xz pst-uml.doc.tar.xz pst-uml.tar.xz pst-vectorian.doc.tar.xz pst-vectorian.tar.xz pst-vowel.doc.tar.xz pst-vowel.tar.xz pst-vue3d.doc.tar.xz pst-vue3d.tar.xz pst2pdf.doc.tar.xz pst2pdf.tar.xz pstool.doc.tar.xz pstool.tar.xz pstools.doc.tar.xz pstools.tar.xz pstricks-add.doc.tar.xz pstricks-add.tar.xz pstricks-examples-en.doc.tar.xz pstricks-examples.doc.tar.xz pstricks.doc.tar.xz pstricks.tar.xz pstricks_calcnotes.doc.tar.xz psu-thesis.doc.tar.xz psu-thesis.tar.xz ptex-base.doc.tar.xz ptex-base.tar.xz ptex-fonts.doc.tar.xz ptex-fonts.tar.xz ptex.doc.tar.xz ptex.tar.xz ptex2pdf.doc.tar.xz ptex2pdf.tar.xz ptext.doc.tar.xz ptext.tar.xz ptptex.doc.tar.xz ptptex.tar.xz punk-latex.doc.tar.xz punk-latex.tar.xz punk.doc.tar.xz punk.tar.xz punknova.doc.tar.xz punknova.tar.xz purifyeps.doc.tar.xz purifyeps.tar.xz pxbase.doc.tar.xz pxbase.tar.xz pxchfon.doc.tar.xz pxchfon.tar.xz pxcjkcat.doc.tar.xz pxcjkcat.tar.xz pxfonts.doc.tar.xz pxfonts.tar.xz pxgreeks.doc.tar.xz pxgreeks.tar.xz pxjahyper.doc.tar.xz pxjahyper.tar.xz pxpgfmark.doc.tar.xz pxpgfmark.tar.xz pxrubrica.doc.tar.xz pxrubrica.tar.xz pxtxalfa.doc.tar.xz pxtxalfa.tar.xz pygmentex.doc.tar.xz pygmentex.tar.xz python.doc.tar.xz python.tar.xz pythontex.doc.tar.xz pythontex.tar.xz New: ---- placeins-plain.tar.xz plain-doc.doc.tar.xz plain.tar.xz plainpkg.doc.tar.xz plainpkg.tar.xz plantslabels.doc.tar.xz plantslabels.tar.xz plari.doc.tar.xz plari.tar.xz plates.doc.tar.xz plates.tar.xz platex-tools.doc.tar.xz platex-tools.tar.xz platex.doc.tar.xz platex.tar.xz platexcheat.doc.tar.xz play.doc.tar.xz play.tar.xz playfair.doc.tar.xz playfair.tar.xz plipsum.doc.tar.xz plipsum.tar.xz plnfss.doc.tar.xz plnfss.tar.xz plstmary.doc.tar.xz plstmary.tar.xz plweb.doc.tar.xz plweb.tar.xz pmgraph.doc.tar.xz pmgraph.tar.xz pmx.doc.tar.xz pmx.tar.xz pmxchords.doc.tar.xz pmxchords.tar.xz pnas2009.tar.xz poemscol.doc.tar.xz poemscol.tar.xz poetrytex.doc.tar.xz poetrytex.tar.xz polski.doc.tar.xz polski.tar.xz poltawski.doc.tar.xz poltawski.tar.xz polyglossia.doc.tar.xz polyglossia.tar.xz polynom.doc.tar.xz polynom.tar.xz polynomial.doc.tar.xz polynomial.tar.xz polytable.doc.tar.xz polytable.tar.xz postcards.doc.tar.xz postcards.tar.xz poster-mac.doc.tar.xz poster-mac.tar.xz powerdot-FUBerlin.doc.tar.xz powerdot-FUBerlin.tar.xz powerdot.doc.tar.xz powerdot.tar.xz ppr-prv.doc.tar.xz ppr-prv.tar.xz pracjourn.doc.tar.xz pracjourn.tar.xz preprint.doc.tar.xz preprint.tar.xz prerex.doc.tar.xz prerex.tar.xz present.doc.tar.xz present.tar.xz presentations-en.doc.tar.xz presentations.doc.tar.xz pressrelease.doc.tar.xz pressrelease.tar.xz prettyref.doc.tar.xz prettyref.tar.xz preview.doc.tar.xz preview.tar.xz prftree.doc.tar.xz prftree.tar.xz printlen.doc.tar.xz printlen.tar.xz proba.doc.tar.xz proba.tar.xz probsoln.doc.tar.xz probsoln.tar.xz procIAGssymp.doc.tar.xz procIAGssymp.tar.xz prodint.doc.tar.xz prodint.tar.xz productbox.doc.tar.xz productbox.tar.xz program.doc.tar.xz program.tar.xz progress.doc.tar.xz progress.tar.xz progressbar.doc.tar.xz progressbar.tar.xz proofread.doc.tar.xz proofread.tar.xz prooftrees.doc.tar.xz prooftrees.tar.xz properties.doc.tar.xz properties.tar.xz proposal.doc.tar.xz proposal.tar.xz prosper.doc.tar.xz prosper.tar.xz protex.doc.tar.xz protex.tar.xz protocol.doc.tar.xz protocol.tar.xz przechlewski-book.doc.tar.xz przechlewski-book.tar.xz ps2pk.doc.tar.xz psbao.doc.tar.xz psbao.tar.xz pseudocode.doc.tar.xz pseudocode.tar.xz pst-arrow.doc.tar.xz pst-arrow.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-s.spec ++++++ ++++ 25395 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-s.new/texlive-specs-s.spec ++++++ pst-support.doc.tar.xz -> pseudocode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/README new/doc/generic/pst-support/README --- old/doc/generic/pst-support/README 2009-02-06 19:45:39.000000000 +0100 +++ new/doc/generic/pst-support/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -Standard_transparency.joboptions - File for the Distiller to make the transparency - work with \usepackage[distiller]{pstricks} - Put the file into \Adobe\ADOBE PDF\Settings\ or - any similiar directory. - -latex-ps-pdf.tco - TeXnicCenter profile for running - latex->dvips->ps2pdf on a LaTeX file - -latex-pstpdf-pdf.tco - TeXnicCenter profile for running - latex->dvips->pdflatex on a LaTeX file - but with using the package pst-pdf - -pdflatex-autopstpdf.tco - TeXnicCenter profile for running - pdflatex on a LaTeX file but with using - the package auto-pst-pdf and an enabled - --enable-write18 option for MiKTeX - - ----- -All files are LPPL - -thanks to Thorsten \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/Standard_transparency.joboptions new/doc/generic/pst-support/Standard_transparency.joboptions --- old/doc/generic/pst-support/Standard_transparency.joboptions 2009-02-06 19:45:39.000000000 +0100 +++ new/doc/generic/pst-support/Standard_transparency.joboptions 1970-01-01 01:00:00.000000000 +0100 @@ -1,232 +0,0 @@ -<< - /ASCII85EncodePages false - /AllowTransparency true - /AutoPositionEPSFiles true - /AutoRotatePages /All - /Binding /Left - /CalGrayProfile (Gray Gamma 2.2) - /CalRGBProfile (sRGB IEC61966-2.1) - /CalCMYKProfile (U.S. Web Coated \050SWOP\051 v2) - /sRGBProfile (sRGB IEC61966-2.1) - /CannotEmbedFontPolicy /Warning - /CompatibilityLevel 1.4 - /CompressObjects /Tags - /CompressPages true - /ConvertImagesToIndexed true - /PassThroughJPEGImages true - /CreateJobTicket false - /DefaultRenderingIntent /Default - /DetectBlends true - /DetectCurves 0.1000 - /ColorConversionStrategy /sRGB - /DoThumbnails false - /EmbedAllFonts true - /EmbedOpenType false - /ParseICCProfilesInComments true - /EmbedJobOptions false - /DSCReportingLevel 0 - /EmitDSCWarnings false - /EndPage -1 - /ImageMemory 1048576 - /LockDistillerParams false - /MaxSubsetPct 100 - /Optimize true - /OPM 1 - /ParseDSCComments true - /ParseDSCCommentsForDocInfo true - /PreserveCopyPage true - /PreserveDICMYKValues true - /PreserveEPSInfo false - /PreserveFlatness true - /PreserveHalftoneInfo false - /PreserveOPIComments false - /PreserveOverprintSettings true - /StartPage 1 - /SubsetFonts true - /TransferFunctionInfo /Apply - /UCRandBGInfo /Remove - /UsePrologue false - /ColorSettingsFile () - /AlwaysEmbed [ true - ] - /NeverEmbed [ true - /Arial-Black - /Arial-BlackItalic - /Arial-BoldItalicMT - /Arial-BoldMT - /Arial-ItalicMT - /ArialMT - /ArialNarrow - /ArialNarrow-Bold - /ArialNarrow-BoldItalic - /ArialNarrow-Italic - /ArialUnicodeMS - /CenturyGothic - /CenturyGothic-Bold - /CenturyGothic-BoldItalic - /CenturyGothic-Italic - /CourierNewPS-BoldItalicMT - /CourierNewPS-BoldMT - /CourierNewPS-ItalicMT - /CourierNewPSMT - /Georgia - /Georgia-Bold - /Georgia-BoldItalic - /Georgia-Italic - /Impact - /LucidaConsole - /Tahoma - /Tahoma-Bold - /TimesNewRomanMT-ExtraBold - /TimesNewRomanPS-BoldItalicMT - /TimesNewRomanPS-BoldMT - /TimesNewRomanPS-ItalicMT - /TimesNewRomanPSMT - /Trebuchet-BoldItalic - /TrebuchetMS - /TrebuchetMS-Bold - /TrebuchetMS-Italic - /Verdana - /Verdana-Bold - /Verdana-BoldItalic - /Verdana-Italic - ] - /AntiAliasColorImages false - /CropColorImages true - /ColorImageMinResolution 150 - /ColorImageMinResolutionPolicy /OK - /DownsampleColorImages true - /ColorImageDownsampleType /Bicubic - /ColorImageResolution 150 - /ColorImageDepth -1 - /ColorImageMinDownsampleDepth 1 - /ColorImageDownsampleThreshold 1.50000 - /EncodeColorImages true - /ColorImageFilter /DCTEncode - /AutoFilterColorImages true - /ColorImageAutoFilterStrategy /JPEG - /ColorACSImageDict << - /QFactor 0.76 - /HSamples [2 1 1 2] /VSamples [2 1 1 2] - >> - /ColorImageDict << - /QFactor 0.76 - /HSamples [2 1 1 2] /VSamples [2 1 1 2] - >> - /JPEG2000ColorACSImageDict << - /TileWidth 256 - /TileHeight 256 - /Quality 15 - >> - /JPEG2000ColorImageDict << - /TileWidth 256 - /TileHeight 256 - /Quality 15 - >> - /AntiAliasGrayImages false - /CropGrayImages true - /GrayImageMinResolution 150 - /GrayImageMinResolutionPolicy /OK - /DownsampleGrayImages true - /GrayImageDownsampleType /Bicubic - /GrayImageResolution 150 - /GrayImageDepth -1 - /GrayImageMinDownsampleDepth 2 - /GrayImageDownsampleThreshold 1.50000 - /EncodeGrayImages true - /GrayImageFilter /DCTEncode - /AutoFilterGrayImages true - /GrayImageAutoFilterStrategy /JPEG - /GrayACSImageDict << - /QFactor 0.76 - /HSamples [2 1 1 2] /VSamples [2 1 1 2] - >> - /GrayImageDict << - /QFactor 0.76 - /HSamples [2 1 1 2] /VSamples [2 1 1 2] - >> - /JPEG2000GrayACSImageDict << - /TileWidth 256 - /TileHeight 256 - /Quality 15 - >> - /JPEG2000GrayImageDict << - /TileWidth 256 - /TileHeight 256 - /Quality 15 - >> - /AntiAliasMonoImages false - /CropMonoImages true - /MonoImageMinResolution 1200 - /MonoImageMinResolutionPolicy /OK - /DownsampleMonoImages true - /MonoImageDownsampleType /Bicubic - /MonoImageResolution 1200 - /MonoImageDepth -1 - /MonoImageDownsampleThreshold 1.50000 - /EncodeMonoImages true - /MonoImageFilter /CCITTFaxEncode - /MonoImageDict << - /K -1 - >> - /AllowPSXObjects true - /CheckCompliance [ - /None - ] - /PDFX1aCheck false - /PDFX3Check false - /PDFXCompliantPDFOnly false - /PDFXNoTrimBoxError true - /PDFXTrimBoxToMediaBoxOffset [ - 0.00000 - 0.00000 - 0.00000 - 0.00000 - ] - /PDFXSetBleedBoxToMediaBox true - /PDFXBleedBoxToTrimBoxOffset [ - 0.00000 - 0.00000 - 0.00000 - 0.00000 - ] - /PDFXOutputIntentProfile (None) - /PDFXOutputConditionIdentifier () - /PDFXOutputCondition () - /PDFXRegistryName () - /PDFXTrapped /False - - /CreateJDFFile false - /Description << - /ARA <FEFF06270633062A062E062F0645002006470630064700200627064406250639062F0627062F0627062A002006440625064606340627062100200648062B062706260642002000410064006F00620065002000500044004600200645062A064806270641064206290020064506390020064506420627064A064A0633002006390631063600200648063706280627063906290020062706440648062B0627062606420020062706440645062A062F062706480644062900200641064A00200645062C062706440627062A002006270644062306390645062706440020062706440645062E062A064406410629061B0020064A06450643064600200641062A062D00200648062B0627062606420020005000440046002006270644064506460634062306290020062806270633062A062E062F062706450020004100630072006F0062006100740020064800410064006F006200650020005200650061006400650072002006250635062F0627063100200035002E0030002006480627064406250635062F062706310627062A0020062706440623062D062F062B002E> - /CHS <FEFF4f7f75288fd94e9b8bbe5b9a521b5efa7684002000410064006f006200650020005000440046002065876863900275284e8e55464e1a65876863768467e5770b548c62535370300260a853ef4ee54f7f75280020004100630072006f0062006100740020548c002000410064006f00620065002000520065006100640065007200200035002e003000204ee553ca66f49ad87248672c676562535f00521b5efa768400200050004400460020658768633002> - /CHT <FEFF4f7f752890194e9b8a2d7f6e5efa7acb7684002000410064006f006200650020005000440046002065874ef69069752865bc666e901a554652d965874ef6768467e5770b548c52175370300260a853ef4ee54f7f75280020004100630072006f0062006100740020548c002000410064006f00620065002000520065006100640065007200200035002e003000204ee553ca66f49ad87248672c4f86958b555f5df25efa7acb76840020005000440046002065874ef63002> - /CZE <FEFF005400610074006f0020006e006100730074006100760065006e00ed00200070006f0075017e0069006a007400650020006b0020007600790074007600e101590065006e00ed00200064006f006b0075006d0065006e0074016f002000410064006f006200650020005000440046002000760068006f0064006e00fd00630068002000700072006f002000730070006f006c00650068006c0069007600e90020007a006f006200720061007a006f007600e1006e00ed002000610020007400690073006b0020006f006200630068006f0064006e00ed0063006800200064006f006b0075006d0065006e0074016f002e002000200056007900740076006f01590065006e00e900200064006f006b0075006d0065006e007400790020005000440046002000620075006400650020006d006f017e006e00e90020006f007400650076015900ed007400200076002000700072006f006700720061006d0065006300680020004100630072006f00620061007400200061002000410064006f00620065002000520065006100640065007200200035002e0030002000610020006e006f0076011b006a016100ed00630068002e> - /DAN <FEFF004200720075006700200069006e0064007300740069006c006c0069006e006700650072006e0065002000740069006c0020006100740020006f007000720065007400740065002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e007400650072002c0020006400650072002000650067006e006500720020007300690067002000740069006c00200064006500740061006c006a006500720065007400200073006b00e60072006d007600690073006e0069006e00670020006f00670020007500640073006b007200690076006e0069006e006700200061006600200066006f0072007200650074006e0069006e006700730064006f006b0075006d0065006e007400650072002e0020004400650020006f007000720065007400740065006400650020005000440046002d0064006f006b0075006d0065006e0074006500720020006b0061006e002000e50062006e00650073002000690020004100630072006f00620061007400200065006c006c006500720020004100630072006f006200610074002000520065006100640065007200200035002e00300020006f00670020006e0079006500720065002e> - /DEU <FEFF00560065007200770065006e00640065006e0020005300690065002000640069006500730065002000450069006e007300740065006c006c0075006e00670065006e0020007a0075006d002000450072007300740065006c006c0065006e00200076006f006e002000410064006f006200650020005000440046002d0044006f006b0075006d0065006e00740065006e002c00200075006d002000650069006e00650020007a0075007600650072006c00e40073007300690067006500200041006e007a006500690067006500200075006e00640020004100750073006700610062006500200076006f006e00200047006500730063006800e40066007400730064006f006b0075006d0065006e00740065006e0020007a0075002000650072007a00690065006c0065006e002e00200044006900650020005000440046002d0044006f006b0075006d0065006e007400650020006b00f6006e006e0065006e0020006d006900740020004100630072006f00620061007400200075006e0064002000520065006100640065007200200035002e003000200075006e00640020006800f600680065007200200067006500f600660066006e00650074002000770065007200640065006e002e> - /ESP <FEFF005500740069006c0069006300650020006500730074006100200063006f006e0066006900670075007200610063006900f3006e0020007000610072006100200063007200650061007200200064006f00630075006d0065006e0074006f0073002000640065002000410064006f00620065002000500044004600200061006400650063007500610064006f007300200070006100720061002000760069007300750061006c0069007a00610063006900f3006e0020006500200069006d0070007200650073006900f3006e00200064006500200063006f006e006600690061006e007a006100200064006500200064006f00630075006d0065006e0074006f007300200063006f006d00650072006300690061006c00650073002e002000530065002000700075006500640065006e00200061006200720069007200200064006f00630075006d0065006e0074006f00730020005000440046002000630072006500610064006f007300200063006f006e0020004100630072006f006200610074002c002000410064006f00620065002000520065006100640065007200200035002e003000200079002000760065007200730069006f006e0065007300200070006f00730074006500720069006f007200650073002e> - /FRA <FEFF005500740069006c006900730065007a00200063006500730020006f007000740069006f006e00730020006100660069006e00200064006500200063007200e900650072002000640065007300200064006f00630075006d0065006e00740073002000410064006f006200650020005000440046002000700072006f00660065007300730069006f006e006e0065006c007300200066006900610062006c0065007300200070006f007500720020006c0061002000760069007300750061006c00690073006100740069006f006e0020006500740020006c00270069006d007000720065007300730069006f006e002e0020004c0065007300200064006f00630075006d0065006e00740073002000500044004600200063007200e900e90073002000700065007500760065006e0074002000ea0074007200650020006f007500760065007200740073002000640061006e00730020004100630072006f006200610074002c002000610069006e00730069002000710075002700410064006f00620065002000520065006100640065007200200035002e0030002000650074002000760065007200730069006f006e007300200075006c007400e90072006900650075007200650073002e> - /GRE <FEFF03a703c103b703c303b903bc03bf03c003bf03b903ae03c303c403b5002003b103c503c403ad03c2002003c403b903c2002003c103c503b803bc03af03c303b503b903c2002003b303b903b1002003bd03b1002003b403b703bc03b903bf03c503c103b303ae03c303b503c403b5002003ad03b303b303c103b103c603b1002000410064006f006200650020005000440046002003ba03b103c403ac03bb03bb03b703bb03b1002003b303b903b1002003b103be03b903cc03c003b903c303c403b7002003c003c103bf03b203bf03bb03ae002003ba03b103b9002003b503ba03c403cd03c003c903c303b7002003b503c003b903c703b503b903c103b703bc03b103c403b903ba03ce03bd002003b503b303b303c103ac03c603c903bd002e0020002003a403b10020005000440046002003ad03b303b303c103b103c603b1002003c003bf03c5002003ad03c703b503c403b5002003b403b703bc03b903bf03c503c103b303ae03c303b503b9002003bc03c003bf03c103bf03cd03bd002003bd03b1002003b103bd03bf03b903c703c403bf03cd03bd002003bc03b5002003c403bf0020004100630072006f006200610074002c002003c403bf002000410064006f00620065002000520065006100640065007200200035002e0030002003ba03b103b9002003bc03b503c403b103b303b503bd03ad03c303c403b503c103b503c2002003b503ba03b403cc03c303b503b903c2002e> - /HEB <FEFF05D405E905EA05DE05E905D5002005D105D405D205D305E805D505EA002005D005DC05D4002005DB05D305D9002005DC05D905E605D505E8002005DE05E105DE05DB05D9002000410064006F006200650020005000440046002005E205D105D505E8002005D405E605D205D4002005D505D405D305E405E105D4002005D005DE05D905E005D4002005E905DC002005DE05E105DE05DB05D905DD002005E205E105E705D905D905DD002E002005DE05E105DE05DB05D90020005000440046002005E905E005D505E605E805D5002005E005D905EA05E005D905DD002005DC05E405EA05D905D705D4002005D105D005DE05E605E205D505EA0020004100630072006F006200610074002005D5002D00410064006F00620065002000520065006100640065007200200035002E0030002005D505D205E805E105D005D505EA002005DE05EA05E705D305DE05D505EA002005D905D505EA05E8002E05D905D505EA05E8002E002D0033002C002005E205D905D905E005D5002005D105DE05D305E805D905DA002005DC05DE05E905EA05DE05E9002005E905DC0020004100630072006F006200610074002E002005DE05E105DE05DB05D90020005000440046002005E905E005D505E605E805D5002005E005D905EA05E005D905DD002005DC05E405EA05D905D705D4002005D105D005DE05E605E205D505EA0020004100630072006F006200610074002005D5002D00410064006F00620065002000520065006100640065007200200035002E0030002005D505D205E805E105D005D505EA002005DE05EA05E705D305DE05D505EA002005D905D505EA05E8002E> - /HRV (Za stvaranje Adobe PDF dokumenata pogodnih za pouzdani prikaz i ispis poslovnih dokumenata koristite ove postavke. Stvoreni PDF dokumenti mogu se otvoriti Acrobat i Adobe Reader 5.0 i kasnijim verzijama.) - /HUN <FEFF00410020006800690076006100740061006c006f007300200064006f006b0075006d0065006e00740075006d006f006b0020006d00650067006200ed007a00680061007400f30020006d0065006700740065006b0069006e007400e9007300e900720065002000e900730020006e0079006f006d00740061007400e1007300e10072006100200073007a00e1006e0074002000410064006f00620065002000500044004600200064006f006b0075006d0065006e00740075006d006f006b0061007400200065007a0065006b006b0065006c0020006100200062006500e1006c006c00ed007400e10073006f006b006b0061006c00200068006f007a006800610074006a00610020006c00e9007400720065002e0020002000410020006c00e90074007200650068006f007a006f00740074002000500044004600200064006f006b0075006d0065006e00740075006d006f006b00200061007a0020004100630072006f006200610074002000e9007300200061007a002000410064006f00620065002000520065006100640065007200200035002e0030002c0020007600610067007900200061007a002000610074007400f3006c0020006b00e9007301510062006200690020007600650072007a006900f3006b006b0061006c0020006e00790069007400680061007400f3006b0020006d00650067002e> - /ITA (Utilizzare queste impostazioni per creare documenti Adobe PDF adatti per visualizzare e stampare documenti aziendali in modo affidabile. I documenti PDF creati possono essere aperti con Acrobat e Adobe Reader 5.0 e versioni successive.) - /JPN <FEFF30d330b830cd30b9658766f8306e8868793a304a3088307353705237306b90693057305f002000410064006f0062006500200050004400460020658766f8306e4f5c6210306b4f7f75283057307e305930023053306e8a2d5b9a30674f5c62103055308c305f0020005000440046002030d530a130a430eb306f3001004100630072006f0062006100740020304a30883073002000410064006f00620065002000520065006100640065007200200035002e003000204ee5964d3067958b304f30533068304c3067304d307e305930023053306e8a2d5b9a3067306f30d530a930f330c8306e57cb30818fbc307f3092884c3044307e30593002> - /KOR <FEFFc7740020c124c815c7440020c0acc6a9d558c5ec0020be44c988b2c8c2a40020bb38c11cb97c0020c548c815c801c73cb85c0020bcf4ace00020c778c1c4d558b2940020b3700020ac00c7a50020c801d569d55c002000410064006f0062006500200050004400460020bb38c11cb97c0020c791c131d569b2c8b2e4002e0020c774b807ac8c0020c791c131b41c00200050004400460020bb38c11cb2940020004100630072006f0062006100740020bc0f002000410064006f00620065002000520065006100640065007200200035002e00300020c774c0c1c5d0c11c0020c5f40020c2180020c788c2b5b2c8b2e4002e> - /NLD (Gebruik deze instellingen om Adobe PDF-documenten te maken waarmee zakelijke documenten betrouwbaar kunnen worden weergegeven en afgedrukt. De gemaakte PDF-documenten kunnen worden geopend met Acrobat en Adobe Reader 5.0 en hoger.) - /NOR <FEFF004200720075006b00200064006900730073006500200069006e006e007300740069006c006c0069006e00670065006e0065002000740069006c002000e50020006f0070007000720065007400740065002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e00740065007200200073006f006d002000650072002000650067006e0065007400200066006f00720020007000e5006c006900740065006c006900670020007600690073006e0069006e00670020006f00670020007500740073006b007200690066007400200061007600200066006f0072007200650074006e0069006e006700730064006f006b0075006d0065006e007400650072002e0020005000440046002d0064006f006b0075006d0065006e00740065006e00650020006b0061006e002000e50070006e00650073002000690020004100630072006f00620061007400200065006c006c00650072002000410064006f00620065002000520065006100640065007200200035002e003000200065006c006c00650072002e> - /POL <FEFF0055007300740061007700690065006e0069006100200064006f002000740077006f0072007a0065006e0069006100200064006f006b0075006d0065006e007400f300770020005000440046002000700072007a0065007a006e00610063007a006f006e00790063006800200064006f0020006e00690065007a00610077006f0064006e00650067006f002000770079015b0077006900650074006c0061006e00690061002000690020006400720075006b006f00770061006e0069006100200064006f006b0075006d0065006e007400f300770020006600690072006d006f0077007900630068002e002000200044006f006b0075006d0065006e0074007900200050004400460020006d006f017c006e00610020006f007400770069006500720061010700200077002000700072006f006700720061006d006900650020004100630072006f00620061007400200069002000410064006f00620065002000520065006100640065007200200035002e0030002000690020006e006f00770073007a0079006d002e> - /PTB <FEFF005500740069006c0069007a006500200065007300730061007300200063006f006e00660069006700750072006100e700f50065007300200064006500200066006f0072006d00610020006100200063007200690061007200200064006f00630075006d0065006e0074006f0073002000410064006f00620065002000500044004600200061006400650071007500610064006f00730020007000610072006100200061002000760069007300750061006c0069007a006100e700e3006f002000650020006100200069006d0070007200650073007300e3006f00200063006f006e0066006900e1007600650069007300200064006500200064006f00630075006d0065006e0074006f007300200063006f006d0065007200630069006100690073002e0020004f007300200064006f00630075006d0065006e0074006f00730020005000440046002000630072006900610064006f007300200070006f00640065006d0020007300650072002000610062006500720074006f007300200063006f006d0020006f0020004100630072006f006200610074002000650020006f002000410064006f00620065002000520065006100640065007200200035002e0030002000650020007600650072007300f50065007300200070006f00730074006500720069006f007200650073002e> - /RUM <FEFF005500740069006c0069007a00610163006900200061006300650073007400650020007300650074010300720069002000700065006e007400720075002000610020006300720065006100200064006f00630075006d0065006e00740065002000410064006f006200650020005000440046002000610064006500630076006100740065002000700065006e007400720075002000760069007a00750061006c0069007a00610072006500610020015f006900200074006900700103007200690072006500610020006c0061002000630061006c006900740061007400650020007300750070006500720069006f0061007201030020006100200064006f00630075006d0065006e00740065006c006f007200200064006500200061006600610063006500720069002e002000200044006f00630075006d0065006e00740065006c00650020005000440046002000630072006500610074006500200070006f00740020006600690020006400650073006300680069007300650020006300750020004100630072006f006200610074002c002000410064006f00620065002000520065006100640065007200200035002e00300020015f00690020007600650072007300690075006e0069006c006500200075006c0074006500720069006f006100720065002e> - /RUS <FEFF04180441043f043e043b044c04370443043904420435002004340430043d043d044b04350020043d0430044104420440043e0439043a043800200434043b044f00200441043e043704340430043d0438044f00200434043e043a0443043c0435043d0442043e0432002000410064006f006200650020005000440046002c0020043f043e04340445043e0434044f04490438044500200434043b044f0020043d0430043404350436043d043e0433043e0020043f0440043e0441043c043e044204400430002004380020043f04350447043004420438002004340435043b043e0432044b044500200434043e043a0443043c0435043d0442043e0432002e002000200421043e043704340430043d043d044b04350020005000440046002d0434043e043a0443043c0435043d0442044b0020043c043e0436043d043e0020043e0442043a0440044b043204300442044c002004410020043f043e043c043e0449044c044e0020004100630072006f00620061007400200438002000410064006f00620065002000520065006100640065007200200035002e00300020043800200431043e043b043504350020043f043e04370434043d043804450020043204350440044104380439002e> - /SLV <FEFF005400650020006e006100730074006100760069007400760065002000750070006f0072006100620069007400650020007a00610020007500730074007600610072006a0061006e006a006500200064006f006b0075006d0065006e0074006f0076002000410064006f006200650020005000440046002c0020007000720069006d00650072006e006900680020007a00610020007a0061006e00650073006c006a00690076006f0020006f0067006c00650064006f00760061006e006a006500200069006e0020007400690073006b0061006e006a006500200070006f0073006c006f0076006e0069006800200064006f006b0075006d0065006e0074006f0076002e00200020005500730074007600610072006a0065006e006500200064006f006b0075006d0065006e0074006500200050004400460020006a00650020006d006f0067006f010d00650020006f0064007000720065007400690020007a0020004100630072006f00620061007400200069006e002000410064006f00620065002000520065006100640065007200200035002e003000200069006e0020006e006f00760065006a01610069006d002e> - /SUO <FEFF004b00e40079007400e40020006e00e40069007400e4002000610073006500740075006b007300690061002c0020006b0075006e0020006c0075006f0074002000410064006f0062006500200050004400460020002d0064006f006b0075006d0065006e007400740065006a0061002c0020006a006f0074006b006100200073006f0070006900760061007400200079007200690074007900730061007300690061006b00690072006a006f006a0065006e0020006c0075006f00740065007400740061007600610061006e0020006e00e400790074007400e4006d0069007300650065006e0020006a0061002000740075006c006f007300740061006d0069007300650065006e002e0020004c0075006f0064007500740020005000440046002d0064006f006b0075006d0065006e00740069007400200076006f0069006400610061006e0020006100760061007400610020004100630072006f0062006100740069006c006c00610020006a0061002000410064006f00620065002000520065006100640065007200200035002e0030003a006c006c00610020006a006100200075007500640065006d006d0069006c006c0061002e> - /SVE <FEFF0041006e007600e4006e00640020006400650020006800e4007200200069006e0073007400e4006c006c006e0069006e006700610072006e00610020006f006d002000640075002000760069006c006c00200073006b006100700061002000410064006f006200650020005000440046002d0064006f006b0075006d0065006e007400200073006f006d00200070006100730073006100720020006600f60072002000740069006c006c006600f60072006c00690074006c006900670020007600690073006e0069006e00670020006f006300680020007500740073006b007200690066007400650072002000610076002000610066006600e4007200730064006f006b0075006d0065006e0074002e002000200053006b006100700061006400650020005000440046002d0064006f006b0075006d0065006e00740020006b0061006e002000f600700070006e00610073002000690020004100630072006f0062006100740020006f00630068002000410064006f00620065002000520065006100640065007200200035002e00300020006f00630068002000730065006e006100720065002e> - /TUR <FEFF005400690063006100720069002000620065006c00670065006c006500720069006e0020006700fc00760065006e0069006c0069007200200062006900720020015f0065006b0069006c006400650020006700f6007200fc006e007400fc006c0065006e006d006500730069002000760065002000790061007a0064013100720131006c006d006100730131006e006100200075007900670075006e002000410064006f006200650020005000440046002000620065006c00670065006c0065007200690020006f006c0075015f007400750072006d0061006b0020006900e70069006e00200062007500200061007900610072006c0061007201310020006b0075006c006c0061006e0131006e002e00200020004f006c0075015f0074007500720075006c0061006e0020005000440046002000620065006c00670065006c0065007200690020004100630072006f006200610074002000760065002000410064006f00620065002000520065006100640065007200200035002e003000200076006500200073006f006e0072006100730131006e00640061006b00690020007300fc007200fc006d006c00650072006c00650020006100e70131006c006100620069006c00690072002e> - /ENU (Use these settings to create Adobe PDF documents suitable for reliable viewing and printing of business documents. Created PDF documents can be opened with Acrobat and Adobe Reader 5.0 and later.) - >> ->> setdistillerparams -<< - /HWResolution [600 600] - /PageSize [612.000 792.000] ->> setpagedevice diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/latex-ps-pdf.tco new/doc/generic/pst-support/latex-ps-pdf.tco --- old/doc/generic/pst-support/latex-ps-pdf.tco 2009-02-06 19:45:39.000000000 +0100 +++ new/doc/generic/pst-support/latex-ps-pdf.tco 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> -<txcop:outputProfiles version="1" xmlns:txcop="http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd"> - <outputProfileList> - <outputProfile name="LaTeX => PS => PDF" stopOnLatexError="false"> - <texCommand execute="true" path="latex.exe" arguments="--src -interaction=nonstopmode "%Wm""/> - <bibTexCommand execute="true" path="bibtex.exe" arguments=""%bm""/> - <makeIndexCommand execute="true" path="makeindex.exe" arguments=""%bm""/> - <postProcessors> - <processor name="DviPs (PDF)" path="dvips.exe" arguments="-t a4 -P pdf "%Bm.dvi"" inputFile="" outputFile=""/> - <processor name="Ghostscript (ps2pdf)" path="gswin32c.exe" arguments="-sPAPERSIZE=a4 -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile="%bm.pdf" -c save pop -f "%bm.ps"" inputFile="" outputFile=""/> - </postProcessors> - <viewer path="ACROBAT.EXE" closeBeforeCompilation="false"> - <viewProjectCommand type="commandLine"> - <commandLineCommand path="ACROBAT.EXE" arguments=" "%bm.pdf""/> - <ddeCommand path="" server="" topic="System" command=""/> - </viewProjectCommand> - <viewCurrentFileCommand type="commandLine"> - <commandLineCommand path="ACROBAT.EXE" arguments=" "%bm.pdf""/> - <ddeCommand path="" server="" topic="System" command=""/> - </viewCurrentFileCommand> - <viewCloseCommand type="commandLine"> - <commandLineCommand path="" arguments=""/> - <ddeCommand path="" server="" topic="System" command=""/> - </viewCloseCommand> - </viewer> - </outputProfile> - </outputProfileList> -</txcop:outputProfiles> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/latex-pstpdf-pdf.tco new/doc/generic/pst-support/latex-pstpdf-pdf.tco --- old/doc/generic/pst-support/latex-pstpdf-pdf.tco 2009-02-06 19:45:39.000000000 +0100 +++ new/doc/generic/pst-support/latex-pstpdf-pdf.tco 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> -<txcop:outputProfiles version="1" xmlns:txcop="http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd"> - <outputProfileList> - <outputProfile name="LaTeX => pst-pdf => PDF" stopOnLatexError="false"> - <texCommand execute="true" path="latex.exe" arguments="--src -interaction=nonstopmode -max-print-line=120 "%Wm""/> - <bibTexCommand execute="false" path="bibtex.exe" arguments=""%bm""/> - <makeIndexCommand execute="false" path="makeindex.exe" arguments="-s personal.ist -g "%bm""/> - <postProcessors> - <processor name="DviPs (PDF)" path="dvips.exe" arguments="-o "%Bm-pics.ps" "%Bm.dvi"" inputFile="" outputFile=""/> - <processor name="Ghostscript (ps2pdf)" path="gswin32.exe" arguments="-sPAPERSIZE=a4 -dNOSAFER -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile="%bm-pics.pdf" -c save pop -f "%bm-pics.ps"" inputFile="" outputFile=""/> - <processor name="PDFLatex" path="pdflatex.exe" arguments="-interaction=nonstopmode -max-print-line=120 "%Bm"" inputFile="" outputFile=""/> - </postProcessors> - <viewer path="Acrobat.exe" closeBeforeCompilation="false"> - <viewProjectCommand type="dde"> - <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/> - <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/> - </viewProjectCommand> - <viewCurrentFileCommand type="dde"> - <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/> - <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/> - </viewCurrentFileCommand> - <viewCloseCommand type="dde"> - <commandLineCommand path="" arguments=""/> - <ddeCommand path="" server="acroview" topic="control" command="[DocClose("%bm.pdf")]"/> - </viewCloseCommand> - </viewer> - </outputProfile> - </outputProfileList> -</txcop:outputProfiles> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-support/pdflatex-autopstpdf.tco new/doc/generic/pst-support/pdflatex-autopstpdf.tco --- old/doc/generic/pst-support/pdflatex-autopstpdf.tco 2009-02-06 19:45:39.000000000 +0100 +++ new/doc/generic/pst-support/pdflatex-autopstpdf.tco 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> -<txcop:outputProfiles version="1" xmlns:txcop="http://schemas.ToolsCenter.org/TeXnicCenter/OutputProfiles.xsd"> - <outputProfileList> - <outputProfile name="LaTeX => auto-pst-pdf => PDF" stopOnLatexError="false"> - <texCommand execute="true" path="pdflatex.exe" arguments="--src -interaction=nonstopmode -max-print-line=120 --enable-write18 "%Wm""/> - <bibTexCommand execute="false" path="bibtex.exe" arguments=""%bm""/> - <makeIndexCommand execute="false" path="makeindex.exe" arguments="-s personal.ist -g "%bm""/> - <postProcessors/> - <viewer path="Acrobat.exe" closeBeforeCompilation="false"> - <viewProjectCommand type="dde"> - <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/> - <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/> - </viewProjectCommand> - <viewCurrentFileCommand type="dde"> - <commandLineCommand path="gsview32.exe" arguments=""%bm.pdf""/> - <ddeCommand path="Acrobat.exe" server="acroview" topic="control" command="[DocOpen("%bm.pdf")][FileOpen("%bm.pdf")]"/> - </viewCurrentFileCommand> - <viewCloseCommand type="dde"> - <commandLineCommand path="" arguments=""/> - <ddeCommand path="" server="acroview" topic="control" command="[DocClose("%bm.pdf")]"/> - </viewCloseCommand> - </viewer> - </outputProfile> - </outputProfileList> -</txcop:outputProfiles> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pseudocode/pseudocode.sty new/tex/latex/pseudocode/pseudocode.sty --- old/tex/latex/pseudocode/pseudocode.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/pseudocode/pseudocode.sty 2016-11-25 19:33:57.000000000 +0100 @@ -0,0 +1,201 @@ +%% +%% January 14, 2004 +%% +%% pseudocode.sty +%% +%% S O F T W A R E L I C E N S E +%% ================================= +%% +%% The file pseudocode.sty +%% is referred to as `the pseudocode package' +%% or simply `the package'. +%% +%% The pseudocode package is copyright 1999 D.L. Kreher and D.R. Stinson. +%% +%% The pseudocode package and its drivers 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://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2003/12/01 or later. +%% +%% The package has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer is Donald L. Kreher. +%% +%% end of software license +%% +%% E-MAIL: kreher(a)mtu.edu dstinson(a)uwaterloo.ca +%% +%% DESCRIPTION: +%% pseudocode.sty is a LaTeX style option, consisting of: +%% the environment pseudocode +%% +%% INSTALLATION: +%% Put this file where your TeX looks for inputs. +%% +%% DOCUMENTATION: +%% See pseudocode.tex. +%% +%% \RETURN altered Oct 22, 1999 +%% Allowed for two column formating Dec 2, 2002 +%% \BREAK for breaking out of loops added Oct 10, 2003 +%% \FORALL added Oct 10, 2003 +%% +%% CODE: +\typeout{** } +\typeout{** Document Style `pseudocode' - environment } +\typeout{** by D.L. Kreher and D.R. Stinson } +\typeout{** } +\typeout{** The pseudocode environment was originally developed for the book} +\typeout{** Combinatorial Algorithms: Enumeration, Generation, and Search} +\typeout{** CRC Press, 1999. } + +% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{pseudocode} +% +\if@twocolumn +\newlength{\pcode@width} +\setlength{\pcode@width}{\columnwidth} +\addtolength{\pcode@width}{-40pt} +\else +\newlength{\pcode@width} +\setlength{\pcode@width}{\textwidth} +\addtolength{\pcode@width}{-40pt} +\fi +% +\RequirePackage{fancybox} +\RequirePackage{ifthen} +% +\newcommand{\pcode@AF}[1]{\mbox{\textsc{#1}}} % Algorithm font +\newcounter{pseudocode}[section] +\newcounter{pseudonum} +\renewcommand{\thepseudonum}{\arabic{pseudonum}} +\newcommand{\pcode@tab}[1]{\hspace*{#1ex}} +\renewcommand{\thepseudocode}{\thesection.\arabic{pseudocode}} +% +\newboolean{pcode@plain} +\newboolean{pcode@ruled} +\newboolean{pcode@disp} +\newboolean{pcode@shad} +\newboolean{pcode@dbox} +\newboolean{pcode@obox} +\newboolean{pcode@Obox} +\newboolean{pcode@fbox} +% +\newenvironment{pseudocode}[3][plain] +{% + \refstepcounter{pseudocode}% + \ifthenelse{\equal{#1}{plain}}{\setboolean{pcode@plain}{true}}{\setboolean{pcode@plain}{false}}% + \ifthenelse{\equal{#1}{ruled}}{\setboolean{pcode@ruled}{true}}{\setboolean{pcode@ruled}{false}}% + \ifthenelse{\equal{#1}{display}}{\setboolean{pcode@disp}{true}}{\setboolean{pcode@disp}{false}}% + \ifthenelse{\equal{#1}{shadowbox}}{\setboolean{pcode@shad}{true}}{\setboolean{pcode@shad}{false}}% + \ifthenelse{\equal{#1}{doublebox}}{\setboolean{pcode@dbox}{true}}{\setboolean{pcode@dbox}{false}}% + \ifthenelse{\equal{#1}{ovalbox}}{\setboolean{pcode@obox}{true}}{\setboolean{pcode@obox}{false}}% + \ifthenelse{\equal{#1}{Ovalbox}}{\setboolean{pcode@Obox}{true}}{\setboolean{pcode@Obox}{false}}% + \ifthenelse{\equal{#1}{framebox}}{\setboolean{pcode@fbox}{true}}{\setboolean{pcode@fbox}{false}}% + \setcounter{pseudonum}{0}% + \ifthenelse{\boolean{pcode@disp}}% + {% + \noindent\begin{math}% + }% + {% + \begin{Sbox}% + \begin{minipage}{\pcode@width}% + \ifthenelse{\boolean{pcode@ruled}} + { + \noindent\rule{\pcode@width}{1pt}\hfill\\ + {\bfseries Algorithm \thepseudocode:\pcode@tab{1}}\pcode@AF{#2}($#3$)\\ + \noindent\rule{\pcode@width}{1pt}\hfill\\[1ex] + } + { + {\bfseries Algorithm \thepseudocode:\pcode@tab{1}}\pcode@AF{#2}($#3$)\\[2ex] + } + \noindent\begin{math}\begin{array}{@{\pcode@tab{1}}lr@{}}% + }{}% +}% +{% + \ifthenelse{\boolean{pcode@disp}}% + {% + \end{math} + }% + {% + \ifthenelse{\boolean{pcode@ruled}} + { + \end{array}\end{math}\\[1ex] + \noindent\rule{\pcode@width}{1pt}\hfill + \end{minipage}\end{Sbox}\bigskip\noindent% + } + {\end{array}\end{math}\end{minipage}\end{Sbox}\bigskip\noindent}% + \ifthenelse{\boolean{pcode@plain}}{\TheSbox}{}% + \ifthenelse{\boolean{pcode@ruled}}{\TheSbox}{}% + \ifthenelse{\boolean{pcode@shad}}{\shadowbox{\TheSbox}}{}% + \ifthenelse{\boolean{pcode@dbox}}{\doublebox{\TheSbox}}{}% + \ifthenelse{\boolean{pcode@obox}}{\cornersize*{4ex}\ovalbox{\TheSbox}}{}% + \ifthenelse{\boolean{pcode@Obox}}{\cornersize*{4ex}\Ovalbox{\TheSbox}}{}% + \ifthenelse{\boolean{pcode@fbox}}{\fbox{\TheSbox}}{}% + \bigskip% + }% +}% +% +\newcommand{\STMTNUM}[2]{&\refstepcounter{pseudonum}\hspace*{#1}% +\mbox{(\thepseudonum)\label{#2}}} +\newcommand{\LOCAL}[1]{\mbox{\bfseries local}\pcode@tab{1}#1} +\newcommand{\GLOBAL}[1]{\mbox{\bfseries global}\pcode@tab{1}#1} +\newcommand{\EXTERNAL}[1]{\mbox{\bfseries external}\pcode@tab{1}#1} +\newcommand{\COMMENT}[1]% +{% + \vspace*{1ex}% + \mbox{\bfseries comment:}\pcode@tab{.5} \mbox{#1} +} +\newcommand{\BEGIN}{\left\{\begin{array}{@{}lr@{}}} +\newcommand{\END}{\end{array}\right.} +\newcommand{\PROCEDURE}[2]% +{% + \mbox{\bfseries procedure }\pcode@AF{#1}(\ensuremath{#2})\\% + \begin{array}{@{\pcode@tab{1}}l@{}}% +} +\newcommand{\ENDPROCEDURE}{\vspace*{2ex}\end{array}\\ } +\newcommand{\CALL}[2]{\pcode@AF{#1}(#2)} % +\newcommand{\MAIN}{\mbox{\bfseries main}\\\begin{array}{@{\pcode@tab{1}}lr@{}}} +\newcommand{\ENDMAIN}{\end{array}} +\newcommand{\RETURN}[1]{\ifthenelse{\equal{#1}{} }% +{\mbox{\bfseries return }}% +{\mbox{\bfseries return }(#1)}} +\newcommand{\OUTPUT}[1]{\mbox{\bfseries output }(#1)} +\newcommand{\EXIT}{\mbox{\bfseries exit }} +\newcommand{\BREAK}{\mbox{\bfseries break }} +\newcommand{\IF}{\mbox{\bfseries if }} +\newcommand{\LET}{\mbox{\bfseries let }} +\newcommand{\CTHEN}{\pcode@tab{1}\mbox{ \bfseries then }} +\newcommand{\CELSE}{\pcode@tab{1}\mbox{ \bfseries else }} +\newcommand{\THEN}{\\\pcode@tab{1}\mbox{ \bfseries then }} +\newcommand{\ELSE}{\\\pcode@tab{1}\mbox{ \bfseries else }} +\newcommand{\ELSEIF}{\\\pcode@tab{1}\mbox{ \bfseries else if }} +\newcommand{\FOREACH}{\mbox{\bfseries for each }} +\newcommand{\FORALL}{\mbox{\bfseries for all }} +\newcommand{\FOR}{\mbox{\bfseries for }} +\newcommand{\TO}{\mbox{ \bfseries to }} +\newcommand{\DOWNTO}{\mbox{ \bfseries downto }} +\newcommand{\CASE}{\mbox{\bfseries case }} +\newcommand{\OF}{\\\pcode@tab{1}\mbox{ \bfseries of }\BEGIN} +\newcommand{\ENDCASE}{\END} +\newcommand{\AND}{\mbox{ \bfseries and }} +\newcommand{\OR}{\mbox{ \bfseries or }} +\newcommand{\NOT}{\mbox{ \bfseries not }} +\newcommand{\SUCCESS}{\mbox{ \bfseries success }} +\newcommand{\FAIL}{\mbox{ \bfseries fail }} +\newcommand{\TRUE}{\mbox{ \bfseries true }} +\newcommand{\FALSE}{\mbox{ \bfseries false }} +\newcommand{\GOTO}{\mbox{\bfseries go to }} +\newcommand{\DO}{\\\pcode@tab{1}\mbox{ \bfseries do }} +\newcommand{\ADO}{\mbox{ \bfseries do }} +\newcommand{\WHILE}{\mbox{\bfseries while }} +\newcommand{\REPEAT}{\mbox{\bfseries repeat }\\\begin{array}{@{\pcode@tab{1}}lr@{}}} +\newcommand{\UNTIL}{\end{array}\\\mbox{\bfseries until }} +\newcommand{\GETS}{\leftarrow} +\endinput +%% END pseudodcode.sty + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pseudocode.tlpobj new/tlpkg/tlpobj/pseudocode.tlpobj --- old/tlpkg/tlpobj/pseudocode.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/pseudocode.tlpobj 2017-04-14 17:54:58.000000000 +0200 @@ -0,0 +1,13 @@ +name pseudocode +category Package +revision 15878 +shortdesc LaTeX environment for specifying algorithms in a natural way +relocated 1 +longdesc This package provides the environment "pseudocode" for +longdesc describing algorithms in a natural manner. +runfiles size=2 + RELOC/tex/latex/pseudocode/pseudocode.sty +catalogue-ctan /macros/latex/contrib/pseudocode +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics pseudocode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-support.doc.tlpobj new/tlpkg/tlpobj/pst-support.doc.tlpobj --- old/tlpkg/tlpobj/pst-support.doc.tlpobj 2016-04-14 19:38:06.000000000 +0200 +++ new/tlpkg/tlpobj/pst-support.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -name pst-support.doc -category Package -revision 15878 -shortdesc doc files of pst-support -relocated 1 -docfiles size=10 - RELOC/doc/generic/pst-support/README - RELOC/doc/generic/pst-support/Standard_transparency.joboptions - RELOC/doc/generic/pst-support/latex-ps-pdf.tco - RELOC/doc/generic/pst-support/latex-pstpdf-pdf.tco - RELOC/doc/generic/pst-support/pdflatex-autopstpdf.tco ++++++ psfrag-italian.doc.tar.xz ++++++ ++++++ psfrag.doc.tar.xz ++++++ ++++++ psfrag.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psfrag.tlpobj new/tlpkg/tlpobj/psfrag.tlpobj --- old/tlpkg/tlpobj/psfrag.tlpobj 2016-04-14 19:36:29.000000000 +0200 +++ new/tlpkg/tlpobj/psfrag.tlpobj 2017-04-14 17:54:58.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/psfrag/psfrag.sty catalogue-also psfragx catalogue-ctan /macros/latex/contrib/psfrag -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics graphics-text catalogue-version 3.04 ++++++ psfragx.doc.tar.xz ++++++ ++++++ psfragx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psfragx.tlpobj new/tlpkg/tlpobj/psfragx.tlpobj --- old/tlpkg/tlpobj/psfragx.tlpobj 2016-04-14 19:36:30.000000000 +0200 +++ new/tlpkg/tlpobj/psfragx.tlpobj 2017-04-14 17:54:59.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/latex/psfragx/psfragx.cfg RELOC/tex/latex/psfragx/psfragx.sty catalogue-ctan /macros/latex/contrib/psfragx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-text catalogue-version 1.1 ++++++ psgo.doc.tar.xz ++++++ ++++++ psgo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psgo.tlpobj new/tlpkg/tlpobj/psgo.tlpobj --- old/tlpkg/tlpobj/psgo.tlpobj 2016-04-14 19:36:31.000000000 +0200 +++ new/tlpkg/tlpobj/psgo.tlpobj 2017-04-14 17:54:59.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=3 RELOC/tex/latex/psgo/psgo.sty catalogue-ctan /graphics/pstricks/contrib/psgo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license lppl catalogue-topics games pstricks catalogue-version 0.17 ++++++ psizzl.doc.tar.xz ++++++ ++++++ psizzl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psizzl.tlpobj new/tlpkg/tlpobj/psizzl.tlpobj --- old/tlpkg/tlpobj/psizzl.tlpobj 2016-04-14 19:36:31.000000000 +0200 +++ new/tlpkg/tlpobj/psizzl.tlpobj 2017-04-14 17:54:59.000000000 +0200 @@ -27,7 +27,7 @@ RELOC/tex/psizzl/base/thesis.Psizzl RELOC/tex/psizzl/config/psizzl.ini catalogue-ctan /macros/psizzl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics format catalogue-version 0.35 ++++++ pslatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pslatex.tlpobj new/tlpkg/tlpobj/pslatex.tlpobj --- old/tlpkg/tlpobj/pslatex.tlpobj 2016-04-14 19:36:31.000000000 +0200 +++ new/tlpkg/tlpobj/pslatex.tlpobj 2017-04-14 17:54:59.000000000 +0200 @@ -27,6 +27,6 @@ RELOC/fonts/vf/public/pslatex/pcrr8tn.vf RELOC/tex/latex/pslatex/pslatex.sty catalogue-ctan /macros/latex/contrib/pslatex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp obsolete ++++++ psnfss.doc.tar.xz ++++++ ++++++ psnfss.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psnfss.tlpobj new/tlpkg/tlpobj/psnfss.tlpobj --- old/tlpkg/tlpobj/psnfss.tlpobj 2016-04-14 19:36:31.000000000 +0200 +++ new/tlpkg/tlpobj/psnfss.tlpobj 2017-04-14 17:54:59.000000000 +0200 @@ -145,7 +145,7 @@ RELOC/tex/latex/psnfss/utopia.sty catalogue-also psnfssx catalogue-ctan /macros/latex/required/psnfss -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp font-use catalogue-version 9.2a ++++++ pspicture.doc.tar.xz ++++++ ++++++ pspicture.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pspicture.tlpobj new/tlpkg/tlpobj/pspicture.tlpobj --- old/tlpkg/tlpobj/pspicture.tlpobj 2016-04-14 19:36:32.000000000 +0200 +++ new/tlpkg/tlpobj/pspicture.tlpobj 2017-04-14 17:55:00.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/dvips/pspicture/pspicture.ps RELOC/tex/latex/pspicture/pspicture.sty catalogue-ctan /macros/latex/contrib/pspicture -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex obsolete ++++++ pst-2dplot.doc.tar.xz ++++++ ++++++ pst-2dplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-2dplot.tlpobj new/tlpkg/tlpobj/pst-2dplot.tlpobj --- old/tlpkg/tlpobj/pst-2dplot.tlpobj 2016-04-14 19:36:32.000000000 +0200 +++ new/tlpkg/tlpobj/pst-2dplot.tlpobj 2017-04-14 17:55:00.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/pst-2dplot/pst-2dplot.sty catalogue-ctan /graphics/pstricks/contrib/pst-2dplot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-plot pstricks catalogue-version 1.5 ++++++ pst-3d.doc.tar.xz ++++++ ++++++ pst-3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3d.tlpobj new/tlpkg/tlpobj/pst-3d.tlpobj --- old/tlpkg/tlpobj/pst-3d.tlpobj 2016-04-14 19:36:32.000000000 +0200 +++ new/tlpkg/tlpobj/pst-3d.tlpobj 2017-04-14 17:55:00.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-3d/pst-3d.tex RELOC/tex/latex/pst-3d/pst-3d.sty catalogue-ctan /graphics/pstricks/contrib/pst-3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-3d pstricks catalogue-version 1.10 ++++++ pst-3dplot.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/Changes new/doc/generic/pst-3dplot/Changes --- old/doc/generic/pst-3dplot/Changes 2014-08-26 19:30:34.000000000 +0200 +++ new/doc/generic/pst-3dplot/Changes 2017-04-06 02:28:00.000000000 +0200 @@ -1,5 +1,6 @@ pst-3dplot.pro -------- -0.32 2014-02-01 - modifications to coorTape=6 +0.33 2017-04-05 - added coorType=7 +0.32 2014-02-01 - modifications to coorType=6 0.31 2014-01-29 - add coorType=6, like 5 with a z axis vice versa 0.30 2010-01-01 - add the subroutine /tx@ProjThreeD from pst-3d to get rid of the dependency @@ -19,6 +20,9 @@ pst-3dplot.tex -------- +2.04 2017-04-05 - added coorType=7 +2.03 2014-12-01 - modifications to coorType=6 +2.02 2014-09-01 - use the alternative for hidden lines of \psThreeDBox 2.01 2014-08-25 - bugfix for \lineIIID@i which is defines by pst-solides3d, too. 2.00 2014-03-26 - enable opacity setting for sphere and cylinder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.bib new/doc/generic/pst-3dplot/pst-3dplot-doc.bib --- old/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2012-07-29 19:07:14.000000000 +0200 +++ new/doc/generic/pst-3dplot/pst-3dplot-doc.bib 2017-04-06 02:28:00.000000000 +0200 @@ -1,52 +1,114 @@ +%% -*-bibtex-*- +@STRING{tugboat = {TUGboat} } @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@Book{companion, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + edition = {second}, + year = {2007}, + address = {Boston, Mass.} +} + +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {{Timothy Van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} + @Book{PostScript, Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, + Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum + praktischen {E}insatz}, Publisher = {IWT}, Address = {Vaterstetten}, year = 1989, } -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, +@ctan{multido, + Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, + url = {/macros/generic/multido.tex}, Note = {}, - year = 1993, + year = 1997 +} + +@Book{PSTricks2, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE -- Lehmanns}, + year = {2016}, + location = {Heidelberg and Berlin} +} + +@Book{PSTricksE, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX}, + edition = {1}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge -- UK} } +@Book{LTXquick, + author = {Herbert Vo\ss{}}, + title = {{\LaTeX} quick reference}, + edition = {1}, + publisher = {UIT}, + year = {2012}, + address = {Cambridge -- UK} +} + +@Book{presentations, + author = {Herbert Vo\ss}, + title = {Presentations with \LaTeX}, + edition = {2}, + publisher = {DANTE -- Lehmanns Media}, + year = {2017}, + location = {Heidelberg and Berlin} +} + + +@Book{tbt, + author = {Victor Eijkhout}, + title = {\TeX\ by Topic -- {A} \TeX{}nician Reference}, + edition = {1}, + publisher = {DANTE -- lehmanns media}, + year = {2014}, + location = {Heidelberg and Berlin} +} -@Manual{pdftricks, +@online{pdftricks, Title = {PSTricks Support for pdf}, Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, - Note = {}, + url = {http://PSTricks.de/pdf/pdfoutput.phtml}, year = 2002, } -@Manual{miwi, +@online{miwi, Title = {References for \TeX{} and Friends}, Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, + url = {http://www.miwie.org/tex-refs/}, year = 2003, } -@Manual{vue3d:2002, - Title = {Vue en 3D}, - Author = {Manuel Luque}, - Organization = {}, - Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}}, - Note = {}, - year = 2002, -} - @Article{dtk02.2:jackson.voss:plot-funktionen, author = {Laura E. Jackson and Herbert Vo{\ss}}, title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, @@ -58,7 +120,6 @@ month = jun, pages = {27--34}, annote = bretter, - keywords = {}, abstract = { Im letzten Heft wurden die mathematischen Funktionen von \PS~im Zusammenhang mit dem {\LaTeX}-Paket \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben @@ -78,7 +139,6 @@ month = mar, pages = {40-47}, annote = bretter, - keywords = {}, abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn nun im eigentlichen @@ -90,39 +150,3 @@ gezeigt. } } -@Book{companion, - author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, - title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, - edition = second, - year = {2007}, - address = {Reading, Mass.} -} - -@Book{PSTricks2, - author = {Herbert Vo\ss{}}, - title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {6.}, - publisher = {DANTE -- Lehmanns}, - year = {2010}, - address = {Heidelberg/Hamburg} -} - -@Book{PSTricksE, - author = {Herbert Vo\ss{}}, - title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX}, - edition = {1.}, - publisher = {UIT}, - year = {2011}, - address = {Cambridge -- UK} -} - -@Book{LTXquick, - author = {Herbert Vo\ss{}}, - title = {{\LaTeX} quick reference}, - edition = {1.}, - publisher = {UIT}, - year = {2012}, - address = {Cambridge -- UK} -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.dat new/doc/generic/pst-3dplot/pst-3dplot-doc.dat --- old/doc/generic/pst-3dplot/pst-3dplot-doc.dat 2010-02-16 01:35:50.000000000 +0100 +++ new/doc/generic/pst-3dplot/pst-3dplot-doc.dat 2017-04-06 02:28:00.000000000 +0200 @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot-doc.dat 236 2009-12-31 08:59:43Z herbert $ +%% $Id: pst-3dplot-doc.dat 402 2017-04-05 06:58:06Z herbert $ \begin{filecontents}{data3D.Roessler} 2.0, 0.0, 0.0 1.9737089990827656, 0.31348417289942826, 0.024766924774833776 Binary files old/doc/generic/pst-3dplot/pst-3dplot-doc.pdf and new/doc/generic/pst-3dplot/pst-3dplot-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-3dplot/pst-3dplot-doc.tex new/doc/generic/pst-3dplot/pst-3dplot-doc.tex --- old/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2014-02-02 00:14:20.000000000 +0100 +++ new/doc/generic/pst-3dplot/pst-3dplot-doc.tex 2017-04-06 02:28:00.000000000 +0200 @@ -1,11 +1,15 @@ \input{pst-3dplot-doc.dat} -%% $Id: pst-3dplot-doc.tex 882 2014-02-01 13:12:37Z herbert $ +%% $Id: pst-3dplot-doc.tex 401 2017-04-05 06:57:36Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles \usepackage[utf8]{inputenc} + +\usepackage{biblatex} +\addbibresource{\jobname.bib} + \usepackage{pst-grad,pst-3dplot} \let\pstFV\fileversion \let\belowcaptionskip\abovecaptionskip @@ -15,6 +19,7 @@ %\usepackage{tabularx} %\usepackage{longtable} % + \makeatletter \renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}} \renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}} @@ -511,7 +516,7 @@ \label{exa:coorType}\xLkeyword{coorType} \begin{LTXexample}[width=9.75cm] \psset{coorType=1,Alpha=135} -\begin{pspicture}(-2,-3)(3,3) +\begin{pspicture}(-2,-3)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -528,7 +533,7 @@ \begin{LTXexample}[width=9.75cm] \psset{coorType=2,Alpha=90, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -540,7 +545,7 @@ \begin{LTXexample}[width=9.75cm] \psset{coorType=3,Alpha=90, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -550,12 +555,12 @@ \begin{LTXexample}[width=9.75cm] \psset{coorType=4,IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} -With \Lkeyword{coorType}=5 the y--z-axes are orthogonal and the angle between x- and y-axis +With \Lkeyword{coorType}=5 the $y$-$z$-axes are orthogonal and the angle between x- and y-axis is variable but should be 30 or 45 degrees and the x-axis is shortened by a factor of $0.5$. The angle \Lkeyword{Beta} is not valid. @@ -563,11 +568,14 @@ \begin{LTXexample}[width=9.75cm] \psset{coorType=5,Alpha=30, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,4) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} + +For \Lkeyword{coorType}=6 the $x$-axis us shortend by 0.559. + %\setIIIDplotDefaults \psset{unit=1cm} \xLkeyword{coorType} @@ -585,7 +593,24 @@ \end{pspicture} \end{LTXexample} +For \Lkeyword{coorType}=7 the $x$-axis us shortend by 0.5. +%\setIIIDplotDefaults +\psset{unit=1cm} +\xLkeyword{coorType} +\begin{LTXexample}[width=9cm] +\psset{coorType=7} +\begin{pspicture}(-3,-2)(6,6) +\psset{IIIDxTicksPlane=xz,IIIDyTicksPlane=yz} +\pstThreeDCoor[xMin=0,xMax=5,yMin=0,yMax=5, + zMin=0,zMax=5,IIIDticks,spotX=180, + IIIDlabels=false,linecolor=red]% +\multido{\iA=1+1}{4}{\footnotesize% + \pstThreeDPut(\iA,-0.3,0.1){\iA}% + \pstThreeDPut(-0.3,\iA,0.1){\iA}% + \pstThreeDPut(0,-0.3,\iA){\iA}} +\end{pspicture} +\end{LTXexample} \clearpage \section{Rotation} @@ -2457,9 +2482,8 @@ \bgroup \nocite{*} -\raggedright -\bibliographystyle{plain} -\bibliography{pst-3dplot-doc} +\RaggedRight +\printbibliography \egroup \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj --- old/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2016-04-14 19:36:32.000000000 +0200 +++ new/tlpkg/tlpobj/pst-3dplot.doc.tlpobj 2017-04-14 17:55:00.000000000 +0200 @@ -1,9 +1,9 @@ name pst-3dplot.doc category Package -revision 35042 +revision 43703 shortdesc doc files of pst-3dplot relocated 1 -docfiles size=751 +docfiles size=772 RELOC/doc/generic/pst-3dplot/Changes RELOC/doc/generic/pst-3dplot/README RELOC/doc/generic/pst-3dplot/pst-3dplot-doc.bib ++++++ pst-3dplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-3dplot/pst-3dplot.pro new/dvips/pst-3dplot/pst-3dplot.pro --- old/dvips/pst-3dplot/pst-3dplot.pro 2014-02-02 00:14:20.000000000 +0100 +++ new/dvips/pst-3dplot/pst-3dplot.pro 2017-04-06 02:28:00.000000000 +0200 @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.pro 882 2014-02-01 13:12:37Z herbert $ +%% $Id: pst-3dplot.pro 401 2017-04-05 06:57:36Z herbert $ %% %% This is file `pst-3dplot.pro', %% @@ -16,7 +16,7 @@ %% `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects %% %% -%% version 0.32 / 2014-02-01 Herbert Voss <hvoss _at_ tug.org> +%% version 0.33 / 2017-04-05 Herbert Voss <hvoss _at_ tug.org> %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu< %% % @@ -62,6 +62,10 @@ /x2D y x -0.559 mul Alpha cos mul add def /y2D z x -0.559 mul Alpha sin mul add def exit } if + coorType 7 le { % coorType |/_ with a 1/2 shortend x-axis and 135 degrees and z into the front + /x2D y x -0.5 mul Alpha cos mul add def + /y2D z x -0.5 mul Alpha sin mul add def + exit } if } repeat } def /ConvertTo2D { true 3Dto2D } def diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-3dplot/pst-3dplot.tex new/tex/generic/pst-3dplot/pst-3dplot.tex --- old/tex/generic/pst-3dplot/pst-3dplot.tex 2014-08-26 19:30:34.000000000 +0200 +++ new/tex/generic/pst-3dplot/pst-3dplot.tex 2017-04-06 02:28:00.000000000 +0200 @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.tex 899 2014-03-26 08:40:56Z herbert $ +%% $Id: pst-3dplot.tex 401 2017-04-05 06:57:36Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -27,8 +27,8 @@ \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.01} -\def\filedate{2014/08/25} +\def\fileversion{2.04} +\def\filedate{2017/04/05} \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -39,6 +39,7 @@ \newdimen\pst@dimf % \define@boolkey[psset]{pst-3dplot}[Pst@]{Debug}[true]{}% +\define@boolkey[psset]{pst-3dplot}[Pst@]{alternative}[true]{}% for switches \define@boolkey[psset]{pst-3dplot}[Pst@]{drawing}[true]{}% draw the coordinates? \define@boolkey[psset]{pst-3dplot}[Pst@]{drawCoor}[true]{}% draw the coordinates of a dot? \define@boolkey[psset]{pst-3dplot}[Pst@]{hiddenLine}[true]{}% emulate hidden line surface? @@ -64,6 +65,8 @@ \or %5 \or %6 \def\psk@ThreeDplot@Alpha{26.565} + \or %7 + \def\psk@ThreeDplot@Alpha{26.565} \else \fi} % 0 default @@ -219,7 +222,7 @@ \def\setIIIDplotDefaults{% \psset[pstricks]{linejoin=1}% \psset[pst-3dplot]{ - Debug=false,CoorCheck=true, + Debug=false,CoorCheck=true,alternative=false, drawing=true,hiddenLine=false,eulerRotation=false, xMin=-1,xMax=4,yMin=-1,yMax=4,zMin=-1,zMax=4, xThreeDunit=1,yThreeDunit=1.0,zThreeDunit=1.0,Alpha=45,Beta=30, @@ -936,25 +939,17 @@ % \def\pstThreeDBox{\pst@object{pstThreeDBox}} \def\pstThreeDBox@i(#1,#2,#3){% - \pst@killglue% - \begingroup% - \addbefore@par{linestyle=\psk@ThreeDplot@invisibleLineStyle}% - \use@keep@par% - \def\pst@tempX{#1 }% - \def\pst@tempY{#2 }% - \def\pst@tempZ{#3 }% - \pstThreeDBox@ii% + \pst@killglue + \begingroup + \addbefore@par{alternative=false,linestyle=\psk@ThreeDplot@visibleLineStyle}% + \use@keep@par + \gdef\pst@tempX{#1 }% + \gdef\pst@tempY{#2 }% + \gdef\pst@tempZ{#3 }% + \pstThreeDBox@ii } \def\pstThreeDBox@ii(#1,#2,#3)(#4,#5,#6)(#7,#8,#9){%%\def\pstThreeDBox@i[#1](#2)(#3)(#4)(#5) -\iftrue - \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% lower square - \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square - \addto@par{linestyle=dashed}%\psk@ThreeDplot@invisibleLineStyle}% -% \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}% - \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square - \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square - \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square -\else% better support for hidden lines +\ifPst@alternative% better support for hidden lines \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9) % lower square \pst@absdim{\psk@ThreeDplot@Alpha pt}\pst@dimo \ifdim\pst@dimo<90pt @@ -962,9 +957,15 @@ \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square \else \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square - \fi% - \fi% - \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}% + \fi + \else + \ifdim\pst@dimo>270pt + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square + \else + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square + \fi + \fi + \ifPst@hiddenLine\psset{linestyle=\psk@ThreeDplot@invisibleLineStyle}\fi \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square \ifdim\pst@dimo<90pt @@ -972,12 +973,64 @@ \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square \else \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square - \fi% + \fi + \else + \ifdim\pst@dimo>270pt + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square + \else + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square + \fi \fi% -\fi% - \endgroup% - \ignorespaces% +\else + \ifnum\psk@ThreeDplot@coorType=3 + \ifPst@hiddenLine + \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle} + \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY #5 add,\pst@tempZ) + \pstThreeDLine(\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ #9 add) + \psset{linestyle=\psk@ThreeDplot@visibleLineStyle} + \else + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square + \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square + \fi + \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% right square + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square + \else + \ifnum\psk@ThreeDplot@coorType=5 + \ifPst@hiddenLine + \psset{linestyle=\psk@ThreeDplot@invisibleLineStyle} + \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ #9 add)(\pst@tempX #1 add,\pst@tempY,\pst@tempZ #9 add) + \pstThreeDLine(\pst@tempX,\pst@tempY,\pst@tempZ #9 add)(\pst@tempX,\pst@tempY #5 add,\pst@tempZ #9 add) + \psset{linestyle=\psk@ThreeDplot@visibleLineStyle} + \else + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square + \fi + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square + \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% top square + \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square + \else + \pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% left square + \pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% front square + \pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% top square + \ifPst@hiddenLine +% \psset{} + \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX #1 add,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY #5 add,\pst@tempZ) + \pstThreeDLine[linestyle=\psk@ThreeDplot@invisibleLineStyle](\pst@tempX,\pst@tempY,\pst@tempZ)(\pst@tempX,\pst@tempY,\pst@tempZ #9 add) +% \psset{linestyle=\psk@ThreeDplot@visibleLineStyle} + \else + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% bottom square + \pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% right square + \fi + \fi + \fi +\fi + \endgroup + \ignorespaces } +% + + \define@key[psset]{pst-3dplot}{height}[5]{\def\psk@height{#1 }} \define@key[psset]{pst-3dplot}{move}[0 0]{\def\psk@move{#1 }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-3dplot/pst-3dplot.sty new/tex/latex/pst-3dplot/pst-3dplot.sty --- old/tex/latex/pst-3dplot/pst-3dplot.sty 2011-03-03 01:38:36.000000000 +0100 +++ new/tex/latex/pst-3dplot/pst-3dplot.sty 2017-04-06 02:28:00.000000000 +0200 @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot.sty 294 2010-02-18 21:15:47Z herbert $ +%% $Id: pst-3dplot.sty 401 2017-04-05 06:57:36Z herbert $ \RequirePackage{pstricks} \RequirePackage{pst-3d} \RequirePackage{pst-plot} @@ -9,7 +9,7 @@ \input{pst-3dplot.tex} \IfFileExists{pst-3dplot.pro}{% \ProvidesFile{pst-3dplot.pro} - [2010/01/01 v. 0.30, PostScript prologue file (hv)] + [2017/04/05 v. 0.33, PostScript prologue file (hv)] \(a)addtofilelist{pst-3dplot.pro}}{}% \ProvidesFile{pst-3dplot.tex} [\filedate\space v\fileversion\space `PST-3dplot' (hv)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-3dplot.tlpobj new/tlpkg/tlpobj/pst-3dplot.tlpobj --- old/tlpkg/tlpobj/pst-3dplot.tlpobj 2016-04-14 19:36:34.000000000 +0200 +++ new/tlpkg/tlpobj/pst-3dplot.tlpobj 2017-04-14 17:55:01.000000000 +0200 @@ -1,6 +1,6 @@ name pst-3dplot category Package -revision 35042 +revision 43703 shortdesc Draw 3D objects in parallel projection, using PSTricks relocated 1 longdesc A package using PSTricks to draw a large variety of graphs and @@ -12,7 +12,7 @@ RELOC/tex/generic/pst-3dplot/pst-3dplot.tex RELOC/tex/latex/pst-3dplot/pst-3dplot.sty catalogue-ctan /graphics/pstricks/contrib/pst-3dplot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-05 10:29:03 +0200 catalogue-license lppl catalogue-topics graphics-3d graphics-plot pstricks -catalogue-version 2.01 +catalogue-version 2.04 ++++++ pst-abspos.doc.tar.xz ++++++ ++++++ pst-abspos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-abspos.tlpobj new/tlpkg/tlpobj/pst-abspos.tlpobj --- old/tlpkg/tlpobj/pst-abspos.tlpobj 2016-04-14 19:36:34.000000000 +0200 +++ new/tlpkg/tlpobj/pst-abspos.tlpobj 2017-04-14 17:55:01.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-abspos/pst-abspos.tex RELOC/tex/latex/pst-abspos/pst-abspos.sty catalogue-ctan /graphics/pstricks/contrib/pst-abspos -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout pstricks catalogue-version 0.2 ++++++ pst-am.doc.tar.xz ++++++ ++++++ pst-am.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-am.tlpobj new/tlpkg/tlpobj/pst-am.tlpobj --- old/tlpkg/tlpobj/pst-am.tlpobj 2016-04-14 19:36:35.000000000 +0200 +++ new/tlpkg/tlpobj/pst-am.tlpobj 2017-04-14 17:55:01.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/pst-am/pst-am.sty catalogue-ctan /graphics/pstricks/contrib/pst-am -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram pstricks catalogue-version 1.02 ++++++ pst-asr.doc.tar.xz ++++++ ++++++ pst-asr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-asr.tlpobj new/tlpkg/tlpobj/pst-asr.tlpobj --- old/tlpkg/tlpobj/pst-asr.tlpobj 2016-04-14 19:36:35.000000000 +0200 +++ new/tlpkg/tlpobj/pst-asr.tlpobj 2017-04-14 17:55:01.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/generic/pst-asr/pst-asr.tex RELOC/tex/latex/pst-asr/pst-asr.sty catalogue-ctan /graphics/pstricks/contrib/pst-asr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics linguistic pstricks catalogue-version 1.3 ++++++ pst-bar.doc.tar.xz ++++++ ++++++ pst-bar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bar.tlpobj new/tlpkg/tlpobj/pst-bar.tlpobj --- old/tlpkg/tlpobj/pst-bar.tlpobj 2016-04-14 19:36:36.000000000 +0200 +++ new/tlpkg/tlpobj/pst-bar.tlpobj 2017-04-14 17:55:02.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/generic/pst-bar/pst-bar.tex RELOC/tex/latex/pst-bar/pst-bar.sty catalogue-ctan /graphics/pstricks/contrib/pst-bar -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics genchart pstricks catalogue-version 0.92 ++++++ pst-barcode.doc.tar.xz ++++++ ++++ 70500 lines of diff (skipped) ++++++ pst-barcode.tar.xz ++++++ ++++ 2367 lines of diff (skipped) ++++++ pst-bezier.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/Changes new/doc/generic/pst-bezier/Changes --- old/doc/generic/pst-bezier/Changes 2009-01-30 01:07:44.000000000 +0100 +++ new/doc/generic/pst-bezier/Changes 2016-11-25 19:27:47.000000000 +0100 @@ -1,10 +1,17 @@ -- pst-bezier.tex --- +0.03 2016-09-03 small changes to the code, correct url in + the documentation +0.02 2016-08-19 added macro \psRQBCmasse for a Bezier curve, + definied by three weighted points 0.01 2009-01-29 first CTAN version -- pst-bezier.sty --- +0.02 2016-08-19 - load expl3 for floating point operations + - define \pscalculation 0.01 2009-01-29 first CTAN version -- pst-bezier.pro --- +0.02 2016-08-19 added function tx@RQBCmasse for a Bezier curve 0.01 2009-01-29 first CTAN version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/README new/doc/generic/pst-bezier/README --- old/doc/generic/pst-bezier/README 2009-01-30 01:07:44.000000000 +0100 +++ new/doc/generic/pst-bezier/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -Save the files pst-bezier.sty|tex in a directory, which is part of your -local TeX tree. pst-bezier.pro should be saved in ../texmf/dvips/pstricks/ -Then do not forget to run texhash to update this tree. -pst-bezier needs pst-plot and pst-tricks, which should be part of your -local TeX installation, otherwise get it from a CTAN server, f.ex. -http://www.CTAN.org - - -Save the files - -pst-bezier.sty -pst-bezier.tex -pst-bezier.pro - -in any place, where latex or any other TeX program will find it. -Do not forget to update your database, when installing this -package the first time. - -pst-bezier uses the extended version of the keyval package. So -be sure that you -- have installed xkeyval with the special pst-xkey - (CTAN: tex-archive/macros/latex/contrib/xkeyval/) -- do not load another package after pst-bezier, which loads - the old keyval.sty or pst-key.tex - - -If you like to get the documentation file in another format run - -latex pst-bezier-doc.tex -bibtex pst-bezier.doc -latex pst-bezier-doc.tex -dvips pst-bezier-doc.dvi - -to get a PostScript file. But pay attention, that the pst-bezier -files are saved in the above mentioned way, before you run -latex on the documentation file. - -The intermediate DVI file works only with viewers which can -interprete the embedded PostScript code. - -For another PDF output read the Introduction from -the documentation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/README.md new/doc/generic/pst-bezier/README.md --- old/doc/generic/pst-bezier/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/pst-bezier/README.md 2016-11-25 19:27:47.000000000 +0100 @@ -0,0 +1,39 @@ +Save the files pst-bezier.sty|tex in a directory, which is part of your +local TeX tree. pst-bezier.pro should be saved in ../texmf/dvips/pstricks/ +Then do not forget to run texhash to update this tree. +pst-bezier needs pst-plot and pstricks, which should be part of your +local TeX installation, otherwise get it from a CTAN server +http://mirror.CTAN.org + + +Save the files + +pst-bezier.sty +pst-bezier.tex +pst-bezier.pro + +in any place, where latex or any other TeX program will find it. +Do not forget to update your database, when installing this +package the first time. + +pst-bezier uses the extended version of the keyval package. So +be sure that you +- have installed xkeyval with the special pst-xkey + (CTAN: tex-archive/macros/latex/contrib/xkeyval/) +- do not load another package after pst-bezier, which loads + the old keyval.sty or pst-key.tex + + +If you like to get the documentation file in another format run + +latex pst-bezier-doc.tex +bibtex pst-bezier.doc +latex pst-bezier-doc.tex +dvips pst-bezier-doc.dvi + +to get a PostScript file. But pay attention, that the pst-bezier +files are saved in the above mentioned way, before you run +latex on the documentation file. + +The intermediate DVI file works only with viewers which can +interprete the embedded PostScript code. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/pst-bezier-doc.bib new/doc/generic/pst-bezier/pst-bezier-doc.bib --- old/doc/generic/pst-bezier/pst-bezier-doc.bib 2009-01-30 01:07:44.000000000 +0100 +++ new/doc/generic/pst-bezier/pst-bezier-doc.bib 2016-11-25 19:27:47.000000000 +0100 @@ -1,110 +1,148 @@ -@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{tugboat = {TUGboat} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm} } +@STRING{bretter = {Bretter, die die Welt bedeuten} } +@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{editorial = {Editorial} } +@STRING{fremdebuehne = {Von fremden B{\"u}hnen} } +@STRING{fundus = {Aus dem Fundus} } +@STRING{hinterbuehne = {Hinter der B{\"u}hne} } +@STRING{leserbrief = {Leserbrief(e)} } +@STRING{magazin = {Magazin} } +@STRING{rezension = {Rezensionen} } +@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} } +@STRING{theaterkasse = {Von der Theaterkasse} } +@STRING{theatertage = {{\TeX}-Theatertage} } -@Book{PostScript, - Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, - Publisher = {IWT}, - Address = {Vaterstetten}, - year = 1989, +@Book{PSTricks2, + author = {Herbert Vo\ss}, + title = {{\PST} {G}rafik für \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE -- Lehmanns}, + year = {2016}, + address = {Heidelberg/Berlin} } -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, - Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, - year = 1993, -} - - -@Manual{pdftricks, - Title = {PSTricks Support for pdf}, - Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, - Note = {}, - year = 2002, -} - -@Manual{miwi, - Title = {References for \TeX{} and Friends}, - Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, - year = 2003, -} - - -@Article{dtk02.2:jackson.voss:plot-funktionen, - author = {Laura E. Jackson and Herbert Vo{\ss}}, - title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, - journal = dtk, - year = 2002, - volume = {2/02}, - altvolume = 2, - altnumber = 14, - month = jun, - pages = {27--34}, - annote = bretter, - keywords = {}, - abstract = { Im letzten Heft wurden die mathematischen Funktionen von - \PS~im Zusammenhang mit dem {\LaTeX}-Paket - \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben - und durch Beispiele erl{\"a}utert. In diesem Teil werden - die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r - externe Daten behandelt. } -} - -@Article{dtk02.1:voss:mathematischen, - author = {Herbert Vo{\ss}}, - title = {Die mathematischen {F}unktionen von {P}ostscript}, - journal = dtk, - year = 2002, - volume = {1/02}, - altvolume = 1, - altnumber = 14, - month = mar, - pages = {40-47}, - annote = bretter, - keywords = {}, - abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im - Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es - darum geht zu beurteilen, was es denn nun im eigentlichen - Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass - sich mit den \PS-Funktionen viele Dinge erledigen lassen, - bei denen sonst auf externe Programme zur{\"u}ckgegriffen - wird. Dies wird im Folgenden f{\"u}r die mathematischen - Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot} - gezeigt. } +@Book{PSTricks-E, + author = {Herbert Vo\ss}, + title = {{\PST} {G}raphics for \LaTeX}, + edition = {1}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge} +} + +@Book{companion04, + author = {Frank Mittelbach and Michel Goosens et al}, + title = {The {\LaTeX} {C}ompanion}, + edition = {second}, + publisher = {Addison-Wesley Publishing Company}, + year = {2004}, + address = {Boston} +} + +@Book{unbound, + author = {Alan Hoenig}, + title = {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore}, + publisher = {Oxford University Press}, + year = {1998}, + address = {London} } - -@Book{companion, - author = {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss}, +@Book{tlgc2, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, title = {The {\LaTeX} {G}raphics {C}ompanion}, publisher = {{Addison-Wesley Publishing Company}}, + edition = 2, year = {2007}, - edition = {2nd}, address = {Reading, Mass.} } -@Book{PSTricks2, - author = {Herbert Vo\ss}, - title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {5.}, - publisher = {DANTE/Lehmanns Media}, - year = {2008}, - address = {Heidelberg/Berlin} +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21--70} +} + +@Article{girou:02:, + author = {{Timothy Van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239--246} } -@Book{voss:math, - author = {Herbert Vo\ss}, - title = {Mathematik mit \LaTeX}, - publisher = {{DANTE/Lehmanns Media}}, - year = {2009}, - address = {Heidelberg/Berlin} +@Book{PostScript, + Author = {Kollock, Nikolai G.}, + Title = {PostScript richtig eingesetzt: vom {K}onzept zum + praktischen {E}insatz}, + Publisher = {IWT}, + Address = {Vaterstetten}, + year = 1989, +} + +@online{pstricks, + Title = {PSTricks - {\PS} macros for generic {\TeX}}, + Author = {{Timothy Van} Zandt}, + Organization = {\TeX\ Users Group}, + url = {http://www.tug.org/application/PSTricks}, + urldate={2016-08-21}, + year = 1993 +} + +@ctan{pst-plot, + Title = {\texttt{pst-plot}: Plotting two dimensional functions and data}, + Author = {{Timothy Van} Zandt and Herbert Voß}, + Organization = {CTAN}, + url = {graphics/pstricks/generic/pst-plot.tex}, + year = 2016 +} + +@ctan{multido, + Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, + Author = {{Timothy Van} Zandt}, + Organization = {CTAN}, + url = {/graphics/pstricks/generic/multido.tex}, + year = 1997 +} + +@inproceedings{GB16, + TITLE = {Mass points, {B}\'ezier curves and conics: a survey}, + AUTHOR = {Lionel Garnier and Jean-Paul Bécar}, + url = {http://ufrsciencestech.u-bourgogne.fr/~garnier/publications/adg2016/}, + BOOKTITLE = {Eleventh International Workshop on Automated Deduction in Geometry}, + ADDRESS = {Strasbourg, France}, + SERIES = {Proceedings of ADG 2016}, + PAGES = {97--116}, + date = {2016-06}, + urldate={2016-08-20}, +} + +@online{gb16a, + author={Lionel Garnier}, + title={Courbes de Bézier et coniques}, + url={http://ufrsciencestech.u-bourgogne.fr/~garnier/Migs/03_CourbesBezierPointsMassiquesEleve.pdf}, + urldate={2016-08-20}, +} +@online{gb16b, + author={Lionel Garnier and Jean-Paul Bécar and Lucie Drouton}, + title={Surfaces canal et courbes de Bézier rationnelles quadratiques}, + journal={Journées du Groupe de Travail en Modélisation Géométrique 2016}, + address={Dijon}, + url={http://ufrsciencestech.u-bourgogne.fr/~garnier/publications/hippocampe/64_GTMG2016_courbesBezierSurfacesCanal.pdf}, + urldate={2016-08-20}, +} + +@PhdThesis{Bec97, +author = {Jean-Paul Bécar}, +title = {Forme ({B}{R}) des coniques et de leurs faisceaux}, +school = {Université de Valenciennes et de Hainaut-Cambrésis, LIMAV}, +date = {1997-12-12}, +address= {Valenciennes, France}, } Binary files old/doc/generic/pst-bezier/pst-bezier-doc.pdf and new/doc/generic/pst-bezier/pst-bezier-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-bezier/pst-bezier-doc.tex new/doc/generic/pst-bezier/pst-bezier-doc.tex --- old/doc/generic/pst-bezier/pst-bezier-doc.tex 2009-01-30 01:07:44.000000000 +0100 +++ new/doc/generic/pst-bezier/pst-bezier-doc.tex 2016-11-25 19:27:47.000000000 +0100 @@ -1,21 +1,35 @@ -%% $Id: pst-bezier-doc.tex 86 2009-01-29 10:34:00Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} +%% $Id: pst-bezier-doc.tex 134 2009-09-27 12:28:50Z herbert $ +\documentclass[11pt,english,bibliography=totoc,parskip=false,smallheadings, + oneside]{pst-doc} \usepackage[utf8]{inputenc} -\usepackage{pst-bezier} \usepackage{esvect} \let\vec\vv +\usepackage{animate} +\usepackage{pst-bezier} +\usepackage{bbold} +\addbibresource{pst-bezier-doc.bib} \let\pstBezierFV\fileversion \lstset{pos=l,wide=false,language=PSTricks, morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily} +\definecolor{navy}{rgb}{0 0 0.5} % +\def\bgImage{\pspicture[showgrid](0,1)(5,6) +\psset{showpoints} +\psbcurve[linecolor=blue,linewidth=0.01](1,1)% + (2,2)(3,1)(4,2)(4,4)(3,5)% + (2,4)(1,5) +\psbcurve(1,1)(2,2)(3,1)(4,2)% + T{0.5}(4,4)(3,5)(2,4)(1,5) +\endpspicture} +\newtheorem{definition}{Definition} +\def\dy{\displaystyle} \begin{document} \title{\texttt{pst-bezier}} \subtitle{A PSTricks package for drawing Bezier curves; v.\pstBezierFV} -\author{Tobias Nähring \\Herbert Vo\ss} -\docauthor{} +\author{Jean-Paul Bécar\\Lionel Garnier\\Manuel Luque\\Tobias Nähring \\Herbert Voß} +\docauthor{Lionel Garnier\\Herbert Voß} \date{\today} \maketitle @@ -37,7 +51,7 @@ points. Note that some control is possible via the \Lkeyword{curvature} option. -The \Lcs{psbezier} macro gives full control over the +The \Lcs{psbcurve} macro gives full control over the interpolation points and the control points of one Bezier polynominal of degree three (two interpolated points and two control points). @@ -47,7 +61,7 @@ Jean-C\^ome Charpentier. \end{abstract} -%% Author: Tobias N"ahring +\clearpage \section{Introduction} @@ -95,7 +109,7 @@ \usepackage{pstricks} \usepackage{pst-bezier} \begin{document} - \begin{pspicture}(6,4) + \begin{pspicture}(0,-0.4)(6,2) \psbcurve(1,2)(5,2) % Draw just one straight line. \end{pspicture} \end{document} @@ -107,8 +121,8 @@ points as the argument of \Lcs{psbcurve}. \begin{LTXexample} -\begin{pspicture}[showgrid=true](5,3) - \psbcurve(1,1)(2,2)(3,1)(4,2) +\begin{pspicture}[showgrid](0,-0.4)(5,3) + \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2) \end{pspicture} \end{LTXexample} @@ -116,8 +130,8 @@ \begin{LTXexample} -\begin{pspicture}[showgrid=true](5,3) - \psbcurve[showpoints=true](1,1)(2,2)(3,1)(4,2) +\begin{pspicture}[showgrid](0,-0.4)(5,3) + \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2) \end{pspicture} \end{LTXexample} @@ -129,8 +143,8 @@ description, it is not a feature of \Lcs{psbcurve}). \begin{LTXexample} -\begin{pspicture}[showgrid=true](5,3) - \psbcurve[showpoints=true](1,1)(2,2)(3,1)(4,2) +\begin{pspicture}[showgrid](0,-0.4)(5,3) + \psbcurve[showpoints](1,1)(2,2)(3,1)(4,2) \uput[-90](1,1){$\vec{p}_{0}=\vec{l}_{1}$} \uput[90](1.5,2){$\vec{r}_{1}$} \uput[90](2,2){$\vec{p}_{1}$} @@ -181,8 +195,8 @@ \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)l(2,1)(2,2)(3,1)r(4,1)(4,2) @@ -192,8 +206,8 @@ \end{LTXexample} \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2) @@ -208,7 +222,7 @@ \begin{LTXexample} -\pspicture(5,3) +\pspicture(0,-0.4)(5,3) \psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2) \endpspicture \end{LTXexample} @@ -220,10 +234,10 @@ demonstrated in the next example. \begin{LTXexample} -\pspicture[showgrid=true](5,3) +\pspicture[showgrid](0,-0.4)(5,3) \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) -\psset{showpoints=true} +\psset{showpoints} \psbcurve(1,1)(2,2)L(2,1)(3,1)(4,2) \uput[-90](2,1){$\vec{l}_{2}$} \uput[0](2,2){$\vec{p}_{1}$} @@ -236,8 +250,8 @@ \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)(2,2)t{0.5}(3,1)(4,2) @@ -252,8 +266,8 @@ respectively, as demonstrated in the following two examples. \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)% @@ -263,8 +277,8 @@ \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)(2,2)tr{0.5}(3,1)(4,2) @@ -278,8 +292,8 @@ a rather surprising effect. \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve(1,1)(2,2)ts{-0.5}(3,1)(4,2) @@ -291,8 +305,8 @@ \begin{LTXexample} -\pspicture[showgrid=true](5,3) -\psset{showpoints=true} +\pspicture[showgrid](0,-0.4)(5,3) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2) \psbcurve[bcurveTension=0.5](1,1)% @@ -307,8 +321,8 @@ that purpose as shown in the following example. \begin{LTXexample} -\pspicture[showgrid=true](5,6) -\psset{showpoints=true} +\pspicture[showgrid](0,0.6)(5,6) +\psset{showpoints} \psbcurve[linecolor=blue,linewidth=0.01](1,1)% (2,2)(3,1)(4,2)(4,4)(3,5)% (2,4)(1,5) @@ -324,7 +338,7 @@ more) are respected by \Lcs{psbcurve} as the following example shows. \begin{LTXexample} -\pspicture[showgrid=true](5,3) +\pspicture[showgrid](0,-0.4)(5,3) \psbcurve[linestyle=dashed, linewidth=3pt, dash=0.5 0.2, @@ -333,7 +347,7 @@ \endpspicture \end{LTXexample} -\section{Things that do not work (`known bugs')} +\subsection{Things that do not work (`known bugs')} As already mentioned this project is something like an experiment. So, there are many things that do not work. @@ -342,10 +356,375 @@ \item The control points are computed in a rather crude way (see above). The \Lkeyword{curvature} option is not recognised. \item If \Lkeyword{fillstyle} is set to \Lkeyword{solid} and - \Lkeyset{showpoints=true} then the fill color covers the interpolation and control points. + \Lkeyword{showpoints} then the fill color covers the interpolation and control points. \item arrow heads do not work. \end{itemize} +\clearpage + +\section{Bezier curve with weighted points} + +\subsection{Mathemathical background} + +A mass point is a weighted point $\left(P;\omega\right)$ with $\omega \neq 0$ or a vector $\left(\overrightarrow{P};0\right)$ with a weight equal to $0$. A generic mass point is noted $\left(P;\omega\right)$. + +Using the quadratic Bernstein polynomials, a rational quadratic B\'ezier curve having three control +mass points $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$ +and $\left(P_{2};\omega_{2}\right)$, is defined as follow: + +\begin{definition}\label{fdef::DefRQBC_Fiorot}: Rational quadratic B\'ezier curve (BR curve) + +Let $\omega_{0}$, $\omega_{1}$ and $\omega_{2}$ be three real numbers. +Let $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$ +and $\left(P_{2};\omega_{2}\right)$ be three mass points, these points are not collinear. + +Define two sets $I = \left \{ i | \omega_i \neq 0 \right \}$ and +$J = \left \{ i | \omega_i = 0 \right \}$ + + +Define the function $\omega_{f}$ from $\left[0;1\right] $ to $\mathbb{R} $ as follows + +\begin{equation} +%\begin{array}{cccc} +%\omega_{f}: & \left[0;1\right] & \longrightarrow & \mathbb{R} \\ +%& t & \longmapsto &\omega_{f}\left(t\right)=\dy\sum_{i\in I}\omega_{i}\times B_{i}\left(t\right) +%\end{array} +\omega_{f}\left(t\right)=\dy\sum_{i\in I}\omega_{i}\times B_{i}\left(t\right) +\label{eq:DenominateurCbreBezier} +\end{equation} + +A mass point $\left(M;\omega\right)$ or $\left(\overrightarrow{u};0\right)$ +belongs to the quadratic B\'ezier curve defined by the three control +mass points $\left(P_{0};\omega_{0}\right)$, $\left(P_{1};\omega_{1}\right)$ +and $\left(P_{2};\omega_{2}\right)$, +if there is a real $t_{0}$ in $\left[0;1\right]$ such that: + +\begin{itemize} +\item [$\bullet$] if $\omega_{f}\left(t_{0}\right)\neq0$ then we have + +\hspace*{-0.75cm}\begin{minipage}{1.0\textwidth} +\begin{equation} +\overrightarrow{OM} = \dy \frac{1}{\omega_{f}\left(t_{0}\right)}\left(\dy \sum_{i\in I} \dy \omega_{i} B_{i}\left(t_{0}\right) + \overrightarrow{OP_{i}} \right) ++\vspace{0.2cm}\dy \frac{1}{\omega_{f}\left(t_{0}\right)}\left( \sum_{i\in J} B_{i}\left(t_{0}\right) \overrightarrow{P_{i}}\right) +\label{eq:DefRQBC_FiorotPoint} +\end{equation} +\end{minipage} + +\item [$\bullet$] if $\omega_{f}\left(t_{0}\right)=0$ then we have +\begin{equation} +\overrightarrow{u}=\sum_{i\in I}\omega_{i}B_{i}\left(t_{0}\right)\overrightarrow{OP_{i}}+\sum_{i\in J}B_{i}\left(t_{0}\right)\overrightarrow{P_{i}}\label{eq:DefRQBC_FiorotVecteur} +\end{equation} + +\end{itemize} +\hrulefill{}\end{definition} + +The reduced discriminant of the denominator $\omega_{f}\left(t_{0}\right)$ is +\begin{equation} +\Delta'=\omega_{1}^{2}-\omega_{2} \omega_{0}\label{eq:DiscrimantReduitCBRQnonStandard} +\end{equation} +and we can state the following fundamental result: +\begin{itemize} +\item[$\star$] +if $\omega_{1}^{2}-\omega_{2} \omega_{0}=0$ then the + denominator has one and only one root, the curve is a parabolic arc; +\item[$\star$] + if $\omega_{1}^{2}-\omega_{2} \omega_{0}>0$ then the + denominator has two distinct roots, the curve is a hyperbolic arc; +\item[$\star$] + if $\omega_{1}^{2}-\omega_{2} \omega_{0}<0$ then the + denominator does not vanish, the curve is an elliptical arc. +\end{itemize} + +We can note w.l.o.g.\footnote{We can permute the role of $P_0$ and $P_2$} that one of the weights can be equal to~$1$. If $\omega_0$ is not equal to $0$, we choose $\omega_0=1$, else, we choose $\omega_1=1$, and we can characterise the type of the conic from the mass points of the BR curve, see Table~\ref{tab::TypeConicEtcbeBr}. + +\begin{table}[!h] +\begin{center} +\begin{tabular}{|c||c|c|c|}\hline +Conic & Three weighted points & Points and vectors \\ \hline \hline +Parabola & $\left(P_{0};1\right)$, $\left(P_{1};\omega\right)$ + $\left(P_{2};\omega^{2}\right)$ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(\overrightarrow{P_{2}};0\right)$\\ \hline \hline + Ellipse & $\left(P_{0};1\right)$, $\left(P_{1};\omega_{1}\right)$, $\left(P_{2};\omega_{2}\right)$, $ \omega_{2}>\omega_{1}^{2} $ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(P_{2};1\right)$ \\ \hline \hline + Hyperbola & $\left(P_{0};1\right)$, $\left(P_{1};\omega_{1}\right)$ $\left(P_{2};\omega_{2}\right)$, $\omega_{2}<\omega_{1}^{2}$ & $\left(P_{0};1\right)$, $\left(\overrightarrow{P_{1}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ $\left(P_{2};-1\right)$ \\ \cline{3-3} +& & $\left(\overrightarrow{P_{0}};0\right)$, $\left(P_{1};1\right)$ and $\left(\overrightarrow{P_{2}};0\right)^{\mathstrut^{\mathstrut}}_{\mathstrut_{\mathstrut}}$ \\ \hline \hline +\end{tabular} +\end{center} +\caption{Types of conics defined by B\'ezier curves with control mass points. +\hrulefill{} +\label{tab::TypeConicEtcbeBr}} +\end{table} + +From the access rights used by Unix and Linux, we define a bijection $f$ between $\mathbb{F_2}^3-\left\lbrace\left(0,0,0\right)\right\rbrace$ and the set $\left\lbrace 1 ,2 , 3, 4, 5, 6, 7\right\rbrace$. From $\left(\omega_2,\omega_1,\omega_0\right)$, we define a triplet $\left(b_2,b_1,b_0\right)$ as follow: if $w_i\neq0$ then $b_i=1$ else $b_i=0$. Then +$$f\left(\omega_2,\omega_1,\omega_0\right)= b_2 \times 4+ b_1 \times 2+b_0$$ + +If $f\left(\omega_2,\omega_1,\omega_0\right)=7$, the control points are weighted points: the curve is an elliptical arc, a parabolic arc or a hyperbolic arc. If $\left(\omega_2,\omega_1,\omega_0\right)=\left(1,-1,1\right)$, the parabolic arc is not bounded and for $t=\frac{1}{2}$, the mass point is a direction vector of the parabola axis. If $\left(\omega_2,\omega_1,\omega_0\right)=\left(1,-2,1\right)$, the hyperbolic arc is not bounded and there exists $t$ in $\left]0,1\right[$ such as the mass point is a direction vector of one of the asymptotes of the hyperbola. \\ +If $f\left(\omega_2,\omega_1,\omega_0\right)=1$, the first control point is a weighted point, the others are vectors: the curve is a parabolic arc. The B\'ezier curve is defined by + \begin{equation} +\begin{cases} + \dy \frac{1}{\omega_0\, B_0\left(t_{0}\right)}\left( \omega_{0}\, B_{0}\left(t_{0}\right) + \overrightarrow{OP_{0}} + B_{1}\left(t_{0}\right) \overrightarrow{P_{1}}+ B_{2}\left(t_{0}\right) + \overrightarrow{P_{2}}\right) & \text{ if }t_0\in\left[0,1\right[ \\[1ex] +\overrightarrow{P_2} & \text{ if }t_0=1\\ + \end{cases} +\label{eq:parabola} +\end{equation} +If $f\left(\omega_2,\omega_1,\omega_0\right)=4$, the B\'ezier curve can be defined in the same way.\\ +If $f\left(\omega_2,\omega_1,\omega_0\right)=2$, the intermediate control point is a weighted point, the others are vectors: the curve is a branch of a hyperbola. The B\'ezier curve is defined by + \begin{equation} +\begin{cases} + \dy \frac{1}{\omega_1\, B_1\left(t_{0}\right)}\left( \omega_{1}\, B_{1}\left(t_{0}\right) \overrightarrow{OP_{1}}+ B_{0}\left(t_{0}\right) \overrightarrow{P_{0}}+ B_{2}\left(t_{0}\right) \overrightarrow{P_{2}}\right) & \text{ if }t_0\in\left]0,1\right[ +\\[1ex] +\overrightarrow{P_0} & \text{ if }t_0=0\\[1ex] +\overrightarrow{P_2} & \text{ if }t_0=1 + \end{cases} +\label{eq:branchHyperbola} +\end{equation} +and the centre of the hyperbola is $P_1$. The vector $\overrightarrow{P_0}$ is a direction vector of an asymptote of the hyperbola whereas the vector $\overrightarrow{P_2}$ is a direction vector of the other asymptote.\\ +If $f\left(\omega_2,\omega_1,\omega_0\right)=5$, the intermediate control point is a vector, the others are weighted points: the curve is an elliptical arc. The B\'ezier curve is defined by + \begin{equation} + \dy \frac{1}{\omega_0\, B_0\left(t_{0}\right)+\omega_2\, B_2\left(t_{0}\right)}\left( \omega_{0}\, B_{0}\left(t_{0}\right) \overrightarrow{OP_{0}} + B_{1}\left(t_{0}\right) \overrightarrow{P_{1}}+ \omega_2\, B_{2}\left(t_{0}\right) \overrightarrow{OP_{2}}\right),\;\; t_0\in\left[0,1\right] +\label{eq:ellipse} +\end{equation} +and the tangent vector to the curve at $P_0$ or $P_2$ is parallel to $\overrightarrow{P_1}$. + +\subsection{Syntax} + +\begin{BDef} +\Lcs{psRQBCmasse}\OptArgs\Largr{$x_0,y_0$}\Largr{$x_1,y_1$}\Largr{$x_2,y_2$}\Largb{$w_0,w_1,w_2$} +\end{BDef} + +For the coordinates of the points all possible kinds of coordinates are possible, like polar, PostScript, nodes, \ldots + +\subsection{Three weighted orthogonal points} +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](-6,-6.4)(3,3) +\psclip{\psframe(-6,-6)(3,3)} + \psRQBCmasse[linecolor=blue](2,0)(2,2)(0,2){1,-1,1} + \psRQBCmasse[linecolor=navy,autoTrace](2,0)(2,2)(0,2){1,1,1} + \rput(P0){$P_0$}\uput[r](P1){$P_1$}\uput[r](P2){$P_2$} +\endpsclip% +\end{pspicture} +\end{LTXexample} + + + +\subsection{Half-ellipse} +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](-3,-2.4)(3,2) +\psframe(-3,-2)(3,2) +\psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-2,0){1,0,1} +\uput[r](P0P1){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$} +\rput(P1P2){$\overrightarrow{P_{1}}$} \uput[r](P0){$P_0$} +\psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-2,0){1,0,1} +\end{pspicture} +\end{LTXexample} + + +\clearpage + +\subsection{Half-parabola} +\subsubsection{Point $P_2$ and two vectors} + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](-3,-3.4)(3,3) +\psclip{\psframe(-3,-3)(3,3)} + \psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-1,0){0,0,1} + \uput[r](P1P2){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$} + \uput[r](P0P2){$\overrightarrow{P_0}$} + \psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-1,0){0,0,1} + \uput[r](P1P2){$\overrightarrow{P_1}$} \uput[r](P2){$P_2$} + \uput[r](P0P2){$\overrightarrow{P_0}$} +\endpsclip +\end{pspicture} +\end{LTXexample} + +\subsubsection{Point $P_0$ and two vectors} + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](-3,-3.4)(3,3) +\psclip{\psframe(-3,-3)(3,3)} + \psRQBCmasse[linecolor=red,autoTrace](2,0)(0,1)(-1,0){1,0,0} + \uput[r](P0P1){$\overrightarrow{P_1}$} \uput[r](P0){$P_0$} + \uput[r](P0P2){$\overrightarrow{P_2}$} + \psRQBCmasse[linecolor=orange,autoTrace=false](2,0)(0,-1)(-1,0){1,0,0} +\endpsclip% +\end{pspicture} +\end{LTXexample} + +\clearpage + +\subsection{Branch of a hyperbola} +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](-3,-3.4)(3,3) +\psclip{\psframe(-3,-3)(3,3)} + \psRQBCmasse[linecolor=red,autoTrace](1,1)(0,0)(-1,1){0,1,0} + \uput[r](P0){$\overrightarrow{P_0}$} \uput[r](0,-0.5){$P_1$} + \uput[r](P2){$\overrightarrow{P_2}$} + \psRQBCmasse[linecolor=orange,autoTrace=false](1,1)(0,0)(-1,1){0,-1,0} +\endpsclip% +\end{pspicture} +\end{LTXexample} + +\subsection{Parabola} +\begin{LTXexample}[pos=t] +\psset{unit=0.5} +\begin{pspicture}(-14,-3.4)(15,10) +\psclip{\psframe(-14,-3)(15,10)} + \psRQBCmasse[linecolor=red,autoTrace](0,6)(-13,0)(-1,-1){1,1,1} + \psRQBCmasse[linecolor=orange](0,6)(-13,0)(-1,-1){1,-1,1} + \uput[u](P0){$P_0$}\uput[l](P1){$P_1$}\uput[d](P2){$P_2$} +\endpsclip +\end{pspicture} +\end{LTXexample} + + +\clearpage + +\subsection{Ellipse} +\begin{LTXexample}[pos=t] +\psset{unit=0.5} +\begin{pspicture}(-14,-3.4)(15,10) +\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] +%\psplotImp[linewidth=0.5pt,linecolor=blue,algebraic](-6,-3)(15,10)% + %{ -0.044*x^2-0.161*y^2 + 0.075*x*y + 0.074*x + 0.797*y + 1} +\psRQBCmasse[nPoints=20,autoTrace,showpoints](0,6)(-13,0)(-1,-1){1,0.5,1} +\psRQBCmasse[nPoints=40,linecolor=red,showpoints](0,6)(-13,0)(-1,-1){1,-0.5,1} +\psaxes[labelFontSize=\scriptscriptstyle]{->}(0,0)(-14,-3)(15,10) +\end{pspicture} +\end{LTXexample} + + +\subsection{Complete circle} +\begin{LTXexample}[pos=t] +\psset{unit=1} +\begin{pspicture}(-4,-4.4)(4,4) +\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] +\psRQBCmasse[autoTrace](0,3)(3,3)(3,0){1,1,2} +\psRQBCmasse[linecolor=red](0,3)(3,3)(3,0){1,-1,2} +\psaxes[labelFontSize=\scriptscriptstyle]{->}(0,0)(-4,-4)(4,4) +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\psset{unit=1.5} +\begin{pspicture}(-4,-4.4)(4,4) +\psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] +\psRQBCmasse[autoTrace](0,3)(3,0)(0,-3){1,0,1} +\uput[u](-0.25,3){$P_0$} +\uput[u](-0.25,-3.5){$P_2$} +\uput[u](3,3){$\overrightarrow{P_1}$} +\uput[u](3,-3.5){$\overrightarrow{P_1}$} +\uput[u](2.5,0){$\overrightarrow{P_1}$} +\psRQBCmasse[linecolor=red](0,3)(-3,0)(0,-3){1,0,1} +\psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(4,4) +\end{pspicture} +\end{LTXexample} +We get a circle because we have + +\begin{equation} +\left\lbrace +\begin{array}{rcl} +\omega_0\times\omega_2\times P_0 P_2^2 &= &4\times\overrightarrow{P_1}^2 \\[0.2cm] +\overrightarrow{P_0 P_2} &\perp & \overrightarrow{P_1} +\end{array} +\right. +\end{equation} + +\clearpage + + +\subsection{Animations} + +\subsubsection{$w_0=1$, $w_2=1$ and a variable $w_1$} + +With the beginning of $w_1=0$ +the curves are swapped. In the case of Bezier curves $w_1 = 0$ gives only +the $[P_0 P_2]$ segment. Using the mass points, the point $P_1$ no longer exists but we get the vector $\overrightarrow{P_1}$. + + +\bigskip +\begin{center} +\begin{animateinline}[controls,loop,palindrome, + begin={\begin{pspicture}(-4,-4)(10,4)}, + end={\end{pspicture}}]{3}% 3 images/s +\multiframe{40}{rA=2.0+-0.1,rB=-2.0+0.1}{% + \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] + \psclip{\psframe(-4,-4)(10,4)} + \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rA,1} + \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$} + \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rB,1} + \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(10,4) + \rput(8,3){$w_1=\rA$}% + \endpsclip +} +\end{animateinline} +\end{center} + +\begin{lstlisting} +\begin{animateinline}[controls,loop,palindrome, + begin={\begin{pspicture}(-4,-4)(10,4)}, + end={\end{pspicture}}]{3}% 3 images/s +\multiframe{40}{rA=2.0+-0.1,rB=-2.0+0.1}{% + \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] + \psclip{\psframe(-4,-4)(10,4)} + \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rA,1} + \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$} + \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,\rB,1} + \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-4,-4)(10,4) + \rput(8,3){$w_1=\rA$}% + \endpsclip +} +\end{animateinline} +\end{lstlisting} + + + +\clearpage + +\subsubsection{$w_0=1$, $\left |w_1\right|=1$ and a variable $w_2$} + +%L'utilisation de $\left |w_1\right|$ permet d'obtenir les deux arcs et donc toute la conique. +The use of $\left |w_1\right|$ provides both arcs and the whole cone. + +\bigskip +\begin{center} +\begin{animateinline}[controls,loop,palindrome, + begin={\begin{pspicture}(-8,-4)(4,4)}, + end={\end{pspicture}}]{3}% 3 images/s +\multiframe{80}{rA=4.0+-0.1}{% + \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] + \psclip{\psframe(-8,-4)(4,4)} + \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,1,\rA} + \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$} + \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,-1,\rA} + \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-8,-4)(4,4) + \rput[rb](3.5,3){$w_2=\rA$}% + \endpsclip +} +\end{animateinline} +\end{center} + +\begin{lstlisting} +\begin{animateinline}[controls,loop,palindrome, + begin={\begin{pspicture}(-8,-4)(4,4)}, + end={\end{pspicture}}]{3}% 3 images/s +\multiframe{80}{rA=4.0+-0.1}{% + \psgrid[subgriddiv=0,gridcolor=lightgray,griddots=5,gridlabels=0pt] + \psclip{\psframe(-8,-4)(4,4)} + \psRQBCmasse[autoTrace,linewidth=1.5pt](0,-1)(1,0)(0,1){1,1,\rA} + \uput[u](P2){$P_2$}\uput[l](P1){$P_1$}\uput[d](P0){$P_0$} + \psRQBCmasse[linecolor=red,linewidth=1.5pt](0,-1)(1,0)(0,1){1,-1,\rA} + \psaxes[labelFontSize=\scriptscriptstyle,linewidth=0.01]{->}(0,0)(-8,-4)(4,4) + \rput[rb](3.5,3){$w_2=\rA$}% + \endpsclip +} +\end{animateinline} +\end{lstlisting} + + +\clearpage + \section{List of all optional arguments for \texttt{pst-bezier}} @@ -355,11 +734,13 @@ \bgroup \raggedright \nocite{*} -\bibliographystyle{plain} -\bibliography{pst-bezier-doc} +\printbibliography \egroup \printindex \end{document} + + +Moreover, we can choose a non Euclidean metric. The use of mass points, Bézier curves, conics and the space of spheres in the Minkowski-Lorentz space permits to realise G1-continous blend between Dupin cyclides : to blend surfaces in R3, we blend Bézier curves in R5. For example, we can build a seahorse (see 09_LorentzHippocampeComplet.png), the article (in French) is here: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bezier.doc.tlpobj new/tlpkg/tlpobj/pst-bezier.doc.tlpobj --- old/tlpkg/tlpobj/pst-bezier.doc.tlpobj 2016-04-14 19:36:37.000000000 +0200 +++ new/tlpkg/tlpobj/pst-bezier.doc.tlpobj 2017-04-14 17:55:02.000000000 +0200 @@ -1,11 +1,11 @@ name pst-bezier.doc category Package -revision 15878 +revision 41981 shortdesc doc files of pst-bezier relocated 1 -docfiles size=32 +docfiles size=296 RELOC/doc/generic/pst-bezier/Changes - RELOC/doc/generic/pst-bezier/README + RELOC/doc/generic/pst-bezier/README.md RELOC/doc/generic/pst-bezier/pst-bezier-doc.bib RELOC/doc/generic/pst-bezier/pst-bezier-doc.pdf RELOC/doc/generic/pst-bezier/pst-bezier-doc.tex ++++++ pst-bezier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-bezier/pst-bezier.pro new/dvips/pst-bezier/pst-bezier.pro --- old/dvips/pst-bezier/pst-bezier.pro 2009-01-30 01:07:44.000000000 +0100 +++ new/dvips/pst-bezier/pst-bezier.pro 2016-11-25 19:30:57.000000000 +0100 @@ -1,17 +1,16 @@ -%% $Id: pst-bezier.pro 87 2009-01-29 10:37:06Z herbert $ -%% PostScript prologue for pstricks-add.tex. +%% $Id: pst-bezier.pro 323 2016-08-20 17:57:28Z herbert $ +%% PostScript prologue for pst-bezier.tex. %% -%% Version 0.01, 2009/01/29 +%% Version 0.02, 2016/08/19 %% %% For distribution, see pst-bezier.tex. %% %% tx@Dict begin - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Auxiliary routines: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - +% %% [x1 y1] [x2 y2] -> [ x1+y1 x2+y2 ] /AddArrays2d { [ 3 1 roll %% Get the operands @@ -40,8 +39,7 @@ 3 1 roll 1 get mul ] } bind def - - +% %% << [Array of Bezier splines] /K 1 >> -> empty stack %% Thereby, a Bezier spline is described by an array: %% [x0 y0 x1 y1 x2 y2 x3 y3 sl sr] @@ -71,7 +69,6 @@ Splines K 1 sub get 2 2 getinterval SubArrays2d putinterval %% } if - %% Second control point: Splines K get 2 get dup %% (cases /n and /s) /n eq { %% `not specified' -> automatically computed @@ -106,4 +103,134 @@ ] end def %% Put points in the top dictionary } bind def +% +/tx@RQBCmasse { + /P0P1{ + xP0 xP1 add + yP0 yP1 add + } def + /P0P2{ + xP0 xP2 add + yP0 yP2 add + } def + /P1P2{ + xP2 xP1 add + yP2 yP1 add + } def + /B0 { 1 t sub dup mul } def + /B1 {2 t mul 1 t sub mul }def + /B2 { t dup mul }def +% +% w0 abs 1e-6 gt {1}{0} ifelse /choixw0 exch def +% w1 abs 1e-6 gt {1}{0} ifelse /choixw1 exch def +% w2 abs 1e-6 gt {1}{0} ifelse /choixw2 exch def +% /choix choixw2 4 mul choixw1 2 mul add choixw0 add def + choix 1 eq { + /den { w0 B0 mul }def % + /RQBCmasse1 { + 0 1 nB {/t exch nB div def + den 0 ne { + w0 B0 mul xP0 mul B1 xP1 mul add B2 xP2 mul add den div + w0 B0 mul yP0 mul B1 yP1 mul add B2 yP2 mul add den div + } if + } for + } def + /RQBCmasse2 {} def + } if % fin choix 1 + choix 2 eq { + /den {w1 B1 mul } def % + /RQBCmasse1 { + 1 1 nB {/t exch nB div def + den 0 ne {% B0*P0+w1*B1*P1+B2*P2 + B0 xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div + B0 yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div + } if + } for + } def + /RQBCmasse2 {} def + } if % fin choix 2 + choix 3 eq { + /den { w0 B0 mul w1 B1 mul add } def % w0*B0+w1*B1 + /RQBCmasse1 { + 0 1 nB {/t exch nB div def + den 1e-6 gt { % w0*B0*P0+w1*B1*P1+B2*P2 + w0 B0 mul xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div + w0 B0 mul yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div + } if + } for + } def + /RQBCmasse2 { + 0 1 nB {/t exch nB div def + den -1e-6 lt { % w0*B0*P0+w1*B1*P1+B2*P2 + w0 B0 mul xP0 mul w1 B1 mul xP1 mul add B2 xP2 mul add den div + w0 B0 mul yP0 mul w1 B1 mul yP1 mul add B2 yP2 mul add den div + } if + } for + } def + } if % fin choix 3 + choix 4 eq { + /den { w2 B2 mul } def % w2*B2 + /RQBCmasse1 { + 0 1 nB {/t exch nB div def + den 0 ne { % B0*P0+B1*P1+w2*B2*P2 + B0 xP0 mul B1 xP1 mul add w2 B2 mul xP2 mul add den div + B0 yP0 mul B1 yP1 mul add w2 B2 mul yP2 mul add den div + } if + } for + } def + /RQBCmasse2 {} def + } if % fin choix 4 + choix 5 eq { + /den {w0 B0 mul w2 B2 mul add} def % w0*B0+w2*B2 + /RQBCmasse1 { + 1 1 nB {/t exch nB div def + den 0 ne { % w0*B0*P0+B1*P1+w2*B2*P2 + w0 B0 mul xP0 mul B1 xP1 mul add w2 B2 mul xP2 mul add den div + w0 B0 mul yP0 mul B1 yP1 mul add w2 B2 mul yP2 mul add den div + } if + } for + } def + /RQBCmasse2 {} def + } if % fin choix 5 + choix 6 eq { + /den { w1 B1 mul w2 B2 mul add } def % w1*B1+w2*B2 + /RQBCmasse1 { + 0 1 nB {/t exch nB div def + den 1e-6 gt { % B0*P0+w1*B1*P1+w2*B2*P2 + B0 xP0 mul w1 B1 mul xP1 mul add w2 B2 mul xP2 mul add den div + B0 yP0 mul w1 B1 mul yP1 mul add w2 B2 mul yP2 mul add den div + } if + } for + } def + /RQBCmasse2 { + 0 1 nB {/t exch nB div def + den -1e-6 lt { % B0*P0+w1*B1*P1+w2*B2*P2 + B0 xP0 mul w1 B1 mul xP1 mul add w2 B2 mul xP2 mul add den div + B0 yP0 mul w1 B1 mul yP1 mul add w2 B2 mul yP2 mul add den div + } if + } for + } def + } if % fin choix 6 + choix 7 eq { + /den { w0 B0 mul w1 B1 mul add w2 B2 mul add } def +% tableau de pointslist[(w0-w1+sqrt(-w0*w2+w1^2))/(w0-2*w1+w2),(w0-w1-sqrt(-w0*w2+w1^2))/(w0-2*w1+w2)] + /RQBCmasse1 { + 0 1 nB {/t exch nB div def + den 1e-6 gt { % w0*B0*P0+w1*B1*P1+w2*B2*P2 + w0 B0 mul xP0 mul B1 w1 mul xP1 mul add w2 B2 mul xP2 mul add den div % xP + w0 B0 mul yP0 mul B1 w1 mul yP1 mul add w2 B2 mul yP2 mul add den div % yP + } if + } for + } def + /RQBCmasse2 { + 0 1 nB {/t exch nB div def + den -1e-6 lt { + w0 B0 mul xP0 mul B1 w1 mul xP1 mul add w2 B2 mul xP2 mul add den div % xP + w0 B0 mul yP0 mul B1 w1 mul yP1 mul add w2 B2 mul yP2 mul add den div % yP + } if + } for + } def + } if % fin du choix 7 +} def +% end %% tx@Dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-bezier/pst-bezier.tex new/tex/generic/pst-bezier/pst-bezier.tex --- old/tex/generic/pst-bezier/pst-bezier.tex 2009-01-30 01:07:44.000000000 +0100 +++ new/tex/generic/pst-bezier/pst-bezier.tex 2016-11-25 19:33:37.000000000 +0100 @@ -6,8 +6,8 @@ %% %% Package `pst-bezier.tex' %% -%% Tobias Nähring (www.tn-home.de) -%% Herbert Voss <voss(a)PSTricks.de> +%% Tobias Nähring (www.tn-home.de) (inactive) +%% Herbert Voss <hvoss(a)tug.org> %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -20,18 +20,20 @@ \csname PSTbezierLoaded\endcsname \let\PSTbezierLoaded\endinput -\def\fileversion{0.01} -\def\filedate{2009/01/29} -\message{ v\fileversion, \filedate} - \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi -\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi +\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi +\ifx\PSTplotLoaded\endinput\else \input pst-plot \fi +\ifx\PSTnodesLoaded\endinput\else\input pst-node \fi + +\def\fileversion{0.03} +\def\filedate{2016/09/03} +\message{ v\fileversion, \filedate} \edef\TheAtCode{\the\catcode`\@}\catcode`\@=11 \pst@addfams{pst-bezier} -%% We need this: +%% We need this if we do not have LaTeX: \expandafter\if\csname gobble\endcsname\relax\def\gobble#1{}\fi %% %% \newcommand is not native TeX. Therefore the following definition. @@ -187,7 +189,7 @@ %% The following macro declare the pstricks option psbcurveTension %% and set it to its default value. \define@key[psset]{pst-bezier}{bcurveTension}[0.25]{\def\psk@bcurveTension{#1}} -\psset{bcurveTension=0.25} +\psset[pst-bezier]{bcurveTension=0.25} %% Points of a spline that are not set yet %% to a certain value or action @@ -198,8 +200,8 @@ \def\psbcurve@pointSetDefaults{% \psbcurve@defIfVoid{l}{\psbcurve@ptNotDef}% \psbcurve@defIfVoid{r}{\psbcurve@ptNotDef}% - \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space}}% - \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space}}% + \psbcurve@defIfVoid{sl}{\code{ \psk@bcurveTension\space }}% + \psbcurve@defIfVoid{sr}{\code{ \psk@bcurveTension\space }}% \psbcurve@defIfVoid{addon}{}% } @@ -236,34 +238,34 @@ \def\psbcurve@tension#1{\futurelet\psbcurve@tmp\psbcurve@@tension} %% \def\psbcurve@@tension{% -\psbcurve@switch\psbcurve@tmp{% - l,\psbcurve@ltension,% - r,\psbcurve@rtension,% - s,\psbcurve@stension,% - \relax,\psbcurve@@@tension% + \psbcurve@switch\psbcurve@tmp{% + l,\psbcurve@ltension,% + r,\psbcurve@rtension,% + s,\psbcurve@stension,% + \relax,\psbcurve@@@tension }} %% the modifier t without further sub-modifiers \def\psbcurve@@@tension#1{% -\psbcurve@def{sr}{\code{ #1 }}% -\psbcurve@def{sl}{\code{ #1 }}% -\psbcurve@next} + \psbcurve@def{sr}{\code{ #1 }}% + \psbcurve@def{sl}{\code{ #1 }}% + \psbcurve@next} %% the modifier ts \def\psbcurve@stension#1#2{% symmetric -\psbcurve@def[-1]{sr}{\code{ #2 }}% -\psbcurve@def{sl}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def[-1]{sr}{\code{ #2 }}% + \psbcurve@def{sl}{\code{ #2 }}% + \psbcurve@next} %% the modifier tl \def\psbcurve@ltension#1#2{% left control point -\psbcurve@def{sl}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def{sl}{\code{ #2 }}% + \psbcurve@next} %% the modifier tr \def\psbcurve@rtension#1#2{% right control point -\psbcurve@def{sr}{\code{ #2 }}% -\psbcurve@next} + \psbcurve@def{sr}{\code{ #2 }}% + \psbcurve@next} %% This macro is called if the next token is %% no modifier but a point (x,y) @@ -321,15 +323,90 @@ \def\psbcurve@next{\futurelet\psbcurve@tmp\psbcurve@@next} \def\psbcurve@@next{% \psbcurve@switch\psbcurve@tmp{% -(,\psbcurve@nextPoint,%) -l,\psbcurve@lPoint,% -r,\psbcurve@rPoint,% -L,\psbcurve@LPoint,% -t,\psbcurve@tension,% -T,\psbcurve@Tension,% -\relax,\psbcurve@end}% + (,\psbcurve@nextPoint,%) + l,\psbcurve@lPoint,% + r,\psbcurve@rPoint,% + L,\psbcurve@LPoint,% + t,\psbcurve@tension,% + T,\psbcurve@Tension,% + \relax,\psbcurve@end}% } - +% +\define@key[psset]{pst-bezier}{nPoints}{\def\psk@nPoints{#1 }} +\define@boolkey[psset]{pst-bezier}[Pst@]{showPolygon}[true]{} +\define@boolkey[psset]{pst-bezier}[Pst@]{autoTrace}[true]{} +% valeurs par défaut +% les coordonnées des points de contrôle P0= x0 y0, etc. +%\psset[pst-RQBC]{P0=2 0,P1=2 2,P2=0 2,w=1 0.707 1,n=400,showPoints=true,showPolygon=false} +\psset[pst-bezier]{nPoints=400,showPolygon=false,autoTrace=false} +% +\def\pst@get@w#1,#2,#3\@nil{% + \def\pst@@w{#1 #2 #3 }% + \def\psk@wZero{#1 }% + \def\psk@wUn{#2 }% + \def\psk@wDeux{#3 }} +% +\def\psRQBCmasse{\def\pst@par{}\pst@object{psRQBCmasse}} +\def\psRQBCmasse@i(#1)(#2)(#3)#4{{% +% \addbefore@par{showpoints=false}% + \begin@SpecialObj + \pst@get@w#4\@nil + \pst@getcoor{#1}\pst@tempA + \pst@getcoor{#2}\pst@tempB + \pst@getcoor{#3}\pst@tempC + \pst@cntm=\pscalculate{abs(\psk@wZero)<1e-6 ? 0 : 1}% + \pst@cntn=\pscalculate{abs(\psk@wUn)<1e-6 ? 0 : 2}% + \pst@cnto=\pscalculate{abs(\psk@wDeux)<1e-6 ? 0 : 4}% + \edef\ps@choix{\the\numexpr\pst@cntm+\pst@cntn+\pst@cnto}% +% \typeout{>>pst-bezier: ps@choix=\ps@choix}% + \pstVerb{ +% \addto@pscode{ + tx@Dict begin + /nB \psk@nPoints def + \pst@tempA \tx@UserCoor /yP0 exch def /xP0 exch def + \pst@tempB \tx@UserCoor /yP1 exch def /xP1 exch def + \pst@tempC \tx@UserCoor /yP2 exch def /xP2 exch def + \pst@@w /w2 exch def /w1 exch def /w0 exch def + /choix \ps@choix\space def + tx@RQBCmasse + end + } % fin pstVerb + \pnodes(#1){P0}(#2){P1}(#3){P2} + \pnode(!P0P1){P0P1} + %\pnode(!P1P0){P1P0} + \pnode(!P1P2){P1P2} + \pnode(!P0P2){P0P2} + \pslistplot{RQBCmasse1}\pslistplot[showpoints=false]{RQBCmasse2}% + \ifPst@autoTrace + \ifcase\ps@choix + \or %1 + \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P1) + \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P2) + %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1) + \psdots(#1)%(P1)(P2) + \or %2 + \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#2)(P0P1) + \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#2)(P1P2) + %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1) + \psdots(#2)%(P1)(P2) + \or %3 + \or %4 + \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P1P2) + \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P0P2) + %\psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(P1) + \psdots(#3)%(P1)(P2) + \or % 5 + \psline[linestyle=dashed,linecolor=black,arrowinset=0.1,arrowsize=0.2]{->}(#1)(P0P1) + \psline[linestyle=dashed,linecolor=green,arrowinset=0.1,arrowsize=0.2]{->}(#3)(P1P2) + \psline[linestyle=dashed,linecolor=magenta,arrowinset=0.1,arrowsize=0.2]{->}(#2) + \psdots(#1)(#2)(#3) + \or %6 + \or %7 + \psline(#1)(#2)(#3)\psdots(#1)(#2)(#3) + \fi + \fi + \end@SpecialObj}\ignorespaces} +% \catcode`\@=\TheAtCode\relax \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-bezier/pst-bezier.sty new/tex/latex/pst-bezier/pst-bezier.sty --- old/tex/latex/pst-bezier/pst-bezier.sty 2009-01-30 01:07:44.000000000 +0100 +++ new/tex/latex/pst-bezier/pst-bezier.sty 2016-11-25 19:33:57.000000000 +0100 @@ -1,13 +1,18 @@ -%% $Id: pst-bezier.sty 86 2009-01-29 10:34:00Z herbert $ +%% $Id: pst-bezier.sty 321 2016-08-20 07:45:01Z herbert $ % \RequirePackage{pstricks} -\ProvidesPackage{pst-bezier}[2009/01/29 v. 0.01 package wrapper for +\RequirePackage{expl3} +\ExplSyntaxOn + \cs_new_eq:NN \pscalculate \fp_eval:n +\ExplSyntaxOff +% +\ProvidesPackage{pst-bezier}[2016/08/19 v. 0.02 package wrapper for pst-bezier.tex (hv)] \input{pst-bezier.tex} \ProvidesFile{pst-bezier.tex} [\filedate\space v\fileversion\space `PST-bezier' (tn,hv)] \IfFileExists{pst-bezier.pro}{% \ProvidesFile{pst-bezier.pro} - [2009/01/29 v. 0.01, PostScript prologue file (tn,hv)] + [2016/08/19 v. 0.02, PostScript prologue file (tn,hv)] \(a)addtofilelist{pst-bezier.pro}}{}% \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bezier.tlpobj new/tlpkg/tlpobj/pst-bezier.tlpobj --- old/tlpkg/tlpobj/pst-bezier.tlpobj 2016-04-14 19:36:37.000000000 +0200 +++ new/tlpkg/tlpobj/pst-bezier.tlpobj 2017-04-14 17:55:02.000000000 +0200 @@ -1,18 +1,18 @@ name pst-bezier category Package -revision 15878 +revision 41981 shortdesc Draw Bezier curves relocated 1 longdesc The package provides a macro \psbcurve for drawing a Bezier longdesc curve. Provision is made for full control of over all the longdesc control points of the curve. -runfiles size=5 +runfiles size=7 RELOC/dvips/pst-bezier/pst-bezier.pro RELOC/tex/generic/pst-bezier/pst-bezier.tex RELOC/tex/latex/pst-bezier/pst-bezier.sty catalogue-also ebezier catalogue-ctan /graphics/pstricks/contrib/pst-bezier -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-09-03 14:36:12 +0200 catalogue-license lppl catalogue-topics graphics-curve pstricks -catalogue-version 0.01 +catalogue-version 0.03 ++++++ pst-blur.doc.tar.xz ++++++ ++++++ pst-blur.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-blur.tlpobj new/tlpkg/tlpobj/pst-blur.tlpobj --- old/tlpkg/tlpobj/pst-blur.tlpobj 2016-04-14 19:36:37.000000000 +0200 +++ new/tlpkg/tlpobj/pst-blur.tlpobj 2017-04-14 17:55:02.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-blur/pst-blur.tex RELOC/tex/latex/pst-blur/pst-blur.sty catalogue-ctan /graphics/pstricks/contrib/pst-blur -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-subpic pstricks catalogue-version 2.0 ++++++ pst-bspline.doc.tar.xz ++++++ ++++++ pst-bspline.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-bspline.tlpobj new/tlpkg/tlpobj/pst-bspline.tlpobj --- old/tlpkg/tlpobj/pst-bspline.tlpobj 2016-04-23 03:19:09.000000000 +0200 +++ new/tlpkg/tlpobj/pst-bspline.tlpobj 2017-04-14 17:55:03.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/generic/pst-bspline/pst-bspline.tex RELOC/tex/latex/pst-bspline/pst-bspline.sty catalogue-ctan /graphics/pstricks/contrib/pst-bspline -catalogue-date 2016-04-21 22:42:58 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-curve pstricks catalogue-version 1.62 ++++++ pst-calendar.doc.tar.xz ++++++ ++++++ pst-calendar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-calendar.tlpobj new/tlpkg/tlpobj/pst-calendar.tlpobj --- old/tlpkg/tlpobj/pst-calendar.tlpobj 2016-04-14 19:36:38.000000000 +0200 +++ new/tlpkg/tlpobj/pst-calendar.tlpobj 2017-04-14 17:55:03.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/pst-calendar/pst-calendar.sty catalogue-also calendar catalogue-ctan /graphics/pstricks/contrib/pst-calendar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics calendar pstricks catalogue-version 0.47 ++++++ pst-cie.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-s/pst-cie.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-cie.doc.tar.xz differ: char 27, line 1 ++++++ pst-cie.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-cie.tlpobj new/tlpkg/tlpobj/pst-cie.tlpobj --- old/tlpkg/tlpobj/pst-cie.tlpobj 2016-05-18 03:21:45.000000000 +0200 +++ new/tlpkg/tlpobj/pst-cie.tlpobj 2017-04-14 17:55:11.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/pst-cie/pst-cie.tex RELOC/tex/latex/pst-cie/pst-cie.sty catalogue-ctan /graphics/pstricks/contrib/pst-cie -catalogue-date 2016-05-16 20:17:50 +0200 +catalogue-date 2016-11-16 07:59:52 +0100 catalogue-license lppl -catalogue-topics pstricks colour-supp +catalogue-topics pstricks colour catalogue-version 1.05 ++++++ pst-circ.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/Changes new/doc/generic/pst-circ/Changes --- old/doc/generic/pst-circ/Changes 2015-04-15 16:26:47.000000000 +0200 +++ new/doc/generic/pst-circ/Changes 2016-11-25 19:27:48.000000000 +0100 @@ -1,8 +1,9 @@ -2.13 2015-04-15 . added some new components (Piere Vivegnis) -2.12a 2014-10-09 . Updated documentation -2.12 2014-07-30 . Added new tripole powermeter. -2.11 2014-06-24 . Added new key circ={} for specific key setting. -2.10 2014-06-19 . Added more alternative styles (Patrice Mégret) +2.14 2016-08-21 fix bug with \splitter +2.13 2015-04-15 added some new components (Piere Vivegnis) +2.12a 2014-10-09 Updated documentation +2.12 2014-07-30 Added new tripole powermeter. +2.11 2014-06-24 Added new key circ={} for specific key setting. +2.10 2014-06-19 Added more alternative styles (Patrice Mégret) fixed bug for quadrupoles 2.09 2014-05-18 - allow empty arguments for logicSymbolstyle and logicLabelstyle Binary files old/doc/generic/pst-circ/pst-circ-doc.pdf and new/doc/generic/pst-circ/pst-circ-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-circ/pst-circ-doc.tex new/doc/generic/pst-circ/pst-circ-doc.tex --- old/doc/generic/pst-circ/pst-circ-doc.tex 2015-04-15 16:26:47.000000000 +0200 +++ new/doc/generic/pst-circ/pst-circ-doc.tex 2016-11-25 19:27:48.000000000 +0100 @@ -1,6 +1,6 @@ %% $Id: pst-circ-doc.tex 927 2014-06-18 11:01:59Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} +\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings, + headexclude,footexclude,oneside,enabledeprecatedfontcommands]{pst-doc} \usepackage[utf8]{inputenc} \usepackage{pst-circ} \let\pstCircFV\fileversion @@ -593,7 +593,7 @@ \begin{LTXexample}[pos=b] -\psset{mathlabel,labelstyle=\tt} +\psset{mathlabel} \def\pcTran(#1)(#2){\psline(#1)(#2|#1)(#2)}% only 2 segements \psset{circedge=\pcTran,connectingdot=false} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.doc.tlpobj new/tlpkg/tlpobj/pst-circ.doc.tlpobj --- old/tlpkg/tlpobj/pst-circ.doc.tlpobj 2016-04-14 19:36:38.000000000 +0200 +++ new/tlpkg/tlpobj/pst-circ.doc.tlpobj 2017-04-14 17:55:11.000000000 +0200 @@ -1,9 +1,9 @@ name pst-circ.doc category Package -revision 36865 +revision 41901 shortdesc doc files of pst-circ relocated 1 -docfiles size=216 +docfiles size=245 RELOC/doc/generic/pst-circ/Changes RELOC/doc/generic/pst-circ/README RELOC/doc/generic/pst-circ/pst-circ-doc.bib ++++++ pst-circ.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-circ/pst-circ.tex new/tex/generic/pst-circ/pst-circ.tex --- old/tex/generic/pst-circ/pst-circ.tex 2015-04-15 16:26:47.000000000 +0200 +++ new/tex/generic/pst-circ/pst-circ.tex 2016-11-25 19:33:37.000000000 +0100 @@ -26,8 +26,8 @@ \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{2.13} -\def\filedate{2015/04/15} +\def\fileversion{2.14} +\def\filedate{2016/08/21} \message{`pst-circ' v\fileversion (hv)} % \edef\PstAtCode{\the\catcode`\@} @@ -5472,14 +5472,14 @@ \ifPst@inputarrow \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=180]{#1}{Tport@left} \else - \ncangle[arrows=-,arm=0.5,angleB=0]{#1}{Tport@left} + \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left} \fi \ncangle[arrows=-, arm=0.5,angleB=0]{#2}{Tport@right} \else \ifPst@inputarrow \ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=0]{#2}{Tport@right} \else - \ncangle[arrows=-,arm=0.5,angleB=180]{Tport@right}{#2} + \ncangle[arrows=-,arm=0.5,angleB=0]{#2}{Tport@right} \fi \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{Tport@left} \fi @@ -5500,10 +5500,10 @@ \fi \else \ifx\psk@tripole@style\pst@tripole@style@top% - \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5) - \else - \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5) - \fi + \psline[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5) + \else + \psline[linewidth=1.5\pslinewidth](-0.5,0.5)(0.5,-0.5) + \fi \fi \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}% \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-circ.tlpobj new/tlpkg/tlpobj/pst-circ.tlpobj --- old/tlpkg/tlpobj/pst-circ.tlpobj 2016-04-14 19:36:38.000000000 +0200 +++ new/tlpkg/tlpobj/pst-circ.tlpobj 2017-04-14 17:55:11.000000000 +0200 @@ -1,6 +1,6 @@ name pst-circ category Package -revision 36865 +revision 41901 shortdesc PSTricks package for drawing electric circuits relocated 1 longdesc The package is built using PSTricks and in particular pst-node. @@ -15,7 +15,7 @@ RELOC/tex/generic/pst-circ/pst-circ.tex RELOC/tex/latex/pst-circ/pst-circ.sty catalogue-ctan /graphics/pstricks/contrib/pst-circ -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-08-21 19:53:03 +0200 catalogue-license lppl catalogue-topics diagram-circ pstricks -catalogue-version 2.13 +catalogue-version 2.14 ++++++ pst-coil.doc.tar.xz ++++++ ++++++ pst-coil.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-coil.tlpobj new/tlpkg/tlpobj/pst-coil.tlpobj --- old/tlpkg/tlpobj/pst-coil.tlpobj 2016-04-14 19:36:39.000000000 +0200 +++ new/tlpkg/tlpobj/pst-coil.tlpobj 2017-04-14 17:55:11.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-coil/pst-coil.tex RELOC/tex/latex/pst-coil/pst-coil.sty catalogue-ctan /graphics/pstricks/contrib/pst-coil -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 1.07 ++++++ pst-cox.doc.tar.xz ++++++ ++++++ pst-cox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-cox.tlpobj new/tlpkg/tlpobj/pst-cox.tlpobj --- old/tlpkg/tlpobj/pst-cox.tlpobj 2016-04-14 19:36:40.000000000 +0200 +++ new/tlpkg/tlpobj/pst-cox.tlpobj 2017-04-14 17:55:12.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/pst-cox/pst-coxcoor.sty RELOC/tex/latex/pst-cox/pst-coxeterp.sty catalogue-ctan /graphics/pstricks/contrib/pst-cox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics physics maths pstricks catalogue-version 0.98 Beta ++++++ pst-dbicons.doc.tar.xz ++++++ ++++++ pst-dbicons.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-dbicons.tlpobj new/tlpkg/tlpobj/pst-dbicons.tlpobj --- old/tlpkg/tlpobj/pst-dbicons.tlpobj 2016-04-14 19:36:42.000000000 +0200 +++ new/tlpkg/tlpobj/pst-dbicons.tlpobj 2017-04-14 17:55:13.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=3 RELOC/tex/latex/pst-dbicons/pst-dbicons.sty catalogue-ctan /graphics/pstricks/contrib/pst-dbicons -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram pstricks catalogue-version 0.16 ++++++ pst-diffraction.doc.tar.xz ++++++ ++++++ pst-diffraction.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-diffraction.tlpobj new/tlpkg/tlpobj/pst-diffraction.tlpobj --- old/tlpkg/tlpobj/pst-diffraction.tlpobj 2016-04-14 19:36:44.000000000 +0200 +++ new/tlpkg/tlpobj/pst-diffraction.tlpobj 2017-04-14 17:55:13.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/generic/pst-diffraction/pst-diffraction.tex RELOC/tex/latex/pst-diffraction/pst-diffraction.sty catalogue-ctan /graphics/pstricks/contrib/pst-diffraction -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 2.03 ++++++ pst-electricfield.doc.tar.xz ++++++ ++++++ pst-electricfield.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-electricfield.tlpobj new/tlpkg/tlpobj/pst-electricfield.tlpobj --- old/tlpkg/tlpobj/pst-electricfield.tlpobj 2016-04-14 19:36:49.000000000 +0200 +++ new/tlpkg/tlpobj/pst-electricfield.tlpobj 2017-04-14 17:55:16.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/pst-electricfield/pst-electricfield.tex RELOC/tex/latex/pst-electricfield/pst-electricfield.sty catalogue-ctan /graphics/pstricks/contrib/pst-electricfield -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 0.14 ++++++ pst-eps.doc.tar.xz ++++++ ++++++ pst-eps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eps.tlpobj new/tlpkg/tlpobj/pst-eps.tlpobj --- old/tlpkg/tlpobj/pst-eps.tlpobj 2016-04-14 19:36:49.000000000 +0200 +++ new/tlpkg/tlpobj/pst-eps.tlpobj 2017-04-14 17:55:16.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-eps/pst-eps.tex RELOC/tex/latex/pst-eps/pst-eps.sty catalogue-ctan /graphics/pstricks/contrib/pst-eps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-prep pstricks catalogue-version 1.0 ++++++ pst-eucl-translation-bg.doc.tar.xz ++++++ ++++++ pst-eucl.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/Changes new/doc/generic/pst-eucl/Changes --- old/doc/generic/pst-eucl/Changes 2015-10-20 23:19:10.000000000 +0200 +++ new/doc/generic/pst-eucl/Changes 2017-04-18 23:30:48.000000000 +0200 @@ -4,6 +4,13 @@ pst-eucl.tex -------- + +1.56 2017/04/18 - \psGetAngleABC: + - added dec -1 le { /dec 15 def } if + - added \pst@usecolor\pslinecolor in line 1616 +1.55 2016/10/11 - fix for \pstRightAngle +1.54 2016/09/01 - added MarkArrow, MarkArroww,MarkArrowww +1.53 2016/05/03 - revert changes of CodeFig(A|B) 1.52 2015/10/19 - added more optional arguments (ts) 1.51 2014/05/17 - added two new functions for angles and distances 1.50 2014/04/05 - added MarkHashLength|Sep (hv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/README new/doc/generic/pst-eucl/README --- old/doc/generic/pst-eucl/README 2014-04-06 00:21:37.000000000 +0200 +++ new/doc/generic/pst-eucl/README 2016-11-25 19:27:48.000000000 +0100 @@ -1,4 +1,4 @@ - the pst-eucl package +pst-eucl package This program can be redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN @@ -27,10 +27,3 @@ run `texhash` - if you don't have a local texmf directory, you can create it or ask - the root to create it by modifying the file: - - $(TEXMF)/web2c/texmf.cnf - - remove the original for the first line: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/pst-eucl-doc.bib new/doc/generic/pst-eucl/pst-eucl-doc.bib --- old/doc/generic/pst-eucl/pst-eucl-doc.bib 2014-05-18 23:48:17.000000000 +0200 +++ new/doc/generic/pst-eucl/pst-eucl-doc.bib 2016-11-25 19:27:48.000000000 +0100 @@ -51,9 +51,9 @@ @Book{PSTricks2, author = {Herbert Vo\ss{}}, title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {6.}, + edition = {7}, publisher = {DANTE -- Lehmanns}, - year = {2010}, + year = {2016}, address = {Heidelberg/Hamburg} } Binary files old/doc/generic/pst-eucl/pst-eucl-doc.pdf and new/doc/generic/pst-eucl/pst-eucl-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-eucl/pst-eucl-doc.tex new/doc/generic/pst-eucl/pst-eucl-doc.tex --- old/doc/generic/pst-eucl/pst-eucl-doc.tex 2014-05-18 23:48:17.000000000 +0200 +++ new/doc/generic/pst-eucl/pst-eucl-doc.tex 2016-11-25 19:27:48.000000000 +0100 @@ -2,8 +2,8 @@ headexclude,footexclude,oneside,english]{pst-doc} \usepackage[utf8]{inputenc} \usepackage{pst-eucl} -\usepackage{multicol} \let\pstEuclideFV\fileversion +\usepackage{multicol} \usepackage{pst-plot,paralist} \usepackage[mathscr]{eucal} \lstset{pos=l,wide=false,language=PSTricks, @@ -12,6 +12,9 @@ \def\Argsans#1{$\langle$#1$\rangle$} \def\DefaultVal#1{(by default #1)} +\usepackage{biblatex} +\addbibresource{\jobname.bib} + \title{\texttt{pst-euclide}} \subtitle{A PSTricks package for drawing geometric pictures; v.\pstEuclideFV} @@ -258,6 +261,9 @@ \item \Seg{MarkHashhh} \item \Seg{MarkCros} \item \Seg{MarkCross} + \item \Seg{MarkArrow} + \item \Seg{MarkArroww} + \item \Seg{MarkArrowww} \end{compactitem} \end{multicols} \endgroup @@ -396,6 +402,30 @@ \end{LTXexample} +\begin{LTXexample}[width=\linewidth,pos=t] +\begin{pspicture}(-0.5,-0.5)(9,3) +\psset{PointSymbol=none,PointNameMathSize=\scriptstyle,PointNameSep=6pt, + RightAngleSize=0.15,PosAngle={135,225,-45,45}} +\psaxes[ticks=none,labels=none] {->}(0,0)(9,3) +\pstGeonode(1,2){A}(1,1){B}(2,1){C}(2,2){D}% +\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B} +\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D} +\pspolygon(A)(B)(C)(D) +\psset{RightAngleType=suisseromand} +\pstGeonode(3,2){A}(3,1){B}(4,1){C}(4,2){D}% +\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B} +\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D} +\pspolygon(A)(B)(C)(D) +\psset{RightAngleType=german} +\pstGeonode(5,2){A}(5,1){B}(6,1){C}(6,2){D}% +\pstRightAngle{C}{B}{A} \pstRightAngle{D}{C}{B} +\pstRightAngle{A}{D}{C} \pstRightAngle{B}{A}{D} +\pspolygon(A)(B)(C)(D) +\end{pspicture} +\end{LTXexample} + + + \subsection{Lines, half-lines and segments} @@ -2028,8 +2058,8 @@ \nocite{*} \bgroup \RaggedRight -\bibliographystyle{plain} -\bibliography{pst-eucl-doc} +%\bibliographystyle{plain} +\printbibliography{pst-eucl-doc} \egroup \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.doc.tlpobj new/tlpkg/tlpobj/pst-eucl.doc.tlpobj --- old/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2016-04-14 19:36:49.000000000 +0200 +++ new/tlpkg/tlpobj/pst-eucl.doc.tlpobj 2017-04-19 02:06:48.000000000 +0200 @@ -1,9 +1,9 @@ name pst-eucl.doc category Package -revision 38678 +revision 43911 shortdesc doc files of pst-eucl relocated 1 -docfiles size=151 +docfiles size=153 RELOC/doc/generic/pst-eucl/Changes RELOC/doc/generic/pst-eucl/README RELOC/doc/generic/pst-eucl/pst-eucl-doc.bib ++++++ pst-eucl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-eucl/pst-eucl.tex new/tex/generic/pst-eucl/pst-eucl.tex --- old/tex/generic/pst-eucl/pst-eucl.tex 2015-10-20 23:19:10.000000000 +0200 +++ new/tex/generic/pst-eucl/pst-eucl.tex 2017-04-18 23:30:48.000000000 +0200 @@ -10,15 +10,15 @@ %% : hv herbert(a)dante.de %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Require PSTricks and pst-node packages -\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi +\ifx\PSTArrowLoaded\endinput\else\input pst-arrow.tex\fi \ifx\PSTtoolsLoaded\endinput\else\input pst-tools.tex\fi -\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi +%\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi \ifx\MultidoLoaded\endinput \else\input multido.tex \fi \csname PSTEuclideLoaded\endcsname \let\PSTEuclideLoaded\endinput -\def\fileversion{1.52} -\def\filedate{2015/10/19} +\def\fileversion{1.56} +\def\filedate{2017/04/18} %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt. @@ -47,13 +47,15 @@ % use math mode in point name \newif\ifPst@PtNameMath% \define@key[psset]{pst-eucl}{PtNameMath}[false]{\@nameuse{Pst@PtNameMath#1}}% +\define@key[psset]{pst-eucl}{PointNameSize}[\normalsize]{\def\Point@Name@Size{#1}}% +\define@key[psset]{pst-eucl}{PointNameMathSize}[\textnormal]{\def\Point@Name@MathSize{#1}}% % symbol used for marking equal length segment -\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\edef\psk@SegmentSymbol{#1}}% -\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\edef\psk@SegmentSymbolA{#1}}% -\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\edef\psk@SegmentSymbolB{#1}}% -\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\edef\psk@SegmentSymbolC{#1}}% -\define@key[psset]{pst-eucl}{Mark}[undef]{\edef\psk@Mark{#1}}% -\define@key[psset]{pst-eucl}{mark}[undef]{\edef\psk@mark{Angle#1}}% for angles +\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\def\psk@SegmentSymbol{#1}}% +\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\def\psk@SegmentSymbolA{#1}}% +\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\def\psk@SegmentSymbolB{#1}}% +\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\def\psk@SegmentSymbolC{#1}}% +\define@key[psset]{pst-eucl}{Mark}[undef]{\def\psk@Mark{#1}}% +\define@key[psset]{pst-eucl}{mark}[undef]{\def\psk@mark{Angle#1}}% for angles \define@key[psset]{pst-eucl}{MarkAngle}[undef]{\edef\psk@MarkAngle{#1}}% \newdimen\psMarkHashLength \newdimen\psMarkHashSep @@ -132,7 +134,8 @@ \psset[pst-eucl]{% PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef, PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef, - PtNameMath=true, PointNameSep=default, PosAngle=undef, PosAngleA=undef, + PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize, + PointNameSep=default, PosAngle=undef, PosAngleA=undef, PosAngleB=undef, PosAngleC=undef, Mark=undef, mark=undef,SegmentSymbol=MarkHashh, SegmentSymbolA=MarkHashh, SegmentSymbolB=MarkHash, SegmentSymbolC=MarkHashhh, RightAngleSize=.4, RightAngleType=default, LabelAngleOffset=0, LabelSep=1, @@ -251,7 +254,7 @@ \xdef\@@GenCourbe{\@@GenCourbe(#5)}%%for accumulating points% DR 22032005 \Pst@ManageParamList{#5}% \@ifnextchar({\Pst@OIJGeonode@iii{#1}{#2}{#3}}{\pst@MngTransformCurve\endgroup}}% DR 22032005 -%%end modif DR 11/2003 +%%end modif DR 11/2003 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% #1 -> point coordinates \def\Pst@geonodelabel#1{% % {nodename} @@ -267,7 +270,7 @@ \ifx\psk@PointName\@none\else \rput{*0}([nodesep=\ifx\psk@PointNameSep\@default{1em}\else\psk@PointNameSep\fi, angle=\ifx\psk@PosAngle\@undef{0}\else\psk@PosAngle\fi]#1)% - {\ifPst@PtNameMath $\Pst@WhichLabel{#1}$\else\Pst@WhichLabel{#1}\fi} + {\ifPst@PtNameMath $\Point@Name@MathSize\Pst@WhichLabel{#1}$\else\Point@Name@Size\Pst@WhichLabel{#1}\fi} \fi}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\Pst@WhichLabel#1{\ifx\psk@PointName\@default#1\else\psk@PointName\fi}%DR 0 @@ -277,7 +280,7 @@ \def\Pst@SegmentMark[#1]#2#3{% \bgroup\psset{#1}% % Affectation of local parameters \ncline[nodesep=0]{#2}{#3} - \ncput[nrot=:U]{$\csname\psk@SegmentSymbol\endcsname$}% + \ncput[nrot=:U]{$\expandafter\@nameuse\expandafter{\psk@SegmentSymbol}$}% $ \egroup% }% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -348,6 +351,19 @@ \let\AngleMarkCross\MarkCross \def\MarkCirc{\pscircle(0,0){2\pslinewidth}} \let\AngleMarkCirc\MarkCirc +% MarkArrow > +\def\MarkArrow{% + \psline[linestyle=none,veearrowlength=\psMarkHashLength, + veearrowangle=90,veearrowlinewidth=\pslinewidth, + ArrowInside=-v](-\psMarkHashLength,0)(\psMarkHashLength,0)}% +\def\MarkArroww{% + \psline[linestyle=none,veearrowlength=\psMarkHashLength, + veearrowangle=90,veearrowlinewidth=\pslinewidth, + ArrowInsideNo=2,ArrowInside=-v](-2\psMarkHashLength,0)(2\psMarkHashLength,0)}% +\def\MarkArrowww{% + \psline[linestyle=none,veearrowlength=\psMarkHashLength, + veearrowangle=90,veearrowlinewidth=\pslinewidth, + ArrowInsideNo=3,ArrowInside=-v](-2.5\psMarkHashLength,0)(2.5\psMarkHashLength,0)}% % %%end modif alaindelplanque 11/2003 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -360,25 +376,29 @@ %% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work... \rput(#2){% \ifx\psk@RightAngleType\@default% - \pspolygon(0,0)%%modif 12/2004 - (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)% - (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan - 2 copy sub abs 91 gt - { 2 copy lt { exch 360 add exch } { 360 add } ifelse } if %%DR 2005/01/14 - %%2 copy lt { exch 360 sub exch } if - add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC end)% - (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)% - \else\ifx\psk@RightAngleType\@german% - \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}% - {\psscalebox{\psk(a)RightAngleSize}{\pscircle*{.08}}}% - \else\ifx\psk@RightAngleType\@suisseromand% - \rput{*0}% - (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan - 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)% - {\psscalebox{\psk(a)RightAngleSize}{\pscircle*{.08}}}% - \pspolygon(0,0)% - (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )% - (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )% + \psline(!tx@EcldDict begin /N@#1 GetNode exch Atan + \psk@RightAngleSize\space exch PtoC end)% + (!tx@EcldDict begin /N@#1 GetNode exch Atan /AngleNo1 ED + tx@EcldDict begin /N@#3 GetNode exch Atan /AngleNo3 ED + AngleNo1 AngleNo3 sub abs 180 gt { /Diff -45 def }{ /Diff 45 def } ifelse + AngleNo1 AngleNo3 gt { AngleNo1 Diff sub }{ AngleNo3 Diff sub } ifelse + \psk@RightAngleSize\space 2 sqrt mul exch PtoC end)% + (!tx@EcldDict begin /N@#3 GetNode exch Atan + \psk@RightAngleSize\space exch PtoC end)% + \else + \ifx\psk@RightAngleType\@german + \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}% + {\psscalebox{\psk(a)RightAngleSize}{\pscircle*{.08}}}% + \else + \ifx\psk@RightAngleType\@suisseromand + \rput{*0}% + (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan + 2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)% + {\psscalebox{\psk(a)RightAngleSize}{\pscircle*{.08}}}% +% \pspolygon(0,0)% + \psline(0,0)% + (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )% + (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )% \fi\fi\fi}% \endgroup\ignorespaces% hv 20130312 }% @@ -400,8 +420,8 @@ \rput[\psk@LabelRefPt]{*0}(! tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end 2 copy lt { exch 360 sub exch } if - add 2 div dup /psRawLabelPos ED - \psk@LabelAngleOffset\space add + add 2 div dup /psRawLabelPos ED + \psk@LabelAngleOffset\space add \psk@LabelSep\space exch PtoC ){#5}% \def\pst@tempA{Angleundef}% %% define \pst@rot@angle to make it compatible with xelatex for later use @@ -440,9 +460,9 @@ \psset{PosAngleA={! /AngleAB \@@coordi\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def /AngleAC \@@coordi\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def - AngleAB AngleAC add 2 div dup + AngleAB AngleAC add 2 div dup 1 exch \tx@PtoC exch \@@coordi\space 4 1 roll add 3 1 roll add XS YS Pyth2 % test if inside/outside - \@@coordi\space XS YS Pyth2 le { 180 add } if + \@@coordi\space XS YS Pyth2 le { 180 add } if }}%% <------ hv \else\psset{PosAngle=\psk@PosAngleA}\fi %%end modif alaindelplanque 11/2003 @@ -467,10 +487,10 @@ %%begin modif alaindelplanque 11/2003 \ifx\psk@PosAngleC\@undef \psset{PosAngleC={! - /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def - /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def + /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def + /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def AngleCB AngleCA add 2 div dup 1 exch \tx@PtoC exch \@@coordv\space 4 1 roll add 3 1 roll add XS YS Pyth2 - \@@coordv\space XS YS Pyth2 le { 180 add } if + \@@coordv\space XS YS Pyth2 le { 180 add } if }}%% <------ hv \else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv %%end modif alaindelplanque 11/2003 @@ -960,7 +980,7 @@ /N@#2 GetNode /N@#3 GetNode /N@#4 GetNode /N@#5 GetNode InterLines end \pst@number\psyunit div exch \pst@number\psxunit div exch - 2 copy + 2 copy /#6.Y exch def /#6.X exch def % save the coors for futher use ){#6}% \Pst@geonodelabel{#6}% @@ -1084,14 +1104,14 @@ \egroup \psset{linecolor=\psk@CodeFigColor, linestyle=\psk@CodeFigStyle, arcsep=-1}% \ifx\psk@CodeFigA\@undef% - \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi + \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\pstArcOAB{#2}{#6}{#7}\fi\fi \else% - \ifx\psk@CodeFigA\@none \ifPst@CodeFigA\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi + \ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi% \fi \ifx\psk@CodeFigB\@undef% - \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi - \else - \ifx\psk@CodeFigB\@none \ifPst@CodeFigB\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi + \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\pstArcOAB{#4}{#6}{#7}\fi\fi + \else% + \ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi% \fi \egroup }% @@ -1108,10 +1128,10 @@ % end){\pnode{#5}}% \pnode(! tx@EcldDict begin - #4 + #4 { \ifPst@algebraic (#3) AlgParser cvx exec \else #3 \fi } { \ifPst@algebraic (#2) AlgParser cvx exec \else #2 \fi } - NewtonSolving pop + NewtonSolving pop 2 copy end /#5.Y exch def /#5.X exch def % save the coors for futher use ){#5}% @@ -1131,16 +1151,16 @@ % #5 { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div % \pst@number\psxunit div 3 1 roll div x mul add } { #2 } % NewtonSolving pop -% end){\pnode{#6}}% +% end){\pnode{#6}}% \pnode(! tx@EcldDict begin - #5 + #5 { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div - \pst@number\psxunit div 3 1 roll div x mul add } + \pst@number\psxunit div 3 1 roll div x mul add } { \ifPst@algebraic (#2) AlgParser cvx exec \else #2 \fi } - NewtonSolving pop 2 copy end + NewtonSolving pop 2 copy end /#5.Y exch def /#5.X exch def % save the coors for futher use - ){#6}% + ){#6}% \Pst@geonodelabel{#6}% \egroup% } @@ -1157,17 +1177,17 @@ \edef\@function{ \ifPst@algebraic (#1) AlgParser cvx exec \else #1 \fi\space }% \pnode(! tx@EcldDict begin - #4 + #4 { /N@#2 GetNode 2 copy /N@#3 GetNode ABDist \pst@number\psxunit div 3 1 roll \pst@number\psyunit div exch \pst@number\psxunit div exch x \@function - ABDist sub } - { 0 } + ABDist sub } + { 0 } NewtonSolving pop - pop dup /x exch def + pop dup /x exch def \@function 2 copy end /#4.Y exch def /#4.X exch def % save the coors for futher use - ){#5}% + ){#5}% \Pst@geonodelabel{#5}% \endgroup \ignorespaces @@ -1516,10 +1536,10 @@ \fi } %% angle defined by three points -\def\pstAngleAOB#1#2#3{% +\def\pstAngleAOB#1#2#3{% % \pstGeonode[PointName=none,PointSymbol=none](#1){temp@1}(#2){temp@2}(#3){temp@3}% % \pstAngleAOB@i{temp@1}{temp@2}{temp@3}} -%\def\pstAngleAOB@i#1#2#3{% +%\def\pstAngleAOB@i#1#2#3{% tx@EcldDict begin /N@#2 GetNode /N@#3 GetNode ABVect /N@#2 GetNode /N@#1 GetNode ABVect end 4 copy exch 4 -1 roll mul 3 -2 roll mul add @@ -1529,19 +1549,19 @@ \fi } % -\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}% Thmoas Söll 20140512 +\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}% Thmoas S\"{o}ll 20140512 \def\psGetDistanceAB@i(#1)(#2)#3{% \begingroup% \pst@killglue \use@par \pst@getcoor{#1}\pst@tempA \pst@getcoor{#2}\pst@tempB -\pnode(! +\pnode(! 15 dict begin /dec \psk@decimals\space def \psk@PSfont findfont \psk@fontscale scalefont setfont /laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def - /Wert { 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse + /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse \ifPst@comma dot2comma \fi show } def \pst@tempA \tx@UserCoor /y1 ED /x1 ED \pst@tempB \tx@UserCoor /y2 ED /x2 ED @@ -1568,8 +1588,8 @@ \define@key[psset]{pst-eucl}{WedgeOpacity}{\def\psk@WedgeOpacity{#1}}% \psset[pst-eucl]{ArcColor=black,WedgeColor=blue,WedgeOpacity=0.2,AngleValue=false, AngleArc,ShowWedge,ArcLinestyle=solid,ArcLinewidth=0.8pt,WedgeFillstyle=solid} - -\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas Söll 20151018 + +\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas S\"{o}ll 20151018 \def\psGetAngleABC@i(#1)(#2)(#3)#4{% \begingroup \use@par @@ -1593,10 +1613,10 @@ \fi \pnode(! % /dec \psk@decimals\space def - \psk@PSfont findfont \psk@fontscale scalefont setfont + \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\pslinecolor /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def /laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def - /WertZeigen {10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse + /WertZeigen { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse \ifPst@comma dot2comma \fi show s1 (\string\260) show} def \pst@tempA \tx@UserCoor /y1 ED /x1 ED \pst@tempB \tx@UserCoor /y2 ED /x2 ED @@ -1618,8 +1638,5 @@ \catcode`\@=\PstAtCode\relax % \endinput -%% -%% -%% END pst-eps.tex %% END: pst-euclide.tex % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-eucl.tlpobj new/tlpkg/tlpobj/pst-eucl.tlpobj --- old/tlpkg/tlpobj/pst-eucl.tlpobj 2016-04-14 19:36:49.000000000 +0200 +++ new/tlpkg/tlpobj/pst-eucl.tlpobj 2017-04-19 02:06:48.000000000 +0200 @@ -1,6 +1,6 @@ name pst-eucl category Package -revision 38678 +revision 43911 shortdesc Euclidian geometry with PSTricks relocated 1 longdesc The package allows the drawing of Euclidean geometric figures @@ -8,13 +8,13 @@ longdesc constraints. It is thus possible to build point using common longdesc transformations or intersections. The use of coordinates is longdesc limited to points which controlled the figure. -runfiles size=20 +runfiles size=21 RELOC/dvips/pst-eucl/pst-eucl.pro RELOC/tex/generic/pst-eucl/pst-eucl.tex RELOC/tex/latex/pst-eucl/pst-eucl.sty catalogue-also eukleides tkz-euclide catalogue-ctan /graphics/pstricks/contrib/pst-eucl -catalogue-date 2015-10-19 21:09:03 +0200 +catalogue-date 2017-04-18 21:26:16 +0200 catalogue-license lppl catalogue-topics maths graphics-use -catalogue-version 1.52 +catalogue-version 1.56 ++++++ pst-exa.doc.tar.xz ++++++ ++++++ pst-exa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-exa.tlpobj new/tlpkg/tlpobj/pst-exa.tlpobj --- old/tlpkg/tlpobj/pst-exa.tlpobj 2016-04-14 19:36:50.000000000 +0200 +++ new/tlpkg/tlpobj/pst-exa.tlpobj 2017-04-14 17:55:17.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/pst-exa/pst-exa.sty catalogue-also showexpl catalogue-ctan /graphics/pstricks/contrib/pst-exa -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics listing pstricks catalogue-version 0.05 ++++++ pst-fill.doc.tar.xz ++++++ ++++++ pst-fill.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fill.tlpobj new/tlpkg/tlpobj/pst-fill.tlpobj --- old/tlpkg/tlpobj/pst-fill.tlpobj 2016-04-14 19:36:51.000000000 +0200 +++ new/tlpkg/tlpobj/pst-fill.tlpobj 2017-04-14 17:55:17.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/generic/pst-fill/pst-fill.tex RELOC/tex/latex/pst-fill/pst-fill.sty catalogue-ctan /graphics/pstricks/contrib/pst-fill -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-fill-tile pstricks catalogue-version 1.01 ++++++ pst-fit.doc.tar.xz ++++++ ++++++ pst-fit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fit.tlpobj new/tlpkg/tlpobj/pst-fit.tlpobj --- old/tlpkg/tlpobj/pst-fit.tlpobj 2016-04-14 19:36:52.000000000 +0200 +++ new/tlpkg/tlpobj/pst-fit.tlpobj 2017-04-14 17:55:17.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-fit/pst-fit.tex RELOC/tex/latex/pst-fit/pst-fit.sty catalogue-ctan /graphics/pstricks/contrib/pst-fit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-supp catalogue-version 0.01 ++++++ pst-fr3d.doc.tar.xz ++++++ ++++++ pst-fr3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fr3d.tlpobj new/tlpkg/tlpobj/pst-fr3d.tlpobj --- old/tlpkg/tlpobj/pst-fr3d.tlpobj 2016-04-14 19:36:52.000000000 +0200 +++ new/tlpkg/tlpobj/pst-fr3d.tlpobj 2017-04-14 17:55:17.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-fr3d/pst-fr3d.tex RELOC/tex/latex/pst-fr3d/pst-fr3d.sty catalogue-ctan /graphics/pstricks/contrib/pst-fr3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing graphics-3d pstricks catalogue-version 1.10 ++++++ pst-fractal.doc.tar.xz ++++++ ++++++ pst-fractal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fractal.tlpobj new/tlpkg/tlpobj/pst-fractal.tlpobj --- old/tlpkg/tlpobj/pst-fractal.tlpobj 2016-04-14 19:36:52.000000000 +0200 +++ new/tlpkg/tlpobj/pst-fractal.tlpobj 2017-04-14 17:55:17.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/generic/pst-fractal/pst-fractal.tex RELOC/tex/latex/pst-fractal/pst-fractal.sty catalogue-ctan /graphics/pstricks/contrib/pst-fractal -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 0.06 ++++++ pst-fun.doc.tar.xz ++++++ ++++++ pst-fun.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fun.tlpobj new/tlpkg/tlpobj/pst-fun.tlpobj --- old/tlpkg/tlpobj/pst-fun.tlpobj 2016-04-14 19:36:53.000000000 +0200 +++ new/tlpkg/tlpobj/pst-fun.tlpobj 2017-04-14 17:55:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/pst-fun/pst-fun.tex RELOC/tex/latex/pst-fun/pst-fun.sty catalogue-ctan /graphics/pstricks/contrib/pst-fun -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics frivolous pstricks catalogue-version 0.04 ++++++ pst-func.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/Changes new/doc/generic/pst-func/Changes --- old/doc/generic/pst-func/Changes 2016-05-02 03:29:35.000000000 +0200 +++ new/doc/generic/pst-func/Changes 2017-04-18 23:31:01.000000000 +0200 @@ -1,4 +1,7 @@ ..... pst-func.tex +0.85 2017-04-18 - allow framing of function values (ts) +0.84 2017-03-11 - some more modifications to the binomial distributions (ts) +0.83 2017-03-07 - added some more macros for binomial distributions (ts) 0.82 2016-05-01 - psk@PontName->\psk@func@PointName (same name in pst-eucl) 0.81 2014-05-20 - changed \pstVerb to \pst@Verb in \psZero to allow variables from tx@Dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.bib new/doc/generic/pst-func/pst-func-doc.bib --- old/doc/generic/pst-func/pst-func-doc.bib 2013-04-19 01:07:03.000000000 +0200 +++ new/doc/generic/pst-func/pst-func-doc.bib 2017-03-12 23:01:05.000000000 +0100 @@ -14,7 +14,7 @@ @STRING{theatertage = {{\TeX}-Theatertage} } @Article{ dtk02.2:jackson.voss:plot-funktionen, - author = {Laura E. Jackson and Herbert Vo{\ss}}, + author = {Laura E. Jackson and Herbert Voß}, title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, journal = dtk, year = 2002, @@ -34,7 +34,7 @@ } @Article{ dtk02.1:voss:mathematischen, - author = {Herbert Vo{\ss}}, + author = {Herbert Voß}, title = {Die mathematischen {F}unktionen von {P}ost{S}cript}, journal = dtk, year = 2002, @@ -48,7 +48,7 @@ abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn nun im eigentlichen - Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass + Sinne ist. Außerdem wird h{\"a}ufig vergessen, dass sich mit den \PS-Funktionen viele Dinge erledigen lassen, bei denen sonst auf externe Programme zur{\"u}ckgegriffen wird. Dies wird im Folgenden f{\"u}r die mathematischen @@ -57,24 +57,15 @@ } @Book{tlgc2, - author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Voß}, title = {The {\LaTeX} {G}raphics {C}ompanion}, publisher = {{Addison-Wesley Publishing Company}}, - edition = second, + edition = 2, year = {2007}, address = {Reading, Mass.} } -@Book{voss:chaos, - author = {Herbert Vo{\ss}}, - title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen - {\"u}ber {F}arbmanipulationen zur perfekten Darstellung}, - publisher = {{Franzis Verlag}}, - year = {1994}, - address = {Poing} -} - @Article{girou:01:, author = {Denis Girou}, title = {Pr\'esentation de {PST}ricks}, @@ -104,44 +95,41 @@ year = 1989, } -@Manual{pstricks, +@online{pstricks, Title = {PSTricks - {\PS} macros for generic {\TeX}}, Author = {{Timothy van} Zandt}, Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, + url = {http://www.tug.org/application/PSTricks}, year = 1993 } -@Manual{pst-plot, +@ctan{pst-plot, Title = {\texttt{pst-plot}: Plotting two dimensional functions and data}, - Author = {{Timothy van} Zandt}, + Author = {{Timothy van} Zandt and Herbert Voß}, Organization = {}, - Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}}, - Note = {}, + url = {/graphics/pstricks/generic/pst-plot.tex}, year = 1999 } -@Manual{multido, +@ctan{multido, Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, Author = {{Timothy van} Zandt}, - Organization = {}, - Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}}, + url = {/graphics/pstricks/generic/multido.tex}, Note = {}, year = 1997 } @Book{PSTricks2, - author = {Herbert Vo\ss}, + author = {Herbert Voß}, title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {6.}, + edition = {7}, publisher = {DANTE -- Lehmanns}, - year = {2010}, - address = {Heidelberg/Berlin} + year = {2016}, + publisher = {Heidelberg and Berlin} } @Book{voss:math, - author = {Herbert Vo\ss}, + author = {Herbert Voß}, title = {Typesetting mathematics with \LaTeX}, publisher = {UIT}, year = {2010}, @@ -149,7 +137,7 @@ } @Book{PSTricks2-UIT, - author = {Herbert Vo\ss}, + author = {Herbert Voß}, title = {PSTricks -- Graphics for \TeX\ and \LaTeX}, publisher = {UIT}, year = {2011}, @@ -157,25 +145,24 @@ } @Book{LaTeXRef-UIT, - author = {Herbert Vo\ss}, + author = {Herbert Voß}, title = {{\LaTeX} quick reference}, publisher = {UIT}, year = {2012}, address = {Cambridge} } -@Manual{wolfram, +@online{wolfram, author = {Eric Weisstein}, title = {Wolfram MathWorld}, publisher = {{Wolfram}}, year = {2007}, - address = {\url{http://mathworld.wolfram.com}} + url = {http://mathworld.wolfram.com} } -@Manual{pst-tools, +@ctan{pst-tools, author = {Herbert Voß}, title = {\texttt{pst-tools} -- Helper functions}, - publisher = {CTAN}, year = {2012}, - address = {\url{CTAN:/graphics/pstricks/contrib/pst-tools}} + url = {/graphics/pstricks/contrib/pst-tools} } Binary files old/doc/generic/pst-func/pst-func-doc.pdf and new/doc/generic/pst-func/pst-func-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/pst-func-doc.tex new/doc/generic/pst-func/pst-func-doc.tex --- old/doc/generic/pst-func/pst-func-doc.tex 2014-05-21 00:00:54.000000000 +0200 +++ new/doc/generic/pst-func/pst-func-doc.tex 2017-04-18 23:31:01.000000000 +0200 @@ -20,8 +20,22 @@ \psGauss[sigma=1, linecolor=blue, linewidth=2pt]{-1.75}{1.75} \end{pspicture}} +\usepackage[style=dtk]{biblatex} +\addbibresource{pst-func-doc.bib} + + \lstset{language=PSTricks, - morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily} + morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily, + literate=% + {Ö}{{\"O}}1 + {Ä}{{\"A}}1 + {Ü}{{\"U}}1 + {ß}{{\ss}}1 + {ü}{{\"u}}1 + {ä}{{\"a}}1 + {ö}{{\"o}}1 + {~}{{\textasciitilde}}1 +} % \psset{labelFontSize=\scriptstyle}% for mathmode %\def\pshlabel#1{\footnotesize#1} @@ -59,6 +73,7 @@ Leon Free, Attila Gati, Horst Gierhardt, + Jürgen Gilg, Christophe Jorssen, Lars Kotthoff, Buddy Ledger, @@ -596,7 +611,7 @@ \Lcs{psZero}\OptArgs\Largr{$x_0,x_1$}\Largb{functionA}\OptArg{functionB}\Largb{node name} \end{BDef} -If the second function is not given the macro calculates and displays the zeros of +If the second function is not given the macro calculates and displays the zeros of the first function. If the second function is defined too, then the macro calculates the intermediate point of the two functions. The intervall is defined as $[x_0,x_1]$. Possible optional arguments are @@ -604,28 +619,69 @@ \medskip \begin{tabularx}{\linewidth}{ @{} l >{\ttfamily}l X @{} }\toprule -\emph{Name} & \emph{Default} & \emph{Meaning} \\\midrule -\Lkeyword{markZeros} & false & Mark the zeros/intermediate points with a symbol.\\ -\Lkeyword{Newton} & false & Use Newton method instead of the bisector one.\\ -\Lkeyword{PrintCoord} & false & Print the pair of coordinate of the zero/intermediate point.\\ -\Lkeyword{onlyNode} & false & Calculate only the node, do not print anything.\\ -\Lkeyword{onlyYVal} & false & Print only the value.\\ -\Lkeyword{originV} & false & Put the values without an offset.\\ -\Lkeyword{PointName} & I & The printed prefix for the calculated Points.\\ -\Lkeyword{decimals} & 2 & The decimals for the $x$ value.\\ -\Lkeyword{ydecimals} & 2 & The decimals for the $y$ value.\\ -\Lkeyword{xShift} & 0 & $x$ move for the printed value.\\ -\Lkeyword{yShift} & 0 & $y$ move for the printed value.\\\bottomrule +\emph{Name} & \emph{Default} & \emph{Meaning} \\\midrule +\Lkeyword{markZeros} & false & Mark the zeros/intermediate points with a symbol.\\ +\Lkeyword{Newton} & false & Use Newton method instead of the bisector one.\\ +\Lkeyword{PrintCoord} & false & Print the pair of coordinates of the zero/intermediate point, like $P(x|y)$.\\ +\Lkeyword{onlyNode} & false & Calculate only the node, do not print anything, if markZeros $=$ false.\\ +\Lkeyword{onlyYVal} & false & Print only the $y$-value.\\ +\Lkeyword{xory} & false & Print $x=$ $x$-Value or, if onlyYVal $=$ true, $y=$ $y$-value.\\ +\Lkeyword{approx} & true & Change the $=$, if xory $=$ true to $\approx$.\\ +\Lkeyword{originV} & false & Put the values without an offset.\\ +\Lkeyword{Framed} & false & Show a filled frame in backround, framesep, fillcolor, opacity or + linestyle are options to show different frames.\\ +\Lkeyword{PointName} & I & The printed prefix for the calculated Points.\\ +\Lkeyword{decimals} & 2 & The decimals for the $x$ value.\\ +\Lkeyword{ydecimals} & 2 & The decimals for the $y$ value.\\ +\Lkeyword{xShift} & 0 & $x$ move for the printed value.\\ +\Lkeyword{yShift} & 0 & $y$ move for the printed value.\\ +\bottomrule \end{tabularx} \medskip -The following example was done by Thomas Söll. +The following examples where done by Jürgen Gilg and Thomas Söll. \bigskip \definecolor{BeigeTS}{rgb}{0.98,0.95,0.87} \definecolor{CornBlauTS}{rgb}{0.39,0.59,0.93} \definecolor{SandBraun}{rgb}{0.96,0.64,0.38} -\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n} +\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n,comma} +\def\funkf{2*sqrt(x)*cos(ln(x))*sin(x)} +\begin{pspicture}[plotpoints=500,algebraic,fontscale=5,markZeros, + PointName=N,dotscale=0.7](-0.5,-3)(10,2.5) +\psStep[fillstyle=solid,fillcolor=BeigeTS,opacity=0.7,linewidth=0.3pt, + linecolor=SandBraun!50](0.001,9.5){40}{\funkf} +\psStep[StepType=Riemann,fillstyle=solid,opacity=0.3,fillcolor=CornBlauTS, + linecolor=CornBlauTS,linewidth=0.3pt](0.001,9.5){40}{\funkf} +\psaxes[labelFontSize=\scriptstyle,ticksize=-0.1 0]{->}(0,0)(0,-2.75)(10,2.5) +\psplot[linecolor=BeigeTS!60,linewidth=0.8pt]{0.001}{9.75}{\funkf} +\psplotTangent[linecolor=blue,Derive={Derive(1,\funkf)}]{1.29}{1.5}{\funkf} +\uput[90](6,1.2){$f(x)=2\cdot\sqrt{x}\cdot\cos{(\ln{x})}\cdot\sin{x}$} +{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0,Framed,opacity=0.8,decimals=1,PrintCoord} + \psZero[xShift=-0.2,yShift=0.15,postString=1,Newton](0.5,1){\funkf}{N1} + \psZero[xShift=-0.05,yShift=0.15,postString=2](2,4){\funkf}{N2} + \psZero[xShift=-0.45,yShift=0.15,postString=3](4,6){\funkf}{N3} + \psZero[xShift=-0.45,yShift=0.15,postString=4](6,7){\funkf}{N4} + \psZero[xShift=-0.25,yShift=0.15,PointName=x,postString=5,xory,PrintCoord=false,linestyle=none,fillcolor=green,opacity=0.6](9,11){\funkf}{N5} + \psZero[xShift=-0.95,yShift=0,PointName=M,decimals=0,linestyle=none,fillcolor=SandBraun, + ydecimals=1,opacity=0.8,postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}% +} +\pcline{->}(0.5,-1)(M) +\nbput[nrot=:U,labelsep=0.3,npos=0.2]{% + \scriptsize \psZero[originV=true,xory=true,onlyYVal=true,PointName=f(x),postString={m=1},Framed, + opacity=0.8,linestyle=none,markZeros=false,fontscale=10](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{R}} +\psdot[linecolor=green,strokeopacity=0.8](M) +\uput{0.5}[40](M){\psZero[originV=true,approx=false,xory=true,onlyYVal=true, + PointName=m,postString={m=1},markZeros=false,fontscale=8](0.5,2){Derive(1,\funkf)-1}[1]{R}} +\end{pspicture} + + +%\begin{LTXexample}[pos=t] +\begin{lstlisting} +\definecolor{BeigeTS}{rgb}{0.98,0.95,0.87} +\definecolor{CornBlauTS}{rgb}{0.39,0.59,0.93} +\definecolor{SandBraun}{rgb}{0.96,0.64,0.38} +\psset{yunit=1.25cm,arrowinset=0.02,arrowlength=2,linewidth=0.5pt,saveNodeCoors,NodeCoorPrefix=n,comma} \def\funkf{2*sqrt(x)*cos(ln(x))*sin(x)} \begin{pspicture}[plotpoints=500,algebraic,fontscale=5,markZeros,PrintCoord, PointName=N,dotscale=0.7](-0.5,-3)(10,2.5) @@ -637,23 +693,225 @@ \psplot[linecolor=BeigeTS!60,linewidth=0.8pt]{0.001}{9.75}{\funkf} \psplotTangent[linecolor=blue,Derive={Derive(1,\funkf)}]{1.29}{1.5}{\funkf} \uput[90](6,1.2){$f(x)=2\cdot\sqrt{x}\cdot\cos{(\ln{x})}\cdot\sin{x}$} -{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0} +{\psset{dotscale=1.5,linecolor=blue!50!black!90,ydecimals=0,Framed,opacity=0.8,decimals=1} \psZero[xShift=-0.2,yShift=0.15,postString=1,Newton](0.5,1){\funkf}{N1} \psZero[xShift=-0.05,yShift=0.15,postString=2](2,4){\funkf}{N2} \psZero[xShift=-0.45,yShift=0.15,postString=3](4,6){\funkf}{N3} \psZero[xShift=-0.45,yShift=0.15,postString=4](6,7){\funkf}{N4} \psZero[xShift=-0.45,yShift=0.15,postString=5](9,11){\funkf}{N5} - \psZero[xShift=-1.15,yShift=0,PointName=M, - postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}% + \psZero[xShift=-1.15,yShift=0,PointName=M,decimals=0,linestyle=none,fillcolor=SandBraun, + opacity=0.8,postString={m=1}](0.5,2){Derive(1,\funkf)-1+\funkf}[\funkf]{M}% } \pcline{->}(0.5,-1)(M) \nbput[nrot=:U,labelsep=0.01]{% - \scriptsize Steigung ist hier + \scriptsize Steigung ist hier\phantom{i} \psPrintValueNew[PSfont=Palatino-Roman,decimals=0,round,fontscale=7]{nMx,{Derive(1,\funkf)}}} \psdot[linecolor=green,strokeopacity=0.8](*{nMx} {\funkf}) -\uput[90](*{nMx} {\funkf}){$m=$ +\uput[90](*{nMx} {\funkf}){$m=$ \psPrintValueNew[PSfont=Palatino-Roman,decimals=0,round,fontscale=8]{nMx,{Derive(1,\funkf)}}} \end{pspicture} +\end{lstlisting} +%\end{LTXexample} + +{\psset{yunit=0.8,comma,decimals=2,algebraic=true,markZeros=true,plotpoints=500,saveNodeCoors,NodeCoorPrefix=n} +%----------------- FUNKTIONSDEFINITIONEN in "algebraic" ----------------- +\def\funkf{0.75*x^4-3*x^2-2} +\def\funkg{0.25*x+1} + +\begin{pspicture}(-6.5,-5.5)(6.5,8.5) +%------ Gitter im Hintergrund (CLIPPED) ----------------- +\begin{psclip}% +{\psframe[linestyle=none](-6.4,-5.4)(6.4,7.4)} +\psgrid[subgriddiv=2,gridlabels=0,gridwidth=0.3pt,gridcolor=black!50,subgridwidth=0.2pt,subgridcolor=black!30](-6.5,-7.5)(6.5,8.5) +\end{psclip} +%--------- Achsen ------------ +\psaxes[xDecimals=0, yDecimals=0,labelFontSize=\scriptstyle,arrowscale=1.3,arrowinset=0.05,arrowlength=1.9, Dy=1,dy=1,dx=1,Dx=1,subticks=0,comma,tickwidth=0.5pt]{->}(0,0)(-6.5,-5.5)(6.5,7.5)[$x$,-90][$y$,180]% Achsen +%----- Funktionsgraphen plotten (Clippen, damit sie nicht aus dem Gitter ragen) ----------------- +\begin{psclip}% +{\psframe[linestyle=none](-6.5,-5.4)(6.5,7.4)} +\psplot[linewidth=1pt,linecolor=Gray]{-6.5}{6.5}{\funkf}% +\psplot[linewidth=1pt,linecolor=BrickRed]{-6.5}{6.5}{\funkg}% +\end{psclip} +%----------------- SPEZIELLE PUNKTE ----------------- +{\psset{fontscale=8,PrintCoord=true,linestyle=none,opacity=0.8,Framed=true,fillcolor=cyan!10} +%----------------- NULLSTELLEN ----------------- +\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={1},ydecimals=0](-3,-2){\funkf}[0]{N1} +\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={2},ydecimals=0](2,3){\funkf}[0]{N2} +%----------------- EXTREMWERTE ----------------- +\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={1}](-2,0){Derive(1,\funkf)+\funkf}[\funkf]{T1} +\psZero[xShift=-0.9,yShift=0.25,PointName={H},postString={}](-1,1){Derive(1,\funkf)+\funkf}[\funkf]{H} +\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={2}](0,2.5){Derive(1,\funkf)+\funkf}[\funkf]{T2} +%----------------- WENDEPUNKTE ----------------- +\psZero[xShift=-1.2,yShift=-0.25,PointName={W},postString={1}](-1.5,-0.5){Derive(2,\funkf)+\funkf}[\funkf]{W1} +\psZero[xShift=-0.6,yShift=-0.25,PointName={W},postString={2}](0.5,1.5){Derive(2,\funkf)+\funkf}[\funkf]{W2} +\psZero[onlyNode=true,markZeros=false](-1.5,-0.5){Derive(2,\funkf)+Derive(1,\funkf)}[Derive(1,\funkf)]{mW1}%Steigung Wendepunkt 1 ist "nmW1y" +} +%----------------- GLEICHUNG WENDETANGENTE ----------------- +\def\funkWende{nmW1y*(x-nW1x)+nW1y} +%----------------- GLEICHUNG WENDENORMALE ----------------- +\def\funkNormal{-1/nmW1y*(x-nW1x)+nW1y} %m_n=-1/m_t +%----------------- Tangente und Normale in W1 plotten ------------------ +\psplot[linewidth=1pt,linecolor=blue]{-1.3}{2.55}{\funkWende}% +\psplot[linewidth=1pt,linecolor=Green]{-6.5}{5}{\funkNormal}% +%----------------- Punkte und Werte NICHT anzeigen +{\psset{onlyNode=true,markZeros=false} +%----------------- Schnittpunkt: Wendetangente in W1 mit f ------------- +\psZero(0,4){\funkWende}[\funkf]{WS1} +%----------------- Schnittpunkte: Wendenormale in W1 mit f ------------- +\psZero(-4,0){\funkNormal}[\funkf]{WN1} +\psZero(0,1.5){\funkNormal}[\funkf]{WN2} +\psZero(1.5,3){\funkNormal}[\funkf]{WN3} +%----------------- NULLSTELLE von g ----------------- +\psZero(-3,3){\funkg}[0]{Ng1} +%----------------- SCHNITTPUNKTE f und g ----------------- +\psZero(0,3){\funkg}[\funkf]{S1} +\psZero(-3,0){\funkg}[\funkf]{S2} +} +%----------------- FLÄCHE mit x-ACHSE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=gray,linestyle=none]{% +\psplot{nN1x}{nW1x}{\funkf} +\lineto(!nW1x 0) +\closepath +} +%----------------- FLÄCHE ZWISCHEN WENDETANGENTE UND KURVE f ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=blue,linestyle=none]{% +\psplot{nW1x}{nWS1x}{\funkWende} +\psplot{nWS1x}{nW1x}{\funkf} +\closepath +} +%----------------- FLÄCHE ZWISCHEN WENDENORMALE UND KURVE f (Zwei FlÄchenstücke!!!) ---- +%----------------- linke FLÄCHE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{% +\psplot{nWN1x}{nW1x}{\funkNormal} +\psplot{nW1x}{nWN1x}{\funkf} +\closepath +} +%----------------- rechte FLÄCHE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{% +\psplot{nWN2x}{nWN3x}{\funkNormal} +\psplot{nWN3x}{nWN2x}{\funkf} +\closepath +} +%----------------- FLÄCHE zwischen den KURVEN f und g und beiden KOORDINATEN-ACHSEN ----- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=yellow,linestyle=none]{% +\psplot{0}{nS1x}{\funkg} +\psplot{nS1x}{nN2x}{\funkf} +\lineto(0,0) +\closepath +} +% SPIELEREI: FLÄCHE mit f und PARALLELEN ZUR x-ACHSE +% Punkte und Werte NICHT anzeigen +{\psset{onlyNode=true,markZeros=false} +\psZero(-3,-2){\funkf}[2]{M1} +\psZero(-3,-2){\funkf}[4]{M2} +} +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=magenta,linestyle=none]{% +\psplot{nM1x}{nM2x}{\funkf} +\lineto(0,4) +\lineto(0,2) +\closepath +} +\end{pspicture}} + +\begin{lstlisting} +\psset{yunit=0.8,comma,decimals=2,algebraic=true,markZeros=true,plotpoints=500,saveNodeCoors,NodeCoorPrefix=n} +%----------------- FUNKTIONSDEFINITIONEN in "algebraic" ----------------- +\def\funkf{0.75*x^4-3*x^2-2} +\def\funkg{0.25*x+1} + +\begin{pspicture}(-6.5,-5.5)(6.5,8.5) +%------ Gitter im Hintergrund (CLIPPED) ----------------- +\begin{psclip}% +{\psframe[linestyle=none](-6.4,-5.4)(6.4,7.4)} +\psgrid[subgriddiv=2,gridlabels=0,gridwidth=0.3pt,gridcolor=black!50,subgridwidth=0.2pt,subgridcolor=black!30](-6.5,-7.5)(6.5,8.5) +\end{psclip} +%--------- Achsen ------------ +\psaxes[xDecimals=0, yDecimals=0,labelFontSize=\scriptstyle,arrowscale=1.3,arrowinset=0.05,arrowlength=1.9, Dy=1,dy=1,dx=1,Dx=1,subticks=0,comma,tickwidth=0.5pt]{->}(0,0)(-6.5,-5.5)(6.5,7.5)[$x$,-90][$y$,180]% Achsen +%----- Funktionsgraphen plotten (Clippen, damit sie nicht aus dem Gitter ragen) ----------------- +\begin{psclip}% +{\psframe[linestyle=none](-6.5,-5.4)(6.5,7.4)} +\psplot[linewidth=1pt,linecolor=Gray]{-6.5}{6.5}{\funkf}% +\psplot[linewidth=1pt,linecolor=BrickRed]{-6.5}{6.5}{\funkg}% +\end{psclip} +%----------------- SPEZIELLE PUNKTE ----------------- +{\psset{fontscale=8,PrintCoord=true,linestyle=none,opacity=0.8,Framed=true,fillcolor=cyan!10} +%----------------- NULLSTELLEN ----------------- +\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={1},ydecimals=0](-3,-2){\funkf}[0]{N1} +\psZero[xShift=-0.9,yShift=0.15,PointName={N},postString={2},ydecimals=0](2,3){\funkf}[0]{N2} +%----------------- EXTREMWERTE ----------------- +\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={1}](-2,0){Derive(1,\funkf)+\funkf}[\funkf]{T1} +\psZero[xShift=-0.9,yShift=0.25,PointName={H},postString={}](-1,1){Derive(1,\funkf)+\funkf}[\funkf]{H} +\psZero[xShift=-0.9,yShift=-0.25,PointName={T},postString={2}](0,2.5){Derive(1,\funkf)+\funkf}[\funkf]{T2} +%----------------- WENDEPUNKTE ----------------- +\psZero[xShift=-1.2,yShift=-0.25,PointName={W},postString={1}](-1.5,-0.5){Derive(2,\funkf)+\funkf}[\funkf]{W1} +\psZero[xShift=-0.6,yShift=-0.25,PointName={W},postString={2}](0.5,1.5){Derive(2,\funkf)+\funkf}[\funkf]{W2} +\psZero[onlyNode=true,markZeros=false](-1.5,-0.5){Derive(2,\funkf)+Derive(1,\funkf)}[Derive(1,\funkf)]{mW1}%Steigung Wendepunkt 1 ist "nmW1y" +} +%----------------- GLEICHUNG WENDETANGENTE ----------------- +\def\funkWende{nmW1y*(x-nW1x)+nW1y} +%----------------- GLEICHUNG WENDETANGENTE ----------------- +\def\funkNormal{-1/nmW1y*(x-nW1x)+nW1y} %m_n=-1/m_t +%----------------- Tangente und Normale in W1 plotten ------------------ +\psplot[linewidth=1pt,linecolor=blue]{-1.3}{2.55}{\funkWende}% +\psplot[linewidth=1pt,linecolor=Green]{-6.5}{5}{\funkNormal}% +%----------------- Punkte und Werte NICHT anzeigen +{\psset{onlyNode=true,markZeros=false} +%----------------- Schnittpunkt: Wendetangente in W1 mit f ------------- +\psZero(0,4){\funkWende}[\funkf]{WS1} +%----------------- Schnittpunkte: Wendenormale in W1 mit f ------------- +\psZero(-4,0){\funkNormal}[\funkf]{WN1} +\psZero(0,1.5){\funkNormal}[\funkf]{WN2} +\psZero(1.5,3){\funkNormal}[\funkf]{WN3} +%----------------- NULLSTELLE von g ----------------- +\psZero(-3,3){\funkg}[0]{Ng1} +%----------------- SCHNITTPUNKTE f und g ----------------- +\psZero(0,3){\funkg}[\funkf]{S1} +\psZero(-3,0){\funkg}[\funkf]{S2} +} +%----------------- FLÄCHE mit x-ACHSE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=gray,linestyle=none]{% +\psplot{nN1x}{nW1x}{\funkf} +\lineto(!nW1x 0) +\closepath +} +%----------------- FLÄCHE ZWISCHEN WENDETANGENTE UND KURVE f ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=blue,linestyle=none]{% +\psplot{nW1x}{nWS1x}{\funkWende} +\psplot{nWS1x}{nW1x}{\funkf} +\closepath +} +%----------------- FLÄCHE ZWISCHEN WENDENORMALE UND KURVE f (Zwei FlÄchenstücke!!!) ---- +%----------------- linke FLÄCHE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{% +\psplot{nWN1x}{nW1x}{\funkNormal} +\psplot{nW1x}{nWN1x}{\funkf} +\closepath +} +%----------------- rechte FLÄCHE ----------------- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=green,linestyle=none]{% +\psplot{nWN2x}{nWN3x}{\funkNormal} +\psplot{nWN3x}{nWN2x}{\funkf} +\closepath +} +%----------------- FLÄCHE zwischen den KURVEN f und g und beiden KOORDINATEN-ACHSEN ----- +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=yellow,linestyle=none]{% + \psplot{0}{nS1x}{\funkg} + \psplot{nS1x}{nN2x}{\funkf} + \lineto(0,0) + \closepath} +% SPIELEREI: FLÄCHE mit f und PARALLELEN ZUR x-ACHSE +% Punkte und Werte NICHT anzeigen +{\psset{onlyNode=true,markZeros=false} +\psZero(-3,-2){\funkf}[2]{M1} +\psZero(-3,-2){\funkf}[4]{M2}} +\pscustom[fillstyle=solid,opacity=0.3,fillcolor=magenta,linestyle=none]{% + \psplot{nM1x}{nM2x}{\funkf} + \lineto(0,4) + \lineto(0,2) + \closepath} +\end{pspicture} +\end{lstlisting} + %\begin{LTXexample}[pos=t] @@ -1032,38 +1290,47 @@ \clearpage + + + \subsection{Binomial distribution}\label{sec:bindistri} -These two macros plot binomial distribution, \Lcs{psBinomialN} the normalized one. -It is always done in the $x$-Intervall $[0;1]$. -Rescaling to another one can be done by setting the \Lkeyword{xunit} option -to any other value. - -The binomial distribution gives the discrete probability distribution $P_p(n|N)$ of obtaining -exactly $n$ successes out of $N$ Bernoulli trials (where the result of each -Bernoulli trial is true with probability $p$ and false with probability -$q=1-p$. The binomial distribution is therefore given by +\begin{sloppypar} +The following five macros plot binomial probability mass function \Lcs{psBinomial} and \Lcs{psBinomialC} in curve style, the normalized one is \Lcs{psBinomialN}. The cumulative distribution function $F$ \Lcs{psBinomialF} and the complement of the cumulative distribution function ($1-F$) \Lcs{psBinomialFS} +The vertical range for the plots is the $y$-Intervall $[0;1]$. +Rescaling other values can be done by setting the \Lkeyword{yunit} option +to any other value. +\end{sloppypar} + +The binomial distribution \Lcs{psBinomial} gives the discrete probability distribution $P_p(n|N)$ $n$ successes out of $N$ Bernoulli trials (where the result of each Bernoulli trial is true with probability $p$ and false with probability $q=1-p$). The binomial distribution is therefore given by \begin{align} P_p(n|N) &= \binom{N}{n}p^nq^{N-n} \\ &= \frac{N!}{n!(N-n)!}p^n(1-p)^{N-n}, \end{align} -where $(N; n)$ is a binomial coefficient and $P$ the probability. +where $(N; n)$ is a binomial coefficient and $P$ the probability. -The syntax is quite easy: +The syntax is: \begin{BDef} \Lcs{psBinomial}\OptArgs\Largb{N}\Largb{probability p}\\ \Lcs{psBinomial}\OptArgs\Largb{m,N}\Largb{probability p}\\ \Lcs{psBinomial}\OptArgs\Largb{m,n,N}\Largb{probability p}\\ -\Lcs{psBinomialN}\OptArgs\Largb{N}\Largb{probability p} +\Lcs{psBinomialC}\OptArgs\Largb{N}\Largb{probability p}\\ +\Lcs{psBinomialN}\OptArgs\Largb{N}\Largb{probability p}\\ +\Lcs{psBinomialF}\OptArgs\Largb{N}\Largb{probability p}\\ +\Lcs{psBinomialF}\OptArgs\Largb{m,N}\Largb{probability p}\\ +\Lcs{psBinomialF}\OptArgs\Largb{m,n,N}\Largb{probability p}\\ +\Lcs{psBinomialFS}\OptArgs\Largb{N}\Largb{probability p}\\ +\Lcs{psBinomialFS}\OptArgs\Largb{m,N}\Largb{probability p}\\ +\Lcs{psBinomialFS}\OptArgs\Largb{m,n,N}\Largb{probability p} \end{BDef} \begin{itemize} \item with one argument $N$ the sequence $0\ldots N$ is calculated and plotted -\item with two arguments $m,N$ the sequence $0\ldots N$ is calculated and +\item with two arguments $m,N$ the sequence $0\ldots N$ is calculated and the sequence $m\ldots N$ is plotted -\item with three arguments $m,n,N$ the sequence $0\ldots N$ is calculated and +\item with three arguments $m,n,N$ the sequence $0\ldots N$ is calculated and the sequence $m\ldots n$ is plotted \end{itemize} @@ -1071,23 +1338,38 @@ one should expect problems with $N>100$. PostScript cannot handle such small values and there will be no graph printed. This happens on PostScript side, so \TeX\ doesn't report any problem in the log file. The valid options for the macros are \Lkeyword{markZeros} to draw rectangles instead -of a continous line and \Lkeyword{printValue} for printing the $y$-values on top of the lines, -rotated by 90\textdegree. For this option all other options from section~1 -for the macro \Lcs{psPrintValue} are valid, too.~ \cite{pst-tools} Important is the keyword \Lkeyword{valuewidth} +of a continous line and \Lkeyword{printValue} for printing the $y$-values in the color LabelColor $=$ color on top of the lines in distance labelsep and xlabelsep, rotated by labelangle $=\alpha$. For this option all other options from section~1 +for the macro \Lcs{psPrintValue} are valid, too.~ \cite{pst-tools} Important is the keyword \Lkeyword{valuewidth} which is preset to 10. If your value has more characters when converting into a string, it will not be printed or cause an GhostScript error. -The only special option is \Lkeyword{barwidth}, -which is a factor (no dimension) and set by default to 1. This option is only valid for -the macro \Lcs{psBinomial} and not for the normalized one! +Special options are +\begin{itemize} +\item \Lkeyword{barwidth}, which is a factor (no dimension) and set by default to 1. This option is not valid for +the macro \Lcs{psBinomialN}! +\item \Lkeyword{labelangle} is the rotation of the printed values, default is 90\textdegree +\item \Lkeyword{xlabelsep} is the x-separation of the printed values, default is 0 (no dimension) +\item \Lkeyword{labelsep} is the y-separation of the printed values, default is 0.2 (no dimension) +\item \Lkeyword{LabelColor} is the color of the printed values, default is black +\item \Lkeyword{LineEnding} this boolean is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS}, default is true. Draws circles at the end of the lines +\item \Lkeyword{VLines} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS}, default is false. Draws the vertical lines dashed. +\item \Lkeyword{rightEnd}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) and $n=N$, default is 2 +\item \Lkeyword{leftEnd}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) and $m=0$, default is 1 +\item \Lkeyword{radiusout}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the outer radius of the both dots left and right, default is 2 +\item \Lkeyword{radiusinL}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the left dot, default is 0 +\item \Lkeyword{radiusinR}, this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the right dot, default is 1.5 +\item \Lkeyword{LineEndColorL} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the color of the left dot, default is green +\item \Lkeyword{LineEndColorR} this option is only valid for the macros \Lcs{psBinomialF} and \Lcs{psBinomialFS} when LineEnding=true (default) for the inner radius of the right dot, default is red +\end{itemize} \psset[pst-func]{barwidth=1} \begin{LTXexample}[pos=t,preset=\centering] \psset{xunit=1cm,yunit=5cm}% -\begin{pspicture}(-1,-0.15)(7,0.55)% +\begin{pspicture}(-1,-0.15)(7,0.6)% \psaxes[Dy=0.2,dy=0.2\psyunit]{->}(0,0)(-1,0)(7,0.5) \uput[-90](7,0){$k$} \uput[90](0,0.5){$P(X=k)$} -\psBinomial[markZeros,printValue,fillstyle=vlines]{6}{0.4} +\psBinomial[markZeros,printValue,fillstyle=vlines, +labelangle=80,LabelColor=blue]{6}{0.4} \end{pspicture} \end{LTXexample} @@ -1096,8 +1378,9 @@ \begin{pspicture}(-1,-0.05)(8,0.6)% \psaxes[Dy=0.2,dy=0.2\psyunit]{->}(0,0)(-1,0)(8,0.5) \uput[-90](8,0){$k$} \uput[90](0,0.5){$P(X=k)$} +\psBinomialC[fillstyle=solid,opacity=0.5,fillcolor=cyan,plotstyle=curve]{7}{0.6} \psBinomial[linecolor=red,markZeros,printValue,fillstyle=solid, - fillcolor=blue,barwidth=0.2]{7}{0.6} + fillcolor=blue,barwidth=0.2,xlabelsep=-0.05]{7}{0.6} \end{pspicture} \end{LTXexample} @@ -1109,6 +1392,7 @@ \psBinomial[linecolor=black!30]{0,7}{0.6} \psBinomial[linecolor=blue,markZeros,printValue,fillstyle=solid, fillcolor=blue,barwidth=0.4]{2,5,7}{0.6} +\psBinomialC[,showpoints=true,plotstyle=curve]{7}{0.6} \end{pspicture} \end{LTXexample} @@ -1125,6 +1409,35 @@ \end{pspicture*} \end{LTXexample} +\begin{LTXexample}[pos=t,preset=\centering] +\psset{xunit=0.8cm,yunit=8cm}% +\begin{pspicture*}[showgrid=false](-1.5,-0.1)(16,1.2)% +\psset{arrowscale=1.3,arrowinset=0.05,arrowlength=1.9,comma}% +\psaxes[labelFontSize=\scriptstyle,xticksize=0 1.07,yticksize=0 16,tickcolor=gray!50, + Dy=0.1,dy=0.1,Dx=1,dx=1,Ox=0]{->}(0,0)(-0.9,0)(16,1.1) +\uput[-90](15.8,0){$z$}\uput[0](0,1.1){$P_{0,15}^{100}(Z=z)$} +\psBinomialC[linecolor=cyan,fillstyle=solid,fillcolor=cyan!50,opacity=0.4,plotstyle=curve]{40}{0.15}% +\psBinomial[markZeros,linecolor=BrickRed,fillstyle=solid,fillcolor=BrickRed,barwidth=0.75,opacity=0.6]{1,16,40}{0.15}% +\psBinomialFS[markZeros,linecolor=Green,fillstyle=solid,fillcolor=orange,barwidth=0.3,opacity=0.6]{0,16,40}{0.15}% +\psBinomialF[linecolor=gray,fillstyle=solid,fillcolor=yellow,barwidth=0.4,opacity=0.5]{3,16,40}{0.15} +\end{pspicture*} +\end{LTXexample} + +\begin{LTXexample}[pos=t,preset=\centering] +\psset{xunit=0.75cm,yunit=7.5cm}% +\begin{pspicture*}[showgrid=false](-1.3,-0.067)(14.67,1.13)% +\psset{arrowscale=1.3,arrowinset=0.05,arrowlength=1.9,comma} +\psaxes[labelFontSize=\scriptstyle,xticksize=0 1.07,yticksize=0 12,tickcolor=gray!50,Dy=0.1,dy=0.1,Dx=1,dx=1,Ox=0]{->}(0,0)(-0.9,0)(14,1.1) +\uput[-90](13.8,0){$z$} \uput[0](0,1.08){$F_{0,7}^{10}(Z\leq z)$} +\psBinomial[markZeros,linecolor=orange,fillstyle=solid,fillcolor=orange,barwidth=1,opacity=0.5]{0,10,10}{0.7} +\psBinomialF[markZeros,linecolor=blue,linewidth=0.7pt,barwidth=0.2, +opacity=0.5,fillstyle=solid,fillcolor=blue,valuewidth=15]{0,13,10}{0.7} +\psBinomialFS[LineEnding=false,linecolor=BrickRed,linewidth=0.9pt,VLines=true]{0,10,10}{0.7} +\psBinomialF[linecolor=Green,printValue=false,linewidth=1.2pt,LineEndColorR=BrickRed,LineEndColorL=Green!70, +radiusout=3.5,radiusinL=0,radiusinR=2,LineEnding=true,leftEnd=1,rightEnd=3]{0,10,10}{0.7} +\end{pspicture*} +\end{LTXexample} + The default binomial distribution has the mean of $\mu=E(X)=N\cdot p$ and a variant of $\sigma^2=\mu\cdot(1-p)$. The normalized distribution has a mean of $0$. Instead of $P(X=k)$ @@ -1166,7 +1479,7 @@ \end{pspicture*} \end{LTXexample} -For the normalized distribution the plotstyle can be set to \Lkeyval{curve} (\Lkeyset{plotstyle=curve}), +For the normalized distribution the plotstyle can be set to \Lkeyval{curve} (\Lkeyset{plotstyle=curve}), then the binomial distribution looks like a normal distribution. This option is only valid for \Lcs{psBinomialN}. The option \Lkeyword{showpoints} is valid if \Lkeyval{curve} was chosen. @@ -1190,6 +1503,12 @@ \end{pspicture*} \end{LTXexample} + + + + + + \clearpage \subsection{Poisson distribution} Given a Poisson process\footnote{\url{http://mathworld.wolfram.com/PoissonProcess.html}}, @@ -1776,7 +2095,7 @@ \clearpage \section{\nxLcs{psplotImp} -- plotting implicit defined functions} For a given area, the macro calculates in a first step row by row for every pixel (1pt) -the function $f(x,y)$ and checks for avchanging of the value from $f(x,y)<0$ to $f(x,y)>0$ +the function $f(x,y)$ and checks for a changing of the value from $f(x,y)<0$ to $f(x,y)>0$ or vice versa. If this happens, then the pixel must be part of the curve of the function $f(x,y)=0$. In a second step the same is done column by column. This may take some time because an area of $400\times 300$ pixel needs 120 thousand calculations @@ -2111,10 +2430,10 @@ \xkvview{family=pst-func,columns={key,type,default}} \bgroup -\raggedright +\RaggedRight \nocite{*} -\bibliographystyle{plain} -\bibliography{pst-func-doc} +%\bibliographystyle{plain} +\printbibliography{pst-func-doc} \egroup \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.doc.tlpobj new/tlpkg/tlpobj/pst-func.doc.tlpobj --- old/tlpkg/tlpobj/pst-func.doc.tlpobj 2016-05-03 03:18:37.000000000 +0200 +++ new/tlpkg/tlpobj/pst-func.doc.tlpobj 2017-04-19 02:06:48.000000000 +0200 @@ -1,9 +1,9 @@ name pst-func.doc category Package -revision 40824 +revision 43912 shortdesc doc files of pst-func relocated 1 -docfiles size=923 +docfiles size=960 RELOC/doc/generic/pst-func/Changes RELOC/doc/generic/pst-func/README.md RELOC/doc/generic/pst-func/pst-func-doc.bib ++++++ pst-func.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-func/pst-func.tex new/tex/generic/pst-func/pst-func.tex --- old/tex/generic/pst-func/pst-func.tex 2016-05-02 03:29:35.000000000 +0200 +++ new/tex/generic/pst-func/pst-func.tex 2017-04-18 23:31:01.000000000 +0200 @@ -19,7 +19,7 @@ %% \csname PSTfuncLoaded\endcsname \let\PSTfuncLoaded\endinput -% Requires some PSTricks packages +% Requires some PSTricks packages \ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi \ifx\PSTnodesLoaded\endinput\else \input pst-plot.tex\fi \ifx\PSTmathLoaded\endinput \else \input pst-math.tex\fi @@ -31,8 +31,8 @@ % interface to the `xkeyval' package \pst@addfams{pst-func} % -\def\fileversion{0.82} -\def\filedate{2016/05/01} +\def\fileversion{0.85} +\def\filedate{2017/04/18} \message{`PST-func' v\fileversion, \filedate\space (hv)} % \pstheader{pst-func.pro} @@ -94,7 +94,7 @@ coeff=0 1, % coeff=a0 a1 a2 a3 ... Derivation=0, % 0 is the original function markZeros=false,% no dots for the zeros - epsZero=0.1, % the distance between two zero points + epsZero=0.1, % the distance between two zero points dZero=0.1, % the distance of the x value for scanning the function zeroLineTo=-1, % a line to the value of the lineTo's Derivation (-1= none) zeroLineStyle=dashed,% @@ -139,7 +139,7 @@ y0 % the returned value ist the zero point 0 \tx@ScreenCoor pstack 3 0 360 arc gsave 0 0 1 setrgbcolor fill grestore 1 setlinewidth stroke -} def +} def \fi % \def\psPolynomial{\pst@object{psPolynomial}} @@ -157,7 +157,7 @@ /dx x1 x0 sub \psk@plotpoints\space div def /Derivation \psk@Derivation\space def /x x0 def - \ifPst@markZeros + \ifPst@markZeros 5 dict begin % hold all local! gsave \pst@number\psk@zeroLineWidth SLW @@ -168,10 +168,10 @@ xZero \pst@number\psxunit mul /xPixel exch def \psk@dotsize \@nameuse{psds@\psk@dotstyle}% - xPixel 0 Dot + xPixel 0 Dot \psk@zeroLineTo\space 0 ge { % line to function \psk@lineTo xPixel 0 moveto - xZero coeff \psk@zeroLineTo\space FuncValue + xZero coeff \psk@zeroLineTo\space FuncValue \pst@number\psyunit mul xPixel exch L \@nameuse{psls@\psk@zeroLineStyle} } if @@ -180,7 +180,7 @@ end \fi /xy { - x \psk@xShift\space sub coeff Derivation FuncValue \pst@number\psyunit mul + x \psk@xShift\space sub coeff Derivation FuncValue \pst@number\psyunit mul x \pst@number\psxunit mul exch } def xy moveto @@ -210,7 +210,7 @@ mark /n 2 def \psk@plotpoints { - xy + xy n 2 roll /n n 2 add def /x x dx add def @@ -257,13 +257,13 @@ \psplot{#2}{#3}[ /nue \psk@nue def /epsilon 1e-20 def ]{% /Sum 0 def /Iter 0 def - {/Sum_Iter + {/Sum_Iter x dup mul 4 div Iter exp % nominator nue Iter add 1 add GAMMA Iter tx@AddMathFunc begin ! end mul % denominator Div def Sum_Iter abs epsilon lt { exit } if /Sum Sum Sum_Iter add def - /Iter Iter 1 add def + /Iter Iter 1 add def } loop x 0.5 mul nue exp Sum mul }% @@ -280,7 +280,7 @@ \psset{plotpoints=200}% \psset{#1}% \psplot[algebraic=false]{#2}{#3}{% - Euler x \psk@mue sub dup mul 2 div \psk@sigma dup mul div neg exp + Euler x \psk@mue sub dup mul 2 div \psk@sigma dup mul div neg exp 1.0 \psk@sigma div TwoPi sqrt div mul% }% }\ignorespaces} @@ -296,20 +296,20 @@ /a #1 def /dx #2 #1 sub \psk@plotpoints\space div def /b a dx add def - /scx { \pst@number\psxunit mul } def + /scx { \pst@number\psxunit mul } def /scy { \pst@number\psyunit mul } def - tx@FuncDict begin + tx@FuncDict begin /C 1 \psk@sigma div TwoPi sqrt div def /SFunc {% x on Stack - Euler exch \psk@mue\space sub dup mul 2 div \psk@sigma\space dup mul div neg exp C mul - } def + Euler exch \psk@mue\space sub dup mul 2 div \psk@sigma\space dup mul div neg exp C mul + } def end % a scx 0 moveto a scx 0 \@nameuse{beginqp@\psplotstyle} \psk@plotpoints 1 sub { a b \psk@Simpson % a b M on Stack tx@FuncDict begin Simpson I end % y value on stack - scy b scx exch \@nameuse{doqp@\psplotstyle} %lineto + scy b scx exch \@nameuse{doqp@\psplotstyle} %lineto /b b dx add def } repeat % stroke @@ -397,17 +397,17 @@ \def\psPrintValue@i#1{\expandafter\psPrintValue@ii#1,,\@nil} \def\psPrintValue@ii#1,#2,#3\@nil{% #1,#2 only for algebraic code \begin@SpecialObj - \addto@pscode{ - gsave \psk@PSfont findfont \psk@fontscale scalefont setfont - \ifPst@algebraic - /x #1 def - /Func (#2) tx@AlgToPs begin AlgToPs end cvx def - Func + \addto@pscode{ + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont + \ifPst@algebraic + /x #1 def + /Func (#2) tx@AlgToPs begin AlgToPs end cvx def + Func \else #1 \fi \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if \psk@valuewidth string cvs %/Output exch def % save output \ifPst@comma dot2comma \fi % do we have to change dot to comma - \psk@xShift\space 0 moveto %Output + \psk@xShift\space 0 moveto %Output show grestore }% \end@SpecialObj% @@ -425,20 +425,20 @@ /mfont { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def /mfontexp { \psk@PSfont findfont \psk@fontscale 1.2 div scalefont setfont } bind def /s1 { /Symbol findfont \psk@fontscale scalefont setfont } bind def - \ifPst@algebraic + \ifPst@algebraic /x #1 def - /Func (#2) tx@AlgToPs begin AlgToPs end cvx def - Func + /Func (#2) tx@AlgToPs begin AlgToPs end cvx def + Func \else #1 \fi /value ED \psk@Scin { value 0 ne { value log floor cvi /expon ED }{ /expon 0 def } ifelse - value 10 expon exp div - \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul + value 10 expon exp div + \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul \ifPst@round round \else cvi \fi exch div } if \psk@decimals 0 eq { cvi } if /numb ED expon \psk@valuewidth string cvs /expon exch def - numb \psk@valuewidth string cvs + numb \psk@valuewidth string cvs \ifPst@comma dot2comma \fi % do we have to change dot to comma /Output exch def /txspc \psk@fontscale 4 div def @@ -447,12 +447,12 @@ txspc 0 rmoveto mfont (10) show txspc 2 div txspc 1.5 mul rmoveto mfontexp expon show } { value - \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul + \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul \ifPst@round round \else cvi \fi exch div } if \psk@decimals 0 eq { cvi } if %inserted to handle decimals=0 - \psk@valuewidth string cvs + \psk@valuewidth string cvs \ifPst@comma dot2comma \fi % do we have to change dot to comma - \psk@xShift\space 0 moveto mfont %Output + \psk@xShift\space 0 moveto mfont %Output show } ifelse }% @@ -522,8 +522,22 @@ }% % \define@boolkey[psset]{pst-func}[Pst@]{printValue}[true]{} +\define@boolkey[psset]{pst-func}[Pst@]{LineEnding}[true]{} +\define@boolkey[psset]{pst-func}[Pst@]{VLines}[true]{} \define@key[psset]{pst-func}{barwidth}[1]{\def\psFunc@barwidth{#1 }}% a factor, not a dimen -\psset[pst-func]{printValue=false,barwidth=1} +\define@key[psset]{pst-func}{rightEnd}[2]{\def\psFunc@rightEnd{#1 }} +\define@key[psset]{pst-func}{leftEnd}[2]{\def\psFunc@leftEnd{#1 }} +\define@key[psset]{pst-func}{labelangle}[90]{\def\psFunc@langle{#1 }} +\define@key[psset]{pst-func}{xlabelsep}[0]{\def\psFunc@xlabelsep{#1 }} +\define@key[psset]{pst-func}{radiusout}[2]{\def\psFunc@radiusout{#1 }} +\define@key[psset]{pst-func}{radiusinL}[0]{\def\psFunc@radiusinL{#1 }} +\define@key[psset]{pst-func}{radiusinR}[1.5]{\def\psFunc@radiusinR{#1 }} +\define@key[psset]{pst-func}{LabelColor}[black]{\pst@getcolor{#1}\psk@LabelColor} +\define@key[psset]{pst-func}{LineEndColorL}[green]{\pst@getcolor{#1}\psk@LineEndColorL} +\define@key[psset]{pst-func}{LineEndColorR}[red]{\pst@getcolor{#1}\psk@LineEndColorR} +\define@key[psset]{pst-func}{vlinestyle}[solid]{\def\psvlinestyle{#1}} +\psset[pst-func]{printValue=false,barwidth=1,labelangle=90,xlabelsep=0,LabelColor=black,LineEndColorL=green,LineEndColorR=red, +radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLines=false} % \def\psBinomial{\pst@object{psBinomial}} \def\psBinomial@i#1#2{\psBinomial@ii#1,,,\@nil{#2}}% @@ -535,9 +549,10 @@ \def\pst@tempA{#3}% \ifx\pst@tempA\@empty\psBinomial@iii{#1}{#2}{#2}{#5}% \else\psBinomial@iii{#1}{#2}{#3}{#5}\fi - \fi}% + \fi} +% \def\psBinomial@iii#1#2#3#4{% - \begin@OpenObj% + \begin@OpenObj \addto@pscode{ /scx { \pst@number\psxunit mul } def /scy { \pst@number\psyunit mul } def @@ -565,23 +580,23 @@ kOld scx Y scy L k dx add scx Y scy L \ifPst@markZeros k dx add scx 0 L kOld 1 add scx 0 L \fi \ifPst@printValue - gsave \psk@PSfont findfont \psk@fontscale scalefont setfont - Y \psk@valuewidth string cvs + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor % + Y \psk@valuewidth string cvs \ifPst@comma dot2comma \fi - k scx \psk@fontscale 2 div add + k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add Y scy \pst@number\pslabelsep add moveto - 90 rotate show grestore + \psFunc@langle rotate show grestore \fi /kOld kOld 1 add def } for \ifPst@markZeros\else k dx add scx 0 L \fi % last line down to x-axis }% -% \psk@fillstyle% -% \pst@stroke% - \end@OpenObj% +% \psk@fillstyle +% \pst@stroke + \end@OpenObj }% % -\def\psBinomialN{\pst@object{psBinomialN}} +\def\psBinomialN{\pst@object{psBinomialN}}% \def\psBinomialN@i#1#2{% \leavevmode \pst@killglue @@ -589,12 +604,12 @@ \use@par \init@pscode \def\cplotstyle{curve}% - \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle} \fi% - \addto@pscode{ - \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi - /scx { \pst@number\psxunit mul } def + \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi + \addto@pscode{% + \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi + /scx { \pst@number\psxunit mul } def /scy { \pst@number\psyunit mul } def - /N #1 def + /N #1 def /p #2 def % probability /q 1 p sub def /E N p mul def @@ -602,43 +617,286 @@ /dx 1.0 sigma div 2 div def /xOld dx neg E sub sigma div def /xEnd xOld neg dx add scx def - Curve + Curve { /Coors [xOld dx sub scx 0] def }% saves the coordinates for curve { xOld scx 0 moveto } % starting point - ifelse - 0 1 N { % N times + ifelse + 0 1 N {% % N times /k exch def % save loop variable - k 0 eq + k 0 eq { /Y q N exp def } { /Y Y N k sub 1 add mul k div p mul q div def } ifelse % recursive definition /x k E sub sigma div dx add def /y Y sigma mul def % normalize - Curve + Curve { x dx sub scx y scy Coors aload length 2 add array astore /Coors exch def} { xOld scx y scy L x scx y scy L - \ifPst@markZeros x scx 0 L \fi % + \ifPst@markZeros x scx 0 L \fi % } ifelse - \ifPst@printValue - gsave \psk@PSfont findfont \psk@fontscale scalefont setfont + \ifPst@printValue + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor % y \psk@valuewidth string cvs %/Output exch def \ifPst@comma dot2comma \fi % do we have to change dot to comma - x dx sub scx \psk@fontscale 2 div add - y scy \pst@number\pslabelsep add moveto - 90 rotate show grestore + x dx sub scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add + y scy \pst@number\pslabelsep add moveto + \psFunc@langle rotate show grestore \fi /xOld x def } for - Curve { [ xEnd 0 Coors aload pop } if % showpoints on top of the stack + Curve { [ xEnd 0 Coors aload pop } if% showpoints on top of the stack }% - \ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else% - \psk@fillstyle% - \pst@stroke% - \fi% - \use@pscode% - \endgroup% - \ignorespaces% -} + \ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else + \psk@fillstyle + \pst@stroke + \fi + \use@pscode + \endgroup + \ignorespaces +}% +\def\psBinomialF{\pst@object{psBinomialF}} +\def\psBinomialF@i#1#2{\psBinomialF@ii#1,,,\@nil{#2}}% +\def\psBinomialF@ii#1,#2,#3,#4\@nil#5{% + \def\pst@tempA{#2}% + \ifx\pst@tempA\@empty + \psBinomialF@iii{0}{#1}{#1}{#5}% + \else + \def\pst@tempA{#3}% + \ifx\pst@tempA\@empty\psBinomialF@iii{#1}{#2}{#2}{#5}% + \else\psBinomialF@iii{#1}{#2}{#3}{#5}\fi + \fi}% +\def\psBinomialF@iii#1#2#3#4{% + \begin@OpenObj + \addto@pscode{ + /scx { \pst@number\psxunit mul } def + /scy { \pst@number\psyunit mul } def + /m #1 def + /n #2 def + /N #3 def + /p #4 def + /dx \psFunc@barwidth 2 div def + /q 1 p sub def + \ifPst@markZeros /kOld dx neg m add def \else + /kOld m def \fi + \psFunc@leftEnd 0 eq + { } + { kOld 0 eq + { kOld \psFunc@leftEnd sub scx 0 moveto % starting point + \ifPst@LineEnding + kOld \psFunc@radiusout\pst@number\psxunit div sub scx 0 L stroke + kOld scx 0 newpath \psFunc@radiusout 0 360 arc kOld scx 0 \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill \else + kOld scx 0 L stroke \fi } + { } ifelse } ifelse + kOld scx 0 moveto % starting point + 0 1 m 1 sub { + /k exch def % save loop variable + k 0 eq + { /Y q N exp def + /F Y def} + { /Y Y N k sub 1 add mul k div p mul q div def + /F F Y add def } + ifelse + } for + m 1 n { % n-m+1 times + /k exch def % save loop variable + k 0 eq + { /Y q N exp def + /F Y def } + { /Y Y N k sub 1 add mul k div p mul q div def + /F F Y add def } + ifelse % recursive definition + \ifPst@markZeros kOld scx F scy L k dx add scx F scy L k dx add scx 0 L kOld 1 add scx 0 L + \else + kOld scx F scy newpath \psFunc@radiusout 0 360 arc kOld scx F scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill + kOld \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div add \fi + scx F scy moveto + k 1 add + \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div sub \fi + k N eq + { \psFunc@rightEnd add } + { } ifelse + scx F scy L \pst@usecolor\pslinecolor [1 0] 0 setdash stroke + \ifPst@LineEnding + k N eq + { } + { k 1 add scx F scy newpath \psFunc@radiusout 0 360 arc k 1 add scx F scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill } + ifelse + \ifPst@VLines + Y \psFunc@radiusout\pst@number\psyunit div 2 mul le + { } + { k scx F Y sub \psFunc@radiusout\pst@number\psyunit div add scy moveto k scx F \psFunc@radiusout\pst@number\psyunit div sub scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse \fi + \else + \ifPst@VLines + Y \psFunc@radiusout\pst@number\psyunit div 0.1 mul le + { } + { k scx F Y sub scy moveto k scx F scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse + \fi\fi\fi + \ifPst@printValue + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor % + F \psk@valuewidth string cvs + \ifPst@comma dot2comma \fi + k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add + F scy \pst@number\pslabelsep add moveto + \psFunc@langle rotate show grestore + \fi + /kOld kOld 1 add def + } for + }% + \end@OpenObj% +}% +% +\def\psBinomialFS{\pst@object{psBinomialFS}} +\def\psBinomialFS@i#1#2{\psBinomialFS@ii#1,,,\@nil{#2}}% +\def\psBinomialFS@ii#1,#2,#3,#4\@nil#5{% + \def\pst@tempA{#2}% + \ifx\pst@tempA\@empty + \psBinomialFS@iii{0}{#1}{#1}{#5}% + \else + \def\pst@tempA{#3}% + \ifx\pst@tempA\@empty\psBinomialFS@iii{#1}{#2}{#2}{#5}% + \else\psBinomialFS@iii{#1}{#2}{#3}{#5}\fi + \fi}% +\def\psBinomialFS@iii#1#2#3#4{% + \begin@OpenObj + \addto@pscode{ + /scx { \pst@number\psxunit mul } def + /scy { \pst@number\psyunit mul } def + /m #1 def + /n #2 def + /N #3 def + /p #4 def + /dx \psFunc@barwidth 2 div def + /q 1 p sub def + \ifPst@markZeros /kOld dx neg m add def \else + /kOld m def \fi + kOld scx 0 moveto % starting point + 0 1 m 1 sub { + /k exch def % save loop variable + k 0 eq + { /Y q N exp def + /F Y def + /FS 1 F sub def} + { /Y Y N k sub 1 add mul k div p mul q div def + /F F Y add def + /FS 1 F sub def} + ifelse + } for + m 1 n { % n-m+1 times + /k exch def % save loop variable + k 0 eq + { /Y q N exp def + /F Y def + /FS 1 F sub def} + { /Y Y N k sub 1 add mul k div p mul q div def + /F F Y add def + /FS 1 F sub def} + ifelse % recursive definition + \ifPst@markZeros kOld scx FS scy L k dx add scx FS scy L k dx add scx 0 L kOld 1 add scx 0 L + \else + \ifPst@LineEnding + k 0 eq + { } + { kOld scx FS scy newpath \psFunc@radiusout 0 360 arc kOld scx FS scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill } ifelse \fi + kOld \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div add \fi + k 0 eq + { \psFunc@leftEnd sub } + { } ifelse + scx FS scy moveto + k 1 add + \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div sub \fi + k N eq + { \psFunc@rightEnd add } + { } ifelse + scx FS scy L \pst@usecolor\pslinecolor [1 0] 0 setdash stroke + \ifPst@LineEnding + k N eq + { } + { k 1 add scx FS scy newpath \psFunc@radiusout 0 360 arc k 1 add scx FS scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill } + ifelse + \ifPst@VLines + Y \psFunc@radiusout\pst@number\psyunit div 2 mul le + { } + { k scx FS Y add \psFunc@radiusout\pst@number\psyunit div sub scy moveto k scx FS \psFunc@radiusout\pst@number\psyunit div add scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse \fi + \else + \ifPst@VLines + Y \psFunc@radiusout\pst@number\psyunit div 0.1 mul le + { } + { k scx FS Y add scy moveto k scx FS scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse + \fi\fi\fi + \ifPst@printValue + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor % + FS \psk@valuewidth string cvs + \ifPst@comma dot2comma \fi + k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add + FS scy \pst@number\pslabelsep add moveto + \psFunc@langle rotate show grestore + \fi + /kOld kOld 1 add def + } for + }% + \end@OpenObj +}% +% +\def\psBinomialC{\pst@object{psBinomialC}} +\def\psBinomialC@i#1#2{% + \leavevmode + \pst@killglue + \begingroup + \use@par + \init@pscode + \def\cplotstyle{curve}% + \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi + \addto@pscode{% + \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi + /scx { \pst@number\psxunit mul } def + /scy { \pst@number\psyunit mul } def + /N #1 def + /p #2 def % Wahrscheinlichkeit + /q 1 p sub def % q = 1 - p + /E N p mul def % Erwartungswert + /sigma E q mul sqrt def % Varianz + /dx 1.0 sigma div 2 div def + /xOld dx neg E sub sigma div def + /xEnd xOld neg E add dx add scx def +% /xOld dx neg sigma div def +% /xEnd xOld neg dx add scx def + Curve + { /Coors [xOld dx sub scx 0] def }% saves the coordinates for curve + { xOld scx 0 moveto }% starting point + ifelse + 0 1 N { % N times + /k exch def % save loop variable + k 0 eq + { /Y q N exp def } + { /Y Y N k sub 1 add mul k div p mul q div def } + ifelse % recursive definition + /x k 1 div dx add def + /y Y 1 mul def % normalize + Curve + { x dx sub scx y scy Coors aload length 2 add array astore /Coors exch def} + { xOld scx y scy L x scx y scy L + \ifPst@markZeros x scx 0 L \fi % + } ifelse + \ifPst@printValue + gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor % + y \psk@valuewidth string cvs %/Output exch def + \ifPst@comma dot2comma \fi % do we have to change dot to comma + x dx sub scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add + y scy \pst@number\pslabelsep add moveto + \psFunc@langle rotate show grestore + \fi + /xOld x def + } for + Curve { [ xEnd 0 Coors aload pop } if% showpoints on top of the stack + }% +\ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else + \psk@fillstyle + \pst@stroke +\fi +\use@pscode +\endgroup +\ignorespaces}% +% % \def\psPoisson{\pst@object{psPoisson}}% with contributions from Gerry Coombes \def\psPoisson@i#1#2{\psPoisson@ii#1,,\@nil{#2}}% @@ -709,9 +967,9 @@ \else \addbefore@par{plotpoints=200,alpha=1,beta=1}% \begin@OpenObj - \psplot[algebraic=false]{#1}{#2}{ + \psplot[algebraic=false]{#1}{#2}{ \psk@beta \psk@alpha add GAMMA - \psk@beta GAMMA \psk@alpha GAMMA mul div + \psk@beta GAMMA \psk@alpha GAMMA mul div 1 x sub \psk@beta 1.0 sub exp mul x \psk@alpha 1.0 sub exp mul } \end@OpenObj% @@ -803,7 +1061,7 @@ \ifdim#1pt<\z@ \psline(#1,0)(0,0)\def\pst@tempA{0}\fi \psplot[algebraic=false]{\pst@tempA}{#2}{ \psk@alpha \psk@beta \psk@alpha neg exp mul % alpha*beta^(-alpha) - x \psk@alpha 1 sub exp % x^(alpha-1) + x \psk@alpha 1 sub exp % x^(alpha-1) mul Euler x \psk@beta div \psk@alpha exp neg exp % e^(-(x/beta)^alpha)) mul } @@ -848,41 +1106,41 @@ \iffalse \def\Lorenz@code{ /D {} def - [ \L@Data\space counttomark dup + [ \L@Data\space counttomark dup 1 sub /m ED 2 div cvi /n ED % m=0..n-1 n=number of pairs ] /xyValues ED - /Xval [] def /Yval [] def /Xmax 0 def + /Xval [] def /Yval [] def /Xmax 0 def /Xsum 0 def /Ysum 0 def /XYsum 0 def xyValues aload pop % [ x y x y x y ... ] n { 2 copy mul XYsum add /XYsum ED - dup - Yval aload length 1 add array astore /Yval ED + dup + Yval aload length 1 add array astore /Yval ED Ysum add /Ysum ED dup - Xval aload length 1 add array astore /Xval ED + Xval aload length 1 add array astore /Xval ED dup Xsum add /Xsum ED dup Xmax gt { /Xmax ED }{ pop } ifelse } repeat Xval bubblesort /Xval ED Yval bubblesort /Yval ED - Xval { Xmax div } forall n array astore /XvalRelMax ED - Xval { Xsum div } forall n array astore /XvalRel ED - Yval { Ysum div } forall n array astore /YvalRel ED - 0 1 n 1 sub { + Xval { Xmax div } forall n array astore /XvalRelMax ED + Xval { Xsum div } forall n array astore /XvalRel ED + Yval { Ysum div } forall n array astore /YvalRel ED + 0 1 n 1 sub { cvi /Index ED - Xval Index get + Xval Index get Yval Index get mul } for n array astore /XmulY ED - XmulY aload length 1 sub { add } repeat + XmulY aload length 1 sub { add } repeat /XmulYsum ED - XmulY { XmulYsum div } forall + XmulY { XmulYsum div } forall n array astore /XmulYdivXmulYsum ED /X [0] def /Y [0] def /Xsum 0 def /Ysum 0 def 0 1 n 1 sub { - /Index ED + /Index ED % XvalRel Index get Xsum add /Xsum ED % X aload length 1 add Xsum exch array astore /X ED X aload length 1 add XvalRelMax Index get exch array astore /X ED %% @@ -891,52 +1149,52 @@ } for \ifPst@Gini 0 % start value for Gini - 0 1 X length 2 sub { + 0 1 X length 2 sub { /Index ED Y Index get Y Index 1 add get add 2 div % yHeight=(y0+y1)/2 - X Index 1 add get X Index get sub abs % xWidth=x1-x0 + X Index 1 add get X Index get sub abs % xWidth=x1-x0 mul % x*y add } for 2 mul 1 sub neg % triangle area divided by the area under the polygon - \psk@PSfont findfont \psk@fontscale scalefont setfont + \psk@PSfont findfont \psk@fontscale scalefont setfont \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if \psk@valuewidth string cvs %/Output exch def % save output \ifPst@comma dot2comma \fi % do we have to change dot to comma /Output ED - \psk@xShift\space -30 moveto (Gini: ) show - Output show + \psk@xShift\space -30 moveto (Gini: ) show + Output show \fi - 0 1 n { dup X exch get exch Y exch get } for + 0 1 n { dup X exch get exch Y exch get } for \if@star 1 0 0 0 \fi % add values for the closed curve }% filling the area under the curve. \fi %%%%%%%%%%%%%%%%%%%%%%5 \def\Lorenz@code{ [ #1 ] dup length /n ED - bubblesort /Yval ED + bubblesort /Yval ED [ 1 1 n { } for ] /Xval ED - /Xsum n dup 1 add mul 2 div cvi def + /Xsum n dup 1 add mul 2 div cvi def /Ysum 0 def /XYsum 0 def 0 Yval { add } forall /Ysum ED - Xval { n div } forall n array astore /XvalRelMax ED - Xval { Xsum div } forall n array astore /XvalRel ED - Yval { Ysum div } forall n array astore /YvalRel ED - 0 1 n 1 sub { + Xval { n div } forall n array astore /XvalRelMax ED + Xval { Xsum div } forall n array astore /XvalRel ED + Yval { Ysum div } forall n array astore /YvalRel ED + 0 1 n 1 sub { /Index ED - Xval Index get + Xval Index get Yval Index get mul } for n array astore /XmulY ED - XmulY aload length 1 sub { add } repeat + XmulY aload length 1 sub { add } repeat /XmulYsum ED - XmulY { XmulYsum div } forall + XmulY { XmulYsum div } forall n array astore /XmulYdivXmulYsum ED /X [0] def /Y [0] def /Xsum 0 def /Ysum 0 def 0 1 n 1 sub { - /Index ED + /Index ED % XvalRel Index get Xsum add /Xsum ED % X aload length 1 add Xsum exch array astore /X ED X aload length 1 add XvalRelMax Index get exch array astore /X ED %% @@ -945,23 +1203,23 @@ } for \ifPst@Gini 0 % start value for Gini - 0 1 X length 2 sub { + 0 1 X length 2 sub { /Index ED Y Index get Y Index 1 add get add 2 div % yHeight=(y0+y1)/2 - X Index 1 add get X Index get sub abs % xWidth=x1-x0 + X Index 1 add get X Index get sub abs % xWidth=x1-x0 mul % x*y add } for 2 mul 1 sub neg % triangle area divided by the area under the polygon - \psk@PSfont findfont \psk@fontscale scalefont setfont + \psk@PSfont findfont \psk@fontscale scalefont setfont \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if \psk@valuewidth string cvs %/Output exch def % save output \ifPst@comma dot2comma \fi % do we have to change dot to comma /Output ED - \psk@xShift\space -30 moveto (Gini: ) show - Output show + \psk@xShift\space -30 moveto (Gini: ) show + Output show \fi - 0 1 n { dup X exch get exch Y exch get } for + 0 1 n { dup X exch get exch Y exch get } for \if@star 1 0 0 0 \fi % add values for the closed curve }% filling the area under the curve. \if@star\listplot*{\Lorenz@code}\else\listplot{\Lorenz@code}% @@ -982,9 +1240,9 @@ \addbefore@par{plotpoints=200}% \use@par \parametricplot{0}{360}{% - t cos dup mul 1 #1\space div exp \pst@radiusA \pst@number\psxunit div mul + t cos dup mul 1 #1\space div exp \pst@radiusA \pst@number\psxunit div mul t 90 gt { t 270 lt { neg } if } if - t sin dup mul 1 #1\space div exp \pst@radiusB \pst@number\psyunit div mul + t sin dup mul 1 #1\space div exp \pst@radiusB \pst@number\psyunit div mul t 180 gt { neg } if } \endgroup\ignorespaces} % @@ -996,9 +1254,9 @@ \psplot{#1}{#2}[/ps@a #3 def /ps@b #4 def]{ /ps@n 0 def /ps@WS 0 def - { - ps@a ps@n exp ps@b ps@n exp Pi mul x mul RadtoDeg cos mul - dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse + { + ps@a ps@n exp ps@b ps@n exp Pi mul x mul RadtoDeg cos mul + dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse ps@n 1 add /ps@n ED } loop }% @@ -1010,9 +1268,9 @@ \psplot{#1}{#2}[/ps@a #3 def]{ /ps@k 1 def /ps@WS 0 def - { - ps@k ps@a exp Pi mul dup x mul RadtoDeg sin exch div - dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse + { + ps@k ps@a exp Pi mul dup x mul RadtoDeg sin exch div + dup abs \psk@epsilon gt { ps@WS add /ps@WS ED }{ ps@WS add exit } ifelse ps@k 1 add /ps@k ED } loop }% @@ -1044,12 +1302,12 @@ /yMin #2 def /yMax #4 def #5 % additional PS code - \ifPst@polarplot + \ifPst@polarplot /@PolarAlgPlot (#6) tx@addDict begin AlgParser end cvx def /Func { /phi y x atan def - /r x y Pyth def - \ifPst@algebraic @PolarAlgPlot \else #6 \fi } def + /r x y Pyth def + \ifPst@algebraic @PolarAlgPlot \else #6 \fi } def \else /Func \ifPst@algebraic (#6) tx@addDict begin AlgParser end cvx \else { #6 } \fi def \fi @@ -1057,17 +1315,17 @@ /yPixel yMax yMin sub \pst@number\psyunit mul round cvi def /dx xMax xMin sub xPixel div def /dy yMax yMin sub yPixel div def - /setpixel { - dy div exch - dx div exch - \ifPst@saveData + /setpixel { + dy div exch + dx div exch + \ifPst@saveData 2 copy - \pst@number\psyunit div exch \pst@number\psxunit div - 20 string cvs Pst@data exch writestring - Pst@data (\space) writestring - 20 string cvs Pst@data exch writestring + \pst@number\psyunit div exch \pst@number\psxunit div + 20 string cvs Pst@data exch writestring + Pst@data (\space) writestring + 20 string cvs Pst@data exch writestring % Pst@data (\string\]) writestring - Pst@data (\string\n) writestring + Pst@data (\string\n) writestring \fi \pst@number\pslinewidth 2 div 0 360 arc fill } bind def % @@ -1078,7 +1336,7 @@ \ifPst@saveData Pst@data ([\string\n) writestring \fi yMin dy \psk@stepFactor\space mul yMax { /y exch def - Func 0 lt + Func 0 lt { VZ { x y setpixel /VZ false def} if } { VZ {}{ x y setpixel /VZ true def } ifelse } ifelse } for @@ -1092,7 +1350,7 @@ \ifPst@saveData Pst@data ([\string\n) writestring \fi xMin dx \psk@stepFactor\space mul xMax { /x exch def - Func 0 lt + Func 0 lt { VZ { x y setpixel /VZ false def} if } { VZ {}{ x y setpixel /VZ true def } ifelse } ifelse } for @@ -1105,7 +1363,7 @@ /y exch def xMin dx \psk@stepFactor\space mul xMax { /x exch def - Func 0 lt + Func 0 lt { VZ { x y setpixel /VZ false def} if } { VZ {}{ x y setpixel /VZ true def } ifelse } ifelse } for @@ -1125,7 +1383,7 @@ \psplot[fillstyle=none]{#1}{#2}{#4}% original function \ifPst@algebraic \psplot[fillstyle=none]{#1}{#2}{-(#4)} - \else + \else \psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis \fi \multido{\iA=1+1}{#3}{% run it #3 times with increment \A @@ -1134,7 +1392,7 @@ /dX #2 #1 sub #3 div def % delta x, the step /Start dX \iA\space 1 sub mul #1 add def % xStart /End Start dX add def % xEnd=xStart+dX - /Height End Start add 2 div /x ED + /Height End Start add 2 div /x ED \ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi def } % height=f(x) % x is the mean between Start+End \psellipticarc(!Start 0)(! Height 8 div Height){90}{270} @@ -1144,9 +1402,9 @@ % draw the other half of the ellipse \rlineto(!dX neg 0)}}% draw a line in negative x-direction \psset{fillstyle=none} -% \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup +% \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup % 8 div exch)% draw again the ellipse to get the borderline. - \psellipse(#2,0)(!{ #2 dup #1 sub #3 div 2 div sub /x ED + \psellipse(#2,0)(!{ #2 dup #1 sub #3 div 2 div sub /x ED \ifPst@algebraic (#4) AlgParser cvx exec \else #4 \fi dup 8 div exch}) % draw again the ellipse to get the borderline. \psset{plotstyle=line,linestyle=dashed, @@ -1154,7 +1412,7 @@ \psplot[fillstyle=none]{#1}{#2}{#4} \ifPst@algebraic \psplot[fillstyle=none]{#1}{#2}{-(#4)} - \else + \else \psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis \fi % draw again the curves to get the borderline @@ -1177,9 +1435,9 @@ \def\psBezier@ii{% \addto@pscode{% \psk@plotpoints % step for Bezier T=0,0+epsilon,0+i*epsilon,...,1 - \pst@BezierType % type of the Bezier curve 2,3,4,... - \txFunc@BezierCurve - \ifshowpoints \txFunc@BezierShowPoints \else pop \fi + \pst@BezierType % type of the Bezier curve 2,3,4,... + \txFunc@BezierCurve + \ifshowpoints \txFunc@BezierShowPoints \else pop \fi }% \end@OpenObj} % @@ -1190,13 +1448,13 @@ \def\psBernstein{\pst@object{psBernstein}}% \psBernstein[options](t1,t2)(i,n) \def\psBernstein@i(#1,#2){% \@ifnextchar({\psBernstein@ii(#1,#2)}{\psBernstein@ii(0,1)(#1,#2)}} -% +% \def\psBernstein@ii(#1,#2)(#3,#4){% (tStart,tEnd)(i,n) \addbefore@par{plotpoints=200}% \begin@OpenObj \addto@pscode{% /ScreenCoor { \tx@ScreenCoor } def - #1\space #2\space + #1\space #2\space 1.0 \psk@plotpoints\space div % step=1/plotpoints #3\space #4\space % on stack we have tStart tEnd epsilon i n @@ -1211,29 +1469,29 @@ \begin@ClosedObj \addto@pscode{ 1 1 #3 { - dup + dup /ipSave ED % save loop value /ip ED % dito 1 1 #3 { dup /iqSave ED % save loop value /iq ED % dito - { + { iq 0 le { exit } if - ip iq mod + ip iq mod /ip iq def - /iq ED + /iq ED } loop - ip 1 eq { + ip 1 eq { /xVal ipSave iqSave div def xVal #1 ge { xVal #2 le { \psk@dotsize \@nameuse{psds@\psk@dotstyle} - \pst@usecolor\pslinecolor xVal 1 iqSave div \tx@ScreenCoor + \pst@usecolor\pslinecolor xVal 1 iqSave div \tx@ScreenCoor 2 copy pop 0 moveto lineto } if } if % 2 copy moveto Dot } if } if } if - } for + } for } for }% \end@ClosedObj% @@ -1252,7 +1510,7 @@ /dx x1 x sub \psk@plotpoints div def #3 /xy { -% x +% x tx@FuncDict begin #4 aload pop \pst@number\psyunit mul exch \pst@number\psxunit mul exch end @@ -1268,16 +1526,18 @@ \endgroup \ignorespaces} % +\define@boolkey[psset]{pst-func}[Pst@]{xory}[true]{} +\define@boolkey[psset]{pst-func}[Pst@]{approx}[true]{} +\define@boolkey[psset]{pst-func}[Pst@]{Framed}[true]{} \define@boolkey[psset]{pst-func}[Pst@]{Newton}[true]{} \define@boolkey[psset]{pst-func}[Pst@]{PrintCoord}[true]{} \define@boolkey[psset]{pst-func}[Pst@]{onlyNode}[true]{} \define@boolkey[psset]{pst-func}[Pst@]{onlyYVal}[true]{} \define@boolkey[psset]{pst-func}[Pst@]{originV}[true]{} -\define@key[psset]{pst-func}{PointName}[]{\def\psk@func@PointName{#1}} +\define@key[psset]{pst-func}{PointName}[I]{\def\psk@func@PointName{#1}} \define@key[psset]{pst-func}{ydecimals}[2]{\pst@getint{#1}\psk@ydecimals } \psset[pst-func]{originV=false,onlyNode=false,ydecimals=2, - PrintCoord=false,onlyYVal=false,Newton=false,PointName=I, -} + PrintCoord=false,onlyYVal=false,Newton=false,PointName=I,Framed=false,xory=false,approx=true} % %-------------------------------------------------------------------- %------------- calculate the value of an intersectionpoint ----------- @@ -1285,10 +1545,10 @@ \def\psZero{\def\pst@par{}\pst@object{psZero}} \def\psZero@i(#1,#2)#3{\@ifnextchar[{\psZero@ii(#1,#2)#3}{\psZero@ii(#1,#2){#3}[0]}} \def\psZero@ii(#1,#2)#3[#4]#5{% -% (#1,#2) Intervall für die Nullstelle, bzw #1 Startwert für Newton, #3 1. Funktion, #4 2. Funktion, #5 Knotenname +% (#1,#2) Intervall f\"{u}r die Nullstelle, bzw #1 Startwert f\"{u}r Newton, #3 1. Funktion, #4 2. Funktion, #5 Knotenname \begingroup \pst@killglue -% \addbefore@par{fontscale=40,PSfont=Times-Roman}% + \addbefore@par{framesep=1pt}%fontscale=40,PSfont=Times-Roman}% \use@par \pst@Verb{ /FunctionA @@ -1296,7 +1556,7 @@ /FunctionB \ifPst@algebraic (#4) tx@AlgToPs begin AlgToPs end cvx \else {#4} \fi def \ifPst@Newton % --------------------------- Newton-Verfahren --- TS 05.2014 - /eps 1e-6 def % eps für (f(x+eps)-f(x))/eps + /eps 1e-6 def % eps f\"{u}r (f(x+eps)-f(x))/eps /x0 #1 def % Startwert wird vorgegeben /Xend x0 def { @@ -1325,24 +1585,25 @@ F_1 F_M mul 0 ge {/Xinf xM def} {/Xsup xM def} ifelse % F_1 * F_M > 0 (F_1 und F_M haben gleiches VZ) => neuer linker x-Wert = xM2 Xinf Xsup sub abs 1e-6 le {exit} if } loop % Die Schleife endet, wenn die Differenz von linkem und rechtem Wert < 10^-6 \fi - /x xM def FunctionA /yM exch def % x wird Mittelwert und an dieser Stelle die Funktion berechnet und als yM2 definiert + /x xM def FunctionA /yM exch def % x wird Mittelwert und an dieser Stelle die Funktion berechnet und als yM definiert }% - \pnode(! xM yM){#5}% - \addto@pscode{ - \ifPst@onlyNode \else - /dec \psk@decimals\space def % Anzahl der Dezimahlen für x - /ydec \psk@ydecimals\space def % Anzahl der Dezimalen für y - /symb { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift für Klammer und senkrechten Strich - /schrift { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def % Schrift für die Ergebnisse - /TiefSchrift { /Symbol findfont \psk@fontscale 1.6 div scalefont setfont } bind def % Schrift für tiefergestellte Buchstaben - /spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftgöße skaliert ist - /spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftgöße skaliert ist - /Wert { 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse % x-Wert runden und als string ablegen +\pnode(! xM yM){#5}% +\addto@pscode{% +\ifPst@onlyNode\else + /dec \psk@decimals\space def % Anzahl der Dezimahlen f\"{u}r x + /ydec \psk@ydecimals\space def % Anzahl der Dezimalen f\"{u}r y + /symb { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich + /schrift { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def % Schrift f\"{u}r die Ergebnisse + /TiefSchrift { /Symbol findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben + /spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist + /spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist + /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % x-Wert runden und als string ablegen \ifPst@comma dot2comma \fi show } def % gegebenenfalls Komma statt Punkt und Ergebnis anzeigen - /yWert { 10 ydec exp mul round 10 ydec exp div ydec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse % y-Wert runden und als string ablegen + /yWert { 10 ydec exp mul round 10 ydec exp div ydec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % y-Wert runden und als string ablegen \ifPst@comma dot2comma \fi show } def % gegebenenfalls Komma statt Punkt und Ergebnis anzeigen /FunctionA \ifPst@algebraic (#3) tx@AlgToPs begin AlgToPs end cvx \else {#3} \fi def /FunctionB \ifPst@algebraic (#4) tx@AlgToPs begin AlgToPs end cvx \else {#4} \fi def + /frs \pst@number\psframesep def \ifPst@Newton /eps 1e-6 def /x0 #1 def @@ -1376,22 +1637,95 @@ yM \psk@yShift\space add \pst@number\psyunit mul \fi \pst@usecolor\pslinecolor - \ifPst@PrintCoord - moveto schrift (\psk@func@PointName) show + \ifPst@PrintCoord +/xytext { moveto schrift (\psk@func@PointName) show 0 spdy 2 mul neg rmoveto TiefSchrift (\psk@postString) show 0 spdy 3 mul rmoveto symb (\string\050) show 0 spdy neg rmoveto schrift xM Wert spdx 3 div spdy rmoveto symb (\string\174) show - spdx 3 div spdy neg rmoveto yM yWert 0 spdy rmoveto symb (\string\051) show + spdx 3 div spdy neg rmoveto schrift yM yWert 0 spdy rmoveto symb (\string\051) show } bind def + xytext + 0 spdy neg rmoveto +% ------------------------------------------------------------------------------ TS 03.2017 + \ifPst@Framed + frs \psk@fontscale 0.15 mul frs add neg rmoveto + 0 \psk@fontscale 0.9 mul frs 2 mul add rlineto + \ifPst@originV + frs neg \psk@fontscale 0.75 mul frs add L + \else + xM \psk@xShift\space add \pst@number\psxunit mul frs sub + yM \psk@yShift\space add \pst@number\psyunit mul \psk@fontscale 0.75 mul add frs add L + \fi + 0 \psk@fontscale 0.9 mul frs 2 mul add neg rlineto closepath + gsave + \pst@usecolor\psfillcolor \tx@setTransparency fill + grestore + \ifx\pslinestyle\@none\else + \pst@number\pslinewidth SLW \pst@usecolor\pslinecolor \tx@setStrokeTransparency \@nameuse{psls@\pslinestyle} stroke + \fi + \ifPst@originV 0 0 \else + xM \psk@xShift\space add \pst@number\psxunit mul + yM \psk@yShift\space add \pst@number\psyunit mul + \fi + xytext + 0 spdy neg rmoveto + \fi +%------------------------------ Wenn nicht die Form P(a|b) sondern x = a oder y = b oder nur a oder nur b ------------------- \else - \ifPst@onlyYVal moveto schrift yM yWert \else moveto schrift xM Wert \fi - \fi\fi}% - \ifPst@markZeros \psdot(#5)\fi + \ifPst@originV 0 0 \else + xM \psk@xShift\space add \pst@number\psxunit mul + yM \psk@yShift\space add \pst@number\psyunit mul + \fi + /xorytext { moveto schrift + \ifPst@onlyYVal% nur der y-Wert + \ifPst@xory% in Form von y=b + (\psk@func@PointName) show + spdx 5 div neg spdy 2.2 mul neg rmoveto TiefSchrift (\psk@postString) show + spdx 1.5 div spdy 2 mul rmoveto symb(\ifPst@approx \string \273 \else \string = \fi) show + spdx 1.5 div neg 0 rmoveto schrift yM yWert + \else schrift yM yWert + \fi + \else + \ifPst@xory% in Form x = a + (\psk@func@PointName) show + spdx 7 div neg spdy 2.2 mul neg rmoveto TiefSchrift (\psk@postString) show + spdx 1.5 div spdy 2 mul rmoveto symb (\ifPst@approx \string \273 \else \string = \fi) show + spdx 1.5 div neg 0 rmoveto schrift xM Wert + \else schrift xM Wert + \fi + \fi } bind def + xorytext + \ifPst@Framed%------------------------------ Rahmenbeginn ------------------------------ + frs \psk@fontscale 0.14 mul frs add neg rmoveto + 0 \psk@fontscale 0.9 mul frs 2 mul add rlineto + \ifPst@originV + frs neg \psk@fontscale 0.75 mul frs add L + \else + xM \psk@xShift\space add \pst@number\psxunit mul frs sub + yM \psk@yShift\space add \pst@number\psyunit mul \psk@fontscale 0.75 mul add frs add L + \fi + 0 \psk@fontscale 0.9 mul frs 2 mul add neg rlineto closepath + gsave + \pst@usecolor\psfillcolor \tx@setTransparency fill + grestore + \ifx\pslinestyle\@none\else + \pst@number\pslinewidth SLW \pst@usecolor\pslinecolor \tx@setStrokeTransparency \@nameuse{psls@\pslinestyle} stroke + \fi + \ifPst@originV 0 0 \else + xM \psk@xShift\space add \pst@number\psxunit mul + yM \psk@yShift\space add \pst@number\psyunit mul + \fi + xorytext + \fi + \fi +\fi}% +\ifPst@markZeros\psdot(#5)\fi \endgroup\use@pscode\ignorespaces -}% +}% % \catcode`\@=\PstAtCode\relax % %% END: pst-func.tex \endinput % + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.tlpobj new/tlpkg/tlpobj/pst-func.tlpobj --- old/tlpkg/tlpobj/pst-func.tlpobj 2016-05-03 03:18:39.000000000 +0200 +++ new/tlpkg/tlpobj/pst-func.tlpobj 2017-04-19 02:06:49.000000000 +0200 @@ -1,6 +1,6 @@ name pst-func category Package -revision 40824 +revision 43912 shortdesc PSTricks package for plotting mathematical functions relocated 1 longdesc The package is built for use with PSTricks. It provides macros @@ -22,12 +22,12 @@ longdesc Vasicek function for describing the evolution of interest longdesc rates; and implicit functions. The plots may be generated as longdesc volumes of rotation about the X-axis, as well. -runfiles size=17 +runfiles size=20 RELOC/dvips/pst-func/pst-func.pro RELOC/tex/generic/pst-func/pst-func.tex RELOC/tex/latex/pst-func/pst-func.sty catalogue-ctan /graphics/pstricks/contrib/pst-func -catalogue-date 2016-05-01 17:26:53 +0200 +catalogue-date 2017-04-18 17:13:42 +0200 catalogue-license lppl catalogue-topics maths graphics-use pstricks -catalogue-version 0.82 +catalogue-version 0.85 ++++++ pst-gantt.doc.tar.xz ++++++ ++++++ pst-gantt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-gantt.tlpobj new/tlpkg/tlpobj/pst-gantt.tlpobj --- old/tlpkg/tlpobj/pst-gantt.tlpobj 2016-04-14 19:36:56.000000000 +0200 +++ new/tlpkg/tlpobj/pst-gantt.tlpobj 2017-04-14 17:55:19.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-gantt/pst-gantt.tex RELOC/tex/latex/pst-gantt/pst-gantt.sty catalogue-ctan /graphics/pstricks/contrib/pst-gantt -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram gantt pstricks catalogue-version 0.22a ++++++ pst-geo.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-s/pst-geo.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-geo.doc.tar.xz differ: char 25, line 1 ++++++ pst-geo.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-s/pst-geo.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-geo.tar.xz differ: char 27, line 1 ++++++ pst-ghsb.doc.tar.xz ++++++ ++++++ pst-ghsb.tar.xz ++++++ ++++++ pst-gr3d.doc.tar.xz ++++++ ++++++ pst-gr3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-gr3d.tlpobj new/tlpkg/tlpobj/pst-gr3d.tlpobj --- old/tlpkg/tlpobj/pst-gr3d.tlpobj 2016-04-14 19:37:20.000000000 +0200 +++ new/tlpkg/tlpobj/pst-gr3d.tlpobj 2017-04-14 17:56:16.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-gr3d/pst-gr3d.tex RELOC/tex/latex/pst-gr3d/pst-gr3d.sty catalogue-ctan /graphics/pstricks/contrib/pst-gr3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typeset-grid graphics-3d pstricks catalogue-version 1.34 ++++++ pst-grad.doc.tar.xz ++++++ ++++++ pst-grad.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-grad.tlpobj new/tlpkg/tlpobj/pst-grad.tlpobj --- old/tlpkg/tlpobj/pst-grad.tlpobj 2016-04-14 19:37:20.000000000 +0200 +++ new/tlpkg/tlpobj/pst-grad.tlpobj 2017-04-14 17:56:16.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-grad/pst-grad.tex RELOC/tex/latex/pst-grad/pst-grad.sty catalogue-ctan /graphics/pstricks/contrib/pst-grad -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics colour pstricks catalogue-version 1.06 ++++++ pst-graphicx.doc.tar.xz ++++++ ++++++ pst-graphicx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-graphicx.tlpobj new/tlpkg/tlpobj/pst-graphicx.tlpobj --- old/tlpkg/tlpobj/pst-graphicx.tlpobj 2016-04-14 19:37:20.000000000 +0200 +++ new/tlpkg/tlpobj/pst-graphicx.tlpobj 2017-04-14 17:56:16.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/generic/pst-graphicx/pst-graphicx.tex catalogue-ctan /graphics/pstricks/contrib/pst-graphicx -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-incl catalogue-version 0.02 ++++++ pst-infixplot.doc.tar.xz ++++++ ++++++ pst-infixplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-infixplot.tlpobj new/tlpkg/tlpobj/pst-infixplot.tlpobj --- old/tlpkg/tlpobj/pst-infixplot.tlpobj 2016-04-14 19:37:20.000000000 +0200 +++ new/tlpkg/tlpobj/pst-infixplot.tlpobj 2017-04-14 17:56:16.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/pst-infixplot/infix-RPN.sty RELOC/tex/latex/pst-infixplot/pst-infixplot.sty catalogue-ctan /graphics/pstricks/contrib/pst-infixplot -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-plot pstricks catalogue-version 0.11 ++++++ pst-intersect.doc.tar.xz ++++++ ++++++ pst-intersect.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-intersect.tlpobj new/tlpkg/tlpobj/pst-intersect.tlpobj --- old/tlpkg/tlpobj/pst-intersect.tlpobj 2016-04-14 19:37:21.000000000 +0200 +++ new/tlpkg/tlpobj/pst-intersect.tlpobj 2017-04-14 17:56:16.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-intersect/pst-intersect.tex RELOC/tex/latex/pst-intersect/pst-intersect.sty catalogue-ctan /graphics/pstricks/contrib/pst-intersect -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-supp pstricks catalogue-version 0.4 ++++++ pst-jtree.doc.tar.xz ++++++ ++++++ pst-jtree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-jtree.tlpobj new/tlpkg/tlpobj/pst-jtree.tlpobj --- old/tlpkg/tlpobj/pst-jtree.tlpobj 2016-04-14 19:37:21.000000000 +0200 +++ new/tlpkg/tlpobj/pst-jtree.tlpobj 2017-04-14 17:56:17.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-jtree/pst-jtree.tex RELOC/tex/latex/pst-jtree/pst-jtree.sty catalogue-ctan /graphics/pstricks/contrib/pst-jtree -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics linguistic tree pstricks catalogue-version 2.6 ++++++ pst-knot.doc.tar.xz ++++++ ++++++ pst-knot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-knot.tlpobj new/tlpkg/tlpobj/pst-knot.tlpobj --- old/tlpkg/tlpobj/pst-knot.tlpobj 2016-04-14 19:37:21.000000000 +0200 +++ new/tlpkg/tlpobj/pst-knot.tlpobj 2017-04-14 17:56:17.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-knot/pst-knot.tex RELOC/tex/latex/pst-knot/pst-knot.sty catalogue-ctan /graphics/pstricks/contrib/pst-knot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics decoration pstricks catalogue-version 0.2 ++++++ pst-labo.doc.tar.xz ++++++ ++++++ pst-labo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-labo.tlpobj new/tlpkg/tlpobj/pst-labo.tlpobj --- old/tlpkg/tlpobj/pst-labo.tlpobj 2016-04-14 19:37:23.000000000 +0200 +++ new/tlpkg/tlpobj/pst-labo.tlpobj 2017-04-14 17:56:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/pst-labo/pst-laboObj.tex RELOC/tex/latex/pst-labo/pst-labo.sty catalogue-ctan /graphics/pstricks/contrib/pst-labo -catalogue-date 2015-12-10 13:07:27 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics chemistry graphics-use catalogue-version 2.04 ++++++ pst-layout.doc.tar.xz ++++++ ++++++ pst-layout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-layout.tlpobj new/tlpkg/tlpobj/pst-layout.tlpobj --- old/tlpkg/tlpobj/pst-layout.tlpobj 2016-04-14 19:37:24.000000000 +0200 +++ new/tlpkg/tlpobj/pst-layout.tlpobj 2017-04-14 17:56:18.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/pst-layout/pst-layout.sty catalogue-ctan /graphics/pstricks/contrib/pst-layout -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout table pstricks catalogue-version .95 ++++++ pst-lens.doc.tar.xz ++++++ ++++++ pst-lens.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-lens.tlpobj new/tlpkg/tlpobj/pst-lens.tlpobj --- old/tlpkg/tlpobj/pst-lens.tlpobj 2016-04-14 19:37:24.000000000 +0200 +++ new/tlpkg/tlpobj/pst-lens.tlpobj 2017-04-14 17:56:18.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/generic/pst-lens/pst-lens.tex RELOC/tex/latex/pst-lens/pst-lens.sty catalogue-ctan /graphics/pstricks/contrib/pst-lens -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics optics pstricks catalogue-version 1.02 ++++++ pst-light3d.doc.tar.xz ++++++ ++++++ pst-light3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-light3d.tlpobj new/tlpkg/tlpobj/pst-light3d.tlpobj --- old/tlpkg/tlpobj/pst-light3d.tlpobj 2016-04-14 19:37:25.000000000 +0200 +++ new/tlpkg/tlpobj/pst-light3d.tlpobj 2017-04-14 17:56:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/pst-light3d/pst-light3d.sty catalogue-also xkeyval catalogue-ctan /graphics/pstricks/contrib/pst-light3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-3d graphics-use pstricks catalogue-version 0.12 ++++++ pst-magneticfield.doc.tar.xz ++++++ ++++++ pst-magneticfield.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-magneticfield.tlpobj new/tlpkg/tlpobj/pst-magneticfield.tlpobj --- old/tlpkg/tlpobj/pst-magneticfield.tlpobj 2016-04-14 19:37:27.000000000 +0200 +++ new/tlpkg/tlpobj/pst-magneticfield.tlpobj 2017-04-14 17:56:19.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/generic/pst-magneticfield/pst-magneticfield.tex RELOC/tex/latex/pst-magneticfield/pst-magneticfield.sty catalogue-ctan /graphics/pstricks/contrib/pst-magneticfield -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics pstricks catalogue-version 1.13 ++++++ pst-math.doc.tar.xz ++++++ ++++++ pst-math.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-math.tlpobj new/tlpkg/tlpobj/pst-math.tlpobj --- old/tlpkg/tlpobj/pst-math.tlpobj 2016-04-14 19:37:27.000000000 +0200 +++ new/tlpkg/tlpobj/pst-math.tlpobj 2017-04-14 17:56:19.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/generic/pst-math/pst-math.tex RELOC/tex/latex/pst-math/pst-math.sty catalogue-ctan /graphics/pstricks/contrib/pst-math -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths calculation pstricks catalogue-version 0.63 ++++++ pst-mirror.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-s/pst-mirror.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new/pst-mirror.doc.tar.xz differ: char 27, line 1 ++++++ pst-mirror.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-mirror.tlpobj new/tlpkg/tlpobj/pst-mirror.tlpobj --- old/tlpkg/tlpobj/pst-mirror.tlpobj 2016-04-14 19:37:32.000000000 +0200 +++ new/tlpkg/tlpobj/pst-mirror.tlpobj 2017-04-14 17:56:22.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-mirror/pst-mirror.tex RELOC/tex/latex/pst-mirror/pst-mirror.sty catalogue-ctan /graphics/pstricks/contrib/pst-mirror -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 1.01 ++++++ pst-node.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/Changes new/doc/generic/pst-node/Changes --- old/doc/generic/pst-node/Changes 2016-04-25 23:48:45.000000000 +0200 +++ new/doc/generic/pst-node/Changes 2017-01-23 00:01:02.000000000 +0100 @@ -1,4 +1,7 @@ ----- pst-node.tex +1.39 2017-01-20 - fix for \Circlenode with +/+\dp\hbox +1.38 2016-05-27 - revert fix for \Cnodeput. Problem was in pstricks.tex +1.37 2016-05-26 - fixed bug with \Cnodeput 1.36 2016-04-24 - moved node definitions from pstricks-add 1.35 2014-08-04 - added \saveDataAsNodes{Filename}{NodePrefix} 1.34 2014-06-17 - fix bug for showNodes Binary files old/doc/generic/pst-node/psmatrix-docDE.pdf and new/doc/generic/pst-node/psmatrix-docDE.pdf differ Binary files old/doc/generic/pst-node/pst-node-doc.pdf and new/doc/generic/pst-node/pst-node-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/pst-node-doc.tex new/doc/generic/pst-node/pst-node-doc.tex --- old/doc/generic/pst-node/pst-node-doc.tex 2016-04-25 23:48:45.000000000 +0200 +++ new/doc/generic/pst-node/pst-node-doc.tex 2017-01-23 00:01:02.000000000 +0100 @@ -1,13 +1,13 @@ -%% $Id: pst-node-doc.tex 66 2014-08-04 19:10:10Z herbert $ +%% $Id: pst-node-doc.tex 295 2016-05-02 19:11:36Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles +\input{pst-node} +\let\pstFV\fileversion + \usepackage[utf8]{inputenc} \usepackage{pst-plot} -\usepackage{pst-node} -%\usepackage{pax} -\let\pstFV\fileversion \let\belowcaptionskip\abovecaptionskip % \newcommand\xstrut{\vphantom{\tabular{c}Üg\\Üg\endtabular}} @@ -16,7 +16,7 @@ \def\bgImage{% \psscalebox{0.85}{% \begin{pspicture}(-1,-1)(21,7) -\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55} +\psset{framearc=0.2,shadow,fillstyle=solid,shadowcolor=black!55} \psBox[blue!30]{7,6}{politische\\Kommunikation} \psBox[red!30]{3,4}{interpersonale\\Kommunikation} \psBox[red!30]{13,4}{massenmediale\\Kommunikation} @@ -39,7 +39,7 @@ \newbox\filebox \setbox\filebox=\hbox{% \pspicture(-1,-.5)(1,.7) - \pspolygon[linearc=2pt,shadow=true,shadowangle=45,xunit=1.1]% + \pspolygon[linearc=2pt,shadow,shadowangle=45,xunit=1.1]% (-1,-.55)(-1,.5)(-.8,.5)(-.8,.65)(-.2,.65)(-.2,.5)(1,.5)(1,-.55) \endpspicture} @@ -406,7 +406,7 @@ top center, top right) of the \Lenv{pspicture} box. \begin{LTXexample}[width=6cm,wide=false] -\begin{pspicture}[showgrid=true](-1,-1)(4,4) +\begin{pspicture}[showgrid](-1,-1)(4,4) \psDefPSPNodes \psdots(PSPbl)(PSPbc)(PSPbr) (PSPcl)(PSPcc)(PSPcr)(PSPtl)(PSPtc)(PSPtr) @@ -1349,7 +1349,7 @@ \psset{arrows=->,nodesep=3pt} \everypsbox{\scriptstyle} \ncline{1,1}{2,2}_{y} - \ncline[doubleline=true,linestyle=dashed]{-}{1,1}{2,3}^{x} + \ncline[doubleline,linestyle=dashed]{-}{1,1}{2,3}^{x} \ncline{2,2}{3,2}<{q} \ncline{2,2}{2,3}_{p} \ncline{2,3}{3,3}>{f} @@ -1683,7 +1683,7 @@ using the macro \Lcs{psGetNodeCenter}. \begin{LTXexample}[width=5cm] -\begin{pspicture}[showgrid=true,arrowscale=2](5,5) +\begin{pspicture}[showgrid,arrowscale=2](5,5) \pnode(4.5,0.5){MyNode} \psdot(MyNode) \pnode(! \psGetNodeCenter{MyNode} @@ -1694,7 +1694,7 @@ \end{LTXexample} \begin{LTXexample}[width=5cm] -\begin{pspicture}[showgrid=true](5,5) +\begin{pspicture}[showgrid](5,5) \rput(1.5,0.5){\trinode{CN}{NodeA}} \rput(3.5,2.5){\trinode{EN}{NodeB}} \pnode(! \psGetNodeCenter{CN} @@ -1705,7 +1705,7 @@ \end{LTXexample} -The coordinates of the nodes can also be saved with \Lkeyset{saveNodeCoors=true} in global defined names +The coordinates of the nodes can also be saved with \Lkeyword{saveNodeCoors} in global defined names \texttt{N-<name>.x} and \texttt{N-<name>.y}. With the optional argument \Lkeyword{NodeCoorPrefix}, which is by default empty, the name setting can be changed to \texttt{<NodeCoorPrefix><name>x} and \texttt{<NodeCoorPrefix><name>y}. @@ -2009,7 +2009,7 @@ \begin{LTXexample}[width=5cm] -\begin{pspicture}[showgrid=true](5,3) +\begin{pspicture}[showgrid](5,3) \psset{linecolor=black} \psline[linestyle=dashed]{->}(3,1.5) \psline[linestyle=dashed]{->}(0.375,1.5) @@ -2151,7 +2151,7 @@ and \Lcs{midAB}\verb|(Q)(P){Q}|. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2.5) +\begin{pspicture}[showgrid](-.5,-.5)(2.5,2.5) \psset{arrows=->,arrowscale=1.5} \pnode(2,1){P}\pnode(.5,1){Q} \AtoB(Q)(P){QP} @@ -2191,7 +2191,7 @@ The expression in \texttt{t} in this case is algebraic, which is detected automatically by the macro. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2) +\begin{pspicture}[showgrid](-.5,-.5)(2.5,2) \def\exn{cos(t) | sin(t)} \psparametricplot[algebraic]{0}{2}{\exn} \curvepnode{1}{\exn}{P} @@ -2226,7 +2226,7 @@ \verb|<tmin>, <tmax>| may be expressed using PostScript---eg, \verb|{Pi neg}{PiDiv2}|. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(2.5,3) \def\exn{t+t^2 | 2*Ex(-t)} \psset{plotpoints=100} \psparametricplot[algebraic]{0}{1}{\exn} @@ -2256,7 +2256,7 @@ \Lcs{fnpnode}\verb|[algebraic]{0.5}{x*(x+1)/2}{P}|. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(2.5,3) \def\exn{x x 1 add mul 2 div} \psplot{0}{2}{\exn} \fnpnode{0.5}{\exn}{Q} @@ -2274,7 +2274,7 @@ must be specified if your expression is indeed algebraic. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(2.5,3) \def\exn{x x 1 add mul 2 div} \psplot{0}{2}{\exn} \fnpnodes[plotpoints=10]{0}{2}{\exn}{A} @@ -2314,7 +2314,7 @@ \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2) +\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) %defines P0..P3--now join them \psnline[arrowscale=2]{-D>}(0,3){P} @@ -2331,7 +2331,7 @@ \end{verbatim} \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2) +\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) %defines P0..P3--now join them \psncurve[arrowscale=2]{-D>}(0,3){P} @@ -2340,7 +2340,7 @@ \vspace{2pc} \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2) +\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) %defines P0..P3--now join them \psnccurve[arrowscale=2]{-D>}(0,3){P} @@ -2361,10 +2361,14 @@ \begin{verbatim} \psLCNodeVar(A)(B)(a,b){C} \end{verbatim} + +\begin{sloppypar} does the same, but the third argument \verb|(a,b)| may be specified in any form acceptable to \Lcs{SpecialCoor}. (With \Lcs{psLCNode}, each coefficient may be specified in PostScript code.) One other difference is that \Lcs{psLCNodeVar} allows the reuse of a node name in place. For example, it is possible to write +\end{sloppypar} + \begin{verbatim} \psLCNodeVar(A)(B)(2,3){A}% symbol A reassigned \end{verbatim} @@ -2382,14 +2386,17 @@ \begin{verbatim} \psRelNode[angle=30](A)(B){2}{C} \end{verbatim} - but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor}, - while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible. - Note that \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}| may be interpreted as defining \texttt{C} to - be the complex product of \texttt{A} and \texttt{B}. + +\begin{sloppypar} +but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor}, +while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible. +Note that \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}| may be interpreted as defining \texttt{C} to +be the complex product of \texttt{A} and \texttt{B}. +\end{sloppypar} \begin{LTXexample}[width=5cm] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \pnode(0,.5){P}\pnode(1.5,.75){Q} \psRelNodeVar(P)(Q)(2;20){R} \psline(Q)(P)\uput[-45](P){P} @@ -2403,7 +2410,8 @@ \begin{BDef} \Lcs{psRelLineVar}\Largr{node A}\Largr{node B}\Largr{radius;angle}\Largb{node name} \end{BDef} - stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}. + +stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}. \Lcs{psRelLine}\verb|Var(A)(B)(a;b){C}| defines the node \texttt{C}, and, in addition, draws the line segment \texttt{AC}. @@ -2423,7 +2431,7 @@ \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \pnode(0,.5){P}\pnode(1,1){Q} \psrline{->}(P)(Q)(2;20) \uput[-45](P){P} @@ -2437,7 +2445,7 @@ line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|. \begin{LTXexample}[width=.35\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,4) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,4) \def\pfn{t | t^2/4} \psparametricplot[algebraic]{0}{3.5}{\pfn} \curvepnode{2}{\pfn}{P}% sets P, Ptang @@ -2490,7 +2498,7 @@ \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5) \pnode(1,1.1){A}\pnode(2,1.5){B} \polyIntersections{N1}{N2}(A)(B){P}{4} @@ -2502,7 +2510,7 @@ \end{LTXexample} \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5) \pnode(1,1.1){A}\pnode(2,3){B} \polyIntersections{N1}{N2}(A)(B){P}{4} @@ -2514,7 +2522,7 @@ \end{LTXexample} \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \def\fn{1.5+sin(t)+.4*sin(2*t)% | 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}% \pnode(1,1.1){A}\pnode(2,1.2){B} @@ -2532,7 +2540,7 @@ \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \def\fn{1.5+sin(t)+.4*sin(2*t)% | 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}% \pnode(.8,.6){A}\pnode(2.5,-.5){B} @@ -2549,7 +2557,7 @@ \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5) \pnode(1,1.1){A}\pnode(2,1.5){B} \polyIntersections{N1}{N2}(A)(B){P}{3} @@ -2564,7 +2572,7 @@ \vspace{1pc} \begin{LTXexample}[width=.375\textwidth] -\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) +\begin{pspicture}[showgrid](-.5,-.5)(3.5,3) \def\func{x+sin(2*x)} \psplot[algebraic]{0}{3.14}{\func} \fnpnodes[algebraic]{0}{3.14}{\func}{P} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.doc.tlpobj new/tlpkg/tlpobj/pst-node.doc.tlpobj --- old/tlpkg/tlpobj/pst-node.doc.tlpobj 2016-04-26 03:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/pst-node.doc.tlpobj 2017-04-14 17:56:22.000000000 +0200 @@ -1,13 +1,12 @@ name pst-node.doc category Package -revision 40743 +revision 43015 shortdesc doc files of pst-node relocated 1 -docfiles size=237 +docfiles size=184 RELOC/doc/generic/pst-node/Changes RELOC/doc/generic/pst-node/README RELOC/doc/generic/pst-node/psmatrix-docDE.bib - RELOC/doc/generic/pst-node/psmatrix-docDE.pdf RELOC/doc/generic/pst-node/psmatrix-docDE.tex RELOC/doc/generic/pst-node/pst-node-doc.bib RELOC/doc/generic/pst-node/pst-node-doc.pdf ++++++ pst-node.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-node/pst-node.pro new/dvips/pst-node/pst-node.pro --- old/dvips/pst-node/pst-node.pro 2014-08-07 00:50:05.000000000 +0200 +++ new/dvips/pst-node/pst-node.pro 2017-01-23 00:01:05.000000000 +0100 @@ -7,7 +7,7 @@ %% of the LaTeX Project Public License Distributed from CTAN archives %% in directory macros/latex/base/lppl.txt. % -%%%% EMPTY lines are not aload!!! Problem with pst-eps -> \par +%%%% EMPTY lines are not alowed!!! Problem with pst-eps -> \par % % tx@Dict begin % from main pstricks dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-node/pst-node97.pro new/dvips/pst-node/pst-node97.pro --- old/dvips/pst-node/pst-node97.pro 2011-07-29 16:12:10.000000000 +0200 +++ new/dvips/pst-node/pst-node97.pro 2017-01-23 00:01:05.000000000 +0100 @@ -1,4 +1,5 @@ %! +% $Id: pst-node97.pro 68 2014-08-07 10:16:26Z herbert $ % PostScript prologue for pst-node.tex. % Created 1993/3/12. Source file was pst-node.doc % Version 0.93a, 93/03/12. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node.tex new/tex/generic/pst-node/pst-node.tex --- old/tex/generic/pst-node/pst-node.tex 2016-04-25 23:48:45.000000000 +0200 +++ new/tex/generic/pst-node/pst-node.tex 2017-01-23 00:01:06.000000000 +0100 @@ -1,4 +1,4 @@ -% $Id: pst-node.tex 68 2014-08-07 10:16:26Z herbert $ +% $Id: pst-node.tex 373 2017-01-20 14:30:39Z herbert $ %% %% BEGIN pst-node.tex %% @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.36} -\def\filedate{2016/04/24} +\def\fileversion{1.39} +\def\filedate{2017/01/20} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -148,8 +148,8 @@ \def\pst@nodealign{% \pst@dimg=\ht\pst@hbox -\advance\pst@dimg-\dp\pst@hbox -\divide\pst@dimg2 +\advance\pst@dimg by -\dp\pst@hbox +\divide\pst@dimg by \tw@ \lower\pst@dimg} % \def\tx@InitPnode{InitPnode } @@ -195,10 +195,7 @@ \fi \pscircle@do(#1){#2}% \pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}% -%% % DG/SR modification begin - Jul. 30, 1997 - Patch 2 -%% %\ifPst@nodealign \kern\pst@dimc\egroup \fi}% \ifPst@nodealign\kern\pst@dimc\fi% -%% % DG/SR modification end }% \ignorespaces} % @@ -210,32 +207,36 @@ \def\cnodeput@i{\@ifnextchar({\cnodeput@iii}{\cnodeput@ii}} \def\cnodeput@ii#1{% \addto@par{rot={#1}}% - \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}} + \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}% +} \def\cnodeput@iii(#1)#2{% \pst@killglue \@fixedradiusfalse \def\pst@nodehook{\cnodeput@iv{#2}}% - \pst@makebox{\cput@v{#1}}} + \pst@makebox{\cput@v{#1}}% +} \def\cnodeput@iv#1{% \pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}{\tx@InitCnode}% - \global\let\pst@nodehook\relax} -% + \global\let\pst@nodehook\relax + \ignorespaces +} \def\Cnodeput{\pst@object{Cnodeput}} \def\Cnodeput@i{\@ifnextchar({\Cnodeput@iii}{\Cnodeput@ii}} \def\Cnodeput@ii#1{% -\addto@par{rot={#1}}% -\@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}} + \addto@par{rot={#1}}% + \@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}} \def\Cnodeput@iii(#1)#2{% -\pst@killglue -\@fixedradiustrue -\def\pst@nodehook{\Cnodeput@iv{#2}}% -\pst@makebox{\cput@v{#1}}} + \pst@killglue + \@fixedradiustrue + \def\pst@nodehook{\Cnodeput@iv{#2}}% + \pst@makebox{\cput@v{#1}}% +} \def\Cnodeput@iv#1{% -\pst@newnode{#1}{11}{% -\pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y -\pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r -{\tx@InitCnode}% -\global\let\pst@nodehook\relax} + \pst@newnode{#1}{11}{% + \pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y + \pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r + {\tx@InitCnode}% + \global\let\pst@nodehook\relax} % \def\circlenode{\pst@object{circlenode}} \def\circlenode@i#1{\pst@makebox{\circlenode@ii{#1}}} @@ -257,21 +258,21 @@ \def\Circlenode@i#1{\pst@makebox{\Circlenode@ii{#1}}} \def\Circlenode@ii#1{% \begingroup -\pst@useboxpar -\pst@dima=\ht\pst@hbox -\advance\pst@dima\dp\pst@hbox -\divide\pst@dima\tw@ -\pssetlength\pst@dimb\psk@radius -\setbox\pst@hbox=\hbox{% -\Cnodeput@iv{#1}% -\pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}% -\box\pst@hbox}% -\ifPst@nodealign \psboxseptrue \fi -\ifpsboxsep \psCirclebox@sep \fi -\leavevmode -\ifPst@nodealign\pst@nodealign\fi -\box\pst@hbox -\endgroup} + \pst@useboxpar + \pst@dima=\ht\pst@hbox + \advance\pst@dima by -\dp\pst@hbox + \divide\pst@dima by \tw@ + \pssetlength\pst@dimb\psk@radius + \setbox\pst@hbox=\hbox{% + \Cnodeput@iv{#1}% + \pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}% + \box\pst@hbox}% + \ifPst@nodealign \psboxseptrue \fi + \ifpsboxsep \psCirclebox@sep \fi + \leavevmode + \ifPst@nodealign\pst@nodealign\fi + \box\pst@hbox + \endgroup} \def\tx@GetRnodePos{GetRnodePos } \def\tx@InitRnode{InitRnode } % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node97.tex new/tex/generic/pst-node/pst-node97.tex --- old/tex/generic/pst-node/pst-node97.tex 2013-09-19 00:21:57.000000000 +0200 +++ new/tex/generic/pst-node/pst-node97.tex 2017-01-23 00:01:06.000000000 +0100 @@ -1,3 +1,4 @@ +% $Id: pst-node97.tex 129 2014-10-09 14:15:40Z herbert $ %% BEGIN: pst-node.tex %% Generated on <1993/3/12> from `pst-node.doc'. %% For use with the PostScript header file `pst-node.pro'. @@ -27,11 +28,11 @@ \csname PSTnodesLoaded\endcsname \let\PSTnodesLoaded\endinput \ifx\PSTricksLoaded\endinput\else -\def\next{\input pstricks.tex}\expandafter\next +\def\next{\input pstricks97.tex}\expandafter\next \fi \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 -\pstheader{pst-node.pro} +\pstheader{pst-node97.pro} \def\pst@nodedict{tx@NodeDict begin } \def\pst@getnode#1#2{% \pst@expandafter\pst@@getnode{#1} * \@nil{#1}#2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.tlpobj new/tlpkg/tlpobj/pst-node.tlpobj --- old/tlpkg/tlpobj/pst-node.tlpobj 2016-04-26 03:17:29.000000000 +0200 +++ new/tlpkg/tlpobj/pst-node.tlpobj 2017-04-14 17:56:22.000000000 +0200 @@ -1,6 +1,6 @@ name pst-node category Package -revision 40743 +revision 43015 shortdesc Nodes and node connections in PSTricks relocated 1 longdesc The package enables the user to connect information, and to @@ -18,7 +18,7 @@ RELOC/tex/generic/pst-node/pst-node97.tex RELOC/tex/latex/pst-node/pst-node.sty catalogue-ctan /graphics/pstricks/contrib/pst-node -catalogue-date 2016-04-25 09:50:38 +0200 +catalogue-date 2017-01-21 23:14:28 +0100 catalogue-license lppl catalogue-topics graphics-in-tex linguistic -catalogue-version 1.36 +catalogue-version 1.39 ++++++ pst-ob3d.doc.tar.xz ++++++ ++++++ pst-ob3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ob3d.tlpobj new/tlpkg/tlpobj/pst-ob3d.tlpobj --- old/tlpkg/tlpobj/pst-ob3d.tlpobj 2016-04-14 19:37:34.000000000 +0200 +++ new/tlpkg/tlpobj/pst-ob3d.tlpobj 2017-04-14 17:56:22.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/pst-ob3d/pst-ob3d.tex RELOC/tex/latex/pst-ob3d/pst-ob3d.sty catalogue-ctan /graphics/pstricks/contrib/pst-ob3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-3d pstricks catalogue-version 0.21 ++++++ pst-ode.doc.tar.xz ++++++ ++++++ pst-ode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ode.tlpobj new/tlpkg/tlpobj/pst-ode.tlpobj --- old/tlpkg/tlpobj/pst-ode.tlpobj 2016-04-14 19:37:34.000000000 +0200 +++ new/tlpkg/tlpobj/pst-ode.tlpobj 2017-04-14 17:56:23.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/generic/pst-ode/pst-ode.tex RELOC/tex/latex/pst-ode/pst-ode.sty catalogue-ctan /graphics/pstricks/contrib/pst-ode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths graphics-plot catalogue-version 0.7 ++++++ pst-optexp.doc.tar.xz ++++++ ++++++ pst-optexp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optexp.tlpobj new/tlpkg/tlpobj/pst-optexp.tlpobj --- old/tlpkg/tlpobj/pst-optexp.tlpobj 2016-04-14 19:37:41.000000000 +0200 +++ new/tlpkg/tlpobj/pst-optexp.tlpobj 2017-04-14 17:56:25.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/makeindex/pst-optexp/pst-optexp.ist RELOC/tex/latex/pst-optexp/pst-optexp.sty catalogue-ctan /graphics/pstricks/contrib/pst-optexp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics optics diagram-lab pstricks catalogue-version 5.2 ++++++ pst-optic.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/Changes new/doc/generic/pst-optic/Changes --- old/doc/generic/pst-optic/Changes 2010-09-13 18:36:21.000000000 +0200 +++ new/doc/generic/pst-optic/Changes 2016-11-25 19:27:50.000000000 +0100 @@ -1,4 +1,5 @@ ---- pst-optic.tex +1.02 2016-07-10 - added option onlyrays, preset to false 1.01 2010-07-23 - bugfixes for \psset[pst-optic,pstricks] 1.00 2009-02-10 - new style opticalAxis to allow different line styles - cosmetic changes to the code and the documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/README new/doc/generic/pst-optic/README --- old/doc/generic/pst-optic/README 2010-09-13 18:36:21.000000000 +0200 +++ new/doc/generic/pst-optic/README 2016-11-25 19:27:50.000000000 +0100 @@ -1,9 +1,9 @@ %% Package `pst-optic.tex' %% %% Manuel Luque <Mluque5130(a)aol.com> (France) -%% Herbert Voss <voss(a)perce.de> (Germany) +%% Herbert Voss <hvoss(a)tug.org> (Germany) %% -%% 2003-02-16 +%% 2016-07-10 %% Save the files @@ -15,7 +15,7 @@ If you like to get the documentation file in another format run latex pst-optic-doc.tex -bibtex pst-optic.doc +biber pst-optic.doc latex pst-optic-doc.tex dvips pst-optic-doc.dvi @@ -23,11 +23,3 @@ files are saved in the above mentioned way, before you run latex on the documentation file. -It is nearly the same for the example file pst-optic-examples.tex - - -The intermediate DVI file works only with viewers which can -interprete the embedded PostScript code, like the one from KDE. - -For another PDF output read the Introduction from -the documentation. Binary files old/doc/generic/pst-optic/more_docs/dtk.pdf and new/doc/generic/pst-optic/more_docs/dtk.pdf differ Binary files old/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf and new/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/more_docs/pst-optic-examples.tex new/doc/generic/pst-optic/more_docs/pst-optic-examples.tex --- old/doc/generic/pst-optic/more_docs/pst-optic-examples.tex 2010-09-13 18:36:21.000000000 +0200 +++ new/doc/generic/pst-optic/more_docs/pst-optic-examples.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,653 +0,0 @@ -%% $Id: pst-func-doc.tex 64 2008-12-08 22:14:27Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV13,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} -\usepackage[utf8]{inputenc} -\usepackage{pst-optic,pst-text} -\usepackage{hyperref} -\let\pstOpticFV\fileversion -\lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily} -\let\belowcaptionskip\abovecaptionskip -% -\begin{document} - -\title{\texttt{pst-optic}} -\subtitle{Lenses and Mirrors -- examples; v.\pstOpticFV} - -\author{Manuel Luque \\Herbert Vo\ss} -\docauthor{Herbert Vo\ss} -\date{\today} -\maketitle - -\tableofcontents - -\clearpage - -\part{Lenses} -\section{A simple colored System} - -\begin{itemize} -\item $\mathrm{\overline{AB} = 2\ cm}$ -\item $\mathrm{\overline{OA} = -10\ cm}$ -\item $\mathrm{\overline{OF'} = 3,333\ cm}$ -\item $\mathrm{\overline{XO} = 2\ cm}$ -\end{itemize} - -\begin{LTXexample} -\begin{pspicture}(-8.5,-3)(8.5,3) -\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red]} -\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2} -\psOutLine[length=2](L1)(B'){END} \psBeforeLine[length=2](B')(L2){START} -\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END)(START)(L2) -\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red,arrowsize=0.2]} -\end{pspicture} -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine} - -\clearpage -\section{A Magnifier} - -\begin{LTXexample} -\begin{pspicture}(-8,-5)(8,3) -\rput(0,0){\lens[lensGlass=true,lensWidth=0.4,focus=4,AB=0.5,OA=-2.8,XO=2,drawing=false] - \psline[linewidth=0.5pt](xLeft)(xRight)} -\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2} -\psOutLine[length=5.5,linestyle=none](B')(L1){END1} -\psBeforeLine[length=6,linestyle=none](L2)(B'){START} -\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END1)(START)(L2) -\psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B) -\uput[270](A){A} \uput[90](B){B} -\psline[linewidth=1.5\pslinewidth,arrowinset=0,linestyle=dashed]{->}(A')(B') -\uput[270](A'){$\mathrm{A'}$} \uput[90](B'){$\mathrm{B'}$} -\psset{linecolor=red,arrowsize=0.2} -\pcline[nodesepB=-4](B)(O)% Mittelpunktstrahl -\psline[linecolor=red,linestyle=dashed](B)(B')% ruckwaertige Verlaengerung -\Arrows(B)(O)% Mittelpunktstrahl -\psOutLine[length=2,arrows=->](B)(O){END6}% Mittelpunktstrahl -\psline(B)(I)(F')\psOutLine(I)(F'){END2}\Arrows(I)(F')\Arrows(B)(I) -\psOutLine[length=1,linestyle=dashed](I')(B'){END3} -\psline[linestyle=dashed](B)(F)\psline(B)(I')\Arrows[arrows=->>](B)(I') -\psline[linestyle=dashed](B')(I')\psline[linestyle=dashed](B')(I) -\psOutLine[length=2,arrows=->>](B')(I'){END4}\psOutLine[length=4](B')(I'){END5} -\rput(8,0){\psset{linecolor=black}\eye} -\end{pspicture} -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows} - -\clearpage -\section{Two Lenses} - -This is a simple system with two lenses, where the \Lcs{lens} macro is used only once. -The second lense (the left one) is drawn by the \Lcs{psline} macro. - -\begin{LTXexample} -\begin{pspicture}(-8,-5)(8,3) -\rput(0,0){\lens[lensScale=0.6,drawing=false,focus=1.5,OA=-1,XO=5,nameF={},nameFi={},AB=-1] - \psline[linewidth=1pt](xLeft)(xRight)} %image intermediaire A1B1 au foyer F'1 -\psline{->}(4,0)(4,-1) %lentille 2 -% \psline[linewidth=2\pslinewidth,linecolor=blue]{<->}(5,1.5)(5,-1.5) -%On place les points essentiels -\pnode(-6,0){O1} \pnode(-6,2.5){E1L1} \pnode(-6,-2.5){E2L1} -\pnode(4,0){A1} \pnode(4,-1){B1} -\rayInterLens(O1)(B1){5}{Inter1L2}%intersection de O1 avec la lentille L2 -\pcline[nodesepB=-2](Inter1L2)(O1)%rayon venant de l'infini jusqu'e la lentille L2 -\Parallel(B1)(O1)(E1L1){B1infty}%rayon parallele au precedent et passant par E1L1 -\Parallel(B1)(O1)(E2L1){B2infty}%rayon passant par E2L2 -%intersection de la droite passant par E1L1 et B1 avec la lentille L2 -\rayInterLens(E1L1)(B1){5}{InterE1B1L2}\psline(E1L1)(InterE1B1L2) -%intersection de la droite passant par E2L2 et B1 avec la lentille L2 -\rayInterLens(E2L1)(B1){5}{InterE2B1L2} -\psline(E2L1)(InterE2B1L2) -\psline[linestyle=dashed]{->}(A')(B')\psline[linestyle=dashed](InterE1B1L2)(B') -\psline[linestyle=dashed](InterE2B1L2)(B')\psline[linestyle=dotted](B')(O) -\psOutLine[length=3](B')(InterE1B1L2){END}\psBeforeLine[length=3](InterE2B1L2)(B'){START} -\pspolygon[style=rayuresJaunes,linestyle=none](B1infty)(E1L1)(InterE1B1L2)% - (END)(START)(InterE2B1L2)(E2L1)(B2infty) -\uput[90](A'){$\mathrm{A'}$}\uput[270](B'){$\mathrm{B'}$} -\uput[90](A1){$\mathrm{A_1}$}\uput[270](B1){$\mathrm{B_1}$} -\uput[225](O1){O1}\uput[45](O){O2}\uput[90](F){$\mathrm{F_2}$} -\uput{0.4}[150](F'){$\mathrm{F'_2}$}\uput{0.6}[90](A1){$\mathrm{F'_1}$} -\psline[linecolor=red](B1infty)(E1L1)(InterE1B1L2)(END) -\psline[linecolor=red](B2infty)(E2L1)(InterE2B1L2)(START) -\rput(8,0){\eye} -\psline[linewidth=2\pslinewidth,linecolor=blue,arrowsize=0.2,arrowinset=0.5]{<->}(-6,-2.5)(-6,2.5) -\end{pspicture} -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows}\xLcs{rayInterLens} - -\clearpage -\section{Real Image} - -\begin{LTXexample} -\begin{pspicture*}(-7.5,-3)(7.5,3) -\rput(0,0){\lens[lensGlass=true,lensWidth=0.5,lensType=DVG,XO=0,AB=2,OA=-4,focus=-6,spotAi=270,spotBi=90]% - \psline[linewidth=1pt](xLeft)(xRight)} -\psline[linecolor=red,linestyle=dashed](I')(F)% Verlaengerung des Brennstrahls -\psOutLine[length=7](B')(I){END}\psBeforeLine[length=7](I')(B'){START}% permet de definir START -\pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(END)(START)(I') -\psline(B)(I)(END) \psline(B)(I')(START) -\end{pspicture*} -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens} - -\clearpage -\section{Virtual Image} - -\begin{LTXexample} -\begin{pspicture*}(-7.5,-6.5)(7.5,7.5) -\rput(0,0){\lens[lensType=DVG,lensWidth=0.75,lensHeight=7,focus=-2,OA=-6,AB=4,XO=-1,lensGlass=true, - rayColor=red,yBottom=-5,yTop=5,drawing=false] - \psline[linewidth=1pt](xLeft)(xRight)} -\pnode(!XO 2.9){L1} \pnode(!XO -2.5){L2} -{ \psset{length=4,linestyle=none} - \psOutLine(B')(L1){A1} \psOutLine(B')(L2){A2} - \pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(A1)(A2)(L2) - \psset{linecolor=red,linestyle=solid} - \psline(B)(L1)(A1) \psline(B)(L2)(A2) \psline[linestyle=dashed](B')(L1) - \psline[linestyle=dashed](B')(L2) } -\psline[linestyle=dashed]{->}(A)(B) \psline{->}(A')(B') -\uput[90](B){B}\uput[90](B'){$\mathrm{B'}$}\uput[270](A){A}\uput[270](A'){$\mathrm{A'}$} -\end{pspicture*} -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens} - -\clearpage -\section{A Microscope} - -\begin{LTXexample} -\begin{pspicture}(-7.5,-5.5)(7.5,3) -\rput(0,0){\lens[focus=1.5,OA=-2,AB=0.5,XO=-5,lensGlass=true,lensWidth=0.4, - yBottom=-4,yTop=4,drawing=false,lensScale=0.4,nameF=F_1,nameFi=F'_1] - \psline[linewidth=1pt](xLeft)(xRight)} -\pnode(! XO 1){UPlens1} \pnode(! XO -1){DOWNlens1} -\Transform -\rput(0,0){\lens[focus=2,XO=3,lensGlass=true,lensWidth=0.4,yBottom=-4,yTop=4,drawing=false, - nameF=F_2,nameFi=F'_2,spotF=90,spotFi=90]} -\psline{->}(A1)(B1)\psline{->}(A'1)(B'1)\uput[270](A1){A}\uput[90](B1){B} -\uput[270](B'1){$\mathrm{B_1}$}\uput{0.7}[90](A'1){$\mathrm{A_1}$} -{\psset{linecolor=red} - \rayInterLens(I11)(B'1){3}{Inter1L2}\rayInterLens(B1)(O1){3}{Inter2L2} - \rayInterLens(UPlens1)(B'1){3}{Inter3L2}\rayInterLens(DOWNlens1)(B'1){3}{Inter4L2} - \psline(B1)(I11)(B'1)(Inter1L2)\psline(B1)(Inter2L2)\psline(B1)(UPlens1)(Inter3L2) - \psline(B1)(DOWNlens1)(Inter4L2) - \psset{length=5} - \Parallel(B'1)(O)(Inter3L2){B1inftyRigth}\Parallel(B'1)(O)(Inter4L2){B2inftyRigth} - \Parallel(B'1)(O)(Inter2L2){B3inftyRigth}\Parallel(B'1)(O)(Inter1L2){B3inftyRigth} - {\psset{length=-5,linestyle=dashed} - \Parallel(B'1)(O)(Inter3L2){B1inftyLeft}\Parallel(B'1)(O)(Inter4L2){B2inftyLeft} - \Parallel(B'1)(O)(Inter2L2){B3inftyLeft}\Parallel(B'1)(O)(Inter1L2){B3inftyLeft} - \pcline[nodesep=6](B'1)(O)} - \pspolygon[style=rayuresJaunes,linestyle=none](B1)(UPlens1)(Inter3L2)% - (B1inftyRigth)(B2inftyRigth)(Inter4L2)(DOWNlens1) - \psline(B1)(UPlens1)(Inter3L2)(B1inftyRigth)\psline(B2inftyRigth)(Inter4L2)(DOWNlens1)(B1)} -\rput(7,0){\eye} -\end{pspicture}% -\end{LTXexample} -\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}\xLcs{rayInterLens}\xLcs{Parallel} - - -\clearpage -\section{Telescope} - -\begin{LTXexample}[wide=false] -\telescope[mirrorFocus=10,posMirrorTwo=8,yBottom=-8] -\end{LTXexample} - -\xLcs{telescope} -\begin{LTXexample}[wide=false] -\telescope[mirrorFocus=6,posMirrorTwo=5,yBottom=-5] -\end{LTXexample} - -\clearpage -\section{Lightspeed measured by Foucault} -1849 Foucault (1819-1868) determines with the following configuration the speed of the light. - - - -\begin{LTXexample} -\begin{pspicture}(-8,-3.2)(7,4.5) -\rput(0,0){\lens[lensWidth=1,lensGlass=true,lensHeight=6,focus=4,drawing=false,AB=2.5]} -{\psset{linewidth=0.5pt,linestyle=dashed,arrowsize=5pt,arrows=|<->|} - \psline(-8,0)(4,0)\pcline(-7.75,-3)(0,-3)\lput*{:U}{2f} - \pcline(0,-3)(4,-3)\lput*{:U}{f}\pcline(7,0)(7,4)\lput*{:U}{f} - \pcline(4,5)(5,5)\lput*{:U}{s}\pcline(5.25,2.3)(5.25,2.8)\lput*{:U}{s} } -\uput[90](0,3){\Large L}\uput[45](-7.7,3){\Large B}\uput[45](-7.7,-2){\Large E} -\uput[270](3,-0.5){\Large D}\uput[-45](4,0){\Large A=F}\uput[270](3,2){\Large S} -\uput[90](4,4){\Large Sp}\uput[90](3.5,3.25){\Large B'}\uput[0](6.3,2.25){\Large B''} -\uput[-90](6,1.1){\Large M}\psarc[linewidth=0.5pt](-7.75,2.5){0.5}{-90}{0}\qdisk(-7.55,2.3){1pt} -\rput{210}(F'){\mirrorTwo} -{\psset{fillstyle=solid,fillcolor=lightgray} - \rput{210}(4,2.5){\psframe(-1,0)(1,0.2)}\psframe(-8,-3)(-7.75,3) - \psframe(3,4)(3.8,4.2)\psframe(4.2,4)(5,4.2) } -{\psset{linewidth=1pt,linecolor=red,arrows=->,arrowsize=5pt} - \arrowLine[linecolor=blue,arrowOffset=-0.2](F')(4,2.5){2} - \arrowLine[linecolor=blue,arrowOffset=-0.2](4,2.3)(6,2.3){1} - \qdisk(6,2.3){2pt} - \psline[linestyle=dashed,arrows=-](F')(5.1,4)\psline[linestyle=dashed,arrows=-](5,2.8)(6,2.8) - \arrowLine(4,4)(F'){3}\arrowLine[linecolor=blue,arrowOffset=-0.2](I)(F'){2} - \arrowLine(F')(I){2}\arrowLine[linecolor=blue,arrowOffset=-0.3](-7.75,2.5)(I){3} - \arrowLine(I)(-7.75,2.5){3} } -\psframe(5.5,1.1)(6.5,3.5) -\multido{\r=1.3+0.2}{12}{\psline(6.1,\r)(6.5,\r)} -\end{pspicture} -\end{LTXexample} - -Sp chink; \\ -D rotating mirror;\\ -L collecting lens;\\ -E end mirror;\\ -S half diaphanous mirror;\\ -M scale - - -\clearpage -\part{Mirrors} - -\section{High Beam Light\label{beamlight}} -\begin{LTXexample} -\begin{pspicture}(-1.5,-5.5)(10,5.5) -\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]} -\makeatletter -\pst@getcoor{Focus}\pst@tempf -\psset{linewidth=1pt,linecolor=red} -\multido{\n=60+5}{18}{% - \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!% - /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin neg){Endd1} - \psOutLine[arrows=->,length=.25](Endd1)(Endd1''){Endd2}% - \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!% - /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin ){End1} - \psOutLine[arrows=->,length=.25](End1)(End1''){End2}} -\makeatletter -\end{pspicture} -\end{LTXexample} -\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine} -\clearpage -\section{Low Beam Light} - - -\begin{LTXexample} -\begin{pspicture}(-1.5,-5)(10,5) -\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]} -\psset{linewidth=1pt,linecolor=red} -\multido{\n=70+5}{20}{% - \psline(2.75,-0.2)(! \n\space cos 2.75 add \n\space sin ) - \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](2.75,-0.2)% - (! \n\space cos 2.75 add \n\space sin ){End1} - \psOutLine[arrows=->,length=.25](End1)(End1''){End2}} -\end{pspicture} -\end{LTXexample} -\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine}\xLkeyword{mirrorDepth}\xLkeyword{mirrorHeight} - - - -\clearpage -\part{Refraction} - -\section{Vertical Medium} - -Refrectionnumbers are $n_1=1$ and $n_2=1.5$: - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-5,-3)(5,3) -\pnode(-1,-2.5){A}\pnode(1,-2.5){B}\pnode(1,2.5){C}\pnode(-1,2.5){D} -% \rotateFrame(A)(B)(C)(D){10} -\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -% 1. -\refractionRay(-3,-3)(-2,-2)(D)(A){1}{1.5}{END} -\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(-3,-3)(END){2}\ABinterCD(END)(END')(C)(B){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -% 2. -\refractionRay(-3,0)(-2,0)(A)(D){1}{1.5}{END} -\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(-3,0)(END){2}\ABinterCD(END)(END')(C)(B){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -% 3. -\refractionRay(-3,3)(-2,2)(D)(A){1}{1.5}{END} -\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(C)(B){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -\end{pspicture} -\end{LTXexample} -\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLkeyword{length} - -\clearpage -\section{Horizontal Medium} -Refrectionnumbers are $n_1=1$ and $n_2=1.5$: - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-5,-4)(5,3) -\pnode(-2.5,-1){A}\pnode(2.5,-1){B}\pnode(2.5,1){C}\pnode(-2.5,1){D} -%\rotateFrame(A)(B)(C)(D){10} -\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -% 1. -\refractionRay(-3,3)(-2,2)(C)(D){1}{1.5}{END} -\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -% 2. -\refractionRay(0,3)(0,1)(C)(D){1}{1.5}{END} -\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(0,3)(END){2}\ABinterCD(END)(END')(A)(B){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -% 3. -\refractionRay(3,3)(2,2)(C)(D){1}{1.5}{END} -\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out} -\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q} -\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -\end{pspicture} -\end{LTXexample} -\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD} - -\clearpage - -\section{Parallel Rays and a sloping medium} -Refrectionnumbers are $n_1=1$ and $n_2=1.5$: - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-7,-1)(5,6) -\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D} -\rotateFrame(A)(B)(C)(D){40} -\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->} -\multido{\r=1.10+0.28}{8}{% - \refractionRay(-6.00,\r)(-3.00,\r)(A)(D){1}{1.5}{End} - \arrowLine(-6.00,\r)(End){2}\ABinterCD(End)(End')(C)(B){Out} - \arrowLine(End)(Out){1}\refractionRay(End)(Out)(C)(B){1.5}{1}{Q} - \psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}} -\end{pspicture} -\end{LTXexample} -\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{polygon} - -\clearpage - -\section{A Prisma} -Refrectionnumbers are $n_1=1$ and $n_2=1.5$: - - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-7,0)(5,6) -\pnode(-3,1){A}\pnode(1,1){B}\pnode(-1,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C) -\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->} -\multido{\rA=0.6+0.2,\rB=1.5+0.2}{7}{% - \refractionRay(-6,\rA)(-4,\rB)(C)(A){1}{1.5}{END}\arrowLine(-6,\rA)(END){2} - \ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} - \refractionRay(END)(Out)(C)(B){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}} -\end{pspicture} -\end{LTXexample} -\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{psOutLine} - - -\section{A Prisma for Dispersion} -The following figure shows the light dispersion with realistic values for the refractions numbers of the different light colors. -\bigskip - -\begin{tabular}{ @{}l l l l l l @{}} - & darkblue & bluegreen & yellow & red & darkred \\ -$n$ for glass & 1.528 & 1.523 & 1.517 & 1.514 & 1.511 -\end{tabular} - -\begin{landscape} -\begin{LTXexample}[wide=false] -\begin{pspicture}[showgrid=true](-7,0)(14,6) -\pnode(-6,1){A}\pnode(-2,1){B}\pnode(-4,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C} -\pnode(12.5,0.5){E1}\pnode(12.5,5.5){E2} -\psframe[fillcolor=lightgray,fillstyle=solid](E1)(12.75,5.5)\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C) -\psset{linecolor=black,linewidth=2pt,arrowsize=5pt,arrows=->} -\pnode(-7,1){P1}\pnode(-6,2){P2}\ABinterCD(P1)(P2)(C)(A){END}\arrowLine(P1)(END){2} -\psset{linecolor=blue,linewidth=0.5pt,arrowsize=2pt,} -\refractionRay(P1)(P2)(C)(A){1}{1.528}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} -\refractionRay(END)(Out)(C)(B){1.528}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt} -\psset{linecolor=green} -\refractionRay(P1)(P2)(C)(A){1}{1.523}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} -\refractionRay(END)(Out)(C)(B){1.523}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt} -\psset{linecolor=yellow} -\refractionRay(P1)(P2)(C)(A){1}{1.517}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} -\refractionRay(END)(Out)(C)(B){1.517}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt} -\psset{linecolor=red} -\refractionRay(P1)(P2)(C)(A){1}{1.511}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} -\refractionRay(END)(Out)(C)(B){1.511}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt} -\end{pspicture} -\end{LTXexample} -\end{landscape} - - -\clearpage -\section{Refration with different Angles} -Refrectionnumbers are $n_1=1$ and $n_2=1.5$: - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-6,-5)(6,5) -\pnode(-6,-1){A}\pnode(6,-1){B}\pnode(6,1){C}\pnode(-6,1){D} -\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -\psline[linewidth=0.5pt](0,-5)(0,5) -\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->} -\multido{\n=30+5}{25}{% - \refractionRay(5;\n)(0,1)(C)(D){1}{1.5}{END}\arrowLine(5;\n)(END){2} - \ABinterCD(END)(END')(B)(A){Out}\arrowLine(END)(Out){1} - \refractionRay(END)(Out)(B)(A){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}} -\end{pspicture} -\end{LTXexample} - - - - - -\clearpage -\section{Great difference in the Refractionsnumbers} - -Refrectionnumbers are $n_1=1$ and $n_2=4$: - - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-5,-1)(2,6) -\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D}\rotateFrame(A)(B)(C)(D){45} -\uput[-135](A){A}\uput[-40](B){B}\uput[45](C){C}\uput[135](D){D} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -\refractionRay(-2.5,-1)(-2,1)(A)(D){1}{4}{END} -\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->} -\arrowLine(-2.5,-1)(END){2}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1} -\refractionRay(END)(Out)(C)(B){4}{1}{Q}\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End} -\end{pspicture} -\end{LTXexample} - - -\clearpage - -\section{Total Reflection} - -Refrectionnumbers are $n_1=2$ and $n_2=1$: - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-8,-3)(8,6) -\pnode(-8,1.5){A}\pnode(8,1.5){B}\uput[45](A){A}\uput[135](B){B}\pnode(0,0){START} -\psframe[fillcolor=lightgray,fillstyle=solid,linecolor=blue](-8,-1.5)(B) -\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->} -% \multido{\n=20+5}{16}{% -\multido{\n=20+5}{29}{% - \refractionRay(START)(1;\n)(A)(B){1.5}{1}{END}\arrowLine(START)(END){2} - \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}} -\end{pspicture} -\end{LTXexample} - -\clearpage - - -\section{Total Reflection with a sloping medium} - -Refrectionnumbers are $n_1=2$ and $n_2=1$: - - -\begin{LTXexample} -\begin{pspicture}[showgrid=true](-8,-6)(8,6) -\pnode(-6,1.5){A}\pnode(6,1.5){B}\pnode(6,-1.5){C}\pnode(-6,-1.5){D} -\rotateFrame(A)(B)(C)(D){30}\uput[90](A){A}\uput[135](B){B}\pnode(0,0){START} -\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D) -\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->} -\multido{\n=50+5}{29}{% - \refractionRay(START)(1;\n)(A)(B){2}{1}{END}\arrowLine(START)(END){2} - \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}} -\end{pspicture} -\end{LTXexample} - -\clearpage - -\part{Spherical Optic} - - -\section{Refraction at a Spherical Surface} - -\subsection[Simple Example]{Construction for finding the position of the image point P' of a point object P formed by refraction at a sperical surface} - - -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-10,-4)(3,4) -\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-6,yTop=6,xLeft=-6,xRight=6,drawing=false]} -\psset{linecolor=red,linewidth=1.5pt,dotstyle=|} -\pnode(-9,0){P}\psdots(P)\uput[-90](P){P}\psline(P)(xRight)\lensSPHRay(P)(-5,2){1}{9}{Q} -\psline(P)(Q)(Q')\psdots(Q)\uput[90](Q){B}\ABinterCD(Q)(Q')(0,0)(5,0){P'} -\psdots(Q')\uput[-90](P'){P'}\psline[linewidth=0.5pt,linecolor=black](Center')(Q) -\psline[linewidth=0.5pt,linecolor=black](Q)(Q|0,0)\psdots(Center')\uput[-90](Center'){C} -\end{pspicture*} -\end{LTXexample} -\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD} - - -\clearpage -\subsection[Height of an Image]{Construction for determining the height of an image formed by refraction at a sperical surface} - -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-13,-3)(3,5) -\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-4,yTop=4,xLeft=-5,xRight=5,drawing=false]} -\psset{linecolor=red,linewidth=1.5pt,dotstyle=|} -\pnode(-12,0){P}\psdots(P)\uput[-90](P){P}\pnode(-12,4){Q}\psdots(Q)\uput[90](Q){Q} -\psline[linecolor=blue,linewidth=3pt,arrows=->](P)(Q)\psline(P)(xRight) -\lensSPHRay(Q)(Center'){1}{9}{S1}\lensSPHRay(Q)(-5,0){1}{9}{S2}% -\psline(Q)(S1')\psline(Q)(S2)(S2')\ABinterCD(Q)(S1')(S2)(S2'){Q'} -\pnode(Q'|0,0){P'}\psline[linecolor=blue,linewidth=3pt,arrows=->](P')(Q') -\uput[90](P'){P'}\uput[-90](Q'){Q'}\psdots(Center')\uput[90](Center'){C} -\end{pspicture*} -\end{LTXexample} -\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD} - - -\clearpage -\section{Thin Convergent Lenses} - -If the two spherical surfaces are close enough we can call such a lense a -\textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays. - -\begin{LTXexample} -\psset{xunit=0.75cm} -\begin{pspicture*}[showgrid=true](-10,-4)(10,4) -\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=1.25,yBottom=-5,yTop=5,xLeft=-12,xRight=12,% - AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]} -\end{pspicture*} -\end{LTXexample} -\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB} - -\clearpage - -\section{Thick Convergent Lenses} - -There is no real image possible. - -\begin{LTXexample} -\begin{pspicture}(-10,-4)(10,4) -\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=2,yBottom=-5,yTop=5,xLeft=-12,xRight=12,% - AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]} -\end{pspicture} -\end{LTXexample} -\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB} - - -\clearpage - -\section{Thin Divergent Lenses} -If the two spherical surfaces are close enough we can call such a lense a \textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays. - -\psset{unit=1cm} -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-6,-3)(6,3) -\rput(0,0){\lensSPH[lensType=DVG,lensWidth=0.1,lensDepth=0.2,AB=1,OA=-5,drawing=true,rayColor=red]} -\end{pspicture*} -\end{LTXexample} -\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB} - - -\clearpage - -\section{Thick Divergent Lenses} - -There is no real image possible. - -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-6,-3)(6,3) -\rput(0,0){\lensSPH[lensType=DVG,lensWidth=1,lensDepth=1,AB=1,OA=-5,drawing=true,rayColor=red]} -\end{pspicture*} -\end{LTXexample} -\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB} - -\clearpage -\section{\nxLcs{mirrorCVG}} - -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-1,-5)(8,5) -\rput(0,0){\mirrorCVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorDepth=3] - \qdisk(Center){2pt}\qdisk(Focus){2pt} - \uput[-90](Center){Center}\uput[-90](Focus){F}\psline(O)(xRight)} -\multido{\rA=-3.50+0.25}{5}{% - \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E} - \psOutLine[linecolor=red,length=4](E')(E''){EEnd}} -\multido{\rA=-2.25+0.25}{19}{% - \ABinterSPHLens(6,\rA)(4,\rA)(Center){Ptemp} - \reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E} - \psline[linecolor=red](6,\rA)(Ptemp)(E)\psOutLine[linecolor=red,length=6](Ptemp)(E){EEnd}} -\multido{\rA=2.50+0.25}{5}{% - \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E} - \psOutLine[linecolor=red,length=4](E')(E''){EEnd}} -\end{pspicture*} -\end{LTXexample} -\xLcs{mirrorCVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay} - - -\clearpage -\section{\nxLcs{mirrorDVG}} - - -\begin{LTXexample} -\begin{pspicture*}[showgrid=true](-5,-5)(8,5) -\rput(0,0){% - \mirrorDVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorWidth=0.25,mirrorDepth=2.5] - \qdisk(Center){2pt}\qdisk(Focus){2pt}\uput[-90](Center){C}\uput[-90](Focus){F} - \psline(xLeft)(xRight)} -\multido{\rA=-3.00+0.25}{25}{% - \ABinterSPHLens(7,\rA)(4,\rA)(Center){Ptemp}\reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E} - \arrowLine[linecolor=red,linewidth=1.5pt](7,\rA)(Ptemp){1} - \psline[linecolor=red,arrows=->,linewidth=1.5pt](Ptemp)(E) - \psOutLine[linecolor=red,length=6,linewidth=1.5pt,arrows=->](Ptemp)(E){EEnd} - \psOutLine[linecolor=red,length=3,linestyle=dashed,linewidth=0.5pt](E)(Ptemp){EEnd}} -\end{pspicture*} -\end{LTXexample} -\xLcs{mirrorDVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay} - -\bgroup -\raggedright -\nocite{*} -\bibliographystyle{plain} -\bibliography{pst-optic-doc} -\egroup - -\printindex - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/pst-optic-doc.bib new/doc/generic/pst-optic/pst-optic-doc.bib --- old/doc/generic/pst-optic/pst-optic-doc.bib 2009-02-15 01:42:49.000000000 +0100 +++ new/doc/generic/pst-optic/pst-optic-doc.bib 2016-11-25 19:27:50.000000000 +0100 @@ -1,80 +1,98 @@ +@STRING{tugboat = {TUGboat} } @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@Book{companion, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + edition = 2, + year = {2007}, + address = {Boston, Mass.} +} + +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {{Timothy Van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} + @Book{PostScript, Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, + Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum + praktischen {E}insatz}, Publisher = {IWT}, Address = {Vaterstetten}, year = 1989, } -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, - Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, - year = 1993, +@ctan{multido, + Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, + Author = {{Timothy Van} Zandt}, + url = {/macros/generic/multido.tex}, + year = 1997 } +@Book{PSTricks2, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE -- Lehmanns}, + year = {2016}, + address = {Heidelberg/Hamburg} +} -@Manual{pdftricks, - Title = {PSTricks Support for pdf}, - Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, - Note = {}, - year = 2002, +@Book{PSTricksE, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX}, + edition = {1}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge -- UK} +} + +@Book{LTXquick, + author = {Herbert Vo\ss{}}, + title = {{\LaTeX} quick reference}, + edition = {1}, + publisher = {UIT}, + year = {2012}, + address = {Cambridge -- UK} } -@Manual{miwi, - Title = {References for \TeX{} and Friends}, - Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, - year = 2003, +@Book{presentations, + author = {Herbert Vo\ss}, + title = {Presentations with \LaTeX}, + edition = {1}, + publisher = {DANTE -- Lehmanns Media}, + year = {2012}, + address = {Heidelberg/Berlin} } -@Manual{pstlens:2001, - Title = {PST-lens - {\PS} macros for Generic TeX}, - Author = {Denis Girou and Manuel Luque}, - Organization = {}, - Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}}, - Note = {}, - year = 2001, +@Book{tbt, + author = {Victor Eijkhout}, + title = {\TeX\ by Topic -- {A} \TeX{}nician Reference}, + edition = {1}, + publisher = {DANTE -- lehmanns media}, + year = {2014}, + address = {Heidelberg/Berlin} } -@Manual{vue3d:2002, - Title = {Vue en 3D}, - Author = {Manuel Luque}, - Organization = {}, - Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}}, - Note = {}, - year = 2002, -} -@Article{dtk02.2:jackson.voss:plot-funktionen, - author = {Laura E. Jackson and Herbert Vo{\ss}}, - title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, - journal = dtk, - year = 2002, - volume = {2/02}, - altvolume = 2, - altnumber = 14, - month = jun, - pages = {27--34}, - annote = bretter, - keywords = {}, - abstract = { Im letzten Heft wurden die mathematischen Funktionen von - \PS~im Zusammenhang mit dem {\LaTeX}-Paket - \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben - und durch Beispiele erl{\"a}utert. In diesem Teil werden - die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r - externe Daten behandelt. } -} @Article{dtk02.1:voss:mathematischen, author = {Herbert Vo{\ss}}, @@ -85,9 +103,8 @@ altvolume = 1, altnumber = 14, month = mar, - pages = {40-47}, + pages = {40--47}, annote = bretter, - keywords = {}, abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn nun im eigentlichen @@ -99,30 +116,10 @@ gezeigt. } } - -@Book{companion, - author = {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss}, - title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, - year = {2007}, - edition = {2nd}, - address = {Reading, Mass.} -} - -@Book{PSTricks2, - author = {Herbert Vo\ss}, - title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {5.}, - publisher = {DANTE -- Lehmanns}, - year = {2008}, - address = {Heidelberg/Hamburg} -} - -@Book{voss:math, - author = {Herbert Vo\ss}, - title = {\LaTeX\ in {M}athematik und {N}aturwissenschaften}, - publisher = {{Franzis-Verlag}}, - year = {2006}, - address = {Poing} +@ctan{pstlens:2001, + Title = {PST-lens - {\PS} macros for Generic TeX}, + Author = {Denis Girou and Manuel Luque}, + url = {/graphics/pstricks/contrib/pst-lens/}, + year = 2001, } Binary files old/doc/generic/pst-optic/pst-optic-doc.pdf and new/doc/generic/pst-optic/pst-optic-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-optic/pst-optic-doc.tex new/doc/generic/pst-optic/pst-optic-doc.tex --- old/doc/generic/pst-optic/pst-optic-doc.tex 2010-09-13 18:36:21.000000000 +0200 +++ new/doc/generic/pst-optic/pst-optic-doc.tex 2016-11-25 19:27:50.000000000 +0100 @@ -8,6 +8,9 @@ \lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily} \let\belowcaptionskip\abovecaptionskip % +\usepackage[style=dtk]{biblatex} +\addbibresource{\jobname.bib} + \begin{document} \title{\texttt{pst-optic}} @@ -16,6 +19,13 @@ \author{Manuel Luque \\Herbert Vo\ss} \docauthor{Herbert Vo\ss} \date{\today} +\def\bgImage{\begin{pspicture*}(-0.5,-4)(8,4) + \rput(0,0){\mirrorCVG[mirrorHeight=8,mirrorDepth=4,drawing=false]} + \multido{\rY=-4.00+0.25}{33}{% + \mirrorCVGRay[linewidth=0.5pt,mirrorHeight=8, + mirrorDepth=4](10,\rY)(1,\rY){Dummy}} +\end{pspicture*}} + \maketitle \tableofcontents @@ -88,7 +98,7 @@ \begin{LTXexample} \begin{pspicture}[showgrid=true](-5,-2.2)(7,4) \rput(1.5,1.5){% - \lens[lensType=DVG,lensGlass=true,lensWidth=0.5,rayColor=red, + \lens[lensType=DVG,lensGlass,lensWidth=0.5,rayColor=red, focus=-2,AB=2,spotAi=270,spotBi=90]} \end{pspicture} \end{LTXexample} @@ -194,6 +204,7 @@ Lense width in cm & \Lkeyword{lensWidth} & 0.5cm\footnotemark\\ vertical scale (obsolet) & \Lkeyword{lensScale} & 1\\ View the lens & \Lkeyword{lensGlass} & \false\\ + show onyl the rays & \Lkeyword{onlyrays} & \false\\ Second lens & \Lkeyword{lensTwo} & \false\\ Focus in cm & \Lkeyword{focus} & 2\\ Distance $\mathrm{\overline{OA}}$& \Lkeyword{OA} & -4\\ @@ -245,8 +256,8 @@ \begin{LTXexample}[wide=false] \begin{pspicture*}(-7.5,-2.75)(7.5,3) -\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]} -\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass=true,lensWidth=0.5]} +\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]} +\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass,lensWidth=0.5]} \end{pspicture*} \end{LTXexample} \vspace*{-2ex} @@ -254,9 +265,9 @@ \begin{LTXexample}[wide=false] \begin{pspicture*}(-7.5,-2.75)(7.5,3) -\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=, lensWidth=0.5]} +\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]} \Transform -\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass=true,lensWidth=0.5]} +\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass,lensWidth=0.5]} \end{pspicture*} \end{LTXexample} \vspace*{-2ex} @@ -265,12 +276,12 @@ \begin{LTXexample}[wide=false] \begin{pspicture*}(-7.5,-2.75)(7.5,3) \rput(0,0){\lens[lensScale=0.6,XO=-4,nameF=F_1,nameA=A_1,nameB=B_1, - nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]} + nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass, lensWidth=0.5]} \pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B) \Transform \rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,nameA=A'_1,spotA=90,nameB=B'_1,spotB=270, nameO=O_2,nameAi=A'_2,spotAi=270,nameBi=B'_2,spotBi=90,nameF=F_2,nameFi=F'_2, - lensTwo=true,lensGlass=true,lensWidth=0.5]} + lensTwo=true,lensGlass,lensWidth=0.5]} \pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B) \end{pspicture*} \end{LTXexample} @@ -1148,7 +1159,7 @@ \psOutLine[linecolor=red,length=9](0,\nCountA)(FF){P2}} \psline[linecolor=blue](A)(FF) \psOutLine[linecolor=blue,length=5](A)(FF){END1} -\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass=true,lensHeight=6.5,drawing=false, +\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass,lensHeight=6.5,drawing=false, spotFi=315,lensWidth=0.5] \psline[linewidth=1pt](xLeft)(xRight) \psline[length=2,linewidth=2pt,arrows=->](F')(FF)} @@ -1307,8 +1318,7 @@ \bgroup \raggedright \nocite{*} -\bibliographystyle{plain} -\bibliography{pst-optic-doc} +\printbibliography \egroup \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optic.doc.tlpobj new/tlpkg/tlpobj/pst-optic.doc.tlpobj --- old/tlpkg/tlpobj/pst-optic.doc.tlpobj 2016-04-14 19:37:42.000000000 +0200 +++ new/tlpkg/tlpobj/pst-optic.doc.tlpobj 2017-04-14 17:56:25.000000000 +0200 @@ -1,14 +1,11 @@ name pst-optic.doc category Package -revision 19704 +revision 41999 shortdesc doc files of pst-optic relocated 1 -docfiles size=244 +docfiles size=124 RELOC/doc/generic/pst-optic/Changes RELOC/doc/generic/pst-optic/README - RELOC/doc/generic/pst-optic/more_docs/dtk.pdf - RELOC/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf - RELOC/doc/generic/pst-optic/more_docs/pst-optic-examples.tex RELOC/doc/generic/pst-optic/pst-optic-doc.bib RELOC/doc/generic/pst-optic/pst-optic-doc.pdf RELOC/doc/generic/pst-optic/pst-optic-doc.tex ++++++ pst-optic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-optic/pst-optic.tex new/tex/generic/pst-optic/pst-optic.tex --- old/tex/generic/pst-optic/pst-optic.tex 2010-09-13 18:36:21.000000000 +0200 +++ new/tex/generic/pst-optic/pst-optic.tex 2016-11-25 19:33:37.000000000 +0100 @@ -30,8 +30,8 @@ \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi % -\def\fileversion{1.01} -\def\filedate{2010/07/23} +\def\fileversion{1.02} +\def\filedate{2016/07/10} \message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -81,10 +81,11 @@ % \define@boolkey[psset]{pst-optic}[Pst@]{lensTwo}[false]{} % is a second lens present? \define@boolkey[psset]{pst-optic}[Pst@]{lensGlass}[true]{}% draw a _real_ lens? +\define@boolkey[psset]{pst-optic}[Pst@]{onlyrays}[true]{}% draw only the rays? \define@boolkey[psset]{pst-optic}[Pst@]{drawing}[true]{} % draw the nodes and rays? \define@boolkey[psset]{pst-optic}[Pst@]{rightRay}[false]{}% a ray on the right side? % -\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay} +\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay,onlyrays=false} % % ------- the global definitions for the pspicture frame ------ % @@ -367,7 +368,7 @@ /YA \pst@tempA exch pop \pst@number\psyunit div def /XA \pst@tempA pop \pst@number\psxunit div def YA 0 eq XA 0 eq and {0 0}{ - /r XA dup mul YA dup mul add sqrt def + /r XA dup mul YA dup mul add Sqrt def /AlphaOld YA XA atan def /AlphaNew AlphaOld \pst@optic@angle\space add def r AlphaNew cos mul r AlphaNew sin mul @@ -447,13 +448,13 @@ \pscustom{% \parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{% /arg t radius 2.0 mul div def - arg 1 arg dup mul sub sqrt atan + arg 1 arg dup mul sub Sqrt atan cos 1 sub radius mul neg Width2 sub t 2.0 div } \parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{% /arg t radius 2.0 mul div def - arg 1 arg dup mul sub sqrt atan + arg 1 arg dup mul sub Sqrt atan cos 1 sub radius mul neg Width2 sub neg t 2.0 div } @@ -466,7 +467,7 @@ % (-d-w/2,h/2)->(-d-w/2,-h/2) \parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{% /arg t 2.0 div radius div def - arg 1 arg dup mul sub sqrt atan cos 1 sub radius mul Width2 sub + arg 1 arg dup mul sub Sqrt atan cos 1 sub radius mul Width2 sub t 2.0 div } % (-d-w/2,-h/2)(d+w/2,-h/2) @@ -474,7 +475,7 @@ % (d+w/2,-h/2)->(d+w/2,h/2) \parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{% /arg t 2.0 div radius div def - 1 arg 1 arg dup mul sub sqrt atan cos sub radius mul Width2 add + 1 arg 1 arg dup mul sub Sqrt atan cos sub radius mul Width2 add t 2.0 div } \fill @@ -616,11 +617,11 @@ /dX XB XA sub def dX abs 0.01 lt { % a horizontal line - /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def - /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def + /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def + /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def /X XA def /XSecond XA def - /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def + /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def Y X neg }{ /dY YB YA sub def @@ -629,12 +630,12 @@ /klammer YM m XA mul add YA sub def /p2neg klammer m mul m21 div def /q klammer dup mul radius dup mul sub m21 div def - /root p2neg dup mul q sub sqrt def + /root p2neg dup mul q sub Sqrt def /X p2neg root YM m mul 0 gt {sub}{add}ifelse def /XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def /Y m X XA sub mul YA add def /YSecond m XSecond XA sub mul YA add def - /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def + /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def Y X neg } ifelse){#4} \else% DVG @@ -649,10 +650,10 @@ /dX XB XA sub def dX abs 0.01 lt { % a horizontal line - /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def - /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def + /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def + /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def /X XA def - /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def + /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def /XSecond XA def Y X neg }{ @@ -662,12 +663,12 @@ /klammer YM m XA mul add YA sub def /p2neg klammer m mul m21 div def /q klammer dup mul radius dup mul sub m21 div def - /root p2neg dup mul q sub sqrt def + /root p2neg dup mul q sub Sqrt def /X p2neg root YM m mul 0 gt {sub}{add}ifelse def /XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def /Y m X XA sub mul YA add def /YSecond m XSecond XA sub mul YA add def - /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def + /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def Y X neg } ifelse){#4} \fi @@ -793,8 +794,9 @@ \pnode(! \psk@optic@xRight\space A'B' YO add){I1}% \pnode(! \psk@optic@xRight\space neg A'B' YO add){I2}% \fi% + \ifPst@onlyrays\else \begingroup% - \ifPst@lensGlass% + \ifPst@lensGlass \rput(! XO YO){% \ifx\psk@optic@lensType\lensTypeCVG\lensCVG% \else\ifx\psk@optic@lensType\lensTypePCVG\lensCVG @@ -811,14 +813,15 @@ (! XO 0.5 \psk@optic@lensHeight\space mul \psk@optic@lensScale\space mul YO add)% \fi% - \endgroup% + \endgroup + \fi \ifPst@drawing % axe optique \psline[style=opticalAxis](! \psk@optic@xLeft\space YO)(! \psk@optic@xRight\space YO) \ifx\psk@optic@lensType\lensTypeDVG\pst@drawDVGRays\else \ifx\psk@optic@lensType\lensTypePDVG\pst@drawDVGRays\else \pst@drawCVGRays\fi\fi - \fi% + \fi \end{pspicture*}% }\ignorespaces} % @@ -1005,7 +1008,7 @@ XB XA sub abs 0.01 lt {A XA dup mul mul XA neg}{ /m YB YA sub XB XA sub div def /m2a m A div 2 div def - /Root m2a dup mul m XA mul YA sub A div sub sqrt def + /Root m2a dup mul m XA mul YA sub A div sub Sqrt def /Xp m2a Root add XA sub def /Xn m2a Root sub XA sub def /YSp m Xp mul YA add def @@ -1055,7 +1058,7 @@ /NoMoreReflection false def % pq Formel anwenden /m2a m A div 2 div def - /Root m2a dup mul m XA mul YA sub A div sub sqrt def + /Root m2a dup mul m XA mul YA sub A div sub Sqrt def /X1 m2a Root add def /X2 m2a Root sub def % be sure, that we get the right point @@ -1173,7 +1176,7 @@ \else \parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{% /radD radius \psk@optic@mirrorWidth\space add def - radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub sqrt sub t 2 div } + radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub Sqrt sub t 2 div } \fi % (d-w,-h/2)(d,-h/2) \psline(!% @@ -1187,7 +1190,7 @@ t 2 exp 4 div mul t 2 div } \else \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{ - radius dup dup mul t 2 div dup mul sub sqrt sub t 2 div } + radius dup dup mul t 2 div dup mul sub Sqrt sub t 2 div } \fi \fill }% @@ -1278,7 +1281,7 @@ Depth Height dup mul div t 2 exp 4 div mul neg t 2 div } \else \parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{% - radius dup mul t 2 div dup mul sub sqrt radius sub t 2 div } + radius dup mul t 2 div dup mul sub Sqrt radius sub t 2 div } \fi % (d-w,-h/2)(d,-h/2) \psline(! Depth Width add neg Height neg)(! Depth neg Height neg)% @@ -1288,7 +1291,7 @@ Depth Height dup mul div t 2 exp 4 div mul neg Width sub t 2 div } \else \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{% - radius Width sub dup mul t 2 div dup mul sub sqrt radius sub t 2 div } + radius Width sub dup mul t 2 div dup mul sub Sqrt radius sub t 2 div } \fi \fill% } @@ -1356,7 +1359,7 @@ /Xmax \psk@optic@mirrorHeight\space 2 div def /m YB YA sub XB XA sub div def /m2a m A div 2 div def - /Root m2a dup mul m XA mul YA sub A div sub sqrt def + /Root m2a dup mul m XA mul YA sub A div sub Sqrt def /X1 m2a Root add def /X2 m2a Root sub def /X XB X1 sub abs XB X2 sub abs lt @@ -1565,7 +1568,7 @@ def /xA' 2 xH mul XA sub def /yA' 2 yH mul YA sub def - /D12 Dx Dx mul Dy Dy mul add sqrt def + /D12 Dx Dx mul Dy Dy mul add Sqrt def xA' yA' moveto xH yH rlineto xA' yA'){#4} @@ -1660,7 +1663,7 @@ % sin(Beta)>1 is a total reflection instead of a refraction /sinBeta \pst@optic@cIn\space \pst@optic@cOut\space div Alpha sin mul def sinBeta abs 1 le{ - /Root 1 sinBeta dup mul sub sqrt def + /Root 1 sinBeta dup mul sub Sqrt def /Beta sinBeta Root atan def }{ /Beta 180 Alpha sub def @@ -1700,7 +1703,7 @@ /dX1 XA XP sub def /signum YP 0 lt {-1}{1}ifelse def % the gradient of the point. radius must be defined - /root radius dup mul XP dup mul sub sqrt def + /root radius dup mul XP dup mul sub Sqrt def /Gamma XP signum mul root atan 180 sub def % the angle of the incoming ray /AlphaStrich dY1 dX1 atan 180 sub def @@ -1773,7 +1776,7 @@ % Les datas % Sellmeier's % glass sf15 : verre flint - % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3)) + % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3)) % Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def /L2 {lambda 1e-3 mul dup mul} bind def % en microm�tres /N {1 @@ -1783,7 +1786,7 @@ add 1.038164 L2 mul L2 116.416755 sub div add - sqrt} bind def + Sqrt} bind def /alpha1 AnglePlan1 AnglePrism add def /sinB1 alpha1 sin N div def /B1 sinB1 arcsin def @@ -1943,14 +1946,14 @@ % Les datas % Sellmeier's % glass sf15 : verre flint lourd - % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3)) + % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3)) % Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def /L2 {lambda 1e-3 mul dup mul} bind def /N {1 1.539259 L2 mul L2 0.011931 sub div add 0.247621 L2 mul L2 0.055608 sub div add 1.038164 L2 mul L2 116.416755 sub div add - sqrt} bind def + Sqrt} bind def /alpha1 AnglePlan1 AnglePrism add def /sinB1 alpha1 sin N div def /B1 sinB1 asin def @@ -1997,7 +2000,7 @@ \def\resetOpticOptions{% hv 2006-07-20 \newpsstyle{opticalAxis}{linewidth=0.5pt,linecolor=black,linestyle=solid} \psset[pst-optic]{% - lensGlass=false,drawing=true,,lensTwo,rightRay, + lensGlass=false,drawing=true,,lensTwo,rightRay,onlyrays=false, xLeft=-7.5,xRight=7.5,yBottom=-3.0,yTop=3.0, lensType=CVG,lensColor=lightgray,lensWidth=0.5,lensDepth=1, lensHeight=5,lensScale=1,lensArrowSize=0.2,lensArrowInset=0.5, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-optic.tlpobj new/tlpkg/tlpobj/pst-optic.tlpobj --- old/tlpkg/tlpobj/pst-optic.tlpobj 2016-04-14 19:37:43.000000000 +0200 +++ new/tlpkg/tlpobj/pst-optic.tlpobj 2017-04-14 17:56:25.000000000 +0200 @@ -1,16 +1,16 @@ name pst-optic category Package -revision 19704 +revision 41999 shortdesc Drawing optics diagrams relocated 1 longdesc A package for drawing both reflective and refractive optics longdesc diagrams. The package requires pstricks later than version longdesc 1.10. -runfiles size=19 +runfiles size=20 RELOC/tex/generic/pst-optic/pst-optic.tex RELOC/tex/latex/pst-optic/pst-optic.sty catalogue-ctan /graphics/pstricks/contrib/pst-optic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-09-05 23:50:16 +0200 catalogue-license lppl catalogue-topics physics diagram pstricks -catalogue-version 1.01 +catalogue-version 1.02 ++++++ pst-osci.doc.tar.xz ++++++ ++++++ pst-osci.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-osci.tlpobj new/tlpkg/tlpobj/pst-osci.tlpobj --- old/tlpkg/tlpobj/pst-osci.tlpobj 2016-04-14 19:37:43.000000000 +0200 +++ new/tlpkg/tlpobj/pst-osci.tlpobj 2017-04-14 17:56:26.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/generic/pst-osci/pst-osci.tex RELOC/tex/latex/pst-osci/pst-osci.sty catalogue-ctan /graphics/pstricks/contrib/pst-osci -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use pstricks catalogue-version 2.82

1 0

commit texlive-specs-q for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-q for openSUSE:Factory checked in at 2017-06-25 19:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-q (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-q.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-q" Sun Jun 25 19:22:23 2017 rev:27 rq:504807 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.changes 2017-06-08 14:55:47.340112051 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-q.new/texlive-specs-q.changes 2017-06-25 19:27:50.319908941 +0200 @@ -1,0 +2,42 @@ +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- oubraces.doc.tar.xz oubraces.tar.xz outline.doc.tar.xz outline.tar.xz outliner.doc.tar.xz outliner.tar.xz outlines.doc.tar.xz outlines.tar.xz overlock.doc.tar.xz overlock.tar.xz overpic.doc.tar.xz overpic.tar.xz pacioli.doc.tar.xz pacioli.tar.xz pagecolor.doc.tar.xz pagecolor.tar.xz pagecont.doc.tar.xz pagecont.tar.xz pagenote.doc.tar.xz pagenote.tar.xz pagerange.doc.tar.xz pagerange.tar.xz pageslts.doc.tar.xz pageslts.tar.xz palatino.tar.xz paper.doc.tar.xz paper.tar.xz papercdcase.doc.tar.xz papercdcase.tar.xz papermas.doc.tar.xz papermas.tar.xz papertex.doc.tar.xz papertex.tar.xz paracol.doc.tar.xz paracol.tar.xz parades.doc.tar.xz parades.tar.xz paralist.doc.tar.xz paralist.tar.xz parallel.doc.tar.xz parallel.tar.xz paratype.doc.tar.xz paratype.tar.xz paresse.doc.tar.xz paresse.tar.xz parnotes.doc.tar.xz parnotes.tar.xz parrun.doc.tar.xz parrun.tar.xz parselines.doc.tar.xz parselines.tar.xz parskip.doc.tar.xz parskip.tar.xz pas-cours.doc.tar.xz pas-cours.tar.xz pas-crosswords.doc.tar.xz pas-crosswords.tar.xz pas-cv.doc.tar.xz pas-cv.tar.xz pas-tableur.doc.tar.xz pas-tableur.tar.xz passivetex.tar.xz patch.source.tar.xz patchcmd.doc.tar.xz patchcmd.tar.xz patgen.doc.tar.xz patgen2-tutorial.doc.tar.xz path.doc.tar.xz path.tar.xz pauldoc.doc.tar.xz pauldoc.tar.xz pawpict.doc.tar.xz pawpict.tar.xz pax.doc.tar.xz pax.tar.xz pb-diagram.doc.tar.xz pb-diagram.tar.xz pbibtex-base.doc.tar.xz pbibtex-base.tar.xz pbox.doc.tar.xz pbox.tar.xz pbsheet.doc.tar.xz pbsheet.tar.xz pdf-trans.doc.tar.xz pdf-trans.tar.xz pdf14.doc.tar.xz pdf14.tar.xz pdfbook2.doc.tar.xz pdfbook2.tar.xz pdfcomment.doc.tar.xz pdfcomment.tar.xz pdfcprot.doc.tar.xz pdfcprot.tar.xz pdfcrop.doc.tar.xz pdfcrop.tar.xz pdfjam.doc.tar.xz pdfjam.tar.xz pdfmarginpar.doc.tar.xz pdfmarginpar.tar.xz pdfpagediff.doc.tar.xz pdfpagediff.tar.xz pdfpages.doc.tar.xz pdfpages.tar.xz pdfscreen.doc.tar.xz pdfscreen.tar.xz New: ---- mwcls.doc.tar.xz mwcls.tar.xz mwe.doc.tar.xz mwe.tar.xz mweights.doc.tar.xz mweights.tar.xz mxedruli.doc.tar.xz mxedruli.tar.xz mychemistry.doc.tar.xz mychemistry.tar.xz mycv.doc.tar.xz mycv.tar.xz mylatexformat.doc.tar.xz mylatexformat.tar.xz mynsfc.doc.tar.xz mynsfc.tar.xz nag.doc.tar.xz nag.tar.xz nameauth.doc.tar.xz nameauth.tar.xz namespc.doc.tar.xz namespc.tar.xz nanumtype1.doc.tar.xz nanumtype1.tar.xz nar.tar.xz natbib.doc.tar.xz natbib.tar.xz natded.doc.tar.xz natded.tar.xz nath.doc.tar.xz nath.tar.xz nature.doc.tar.xz nature.tar.xz navigator.doc.tar.xz navigator.tar.xz navydocs.doc.tar.xz navydocs.tar.xz ncclatex.doc.tar.xz ncclatex.tar.xz ncctools.doc.tar.xz ncctools.tar.xz ncntrsbk.tar.xz nddiss.doc.tar.xz nddiss.tar.xz ndsu-thesis.doc.tar.xz ndsu-thesis.tar.xz needspace.doc.tar.xz needspace.tar.xz nestquot.tar.xz neuralnetwork.doc.tar.xz neuralnetwork.tar.xz nevelok.doc.tar.xz nevelok.tar.xz newcommand.doc.tar.xz newenviron.doc.tar.xz newenviron.tar.xz newfile.doc.tar.xz newfile.tar.xz newlfm.doc.tar.xz newlfm.tar.xz newpx.doc.tar.xz newpx.tar.xz newsletr.doc.tar.xz newsletr.tar.xz newspaper.doc.tar.xz newspaper.tar.xz newtx.doc.tar.xz newtx.tar.xz newtxsf.doc.tar.xz newtxsf.tar.xz newtxtt.doc.tar.xz newtxtt.tar.xz newunicodechar.doc.tar.xz newunicodechar.tar.xz newvbtm.doc.tar.xz newvbtm.tar.xz newverbs.doc.tar.xz newverbs.tar.xz nextpage.tar.xz nfssext-cfr.doc.tar.xz nfssext-cfr.tar.xz nicefilelist.doc.tar.xz nicefilelist.tar.xz niceframe.doc.tar.xz niceframe.tar.xz nicetext.doc.tar.xz nicetext.tar.xz nih.doc.tar.xz nih.tar.xz nihbiosketch.doc.tar.xz nihbiosketch.tar.xz nimbus15.doc.tar.xz nimbus15.tar.xz nkarta.doc.tar.xz nkarta.tar.xz nlctdoc.doc.tar.xz nlctdoc.tar.xz nodetree.doc.tar.xz nodetree.tar.xz notespages.doc.tar.xz notespages.tar.xz notex-bst.tar.xz novel.doc.tar.xz novel.tar.xz numspell.doc.tar.xz numspell.tar.xz olsak-misc.doc.tar.xz olsak-misc.tar.xz oplotsymbl.doc.tar.xz oplotsymbl.tar.xz optidef.doc.tar.xz optidef.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-q.spec ++++++ ++++ 33684 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 ++++++ nmbib.doc.tar.xz ++++++ ++++++ nmbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nmbib.tlpobj new/tlpkg/tlpobj/nmbib.tlpobj --- old/tlpkg/tlpobj/nmbib.tlpobj 2016-04-14 19:30:18.000000000 +0200 +++ new/tlpkg/tlpobj/nmbib.tlpobj 2017-04-14 17:52:27.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/nmbib/nmbib.sty catalogue-also multibibliography catalogue-ctan /macros/latex/contrib/nmbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bibtex-supp catalogue-version 1.04 ++++++ noconflict.doc.tar.xz ++++++ ++++++ noconflict.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noconflict.tlpobj new/tlpkg/tlpobj/noconflict.tlpobj --- old/tlpkg/tlpobj/noconflict.tlpobj 2016-04-14 19:30:18.000000000 +0200 +++ new/tlpkg/tlpobj/noconflict.tlpobj 2017-04-14 17:52:27.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/noconflict/noconflict.sty catalogue-ctan /macros/latex/contrib/noconflict -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 1.0 ++++++ noindentafter.doc.tar.xz ++++++ ++++++ noindentafter.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noindentafter.tlpobj new/tlpkg/tlpobj/noindentafter.tlpobj --- old/tlpkg/tlpobj/noindentafter.tlpobj 2016-04-14 19:30:18.000000000 +0200 +++ new/tlpkg/tlpobj/noindentafter.tlpobj 2017-04-14 17:52:27.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/noindentafter/noindentafter.sty catalogue-ctan /macros/latex/contrib/noindentafter -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 0.2.2 ++++++ noitcrul.doc.tar.xz ++++++ ++++++ noitcrul.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noitcrul.tlpobj new/tlpkg/tlpobj/noitcrul.tlpobj --- old/tlpkg/tlpobj/noitcrul.tlpobj 2016-04-14 19:30:18.000000000 +0200 +++ new/tlpkg/tlpobj/noitcrul.tlpobj 2017-04-14 17:52:27.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/noitcrul/noitcrul.sty catalogue-ctan /macros/latex/contrib/noitcrul -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics underline maths catalogue-version 0.2 ++++++ nolbreaks.doc.tar.xz ++++++ ++++++ nolbreaks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nolbreaks.tlpobj new/tlpkg/tlpobj/nolbreaks.tlpobj --- old/tlpkg/tlpobj/nolbreaks.tlpobj 2016-04-14 19:30:19.000000000 +0200 +++ new/tlpkg/tlpobj/nolbreaks.tlpobj 2017-04-14 17:52:27.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/nolbreaks/nolbreaks.sty catalogue-ctan /macros/latex/contrib/nolbreaks -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics typesetting catalogue-version 1.2 ++++++ nomencl.doc.tar.xz ++++++ ++++++ nomencl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomencl.tlpobj new/tlpkg/tlpobj/nomencl.tlpobj --- old/tlpkg/tlpobj/nomencl.tlpobj 2016-04-14 19:30:19.000000000 +0200 +++ new/tlpkg/tlpobj/nomencl.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/nomencl/sample05.cfg catalogue-also glosstex catalogue-ctan /macros/latex/contrib/nomencl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics glossary catalogue-version 3.1a ++++++ 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 2016-04-14 19:30:19.000000000 +0200 +++ new/tlpkg/tlpobj/nomentbl.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/makeindex/nomentbl/nomentbl.ist RELOC/tex/latex/nomentbl/nomentbl.sty catalogue-ctan /macros/latex/contrib/nomentbl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:20.000000000 +0200 +++ new/tlpkg/tlpobj/nonfloat.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/nonfloat/nonfloat.sty catalogue-ctan /macros/latex/contrib/nonfloat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:20.000000000 +0200 +++ new/tlpkg/tlpobj/nonumonpart.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/nonumonpart/nonumonpart.sty catalogue-ctan /macros/latex/contrib/nonumonpart -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:20.000000000 +0200 +++ new/tlpkg/tlpobj/nopageno.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=1 RELOC/tex/latex/nopageno/nopageno.sty catalogue-ctan /macros/latex/contrib/nopageno -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics page-nos ++++++ norasi-c90.tar.xz ++++++ ++++++ normalcolor.doc.tar.xz ++++++ ++++++ normalcolor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/normalcolor.tlpobj new/tlpkg/tlpobj/normalcolor.tlpobj --- old/tlpkg/tlpobj/normalcolor.tlpobj 2016-04-14 19:30:21.000000000 +0200 +++ new/tlpkg/tlpobj/normalcolor.tlpobj 2017-04-14 17:52:28.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/normalcolor/normalcolor.sty catalogue-ctan /macros/latex/contrib/normalcolor -catalogue-date 2016-03-30 06:22:42 +0200 +catalogue-date 2016-11-16 07:56:28 +0100 catalogue-license lppl1.3 -catalogue-topics colour-supp +catalogue-topics colour catalogue-version r11 ++++++ 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 2016-04-14 19:30:21.000000000 +0200 +++ new/tlpkg/tlpobj/nostarch.tlpobj 2017-04-14 17:52:29.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/nostarch/nostarch.cls RELOC/tex/latex/nostarch/nshyper.sty catalogue-ctan /macros/latex/contrib/nostarch -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics book-pub class catalogue-version 1.3 ++++++ notes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes.doc.tlpobj new/tlpkg/tlpobj/notes.doc.tlpobj --- old/tlpkg/tlpobj/notes.doc.tlpobj 2016-04-14 19:30:21.000000000 +0200 +++ new/tlpkg/tlpobj/notes.doc.tlpobj 2017-04-14 17:52:29.000000000 +0200 @@ -1,6 +1,6 @@ name notes.doc category Package -revision 37998 +revision 42428 shortdesc doc files of notes relocated 1 docfiles size=32 ++++++ 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 2016-04-14 19:30:22.000000000 +0200 +++ new/tlpkg/tlpobj/notes.tlpobj 2017-04-14 17:52:29.000000000 +0200 @@ -1,6 +1,6 @@ name notes category Package -revision 37998 +revision 42428 shortdesc Mark sections of a document relocated 1 longdesc The package provides environments to highlight significant @@ -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-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:22.000000000 +0200 +++ new/tlpkg/tlpobj/notes2bib.tlpobj 2017-04-14 17:52:29.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=5 RELOC/tex/latex/notes2bib/notes2bib.sty catalogue-ctan /macros/latex/contrib/notes2bib -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics notes bib-use expl3 catalogue-version 2.0k ++++++ noto.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/README new/doc/fonts/noto/README --- old/doc/fonts/noto/README 2016-03-24 23:25:43.000000000 +0100 +++ new/doc/fonts/noto/README 2017-01-07 00:01:03.000000000 +0100 @@ -1,8 +1,8 @@ -This is the README for the noto package, version 2016-03-21. +This is the README for the noto package, version 2017-01-05. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX -support for the NotoSerif and NotoSans families of fonts, -designed by Steve Matteson for Google. +support for the NotoSerif, NotoSans and NotoMono families of +fonts, designed by Steve Matteson for Google. To install this package on a TDS-compliant TeX system download the file "tex-archive"/install/fonts/noto.tds.zip, where the @@ -16,8 +16,9 @@ \usepackage{noto} -to the preamble of your document. This will activate NotoSerif as the -main (serifed) text font and NotoSans as the sans font. +to the preamble of your document. This will activate +NotoSerif as the main (serifed) text font, NotoSans as the +sans font and NotoMono as the fixed-width font. To activate NotoSerif without NotoSans, use @@ -32,22 +33,25 @@ \usepackage[sfdefault]{noto} This re-defines \familydefault, not \rmdefault. LuaLaTeX and -xeLaTeX users who might prefer type1 fonts or who wish to avoid fontspec -may use the type1 option. - -Options scaled=<number> or scale=<number> may be used to scale the -NotoSans fonts; the serifed variants are not affected. +xeLaTeX users who might prefer type1 fonts or who wish to +avoid fontspec may use the type1 option. Use option nott to +avoid activating NotoMono as the fixed-width font. + +Options scaled=<number> or scale=<number> may be used to +scale the NotoSans and NotoMono fonts; the serifed variants +are not affected. Font encodings supported are OT1, T1, LY1 and TS1. -Macros \notoserif and \notosans select the NotoSerif -and NotoSans families, respectively. +Macros \notoserif, \notosans and \notomono select the +NotoSerif, NotoSans and NotoMono families, respectively. The original fonts are available at https://www.google.com/get/noto and are licensed under the SIL Open Font License, (version 1.1); the text may be found -in the doc directory. The opentype and type1 versions were -created using fontforge. The support files were created -using autoinst and are licensed under the terms of the LaTeX -Project Public License. The maintainer of this package is -Bob Tennent (rdt at cs.queensu.ca) +in the doc directory. The type1 versions were created using +fontforge, which was also used to generate bold and italic +(i.e., oblique) variants of NotoMono. The support files were +created using autoinst and are licensed under the terms of +the LaTeX Project Public License. The maintainer of this +package is Bob Tennent (rdt at cs.queensu.ca) Binary files old/doc/fonts/noto/noto-samples.pdf and new/doc/fonts/noto/noto-samples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/noto-samples.tex new/doc/fonts/noto/noto-samples.tex --- old/doc/fonts/noto/noto-samples.tex 2016-03-24 23:25:43.000000000 +0100 +++ new/doc/fonts/noto/noto-samples.tex 2016-11-25 19:27:32.000000000 +0100 @@ -51,4 +51,28 @@ 1234567890 +\section*{NotoMono} + +\tt + +\subsection*{Regular} +\lipsum[1] + +\subsection*{Italic} +\textit{\lipsum[2]} + +\subsection*{Bold} + +\textbf{\lipsum[3]} + + + +\subsection*{Bold Italic} + +\textbf{\textit{\lipsum[4]}} + +\subsection*{Numbers} + +1234567890 + \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noto.doc.tlpobj new/tlpkg/tlpobj/noto.doc.tlpobj --- old/tlpkg/tlpobj/noto.doc.tlpobj 2016-04-14 19:30:22.000000000 +0200 +++ new/tlpkg/tlpobj/noto.doc.tlpobj 2017-04-14 17:52:30.000000000 +0200 @@ -1,9 +1,9 @@ name noto.doc category Package -revision 40119 +revision 42881 shortdesc doc files of noto relocated 1 -docfiles size=16 +docfiles size=22 RELOC/doc/fonts/noto/LICENSE_OFL.txt RELOC/doc/fonts/noto/README RELOC/doc/fonts/noto/noto-samples.pdf ++++++ noto.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/noto/nto_dhn6fe.enc new/fonts/enc/dvips/noto/nto_dhn6fe.enc --- old/fonts/enc/dvips/noto/nto_dhn6fe.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/noto/nto_dhn6fe.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob +% Encoding created by otftotfm on Sun Oct 30 17:21:26 2016 +% Command line follows encoding +/AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob [ +%00 + /Gamma /uni0394 /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /.notdef /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ot1 +% --tfm-directory=texmf/fonts/tfm/google/noto +% --vf-directory=texmf/fonts/vf/google/noto +% --type1-directory=texmf/fonts/type1/google/noto +% --truetype-directory=texmf/fonts/truetype/google/noto +% --encoding-directory=texmf/fonts/enc/dvips/noto +% --map-file=texmf/fonts/map/dvips/noto/NotoMono.map --no-updmap +% --coding-scheme=TEX TEXT --ligkern=f i =: fi --ligkern=f l =: fl +% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl +% NotoMono-BoldItalic.otf NotoMono-BoldItalic-tlf-ot1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/noto/nto_m27ex3.enc new/fonts/enc/dvips/noto/nto_m27ex3.enc --- old/fonts/enc/dvips/noto/nto_m27ex3.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/noto/nto_m27ex3.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd +% Encoding created by otftotfm on Sun Oct 30 17:21:26 2016 +% Command line follows encoding +/AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /.notdef /uniFB04 /uniFB03 /.notdef /uniFB02 /uniFB01 +%10 + /dotlessi /.notdef /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /tilde /dieresis +%80 + /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl + /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus +%90 + /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash + /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis +%A0 + /uni00A0 /exclamdown /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron +%B0 + /degree /plusminus /uni00B2 /uni00B3 /acute /mu /paragraph /periodcentered + /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/google/noto +% --vf-directory=texmf/fonts/vf/google/noto +% --type1-directory=texmf/fonts/type1/google/noto +% --truetype-directory=texmf/fonts/truetype/google/noto +% --encoding-directory=texmf/fonts/enc/dvips/noto +% --map-file=texmf/fonts/map/dvips/noto/NotoMono.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl NotoMono-BoldItalic.otf NotoMono-BoldItalic-tlf-ly1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/noto/nto_rk6f5k.enc new/fonts/enc/dvips/noto/nto_rk6f5k.enc --- old/fonts/enc/dvips/noto/nto_rk6f5k.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/noto/nto_rk6f5k.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg +% Encoding created by otftotfm on Sun Oct 30 17:21:26 2016 +% Command line follows encoding +/AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef + /.notdef /dotlessi /.notdef /uniFB04 /uniFB03 /.notdef /uniFB02 /uniFB01 +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve + /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute +%90 + /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring + /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section +%A0 + /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve + /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute +%B0 + /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring + /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t1 +% --tfm-directory=texmf/fonts/tfm/google/noto +% --vf-directory=texmf/fonts/vf/google/noto +% --type1-directory=texmf/fonts/type1/google/noto +% --truetype-directory=texmf/fonts/truetype/google/noto +% --encoding-directory=texmf/fonts/enc/dvips/noto +% --map-file=texmf/fonts/map/dvips/noto/NotoMono.map --no-updmap +% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl NotoMono-BoldItalic.otf NotoMono-BoldItalic-tlf-t1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/noto/nto_sjhjju.enc new/fonts/enc/dvips/noto/nto_sjhjju.enc --- old/fonts/enc/dvips/noto/nto_sjhjju.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/noto/nto_sjhjju.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_sjhjju6stv24tupxs5cx2lzgvd +% Encoding created by otftotfm on Sun Oct 30 17:21:26 2016 +% Command line follows encoding +/AutoEnc_sjhjju6stv24tupxs5cx2lzgvd [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /exclam /asterisk +%10 + /question /C /quotedblbase /bar /exclamdown /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /questiondown /.notdef +%20 + /.notdef /endash /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Omega + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /lira /.notdef /.notdef /.notdef /dong /trademark + /.notdef /.notdef /.notdef /uni2116 /.notdef /estimated /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /uni00B2 /uni00B3 /.notdef /mu /paragraph /periodcentered + /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /uniFB04 /uniFB03 /.notdef /uniFB02 /l /uniFB01 /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/google/noto +% --vf-directory=texmf/fonts/vf/google/noto +% --type1-directory=texmf/fonts/type1/google/noto +% --truetype-directory=texmf/fonts/truetype/google/noto +% --encoding-directory=texmf/fonts/enc/dvips/noto +% --map-file=texmf/fonts/map/dvips/noto/NotoMono.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl NotoMono-BoldItalic.otf NotoMono-BoldItalic-tlf-ts1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/noto/noto.map new/fonts/map/dvips/noto/noto.map --- old/fonts/map/dvips/noto/noto.map 2016-03-24 23:25:43.000000000 +0100 +++ new/fonts/map/dvips/noto/noto.map 2016-11-25 19:31:10.000000000 +0100 @@ -33,3 +33,35 @@ NotoSerif-tlf-t1--base NotoSerif "AutoEnc_5ritkcd3bsjyc2ymhcnwkygqzc ReEncodeFont" <[nto_5ritkc.enc <NotoSerif-Regular.pfb NotoSerif-tlf-ly1--base NotoSerif "AutoEnc_rq4uale5cat7l6tylkd2nhwt2e ReEncodeFont" <[nto_rq4ual.enc <NotoSerif-Regular.pfb NotoSerif-tlf-ts1--base NotoSerif "AutoEnc_m46tqgaxnozesqm622wncevcbh ReEncodeFont" <[nto_m46tqg.enc <NotoSerif-Regular.pfb + +% Automatically maintained by otftotfm or other programs. Do not edit. + +NotoMono-BoldItalic-tlf-ot1--lcdfj NotoMono-BoldItalicLCDFJ "" <NotoMono-BoldItalicLCDFJ.pfb +NotoMono-BoldItalic-tlf-ot1--base NotoMono-BoldItalic "AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob ReEncodeFont" <[nto_dhn6fe.enc <NotoMono-BoldItalic.pfb +NotoMono-BoldItalic-tlf-t1--lcdfj NotoMono-BoldItalicLCDFJ "" <NotoMono-BoldItalicLCDFJ.pfb +NotoMono-BoldItalic-tlf-t1--base NotoMono-BoldItalic "AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg ReEncodeFont" <[nto_rk6f5k.enc <NotoMono-BoldItalic.pfb +NotoMono-BoldItalic-tlf-ly1--lcdfj NotoMono-BoldItalicLCDFJ "" <NotoMono-BoldItalicLCDFJ.pfb +NotoMono-BoldItalic-tlf-ly1--base NotoMono-BoldItalic "AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd ReEncodeFont" <[nto_m27ex3.enc <NotoMono-BoldItalic.pfb +NotoMono-BoldItalic-tlf-ts1--base NotoMono-BoldItalic "AutoEnc_sjhjju6stv24tupxs5cx2lzgvd ReEncodeFont" <[nto_sjhjju.enc <NotoMono-BoldItalic.pfb +NotoMono-Bold-tlf-ot1--lcdfj NotoMono-BoldLCDFJ "" <NotoMono-BoldLCDFJ.pfb +NotoMono-Bold-tlf-ot1--base NotoMono-Bold "AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob ReEncodeFont" <[nto_dhn6fe.enc <NotoMono-Bold.pfb +NotoMono-Bold-tlf-t1--lcdfj NotoMono-BoldLCDFJ "" <NotoMono-BoldLCDFJ.pfb +NotoMono-Bold-tlf-t1--base NotoMono-Bold "AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg ReEncodeFont" <[nto_rk6f5k.enc <NotoMono-Bold.pfb +NotoMono-Bold-tlf-ly1--lcdfj NotoMono-BoldLCDFJ "" <NotoMono-BoldLCDFJ.pfb +NotoMono-Bold-tlf-ly1--base NotoMono-Bold "AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd ReEncodeFont" <[nto_m27ex3.enc <NotoMono-Bold.pfb +NotoMono-Bold-tlf-ts1--base NotoMono-Bold "AutoEnc_sjhjju6stv24tupxs5cx2lzgvd ReEncodeFont" <[nto_sjhjju.enc <NotoMono-Bold.pfb +NotoMono-Italic-tlf-ot1--lcdfj NotoMono-ItalicLCDFJ "" <NotoMono-ItalicLCDFJ.pfb +NotoMono-Italic-tlf-ot1--base NotoMono-Italic "AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob ReEncodeFont" <[nto_dhn6fe.enc <NotoMono-Italic.pfb +NotoMono-Italic-tlf-t1--lcdfj NotoMono-ItalicLCDFJ "" <NotoMono-ItalicLCDFJ.pfb +NotoMono-Italic-tlf-t1--base NotoMono-Italic "AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg ReEncodeFont" <[nto_rk6f5k.enc <NotoMono-Italic.pfb +NotoMono-Italic-tlf-ly1--lcdfj NotoMono-ItalicLCDFJ "" <NotoMono-ItalicLCDFJ.pfb +NotoMono-Italic-tlf-ly1--base NotoMono-Italic "AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd ReEncodeFont" <[nto_m27ex3.enc <NotoMono-Italic.pfb +NotoMono-Italic-tlf-ts1--base NotoMono-Italic "AutoEnc_sjhjju6stv24tupxs5cx2lzgvd ReEncodeFont" <[nto_sjhjju.enc <NotoMono-Italic.pfb +NotoMono-tlf-ot1--lcdfj NotoMonoLCDFJ "" <NotoMonoLCDFJ.pfb +NotoMono-tlf-ot1--base NotoMono "AutoEnc_dhn6felaiwv6rsgve2pjyvk6ob ReEncodeFont" <[nto_dhn6fe.enc <NotoMono.pfb +NotoMono-tlf-t1--lcdfj NotoMonoLCDFJ "" <NotoMonoLCDFJ.pfb +NotoMono-tlf-t1--base NotoMono "AutoEnc_rk6f5kaqoyhz3a6srqxkfwrctg ReEncodeFont" <[nto_rk6f5k.enc <NotoMono.pfb +NotoMono-tlf-ly1--lcdfj NotoMonoLCDFJ "" <NotoMonoLCDFJ.pfb +NotoMono-tlf-ly1--base NotoMono "AutoEnc_m27ex3hzlhkbp2ug4kmbhmxepd ReEncodeFont" <[nto_m27ex3.enc <NotoMono.pfb +NotoMono-tlf-ts1--base NotoMono "AutoEnc_sjhjju6stv24tupxs5cx2lzgvd ReEncodeFont" <[nto_sjhjju.enc <NotoMono.pfb + Binary files old/fonts/opentype/google/noto/NotoSans-Bold.otf and new/fonts/opentype/google/noto/NotoSans-Bold.otf differ Binary files old/fonts/opentype/google/noto/NotoSans-BoldItalic.otf and new/fonts/opentype/google/noto/NotoSans-BoldItalic.otf differ Binary files old/fonts/opentype/google/noto/NotoSans-Italic.otf and new/fonts/opentype/google/noto/NotoSans-Italic.otf differ Binary files old/fonts/opentype/google/noto/NotoSans-Regular.otf and new/fonts/opentype/google/noto/NotoSans-Regular.otf differ Binary files old/fonts/opentype/google/noto/NotoSerif-Bold.otf and new/fonts/opentype/google/noto/NotoSerif-Bold.otf differ Binary files old/fonts/opentype/google/noto/NotoSerif-BoldItalic.otf and new/fonts/opentype/google/noto/NotoSerif-BoldItalic.otf differ Binary files old/fonts/opentype/google/noto/NotoSerif-Italic.otf and new/fonts/opentype/google/noto/NotoSerif-Italic.otf differ Binary files old/fonts/opentype/google/noto/NotoSerif-Regular.otf and new/fonts/opentype/google/noto/NotoSerif-Regular.otf differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1.tfm and new/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--base.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--base.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--base.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1--base.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1.tfm and new/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1--base.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1.tfm and new/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ly1--base.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ly1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ly1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ly1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ly1.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ly1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ot1--base.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ot1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ot1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ot1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ot1.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ot1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-t1--base.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-t1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-t1--lcdfj.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-t1--lcdfj.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-t1.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-t1.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ts1--base.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/google/noto/NotoMono-tlf-ts1.tfm and new/fonts/tfm/google/noto/NotoMono-tlf-ts1.tfm differ Binary files old/fonts/truetype/google/noto/NotoMono-Bold.ttf and new/fonts/truetype/google/noto/NotoMono-Bold.ttf differ Binary files old/fonts/truetype/google/noto/NotoMono-BoldItalic.ttf and new/fonts/truetype/google/noto/NotoMono-BoldItalic.ttf differ Binary files old/fonts/truetype/google/noto/NotoMono-Italic.ttf and new/fonts/truetype/google/noto/NotoMono-Italic.ttf differ Binary files old/fonts/truetype/google/noto/NotoMono.ttf and new/fonts/truetype/google/noto/NotoMono.ttf differ Binary files old/fonts/truetype/google/noto/NotoSans-Bold.ttf and new/fonts/truetype/google/noto/NotoSans-Bold.ttf differ Binary files old/fonts/truetype/google/noto/NotoSans-BoldItalic.ttf and new/fonts/truetype/google/noto/NotoSans-BoldItalic.ttf differ Binary files old/fonts/truetype/google/noto/NotoSans-Italic.ttf and new/fonts/truetype/google/noto/NotoSans-Italic.ttf differ Binary files old/fonts/truetype/google/noto/NotoSans-Regular.ttf and new/fonts/truetype/google/noto/NotoSans-Regular.ttf differ Binary files old/fonts/truetype/google/noto/NotoSerif-Bold.ttf and new/fonts/truetype/google/noto/NotoSerif-Bold.ttf differ Binary files old/fonts/truetype/google/noto/NotoSerif-BoldItalic.ttf and new/fonts/truetype/google/noto/NotoSerif-BoldItalic.ttf differ Binary files old/fonts/truetype/google/noto/NotoSerif-Italic.ttf and new/fonts/truetype/google/noto/NotoSerif-Italic.ttf differ Binary files old/fonts/truetype/google/noto/NotoSerif-Regular.ttf and new/fonts/truetype/google/noto/NotoSerif-Regular.ttf differ Binary files old/fonts/type1/google/noto/NotoMono-Bold.pfb and new/fonts/type1/google/noto/NotoMono-Bold.pfb differ Binary files old/fonts/type1/google/noto/NotoMono-BoldItalic.pfb and new/fonts/type1/google/noto/NotoMono-BoldItalic.pfb differ Binary files old/fonts/type1/google/noto/NotoMono-BoldItalicLCDFJ.pfb and new/fonts/type1/google/noto/NotoMono-BoldItalicLCDFJ.pfb differ Binary files old/fonts/type1/google/noto/NotoMono-BoldLCDFJ.pfb and new/fonts/type1/google/noto/NotoMono-BoldLCDFJ.pfb differ Binary files old/fonts/type1/google/noto/NotoMono-Italic.pfb and new/fonts/type1/google/noto/NotoMono-Italic.pfb differ Binary files old/fonts/type1/google/noto/NotoMono-ItalicLCDFJ.pfb and new/fonts/type1/google/noto/NotoMono-ItalicLCDFJ.pfb differ Binary files old/fonts/type1/google/noto/NotoMono.pfb and new/fonts/type1/google/noto/NotoMono.pfb differ Binary files old/fonts/type1/google/noto/NotoMonoLCDFJ.pfb and new/fonts/type1/google/noto/NotoMonoLCDFJ.pfb differ Binary files old/fonts/vf/google/noto/NotoMono-Bold-tlf-ly1.vf and new/fonts/vf/google/noto/NotoMono-Bold-tlf-ly1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Bold-tlf-ot1.vf and new/fonts/vf/google/noto/NotoMono-Bold-tlf-ot1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Bold-tlf-t1.vf and new/fonts/vf/google/noto/NotoMono-Bold-tlf-t1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Bold-tlf-ts1.vf and new/fonts/vf/google/noto/NotoMono-Bold-tlf-ts1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ly1.vf and new/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ly1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ot1.vf and new/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ot1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-t1.vf and new/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-t1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ts1.vf and new/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ts1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Italic-tlf-ly1.vf and new/fonts/vf/google/noto/NotoMono-Italic-tlf-ly1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Italic-tlf-ot1.vf and new/fonts/vf/google/noto/NotoMono-Italic-tlf-ot1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Italic-tlf-t1.vf and new/fonts/vf/google/noto/NotoMono-Italic-tlf-t1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-Italic-tlf-ts1.vf and new/fonts/vf/google/noto/NotoMono-Italic-tlf-ts1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-tlf-ly1.vf and new/fonts/vf/google/noto/NotoMono-tlf-ly1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-tlf-ot1.vf and new/fonts/vf/google/noto/NotoMono-tlf-ot1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-tlf-t1.vf and new/fonts/vf/google/noto/NotoMono-tlf-t1.vf differ Binary files old/fonts/vf/google/noto/NotoMono-tlf-ts1.vf and new/fonts/vf/google/noto/NotoMono-tlf-ts1.vf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/noto/LY1NotoMono-TLF.fd new/tex/latex/noto/LY1NotoMono-TLF.fd --- old/tex/latex/noto/LY1NotoMono-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/noto/LY1NotoMono-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,50 @@ +%% Generated by autoinst on 2016/10/30 +%% +\ProvidesFile{LY1NotoMono-TLF.fd} + [2016/10/30 (autoinst) Font definitions for LY1/NotoMono-TLF.] + +\expandafter\ifx\csname NotoMono@scale\endcsname\relax + \let\NotoMono@@scale\@empty +\else + \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{NotoMono-TLF}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{b}{n}{ + <-> \NotoMono@@scale NotoMono-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{b}{it}{ + <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{b}{sl}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{m}{n}{ + <-> \NotoMono@@scale NotoMono-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{m}{it}{ + <-> \NotoMono@@scale NotoMono-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{m}{sl}{ + <-> ssub * NotoMono-TLF/m/it +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{bx}{sl}{ + <-> ssub * NotoMono-TLF/b/sl +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{bx}{n}{ + <-> ssub * NotoMono-TLF/b/n +}{} + +\DeclareFontShape{LY1}{NotoMono-TLF}{bx}{it}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/noto/OT1NotoMono-TLF.fd new/tex/latex/noto/OT1NotoMono-TLF.fd --- old/tex/latex/noto/OT1NotoMono-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/noto/OT1NotoMono-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,50 @@ +%% Generated by autoinst on 2016/10/30 +%% +\ProvidesFile{OT1NotoMono-TLF.fd} + [2016/10/30 (autoinst) Font definitions for OT1/NotoMono-TLF.] + +\expandafter\ifx\csname NotoMono@scale\endcsname\relax + \let\NotoMono@@scale\@empty +\else + \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{NotoMono-TLF}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{b}{n}{ + <-> \NotoMono@@scale NotoMono-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{b}{it}{ + <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{b}{sl}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{m}{n}{ + <-> \NotoMono@@scale NotoMono-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{m}{it}{ + <-> \NotoMono@@scale NotoMono-Italic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{m}{sl}{ + <-> ssub * NotoMono-TLF/m/it +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{bx}{sl}{ + <-> ssub * NotoMono-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{bx}{n}{ + <-> ssub * NotoMono-TLF/b/n +}{} + +\DeclareFontShape{OT1}{NotoMono-TLF}{bx}{it}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/noto/T1NotoMono-TLF.fd new/tex/latex/noto/T1NotoMono-TLF.fd --- old/tex/latex/noto/T1NotoMono-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/noto/T1NotoMono-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,50 @@ +%% Generated by autoinst on 2016/10/30 +%% +\ProvidesFile{T1NotoMono-TLF.fd} + [2016/10/30 (autoinst) Font definitions for T1/NotoMono-TLF.] + +\expandafter\ifx\csname NotoMono@scale\endcsname\relax + \let\NotoMono@@scale\@empty +\else + \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{NotoMono-TLF}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{b}{n}{ + <-> \NotoMono@@scale NotoMono-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{b}{it}{ + <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{b}{sl}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{m}{n}{ + <-> \NotoMono@@scale NotoMono-tlf-t1 +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{m}{it}{ + <-> \NotoMono@@scale NotoMono-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{m}{sl}{ + <-> ssub * NotoMono-TLF/m/it +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{bx}{sl}{ + <-> ssub * NotoMono-TLF/b/sl +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{bx}{n}{ + <-> ssub * NotoMono-TLF/b/n +}{} + +\DeclareFontShape{T1}{NotoMono-TLF}{bx}{it}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/noto/TS1NotoMono-TLF.fd new/tex/latex/noto/TS1NotoMono-TLF.fd --- old/tex/latex/noto/TS1NotoMono-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/noto/TS1NotoMono-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,50 @@ +%% Generated by autoinst on 2016/10/30 +%% +\ProvidesFile{TS1NotoMono-TLF.fd} + [2016/10/30 (autoinst) Font definitions for TS1/NotoMono-TLF.] + +\expandafter\ifx\csname NotoMono@scale\endcsname\relax + \let\NotoMono@@scale\@empty +\else + \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{NotoMono-TLF}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{b}{n}{ + <-> \NotoMono@@scale NotoMono-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{b}{it}{ + <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{b}{sl}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{m}{n}{ + <-> \NotoMono@@scale NotoMono-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{m}{it}{ + <-> \NotoMono@@scale NotoMono-Italic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{m}{sl}{ + <-> ssub * NotoMono-TLF/m/it +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{bx}{sl}{ + <-> ssub * NotoMono-TLF/b/sl +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{bx}{n}{ + <-> ssub * NotoMono-TLF/b/n +}{} + +\DeclareFontShape{TS1}{NotoMono-TLF}{bx}{it}{ + <-> ssub * NotoMono-TLF/b/it +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/noto/noto.sty new/tex/latex/noto/noto.sty --- old/tex/latex/noto/noto.sty 2016-03-24 23:25:43.000000000 +0100 +++ new/tex/latex/noto/noto.sty 2017-01-07 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{noto} - [2016/03/21 (Bob Tennent) Supports Noto fonts for all LaTeX engines.] + [2017/01/05 (Bob Tennent) Supports Noto fonts for all LaTeX engines.] \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} @@ -16,14 +16,18 @@ \newif\ifnoto@sfdefault \noto@sfdefaultfalse \newif\ifnoto@sf \noto@sftrue \newif\ifnoto@rm \noto@rmtrue +\newif\ifnoto@tt \noto@tttrue \newcommand*{\NotoSans@scale}{1} -\DeclareOptionX{scaled}{\renewcommand*{\NotoSans@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\NotoSans@scale}{#1}} +\newcommand*{\NotoMono@scale}{1} +\DeclareOptionX{scaled}{\renewcommand*{\NotoSans@scale}{#1}\renewcommand*{\NotoMono@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\NotoSans@scale}{#1}\renewcommand*{\NotoMono@scale}{#1}} + \DeclareOptionX{sf}{\noto@sftrue\noto@rmfalse} \DeclareOptionX{rm}{\noto@rmtrue\noto@sffalse} +\DeclareOptionX{nott}{\noto@ttfalse} \DeclareOptionX{sfdefault}{\noto@sfdefaulttrue} \DeclareOptionX{type1}{\noto@otffalse} @@ -31,11 +35,11 @@ \ProcessOptionsX\relax \ifnoto@otf - \def\noto@boldstyle{Bold} - \def\noto@regstyle{Regular} \else % type1 \def\bfseries@sf{b} + \def\bfseries@tt{b} \def\mdseries@sf{m} + \def\mdseries@tt{m} \fi \ifnoto@otf\else % type1 @@ -55,45 +59,62 @@ \defaultfontfeatures{ Ligatures = TeX , Scale = \NotoSans@scale , - Extension = .otf } + Extension = .ttf } \ifnoto@sf \setsansfont - [ UprightFont = *-\noto@regstyle , + [ UprightFont = *-Regular , ItalicFont = *-Italic , - BoldFont = *-\noto@boldstyle , - BoldItalicFont = *-\noto@boldstyle Italic ] + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] {NotoSans} + \let\notosansfamily\sfdefault \fi \ifnoto@rm \setmainfont - [ UprightFont = *-\noto@regstyle , + [ UprightFont = *-Regular , ItalicFont = *-Italic , - BoldFont = *-\noto@boldstyle , - BoldItalicFont = *-\noto@boldstyle Italic ] + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] {NotoSerif} \fi - % grab current family in case of subsequent change: - \let\notosansfamily\sfdefault + \ifnoto@tt + \setmonofont + [ UprightFont = * , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {NotoMono} + \let\notomonofamily\ttdefault + \fi \ifnoto@sfdefault\renewcommand*\familydefault{\notosansfamily}\fi \newfontfamily\notosans - [ UprightFont = *-\noto@regstyle , + [ UprightFont = *-Regular , ItalicFont = *-Italic , - BoldFont = *-\noto@boldstyle , - BoldItalicFont = *-\noto@boldstyle Italic ] + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] {NotoSans} \newfontfamily\notoserif - [ UprightFont = *-\noto@regstyle , + [ UprightFont = *-Regular , ItalicFont = *-Italic , - BoldFont = *-\noto@boldstyle , - BoldItalicFont = *-\noto@boldstyle Italic ] + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] {NotoSerif} + \newfontfamily\notomono + [ UprightFont = * , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {NotoMono} \else % type1 \def\notosansfamily{NotoSans-\noto@figurealign\noto@figurestyle} \def\notoseriffamily{NotoSerif-\noto@figurealign\noto@figurestyle} + \def\notomonofamily{NotoMono-\noto@figurealign\noto@figurestyle} \newcommand*\notoserif{\fontfamily{\notoseriffamily}\selectfont} \newcommand*\notosans{\fontfamily{\notosansfamily}\selectfont} + \newcommand*\notomono{\fontfamily{\notomonofamily}\selectfont} \ifnoto@rm \def\rmdefault{\notoseriffamily} \fi \ifnoto@sf \def\sfdefault{\notosansfamily} \fi + \ifnoto@tt \def\ttdefault{\notomonofamily} \fi \ifnoto@sfdefault\edef\familydefault{\sfdefault}\fi \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noto.tlpobj new/tlpkg/tlpobj/noto.tlpobj --- old/tlpkg/tlpobj/noto.tlpobj 2016-04-14 19:30:22.000000000 +0200 +++ new/tlpkg/tlpobj/noto.tlpobj 2017-04-14 17:52:30.000000000 +0200 @@ -1,26 +1,66 @@ name noto category Package -revision 40119 +revision 42881 shortdesc Support for Noto fonts relocated 1 longdesc This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX longdesc support for the NotoSerif and NotoSans families of fonts, longdesc designed by Steve Matteson for Google. execute addMap noto.map -runfiles size=2407 +runfiles size=1940 RELOC/fonts/enc/dvips/noto/nto_5drdqr.enc RELOC/fonts/enc/dvips/noto/nto_5ritkc.enc + RELOC/fonts/enc/dvips/noto/nto_dhn6fe.enc + RELOC/fonts/enc/dvips/noto/nto_m27ex3.enc RELOC/fonts/enc/dvips/noto/nto_m46tqg.enc + RELOC/fonts/enc/dvips/noto/nto_rk6f5k.enc RELOC/fonts/enc/dvips/noto/nto_rq4ual.enc + RELOC/fonts/enc/dvips/noto/nto_sjhjju.enc RELOC/fonts/map/dvips/noto/noto.map - RELOC/fonts/opentype/google/noto/NotoSans-Bold.otf - RELOC/fonts/opentype/google/noto/NotoSans-BoldItalic.otf - RELOC/fonts/opentype/google/noto/NotoSans-Italic.otf - RELOC/fonts/opentype/google/noto/NotoSans-Regular.otf - RELOC/fonts/opentype/google/noto/NotoSerif-Bold.otf - RELOC/fonts/opentype/google/noto/NotoSerif-BoldItalic.otf - RELOC/fonts/opentype/google/noto/NotoSerif-Italic.otf - RELOC/fonts/opentype/google/noto/NotoSerif-Regular.otf + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ly1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ot1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-t1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Bold-tlf-ts1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ly1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ot1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-t1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-BoldItalic-tlf-ts1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ly1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ot1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-t1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-Italic-tlf-ts1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ly1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ly1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ly1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ot1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ot1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ot1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-t1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-t1--lcdfj.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-t1.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ts1--base.tfm + RELOC/fonts/tfm/google/noto/NotoMono-tlf-ts1.tfm RELOC/fonts/tfm/google/noto/NotoSans-Bold-tlf-ly1--base.tfm RELOC/fonts/tfm/google/noto/NotoSans-Bold-tlf-ly1.tfm RELOC/fonts/tfm/google/noto/NotoSans-Bold-tlf-ot1--base.tfm @@ -85,6 +125,26 @@ RELOC/fonts/tfm/google/noto/NotoSerif-tlf-t1.tfm RELOC/fonts/tfm/google/noto/NotoSerif-tlf-ts1--base.tfm RELOC/fonts/tfm/google/noto/NotoSerif-tlf-ts1.tfm + RELOC/fonts/truetype/google/noto/NotoMono-Bold.ttf + RELOC/fonts/truetype/google/noto/NotoMono-BoldItalic.ttf + RELOC/fonts/truetype/google/noto/NotoMono-Italic.ttf + RELOC/fonts/truetype/google/noto/NotoMono.ttf + RELOC/fonts/truetype/google/noto/NotoSans-Bold.ttf + RELOC/fonts/truetype/google/noto/NotoSans-BoldItalic.ttf + RELOC/fonts/truetype/google/noto/NotoSans-Italic.ttf + RELOC/fonts/truetype/google/noto/NotoSans-Regular.ttf + RELOC/fonts/truetype/google/noto/NotoSerif-Bold.ttf + RELOC/fonts/truetype/google/noto/NotoSerif-BoldItalic.ttf + RELOC/fonts/truetype/google/noto/NotoSerif-Italic.ttf + RELOC/fonts/truetype/google/noto/NotoSerif-Regular.ttf + RELOC/fonts/type1/google/noto/NotoMono-Bold.pfb + RELOC/fonts/type1/google/noto/NotoMono-BoldItalic.pfb + RELOC/fonts/type1/google/noto/NotoMono-BoldItalicLCDFJ.pfb + RELOC/fonts/type1/google/noto/NotoMono-BoldLCDFJ.pfb + RELOC/fonts/type1/google/noto/NotoMono-Italic.pfb + RELOC/fonts/type1/google/noto/NotoMono-ItalicLCDFJ.pfb + RELOC/fonts/type1/google/noto/NotoMono.pfb + RELOC/fonts/type1/google/noto/NotoMonoLCDFJ.pfb RELOC/fonts/type1/google/noto/NotoSans-Bold.pfb RELOC/fonts/type1/google/noto/NotoSans-BoldItalic.pfb RELOC/fonts/type1/google/noto/NotoSans-Italic.pfb @@ -93,6 +153,22 @@ RELOC/fonts/type1/google/noto/NotoSerif-BoldItalic.pfb RELOC/fonts/type1/google/noto/NotoSerif-Italic.pfb RELOC/fonts/type1/google/noto/NotoSerif-Regular.pfb + RELOC/fonts/vf/google/noto/NotoMono-Bold-tlf-ly1.vf + RELOC/fonts/vf/google/noto/NotoMono-Bold-tlf-ot1.vf + RELOC/fonts/vf/google/noto/NotoMono-Bold-tlf-t1.vf + RELOC/fonts/vf/google/noto/NotoMono-Bold-tlf-ts1.vf + RELOC/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ly1.vf + RELOC/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ot1.vf + RELOC/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-t1.vf + RELOC/fonts/vf/google/noto/NotoMono-BoldItalic-tlf-ts1.vf + RELOC/fonts/vf/google/noto/NotoMono-Italic-tlf-ly1.vf + RELOC/fonts/vf/google/noto/NotoMono-Italic-tlf-ot1.vf + RELOC/fonts/vf/google/noto/NotoMono-Italic-tlf-t1.vf + RELOC/fonts/vf/google/noto/NotoMono-Italic-tlf-ts1.vf + RELOC/fonts/vf/google/noto/NotoMono-tlf-ly1.vf + RELOC/fonts/vf/google/noto/NotoMono-tlf-ot1.vf + RELOC/fonts/vf/google/noto/NotoMono-tlf-t1.vf + RELOC/fonts/vf/google/noto/NotoMono-tlf-ts1.vf RELOC/fonts/vf/google/noto/NotoSans-Bold-tlf-ly1.vf RELOC/fonts/vf/google/noto/NotoSans-Bold-tlf-ot1.vf RELOC/fonts/vf/google/noto/NotoSans-Bold-tlf-t1.vf @@ -125,16 +201,20 @@ RELOC/fonts/vf/google/noto/NotoSerif-tlf-ot1.vf RELOC/fonts/vf/google/noto/NotoSerif-tlf-t1.vf RELOC/fonts/vf/google/noto/NotoSerif-tlf-ts1.vf + RELOC/tex/latex/noto/LY1NotoMono-TLF.fd RELOC/tex/latex/noto/LY1NotoSans-TLF.fd RELOC/tex/latex/noto/LY1NotoSerif-TLF.fd + RELOC/tex/latex/noto/OT1NotoMono-TLF.fd RELOC/tex/latex/noto/OT1NotoSans-TLF.fd RELOC/tex/latex/noto/OT1NotoSerif-TLF.fd + RELOC/tex/latex/noto/T1NotoMono-TLF.fd RELOC/tex/latex/noto/T1NotoSans-TLF.fd RELOC/tex/latex/noto/T1NotoSerif-TLF.fd + RELOC/tex/latex/noto/TS1NotoMono-TLF.fd RELOC/tex/latex/noto/TS1NotoSans-TLF.fd RELOC/tex/latex/noto/TS1NotoSerif-TLF.fd RELOC/tex/latex/noto/noto.sty catalogue-ctan /fonts/noto -catalogue-date 2016-03-30 06:22:42 +0200 +catalogue-date 2017-01-06 05:32:10 +0100 catalogue-license ofl catalogue-topics font font-otf font-type1 font-sans font-serif ++++++ 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 2016-04-14 19:30:32.000000000 +0200 +++ new/tlpkg/tlpobj/notoccite.tlpobj 2017-04-14 17:52:32.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=1 RELOC/tex/latex/notoccite/notoccite.sty catalogue-ctan /macros/latex/contrib/notoccite -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:32.000000000 +0200 +++ new/tlpkg/tlpobj/nowidow.tlpobj 2017-04-14 17:52:34.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=1 RELOC/tex/latex/nowidow/nowidow.sty catalogue-ctan /macros/latex/contrib/nowidow -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:32.000000000 +0200 +++ new/tlpkg/tlpobj/nox.tlpobj 2017-04-14 17:52:34.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/nox/nox.sty catalogue-ctan /macros/latex/contrib/nox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:33.000000000 +0200 +++ new/tlpkg/tlpobj/nrc.tlpobj 2017-04-14 17:52:34.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/nrc/nrc2.cls RELOC/tex/latex/nrc/nrc2.sty catalogue-ctan /macros/latex/contrib/nrc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:34.000000000 +0200 +++ new/tlpkg/tlpobj/ntgclass.tlpobj 2017-04-14 17:52:35.000000000 +0200 @@ -24,7 +24,7 @@ RELOC/tex/latex/ntgclass/rapport1.cls RELOC/tex/latex/ntgclass/rapport3.cls catalogue-ctan /macros/latex/contrib/ntgclass -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:35.000000000 +0200 +++ new/tlpkg/tlpobj/ntheorem.tlpobj 2017-04-14 17:52:35.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/ntheorem/ntheorem.sty catalogue-also amsthm thmtools empheq catalogue-ctan /macros/latex/contrib/ntheorem -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:35.000000000 +0200 +++ new/tlpkg/tlpobj/nuc.tlpobj 2017-04-14 17:52:35.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/nuc/nuc.sty catalogue-ctan /macros/latex/contrib/nuc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics subsup-pos catalogue-version 0.1 ++++++ nucleardata.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/nucleardata/README new/doc/latex/nucleardata/README --- old/doc/latex/nucleardata/README 2016-04-02 23:57:34.000000000 +0200 +++ new/doc/latex/nucleardata/README 2016-11-25 19:29:38.000000000 +0100 @@ -8,7 +8,7 @@ See http://www.latex-project.org/lppl.txt -Version Date: 04/01/2016 +Version Date: 10/18/2016 ---------------------------------------------------------------- @@ -16,4 +16,4 @@ It reads data from two different csv files: elementlist.csv and massdata.csv which are normally stored in the same folder as the nucleardata.sty file (dist/tex/latex/nucleardata). -The massdata.csv file was created from ENSDF data files and the file mass.mas03round from ``The Ame2003 atomic mass evaluation (II)'' by G.Audi, A.H.Wapstra and C.Thibault, _Nuclear Physics_ A729 p. 337-676, December 22, 2003. +The massdata.csv file was created from ENSDF data files and the file mass.mas03round from ``The Ame2003 atomic mass evaluation (II)'' by G.Audi, A.H.Wapstra and C.Thibault, _Nuclear Physics_ A729 p. 337-676, December 22, 2003. Elements 110 through 118 have been updated to the IUPAC approved and proposed names and symbols as of October, 2016. Binary files old/doc/latex/nucleardata/nucleardata.pdf and new/doc/latex/nucleardata/nucleardata.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nucleardata.doc.tlpobj new/tlpkg/tlpobj/nucleardata.doc.tlpobj --- old/tlpkg/tlpobj/nucleardata.doc.tlpobj 2016-04-14 19:30:36.000000000 +0200 +++ new/tlpkg/tlpobj/nucleardata.doc.tlpobj 2017-04-14 17:52:35.000000000 +0200 @@ -1,6 +1,6 @@ name nucleardata.doc category Package -revision 40216 +revision 42307 shortdesc doc files of nucleardata relocated 1 docfiles size=102 ++++++ nucleardata.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nucleardata/elementlist.csv new/tex/latex/nucleardata/elementlist.csv --- old/tex/latex/nucleardata/elementlist.csv 2015-11-13 23:42:38.000000000 +0100 +++ new/tex/latex/nucleardata/elementlist.csv 2016-11-25 19:33:56.000000000 +0100 @@ -111,10 +111,10 @@ 110,Ds,Darmstadtium 111,Rg,Roentgenium 112,Cn,Copernicium -113,Uut,Ununtrium +113,Nh,Nihonium 114,Fl,Flerovium -115,Uup,Ununpentium +115,Mc,Moscovium 116,Lv,Livermorium -117,Uus,Ununseptium -118,Uuo,Ununoctium +117,Ts,Tennessine +118,Og,Oganesson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nucleardata/massdata.csv new/tex/latex/nucleardata/massdata.csv --- old/tex/latex/nucleardata/massdata.csv 2015-11-13 23:42:38.000000000 +0100 +++ new/tex/latex/nucleardata/massdata.csv 2016-11-25 19:33:56.000000000 +0100 @@ -3080,102 +3080,102 @@ " ",160,107,267,"Bh "," -a",118910.0,260.0,7312.0,1.0,"B+",3000.0,380.0,267.12765,280.0,"None","None",-3.85,1.988,3.01,9.375084 " ",159,108,267,"Hs "," -a",122760.0,100.0,7295.0,0.0,"B+",3860.0,280.0,267.13179,110.0,"50 ms","",-5.14,2.828,3.85,10.115084 " ",158,109,267,"Mt "," -a",127900.0,540.0,7273.0,2.0,"B+",5140.0,550.0,267.13731,580.0,"None","None",-6.55,4.118,5.14,10.865084 -" ",157,110,267,"Ea "," -a",134450.0,370.0,7245.0,1.0,"B+",6550.0,660.0,267.14434,390.0,"None","None",0.0,5.528,6.55,12.275084 +" ",157,110,267,"Ds "," -a",134450.0,370.0,7245.0,1.0,"B+",6550.0,660.0,267.14434,390.0,"None","None",0.0,5.528,6.55,12.275084 "0",164,104,268,"Rf "," -a",115170.0,710.0,7338.0,3.0," ","*","*",268.12364,760.0,"None","None",-1.68,0.0,0.0,8.095084 " ",163,105,268,"Db "," -a",116850.0,530.0,7329.0,2.0,"B+",1680.0,880.0,268.12545,570.0,"None","None",-0.15,0.658,1.68,8.195084 " ",162,106,268,"Sg "," -a",117000.0,540.0,7325.0,2.0,"B+",150.0,760.0,268.12561,580.0,"None","None",-3.87,-0.872,0.15,8.395083999999999 " ",161,107,268,"Bh "," -a",120870.0,380.0,7308.0,1.0,"B+",3870.0,660.0,268.12976,410.0,"None","None",-2.24,2.848,3.87,9.085083999999998 " ",160,108,268,"Hs "," -a",123110.0,410.0,7297.0,2.0,"B+",2240.0,560.0,268.13216,440.0,"None","None",-6.11,1.218,2.24,9.905083999999999 " ",159,109,268,"Mt "," -a",129220.0,320.0,7271.0,1.0,"B+",6120.0,520.0,268.13873,340.0,"0.07 s","",-4.72,5.088,6.11,10.725083999999999 -" ",158,110,268,"Ea "," -a",133940.0,500.0,7250.0,2.0,"B+",4720.0,590.0,268.1438,540.0,"None","None",0.0,3.698,4.72,11.915083999999998 +" ",158,110,268,"Ds "," -a",133940.0,500.0,7250.0,2.0,"B+",4720.0,590.0,268.1438,540.0,"None","None",0.0,3.698,4.72,11.915083999999998 "0",164,105,269,"Db "," -a",118730.0,770.0,7325.0,3.0," ","*","*",269.12746,830.0,"None","None",-1.2,0.0,0.0,8.405083999999999 " ",163,106,269,"Sg "," -a",119930.0,660.0,7317.0,2.0,"B+",1210.0,1010.0,269.12876,700.0,"22 s","",-1.81,0.178,1.2,8.795084 " ",162,107,269,"Bh "," -a",121740.0,410.0,7308.0,2.0,"B+",1810.0,780.0,269.13069,440.0,"None","None",-3.13,0.788,1.81,8.835083999999998 " ",161,108,269,"Hs "," -a",124870.0,120.0,7293.0,0.0,"B+",3130.0,430.0,269.13406,130.0,"13 s","",-4.66,2.108,3.13,9.625084 " ",160,109,269,"Mt "," -a",129530.0,550.0,7273.0,2.0,"B+",4660.0,560.0,269.13906,590.0,"None","None",-5.65,3.638,4.66,10.535084 -" ",159,110,269,"Ea "," -a",135180.0,140.0,7249.0,1.0,"B+",5650.0,570.0,269.14512,150.0,"None","None",0.0,4.628,5.65,11.585083999999998 +" ",159,110,269,"Ds "," -a",135180.0,140.0,7249.0,1.0,"B+",5650.0,570.0,269.14512,150.0,"None","None",0.0,4.628,5.65,11.585083999999998 "0",165,105,270,"Db "," -a",121760.0,720.0,7316.0,3.0,"B-",360.0,950.0,270.13071,770.0,"None","None",0.36,0.0,0.0,8.205084 " ",164,106,270,"Sg "," -a",121400.0,620.0,7315.0,2.0," ","*","*",270.13033,660.0,"None","None",-3.06,-1.382,-0.36,9.095083999999998 " ",163,107,270,"Bh "," -a",124460.0,470.0,7300.0,2.0,"B+",3060.0,780.0,270.13362,500.0,"None","None",-0.97,2.038,3.06,9.295084 " ",162,108,270,"Hs "," -a",125430.0,290.0,7294.0,1.0,"B+",960.0,550.0,270.13465,310.0,"3.6 s","0+",-5.59,-0.052,0.97,9.305083999999999 " ",161,109,270,"Mt "," -a",131020.0,540.0,7270.0,2.0,"B+",5600.0,610.0,270.14066,580.0,"5.0 ms","",-3.79,4.568,5.59,10.345083999999998 -" ",160,110,270,"Ea "," -a",134810.0,290.0,7253.0,1.0,"B+",3790.0,610.0,270.14472,310.0,"None","None",0.0,2.768,3.79,11.195084 +" ",160,110,270,"Ds "," -a",134810.0,290.0,7253.0,1.0,"B+",3790.0,610.0,270.14472,310.0,"None","None",0.0,2.768,3.79,11.195084 "0",165,106,271,"Sg "," -a",124330.0,650.0,7307.0,2.0," ","*","*",271.13347,700.0,"2.4 m","",-1.59,0.0,0.0,8.705084 " ",164,107,271,"Bh "," -a",125920.0,560.0,7298.0,2.0,"B+",1590.0,850.0,271.13518,600.0,"None","None",-2.31,0.568,1.59,9.505083999999998 " ",163,108,271,"Hs "," -a",128230.0,340.0,7286.0,1.0,"B+",2310.0,650.0,271.13766,360.0,"None","None",-3.24,1.288,2.31,9.905083999999999 " ",162,109,271,"Mt "," -a",131470.0,570.0,7272.0,2.0,"B+",3240.0,660.0,271.14114,610.0,"None","None",-4.59,2.218,3.24,10.135083999999999 -" ",161,110,271,"Ea "," -a",136060.0,110.0,7252.0,0.0,"B+",4590.0,570.0,271.14606,110.0,"None","None",0.0,3.568,4.59,10.875084 +" ",161,110,271,"Ds "," -a",136060.0,110.0,7252.0,0.0,"B+",4590.0,570.0,271.14606,110.0,"None","None",0.0,3.568,4.59,10.875084 "0",166,106,272,"Sg "," -a",125900.0,770.0,7304.0,3.0," ","*","*",272.13516,820.0,"None","None",-2.68,0.0,0.0,8.305083999999999 " ",165,107,272,"Bh "," -a",128580.0,610.0,7291.0,2.0,"B+",2680.0,980.0,272.13803,650.0,"10 s","",-0.95,1.658,2.68,9.305083999999999 " ",164,108,272,"Hs "," -a",129530.0,580.0,7284.0,2.0,"B+",950.0,840.0,272.13905,620.0,"None","None",-4.36,-0.072,0.95,10.105084 " ",163,109,272,"Mt "," -a",133890.0,480.0,7266.0,2.0,"B+",4370.0,750.0,272.14374,520.0,"None","None",-2.4,3.338,4.36,10.595083999999998 -" ",162,110,272,"Ea "," -a",136290.0,650.0,7254.0,2.0,"B+",2400.0,810.0,272.14632,700.0,"None","None",-6.8,1.378,2.4,10.755083999999998 -" ",161,111,272,"Eb "," -a",143090.0,330.0,7226.0,1.0,"B+",6800.0,730.0,272.15362,360.0,"None","None",0.0,5.778,6.8,11.445084 +" ",162,110,272,"Ds "," -a",136290.0,650.0,7254.0,2.0,"B+",2400.0,810.0,272.14632,700.0,"None","None",-6.8,1.378,2.4,10.755083999999998 +" ",161,111,272,"Rg "," -a",143090.0,330.0,7226.0,1.0,"B+",6800.0,730.0,272.15362,360.0,"None","None",0.0,5.778,6.8,11.445084 "0",167,106,273,"Sg "," x",128750.0,660.0,7296.0,2.0," ","*","*",273.13822,710.0,"None","None",-1.3,0.0,0.0,0.0 " ",166,107,273,"Bh "," -a",130050.0,830.0,7288.0,3.0,"B+",1300.0,1060.0,273.13962,890.0,"None","None",-2.21,0.278,1.3,8.895083999999999 " ",165,108,273,"Hs "," -a",132260.0,830.0,7277.0,3.0,"B+",2210.0,1170.0,273.14199,890.0,"None","None",-2.73,1.188,2.21,9.905083999999999 " ",164,109,273,"Mt "," -a",134990.0,510.0,7264.0,2.0,"B+",2730.0,970.0,273.14491,550.0,"None","None",-3.68,1.708,2.73,10.825083999999999 -" ",163,110,273,"Ea "," -a",138670.0,130.0,7248.0,0.0,"B+",3680.0,530.0,273.14886,140.0,"None","None",-4.48,2.658,3.68,11.375084 -" ",162,111,273,"Eb "," -a",143150.0,610.0,7229.0,2.0,"B+",4490.0,620.0,273.15368,650.0,"None","None",0.0,3.458,4.48,11.195084 +" ",163,110,273,"Ds "," -a",138670.0,130.0,7248.0,0.0,"B+",3680.0,530.0,273.14886,140.0,"None","None",-4.48,2.658,3.68,11.375084 +" ",162,111,273,"Rg "," -a",143150.0,610.0,7229.0,2.0,"B+",4490.0,620.0,273.15368,650.0,"None","None",0.0,3.458,4.48,11.195084 "0",167,107,274,"Bh "," -a",132680.0,780.0,7282.0,3.0," ","*","*",274.14244,840.0,"None","None",-0.65,0.0,0.0,8.495083999999999 " ",166,108,274,"Hs "," -a",133330.0,650.0,7276.0,2.0,"B+",640.0,1010.0,274.14313,700.0,"None","None",-4.06,-0.372,0.65,9.505083999999998 " ",165,109,274,"Mt "," -a",137390.0,560.0,7259.0,2.0,"B+",4060.0,850.0,274.14749,600.0,"None","None",-1.86,3.038,4.06,10.505083999999998 -" ",164,110,274,"Ea "," -a",139250.0,490.0,7249.0,2.0,"B+",1860.0,740.0,274.14949,530.0,"None","None",-5.8,0.838,1.86,11.395083999999999 -" ",163,111,274,"Eb "," -a",145050.0,620.0,7225.0,2.0,"B+",5800.0,790.0,274.15571,660.0,"None","None",0.0,4.778,5.8,11.605084 +" ",164,110,274,"Ds "," -a",139250.0,490.0,7249.0,2.0,"B+",1860.0,740.0,274.14949,530.0,"None","None",-5.8,0.838,1.86,11.395083999999999 +" ",163,111,274,"Rg "," -a",145050.0,620.0,7225.0,2.0,"B+",5800.0,790.0,274.15571,660.0,"None","None",0.0,4.778,5.8,11.605084 "0",168,107,275,"Bh "," x",134370.0,650.0,7278.0,2.0," ","*","*",275.14425,700.0,"None","None",-1.58,0.0,0.0,0.0 " ",167,108,275,"Hs "," -a",135950.0,710.0,7270.0,3.0,"B+",1590.0,970.0,275.14595,770.0,"0.15 s","",-2.51,0.558,1.58,9.195084 " ",166,109,275,"Mt "," -a",138460.0,590.0,7258.0,2.0,"B+",2510.0,930.0,275.14865,640.0,"10 ms","",-3.29,1.488,2.51,10.115084 -" ",165,110,275,"Ea "," -a",141750.0,450.0,7243.0,2.0,"B+",3290.0,740.0,275.15218,480.0,"None","None",-3.7,2.268,3.29,11.095083999999998 -" ",164,111,275,"Eb "," -a",145450.0,690.0,7227.0,3.0,"B+",3690.0,830.0,275.15614,740.0,"None","None",0.0,2.678,3.7,11.555083999999999 +" ",165,110,275,"Ds "," -a",141750.0,450.0,7243.0,2.0,"B+",3290.0,740.0,275.15218,480.0,"None","None",-3.7,2.268,3.29,11.095083999999998 +" ",164,111,275,"Rg "," -a",145450.0,690.0,7227.0,3.0,"B+",3690.0,830.0,275.15614,740.0,"None","None",0.0,2.678,3.7,11.555083999999999 "0",168,108,276,"Hs "," -a",137120.0,820.0,7268.0,3.0," ","*","*",276.14721,890.0,"None","None",-3.68,0.0,0.0,8.795084 " ",167,109,276,"Mt "," -a",140800.0,680.0,7252.0,2.0,"B+",3680.0,1070.0,276.15116,730.0,"0.72 s","",-1.75,2.658,3.68,9.795084 -" ",166,110,276,"Ea "," -a",142550.0,610.0,7243.0,2.0,"B+",1750.0,910.0,276.15303,650.0,"None","None",-5.09,0.728,1.75,10.595083999999998 -" ",165,111,276,"Eb "," -a",147640.0,630.0,7222.0,2.0,"B+",5090.0,870.0,276.15849,670.0,"None","None",0.0,4.068,5.09,11.325083999999999 +" ",166,110,276,"Ds "," -a",142550.0,610.0,7243.0,2.0,"B+",1750.0,910.0,276.15303,650.0,"None","None",-5.09,0.728,1.75,10.595083999999998 +" ",165,111,276,"Rg "," -a",147640.0,630.0,7222.0,2.0,"B+",5090.0,870.0,276.15849,670.0,"None","None",0.0,4.068,5.09,11.325083999999999 "0",169,108,277,"Hs "," -a",139580.0,730.0,7262.0,3.0," ","*","*",277.14984,780.0,"None","None",-2.4,0.0,0.0,8.405083999999999 " ",168,109,277,"Mt "," -a",141980.0,880.0,7251.0,3.0,"B+",2400.0,1140.0,277.15242,950.0,"None","None",-3.0,1.378,2.4,9.505083999999998 -" ",167,110,277,"Ea "," -a",144980.0,960.0,7237.0,3.0,"B+",3010.0,1310.0,277.15565,1040.0,"None","None",-3.61,1.978,3.0,10.295084 -" ",166,111,277,"Eb "," -a",148590.0,620.0,7221.0,2.0,"B+",3610.0,1150.0,277.15952,660.0,"None","None",-4.12,2.588,3.61,11.175083999999998 -" ",165,112,277,"Ec "," -a",152710.0,130.0,7204.0,0.0,"B+",4120.0,630.0,277.16394,140.0,"None","None",0.0,3.098,4.12,11.615084 +" ",167,110,277,"Ds "," -a",144980.0,960.0,7237.0,3.0,"B+",3010.0,1310.0,277.15565,1040.0,"None","None",-3.61,1.978,3.0,10.295084 +" ",166,111,277,"Rg "," -a",148590.0,620.0,7221.0,2.0,"B+",3610.0,1150.0,277.15952,660.0,"None","None",-4.12,2.588,3.61,11.175083999999998 +" ",165,112,277,"Cn "," -a",152710.0,130.0,7204.0,0.0,"B+",4120.0,630.0,277.16394,140.0,"None","None",0.0,3.098,4.12,11.615084 "0",169,109,278,"Mt "," -a",144210.0,840.0,7246.0,3.0," ","*","*",278.15481,900.0,"None","None",-1.54,0.0,0.0,9.105084 -" ",168,110,278,"Ea "," -a",145750.0,680.0,7237.0,2.0,"B+",1540.0,1080.0,278.15647,730.0,"None","None",-4.78,0.518,1.54,9.995083999999999 -" ",167,111,278,"Eb "," -a",150530.0,630.0,7217.0,2.0,"B+",4780.0,930.0,278.1616,680.0,"None","None",-2.53,3.758,4.78,10.715084 -" ",166,112,278,"Ec "," -a",153060.0,530.0,7206.0,2.0,"B+",2520.0,830.0,278.16431,570.0,"None","None",0.0,1.508,2.53,11.385083999999999 +" ",168,110,278,"Ds "," -a",145750.0,680.0,7237.0,2.0,"B+",1540.0,1080.0,278.15647,730.0,"None","None",-4.78,0.518,1.54,9.995083999999999 +" ",167,111,278,"Rg "," -a",150530.0,630.0,7217.0,2.0,"B+",4780.0,930.0,278.1616,680.0,"None","None",-2.53,3.758,4.78,10.715084 +" ",166,112,278,"Cn "," -a",153060.0,530.0,7206.0,2.0,"B+",2520.0,830.0,278.16431,570.0,"None","None",0.0,1.508,2.53,11.385083999999999 "0",170,109,279,"Mt "," -a",145490.0,720.0,7244.0,3.0," ","*","*",279.15619,770.0,"None","None",-2.49,0.0,0.0,8.695084 -" ",169,110,279,"Ea "," -a",147980.0,740.0,7232.0,3.0,"B+",2490.0,1030.0,279.15886,800.0,"None","None",-3.36,1.468,2.49,9.605084 -" ",168,111,279,"Eb "," -a",151340.0,660.0,7218.0,2.0,"B+",3360.0,1000.0,279.16247,710.0,"None","None",-3.8,2.338,3.36,10.455084 -" ",167,112,279,"Ec "," -a",155140.0,490.0,7201.0,2.0,"B+",3800.0,830.0,279.16655,530.0,"None","None",0.0,2.778,3.8,10.965084 -"0",170,110,280,"Ea "," -a",148850.0,850.0,7232.0,3.0," ","*","*",280.1598,910.0,"None","None",-4.36,0.0,0.0,9.305083999999999 -" ",169,111,280,"Eb "," -a",153210.0,740.0,7214.0,3.0,"B+",4360.0,1130.0,280.16447,800.0,"None","None",-2.39,3.338,4.36,9.985083999999999 -" ",168,112,280,"Ec "," -a",155600.0,640.0,7203.0,2.0,"B+",2390.0,980.0,280.16704,690.0,"None","None",0.0,1.368,2.39,10.625084 -"0",171,110,281,"Ea "," -a",150960.0,730.0,7228.0,3.0," ","*","*",281.16206,780.0,"None","None",-3.08,0.0,0.0,8.955084 -" ",170,111,281,"Eb "," -a",154040.0,930.0,7214.0,3.0,"B+",3080.0,1180.0,281.16537,1000.0,"None","None",-3.65,2.058,3.08,9.635083999999999 -" ",169,112,281,"Ec "," -a",157690.0,990.0,7198.0,4.0,"B+",3650.0,1360.0,281.16929,1060.0,"None","None",0.0,2.628,3.65,10.285084 -"0",171,111,282,"Eb "," -a",156010.0,890.0,7210.0,3.0," ","*","*",282.16749,950.0,"None","None",-2.13,0.0,0.0,9.375084 -" ",170,112,282,"Ec "," -a",158140.0,710.0,7200.0,3.0,"B+",2120.0,1140.0,282.16977,760.0,"None","None",0.0,1.108,2.13,9.965084 -"0",172,111,283,"Eb "," -a",156880.0,780.0,7210.0,3.0," ","*","*",283.16842,840.0,"None","None",-3.14,0.0,0.0,8.965084 -" ",171,112,283,"Ec "," -a",160020.0,770.0,7196.0,3.0,"B+",3150.0,1090.0,283.17179,830.0,"None","None",-4.34,2.118,3.14,9.615084 -" ",170,113,283,"Ed "," -a",164360.0,730.0,7178.0,3.0,"B+",4340.0,1060.0,283.17645,780.0,"None","None",0.0,3.318,4.34,10.595083999999998 -"0",172,112,284,"Ec "," -a",160570.0,850.0,7197.0,3.0," ","*","*",284.17238,910.0,"None","None",-5.31,0.0,0.0,9.295084 -" ",171,113,284,"Ed "," -a",165880.0,800.0,7176.0,3.0,"B+",5310.0,1170.0,284.17808,860.0,"None","None",0.0,4.288,5.31,10.245083999999999 -"0",173,112,285,"Ec "," -a",162180.0,730.0,7195.0,3.0," ","*","*",285.17411,780.0,"None","None",-4.31,0.0,0.0,8.795084 -" ",172,113,285,"Ed "," -a",166490.0,980.0,7177.0,3.0,"B+",4310.0,1220.0,285.17873,1050.0,"None","None",-4.62,3.288,4.31,10.025084 -" ",171,114,285,"Ee "," -a",171110.0,1030.0,7158.0,4.0,"B+",4630.0,1420.0,285.1837,1110.0,"None","None",0.0,3.598,4.62,10.995083999999999 -"0",173,113,286,"Ed "," -a",168120.0,940.0,7174.0,3.0," ","*","*",286.18048,1010.0,"None","None",-3.14,0.0,0.0,9.685084 -" ",172,114,286,"Ee "," -a",171260.0,770.0,7161.0,3.0,"B+",3140.0,1210.0,286.18386,830.0,"None","None",0.0,2.118,3.14,10.695084 -"0",174,113,287,"Ed "," -a",168640.0,830.0,7176.0,3.0," ","*","*",287.18105,900.0,"None","None",-4.24,0.0,0.0,9.335083999999998 -" ",173,114,287,"Ee "," -a",172880.0,770.0,7158.0,3.0,"B+",4240.0,1140.0,287.1856,830.0,"None","None",-5.21,3.218,4.24,10.435084 -" ",172,115,287,"Ef "," -a",178090.0,790.0,7137.0,3.0,"B+",5200.0,1100.0,287.19119,850.0,"None","None",0.0,4.188,5.21,11.305083999999999 -"0",174,114,288,"Ee "," -a",172970.0,850.0,7161.0,3.0," ","*","*",288.18569,910.0,"None","None",-6.34,0.0,0.0,9.975083999999999 -" ",173,115,288,"Ef "," -a",179310.0,850.0,7136.0,3.0,"B+",6340.0,1210.0,288.19249,920.0,"None","None",0.0,5.318,6.34,11.005083999999998 -"0",175,114,289,"Ee "," -a",174450.0,730.0,7159.0,3.0," ","*","*",289.18728,790.0,"None","None",-5.06,0.0,0.0,9.845083999999998 -" ",174,115,289,"Ef "," -a",179510.0,1020.0,7139.0,4.0,"B+",5060.0,1260.0,289.19272,1100.0,"None","None",-5.73,4.038,5.06,10.595083999999998 -" ",173,116,289,"Eg "," -a",185240.0,1090.0,7116.0,4.0,"B+",5730.0,1490.0,289.19886,1170.0,"None","None",0.0,4.708,5.73,11.705084 -"0",175,115,290,"Ef "," -a",180840.0,980.0,7137.0,3.0," ","*","*",290.19414,1060.0,"None","None",-4.15,0.0,0.0,10.295084 -" ",174,116,290,"Eg "," -a",184990.0,840.0,7120.0,3.0,"B+",4140.0,1300.0,290.19859,910.0,"None","None",0.0,3.128,4.15,11.305083999999999 -"0",176,115,291,"Ef "," -a",181070.0,890.0,7140.0,3.0," ","*","*",291.19438,950.0,"None","None",-5.24,0.0,0.0,10.005083999999998 -" ",175,116,291,"Eg "," -a",186310.0,850.0,7119.0,3.0,"B+",5240.0,1230.0,291.20001,910.0,"None","None",-6.1,4.218,5.24,11.005083999999998 -" ",174,117,291,"Eh "," -a",192410.0,880.0,7096.0,3.0,"B+",6100.0,1220.0,291.20656,950.0,"None","None",0.0,5.078,6.1,11.895083999999999 -"0",176,116,292,"Eg "," -a",186100.0,850.0,7123.0,3.0," ","*","*",292.19979,920.0,"None","None",-7.23,0.0,0.0,10.705084 -" ",175,117,292,"Eh "," -a",193330.0,940.0,7096.0,3.0,"B+",7230.0,1270.0,292.20755,1010.0,"None","None",0.0,6.208,7.23,11.595083999999998 -"0",175,118,293,"Ei "," -a",199960.0,1200.0,7074.0,4.0," ","*","*",293.21467,1290.0,"None","None",0.0,0.0,0.0,12.295084 +" ",169,110,279,"Ds "," -a",147980.0,740.0,7232.0,3.0,"B+",2490.0,1030.0,279.15886,800.0,"None","None",-3.36,1.468,2.49,9.605084 +" ",168,111,279,"Rg "," -a",151340.0,660.0,7218.0,2.0,"B+",3360.0,1000.0,279.16247,710.0,"None","None",-3.8,2.338,3.36,10.455084 +" ",167,112,279,"Cn "," -a",155140.0,490.0,7201.0,2.0,"B+",3800.0,830.0,279.16655,530.0,"None","None",0.0,2.778,3.8,10.965084 +"0",170,110,280,"Ds "," -a",148850.0,850.0,7232.0,3.0," ","*","*",280.1598,910.0,"None","None",-4.36,0.0,0.0,9.305083999999999 +" ",169,111,280,"Rg "," -a",153210.0,740.0,7214.0,3.0,"B+",4360.0,1130.0,280.16447,800.0,"None","None",-2.39,3.338,4.36,9.985083999999999 +" ",168,112,280,"Cn "," -a",155600.0,640.0,7203.0,2.0,"B+",2390.0,980.0,280.16704,690.0,"None","None",0.0,1.368,2.39,10.625084 +"0",171,110,281,"Ds "," -a",150960.0,730.0,7228.0,3.0," ","*","*",281.16206,780.0,"None","None",-3.08,0.0,0.0,8.955084 +" ",170,111,281,"Rg "," -a",154040.0,930.0,7214.0,3.0,"B+",3080.0,1180.0,281.16537,1000.0,"None","None",-3.65,2.058,3.08,9.635083999999999 +" ",169,112,281,"Cn "," -a",157690.0,990.0,7198.0,4.0,"B+",3650.0,1360.0,281.16929,1060.0,"None","None",0.0,2.628,3.65,10.285084 +"0",171,111,282,"Rg "," -a",156010.0,890.0,7210.0,3.0," ","*","*",282.16749,950.0,"None","None",-2.13,0.0,0.0,9.375084 +" ",170,112,282,"Cn "," -a",158140.0,710.0,7200.0,3.0,"B+",2120.0,1140.0,282.16977,760.0,"None","None",0.0,1.108,2.13,9.965084 +"0",172,111,283,"Rg "," -a",156880.0,780.0,7210.0,3.0," ","*","*",283.16842,840.0,"None","None",-3.14,0.0,0.0,8.965084 +" ",171,112,283,"Cn "," -a",160020.0,770.0,7196.0,3.0,"B+",3150.0,1090.0,283.17179,830.0,"None","None",-4.34,2.118,3.14,9.615084 +" ",170,113,283,"Nh "," -a",164360.0,730.0,7178.0,3.0,"B+",4340.0,1060.0,283.17645,780.0,"None","None",0.0,3.318,4.34,10.595083999999998 +"0",172,112,284,"Cn "," -a",160570.0,850.0,7197.0,3.0," ","*","*",284.17238,910.0,"None","None",-5.31,0.0,0.0,9.295084 +" ",171,113,284,"Nh "," -a",165880.0,800.0,7176.0,3.0,"B+",5310.0,1170.0,284.17808,860.0,"None","None",0.0,4.288,5.31,10.245083999999999 +"0",173,112,285,"Cn "," -a",162180.0,730.0,7195.0,3.0," ","*","*",285.17411,780.0,"None","None",-4.31,0.0,0.0,8.795084 +" ",172,113,285,"Nh "," -a",166490.0,980.0,7177.0,3.0,"B+",4310.0,1220.0,285.17873,1050.0,"None","None",-4.62,3.288,4.31,10.025084 +" ",171,114,285,"Fl "," -a",171110.0,1030.0,7158.0,4.0,"B+",4630.0,1420.0,285.1837,1110.0,"None","None",0.0,3.598,4.62,10.995083999999999 +"0",173,113,286,"Nh "," -a",168120.0,940.0,7174.0,3.0," ","*","*",286.18048,1010.0,"None","None",-3.14,0.0,0.0,9.685084 +" ",172,114,286,"Fl "," -a",171260.0,770.0,7161.0,3.0,"B+",3140.0,1210.0,286.18386,830.0,"None","None",0.0,2.118,3.14,10.695084 +"0",174,113,287,"Nh "," -a",168640.0,830.0,7176.0,3.0," ","*","*",287.18105,900.0,"None","None",-4.24,0.0,0.0,9.335083999999998 +" ",173,114,287,"Fl "," -a",172880.0,770.0,7158.0,3.0,"B+",4240.0,1140.0,287.1856,830.0,"None","None",-5.21,3.218,4.24,10.435084 +" ",172,115,287,"Mc "," -a",178090.0,790.0,7137.0,3.0,"B+",5200.0,1100.0,287.19119,850.0,"None","None",0.0,4.188,5.21,11.305083999999999 +"0",174,114,288,"Fl "," -a",172970.0,850.0,7161.0,3.0," ","*","*",288.18569,910.0,"None","None",-6.34,0.0,0.0,9.975083999999999 +" ",173,115,288,"Mc "," -a",179310.0,850.0,7136.0,3.0,"B+",6340.0,1210.0,288.19249,920.0,"None","None",0.0,5.318,6.34,11.005083999999998 +"0",175,114,289,"Fl "," -a",174450.0,730.0,7159.0,3.0," ","*","*",289.18728,790.0,"None","None",-5.06,0.0,0.0,9.845083999999998 +" ",174,115,289,"Mc "," -a",179510.0,1020.0,7139.0,4.0,"B+",5060.0,1260.0,289.19272,1100.0,"None","None",-5.73,4.038,5.06,10.595083999999998 +" ",173,116,289,"Lv "," -a",185240.0,1090.0,7116.0,4.0,"B+",5730.0,1490.0,289.19886,1170.0,"None","None",0.0,4.708,5.73,11.705084 +"0",175,115,290,"Mc "," -a",180840.0,980.0,7137.0,3.0," ","*","*",290.19414,1060.0,"None","None",-4.15,0.0,0.0,10.295084 +" ",174,116,290,"Lv "," -a",184990.0,840.0,7120.0,3.0,"B+",4140.0,1300.0,290.19859,910.0,"None","None",0.0,3.128,4.15,11.305083999999999 +"0",176,115,291,"Mc "," -a",181070.0,890.0,7140.0,3.0," ","*","*",291.19438,950.0,"None","None",-5.24,0.0,0.0,10.005083999999998 +" ",175,116,291,"Lv "," -a",186310.0,850.0,7119.0,3.0,"B+",5240.0,1230.0,291.20001,910.0,"None","None",-6.1,4.218,5.24,11.005083999999998 +" ",174,117,291,"Ts "," -a",192410.0,880.0,7096.0,3.0,"B+",6100.0,1220.0,291.20656,950.0,"None","None",0.0,5.078,6.1,11.895083999999999 +"0",176,116,292,"Lv "," -a",186100.0,850.0,7123.0,3.0," ","*","*",292.19979,920.0,"None","None",-7.23,0.0,0.0,10.705084 +" ",175,117,292,"Ts "," -a",193330.0,940.0,7096.0,3.0,"B+",7230.0,1270.0,292.20755,1010.0,"None","None",0.0,6.208,7.23,11.595083999999998 +"0",175,118,293,"Og "," -a",199960.0,1200.0,7074.0,4.0," ","*","*",293.21467,1290.0,"None","None",0.0,0.0,0.0,12.295084 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nucleardata/nucleardata.pytxcode new/tex/latex/nucleardata/nucleardata.pytxcode --- old/tex/latex/nucleardata/nucleardata.pytxcode 2016-04-02 23:57:34.000000000 +0200 +++ new/tex/latex/nucleardata/nucleardata.pytxcode 2016-11-25 19:33:56.000000000 +0100 @@ -378,7 +378,7 @@ nuc=Nucdata() =>PYTHONTEX:SETTINGS# -version=0.14 +version=0.15 outputdir=pythontex-files-nucleardata workingdir=. workingdirset=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nucleardata/nucleardata.sty new/tex/latex/nucleardata/nucleardata.sty --- old/tex/latex/nucleardata/nucleardata.sty 2016-04-02 23:57:34.000000000 +0200 +++ new/tex/latex/nucleardata/nucleardata.sty 2016-11-25 19:33:56.000000000 +0100 @@ -15,11 +15,11 @@ %% %% See http://www.latex-project.org/lppl.txt %% -%% Version Date: 04/01/2016 +%% Version Date: 10/18/2016 %% %% ---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{nucleardata}[2016/04/01 v1.01c LaTeX package for providing basic nuclear properties to documents efficiently] +\ProvidesPackage{nucleardata}[2016/10/18 v1.01d LaTeX package for providing basic nuclear properties to documents efficiently] \RequirePackage{pythontex} \RequirePackage{siunitx} @@ -485,6 +485,6 @@ %% nuccommandtest.tex, %% nuccommandtext.pdf %% -%% Version Date: 04/01/2016 +%% Version Date: 10/18/2016 %% %% End of file `nucleardata.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nucleardata.tlpobj new/tlpkg/tlpobj/nucleardata.tlpobj --- old/tlpkg/tlpobj/nucleardata.tlpobj 2016-04-14 19:30:36.000000000 +0200 +++ new/tlpkg/tlpobj/nucleardata.tlpobj 2017-04-14 17:52:35.000000000 +0200 @@ -1,6 +1,6 @@ name nucleardata category Package -revision 40216 +revision 42307 shortdesc Provides data about atomic nuclides for documents relocated 1 longdesc The package provides data and commands for including nuclear @@ -14,6 +14,7 @@ RELOC/tex/latex/nucleardata/nucleardata.pytxcode RELOC/tex/latex/nucleardata/nucleardata.sty catalogue-ctan /macros/latex/contrib/nucleardata -catalogue-date 2016-04-02 06:35:49 +0200 +catalogue-date 2016-10-19 19:49:06 +0200 catalogue-license lppl1.3 -catalogue-topics callback +catalogue-topics callback physics chemistry +catalogue-version 1.01d ++++++ 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 2016-04-14 19:30:37.000000000 +0200 +++ new/tlpkg/tlpobj/numberedblock.tlpobj 2017-04-14 17:52:36.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/numberedblock/numberedblock.sty catalogue-ctan /macros/latex/contrib/numberedblock -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:38.000000000 +0200 +++ new/tlpkg/tlpobj/numericplots.tlpobj 2017-04-14 17:52:36.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/numericplots/NumericPlots_styles.tex catalogue-also pst-plot pgfplots catalogue-ctan /graphics/pstricks/contrib/numericplots -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:38.000000000 +0200 +++ new/tlpkg/tlpobj/numname.tlpobj 2017-04-14 17:52:36.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=5 RELOC/tex/latex/numname/numname.sty catalogue-ctan /macros/latex/contrib/numname -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:30:40.000000000 +0200 +++ new/tlpkg/tlpobj/numprint.tlpobj 2017-04-14 17:52:37.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/latex/numprint/numprint.sty RELOC/tex/latex/numprint/numprint032.sty catalogue-ctan /macros/latex/contrib/numprint -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics numbers catalogue-version 1.39 ++++++ nwejm.doc.tar.xz ++++++ ++++ 5421 lines of diff (skipped) ++++++ nwejm.tar.xz ++++++ ++++ 3233 lines of diff (skipped) ++++++ 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 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/oberdiek/oberdiek.pdftexcmds.lua new/scripts/oberdiek/oberdiek.pdftexcmds.lua --- old/scripts/oberdiek/oberdiek.pdftexcmds.lua 2016-05-13 23:31:18.000000000 +0200 +++ new/scripts/oberdiek/oberdiek.pdftexcmds.lua 2017-03-26 23:48:50.000000000 +0200 @@ -9,7 +9,7 @@ -- This is a generated file. -- -- Project: pdftexcmds --- Version: 2016/05/10 v0.21 +-- Version: 2017/03/19 v0.25 -- -- Copyright (C) 2007, 2009-2011 by -- Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -41,7 +41,7 @@ module("oberdiek.pdftexcmds", package.seeall) local systemexitstatus function getversion() - tex.write("2016/05/10 v0.21") + tex.write("2017/03/19 v0.25") end function strcmp(A, B) if A == B then @@ -253,6 +253,7 @@ end local dump = filehandle:read(length) escapehex(dump) + filehandle:close() end end end @@ -270,6 +271,7 @@ if filehandle then local contents = filehandle:read("*a") escapehex(md5.sum(contents)) + filehandle:close() end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/oberdiek/pdftexcmds.lua new/scripts/oberdiek/pdftexcmds.lua --- old/scripts/oberdiek/pdftexcmds.lua 2016-05-11 23:38:01.000000000 +0200 +++ new/scripts/oberdiek/pdftexcmds.lua 2017-03-26 23:48:50.000000000 +0200 @@ -9,7 +9,7 @@ -- This is a generated file. -- -- Project: pdftexcmds --- Version: 2016/05/10 v0.21 +-- Version: 2017/03/19 v0.25 -- -- Copyright (C) 2007, 2009-2011 by -- Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -41,7 +41,7 @@ module("oberdiek.pdftexcmds", package.seeall) local systemexitstatus function getversion() - tex.write("2016/05/10 v0.21") + tex.write("2017/03/19 v0.25") end function strcmp(A, B) if A == B then @@ -253,6 +253,7 @@ end local dump = filehandle:read(length) escapehex(dump) + filehandle:close() end end end @@ -270,6 +271,7 @@ if filehandle then local contents = filehandle:read("*a") escapehex(md5.sum(contents)) + filehandle:close() end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/atbegshi.sty new/tex/generic/oberdiek/atbegshi.sty --- old/tex/generic/oberdiek/atbegshi.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/generic/oberdiek/atbegshi.sty 2016-11-25 19:33:35.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: atbegshi -%% Version: 2016/05/16 v1.17 +%% Version: 2016/06/09 v1.18 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver(a)atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2016/05/16 v1.17 At begin shipout hook (HO)]% + [2016/06/09 v1.18 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -470,8 +470,10 @@ \RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf - \def\AtBegShi@horigin{\pdfhorigin}% - \def\AtBegShi@vorigin{\pdfvorigin}% + \def\AtBegShi@horigin{% + \ifx\pdfhorigin\@undefined\pdfvariable horigin\else\pdfhorigin\fi}% + \def\AtBegShi@vorigin{% + \ifx\pdfvorigin\@undefined\pdfvariable vorigin\else\pdfvorigin\fi}% \else \def\AtBegShi(a)horigin{72.27pt}% \def\AtBegShi(a)vorigin{72.27pt}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/hobsub-generic.sty new/tex/generic/oberdiek/hobsub-generic.sty --- old/tex/generic/oberdiek/hobsub-generic.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/generic/oberdiek/hobsub-generic.sty 2017-03-26 23:48:50.000000000 +0200 @@ -3402,16 +3402,16 @@ \hobsub@StopPackage \hobsub@StartPackage{ifpdf} %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -\csname ver(a)ifpdf.sty\endcsname{#3}} +\csname ver\string @ifpdf.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{ifpdf} -[2016/05/14 v3.1 Provides the ifpdf switch] +[2017/03/15 v3.2 Provides the ifpdf switch] \expandafter\ifx\csname ifpdf\endcsname\relax \csname newif\expandafter\endcsname\csname ifpdf\endcsname \else @@ -4561,7 +4561,7 @@ \fi \expandafter\x\csname ver(a)pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4732,7 +4732,7 @@ if tex.enableprimitives then tex.enableprimitives( 'pdf@', -{'primitive', 'ifprimitive', 'pdfdraftmode'} +{'primitive', 'ifprimitive', 'pdfdraftmode','draftmode'} ) tex.enableprimitives('', {'luaescapestring'}) end @@ -4755,14 +4755,15 @@ \fi \fi } -\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX -\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX -\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX +\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX, luatex +\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX, luatex +\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% oldLuaTeX +\ifluatex\else \begingroup \expandafter\ifx\csname pdf@primitive\endcsname\relax \else @@ -4786,6 +4787,7 @@ \fi \fi \endgroup +\fi \begingroup \@PackageInfoNoLine{pdftexcmds}{% \string\pdf@primitive\space is % @@ -4867,6 +4869,9 @@ \fi } \ifluatex +\ifx\pdfdraftmode\@undefined +\let\pdfdraftmode\draftmode +\fi \else \pdf@isprimitive \fi @@ -4931,6 +4936,7 @@ \else \expandafter\pdftexcmds@AtEnd \fi% +\ifnum\luatexversion<80 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\TMP@RequirePackage#1[#2]{% @@ -4943,8 +4949,9 @@ \else \RequirePackage{luatex-loader}[2009/04/10]% \fi +\fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -4956,13 +4963,13 @@ \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup -\def\x{2016/05/10 v0.21}% +\def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5159,11 +5166,8 @@ \fi \ifnum\luatexversion<68 % \else -\def\pdf@shellescape{% -\directlua0{% - oberdiek.pdftexcmds.shellescape()% -}% -}% +\protected\edef\pdf@shellescape{% +\numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi \def\pdf@system#1{% \directlua0{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/hobsub-hyperref.sty new/tex/generic/oberdiek/hobsub-hyperref.sty --- old/tex/generic/oberdiek/hobsub-hyperref.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/generic/oberdiek/hobsub-hyperref.sty 2016-11-25 19:33:35.000000000 +0100 @@ -1470,7 +1470,7 @@ \fi \expandafter\x\csname ver(a)atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2016/05/16 v1.17 At begin shipout hook (HO)]% + [2016/06/09 v1.18 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -1837,8 +1837,10 @@ \RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf -\def\AtBegShi@horigin{\pdfhorigin}% -\def\AtBegShi@vorigin{\pdfvorigin}% +\def\AtBegShi@horigin{% +\ifx\pdfhorigin\@undefined\pdfvariable horigin\else\pdfhorigin\fi}% +\def\AtBegShi@vorigin{% +\ifx\pdfvorigin\@undefined\pdfvariable vorigin\else\pdfvorigin\fi}% \else \def\AtBegShi(a)horigin{72.27pt}% \def\AtBegShi(a)vorigin{72.27pt}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/ifpdf.sty new/tex/generic/oberdiek/ifpdf.sty --- old/tex/generic/oberdiek/ifpdf.sty 2016-05-15 23:39:17.000000000 +0200 +++ new/tex/generic/oberdiek/ifpdf.sty 2017-03-26 23:48:50.000000000 +0200 @@ -7,16 +7,16 @@ %% ifpdf.dtx (with options: `package') %% %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -\csname ver(a)ifpdf.sty\endcsname{#3}} +\csname ver\string @ifpdf.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{ifpdf} -[2016/05/14 v3.1 Provides the ifpdf switch] +[2017/03/15 v3.2 Provides the ifpdf switch] \expandafter\ifx\csname ifpdf\endcsname\relax \csname newif\expandafter\endcsname\csname ifpdf\endcsname \else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/pdfcol.sty new/tex/generic/oberdiek/pdfcol.sty --- old/tex/generic/oberdiek/pdfcol.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/generic/oberdiek/pdfcol.sty 2016-11-25 19:33:35.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdfcol -%% Version: 2016/05/16 v1.3 +%% Version: 2016/05/17 v1.4 %% %% Copyright (C) 2007 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver(a)pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% - [2016/05/16 v1.3 Handle new color stacks for pdfTeX (HO)]% + [2016/05/17 v1.4 Handle new color stacks for pdfTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -154,6 +154,9 @@ \RequirePackage{#1}[{#2}]% }% \fi +\ifx\pdfextension\@undefined\else + \PDFCOL@RequirePackage{luatex85}[2016/01/01] +\fi \PDFCOL@RequirePackage{ltxcmds}[2010/03/01] \ltx@newif\ifpdfcolAvailable \pdfcolAvailabletrue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/pdfrender.sty new/tex/generic/oberdiek/pdfrender.sty --- old/tex/generic/oberdiek/pdfrender.sty 2016-05-15 23:39:17.000000000 +0200 +++ new/tex/generic/oberdiek/pdfrender.sty 2016-11-25 19:33:35.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdfrender -%% Version: 2016/05/14 v1.3 +%% Version: 2016/05/17 v1.4 %% %% Copyright (C) 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver(a)pdfrender.sty\endcsname \ProvidesPackage{pdfrender}% - [2016/05/14 v1.3 Access to some PDF graphics parameters (HO)]% + [2016/05/17 v1.4 Access to some PDF graphics parameters (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -158,9 +158,6 @@ \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | -\ifx\pdfextension\@undefined\else - \RequirePackage{luatex85} -\fi \def\PdfRender@AtEndHook{} \expandafter\def\expandafter\PdfRender@AtEnd\expandafter{% \expandafter\PdfRender@AtEndHook @@ -202,6 +199,9 @@ \else \let\PdfRender@RequirePackage\RequirePackage \fi +\ifx\pdfextension\@undefined\else + \PdfRender@RequirePackage{luatex85}[2016/01/01] +\fi \PdfRender@RequirePackage{ifpdf}[2010/01/28] \PdfRender@RequirePackage{infwarerr}[2007/09/09] \PdfRender@RequirePackage{ltxcmds}[2010/01/28] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/oberdiek/pdftexcmds.sty new/tex/generic/oberdiek/pdftexcmds.sty --- old/tex/generic/oberdiek/pdftexcmds.sty 2016-05-11 23:38:01.000000000 +0200 +++ new/tex/generic/oberdiek/pdftexcmds.sty 2017-03-26 23:48:50.000000000 +0200 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdftexcmds -%% Version: 2016/05/10 v0.21 +%% Version: 2017/03/19 v0.25 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver(a)pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -275,7 +275,7 @@ if tex.enableprimitives then tex.enableprimitives( 'pdf@', - {'primitive', 'ifprimitive', 'pdfdraftmode'} + {'primitive', 'ifprimitive', 'pdfdraftmode','draftmode'} ) tex.enableprimitives('', {'luaescapestring'}) end @@ -298,14 +298,15 @@ \fi \fi } -\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX -\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX -\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX +\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX, luatex +\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX, luatex +\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% oldLuaTeX +\ifluatex\else \begingroup \expandafter\ifx\csname pdf@primitive\endcsname\relax \else @@ -329,6 +330,7 @@ \fi \fi \endgroup +\fi \begingroup \@PackageInfoNoLine{pdftexcmds}{% \string\pdf@primitive\space is % @@ -410,6 +412,9 @@ \fi } \ifluatex +\ifx\pdfdraftmode\@undefined + \let\pdfdraftmode\draftmode +\fi \else \pdf@isprimitive \fi @@ -474,20 +479,22 @@ \else \expandafter\pdftexcmds@AtEnd \fi% -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \def\TMP@RequirePackage#1[#2]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ver(a)#1.sty\endcsname\relax - \input #1.sty\relax - \fi - }% - \TMP@RequirePackage{luatex-loader}[2009/04/10]% -\else - \RequirePackage{luatex-loader}[2009/04/10]% +\ifnum\luatexversion<80 + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver(a)#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{luatex-loader}[2009/04/10]% + \else + \RequirePackage{luatex-loader}[2009/04/10]% + \fi \fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -499,13 +506,13 @@ \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup - \def\x{2016/05/10 v0.21}% + \def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -702,11 +709,8 @@ \fi \ifnum\luatexversion<68 % \else - \def\pdf@shellescape{% - \directlua0{% - oberdiek.pdftexcmds.shellescape()% - }% - }% + \protected\edef\pdf@shellescape{% + \numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi \def\pdf@system#1{% \directlua0{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-dvipdfm.def new/tex/latex/oberdiek/bkm-dvipdfm.def --- old/tex/latex/oberdiek/bkm-dvipdfm.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-dvipdfm.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2016/05/16 v1.25 bookmark driver for dvipdfm (HO)]% + [2016/05/17 v1.26 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-dvips.def new/tex/latex/oberdiek/bkm-dvips.def --- old/tex/latex/oberdiek/bkm-dvips.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-dvips.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2016/05/16 v1.25 bookmark driver for dvips (HO)]% + [2016/05/17 v1.26 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-dvipsone.def new/tex/latex/oberdiek/bkm-dvipsone.def --- old/tex/latex/oberdiek/bkm-dvipsone.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-dvipsone.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2016/05/16 v1.25 bookmark driver for dvipsone (HO)]% + [2016/05/17 v1.26 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-pdftex.def new/tex/latex/oberdiek/bkm-pdftex.def --- old/tex/latex/oberdiek/bkm-pdftex.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-pdftex.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2016/05/16 v1.25 bookmark driver for pdfTeX (HO)]% + [2016/05/17 v1.26 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-textures.def new/tex/latex/oberdiek/bkm-textures.def --- old/tex/latex/oberdiek/bkm-textures.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-textures.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -54,7 +54,7 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2016/05/16 v1.25 bookmark driver for textures (HO)]% + [2016/05/17 v1.26 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bkm-vtex.def new/tex/latex/oberdiek/bkm-vtex.def --- old/tex/latex/oberdiek/bkm-vtex.def 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bkm-vtex.def 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2016/05/16 v1.25 bookmark driver for VTeX (HO)]% + [2016/05/17 v1.26 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/bookmark.sty new/tex/latex/oberdiek/bookmark.sty --- old/tex/latex/oberdiek/bookmark.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/bookmark.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2016/05/16 v1.25 +%% Version: 2016/05/17 v1.26 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2016/05/16 v1.25 PDF bookmarks (HO)]% + [2016/05/17 v1.26 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -600,6 +600,11 @@ \providecommand*{\BookmarkDriverDefault}{dvips} \ifpdf \def\BKM@driver{pdftex}% + \ifx\pdfoutline\@undefined + \ifx\pdfextension\@undefined\else + \protected\def\pdfoutline{\pdfextension outline } + \fi + \fi \else \ifxetex \def\BKM@driver{dvipdfm}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/holtxdoc.sty new/tex/latex/oberdiek/holtxdoc.sty --- old/tex/latex/oberdiek/holtxdoc.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/holtxdoc.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: holtxdoc -%% Version: 2016/05/16 v0.26 +%% Version: 2016/05/17 v0.27 %% %% Copyright (C) 1999-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2016/05/16 v0.26 Private additional ltxdoc support (HO)] + [2016/05/17 v0.27 Private additional ltxdoc support (HO)] \PassOptionsToPackage{pdfencoding=auto}{hyperref} \RequirePackage[numbered]{hypdoc}[2010/03/26] \RequirePackage{hyperref}[2010/03/30] @@ -52,7 +52,7 @@ \ifluatex \RequirePackage{fontspec}[2011/09/18]% \RequirePackage{unicode-math}[2011/09/19]% - \setmathfont{lmmath-regular.otf}% + \setmathfont{latinmodern-math.otf}% \fi \ltx@IfUndefined{pdf@filemoddate}{% }{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/hypdestopt.sty new/tex/latex/oberdiek/hypdestopt.sty --- old/tex/latex/oberdiek/hypdestopt.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/hypdestopt.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hypdestopt -%% Version: 2016/05/16 v2.4 +%% Version: 2016/05/21 v2.5 %% %% Copyright (C) 2006-2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2016/05/16 v2.4 Hyperref destination optimizer (HO)]% + [2016/05/21 v2.5 Hyperref destination optimizer (HO)]% \newif\ifHypDest@Verbose \DeclareOption{verbose}{\HypDest@Verbosetrue} \def\HypDest@VerboseInfo#1{% @@ -174,6 +174,9 @@ hyperref 2006/06/01 v6.75a or later is required% }\@ehc }% +\ifx\pdfextension\@undefined\else + \protected\def\pdfdest{\pdfextension dest } +\fi \ifHypDest@name \let\HypDest@Org@DestName\Hy@DestName \renewcommand*{\Hy@DestName}[2]{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/hypdoc.sty new/tex/latex/oberdiek/hypdoc.sty --- old/tex/latex/oberdiek/hypdoc.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/hypdoc.sty 2017-03-26 23:48:50.000000000 +0200 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hypdoc -%% Version: 2016/05/16 v1.12 +%% Version: 2016/10/02 v1.13 %% %% Copyright (C) 2002, 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2016/05/16 v1.12 Hyper extensions for doc.sty (HO)]% + [2016/10/02 v1.13 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax @@ -149,7 +149,7 @@ \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHD@unique}% + {\listfigurename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -162,7 +162,7 @@ \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoftables}]% - {\contentsname}{toc\theHD@unique}% + {\listtablename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -244,7 +244,7 @@ \let\Hy@writebookmark\HDorg@writebookmark \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@glossary@prologue}]% - {\glossaryname}{glossary\theHD@unique}% + {\changehistoryname}{glossary\theHD@unique}% \endgroup \fi \HDorg@glossary@prologue @@ -252,6 +252,7 @@ \HDorg@theglossary } \providecommand*{\glossaryname}{Change History} +\providecommand*{\changehistoryname}{\glossaryname} \newcounter{HD@hypercount} \newlength{\HD@helplength} \newif\ifHD@savedest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/selinput.sty new/tex/latex/oberdiek/selinput.sty --- old/tex/latex/oberdiek/selinput.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/selinput.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: selinput -%% Version: 2016/05/16 v1.3 +%% Version: 2016/05/17 v1.4 %% %% Copyright (C) 2007 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{selinput} - [2016/05/16 v1.3 Semi-automatic input encoding detection (HO)]% + [2016/05/17 v1.4 Semi-automatic input encoding detection (HO)]% \RequirePackage{inputenc} \RequirePackage{kvsetkeys}[2006/10/19] \RequirePackage{stringenc}[2007/06/16] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-abspage.sty new/tex/latex/oberdiek/zref-abspage.sty --- old/tex/latex/oberdiek/zref-abspage.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-abspage.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2016/05/16 v2.25 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-abspos.sty new/tex/latex/oberdiek/zref-abspos.sty --- old/tex/latex/oberdiek/zref-abspos.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-abspos.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,18 +44,18 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2016/05/16 v2.25 Module abspos for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module abspos for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2016/05/16] +\RequirePackage{zref-savepos}[2016/05/21] \ifx\ZREF@savepos@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-pagelayout}[2016/05/16] +\RequirePackage{zref-pagelayout}[2016/05/21] \zref@addprop{savepos}{abspage} \RequirePackage{ifpdf}[2010/09/13] \newcommand*{\zref@absposx}[3]{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-base.sty new/tex/latex/oberdiek/zref-base.sty --- old/tex/latex/oberdiek/zref-base.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-base.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2016/05/16 v2.25 Module base for zref (HO)]% + [2016/05/21 v2.26 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-counter.sty new/tex/latex/oberdiek/zref-counter.sty --- old/tex/latex/oberdiek/zref-counter.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-counter.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2016/05/16 v2.25 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-dotfill.sty new/tex/latex/oberdiek/zref-dotfill.sty --- old/tex/latex/oberdiek/zref-dotfill.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-dotfill.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2016/05/16 v2.25 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2016/05/16] +\RequirePackage{zref-savepos}[2016/05/21] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-env.sty new/tex/latex/oberdiek/zref-env.sty --- old/tex/latex/oberdiek/zref-env.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-env.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-env}% - [2016/05/16 v2.25 Module env for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module env for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-hyperref.sty new/tex/latex/oberdiek/zref-hyperref.sty --- old/tex/latex/oberdiek/zref-hyperref.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-hyperref.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2016/05/16 v2.25 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-lastpage.sty new/tex/latex/oberdiek/zref-lastpage.sty --- old/tex/latex/oberdiek/zref-lastpage.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-lastpage.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,9 +44,9 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2016/05/16 v2.25 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] -\RequirePackage{zref-abspage}[2016/05/16] + [2016/05/21 v2.26 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] +\RequirePackage{zref-abspage}[2016/05/21] \RequirePackage{atveryend}[2009/12/07] \ifx\ZREF@base@ok Y% \else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-marks.sty new/tex/latex/oberdiek/zref-marks.sty --- old/tex/latex/oberdiek/zref-marks.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-marks.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2016/05/16 v2.25 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-nextpage.sty new/tex/latex/oberdiek/zref-nextpage.sty --- old/tex/latex/oberdiek/zref-nextpage.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-nextpage.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,15 +44,15 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2016/05/16 v2.25 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/16] -\RequirePackage{zref-thepage}[2016/05/16] -\RequirePackage{zref-lastpage}[2016/05/16] +\RequirePackage{zref-abspage}[2016/05/21] +\RequirePackage{zref-thepage}[2016/05/21] +\RequirePackage{zref-lastpage}[2016/05/21] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-pageattr.sty new/tex/latex/oberdiek/zref-pageattr.sty --- old/tex/latex/oberdiek/zref-pageattr.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-pageattr.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2016/05/16 v2.25 Module pageattr for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module pageattr for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -86,7 +86,7 @@ \def\zref@pdfpageattr#1{}% \def\zref@pdfpageattr@used#1{}% }{% - \RequirePackage{zref-thepage}[2016/05/16]% + \RequirePackage{zref-thepage}[2016/05/21]% \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}% \zref@addprop{thepage}{pdfpageattr}% \let\ZREF@temp=Y% @@ -98,7 +98,7 @@ \def\zref@pdfpagesattr{}% \def\zref@pdfpagesattr@used{}% }{% - \RequirePackage{zref-lastpage}[2016/05/16]% + \RequirePackage{zref-lastpage}[2016/05/21]% \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}% \zref@addprop{LastPage}{pdfpagesattr}% \let\ZREF@temp=Y% @@ -106,7 +106,7 @@ \ifx\ZREF@temp N% \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/16] +\RequirePackage{zref-abspage}[2016/05/21] \RequirePackage{atveryend}[2010/03/24] \RequirePackage{pdftexcmds}[2010/04/01] \let\ZREF@temp=Y% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-pagelayout.sty new/tex/latex/oberdiek/zref-pagelayout.sty --- old/tex/latex/oberdiek/zref-pagelayout.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-pagelayout.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2016/05/16 v2.25 Module pagelayout for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module pagelayout for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-thepage}[2016/05/16] +\RequirePackage{zref-thepage}[2016/05/21] \RequirePackage{ifluatex}[2010/03/01] \RequirePackage{atveryend}[2010/03/24] \ifluatex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-perpage.sty new/tex/latex/oberdiek/zref-perpage.sty --- old/tex/latex/oberdiek/zref-perpage.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-perpage.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2016/05/16 v2.25 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/16] +\RequirePackage{zref-abspage}[2016/05/21] \ZREF@NewPropPageValue \zref@newlist{perpage} \zref@addprops{perpage}{abspage,page,pagevalue} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-runs.sty new/tex/latex/oberdiek/zref-runs.sty --- old/tex/latex/oberdiek/zref-runs.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-runs.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2016/05/16 v2.25 Module runs for zref (HO)]% + [2016/05/21 v2.26 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-savepos.sty new/tex/latex/oberdiek/zref-savepos.sty --- old/tex/latex/oberdiek/zref-savepos.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-savepos.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,12 +44,17 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2016/05/16 v2.25 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi +\ifx\pdfsavepos\@undefined + \let\pdfsavepos \savepos + \let\pdflastxpos \lastxpos + \let\pdflastypos \lastypos +\fi \ltx@IfUndefined{pdfsavepos}{% \PackageError\ZREF@name{% \string\pdfsavepos\space is not supported.\MessageBreak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-thepage.sty new/tex/latex/oberdiek/zref-thepage.sty --- old/tex/latex/oberdiek/zref-thepage.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-thepage.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2016/05/16 v2.25 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{atbegshi}[2011/10/05] -\RequirePackage{zref-abspage}[2016/05/16] +\RequirePackage{zref-abspage}[2016/05/21] \zref@newlist{thepage} \zref@addprop{thepage}{page} \ZREF@NewPropPageValue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-titleref.sty new/tex/latex/oberdiek/zref-titleref.sty --- old/tex/latex/oberdiek/zref-titleref.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-titleref.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2016/05/16 v2.25 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-totpages.sty new/tex/latex/oberdiek/zref-totpages.sty --- old/tex/latex/oberdiek/zref-totpages.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-totpages.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2016/05/16 v2.25 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/16] -\RequirePackage{zref-lastpage}[2016/05/16] +\RequirePackage{zref-abspage}[2016/05/21] +\RequirePackage{zref-lastpage}[2016/05/21] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-user.sty new/tex/latex/oberdiek/zref-user.sty --- old/tex/latex/oberdiek/zref-user.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-user.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2016/05/16 v2.25 Module user for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module user for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref-xr.sty new/tex/latex/oberdiek/zref-xr.sty --- old/tex/latex/oberdiek/zref-xr.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref-xr.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2016/05/16 v2.25 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2016/05/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oberdiek/zref.sty new/tex/latex/oberdiek/zref.sty --- old/tex/latex/oberdiek/zref.sty 2016-05-19 00:01:00.000000000 +0200 +++ new/tex/latex/oberdiek/zref.sty 2016-11-25 19:33:56.000000000 +0100 @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/16 v2.25 +%% Version: 2016/05/21 v2.26 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2016/05/16 v2.25 A new reference scheme for LaTeX (HO)]% -\RequirePackage{zref-base}[2016/05/16] + [2016/05/21 v2.26 A new reference scheme for LaTeX (HO)]% +\RequirePackage{zref-base}[2016/05/21] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2016/05/16]% + \RequirePackage{zref-#1}[2016/05/21]% }% }% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oberdiek.tlpobj new/tlpkg/tlpobj/oberdiek.tlpobj --- old/tlpkg/tlpobj/oberdiek.tlpobj 2016-05-19 17:31:56.000000000 +0200 +++ new/tlpkg/tlpobj/oberdiek.tlpobj 2017-04-14 17:52:48.000000000 +0200 @@ -1,6 +1,6 @@ name oberdiek category Package -revision 41247 +revision 43610 shortdesc A bundle of packages submitted by Heiko Oberdiek relocated 1 longdesc The bundle comprises packages to provide: accsupp: better @@ -38,7 +38,7 @@ longdesc safely apply package patches; hycolor: implements the color longdesc option stuff that is used by packages hyperref and bookmark; longdesc hypbmsec: bookmarks in sectioning commands; hypcap: anjusting -longdesc anchors of captions; hypdestopt: optimising hyperref's pdftex +longdesc anchors of captions; hypdestopt: optimising hyperref's pdfTeX longdesc driver destinations; hypdoc: hyper-references in the LaTeX longdesc standard doc package; hypgotoe: experimental package for links longdesc to embedded files; hyphsubst: substitute hyphenation patterns; @@ -63,16 +63,16 @@ longdesc to access magic numbers by a hierarchical name system; longdesc makerobust: make a command robust; pagegrid: prints a page grid longdesc in the background; pagesel: select pages of a document for -longdesc output; pdfcolfoot: using pdftex's color stack for footnotes; +longdesc output; pdfcolfoot: using pdfTeX's color stack for footnotes; longdesc pdfcol: macros for setting and maintaining new color stacks; -longdesc pdfcolmk: PDFTeX COLour MarK -- fake a PDFTeX colour stack -longdesc using marks (not needed for PDFTeX 1.40.0 and later); +longdesc pdfcolmk: pdfTeX COLour MarK -- fake a pdfTeX colour stack +longdesc using marks (not needed for pdfTeX 1.40.0 and later); longdesc pdfcolparallel: fixes colour problems in package parallel; longdesc pdfcolparcolumns: fixes colour problems in package parcolumns; longdesc pdfcrypt: setting PDF encryption; pdfescape: pdfTeX's escape longdesc features using TeX or e-TeX; pdflscape: landscape pages in PDF; longdesc pdfrender: control PDF rendering modes; pdftexcmds: provide -longdesc PDFTeX primitives missing in LuaTeX; picture: dimens for +longdesc pdfTeX primitives missing in LuaTeX; picture: dimens for longdesc picture macros; pmboxdraw: poor man's box drawing characters; longdesc protecteddef: define a command that protected against longdesc expansion; refcount: using the numeric values of references; @@ -99,7 +99,7 @@ longdesc represented by two files, a .dtx (documented source) and a PDF longdesc file; the .ins file necessary for installation is extracted by longdesc running the .dtx file with Plain TeX. -runfiles size=701 +runfiles size=702 RELOC/bibtex/bib/oberdiek/oberdiek-bundle.bib RELOC/bibtex/bib/oberdiek/oberdiek-source.bib RELOC/scripts/oberdiek/luacolor-pre065.lua @@ -331,6 +331,6 @@ RELOC/tex/latex/oberdiek/zref-xr.sty RELOC/tex/latex/oberdiek/zref.sty catalogue-ctan /macros/latex/contrib/oberdiek -catalogue-date 2016-05-16 22:08:23 +0200 -catalogue-license lppl +catalogue-date 2017-03-19 14:31:51 +0100 +catalogue-license lppl1.3 catalogue-topics collection ++++++ 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 2016-04-14 19:31:02.000000000 +0200 +++ new/tlpkg/tlpobj/objectz.tlpobj 2017-04-14 17:52:49.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/latex/objectz/oz.sty catalogue-also zed-csp catalogue-ctan /macros/latex/contrib/objectz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:03.000000000 +0200 +++ new/tlpkg/tlpobj/obnov.tlpobj 2017-04-14 17:52:50.000000000 +0200 @@ -60,7 +60,7 @@ RELOC/tex/latex/obnov/lcyw.cmap RELOC/tex/latex/obnov/lcywobn.fd catalogue-ctan /fonts/obnov -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:05.000000000 +0200 +++ new/tlpkg/tlpobj/ocg-p.tlpobj 2017-04-14 17:52:51.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/ocg-p/ocg-p.sty catalogue-ctan /macros/latex/contrib/ocg-p -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:06.000000000 +0200 +++ new/tlpkg/tlpobj/ocgx.tlpobj 2017-04-14 17:52:51.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/ocgx/tikzlibraryocgx.code.tex catalogue-also asymptote catalogue-ctan /macros/latex/contrib/ocgx -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-12-28 10:23:26 +0100 +catalogue-license lppllppl 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 2016-03-24 23:28:05.000000000 +0100 +++ new/doc/latex/ocgx2/ChangeLog 2017-06-08 23:23:05.000000000 +0200 @@ -1,3 +1,58 @@ +2017-06-08 + * v0.29 : ocgx2.sty + * fix: wrong box number in internal macro, ocgcolorlinks broken for dvips + +2017-06-07 + * v0.28 : ocgx2.sty + * fix: hotfix from v0.27 replaced + +2017-06-07 + * v0.27 : ocgx2.sty + * fix: hotfix to cope with a change of \hbox:n in expl3 [2017/05/13] + +2017-05-12 + * v0.26 : ocgx2.sty + * fix: OCView, OCPrint (ocgcolorlinks related OCGs) settings saved for + possible re-opening by the user + +2017-04-25 + * v0.25 : ocgx2.sty + * new:OCG switching links (\showocg, \hideocg etc.) with hyperref look + & feel if hyperref is loaded (link border or colorlinks/ocgcolorlinks) + +2017-03-30 + * v0.24 : ocgx2.sty + * fix: \ocglinkprotect{...} messing up the graphics state (CTM) + +2017-03-30 + * v0.23 : ocgx2.sty + * v0.10 : ocgbase.sty + * fix: nested ocgcolorlinks over multiple pages + +2017-03-26 + * v0.22 : ocgx2.sty + * fix: nested ocgcolorlinks + +2017-03-23 + * v0.21 : ocgx2.sty + * v0.9 : ocgbase.sty + * fix: error when building document with nested OCGs + * new: ocgcolorlinks extending over line and page breaks + +2017-03-16 + * v0.20 : ocgx2.sty + * v0.8 : ocgbase.sty + * fix: compatibility with other pkgs (pdfbase, xsavebox, media9, animate) + +2017-03-09 + * v0.19 : ocgx2.sty + * v0.7 : ocgbase.sty + * fix: minor code fixes + +2017-03-07 + * v0.18 : ocgx2.sty + * fix: workaround for A-Reader bug when placing OCG switches on OCGs + 2016-03-22 * v0.17 : ocgx2.sty * new: option `ocgcolorlinks', enables OCG colour links for hyperref package 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 2016-03-24 23:28:05.000000000 +0100 +++ new/doc/latex/ocgx2/README 2017-03-30 23:32:38.000000000 +0200 @@ -1,7 +1,7 @@ ================================== The `ocgx2' LaTeX Package - Version 0.17 [2016/03/22] + https://github.com/agrahn/ocgx2 (C) 2015--\today Alexander Grahn ================================== @@ -21,22 +21,25 @@ * (Xe)LaTeX --> (x)dvipdfmx * pdfLaTeX, luaLaTeX -To enable dvipdfmx support, pass `dvipdfmx' globally as a class option. - - * 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 +To enable dvipdfmx support, pass `dvipdfmx' globally as a class option. + + * New features: + + + PDF layers extending over page breaks + + grouping PDF layers into Radio Button Groups + + re-implementing `hyperref`'s `ocgcolorlinks` option for creating + OCG coloured links, which are printed on paper in the default + text colour and which can, unlike the original `hyperref' + implementation, extend over line and page breaks. With + pdfLaTeX/LuaLaTeX, OCG links can be nested. + +Coloured OCG links are enabled with \usepackage{hyperref} % do NOT set [ocgcolorlinks] here! \usepackage[ocgcolorlinks]{ocgx2} @@ -126,6 +129,24 @@ See the `ocg-p' package manual for the meaning of `triggerocg=...'. +Breakable OCG coloured links work best with normal text as link text. If +the link text is mixed with graphical content, such as from external files or +inline graphics (e. g. TikZ) and even \fbox-ed text, these graphical parts must +be enclosed in + + \ocglinkprotect{...} + +For example: + + \href{http://ctan.org}{Visit me on + \ocglinkprotect{\includegraphics{ctan-lion}}!} + +Alternatively, the whole link can be placed inside + + \hypersetup{breaklinks=false}...\hypersetup{breaklinks=true} + +to temporarily disable breakable links. + * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/README.md new/doc/latex/ocgx2/README.md --- old/doc/latex/ocgx2/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ocgx2/README.md 2017-05-13 00:00:54.000000000 +0200 @@ -0,0 +1,168 @@ +# The `ocgx2` LaTeX Package + +© 2015--`\today`, Alexander Grahn + +https://github.com/agrahn/ocgx2 + +## Introduction + +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: + +- LaTeX ⇒ dvips ⇒ ps2pdf/Distiller +- (Xe)LaTeX ⇒ (x)dvipdfmx +- pdfLaTeX, LuaLaTeX + +Also, it adds some features, 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, a re-implementation of **`hyperref`**'s +**`ocgcolorlink`** option. + +To enable dvipdfmx support, pass **`dvipdfmx`** globally as a class option. + +---- + +*New features:* + ++ layers extending across **page breaks** ++ grouping layers into **Radio Button Groups** (`ocg` environment option **`radiobtngrp=...`**) ++ re-implementing **`hyperref`**'s **`ocgcolorlinks`** option + +for creating OCG coloured links, which are printed on paper in the default +text colour and which can, unlike the original `hyperref` implementation, +extend over **line** and **page breaks**. Moreover, with pdfLaTeX/LuaLaTeX, OCG +coloured links can be **nested**. + +Coloured OCG links are enabled with + +````latex +\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. + +Just say: +````latex +\usepackage[tikz]{ocgx2} +```` +instead of +````latex +\usepackage{tikz} +\usetikzlibrary{ocgx} +```` +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. + +## Usage + +````latex +\usepackage[<options>]{ocgx2} + +\begin{ocg}[<options>]{<layer name>}{<layer id>}{<initial visibility>} + ... material to be put on a PDF layer ... +\end{ocg} +```` +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 + +showingui +radiobtngrp = <group name> +tikz +ocgcolorlinks +```` +**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. + +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 +remaining options: +```` +texdoc ocg-p +```` + +---- + +Clickable links for switching PDF layer visibility are created with: +````latex +\switchocg{<layer IDs to toggle, space separated>}{<link text>} +\showocg{<layer IDs to switch ON, space separated>}{<link text>} +\hideocg{<layer IDs to switch OFF, space separated>}{<link text>} +\actionsocg{<IDs to toggle>}{<IDs to switch ON>}{<IDs to switch OFF>}{<link text>} +```` +For details about their usage, read the `ocgx` package manual: +```` +texdoc ocgx +```` +For compatibility with the `ocg-p` package, the following commands have +been provided: +````latex +\toggleocgs[triggerocg=...]{<layer IDs to toggle, space separated>}{<link text>} +\showocgs[triggerocg=...]{<layer IDs to switch ON, space separated>}{<link text>} +\hideocgs[triggerocg=...]{<layer IDs to switch OFF, space separated>}{<link text>} +\setocgs[triggerocg=...]{<IDs to toggle>}{<IDs to switch ON>}{<IDs to switch OFF>}{<link text>} +```` +See the `ocg-p` package manual for the meaning of `triggerocg=...`. + +---- + +Breakable OCG coloured links work best with normal text as link text. If the +link text is mixed with graphical content, such as from external files or +inline graphics (e. g. TikZ) and even `\fbox`-ed text, these graphical parts +must be enclosed in +````latex +\ocglinkprotect{...} +```` + +For example: +````latex +\href{http://ctan.org}{Visit me on \ocglinkprotect{\includegraphics{ctan-lion}}!} +```` + +Alternatively, the whole link can be placed inside +````latex +\hypersetup{breaklinks=false}...\hypersetup{breaklinks=true} +```` +to temporarily disable breakable links. + +## License + +This material is subject to the [LaTeX Project Public License](http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html +). + Binary files old/doc/latex/ocgx2/mailto.png and new/doc/latex/ocgx2/mailto.png differ 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 2016-04-14 19:31:06.000000000 +0200 +++ new/tlpkg/tlpobj/ocgx2.doc.tlpobj 2017-06-09 02:21:35.000000000 +0200 @@ -1,8 +1,10 @@ name ocgx2.doc category Package -revision 40126 +revision 44528 shortdesc doc files of ocgx2 relocated 1 -docfiles size=3 +docfiles size=6 RELOC/doc/latex/ocgx2/ChangeLog RELOC/doc/latex/ocgx2/README + RELOC/doc/latex/ocgx2/README.md + RELOC/doc/latex/ocgx2/mailto.png ++++++ 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 2016-03-12 00:41:22.000000000 +0100 +++ new/tex/latex/ocgx2/ocgbase.sty 2017-03-30 23:32:38.000000000 +0200 @@ -31,7 +31,7 @@ % #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) +% #3: initial visibility (1|0|true|false|on|off|visible|invisible) % % \ocgbase_last_ocg: % \ocgbase@last@ocg (LaTeX2e version) @@ -94,17 +94,30 @@ % The Current Maintainer of this work is A. Grahn. \RequirePackage{expl3} -\RequirePackage{atenddvi} \RequirePackage{pdfbase} -\ProvidesExplPackage{ocgbase}{2016/03/11}{0.6} +\def\g@ocgbase@date@tl{2017/03/30} +\def\g@ocgbase@version@tl{0.10} + +\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl} {support package for ocgx2.sty} +\msg_set:nnnn{ocgbase}{support~outdated}{ + Support~package~`#1'~too~old. +}{ + Get~an~up~to~date~version~of~`#1'.\\ + Aborting. +} +\@ifpackagelater{pdfbase}{2017/03/23}{}{ + \msg_error:nnn{ocgbase}{support~outdated}{pdfbase.sty} + \tex_endinput:D +} + \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{ +\pbs_at_end_dvi:n{ \tl_if_empty:NF\g_ocgbase_ocgs_tl{ %global OCG array \pbs_pdfobj:nnn{}{array}{\g_ocgbase_ocgs_tl} @@ -212,13 +225,14 @@ %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>>} + /Type/OCG/Name~(#1)~\str_if_eq_x:nnF{#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} + \str_if_eq_x_p:nn{#3}{false} || + \str_if_eq_x_p:nn{#3}{invisible} }{ \ocgbase_add_to_off_list:n{\pbs_pdflastobj:} } @@ -282,6 +296,25 @@ \cs_new_nopar:Nn\ocgbase_oc_bdc:n{\pbs_pdfbdc:nn{/OC}{#1}} \cs_new_nopar:Nn\ocgbase_oc_emc:{\pbs_pdfemc:} +%stack of PDF obj references of currently open OCGs +\seq_new:N\g_ocgbase_ocgstack_seq +%push OCG to stack +\cs_new_nopar:Nn\ocgbase_ocgstack_push:n{ + \seq_gpush:Nx\g_ocgbase_ocgstack_seq{#1}} +%pop OCG from stack into tl +\cs_new_nopar:Nn\ocgbase_ocgstack_pop:N{\seq_gpop:NN\g_ocgbase_ocgstack_seq#1} +%get top OCG on stack, without removing it +\cs_new_nopar:Nn\ocgbase_ocgstack_top:{ + \seq_item:Nn\g_ocgbase_ocgstack_seq{\c_one}} + +%command that inserts /OC <<OCMD with currently open OCGs>> entry; +%for use within annotation/xobject dicts +\cs_new_nopar:Nn\ocgbase_insert_oc:{ + \seq_if_empty:NF\g_ocgbase_ocgstack_seq{ + /OC~<</Type/OCMD/OCGs~[\seq_use:Nn\g_ocgbase_ocgstack_seq{~}]/P/AllOn>> + } +} + %l2e versions \cs_gset_eq:NN\ocgbase@new@ocg\ocgbase_new_ocg:nnn \cs_gset_eq:NN\ocgbase@last@ocg\ocgbase_last_ocg: @@ -291,3 +324,7 @@ \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: +\cs_gset_eq:NN\ocgbase@insert@oc\ocgbase_insert_oc: +\cs_gset_eq:NN\ocgbase@ocgstack@top\ocgbase_ocgstack_top: +\cs_gset_eq:NN\ocgbase@ocgstack@pop\ocgbase_ocgstack_pop:N +\cs_gset_eq:NN\ocgbase@ocgstack@push\ocgbase_ocgstack_push:n 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 2016-03-24 23:28:05.000000000 +0100 +++ new/tex/latex/ocgx2/ocgx2.sty 2017-06-08 23:23:05.000000000 +0200 @@ -37,12 +37,36 @@ \RequirePackage{xparse} \RequirePackage{l3keys2e} -\ProvidesExplPackage{ocgx2}{2016/03/22}{0.17} +\def\g@ocgxii@date@tl{2017/06/08} +\def\g@ocgxii@version@tl{0.29} + +\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl} {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx} %creating global definitions \cs_new:Npn\ocgxii@newkey#1#2{\tl_gset:cx{#1}{#2}} +\AtBeginDocument{ + \iow_now:Nx\@mainaux{ + \token_to_str:N\providecommand\token_to_str:N\ocgxii@newkey[2]{} + } + \iow_now:Nx\@mainaux{ + \token_to_str:N\providecommand\token_to_str:N\ocgxii@ocg@stack@on@page[2]{} + } + \iow_now:Nx\@mainaux{ + \token_to_str:N\providecommand + \token_to_str:N\ocgxii@lnkcol@stack@on@page[2]{} + } +} + +\msg_set:nnn{ocgx2}{missing~package}{ + Package~`#1'~must~be~loaded~before~ocgx2.\\\\ + Put\\\\ + \space\space\string\usepackage#2{#1}\\ + \space\space\string\usepackage[ocgcolorlinks]{ocgx2}\\\\ + to~the~preamble~of~your~document. +} + %package opts %unknown package option error message \msg_set:nnnn{ocgx2}{unknown~package~option}{Unknown~package~option~`#1'.}{ @@ -115,16 +139,6 @@ \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}{ @@ -135,9 +149,7 @@ \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} - } + \seq_gput_left:Nx\g_ocgxii_nested_seq{\ocgbase_ocgstack_top:} \ocgbase_add_to_order_list:n{[} } \bool_gset_true:N\g_ocgxii_nestedB_bool @@ -197,8 +209,8 @@ } } \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 + \ocgbase_ocgstack_push:n{\tl_use:c{ocgxii@#3}} + \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_ocgstack_seq \group_end: \ocgbase_oc_bdc:n{\tl_use:c{ocgxii@#3}} \ignorespaces @@ -212,14 +224,14 @@ \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_ocgstack_top: } }{ \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 + \ocgbase_ocgstack_pop:N\l_trash_tl + \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_ocgstack_seq \bool_gset_false:N\g_ocgxii_nestedB_bool \bool_gset_true:N\g_ocgxii_nestedE_bool } @@ -228,14 +240,15 @@ \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{ +\cs_new_nopar:Nn\ocgxii_stack_shipout:NN{ \iow_shipout_x:Nx\@mainaux{ - \token_to_str:N\ocgxii@stack@on@page{ + \token_to_str:N#1{ \exp_not:N\int_use:N\g_ocgxii_page_int - }{\seq_use:Nn#1{,}} + }{\seq_use:Nn#2{,}} } } -\cs_new_nopar:Npn\ocgxii@stack@on@page#1#2{ + +\cs_new_nopar:Npn\ocgxii@ocg@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}{ @@ -245,10 +258,49 @@ } } } -\ocgxii@stack@on@page{0}{} %initialize +\ocgxii@ocg@stack@on@page{0}{} %initialize -%end-of-page action in output routine -\cs_new_nopar:Nn\ocgxii_at_end_page:{ +\cs_new_nopar:Npn\ocgxii@lnkcol@stack@on@page#1#2{ + \seq_gset_from_clist:cn{g_pending_lnkcols_on_#1_seq}{#2} + %re-add braces around items + \seq_map_inline:cn{g_pending_lnkcols_on_#1_seq}{ + \seq_gpop_left:cN{g_pending_lnkcols_on_#1_seq}\l_trash_tl + \seq_gput_right:cn{g_pending_lnkcols_on_#1_seq}{{##1}} + } +} +\ocgxii@lnkcol@stack@on@page{0}{} %initialize + +%end-of-page action +\pbs_eop_action:n{ + \seq_if_exist:cT{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}{ + %check whether end-of-page link colour stack has settled + \iow_shipout:Nx\@mainaux{ + \token_to_str:N\ocgxii@newkey{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}{ + \seq_use:cn{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}{,} + } + } + \bool_if:nT{ + !\cs_if_exist:cTF{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}{ + \str_if_eq_x_p:nn{ + \tl_use:c{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int} + }{ + \seq_use:cn{g_pending_lnkcols_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 the colourlink opened last + \seq_get:cNT{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}\l_tmpa_tl{ + \tl_gset:Nx\g_ocgxii_lnkcol_tl{{\l_tmpa_tl}} + \ocgxii_colourlink_end: + } + } %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}{ @@ -274,20 +326,23 @@ %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: - } + }\l_tmpb_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{ +%begin-of-page action +\pbs_bop_action:n{ + % re-open all pending ocgs in original order + \seq_set_eq:Nc\l_ocgxii_pending_ocgs_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} + \seq_reverse:N\l_ocgxii_pending_ocgs_seq + \seq_map_variable:NNn\l_ocgxii_pending_ocgs_seq\l_tmpa_tl{ + \ocgbase_oc_bdc:n{\l_tmpa_tl} + } + % re-open the colourlink opened last + \seq_get:cNT{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}\l_tmpa_tl{ + \tl_gset:Nx\g_ocgxii_lnkcol_tl{{\l_tmpa_tl}} + \ocgxii_colourlink_begin: } \int_gincr:N\g_ocgxii_page_int % copy pending ocg stack from previous page, if it has not been initialized @@ -299,30 +354,16 @@ 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_ocgxii_ocgstack_seq - -%macro that inserts /OC <<OCMD with currently open OCGs>> entry; -%for use within annotation dicts -\cs_new_nopar:Npn\ocgxii@insert@OC{ - \seq_if_empty:NF\g_ocgxii_ocgstack_seq{ - /OC~<</Type/OCMD/OCGs~[\seq_use:Nn\g_ocgxii_ocgstack_seq{~}]/P/AllOn>> + %the same for link colour stack + \seq_if_exist:cF{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}{ + \seq_gset_eq:cc{ + g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq + }{ + g_pending_lnkcols_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq + } } } +\int_new:N\g_ocgxii_page_int %abs. page counter \cs_new_nopar:Nn\ocgxii_ocglist_reset:{ \tl_clear_new:N\l_ocgxii_u_list_tl @@ -373,157 +414,65 @@ \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 <</S/SetOCGState/State [ - \str_if_eq:VnF\l_ocgxii_u_list_tl{}{/Toggle~\l_ocgxii_u_list_tl}]>> - /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 <</S/SetOCGState/State [/Toggle~\l_ocgxii_u_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_d_list_tl{}{ - /D <</S/SetOCGState/State [/Toggle~\l_ocgxii_d_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_e_list_tl{}{ - /E <</S/SetOCGState/State [/Toggle~\l_ocgxii_e_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_x_list_tl{}{ - /X <</S/SetOCGState/State [/Toggle~\l_ocgxii_x_list_tl]>> - } - >> - }{\mbox{#3}} %Widget annots should not be broken across lines - \pbs_appendtofields:n{\pbs_pdflastann:} - \int_gincr:N\g_ocgxii_widcount_int - } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% re-implement commands from ocgx.sty (all engines including ps2pdf [gs>=9.15]) +% adding optional `*` (arg 1) -> non-breakable Button Widget & mouse-up trigger +% instead of plain (multiline) Link +% adding optional 2nd argument -> Button Widget with one of various mouse +% triggers +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\DeclareDocumentCommand\switchocg{s o m +m}{ + \ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{}{}{#4} } -\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 <</S/SetOCGState/State [ - \str_if_eq:VnF\l_ocgxii_u_list_tl{}{/ON~\l_ocgxii_u_list_tl}]>> - /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 <</S/SetOCGState/State [/ON~\l_ocgxii_u_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_d_list_tl{}{ - /D <</S/SetOCGState/State [/ON~\l_ocgxii_d_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_e_list_tl{}{ - /E <</S/SetOCGState/State [/ON~\l_ocgxii_e_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_x_list_tl{}{ - /X <</S/SetOCGState/State [/ON~\l_ocgxii_x_list_tl]>> - } - >> - }{\mbox{#3}} %Widget annots should not be broken across lines - \pbs_appendtofields:n{\pbs_pdflastann:} - \int_gincr:N\g_ocgxii_widcount_int - } +\DeclareDocumentCommand\showocg{s o m +m}{ + \ocgxii_actionsocg:nnnnnn{#1}{#2}{}{#3}{}{#4} } -\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 <</S/SetOCGState/State [ - \str_if_eq:VnF\l_ocgxii_u_list_tl{}{/OFF~\l_ocgxii_u_list_tl}]>> - /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 <</S/SetOCGState/State [/OFF~\l_ocgxii_u_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_d_list_tl{}{ - /D <</S/SetOCGState/State [/OFF~\l_ocgxii_d_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_e_list_tl{}{ - /E <</S/SetOCGState/State [/OFF~\l_ocgxii_e_list_tl]>> - } - \str_if_eq:VnF\l_ocgxii_x_list_tl{}{ - /X <</S/SetOCGState/State [/OFF~\l_ocgxii_x_list_tl]>> - } - >> - }{\mbox{#3}} %Widget annots should not be broken across lines - \pbs_appendtofields:n{\pbs_pdflastann:} - \int_gincr:N\g_ocgxii_widcount_int - } +\DeclareDocumentCommand\hideocg{s o m +m}{ + \ocgxii_actionsocg:nnnnnn{#1}{#2}{}{}{#3}{#4} } -\DeclareDocumentCommand\actionsocg{o m m m +m}{ +\DeclareDocumentCommand\actionsocg{s o m m m +m}{ + \ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{#4}{#5}{#6} +} + +\cs_new:Nn\ocgxii_actionsocg:nnnnnn{ \leavevmode - \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 <</S/SetOCGState - /State [ - \str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{ - /Toggle~\l_ocgxii_toswitch_u_tl}~ - \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_u_tl}~ - \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl} - ] - >> - /Border [0~0~0] - }{#5} - }{ - \ocgxii_ocglist_process_idlist:nn{#1}{#2} + \bool_if:nTF{#1 || \IfValueTF{#2}{\c_true_bool}{\c_false_bool}}{ + % implemented as Widget annot (non-breakable) + \ocgxii_ocglist_process_idlist:nn{ + \IfValueTF{#2}{#2}{triggerocg=onmouseup} + }{#3} \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} + \ocgxii_ocglist_process_idlist:nn{ + \IfValueTF{#2}{#2}{triggerocg=onmouseup} + }{#4} \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} + \ocgxii_ocglist_process_idlist:nn{ + \IfValueTF{#2}{#2}{triggerocg=onmouseup} + }{#5} \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 + \hbox_set:Nn\l_tmpa_box{#6} + \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 + }{ + /Subtype/Widget/Ff~65536/FT/Btn/BS<</W~0>> + \cs_if_exist:NT\@pdfhighlight{ + \ifx\@pdfhighlight\@empty\else/H\@pdfhighlight\fi + } /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 @@ -586,17 +535,49 @@ ]>> } >> - }{\mbox{#5}} %Widget annots should not be broken across lines + }\box_use_clear:N\l_tmpa_box \pbs_appendtofields:n{\pbs_pdflastann:} \int_gincr:N\g_ocgxii_widcount_int + }{ + \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#3} + \tl_set_eq:NN\l_ocgxii_toswitch_u_tl\l_ocgxii_u_list_tl + \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#4} + \tl_set_eq:NN\l_ocgxii_toshow_u_tl\l_ocgxii_u_list_tl + \ocgxii_ocglist_process_idlist:nn{triggerocg=onmouseup}{#5} + \tl_set_eq:NN\l_ocgxii_tohide_u_tl\l_ocgxii_u_list_tl + \pbs_pdflink:nn{ + /Subtype/Link + /A <</S/SetOCGState + /State [ + \str_if_eq:VnF{\l_ocgxii_toswitch_u_tl}{}{ + /Toggle~\l_ocgxii_toswitch_u_tl}~ + \str_if_eq:VnF{\l_ocgxii_toshow_u_tl}{}{/ON~\l_ocgxii_toshow_u_tl}~ + \str_if_eq:VnF{\l_ocgxii_tohide_u_tl}{}{/OFF~\l_ocgxii_tohide_u_tl} + ] + >> + %look and feel of hyperref links, if hyperref has been loaded + \cs_if_exist:NTF\Hy@setpdfborder{ + \Hy@setpdfborder\g_ocgxii_patch_tl + \ifx\@pdfhighlight\@empty\else/H\@pdfhighlight\fi + \ifx\@linkbordercolor\relax\else/C[\@linkbordercolor]\fi + \ifHy@pdfa /F~4\fi + }{ + /Border~[0~0~0] + } + }{ + \cs_if_exist:NTF\Hy@colorlink{ + \Hy@colorlink\@linkcolor#6\Hy@endcolorlink\Hy@VerboseLinkStop + }{#6} + } } } -% mimic commands from ocg-p -\let\toggleocgs\switchocg -\let\showocgs\showocg -\let\hideocgs\hideocg -\let\setocgs\actionsocg +%mimic commands from ocg-p +\cs_new:Npn\toggleocgs{\switchocg*} +\cs_new:Npn\showocgs{\showocg*} +\cs_new:Npn\hideocgs{\hideocg*} +\cs_new:Npn\setocgs{\actionsocg*} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \cs_new:Nn\ocgxii_process_ocgref:NN{ \str_if_eq_x:nnF{#2}{}{ @@ -672,93 +653,190 @@ Line~\msg_line_number: :~unknown~option~`#1'. } -% dvipdfmx and xelatex workaround for ocg buttons within `tikzpicture' context -\cs_new:Nn\ocgxii_pdflink:nn{ - \bool_if:nTF{ - \g_ocgxii_dvipdfmx_bool && \cs_if_exist_p:N\pgfpictureid - }{ - \hbox_set:Nn\l_tmpa_box{#2} - \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 - }{ - \pbs_pdflink:nn{#1}{#2} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% patch hyperref to ensure compatibility with our `ocgcolorlinks' option +% +% Plus: +% +% * add `ocgcolorlinks' support to all drivers +% +% * allows for `ocgcolorlinks' extending over +% +% line-breaks AND page-breaks +% +% with pdftex, luatex, xetex, dvipdfmx drivers +% +% based on Ben Lerner's solution +% http://tex.stackexchange.com/a/104227; +% with some improvements +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\sys_if_output_pdf:TF{ + \cs_new:Nn\ocgxii_literal_page:n{\pdfliteral~page~{#1}} +}{ + \bool_if:NT\g_ocgxii_dvipdfmx_bool{ %dvipdfmx/XeTeX + \cs_new:Nn\ocgxii_literal_page:n{\special{pdf:code~#1}} } } -\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_new_nopar:Nn\ocgxii_colourlink_begin:{} +\cs_new_nopar:Nn\ocgxii_colourlink_end:{} +\cs_new_nopar:Nn\ocgxii_colourlink_nobreak_begin:{ + \hbox_set:Nw\l_tmpa_box\color@begingroup + \tl_set_eq:NN\color@setgroup\group_begin: +} +\cs_new_nopar:Nn\ocgxii_colourlink_nobreak_end:{ + \color@endgroup\hbox_set_end: + \mbox{ + \ocgbase_oc_bdc:n{\ocgxii@OCPrint} + \hbox_to_zero:n{\box_use:N\l_tmpa_box\hss} + \ocgbase_oc_emc: + \ocgbase_oc_bdc:n{\ocgxii@OCView} + \group_begin: + \exp_after:wN\HyColor@UseColor\l_ocgxii_lnkcol_tl + \box_use_clear:N\l_tmpa_box + \group_end: + \ocgbase_oc_emc: + } +} + +\seq_new:N\g_ocgxii_lnk_color_seq %stack of colours of currently open links +\tl_new:N\g_ocgxii_patch_tl % `BorderArrayPatch' for dvips + +\bool_if:nTF{\sys_if_output_dvi_p: && !\g_ocgxii_dvipdfmx_bool}{ + % non-breakable links in dvips + \cs_new_nopar:Nn\ocgxii_enable_ocglinks:{ + \def\Hy@colorlink##1{ + \group_begin: + \tl_set:Nn\l_ocgxii_lnkcol_tl{##1} + \ocgxii_colourlink_nobreak_begin: + } + \def\Hy@endcolorlink{ + \ocgxii_colourlink_nobreak_end: + \group_end: } - }{ - \cs_if_exist:NF\g_ocgxii_rerunwarned_tl{ - \tl_new:N\g_ocgxii_rerunwarned_tl - \msg_warning:nn{ocgx2}{rerun} + } + \tl_gset:Nn\g_ocgxii_patch_tl{BorderArrayPatch} +}{ + % pdftex,luatex,xetex,dvipdfmx: + % ocgcolorlinks that extend over line and page breaks + \cs_new_nopar:Nn\ocgxii_enable_ocglinks:{ + \def\Hy@colorlink##1{ + \ifx\Hy@setbreaklinks\@gobble\else + \Hy@breaklinkstrue + \fi + \ifHy@breaklinks + \seq_get_left:NNT\g_ocgxii_lnk_color_seq\l_tmpa_tl{ + \tl_gset_eq:NN\g_ocgxii_lnkcol_tl\l_tmpa_tl + \ocgxii_colourlink_end: + } + \group_begin: + \ocgxii_colourlink_begin: + \seq_gpush:Nx\g_ocgxii_lnk_color_seq{{##1}} + \ocgxii_stack_shipout:NN\ocgxii@lnkcol@stack@on@page\g_ocgxii_lnk_color_seq + \else + \group_begin: + \tl_set:Nn\l_ocgxii_lnkcol_tl{##1} + \ocgxii_colourlink_nobreak_begin: + \fi + } + \def\Hy@endcolorlink{ + \ifHy@breaklinks + \seq_gpop:NN\g_ocgxii_lnk_color_seq\l_tmpa_tl + \tl_gset_eq:NN\g_ocgxii_lnkcol_tl\l_tmpa_tl + \ocgxii_stack_shipout:NN\ocgxii@lnkcol@stack@on@page\g_ocgxii_lnk_color_seq + \ocgxii_colourlink_end: + \group_end: + \seq_get_left:NNT\g_ocgxii_lnk_color_seq\l_tmpa_tl{ + \tl_gset_eq:NN\g_ocgxii_lnkcol_tl\l_tmpa_tl + \ocgxii_colourlink_begin: + } + \else + \ocgxii_colourlink_nobreak_end: + \group_end: + \fi + } + } + \cs_gset_nopar:Nn\ocgxii_colourlink_begin:{ + \ocgxii_literal_page:n{q~7~Tr} + } + \cs_gset_nopar:Nn\ocgxii_colourlink_end:{ + \vbox_to_zero:n{ + \vss + \hbox_to_zero:n{\skip_horizontal:n{2\paperwidth}.\hss} + \skip_vertical:n{2\paperheight} } + \ocgbase_oc_bdc:n{\ocgxii@OCPrint} + \ocgxii_literal_page:n{-88888~-88888~99999~99999~re~f} + \ocgbase_oc_emc: + \ocgbase_oc_bdc:n{\ocgxii@OCView} + \group_begin: + \exp_after:wN\HyColor@UseColor\g_ocgxii_lnkcol_tl + \ocgxii_literal_page:n{-88888~-88888~99999~99999~re~f} + \group_end: + \ocgbase_oc_emc: + \ocgxii_literal_page:n{0~Tr~Q} } } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% 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 +% user command for protecting graphical content (external file, inline +% [e. g. TikZ], \fbox{...}) inside breakable ocgcolorlink +\DeclareDocumentCommand\ocglinkprotect{m}{ + \seq_get_left:NNT\g_ocgxii_lnk_color_seq\l_tmpa_tl{ + \tl_gset_eq:NN\g_ocgxii_lnkcol_tl\l_tmpa_tl + \ocgxii_colourlink_end: + \group_begin: + \tl_set_eq:NN\l_ocgxii_lnkcol_tl\l_tmpa_tl + \ocgxii_colourlink_nobreak_begin: + } + #1 + \seq_get_left:NNT\g_ocgxii_lnk_color_seq\l_tmpa_tl{ + \ocgxii_colourlink_nobreak_end: + \group_end: + \vbox_to_zero:n{ % avoid mixing up CTM + \vss + \hbox_to_zero:n{\skip_horizontal:n{2\paperwidth}.\hss} + \skip_vertical:n{2\paperheight} } - \endgroup + \ocgxii_colourlink_begin: } } -\RequirePackage{scrlfile} \bool_if:NT\l_ocgxii_ocgcolorlinks_bool{ - \PassOptionsToPackage{colorlinks}{hyperref} - \AfterPackage*{hyperref}{ + \@ifpackageloaded{hyperref}{ \Hy@colorlinkstrue - \Hy@AtBeginDocument{ + \AtBeginDocument{ \ocgbase_new_ocg:nnn{OCView}{/Print<</PrintState/OFF>>}{on} - \tl_gset:Nx\OBJ@OCG@view{\ocgbase_last_ocg:} + \tl_gset:Nx\ocgxii@OCView{\ocgbase_last_ocg:} + \tl_gset:cx{ocgxii@OCView.opts}{showingui=never,printocg=never} \ocgbase_new_ocg:nnn{OCPrint}{/Print<</PrintState/ON>>}{off} - \tl_gset:Nx\OBJ@OCG@print{\ocgbase_last_ocg:} + \tl_gset:Nx\ocgxii@OCPrint{\ocgbase_last_ocg:} + \tl_gset:cx{ocgxii@OCPrint.opts}{showingui=never,printocg=always} \ocgxii_enable_ocglinks: + \iow_now:Nx\@mainaux{ + \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{\ocgxii@OCView} + } + \iow_now:Nx\@mainaux{ + \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{\ocgxii@OCPrint} + } } + }{ + \msg_error:nnn{ocgx2}{missing~package}{hyperref} } } + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% tikz related code follows (to be 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 \RequirePackage{tikz} \usetikzlibrary{calc} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Copyright notice: The code that follows until the end of the file was -% taken from Paul Gaborit's `tikzlibraryocgx.code.tex' with minor modification. +% taken from Paul Gaborit's `tikzlibraryocgx.code.tex' with minor additions. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \tikzset{ ocg/.style={ocg/.cd,#1,/tikz/.cd}, ocg={ @@ -773,14 +851,18 @@ status/false/.style={visibility=0}, status/on/.style={visibility=1}, status/off/.style={visibility=0}, + status/1/.style={visibility=1}, + status/0/.style={visibility=0}, % default values name=, opts=, - status=visible, + status=on, % ref ref/.style={ /tikz/execute at begin scope={% - \begin{ocg}[\ocgxii@opts]{\ocgxii@name}{#1}{\ocgxii@visibility}}, + \begin{ocg}[\ocgxii@opts]{% + \ifx\empty\ocgxii@name\empty#1\else\ocgxii@name\fi% + }{#1}{\ocgxii@visibility}}, /tikz/execute at end scope={\end{ocg}}, }, }, @@ -794,7 +876,7 @@ in (path picture bounding box.center) node[inner sep=0pt,anchor=center,outer sep=0pt] - {\switchocg{#1}{\phantom{\rule{\x3}{\y3}}}}; + {\switchocg*{#1}{\phantom{\rule{\x3}{\y3}}}}; } }, }, @@ -842,7 +924,7 @@ in (path picture bounding box.center) node[inner sep=0pt,anchor=center] - {\showocg{#1}{\phantom{\rule{\x3}{\y3}}}}; + {\showocg*{#1}{\phantom{\rule{\x3}{\y3}}}}; }, }, }, @@ -856,7 +938,7 @@ in (path picture bounding box.center) node[inner sep=0pt,anchor=center] - {\hideocg{#1}{\phantom{\rule{\x3}{\y3}}}}; + {\hideocg*{#1}{\phantom{\rule{\x3}{\y3}}}}; }, }, }, @@ -870,7 +952,7 @@ in (path picture bounding box.center) node[inner sep=0pt,anchor=center] - {\actionsocg{#1}{#2}{#3}{\phantom{\rule{\x3}{\y3}}}}; + {\actionsocg*{#1}{#2}{#3}{\phantom{\rule{\x3}{\y3}}}}; }, }, }, 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 2016-04-14 19:31:06.000000000 +0200 +++ new/tlpkg/tlpobj/ocgx2.tlpobj 2017-06-09 02:21:35.000000000 +0200 @@ -1,21 +1,23 @@ name ocgx2 category Package -revision 40126 -shortdesc Drop-in replacement for the 'ocgx' package; adds support for dvips+ps2pdf, XeLaTeX, dvipdfmx +revision 44528 +shortdesc Drop-in replacement for 'ocgx' and 'ocg-p' 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 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 +longdesc This package serves as a drop-in replacement for the packages +longdesc ocgx by Paul Gaborit and ocg-p by Werner Moshammer for the +longdesc creation of PDF Layers. It re-implements the functionality of +longdesc the ocg, ocgx, and ocg-p packages and adds support for all +longdesc known 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=12 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 2016-03-22 13:44:20 +0100 +catalogue-date 2017-06-08 16:04:35 +0200 catalogue-license lppl1.3 catalogue-topics pdf-feat -catalogue-version 0.17 +catalogue-version 0.29 ++++++ 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 2016-04-14 19:31:06.000000000 +0200 +++ new/tlpkg/tlpobj/ocherokee.tlpobj 2017-04-14 17:52:51.000000000 +0200 @@ -35,6 +35,6 @@ RELOC/tex/lambda/ocherokee/ocherokee.sty catalogue-also omega catalogue-ctan /language/cherokee/ocherokee -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:07.000000000 +0200 +++ new/tlpkg/tlpobj/ocr-b-outline.tlpobj 2017-04-14 17:52:51.000000000 +0200 @@ -23,6 +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 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:06.000000000 +0200 +++ new/tlpkg/tlpobj/ocr-b.tlpobj 2017-04-14 17:52:51.000000000 +0200 @@ -26,6 +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 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:07.000000000 +0200 +++ new/tlpkg/tlpobj/ocr-latex.tlpobj 2017-04-14 17:52:52.000000000 +0200 @@ -15,6 +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 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:08.000000000 +0200 +++ new/tlpkg/tlpobj/octavo.tlpobj 2017-04-14 17:52:52.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/latex/octavo/oct12.clo RELOC/tex/latex/octavo/octavo.cls catalogue-ctan /macros/latex/contrib/octavo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics book-pub class catalogue-version 1.2 ++++++ odsfile.doc.tar.xz ++++++ ++++++ odsfile.tar.xz ++++++ 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 2016-04-14 19:31:08.000000000 +0200 +++ new/tlpkg/tlpobj/odsfile.tlpobj 2017-04-14 17:52:52.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/lualatex/odsfile/odsfile.lua RELOC/tex/lualatex/odsfile/odsfile.sty catalogue-ctan /macros/luatex/latex/odsfile -catalogue-date 2015-09-23 16:15:56 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 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 2016-04-14 19:31:09.000000000 +0200 +++ new/tlpkg/tlpobj/ofs.tlpobj 2017-04-14 17:52:52.000000000 +0200 @@ -49,6 +49,6 @@ RELOC/tex/generic/ofs/txfn.tex catalogue-also plnfss font-selection fontch catalogue-ctan /macros/generic/ofs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:09.000000000 +0200 +++ new/tlpkg/tlpobj/ogham.tlpobj 2017-04-14 17:52:52.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/fonts/source/public/ogham/ogham.mf RELOC/fonts/tfm/public/ogham/ogham.tfm catalogue-ctan /fonts/ogham -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:10.000000000 +0200 +++ new/tlpkg/tlpobj/oinuit.tlpobj 2017-04-14 17:52:53.000000000 +0200 @@ -36,6 +36,6 @@ RELOC/tex/lambda/oinuit/litenc.def RELOC/tex/lambda/oinuit/oinuit.sty catalogue-ctan /language/inuktitut/oinuit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics other-lang omega ++++++ old-arrows.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/old-arrows/README new/doc/fonts/old-arrows/README --- old/doc/fonts/old-arrows/README 2015-10-13 00:17:16.000000000 +0200 +++ new/doc/fonts/old-arrows/README 2017-01-06 00:01:04.000000000 +0100 @@ -1,16 +1,19 @@ -The old-arrows package v1.2 2015/10/11 +The old-arrows package v2.0 2017/01/05 -------------------------------------------------------------------------- Riccardo Dossena Email: riccardo.dossena(a)gmail.com -------------------------------------------------------------------------- -copyright 2015 by Riccardo Dossena +copyright 2015-2017 by Riccardo Dossena This package provides cm old-style arrows with smaller arrowheads, associated with ordinary LaTeX commands. It can be used in a document that contains other amssymb arrow characters, like \twoheadrightarrow, -which also have small arrowheads. The option `new' allows to use the -usual new-style cm arrows together with the old-style ones: -simply put \var before every arrow command. +which also have small arrowheads. The options `new' and `old' allow the +user to use the usual new-style cm arrows together with the old-style +ones. The option `new' allows you to maintain the old-style by default +and get the old-style by putting \var before every command; conversely, +the option `old' allows you to maintain the new-style by default and get +the old-style by putting \var before every command. This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -22,7 +25,7 @@ This work has the LPPL maintenance status `maintained'. -The Current Maintainer of this work is Riccardo Dossena +The Current Maintainer of this work is Riccardo Dossena. Old Arrows fonts were derived from an old version of Blue Sky Computer Modern Math Symbols (1991-1992, released by AMS) Binary files old/doc/fonts/old-arrows/old-arrows-italian.pdf and new/doc/fonts/old-arrows/old-arrows-italian.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/old-arrows/old-arrows-italian.tex new/doc/fonts/old-arrows/old-arrows-italian.tex --- old/doc/fonts/old-arrows/old-arrows-italian.tex 2015-10-13 00:17:16.000000000 +0200 +++ new/doc/fonts/old-arrows/old-arrows-italian.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,12 +1,10 @@ %% start of file `old-arrows-italian.tex'. -%% Copyright 2015 Riccardo Dossena (riccardo.dossena(a)gmail.com). +%% Copyright 2015-2017 Riccardo Dossena (riccardo.dossena(a)gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, % available at http://www.latex-project.org/lppl/. %% -% !TEX encoding = UTF-8 -% !TEX program = pdflatex \documentclass[11pt,a4paper]{ltxdoc} \usepackage[utf8]{inputenc} @@ -18,13 +16,13 @@ \usepackage{stmaryrd} \usepackage{mathtools} \usepackage[new]{old-arrows} -\usepackage[hmargin=3.3cm,vmargin=3.1cm,footskip=20pt]{geometry} +\usepackage[hmargin=3.3cm,vmargin=2.5cm,footskip=30pt]{geometry} \usepackage[colorlinks=true]{hyperref} \usepackage[all]{hypcap} % needed to help hyperlinks direct correctly; \usepackage[chicago]{ellipsis} -\def\fileversion{1.2} -\def\filedate{11 ottobre 2015} +\def\fileversion{2.0} +\def\filedate{5 gennaio 2017} %Logo per MiKTeX e TeXLive \newcommand{\MiKTeX}{MiK\TeX} @@ -118,10 +116,11 @@ appaiono molto dissimili da $\varto$. Il pacchetto \texttt{old-arrows}, con la famiglia di font Old Arrows, consente di usare le frecce vecchio -stile ($\to$, $\gets$, \ldots) associandole ai comandi tradizionali (\verb|\rightarrow|, -\verb|\leftarrow|, \ldots). Inoltre, l'opzione \texttt{new} permette di ottenere simultaneamente le frecce -nuovo stile ($\varto$, $\vargets$, \ldots) semplicemente anteponendo \verb|\var| ai comandi corrispondenti -(\verb|\varrightarrow|, \verb|\varleftarrow|, \ldots). +stile ($\to$, $\gets$, \ldots) associandole ai comandi tradizionali (\verb|\rightarrow|, \verb|\leftarrow|, +\ldots). Inoltre, le opzioni \texttt{new} e \texttt{old} permettono di ottenere le frecce nuovo stile +($\varto$, $\vargets$, \ldots) insieme a quelle vecchio stile, semplicemente anteponendo \verb|\var| ai +comandi corrispondenti (\verb|\varrightarrow|, \verb|\varleftarrow|, \ldots)\footnote{Vedi le sezioni +\ref{sec:new} e \ref{sec:old}.}. La famiglia di font Old Arrows deriva da una vecchia versione dei \foreignlanguage{english}{Blue Sky Computer Modern Math Symbols} (1991-1992, rilasciati da AMS) tramite la cancellazione con FontForge di @@ -135,6 +134,9 @@ \section{Installazione} +Il pacchetto \texttt{old-arrows} è contenuto nelle distribuzioni \MiKTeX\ e \TeXLive\ più recenti. Tuttavia, +se si vuole procedere all'installazione manuale, seguire le indicazioni fornite di seguito. + \subsection{Copiare i file nell'albero locale del sistema \TeX} I file della famiglia Old Arrows sono: @@ -259,7 +261,7 @@ \end{table} I comandi \verb|\rightarrowfill| e \verb|\leftarrowfill| consentono di riempire spazi vuoti con frecce -estendibili. Per esempio, il primo comando dato alla fine di questo stesso paragrafo produce: +estendibili. Per esempio, il primo comando dato alla fine di questo stesso paragrafo produce: \rightarrowfill \subsection{Uso con altri pacchetti} @@ -384,7 +386,7 @@ \end{verbatim} \end{nota} -\subsection{L'opzione \textsf{new}} +\subsection{L'opzione \textsf{new}}\label{sec:new} Caricando \texttt{old-arrows} con l'opzione \texttt{new} \begin{verbatim} @@ -477,6 +479,27 @@ \end{center} producono rispettivamente $\boldsymbol{A \varto B}$ e $\boldsymbol{\varoverrightarrow{AB}}$. +\subsection{L'opzione \textsf{old}}\label{sec:old} + +Qualora si volesse usare il vecchio stile solo in alcuni casi, mantenendo di default il nuovo stile, è +disponibile l'opzione \texttt{old} +\begin{verbatim} + \usepackage[old]{old-arrows} +\end{verbatim} +che associa a tutti i comandi con prefisso \verb|\var| il vecchio stile anziché il nuovo, il quale rimane +associato ai comandi ordinari. Per esempio, con l'opzione \texttt{old} i comandi +\begin{center} + \verb|$A \varleftarrow B$| \quad e \quad \verb|$A \varto B$| +\end{center} +producono rispettivamente $A \leftarrow B$ e $A \to B$, mentre +\begin{center} + \verb|$A \leftarrow B$| \quad e \quad \verb|$A \to B$| +\end{center} +producono rispettivamente $A \varleftarrow B$ e $A \varto B$. + +Non è possibile caricare contemporaneamente le opzioni \texttt{new} e \texttt{old} (nel caso, si otterrà un +messaggio di errore). + \subsection{Comandi aggiuntivi disponibili con \texttt{old-arrows}} Il pacchetto \texttt{old-arrows} fornisce comandi aggiuntivi per nuovi tipi di frecce, come mostra la Binary files old/doc/fonts/old-arrows/old-arrows.pdf and new/doc/fonts/old-arrows/old-arrows.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/old-arrows/old-arrows.tex new/doc/fonts/old-arrows/old-arrows.tex --- old/doc/fonts/old-arrows/old-arrows.tex 2015-10-13 00:17:16.000000000 +0200 +++ new/doc/fonts/old-arrows/old-arrows.tex 2017-01-06 00:01:04.000000000 +0100 @@ -1,12 +1,10 @@ %% start of file `old-arrows.tex'. -%% Copyright 2015 Riccardo Dossena (riccardo.dossena(a)gmail.com). +%% Copyright 2015-2017 Riccardo Dossena (riccardo.dossena(a)gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, % available at http://www.latex-project.org/lppl/. %% -% !TEX encoding = UTF-8 -% !TEX program = pdflatex \documentclass[11pt]{ltxdoc} \usepackage[english]{babel} @@ -16,13 +14,13 @@ \usepackage{stmaryrd} \usepackage{mathtools} \usepackage[new]{old-arrows} -\usepackage[hmargin=3.3cm,vmargin=3.0cm,footskip=20pt]{geometry} +\usepackage[hmargin=3.3cm,vmargin=2.5cm,footskip=30pt]{geometry} \usepackage[colorlinks=true]{hyperref} \usepackage[all]{hypcap} % needed to help hyperlinks direct correctly; \usepackage[chicago]{ellipsis} -\def\fileversion{1.2} -\def\filedate{October 11, 2015} +\def\fileversion{2.0} +\def\filedate{January 5, 2017} %Logo per MiKTeX e TeXLive \newcommand{\MiKTeX}{MiK\TeX} @@ -113,11 +111,12 @@ $\rightarrowtail$, $\twoheadrightarrow$ and others, maintained a small arrowhead and seem too different from $\varto$. -The \texttt{old-arrows} package with Old Arrows font family allows to use the old-style arrows ($\to$, -$\gets$, \ldots) with the traditional commands (\verb|\rightarrow|, \verb|\leftarrow|, \ldots). Furthermore, -the option \texttt{new} allows to obtain simultaneously the new-style arrows ($\varto$, $\vargets$, \ldots) -just placing \verb|\var| before the corresponding commands (\verb|\varrightarrow|, -\verb|\varleftarrow|,~\ldots). +The \texttt{old-arrows} package with Old Arrows font family allows the user to use the old-style arrows +($\to$, $\gets$, \ldots) with the traditional commands (\verb|\rightarrow|, \verb|\leftarrow|,~\ldots). +Furthermore, the options \texttt{new} and \texttt{old} allow the user to obtain the new-style arrows +($\varto$, $\vargets$,~\ldots) together with the old-style ones by putting \verb|\var| before the +corresponding commands (\verb|\varrightarrow|, \verb|\varleftarrow|,~\ldots)\footnote{See sections +\ref{sec:new} and \ref{sec:old}.}. Old Arrows font family was derived from an old version of Blue Sky Computer Modern Math Symbols (1991--1992, released by AMS) by deleting many characters with FontForge. @@ -130,6 +129,9 @@ \section{Installation} +The \texttt{old-arrows} package is included in the latest \MiKTeX\ and \TeXLive\ distributions. However, if +you want to install it manually, follow the instructions below. + \subsection{Copying the files in the local \texttt{texmf} tree} The Old Arrows fonts files are: @@ -264,10 +266,10 @@ \usepackage{old-arrows} \end{verbatim} -The \texttt{amsmath} package makes additional over, under (table~\ref{tab-frecce-vecchie-amsmath}), -extensible (table~\ref{tab-frecce-vecchie-ext}) arrows and operator names (table~\ref{tab-operatori-vecchi}) -available. Note that \texttt{amsmath} adds more space between the arrow above and the characters below, with -a better typographical result. The commands \verb|\overrightarrow{AB}| and \verb|\overleftarrow{AB}|, without +The \texttt{amsmath} package provides over, under (table~\ref{tab-frecce-vecchie-amsmath}), extensible +(table~\ref{tab-frecce-vecchie-ext}) arrows and operator names (table~\ref{tab-operatori-vecchi}). Note that +\texttt{amsmath} adds more space between the arrow above and the characters below, with a better +typographical result. The commands \verb|\overrightarrow{AB}| and \verb|\overleftarrow{AB}|, without \texttt{amsmath}, produce respectively \[ \overrightfreccia{AB} \,\text{ rather than }\, \overrightarrow{AB} \qquad \text{and} \qquad @@ -275,8 +277,8 @@ \,\text{ rather than }\, \overleftarrow{AB}. \] -The \texttt{amsmath} package provides the command \verb|\boldsymbol| that allows bold mathematical symbols, -which can be used together with \texttt{old-arrows}. For example, the commands +The \texttt{amsmath} package also provides the command \verb|\boldsymbol| for obtaining bold mathematical +symbols, which can be used together with \texttt{old-arrows}. For example, the commands \begin{center} \verb|$\boldsymbol{A \to B}$| \quad and \quad \verb|$\boldsymbol{\overrightarrow{AB}}$| \end{center} @@ -324,7 +326,7 @@ The \texttt{stmaryrd} package provides several arrow characters with small arrowheads, like \verb|\shortrightarrow| ($\shortrightarrow$) and \verb|\nnearrow| ($\nnearrow$). However, without \texttt{old-arrows}, the commands \verb|\mapsfrom| and \verb|\longmapsfrom| produce the new-style arrows -$\varmapsfrom$ and $\varlongmapsfrom$. Instead, the \texttt{old-arrows} package allows to obtain the +$\varmapsfrom$ and $\varlongmapsfrom$. Instead, the \texttt{old-arrows} package allows you to obtain the old-style version of these arrows, as shown in table~\ref{tab-frecce-vecchie-smr}. \begin{table}[!htbp] @@ -334,7 +336,7 @@ \caption{Old-style arrows provided by \texttt{stmaryrd}.}\label{tab-frecce-vecchie-smr} \end{table} -\pagebreak +%\pagebreak \subsubsection{\texttt{mathtools}} @@ -382,13 +384,13 @@ \end{remark} -\subsection{The option \textsf{new}} +\subsection{The option \textsf{new}}\label{sec:new} Loading \texttt{old-arrows} with the option \texttt{new} \begin{verbatim} \usepackage[new]{old-arrows} \end{verbatim} -allows to use the new-style and the old-style arrows simultaneously. In order to obtain new-style arrows, +allows you to use the new-style and the old-style arrows simultaneously. In order to obtain new-style arrows, just put \verb|\var| before every ordinary command, as shown in tables~\ref{tab-frecce-nuove}, \ref{tab-frecce-nuove-amsmath}, \ref{tab-frecce-nuove-ext}, \ref{tab-operatori-nuovi}, \ref{tab-frecce-nuove-smr} and \ref{tab-frecce-nuove-mt}. @@ -475,7 +477,26 @@ \end{center} produce $\boldsymbol{A \varto B}$ and $\boldsymbol{\varoverrightarrow{AB}}$ respectively. -%\pagebreak +\subsection{The option \textsf{old}}\label{sec:old} + +If you want to use the old-style arrows only in a few cases, and maintain the new-style by default, then it +is available the option \texttt{old} +\begin{verbatim} + \usepackage[old]{old-arrows} +\end{verbatim} +that associates all of the commands with prefix \verb|\var| to the old-style rather than the new one, which +remains associated to the ordinary commands. For example, with the option \texttt{old} the commands +\begin{center} + \verb|$A \varleftarrow B$| \quad and \quad \verb|$A \varto B$| +\end{center} +produce $A \leftarrow B$ and $A \to B$ respectively, while +\begin{center} + \verb|$A \leftarrow B$| \quad and \quad \verb|$A \to B$| +\end{center} +produce $A \varleftarrow B$ and $A \varto B$, respectively. + +It is not possible to load the options \texttt{new} and \texttt{old} simultaneously (if so, you will get an +error message). \subsection{Additional arrow commands provided by \texttt{old-arrows}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/old-arrows.doc.tlpobj new/tlpkg/tlpobj/old-arrows.doc.tlpobj --- old/tlpkg/tlpobj/old-arrows.doc.tlpobj 2016-04-14 19:31:10.000000000 +0200 +++ new/tlpkg/tlpobj/old-arrows.doc.tlpobj 2017-04-14 17:52:53.000000000 +0200 @@ -1,9 +1,9 @@ name old-arrows.doc category Package -revision 38619 +revision 42872 shortdesc doc files of old-arrows relocated 1 -docfiles size=242 +docfiles size=245 RELOC/doc/fonts/old-arrows/README RELOC/doc/fonts/old-arrows/old-arrows-italian.pdf RELOC/doc/fonts/old-arrows/old-arrows-italian.tex ++++++ old-arrows.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/old-arrows/old-arrows.sty new/tex/latex/old-arrows/old-arrows.sty --- old/tex/latex/old-arrows/old-arrows.sty 2015-10-13 00:17:16.000000000 +0200 +++ new/tex/latex/old-arrows/old-arrows.sty 2017-01-06 00:01:05.000000000 +0100 @@ -1,14 +1,19 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% old-arrows.sty. Version: 1.2 - October 11, 2015. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% old-arrows.sty. Version: 2.0 - January 5, 2017. % Author: Riccardo DOSSENA <riccardo.dossena(a)gmail.com> % -% This package provides old-style cm arrows with smaller arrowheads, -% associated with ordinary commands. -% Use the option `new' if you want to use the new-style -% cm arrows simultaneously: simply put \var before every command. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This package provides cm old-style arrows with smaller arrowheads, +% associated with ordinary LaTeX commands. It can be used in a document +% that contains other amssymb arrow characters, like \twoheadrightarrow, +% which also have small arrowheads. The options `new' and `old' allow the +% user to use the usual new-style cm arrows together with the old-style +% ones. The option `new' allows you to maintain the old-style by default +% and get the old-style by putting \var before every command; conversely, +% the option `old' allows you to maintain the new-style by default and get +% the old-style by putting \var before every command. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Copyright 2015 R. Dossena +% Copyright 2015-2017 R. Dossena % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -22,9 +27,39 @@ % % The Current Maintainer of this work is R. Dossena. % -% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{old-arrows}[2015/10/11 v1.2 Old Arrows] +\ProvidesPackage{old-arrows}[2017/01/05 v2.0 Old Arrows] + +\newif\ifoldarrows@default +\newif\ifoldarrows@new +\newif\ifoldarrows@old + +\def\oldarrows@opterr{% + \PackageError{old-arrows}{`new' and `old' options are incompatible}{% + I'm sorry, you cannot use the `new' and `old' options simultaneously! % + Ciao ;) \MessageBreak}% +}% + +\DeclareOption{default}{\oldarrows@defaulttrue} +\DeclareOption{new}{% + \ifoldarrows@old\oldarrows@opterr\fi + \oldarrows@newtrue} +\DeclareOption{old}{% + \ifoldarrows@new\oldarrows@opterr\fi + \oldarrows@defaultfalse\oldarrows@oldtrue} + +\ExecuteOptions{default} + +\ProcessOptions\relax + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% default option +% + +\ifoldarrows@default \@ifpackageloaded{lmodern}{% \DeclareFontFamily{OMS}{oasy}{\skewchar\font48 } @@ -142,9 +177,14 @@ \DeclareRobustCommand\longleftharpoondown {\leftharpoondown\joinrel\relbar} +\fi -%new style arrows: \var before every command -\DeclareOption{new}{ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% `new' option +% + +\ifoldarrows@new \@ifpackageloaded{lmodern}{% \DeclareSymbolFont{lmsy}{OMS}{lmsy}{m}{n} @@ -270,17 +310,186 @@ \arrowfill@{\mapstochar\relbar}\relbar\varrightarrow} \relax}{} -%new-style support for St Mary's Road fonts +%%stmaryrd new-style xmapsfrom (mathtools or amsmath needed) \@ifpackageloaded{stmaryrd}{% -\stmry@if\def\varmapsfrom{\varleftarrow\mapsfromchar}\fi -\stmry@if\def\varlongmapsfrom{\varlongleftarrow\mapsfromchar}\fi -%stmaryrd new-style xmapsfrom (mathtools or amsmath needed) \newcommand{\varxmapsfrom}[2][]{% \ext@arrow 3095\varSMRmapsfromfill@{#1}{#2}} \def\varSMRmapsfromfill@{% \arrowfill@\varleftarrow\relbar{\relbar\mapsfromchar}} \relax}{} +\fi + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% `old' option +% + +\ifoldarrows@old + +\@ifpackageloaded{lmodern}{% +\DeclareFontFamily{OMS}{oasy}{\skewchar\font48 } +\DeclareFontShape{OMS}{oasy}{m}{n}{% + <-5.5> oasy5 <5.5-6.5> oasy6 + <6.5-7.5> oasy7 <7.5-8.5> oasy8 + <8.5-9.5> oasy9 <9.5-> oasy10 + }{} +\DeclareFontShape{OMS}{oasy}{b}{n}{% + <-6> oabsy5 + <6-8> oabsy7 + <8-> oabsy10 + }{} +\relax}{% +\DeclareFontFamily{OMS}{oasy}{\skewchar\font48 } +\DeclareFontShape{OMS}{oasy}{m}{n}{% + <5><6><7><8><9><10>gen*oasy% + <10.95><12><14.4><17.28><20.74><24.88>oasy10% + }{} +\DeclareFontShape{OMS}{oasy}{b}{n}{% + <5><6><7><8><9>gen*oabsy% + <10><10.95><12><14.4><17.28><20.74><24.88>oabsy10% + }{} +\relax} + +\DeclareSymbolFont{oasy}{OMS}{oasy}{m}{n} + +\SetSymbolFont{oasy}{normal}{OMS}{oasy}{m}{n} +\SetSymbolFont{oasy}{bold}{OMS}{oasy}{b}{n} + +\DeclareMathSymbol{\varleftarrow} {\mathrel}{oasy}{"20} + \let\vargets=\varleftarrow +\DeclareMathSymbol{\varrightarrow} {\mathrel}{oasy}{"21} + \let\varto=\varrightarrow +\DeclareMathSymbol{\varleftrightarrow} {\mathrel}{oasy}{"24} +\DeclareMathSymbol{\varnearrow} {\mathrel}{oasy}{"25} +\DeclareMathSymbol{\varsearrow} {\mathrel}{oasy}{"26} +\DeclareMathSymbol{\varnwarrow} {\mathrel}{oasy}{"2D} +\DeclareMathSymbol{\varswarrow} {\mathrel}{oasy}{"2E} +\DeclareMathSymbol{\varmapstochar} {\mathrel}{oasy}{"37} + \def\varmapsto{\varmapstochar\varrightarrow} + \def\varhookrightarrow{\lhook\joinrel\varrightarrow} + \def\varhookleftarrow{\varleftarrow\joinrel\rhook} + +\DeclareMathDelimiter{\varuparrow} {\mathrel}{oasy}{"22}{largesymbols}{"78} +\DeclareMathDelimiter{\vardownarrow} {\mathrel}{oasy}{"23}{largesymbols}{"79} +\DeclareMathDelimiter{\varupdownarrow} {\mathrel}{oasy}{"6C}{largesymbols}{"3F} + +%definitions of \meno, \joinrelaz and \relbarra +\DeclareMathSymbol{\meno} {\mathbin}{oasy}{"00} +\DeclareRobustCommand + \joinrelaz{\mathrel{\mkern-3mu}} +\DeclareRobustCommand + \relbarra{\mathrel{\smash\meno}} % \smash, because - + % has the same height as + + +\DeclareRobustCommand\varlongrightarrow + {\relbarra\joinrelaz\varrightarrow} +\DeclareRobustCommand\varlongleftarrow + {\varleftarrow\joinrelaz\relbarra} +\DeclareRobustCommand + \varlongmapsto{\varmapstochar\varlongrightarrow} +\DeclareRobustCommand + \varlongleftrightarrow{\varleftarrow\joinrelaz\varrightarrow} + +\def\varoverrightarrow#1{\vbox{\m@th\ialign{##\crcr + \varrightarrowfill\crcr\noalign{\kern-\p@\nointerlineskip} + $\hfil\displaystyle{#1}\hfil$\crcr}}} +\def\varoverleftarrow#1{\vbox{\m@th\ialign{##\crcr + \varleftarrowfill\crcr\noalign{\kern-\p@\nointerlineskip}% + $\hfil\displaystyle{#1}\hfil$\crcr}}} +\def\varrightarrowfill{$\m@th\smash\meno\mkern-7mu% + \cleaders\hbox{$\mkern-2mu\smash\meno\mkern-2mu$}\hfill + \mkern-7mu\mathord\varrightarrow$} +\def\varleftarrowfill{$\m@th\mathord\varleftarrow\mkern-7mu% + \cleaders\hbox{$\mkern-2mu\smash\meno\mkern-2mu$}\hfill + \mkern-7mu\smash\meno$} + +%amsmath redefinitions, if loaded +\@ifpackageloaded{amsmath}{% +\ams@def\relbarra{\mathrel{\mathpalette\mathsm@sh\meno}} +\def\varleftarrowfill@{\arrowfill@\varleftarrow\relbarra\relbarra} +\def\varrightarrowfill@{\arrowfill@\relbarra\relbarra\varrightarrow} +\def\varleftrightarrowfill@{\arrowfill@\varleftarrow\relbarra\varrightarrow} +\ams@renewcommand{\varoverrightarrow}{% + \mathpalette{\overarrow@\varrightarrowfill@}} +\ams@renewcommand{\varoverleftarrow}{% + \mathpalette{\overarrow@\varleftarrowfill@}} +\ams@newcommand{\varoverleftrightarrow}{% + \mathpalette{\overarrow@\varleftrightarrowfill@}} +\ams@newcommand{\varunderrightarrow}{% + \mathpalette{\underarrow@\varrightarrowfill@}} +\ams@newcommand{\varunderleftarrow}{% + \mathpalette{\underarrow@\varleftarrowfill@}} +\ams@newcommand{\varunderleftrightarrow}{% + \mathpalette{\underarrow@\varleftrightarrowfill@}} +\newcommand{\varxrightarrow}[2][]{\ext@arrow 0359\varrightarrowfill@{#1}{#2}} +\newcommand{\varxleftarrow}[2][]{\ext@arrow 3095\varleftarrowfill@{#1}{#2}} +\def\varvarinjlim{% + \mathop{\mathpalette\varlim@{\varrightarrowfill@\textstyle}}\nmlimits@ } -\ProcessOptions\relax +\def\varvarprojlim{% + \mathop{\mathpalette\varlim@{\varleftarrowfill@\textstyle}}\nmlimits@ +} +\relax}{} + +%mathtools redefinitions, if loaded +\@ifpackageloaded{mathtools}{% +\newcommand{\varxleftrightarrow}[2][]{% + \ext@arrow 3095\varMTleftrightarrowfill@{#1}{#2}} +\def\varMTleftrightarrowfill@{% + \arrowfill@\varleftarrow\relbarra\varrightarrow} +\newcommand{\varxhookleftarrow}[2][]{% + \ext@arrow 3095\varMThookleftfill@{#1}{#2}} +\def\varMThookleftfill@{% + \arrowfill@\varleftarrow\relbarra{\relbarra\joinrelaz\rhook}} +\newcommand{\varxhookrightarrow}[2][]{% + \ext@arrow 3095\varMThookrightfill@{#1}{#2}} +\def\varMThookrightfill@{% + \arrowfill@{\lhook\joinrelaz\relbarra}\relbarra\varrightarrow} +\newcommand{\varxmapsto}[2][]{% + \ext@arrow 0395\varMTmapstofill@{#1}{#2}} +\def\varMTmapstofill@{% + \arrowfill@{\mapstochar\relbarra}\relbarra\varrightarrow} +\relax}{} + +%%stmaryrd old-style xmapsfrom (mathtools or amsmath needed) +\@ifpackageloaded{stmaryrd}{% +\newcommand{\varxmapsfrom}[2][]{% + \ext@arrow 3095\varSMRmapsfromfill@{#1}{#2}} +\def\varSMRmapsfromfill@{% + \arrowfill@\varleftarrow\relbarra{\relbarra\mapsfromchar}} +\newcommand{\xmapsfrom}[2][]{% + \ext@arrow 3095\SMRmapsfromfill@{#1}{#2}} +\def\SMRmapsfromfill@{% + \arrowfill@\leftarrow\relbar{\relbar\mapsfromchar}} +\relax}{} + +%arrow commands provided by old-arrows with option old +\DeclareRobustCommand\varlonghookrightarrow + {\lhook\joinrelaz\varlongrightarrow} +\DeclareRobustCommand\varlonghookleftarrow + {\varlongleftarrow\joinrelaz\rhook} + +%arrow commands provided by old-arrows (default) +\DeclareRobustCommand\longhookrightarrow + {\lhook\joinrel\longrightarrow} +\DeclareRobustCommand\longhookleftarrow + {\longleftarrow\joinrel\rhook} +\DeclareRobustCommand\longrightharpoonup + {\relbar\joinrel\rightharpoonup} +\DeclareRobustCommand\longrightharpoondown + {\relbar\joinrel\rightharpoondown} +\DeclareRobustCommand\longleftharpoonup + {\leftharpoonup\joinrel\relbar} +\DeclareRobustCommand\longleftharpoondown + {\leftharpoondown\joinrel\relbar} + +\fi + +%stmaryrd support for `new' and `old' +\@ifpackageloaded{stmaryrd}{% + \stmry@if\def\varmapsfrom{\varleftarrow\mapsfromchar}\fi + \stmry@if\def\varlongmapsfrom{\varlongleftarrow\mapsfromchar}\fi +}{} + \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/old-arrows.tlpobj new/tlpkg/tlpobj/old-arrows.tlpobj --- old/tlpkg/tlpobj/old-arrows.tlpobj 2016-04-14 19:31:11.000000000 +0200 +++ new/tlpkg/tlpobj/old-arrows.tlpobj 2017-04-14 17:52:53.000000000 +0200 @@ -1,6 +1,6 @@ name old-arrows category Package -revision 38619 +revision 42872 shortdesc Computer Modern old-style arrows with smaller arrowheads relocated 1 longdesc This package provides Computer Modern old-style arrows with @@ -10,7 +10,7 @@ longdesc to use the usual new-style Computer Modern arrows together with longdesc the old-style ones. execute addMap oasy.map -runfiles size=53 +runfiles size=55 RELOC/fonts/afm/public/old-arrows/oabsy10.afm RELOC/fonts/afm/public/old-arrows/oabsy5.afm RELOC/fonts/afm/public/old-arrows/oabsy7.afm @@ -54,7 +54,7 @@ RELOC/fonts/type1/public/old-arrows/oasy9.pfm RELOC/tex/latex/old-arrows/old-arrows.sty catalogue-ctan /fonts/old-arrows -catalogue-date 2015-10-11 23:55:18 +0200 +catalogue-date 2017-01-05 17:35:49 +0100 catalogue-license lppl1.3 catalogue-topics font-symbol-maths font-type1 -catalogue-version 1.2 +catalogue-version 2.0 ++++++ 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 2016-04-14 19:31:12.000000000 +0200 +++ new/tlpkg/tlpobj/oldlatin.tlpobj 2017-04-14 17:52:54.000000000 +0200 @@ -100,7 +100,7 @@ RELOC/fonts/tfm/public/oldlatin/oltt9.tfm RELOC/fonts/tfm/public/oldlatin/olvtt10.tfm catalogue-ctan /fonts/gothic/oldlatin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-mf font-historical catalogue-version 1.00 ++++++ oldstandard.doc.tar.xz ++++++ ++++ 2309 lines of diff (skipped) ++++++ oldstandard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_26r254.enc new/fonts/enc/dvips/oldstandard/ost_26r254.enc --- old/fonts/enc/dvips/oldstandard/ost_26r254.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_26r254.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_26r254jiv53lkb4bdgwgvidqga +% Encoding created by otftotfm on Thu Jun 30 22:11:13 2016 +% Command line follows encoding +/AutoEnc_26r254jiv53lkb4bdgwgvidqga [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /questiondown +%10 + /exclamdown /endash /quotedblbase /.notdef /.notdef /.notdef /.notdef /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /asteriskmath /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Ohm + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /uni2225 /perthousand + /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /uni203D /.notdef /.notdef /trademark + /uni2031 /.notdef /.notdef /afii61352 /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /twosuperior /threesuperior /.notdef /mu1 /paragraph /periodcentered + /uni203B /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /ffl /ffi /ff /fl /l /fi /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --x-height=x OldStandard-Regular.otf OldStandard-Regular-tlf-ts1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_dgnoxb.enc new/fonts/enc/dvips/oldstandard/ost_dgnoxb.enc --- old/fonts/enc/dvips/oldstandard/ost_dgnoxb.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_dgnoxb.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_dgnoxbhlxbh6f6ivbbyamswsee +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_dgnoxbhlxbh6f6ivbbyamswsee [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664 + /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve + /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute +%90 + /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring + /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section +%A0 + /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve + /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute +%B0 + /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring + /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --feature=liga --feature=sups --ligkern=* {KL} * --x-height=x +% OldStandard-Bold.otf OldStandard-Bold-sup-t1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_dgu773.enc new/fonts/enc/dvips/oldstandard/ost_dgu773.enc --- old/fonts/enc/dvips/oldstandard/ost_dgu773.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_dgu773.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_dgu773ll3jyopchtqxcy2oc33g +% Encoding created by otftotfm on Thu Jun 30 22:11:11 2016 +% Command line follows encoding +/AutoEnc_dgu773ll3jyopchtqxcy2oc33g [ +%00 + /fl /Euro /ff /ffl /fraction /dotaccent /hungarumlaut /ogonek + /f_j /f_f_j /afii61664 /fi /ffi /.notdef /.notdef /.notdef +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /tilde /dieresis +%80 + /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl + /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus +%90 + /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash + /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis +%A0 + /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /softhyphen /registered /macron +%B0 + /degree /plusminus /twosuperior /threesuperior /acute /mu1 /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --x-height=x OldStandard-Bold.otf OldStandard-Bold-tlf-ly1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_dpv76i.enc new/fonts/enc/dvips/oldstandard/ost_dpv76i.enc --- old/fonts/enc/dvips/oldstandard/ost_dpv76i.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_dpv76i.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_dpv76izfhduqnuxghxca4wzsgd +% Encoding created by otftotfm on Thu Jun 30 22:11:11 2016 +% Command line follows encoding +/AutoEnc_dpv76izfhduqnuxghxca4wzsgd [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664 + /fi /dotlessi /dotlessj /fl /ff /ffl /f_j /f_f_j +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve + /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute +%90 + /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring + /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section +%A0 + /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve + /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute +%B0 + /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring + /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --feature=liga --x-height=x OldStandard-Bold.otf OldStandard-Bold-tlf-t1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_hn3tfb.enc new/fonts/enc/dvips/oldstandard/ost_hn3tfb.enc --- old/fonts/enc/dvips/oldstandard/ost_hn3tfb.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_hn3tfb.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_hn3tfbj2dxaaypjok42qq7rllh +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_hn3tfbj2dxaaypjok42qq7rllh [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /less /equal /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /tilde /dieresis +%80 + /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl + /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus +%90 + /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash + /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis +%A0 + /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /softhyphen /registered /macron +%B0 + /degree /plusminus /twosuperior /threesuperior /acute /mu1 /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=sups --ligkern=* {KL} * --x-height=x +% OldStandard-Bold.otf OldStandard-Bold-sup-ly1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_lb4p2v.enc new/fonts/enc/dvips/oldstandard/ost_lb4p2v.enc --- old/fonts/enc/dvips/oldstandard/ost_lb4p2v.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_lb4p2v.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,64 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_lb4p2val3pcnvq5vltq3qon2kb +% Encoding created by otftotfm on Thu Jun 30 22:11:11 2016 +% Command line follows encoding +/AutoEnc_lb4p2val3pcnvq5vltq3qon2kb [ +%00 + /Gamma /Deltagreek /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /Omegagreek /ff /fi /fl /ffi /ffl +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zero /one /two /three /four /five /six /seven + /eight /nine /colon /semicolon /exclamdown /equal /questiondown /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis +%80 + /f_j /f_f_j /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ot1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --x-height=x +% OldStandard-Bold.otf OldStandard-Bold-tlf-ot1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_sfa7gz.enc new/fonts/enc/dvips/oldstandard/ost_sfa7gz.enc --- old/fonts/enc/dvips/oldstandard/ost_sfa7gz.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_sfa7gz.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_sfa7gz2642eu6yoeb3aubyk7lc +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_sfa7gz2642eu6yoeb3aubyk7lc [ +%00 + /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek + /.notdef /.notdef /afii61664 /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /uni207D /uni207E /asterisk /uni207A /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /less /uni207C /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /tilde /dieresis +%80 + /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl + /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /uni207B +%90 + /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash + /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis +%A0 + /nonbreakingspace /exclamdown /cent /sterling /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /softhyphen /registered /macron +%B0 + /degree /plusminus /twosuperior /threesuperior /acute /mu1 /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ly1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern +% --feature=liga --feature=sups --ligkern=* {KL} * --x-height=x +% OldStandard-Italic.otf OldStandard-Italic-sup-ly1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_urxscd.enc new/fonts/enc/dvips/oldstandard/ost_urxscd.enc --- old/fonts/enc/dvips/oldstandard/ost_urxscd.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_urxscd.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_urxscdt7bz7e3h6qrpp66bx4zg +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_urxscdt7bz7e3h6qrpp66bx4zg [ +%00 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /asterisk /C +%10 + /bar /questiondown /quotedblbase /exclamdown /endash /.notdef /.notdef /.notdef + /arrowleft /arrowright /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /.notdef /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle + /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction +%30 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /uni27E8 /minus /uni27E9 /.notdef +%40 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%50 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /Ohm + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /arrowup /arrowdown +%60 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%70 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%80 + /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand + /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /uni203D /.notdef /.notdef /trademark + /uni2031 /.notdef /.notdef /afii61352 /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section + /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef +%B0 + /degree /plusminus /twosuperior /threesuperior /.notdef /mu1 /paragraph /periodcentered + /uni203B /onesuperior /ordmasculine /radical /onequarter /onehalf /threequarters /Euro +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef + /ffl /ffi /ff /fl /l /fi /i /f +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ts1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --ligkern=f i =: fi +% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff +% l =: ffl --x-height=x OldStandard-Bold.otf OldStandard-Bold-tlf-ts1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_wf5qbf.enc new/fonts/enc/dvips/oldstandard/ost_wf5qbf.enc --- old/fonts/enc/dvips/oldstandard/ost_wf5qbf.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_wf5qbf.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_wf5qbfgth4m7gczmyleny2hftf +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_wf5qbfgth4m7gczmyleny2hftf [ +%00 + /Gamma /Deltagreek /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /Omegagreek /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /exclamdown /equal /questiondown /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ot1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups +% --ligkern=* {KL} * --x-height=x OldStandard-Bold.otf +% OldStandard-Bold-sup-ot1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_wle65k.enc new/fonts/enc/dvips/oldstandard/ost_wle65k.enc --- old/fonts/enc/dvips/oldstandard/ost_wle65k.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_wle65k.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_wle65ktaejnm6e5xb3uefpujze +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_wle65ktaejnm6e5xb3uefpujze [ +%00 + /Gamma /Deltagreek /Theta /Lambda /Xi /Pi /Sigma /Upsilon + /Phi /Psi /Omegagreek /.notdef /.notdef /.notdef /.notdef /.notdef +%10 + /dotlessi /dotlessj /grave /acute /caron /breve /macron /ring + /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +%20 + /space /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright + /uni207D /uni207E /asterisk /uni207A /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /exclamdown /uni207C /questiondown /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis +%80 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%90 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%A0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%B0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%C0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%D0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%E0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +%F0 + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def +% Command line: 'otftotfm --automatic --encoding=fontools_ot1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=TEX TEXT --feature=kern --feature=liga --feature=sups +% --ligkern=* {KL} * --x-height=x OldStandard-Italic.otf +% OldStandard-Italic-sup-ot1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/oldstandard/ost_yewge3.enc new/fonts/enc/dvips/oldstandard/ost_yewge3.enc --- old/fonts/enc/dvips/oldstandard/ost_yewge3.enc 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/enc/dvips/oldstandard/ost_yewge3.enc 2016-11-25 19:31:08.000000000 +0100 @@ -0,0 +1,65 @@ +% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT + +%%AutoEnc_yewge35ng5osg5vmjy6f2dxqhc +% Encoding created by otftotfm on Thu Jun 30 22:11:12 2016 +% Command line follows encoding +/AutoEnc_yewge35ng5osg5vmjy6f2dxqhc [ +%00 + /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron + /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright +%10 + /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /afii61664 + /.notdef /dotlessi /dotlessj /.notdef /.notdef /.notdef /.notdef /.notdef +%20 + /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright + /uni207D /uni207E /asterisk /uni207A /comma /hyphen /period /slash +%30 + /zerosuperior /onesuperior /twosuperior /threesuperior /foursuperior /fivesuperior /sixsuperior /sevensuperior + /eightsuperior /ninesuperior /colon /semicolon /less /uni207C /greater /question +%40 + /at /A /B /C /D /E /F /G + /H /I /J /K /L /M /N /O +%50 + /P /Q /R /S /T /U /V /W + /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore +%60 + /quoteleft /a /b /c /d /e /f /g + /h /i /j /k /l /m /n /o +%70 + /p /q /r /s /t /u /v /w + /x /y /z /braceleft /bar /braceright /asciitilde /hyphen +%80 + /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve + /Lacute /Lcaron /Lslash /Nacute /Ncaron /Eng /Ohungarumlaut /Racute +%90 + /Rcaron /Sacute /Scaron /Scedilla /Tcaron /Tcommaaccent /Uhungarumlaut /Uring + /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section +%A0 + /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve + /lacute /lcaron /lslash /nacute /ncaron /eng /ohungarumlaut /racute +%B0 + /rcaron /sacute /scaron /scedilla /tcaron /tcommaaccent /uhungarumlaut /uring + /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling +%C0 + /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis +%D0 + /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE + /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef +%E0 + /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis +%F0 + /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe + /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls +] def +% Command line: 'otftotfm --automatic --encoding=fontools_t1 +% --tfm-directory=texmf/fonts/tfm/public/oldstandard +% --vf-directory=texmf/fonts/vf/public/oldstandard +% --type1-directory=texmf/fonts/type1/public/oldstandard +% --truetype-directory=texmf/fonts/truetype/public/oldstandard +% --encoding-directory=texmf/fonts/enc/dvips/oldstandard +% --map-file=texmf/fonts/map/dvips/oldstandard/OldStandard.map --no-updmap +% --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern +% --feature=liga --feature=sups --ligkern=* {KL} * --x-height=x +% OldStandard-Italic.otf OldStandard-Italic-sup-t1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/oldstandard/OldStandard.map new/fonts/map/dvips/oldstandard/OldStandard.map --- old/fonts/map/dvips/oldstandard/OldStandard.map 1970-01-01 01:00:00.000000000 +0100 +++ new/fonts/map/dvips/oldstandard/OldStandard.map 2016-11-25 19:31:10.000000000 +0100 @@ -0,0 +1,23 @@ +% Automatically maintained by otftotfm or other programs. Do not edit. + +OldStandard-Bold-tlf-ot1 OldStandard-Bold "AutoEnc_lb4p2val3pcnvq5vltq3qon2kb ReEncodeFont" <[ost_lb4p2v.enc <OldStandard-Bold.pfb +OldStandard-Bold-tlf-t1--base OldStandard-Bold "AutoEnc_dpv76izfhduqnuxghxca4wzsgd ReEncodeFont" <[ost_dpv76i.enc <OldStandard-Bold.pfb +OldStandard-Bold-tlf-ly1 OldStandard-Bold "AutoEnc_dgu773ll3jyopchtqxcy2oc33g ReEncodeFont" <[ost_dgu773.enc <OldStandard-Bold.pfb +OldStandard-Bold-tlf-ts1--base OldStandard-Bold "AutoEnc_urxscdt7bz7e3h6qrpp66bx4zg ReEncodeFont" <[ost_urxscd.enc <OldStandard-Bold.pfb +OldStandard-Bold-sup-ot1 OldStandard-Bold "AutoEnc_wf5qbfgth4m7gczmyleny2hftf ReEncodeFont" <[ost_wf5qbf.enc <OldStandard-Bold.pfb +OldStandard-Bold-sup-t1--base OldStandard-Bold "AutoEnc_dgnoxbhlxbh6f6ivbbyamswsee ReEncodeFont" <[ost_dgnoxb.enc <OldStandard-Bold.pfb +OldStandard-Bold-sup-ly1 OldStandard-Bold "AutoEnc_hn3tfbj2dxaaypjok42qq7rllh ReEncodeFont" <[ost_hn3tfb.enc <OldStandard-Bold.pfb +OldStandard-Italic-tlf-ot1 OldStandard-Italic "AutoEnc_lb4p2val3pcnvq5vltq3qon2kb ReEncodeFont" <[ost_lb4p2v.enc <OldStandard-Italic.pfb +OldStandard-Italic-tlf-t1--base OldStandard-Italic "AutoEnc_dpv76izfhduqnuxghxca4wzsgd ReEncodeFont" <[ost_dpv76i.enc <OldStandard-Italic.pfb +OldStandard-Italic-tlf-ly1 OldStandard-Italic "AutoEnc_dgu773ll3jyopchtqxcy2oc33g ReEncodeFont" <[ost_dgu773.enc <OldStandard-Italic.pfb +OldStandard-Italic-tlf-ts1--base OldStandard-Italic "AutoEnc_urxscdt7bz7e3h6qrpp66bx4zg ReEncodeFont" <[ost_urxscd.enc <OldStandard-Italic.pfb +OldStandard-Italic-sup-ot1 OldStandard-Italic "AutoEnc_wle65ktaejnm6e5xb3uefpujze ReEncodeFont" <[ost_wle65k.enc <OldStandard-Italic.pfb +OldStandard-Italic-sup-t1--base OldStandard-Italic "AutoEnc_yewge35ng5osg5vmjy6f2dxqhc ReEncodeFont" <[ost_yewge3.enc <OldStandard-Italic.pfb +OldStandard-Italic-sup-ly1 OldStandard-Italic "AutoEnc_sfa7gz2642eu6yoeb3aubyk7lc ReEncodeFont" <[ost_sfa7gz.enc <OldStandard-Italic.pfb +OldStandard-Regular-tlf-ot1 OldStandard-Regular "AutoEnc_lb4p2val3pcnvq5vltq3qon2kb ReEncodeFont" <[ost_lb4p2v.enc <OldStandard-Regular.pfb +OldStandard-Regular-tlf-t1--base OldStandard-Regular "AutoEnc_dpv76izfhduqnuxghxca4wzsgd ReEncodeFont" <[ost_dpv76i.enc <OldStandard-Regular.pfb +OldStandard-Regular-tlf-ly1 OldStandard-Regular "AutoEnc_dgu773ll3jyopchtqxcy2oc33g ReEncodeFont" <[ost_dgu773.enc <OldStandard-Regular.pfb +OldStandard-Regular-tlf-ts1--base OldStandard-Regular "AutoEnc_26r254jiv53lkb4bdgwgvidqga ReEncodeFont" <[ost_26r254.enc <OldStandard-Regular.pfb +OldStandard-Regular-sup-ot1 OldStandard-Regular "AutoEnc_wle65ktaejnm6e5xb3uefpujze ReEncodeFont" <[ost_wle65k.enc <OldStandard-Regular.pfb +OldStandard-Regular-sup-t1--base OldStandard-Regular "AutoEnc_yewge35ng5osg5vmjy6f2dxqhc ReEncodeFont" <[ost_yewge3.enc <OldStandard-Regular.pfb +OldStandard-Regular-sup-ly1 OldStandard-Regular "AutoEnc_sfa7gz2642eu6yoeb3aubyk7lc ReEncodeFont" <[ost_sfa7gz.enc <OldStandard-Regular.pfb Binary files old/fonts/opentype/public/oldstandard/OldStandard-Bold.otf and new/fonts/opentype/public/oldstandard/OldStandard-Bold.otf differ Binary files old/fonts/opentype/public/oldstandard/OldStandard-Italic.otf and new/fonts/opentype/public/oldstandard/OldStandard-Italic.otf differ Binary files old/fonts/opentype/public/oldstandard/OldStandard-Regular.otf and new/fonts/opentype/public/oldstandard/OldStandard-Regular.otf differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ly1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ly1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ot1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ot1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1--base.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1--base.tfm differ Binary files old/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1.tfm and new/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1.tfm differ Binary files old/fonts/type1/public/oldstandard/OldStandard-Bold.pfb and new/fonts/type1/public/oldstandard/OldStandard-Bold.pfb differ Binary files old/fonts/type1/public/oldstandard/OldStandard-Italic.pfb and new/fonts/type1/public/oldstandard/OldStandard-Italic.pfb differ Binary files old/fonts/type1/public/oldstandard/OldStandard-Regular.pfb and new/fonts/type1/public/oldstandard/OldStandard-Regular.pfb differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Bold-sup-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Bold-sup-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-ts1.vf and new/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-ts1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Italic-sup-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Italic-sup-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-ts1.vf and new/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-ts1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Regular-sup-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Regular-sup-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-t1.vf and new/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-t1.vf differ Binary files old/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-ts1.vf and new/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-ts1.vf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/LY1OldStandard-Sup.fd new/tex/latex/oldstandard/LY1OldStandard-Sup.fd --- old/tex/latex/oldstandard/LY1OldStandard-Sup.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/LY1OldStandard-Sup.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{LY1OldStandard-Sup.fd} + [2016/06/30 (autoinst) Font definitions for LY1/OldStandard-Sup.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{OldStandard-Sup}{} + +\DeclareFontShape{LY1}{OldStandard-Sup}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-Sup}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-Sup}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-Sup}{m}{sl}{ + <-> ssub * OldStandard-Sup/m/it +}{} + +\DeclareFontShape{LY1}{OldStandard-Sup}{bx}{n}{ + <-> ssub * OldStandard-Sup/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/LY1OldStandard-TLF.fd new/tex/latex/oldstandard/LY1OldStandard-TLF.fd --- old/tex/latex/oldstandard/LY1OldStandard-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/LY1OldStandard-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{LY1OldStandard-TLF.fd} + [2016/06/30 (autoinst) Font definitions for LY1/OldStandard-TLF.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{OldStandard-TLF}{} + +\DeclareFontShape{LY1}{OldStandard-TLF}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-TLF}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-TLF}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{OldStandard-TLF}{m}{sl}{ + <-> ssub * OldStandard-TLF/m/it +}{} + +\DeclareFontShape{LY1}{OldStandard-TLF}{bx}{n}{ + <-> ssub * OldStandard-TLF/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/OT1OldStandard-Sup.fd new/tex/latex/oldstandard/OT1OldStandard-Sup.fd --- old/tex/latex/oldstandard/OT1OldStandard-Sup.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/OT1OldStandard-Sup.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{OT1OldStandard-Sup.fd} + [2016/06/30 (autoinst) Font definitions for OT1/OldStandard-Sup.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{OldStandard-Sup}{} + +\DeclareFontShape{OT1}{OldStandard-Sup}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-Sup}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-Sup}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-Sup}{m}{sl}{ + <-> ssub * OldStandard-Sup/m/it +}{} + +\DeclareFontShape{OT1}{OldStandard-Sup}{bx}{n}{ + <-> ssub * OldStandard-Sup/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/OT1OldStandard-TLF.fd new/tex/latex/oldstandard/OT1OldStandard-TLF.fd --- old/tex/latex/oldstandard/OT1OldStandard-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/OT1OldStandard-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{OT1OldStandard-TLF.fd} + [2016/06/30 (autoinst) Font definitions for OT1/OldStandard-TLF.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{OldStandard-TLF}{} + +\DeclareFontShape{OT1}{OldStandard-TLF}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-TLF}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-TLF}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{OldStandard-TLF}{m}{sl}{ + <-> ssub * OldStandard-TLF/m/it +}{} + +\DeclareFontShape{OT1}{OldStandard-TLF}{bx}{n}{ + <-> ssub * OldStandard-TLF/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/OldStandard.sty new/tex/latex/oldstandard/OldStandard.sty --- old/tex/latex/oldstandard/OldStandard.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/OldStandard.sty 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,73 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{OldStandard} + [2016/07/02 (Bob Tennent and autoinst) Style file for Old Standard fonts.] + +\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp} + +\newif\ifoldstandard@otf +\ifxetex + \oldstandard@otftrue +\else\ifluatex + \oldstandard@otftrue +\else % [pdf]LaTeX + \oldstandard@otffalse + \fi\fi + +\RequirePackage{fontaxes} + +\newcommand*{\OldStandard@scale}{1} +\RequirePackage{xkeyval} +\DeclareOptionX{scaled}{\renewcommand*{\OldStandard@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\OldStandard@scale}{#1}} +\DeclareOptionX{type1}{\oldstandard@otffalse} + +\ProcessOptionsX\relax + +\ifoldstandard@otf + \RequirePackage{fontspec} +\else + \RequirePackage{fontenc,fontaxes} +\fi + +\ifoldstandard@otf + \ifxetex\XeTeXtracingfonts=1\fi + \defaultfontfeatures{ + Ligatures = TeX , + Scale = \OldStandard@scale , + Extension = .otf } + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + ] + {OldStandard} + \newfontfamily\oldstandard + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + ] + {OldStandard} + + \providecommand\sufigures{\addfontfeatures{VerticalPosition=Superior}} + + +\else % type1 + + \def\oldstandard@family{OldStandard-TLF} + \renewcommand*\rmdefault{\oldstandard@family} + \newcommand*\oldstandard{\fontfamily{\oldstandard@family}\selectfont} + + \fa@naming@exception{figures}{{superior}{proportional}}{Sup} + \fa@naming@exception{figures}{{superior}{tabular}}{Sup} + \providecommand\sufigures{\@nomath\sufigures\fontfigurestyle{superior}\selectfont} + +\fi + +\DeclareTextFontCommand{\textsu}{\sufigures} + + +\ifoldstandard@otf + \defaultfontfeatures{} +\fi + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/T1OldStandard-Sup.fd new/tex/latex/oldstandard/T1OldStandard-Sup.fd --- old/tex/latex/oldstandard/T1OldStandard-Sup.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/T1OldStandard-Sup.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{T1OldStandard-Sup.fd} + [2016/06/30 (autoinst) Font definitions for T1/OldStandard-Sup.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{OldStandard-Sup}{} + +\DeclareFontShape{T1}{OldStandard-Sup}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-Sup}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-Sup}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-sup-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-Sup}{m}{sl}{ + <-> ssub * OldStandard-Sup/m/it +}{} + +\DeclareFontShape{T1}{OldStandard-Sup}{bx}{n}{ + <-> ssub * OldStandard-Sup/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/T1OldStandard-TLF.fd new/tex/latex/oldstandard/T1OldStandard-TLF.fd --- old/tex/latex/oldstandard/T1OldStandard-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/T1OldStandard-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{T1OldStandard-TLF.fd} + [2016/06/30 (autoinst) Font definitions for T1/OldStandard-TLF.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{OldStandard-TLF}{} + +\DeclareFontShape{T1}{OldStandard-TLF}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-TLF}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-TLF}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{OldStandard-TLF}{m}{sl}{ + <-> ssub * OldStandard-TLF/m/it +}{} + +\DeclareFontShape{T1}{OldStandard-TLF}{bx}{n}{ + <-> ssub * OldStandard-TLF/b/n +}{} + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oldstandard/TS1OldStandard-TLF.fd new/tex/latex/oldstandard/TS1OldStandard-TLF.fd --- old/tex/latex/oldstandard/TS1OldStandard-TLF.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oldstandard/TS1OldStandard-TLF.fd 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,34 @@ +%% Generated by autoinst on 2016/06/30 +%% +\ProvidesFile{TS1OldStandard-TLF.fd} + [2016/06/30 (autoinst) Font definitions for TS1/OldStandard-TLF.] + +\expandafter\ifx\csname OldStandard@scale\endcsname\relax + \let\OldStandard@@scale\@empty +\else + \edef\OldStandard@@scale{s*[\csname OldStandard@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{OldStandard-TLF}{} + +\DeclareFontShape{TS1}{OldStandard-TLF}{b}{n}{ + <-> \OldStandard@@scale OldStandard-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{OldStandard-TLF}{m}{n}{ + <-> \OldStandard@@scale OldStandard-Regular-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{OldStandard-TLF}{m}{it}{ + <-> \OldStandard@@scale OldStandard-Italic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{OldStandard-TLF}{m}{sl}{ + <-> ssub * OldStandard-TLF/m/it +}{} + +\DeclareFontShape{TS1}{OldStandard-TLF}{bx}{n}{ + <-> ssub * OldStandard-TLF/b/n +}{} + +\endinput 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 2016-04-14 19:31:23.000000000 +0200 +++ new/tlpkg/tlpobj/oldstandard.tlpobj 2017-04-14 17:52:54.000000000 +0200 @@ -1,6 +1,6 @@ name oldstandard category Package -revision 29349 +revision 41735 shortdesc Old Standard: A Unicode Font for Classical and Medieval Studies relocated 1 longdesc Old Standard is designed to reproduce the actual printing style @@ -14,12 +14,75 @@ longdesc Classical Greek and Latin, and many more. Old Standard works longdesc with TeX engines that directly support OpenType features, such longdesc as XeTeX and LuaTeX. -runfiles size=137 +execute addMap OldStandard.map +runfiles size=459 + RELOC/fonts/enc/dvips/oldstandard/ost_26r254.enc + RELOC/fonts/enc/dvips/oldstandard/ost_dgnoxb.enc + RELOC/fonts/enc/dvips/oldstandard/ost_dgu773.enc + RELOC/fonts/enc/dvips/oldstandard/ost_dpv76i.enc + RELOC/fonts/enc/dvips/oldstandard/ost_hn3tfb.enc + RELOC/fonts/enc/dvips/oldstandard/ost_lb4p2v.enc + RELOC/fonts/enc/dvips/oldstandard/ost_sfa7gz.enc + RELOC/fonts/enc/dvips/oldstandard/ost_urxscd.enc + RELOC/fonts/enc/dvips/oldstandard/ost_wf5qbf.enc + RELOC/fonts/enc/dvips/oldstandard/ost_wle65k.enc + RELOC/fonts/enc/dvips/oldstandard/ost_yewge3.enc + RELOC/fonts/map/dvips/oldstandard/OldStandard.map RELOC/fonts/opentype/public/oldstandard/OldStandard-Bold.otf RELOC/fonts/opentype/public/oldstandard/OldStandard-Italic.otf RELOC/fonts/opentype/public/oldstandard/OldStandard-Regular.otf + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-sup-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Bold-tlf-ts1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-sup-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Italic-tlf-ts1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-sup-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ly1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ot1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-t1.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1--base.tfm + RELOC/fonts/tfm/public/oldstandard/OldStandard-Regular-tlf-ts1.tfm + RELOC/fonts/type1/public/oldstandard/OldStandard-Bold.pfb + RELOC/fonts/type1/public/oldstandard/OldStandard-Italic.pfb + RELOC/fonts/type1/public/oldstandard/OldStandard-Regular.pfb + RELOC/fonts/vf/public/oldstandard/OldStandard-Bold-sup-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Bold-tlf-ts1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Italic-sup-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Italic-tlf-ts1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Regular-sup-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-t1.vf + RELOC/fonts/vf/public/oldstandard/OldStandard-Regular-tlf-ts1.vf + RELOC/tex/latex/oldstandard/LY1OldStandard-Sup.fd + RELOC/tex/latex/oldstandard/LY1OldStandard-TLF.fd + RELOC/tex/latex/oldstandard/OT1OldStandard-Sup.fd + RELOC/tex/latex/oldstandard/OT1OldStandard-TLF.fd + RELOC/tex/latex/oldstandard/OldStandard.sty + RELOC/tex/latex/oldstandard/T1OldStandard-Sup.fd + RELOC/tex/latex/oldstandard/T1OldStandard-TLF.fd + RELOC/tex/latex/oldstandard/TS1OldStandard-TLF.fd catalogue-ctan /fonts/oldstandard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-20 09:11:51 +0200 catalogue-license ofl -catalogue-topics font font-serif font-ttf font-otf -catalogue-version 2.0.2 +catalogue-topics font font-serif font-type1 font-otf +catalogue-version 2.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 2016-04-14 19:31:23.000000000 +0200 +++ new/tlpkg/tlpobj/oldstyle.tlpobj 2017-04-14 17:52:55.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/oldstyle/oldstyle.sty catalogue-also eco catalogue-ctan /macros/latex/contrib/oldstyle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:24.000000000 +0200 +++ new/tlpkg/tlpobj/omega.tlpobj 2017-04-14 17:52:55.000000000 +0200 @@ -360,6 +360,6 @@ RELOC/tex/generic/omegahyph/srhyph.tex RELOC/tex/plain/omega/grlccode.tex RELOC/tex/plain/omega/omega.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics engine omega obsolete ++++++ omegaware.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/odvicopy.man1.pdf and new/texmf-dist/doc/man/man1/odvicopy.man1.pdf differ Binary 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 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ofm2opl.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH OFM2OPL "14 April 2016" "Web2C 2016" +.TH OFM2OPL 1 "14 April 2016" "Web2C 2017" .PP .SH "NAME" ofm2opl \- convert Omega and TeX font-metric files to property-list files Binary 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 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/opl2ofm.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH OPL2OFM "16 June 2015" "Web2C 2016" +.TH OPL2OFM 1 "16 June 2015" "Web2C 2017" .PP .SH "NAME" opl2ofm \- convert Omega and TeX property-list files to font-metric files Binary files old/texmf-dist/doc/man/man1/opl2ofm.man1.pdf and new/texmf-dist/doc/man/man1/opl2ofm.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/otangle.man1.pdf and new/texmf-dist/doc/man/man1/otangle.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/otp2ocp.1 new/texmf-dist/doc/man/man1/otp2ocp.1 --- old/texmf-dist/doc/man/man1/otp2ocp.1 2010-05-19 10:40:53.000000000 +0200 +++ new/texmf-dist/doc/man/man1/otp2ocp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "otp2ocp" "1" "September 2000" "Omega" "Omega" +.TH "otp2ocp" "1" "April 2017" "TeX Live" .PP .SH "NAME" otp2ocp \- convert Omega Translation Process files to Omega @@ -20,16 +20,13 @@ .SH "SEE ALSO" .PP \fBmkocp\fP(1), \fBomega\fP(1)\&. -.PP -\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&. -.PP -Web page: <http://www\&.gutenberg\&.eu\&.org/omega/> +.PP +<https://ctan\&.org/pkg/omega> .PP .SH "AUTHOR" .PP -The primary authors of Omega are John Plaice -<plaice(a)cse\&.unsw\&.edu\&.au> and Yannis Haralambous -<yannis(a)fluxus-virus\&.com>\&. +\fBmkocp\fP is part of Omega\&. The primary authors of Omega are John Plaice +and Yannis Haralambous\&. .PP This manual page was written by C\&.M\&. Connelly <cmc(a)debian\&.org>, for @@ -37,4 +34,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 Binary files old/texmf-dist/doc/man/man1/otp2ocp.man1.pdf and new/texmf-dist/doc/man/man1/otp2ocp.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/outocp.1 new/texmf-dist/doc/man/man1/outocp.1 --- old/texmf-dist/doc/man/man1/outocp.1 2010-05-19 10:40:53.000000000 +0200 +++ new/texmf-dist/doc/man/man1/outocp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "outocp" "1" "September 2000" "Omega" "Omega" +.TH "outocp" "1" "April 2017" "TeX Live" .PP .SH "NAME" outocp \- debug an OCP file @@ -24,15 +24,12 @@ .PP \fBocp2otp\fP(1), \fBotp2ocp\fP(1), \fBomega\fP(1)\&. .PP -\fIDraft Manual for the Omega System\fP (\fIomega-manual\&.dvi\fP)\&. -.PP -Web page: <http://www\&.gutenberg\&.eu\&.org/omega/> +<https://ctan\&.org/pkg/omega> .PP .SH "AUTHOR" .PP -The primary authors of Omega are John Plaice -<plaice(a)cse\&.unsw\&.edu\&.au> and Yannis Haralambous -<yannis(a)fluxus-virus\&.com>\&. +\fBmkocp\fP is part of Omega\&. The primary authors of Omega are John Plaice +and Yannis Haralambous\&. .PP This manual page was written by C\&.M\&. Connelly <cmc(a)debian\&.org>, for Binary 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 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ovf2ovp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH OVF2OVP "14 April 2016" "Web2C 2016" +.TH OVF2OVP 1 "14 April 2016" "Web2C 2017" .PP .SH "NAME" ovf2ovp \- convert virtual font file and associated font metrics to property-list format Binary 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 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ovp2ovf.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH OVP2OVF "16 June 2015" "Web2C 2016" +.TH OVP2OVF 1 "16 June 2015" "Web2C 2017" .PP .SH "NAME" ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file Binary 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 2016-04-27 03:21:30.000000000 +0200 +++ new/tlpkg/tlpobj/omegaware.doc.tlpobj 2017-05-04 02:07:11.000000000 +0200 @@ -1,8 +1,8 @@ name omegaware.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of omegaware -docfiles size=62 +docfiles size=27 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 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onlyamsmath/ChangeLog new/doc/latex/onlyamsmath/ChangeLog --- old/doc/latex/onlyamsmath/ChangeLog 2012-01-03 01:19:12.000000000 +0100 +++ new/doc/latex/onlyamsmath/ChangeLog 2017-01-12 01:01:03.000000000 +0100 @@ -1,3 +1,7 @@ +2016/12/18 0.20 Harald Harders + Added switch nodollardollar again (prevent from changing catcode + to avoid issues with TikZ/PGF) + 2012/01/01 0.10 Harald Harders Explicitly state date and version in \ProvidesPackage statement Update e-mail address @@ -8,10 +12,10 @@ 2001/09/22 0.03 Harald Harders Changed definition of \dollarcode, by David Kastrup - Removed switches \dollardollar and \nodollardollar + Removed switches dollardollar and nodollardollar 2001/09/21 0.02 Harald Harders - Added switch \nodollardollar + Added switch nodollardollar 2001/09/21 0.01 Harald Harders First version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onlyamsmath/Makefile new/doc/latex/onlyamsmath/Makefile --- old/doc/latex/onlyamsmath/Makefile 2012-01-03 01:19:12.000000000 +0100 +++ new/doc/latex/onlyamsmath/Makefile 2017-01-12 01:01:03.000000000 +0100 @@ -41,8 +41,7 @@ onlyamsmath/ChangeLog \ onlyamsmath/Makefile \ onlyamsmath/onlyamsmath.{dtx,ins,pdf} \ - onlyamsmath/onlyamsmathtest.tex \ - onlyamsmath/onlyamsmath.xml + onlyamsmath/onlyamsmathtest.tex zip: all clean @echo Generate onlyamsmath-$(VERSION).zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onlyamsmath/README new/doc/latex/onlyamsmath/README --- old/doc/latex/onlyamsmath/README 2012-01-03 01:19:12.000000000 +0100 +++ new/doc/latex/onlyamsmath/README 2017-01-12 01:01:03.000000000 +0100 @@ -7,7 +7,7 @@ use the environments provided by the amsmath package. -Copyright 2001, 2012 Harald Harders +Copyright 2001, 2012, 2016 Harald Harders This program can be redistributed and/or modified under the terms of the LaTeX Project Public License Distributed from CTAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onlyamsmath/onlyamsmath-v.tex new/doc/latex/onlyamsmath/onlyamsmath-v.tex --- old/doc/latex/onlyamsmath/onlyamsmath-v.tex 2012-01-03 01:19:12.000000000 +0100 +++ new/doc/latex/onlyamsmath/onlyamsmath-v.tex 2017-01-12 01:01:03.000000000 +0100 @@ -8,7 +8,7 @@ %% %% onlyamsmath package %% -%% Copyright 2001, 2012 Harald Harders +%% Copyright 2001, 2012, 2016 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -18,7 +18,7 @@ %% harald.harders(a)gmx.de %% \ProvidesFile{onlyamsmath-v.tex} - [2012/01/01 v0.10 Destroy the standard math environments] + [2016/12/18 v0.20 Destroy the standard math environments] \endinput %% Binary files old/doc/latex/onlyamsmath/onlyamsmath.pdf and new/doc/latex/onlyamsmath/onlyamsmath.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onlyamsmath.doc.tlpobj new/tlpkg/tlpobj/onlyamsmath.doc.tlpobj --- old/tlpkg/tlpobj/onlyamsmath.doc.tlpobj 2016-04-14 19:31:47.000000000 +0200 +++ new/tlpkg/tlpobj/onlyamsmath.doc.tlpobj 2017-04-14 17:53:03.000000000 +0200 @@ -1,6 +1,6 @@ name onlyamsmath.doc category Package -revision 25006 +revision 42927 shortdesc doc files of onlyamsmath relocated 1 docfiles size=57 ++++++ onlyamsmath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onlyamsmath/onlyamsmath.sty new/tex/latex/onlyamsmath/onlyamsmath.sty --- old/tex/latex/onlyamsmath/onlyamsmath.sty 2012-01-03 01:19:12.000000000 +0100 +++ new/tex/latex/onlyamsmath/onlyamsmath.sty 2017-01-12 01:01:04.000000000 +0100 @@ -8,7 +8,7 @@ %% %% onlyamsmath package %% -%% Copyright 2001, 2012 Harald Harders +%% Copyright 2001, 2012, 2016 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -18,7 +18,7 @@ %% harald.harders(a)gmx.de %% \ProvidesPackage{onlyamsmath} - [2012/01/01 v0.10 Destroy the standard math environments] + [2016/12/18 v0.20 Destroy the standard math environments] \RequirePackage{amsmath} \newif\ifonlyams@eqnarray \DeclareOption{eqnarray}{\onlyams@eqnarraytrue} @@ -31,6 +31,8 @@ \onlyams@errortrue \DeclareOption{error}{\onlyams@errortrue} \DeclareOption{warning}{\onlyams@errorfalse} +\newif\ifonlyams@nodollardollar +\DeclareOption{nodollardollar}{\onlyams@nodollardollartrue} \ExecuteOptions{error} \ProcessOptions\relax \newcommand{\onlyams@error}[1]{% @@ -69,7 +71,10 @@ \onlyams@error{$$ $$}% \expandafter \[ \fi} -\AtBeginDocument{\catcode`\$=13 } +\ifonlyams@nodollardollar +\else + \AtBeginDocument{\catcode`\$=13 } +\fi \endinput %% 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 2016-04-14 19:31:48.000000000 +0200 +++ new/tlpkg/tlpobj/onlyamsmath.tlpobj 2017-04-14 17:53:03.000000000 +0200 @@ -1,6 +1,6 @@ name onlyamsmath category Package -revision 25006 +revision 42927 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 @@ -11,7 +11,7 @@ RELOC/tex/latex/onlyamsmath/onlyamsmath.sty catalogue-also nag catalogue-ctan /macros/latex/contrib/onlyamsmath -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-10 23:29:26 +0100 catalogue-license lppl catalogue-topics maths latex-qual -catalogue-version 0.10 +catalogue-version 0.20 ++++++ 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 2016-04-14 19:31:48.000000000 +0200 +++ new/tlpkg/tlpobj/onrannual.tlpobj 2017-04-14 17:53:03.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/onrannual/onrannual.cls catalogue-ctan /macros/latex/contrib/onrannual -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:48.000000000 +0200 +++ new/tlpkg/tlpobj/opcit.tlpobj 2017-04-14 17:53:03.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/bibtex/bst/opcit/opcit.bst RELOC/tex/latex/opcit/opcit.sty catalogue-ctan /macros/latex/contrib/opcit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:49.000000000 +0200 +++ new/tlpkg/tlpobj/opensans.tlpobj 2017-04-14 17:53:04.000000000 +0200 @@ -815,7 +815,7 @@ RELOC/tex/latex/opensans/x2fos.fd RELOC/tex/latex/opensans/x2fosj.fd catalogue-ctan /fonts/opensans -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:58.000000000 +0200 +++ new/tlpkg/tlpobj/opteng.tlpobj 2017-04-14 17:53:07.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/opteng/opteng.sty catalogue-also spie catalogue-ctan /macros/latex/contrib/opteng -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:58.000000000 +0200 +++ new/tlpkg/tlpobj/optional.tlpobj 2017-04-14 17:53:07.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/latex/optional/optional.sty catalogue-ctan /macros/latex/contrib/optional -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cond-comp editorial catalogue-version 2.2b ++++++ options.doc.tar.xz ++++++ ++++++ options.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/options.tlpobj new/tlpkg/tlpobj/options.tlpobj --- old/tlpkg/tlpobj/options.tlpobj 2016-04-14 19:31:59.000000000 +0200 +++ new/tlpkg/tlpobj/options.tlpobj 2017-04-14 17:53:07.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/options/options.sty catalogue-also keyval pgfkeys xkeyval catalogue-ctan /macros/latex/contrib/options -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics keyval catalogue-version 1.0 ++++++ 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 2016-04-14 19:31:59.000000000 +0200 +++ new/tlpkg/tlpobj/ordinalpt.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/ordinalpt/ordinalpt.sty catalogue-ctan /macros/latex/contrib/ordinalpt -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:31:59.000000000 +0200 +++ new/tlpkg/tlpobj/orkhun.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/fonts/tfm/public/orkhun/orhant20.tfm RELOC/fonts/tfm/public/orkhun/orhant25.tfm catalogue-ctan /fonts/orkhun -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics turkish ++++++ oscola.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/oscola/README new/doc/latex/oscola/README --- old/doc/latex/oscola/README 2014-05-23 00:03:54.000000000 +0200 +++ new/doc/latex/oscola/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -SUMMARY -======= - -The Oscola package works (only!) with Biblatex (v 2.0 or later) and -Biber (v 1.0 or later). It aims to implement, almost completely, the -OSCOLA style of legal citation, according to the 4th edition. For -further information about coverage see the documentation. - -FILES AND LICENCE -================= - -The package consists of three principal files (oscola.bbx, oscola.cbx -and english-oscola.lbx) which should be placed, documentation -(oscola.pdf), and a very short index style file -(oscola.ist). Those files are copyright (c) Paul Stanley 2012-13. - -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 the license is in - http://www.latex-project.org/lppl.txt -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 Paul Stanley (pstanley(a)essexcourt.net) - -The documentation consists of oscola.pdf and -oscola-examples.bib. Those files are distributed under the Creative -Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that -license is available at - http://creativecommons.org/licenses/by/3.0/deed.en_GB - -The LaTeX source of oscola.pdf is available upon request -from the author, or from https://github.com/PaulStanley/oscola-biblatex. -It is also licensed under CC BY 3.0. - -All bug reports, questions, or suggestions should be sent to the -maintainer, whose email is pstanley(a)essexcourt.net. - -INSTALLATION -============ - -I find the TDS difficult, but I think the correct installation (under -the local tree) is as follows: - -oscola.bbx: With the bibliography style files in - ...tex/latex/biblatex/bbx -oscola.cbx: With the citation style files in - .../tex/latex/biblatex/cbx -english-oscola.lbx: With the language definition files in - .../tex/latex/biblatex/lbx -oscola.pdf: With documentation in a suitable directory - under .../doc/latex -oscola.ist: With the index style files in - .../makeindex/latex -oscola-examples.bib: With the sample bibliography files in a suitable - directory under .../bibtex/bib - -VERSION HISTORY -=============== - -August 2012 Version 1 Original release - -May 2013 Version 1.2 Various bugfixes, and implementation - of citation scheme for UN documents - -October 2013 Version 1.3 Corrected spacing bug - -May 2014 Version 1.4 Various bugs have been fixed, an additional - index has been installed, and there have - been minor improvements to the documentation - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/oscola/README.md new/doc/latex/oscola/README.md --- old/doc/latex/oscola/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/oscola/README.md 2017-03-25 21:53:44.000000000 +0100 @@ -0,0 +1,69 @@ +# Summary + +The Oscola package works (only!) with Biblatex (v 2.0 or later) and +Biber (v 1.0 or later). It aims to implement, almost completely, the +OSCOLA style of legal citation, according to the +[4th edition](https://www.law.ox.ac.uk/sites/files/oxlaw/oscola_4th_edn_hart_2012.pdf). For +further information about coverage see the documentation. + +# Files and licence + +## The package + +The package consists of four principal files (`oscola.bbx`, `oscola.cbx`, +`english-oscola.lbx`, and `british-oscola.lbx`) and a very short index +style file, `oscola.ist`. Those files are copyright (c) Paul Stanley +2012-17. + +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 the license is in [available online](http://www.latex-project.org/lppl.txt) +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 Paul Stanley (pstanley(a)essexcourt.net). + +## The documentation + +The documentation consists of `oscola.tex`, `oscola.pdf` and +`oscola-examples.bib`. Those files are distributed under the Creative +Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that +license is available [online](http://creativecommons.org/licenses/by/3.0/deed.en_GB). + +## Bug reports + +All bug reports, questions, or suggestions should be sent to the +maintainer, whose email is pstanley(a)essexcourt.net. + +# Installation + +I find the TDS difficult. TeXlive, whose maintainers apparently don't, +currently installs as follows: + +* `oscola.bbx`: in the package directory `...tex/latex/oscola` +* `oscola.cbx`: in the package directory `.../tex/latex/oscola` +* `english-oscola.lbx`: in the package directory `.../tex/latex/oscola` +* `british-oscola.lbx`: in the package directory `.../tex/latex/oscola` +* `oscola.pdf` and `oscola.tex`: with documentation under `.../doc/latex/oscola` +* `oscola.ist`: with the index style files in `.../makeindex/oscola` + +# Version history + +August 2012 Version 1 Original release + +May 2013 Version 1.2 Various bugfixes, and implementation + of citation scheme for UN documents + +October 2013 Version 1.3 Corrected spacing bug + +May 2014 Version 1.4 Various bugs have been fixed, an additional + index has been installed, and there have + been minor improvements to the documentation + +March 2017 Version 1.5 The package has been updated to take + account of changes in Biblatex; various bugs + have been fixed; experimental support has + been added for the use of ECLI numbers + in EU cases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/oscola/oscola-examples.bib new/doc/latex/oscola/oscola-examples.bib --- old/doc/latex/oscola/oscola-examples.bib 2013-05-28 01:01:50.000000000 +0200 +++ new/doc/latex/oscola/oscola-examples.bib 2017-03-25 21:53:44.000000000 +0100 @@ -245,7 +245,7 @@ location = {London}, } @jurisdiction{adbhu, - keywords = {eu}, + keywords = {eu}, title = {Procureur de la R\'epublique v ADBHU}, shorttitle = {ADBHU}, number = {240/83}, @@ -253,6 +253,7 @@ date = {1985}, reporter = {ECR}, pages = {531}, + ecli = {EU:C:1985:59}, } @jurisdiction{C430/93, Binary files old/doc/latex/oscola/oscola.pdf and new/doc/latex/oscola/oscola.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/oscola/oscola.tex new/doc/latex/oscola/oscola.tex --- old/doc/latex/oscola/oscola.tex 2014-05-23 00:03:54.000000000 +0200 +++ new/doc/latex/oscola/oscola.tex 2017-03-25 21:53:44.000000000 +0100 @@ -1,14 +1,17 @@ -% This file documents the biblatex-oscola package. It is (c) Paul Stanley 2014 +% This file documents the biblatex-oscola package. It is (c) Paul Stanley 2014-2017 % and licensed under the Creative Commons Attribution 3.0-Unported License (CC BY 3.0). A copy of that % license is available at % http://creativecommons.org/licenses/by/3.0/deed.en_GB % -% The documentation makes use of fonts that are commercially available, but may -% be modified so that it does not do so. -% To compile: run LaTeX, Biber, LaTeX, LaTeX, splitindex -- -s oscola.ist, makeindex oscola-documentation-general, LaTeX, LaTeX +% To compile: run +% LaTeX <oscola> +% Biber <oscola> +% LaTeX <oscola> , LaTeX <oscola> +% splitindex <oscola> -- -s oscola.ist +% makeindex oscola-general +% LaTeX <oscola>, LaTeX <oscola> % % - \documentclass[a4paper, 11pt, DIV=1, @@ -16,8 +19,8 @@ {scrartcl} % SET VERSION NUMBER AND RELEASE DATE -\def\releasedate{22 May 2014} -\def\versionnumber{1.4} +\def\releasedate{1 April 2017} +\def\versionnumber{1.5} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{geometry} @@ -36,6 +39,7 @@ \usepackage[style=oscola, indexing=cite, backend=biber, + ecli=yes, babel=hyphen]{biblatex} \usepackage[splitindex, @@ -63,18 +67,14 @@ \renewcommand{\linespread}{1.2} -% HYPER REF - -\usepackage{hyperref} - - % Various commands and environments specific to this document \newcommand{\oscola}{\textsc{bl-oscola}} \newcommand{\biblatex}{\textsc{biblatex}} \newcommand{\oscolashort}{\textsc{oscola}\nocite{oscola}} \newcounter{egcounter}\setcounter{egcounter}{0} - +% TYPOGRAPHY +\usepackage{scrpage2} \usepackage[dvipsnames]{xcolor} % This code from Juanjo's answer at http://www.latex-community.org @@ -101,6 +101,11 @@ \newcommand{\egcite}[1]{{\texttt{\textbackslash cite#1}}} \newcommand\angledtext[1]{$\langle$\textit{#1}\/$\rangle$} +% HYPER REF + +\usepackage[final=true,colorlinks=true]{hyperref} + + % BIBLIOGRAPHIC RESOURCES \addbibresource{oscola-examples.bib} @@ -109,9 +114,8 @@ \hyphenation{nieu-wen-huis} \hyphenation{sti-cht-ing} -% TYPOGRAPHY -\usepackage{scrpage2} +% Some basic typographical settings \deffootnote{1em}{1em}{\thefootnotemark\ } \setcounter{secnumdepth}{-1} \frenchspacing @@ -192,6 +196,8 @@ \tableofcontents +\clearpage + \section{Scope} \index[general]{scope of package|(}The \oscola\ style for \biblatex\ @@ -225,7 +231,7 @@ a work with \emph{extensive} citation of public international law materials. -\textsc{Bl-oscola}\index[general]{scope of package!historical cases} +This style\index[general]{scope of package!historical cases} does not include citation forms for Yearbook or historical cases\footcite[20--21]{oscola} (other than the \enquote{plain vanilla} of the nominate reports and the English Reports). Nor does the package @@ -249,13 +255,13 @@ the US, Australia, Canada and New Zealand, but not for citing legislation or `official' materials. \item The \oscola\ style provides basic facilities for citing public - international law treaties and case law, and at least many UN documents, but does not cover - everything that the 3rd edition of \oscola\ specifies in relation to - such materials. + international law treaties and case law, and at least many UN + documents, but does not cover everything that the 3rd edition of + \oscola\ specifies in relation to such materials. \end{itemize} -I hope that the coverage is sufficient for most UK legal work; I believe -that only specialists in public international law or legal history are -likely to find it significantly deficient. +I hope that the coverage is sufficient for most UK legal work; I +believe that only specialists in public international law or legal +history are likely to find it significantly deficient. \subsection{Language} @@ -278,9 +284,11 @@ Joseph Wright -- without whom this would be impossible. Many members of the community at \TeX-StackExchange\footnote{\url{tex.stackexchange.com}} have helped -too. I've borrowed from more people than I can remember. Daniel -H\"ogger identified various important bugs, and suggested -improvements, particularly in relation to international law materials. Thanks to everyone. +too, at first by answering my questions, and later by asking (and and +sometimes answering) their own. I've borrowed from more people than I +can remember. Daniel H\"ogger identified various important bugs, and +suggested improvements, particularly in relation to international law +materials. Thanks to everyone. \subsection{An apology} @@ -378,12 +386,9 @@ \index[general]{english-oscola.ist(a)\texttt{english-oscola.ist}} I would suggest installation in your (local) \TeX\ directory as follows: \begin{description} -\item[oscola.bbx] With the bibliography style files in \texttt{.../\allowbreak tex/\allowbreak latex/\linebreak biblatex/\allowbreak bbx}. -\item[oscola.cbx] With the citation style files in \texttt{.../tex/latex/\linebreak biblatex/cbx}. -\item[english-oscola.lbx] With the language definition files in \texttt{.../tex/latex/\linebreak biblatex/lbx}. -\item[oscola.pdf] With documentation in a suitable directory under\linebreak \texttt{.../doc/latex}. -\item[oscola.ist] With the index style files in \verb|.../makeindex/latex|. -\item[oscola-examples.bib] With the sample bibliography files in a suitable directory under \verb|.../bibtex/bib|. +\item The operational files (that is \verb|oscola.bbx|, \verb|oscola.cbx|, \verb|english-oscola.lbx| and \verb|british-oscola.lbx| go with \LaTeX\ macros under \verb|.../tex/latex/oscola|. +\item The index style file \verb|oscola.idx| goes with other such files under \verb|.../makeindex/oscola|. +\item The documentation files (\verb|oscola.tex| and \verb|oscola.pdf| go under \verb|.../doc/latex/oscola|. \end{description} \section{Basic Use} @@ -460,6 +465,16 @@ To my eye that looks odd. The option \texttt{caseshorthands=italic} will see to it that shorthand names for cases, like their short titles, will be printed in italic type. +\item[ecli]\index[general]{ECLI numbers} + \index[general]{options!ecli@\texttt{ecli}} This option controls + whether the EU's recently introduced ECLI numbers get + printed. Options are: \verb|yes| (the default), which means they are + printed when available in addition to the official report, + \verb|no|, in which case they are never printed, or \verb|only|, in + which case only ECLI numbers are used, with no printed report, in + the current style of the CJEU itself (not yet officially accepted by + the standard). Note that if the case is otherwise unreported, ECLI + numbers will always be used if available. \item[ibidstyle]\index[general]{customization!ibid} \index[general]{ibid!capitalization} \index[general]{options!ibidstyle@\texttt{ibidstyle}} @@ -846,6 +861,7 @@ information in an external file which will, with the help of another \index[general]{Imakeidx!recommended} \index[general]{Splitindex!recommended} +\index[general]{memoir!incompatibility} package (\textsc{imakeidx} is the one I recommend) and an external program or programs (I recommend \textsc{splitindex})\footnote{Why \textsc{imakeidx} and \textsc{splitindex}? I like \textsc{splitindex} @@ -853,7 +869,9 @@ can only write a number of auxiliary files. I like \textsc{imakeidx} because it provides a convenient method of using \textsc{splitindex}. You cannot, in fact, use \textsc{splitindex} -directly with \oscola.} produce the necessary tables. +directly with \oscola.} produce the necessary tables. If you are using the +\textsc{memoir} class, you \emph{must} load \textsc{imakeidx}, to avoid some +fundamental problems. The complication is in the word `tries'. The difficulty is that it's not obvious how many indexes you want. \textsc{Oscola} leaves you @@ -1074,7 +1092,10 @@ \item If you are using \textsc{splitindex}, run it with the option \verb|-m|, and then process each of the resulting sub-indices that you want formatted with leaders with the option \verb|-s oscola|. -\item Alternatively, run \textsc{splitindex} with the option \verb|-- -s oscola|, which will run \textsc{makeindex} on each file with the requisite style. +\item Alternatively, run \textsc{splitindex} with the option \verb|-- -s oscola|, which will run \textsc{makeindex} on each file with the requisite style. In that case your \verb|.tex| source base name comes first, so that the overall command is +\begin{verbatim} +splitindex [BASENAME] -- -s oscola +\end{verbatim} \end{itemize} The only real annoyance is when you have multiple indexes and want @@ -1898,7 +1919,9 @@ \index[general]{bibfile(a)\texttt{.bib} file!number field@\texttt{number field}} \index[general]{cases!European Union!case number@\texttt{case number}} Enter the case number (or numbers) in the - \texttt{number} field. Do not include `Case' or `Joined Cases' in the number field. + \texttt{number} field. Do not include `Case' or `Joined Cases' in the number field. This + is the number given to the case by the court registry -- not the ECLI number given + to the reported decision. \item[type] If your case is an ordinary one (ie, `Case' or `Joined Cases') you need enter nothing here. If you need to specify something unusual (like \texttt{Opinion}) to precede the case @@ -1910,6 +1933,10 @@ some other full report) you can include a citation to the Official Journal. Follow the advice set out in relation to Commission decisions, below. +\item[ecli]\index[general]{ECLI number} + The ECLI number for the case report. Note that whether the + number is used depends on the setting of the option \verb|ecli| to + \verb|yes| (the default), \verb|no|, or \verb|only|. \item[pagination] You can, if you like, specify \texttt{paragraph}; but if nothing is entered, paragraph will be assumed. \end{description} @@ -1948,6 +1975,7 @@ date = {1985}, journaltitle = {ECR}, pages = {531}, + ecli = {EU:C:1985:59}, } \end{verbatim} \end{bibexample} @@ -2943,8 +2971,8 @@ \begin{bibexample}[spbill4] \begin{verbatim} @misc{spbill4, - title = {SP Bill 4 Abolition of Feudal Tenure etc (Scotland) - Bill [as introduced] Session 1}, + title = {SP Bill 4 Abolition of Feudal Tenure etc + (Scotland) Bill [as introduced] Session 1}, date = {1999}, } \end{verbatim} @@ -3378,8 +3406,8 @@ @legal{aaland, title = {Convention Relating to the Non-Fortification and Neutralisation of the Aaland Islands}, - parties = {{Aaaland Islands} and Germany and Denmark and Estonia - and Finland and France}, + parties = {{Aaaland Islands} and Germany and Denmark + and Estonia and Finland and France}, lista = {opened=1921-10-02 and inforce=1922-12-06}, pagination = {article}, volume = {9}, @@ -3427,11 +3455,12 @@ volume = {213}, reporter = {U.N.T.S.}, pages = {221}, - note = {as amended by Protocol No 14bis to the Convention - for the Protection of Human Rights and - Fundamental Freedoms - (opened for signature 27 May 2009, entered into force - 1 September 2009) CETS No 204}, + note = {as amended by Protocol No 14bis to the + Convention for the Protection of Human Rights + and Fundamental Freedoms + (opened for signature 27 May 2009, + entered into force1 September 2009) + CETS No 204}, shorthand = {ECHR}, entrysubtype = {piltreaty}, } @@ -4542,10 +4571,11 @@ \begin{bibexample}[com895] \begin{verbatim} @report{com895, - title = {Proposal for a Council Decision on the conclusion, - on behalf of the European Community, of a Protocol - on the Implementation of the Alpine Convention in - the Field of Transport (Transport Protocol)}, + title = {Proposal for a Council Decision on the + conclusion, on behalf of the European Community, + of a Protocol on the Implementation of the Alpine + Convention in the Field of Transport + (Transport Protocol)}, institution = {Commission}, number = {COM (2008) 895 final}, entrysubtype = {comdoc} @@ -4571,9 +4601,10 @@ \begin{bibexample}[com348] \begin{verbatim} @report{com348, - title = {Proposal for a Council Regulation on jurisdiction - and the recognition and enforcement of judgments - in civil and commercial matters}, + title = {Proposal for a Council Regulation on + jurisdiction and the recognition and + enforcement of judgments in civil and + commercial matters}, number = {COM (99) 348 final}, institution = {Commission}, entrysubtype = {comdoc}, @@ -4769,8 +4800,9 @@ \begin{verbatim} @inproceedings{reliance, author = {McFarlane, Ben and Nolan, Donal}, - title = {Remedying Reliance: The Future Development of - Promissory and Proprietary Estoppel in English Law}, + title = {Remedying Reliance: The Future Development + of Promissory and Proprietary Estoppel in + English Law}, eventtitle = {Obligations III conference}, location = {Brisbane}, eventdate = {2006-07-01}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oscola.doc.tlpobj new/tlpkg/tlpobj/oscola.doc.tlpobj --- old/tlpkg/tlpobj/oscola.doc.tlpobj 2016-04-14 19:31:59.000000000 +0200 +++ new/tlpkg/tlpobj/oscola.doc.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -1,10 +1,10 @@ name oscola.doc category Package -revision 34207 +revision 43599 shortdesc doc files of oscola relocated 1 -docfiles size=277 - RELOC/doc/latex/oscola/README +docfiles size=212 + RELOC/doc/latex/oscola/README.md RELOC/doc/latex/oscola/oscola-examples.bib RELOC/doc/latex/oscola/oscola.pdf RELOC/doc/latex/oscola/oscola.tex ++++++ oscola.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/oscola/oscola.ist new/makeindex/oscola/oscola.ist --- old/makeindex/oscola/oscola.ist 2013-05-28 01:01:50.000000000 +0200 +++ new/makeindex/oscola/oscola.ist 2017-03-25 21:53:44.000000000 +0100 @@ -1,6 +1,6 @@ % Part of the OSCOLA package for biblatex: see the file % oscola.lbx for copyright and licence information -% v 1.2 23/05/2013 +% v 1.5 01/04/2017 delim_0 "\\space\\dotfill\\space " delim_1 "\\space\\dotfill\\space " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/british-oscola.lbx new/tex/latex/oscola/british-oscola.lbx --- old/tex/latex/oscola/british-oscola.lbx 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/oscola/british-oscola.lbx 2017-03-25 21:53:44.000000000 +0100 @@ -0,0 +1,572 @@ +% Based on english.lbx by Philip Lehman and others +% Part of the OSCOLA package for biblatex: see the file +% oscola.lbx for copyright and licence information + +\ProvidesFile{british-oscola.lbx}[2017/04/01 v 1.5 Biblatex localisation file for OSCOLA citations] + +\InheritBibliographyExtras{british} + +\NewBibliographyString{regulation, + regulations, + eucase, + eujoinedcases, + commissiondecision, + article, + articles, + application, + rule, + rules, + order, + directive, + decision, + bill, + draft, + clause, + clauses, + signed, + opened, + inforce, + adopted, + casenote, + firstpublished} + +\DeclareBibliographyExtras{% + \protected\def\bibrangedash{% + \textendash\penalty\hyphenpenalty}% breakable dash + \protected\def\bibdatedash{\bibrangedash}% + \def\finalandcomma{\addcomma}% + \protected\def\mkbibordinal#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}% + \ifnum\@tempcnta>20 + \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}% + \fi + \ifcase\@tempcnta th\or st\or nd\or rd\else th\fi + \endgroup}% + \protected\def\mkusbibordinal#1{% + \begingroup + \@tempcnta0#1\relax\number\@tempcnta + \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}% + \ifnum\@tempcnta>20 + \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}% + \fi + \ifcase\@tempcnta th\or st\or d\or d\else th\fi + \endgroup}% + \protected\def\mkbibmascord{\mkbibordinal}% + \protected\def\mkbibfemord{\mkbibordinal}% + \protected\def\mkbibdatelong#1#2#3{% + \iffieldundef{#3} + {}% + {\stripzeros{\thefield{#3}}% + \iffieldundef{#2}{}{\nobreakspace}}% + \iffieldundef{#2}% + {}% + {\mkbibmonth{\thefield{#2}}% + \iffieldundef{#1}{}{\space}}% + \iffieldundef{#1}% + {}% + {\stripzeros{\thefield{#1}}}}% + \protected\def\mkbibdateshort#1#2#3{% + \iffieldundef{#2} + {} + {\mkdatezeros{\thefield{#2}}% + \iffieldundef{#3} + {\iffieldundef{#1}{}{/}} + {/}}% + \iffieldundef{#3} + {} + {\mkdatezeros{\thefield{#3}}% + \iffieldundef{#1}{}{/}}% + \mkdatezeros{\thefield{#1}}}% + \savecommand\mkbibrangecomp + \savecommand\mkbibrangecompextra + \savecommand\mkbibrangeterse + \savecommand\mkbibrangeterseextra + \protected\def\mkbibrangecomp{% + \lbx@us@mkbibrangetrunc@long{long}}% + \protected\def\mkbibrangeterse{% + \lbx@us@mkbibrangetrunc@short{short}}% + \protected\def\mkbibrangecompextra{% + \lbx@us@mkbibrangetruncextra@long{long}}% + \protected\def\mkbibrangeterseextra{% + \lbx@us@mkbibrangetruncextra@short{short}}% + \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} + +\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \mbox{\bibdatedash}} + {\bibdatedash + \iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% + \printfield{extrayear}}}}}} + +\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + \printfield{extrayear}}}}}} +} + +\UndeclareBibliographyExtras{% + \restorecommand\mkbibrangecomp + \restorecommand\mkbibrangecompextra + \restorecommand\mkbibrangeterse + \restorecommand\mkbibrangeterseextra +} + +\DeclareBibliographyStrings{% +% inherit = {english}, + bibliography = {{Bibliography}{Bibliography}}, + references = {{References}{References}}, + shorthands = {{List of Abbreviations}{Abbreviations}}, + editor = {{editor}{ed}}, + editors = {{editors}{eds}}, + compiler = {{compiler}{comp}}, + compilers = {{compilers}{comp}}, + redactor = {{redactor}{red}}, + redactors = {{redactors}{red}}, + founder = {{founder}{found}}, + founders = {{founders}{found}}, + continuator = {{continued}{cont}}, % FIXME: unsure + continuators = {{continued}{cont}}, % FIXME: unsure + collaborator = {{collaborator}{collab}}, % FIXME: unsure + collaborators = {{collaborators}{collab}}, % FIXME: unsure + translator = {{translator}{tr}}, + translators = {{translators}{trs}}, + commentator = {{commentator}{comm}}, + commentators = {{commentators}{comm}}, + annotator = {{annotator}{annot}}, + annotators = {{annotators}{annot}}, + commentary = {{commentary}{comm}}, + annotations = {{annotations}{annot}}, + introduction = {{introduction}{intro}}, + foreword = {{foreword}{foreword}}, + afterword = {{afterword}{afterword}}, + editortr = {{editor and translator}% + {ed and tr}}, + editorstr = {{editors and translators}% + {eds and trs}}, + editorco = {{editor and commentator}% + {ed and comm}}, + editorsco = {{editors and commentators}% + {eds and comm}}, + editoran = {{editor and annotator}% + {ed and annot}}, + editorsan = {{editors and annotators}% + {eds and annot}}, + editorin = {{editor and introduction}% + {ed and introd}}, + editorsin = {{editors and introduction}% + {eds and introd}}, + editorfo = {{editor and foreword}% + {ed and foreword}}, + editorsfo = {{editors and foreword}% + {eds and forewords}}, + editoraf = {{editor and afterword}% + {ed and afterword}}, + editorsaf = {{editors and afterword}% + {eds and afterword}}, + editortrco = {{editor, translator\finalandcomma\ and commentator}% + {ed\addcomma\space trans\finalandcomma\ and comm}}, + editorstrco = {{editors, translators\finalandcomma\ and commentators}% + {eds,\addabbrvspace trans\finalandcomma\ and comm}}, + editortran = {{editor, translator\finalandcomma\ and annotator}% + {ed,\addabbrvspace trans\finalandcomma\ and annot}}, + editorstran = {{editors, translators\finalandcomma\ and annotators}% + {eds,\addabbrvspace trans\finalandcomma\ and annot}}, + editortrin = {{editor, translator\finalandcomma\ and introduction}% + {ed,\addabbrvspace trans\finalandcomma\ and introd}}, + editorstrin = {{editors, translators\finalandcomma\ and introduction}% + {eds,\addabbrvspace trans\finalandcomma\ and introd}}, + editortrfo = {{editor, translator\finalandcomma\ and foreword}% + {ed.,\addabbrvspace trans\finalandcomma\ and forew}}, + editorstrfo = {{editors, translators\finalandcomma\ and foreword}% + {eds,\addabbrvspace trans\finalandcomma\ and forew}}, + editortraf = {{editor, translator\finalandcomma\ and afterword}% + {ed,\addabbrvspace trans\finalandcomma\ and afterw}}, + editorstraf = {{editors, translators\finalandcomma\ and afterword}% + {eds,\addabbrvspace trans\finalandcomma\ and afterw}}, + editorcoin = {{editor, commentator\finalandcomma\ and introduction}% + {ed,\addabbrvspace comm\finalandcomma\ and introd}}, + editorscoin = {{editors, commentators\finalandcomma\ and introduction}% + {eds,\addabbrvspace comm\finalandcomma\ and introd}}, + editorcofo = {{editor, commentator\finalandcomma\ and foreword}% + {ed,\addabbrvspace comm\finalandcomma\ and forew}}, + editorscofo = {{editors, commentators\finalandcomma\ and foreword}% + {eds,\addabbrvspace comm\finalandcomma\ and forew}}, + editorcoaf = {{editor, commentator\finalandcomma\ and afterword}% + {ed,\addabbrvspace comm\finalandcomma\ and afterw}}, + editorscoaf = {{editors, commentators\finalandcomma\ and afterword}% + {eds,\addabbrvspace comm\finalandcomma\ and afterw}}, + editoranin = {{editor, annotator\finalandcomma\ and introduction}% + {ed,\addabbrvspace annot\finalandcomma\ and introd}}, + editorsanin = {{editors, annotators\finalandcomma\ and introduction}% + {eds,\addabbrvspace annot\finalandcomma\ and introd}}, + editoranfo = {{editor, annotator\finalandcomma\ and foreword}% + {ed,\addabbrvspace annot\finalandcomma\ and forew}}, + editorsanfo = {{editors, annotators\finalandcomma\ and foreword}% + {eds,\addabbrvspace annot\finalandcomma\ and forew}}, + editoranaf = {{editor, annotator\finalandcomma\ and afterword}% + {ed,\addabbrvspace annot\finalandcomma\ and afterw}}, + editorsanaf = {{editors, annotators\finalandcomma\ and afterword}% + {eds,\addabbrvspace annot\finalandcomma\ and afterw}}, + editortrcoin = {{editor, translator, commentator\finalandcomma\ and introduction}% + {ed,\addabbrvspace trans, comm\finalandcomma\ and introd}}, + editorstrcoin = {{editors, translators, commentators\finalandcomma\ and introduction}% + {eds,\addabbrvspace trans, comm\finalandcomma\ and introd}}, + editortrcofo = {{editor, translator, commentator\finalandcomma\ and foreword}% + {ed,\addabbrvspace trans, comm\finalandcomma\ and forew}}, + editorstrcofo = {{editors, translators, commentators\finalandcomma\ and foreword}% + {eds,\addabbrvspace trans, comm\finalandcomma\ and forew}}, + editortrcoaf = {{editor, translator, commentator\finalandcomma\ and afterword}% + {ed,\addabbrvspace trans, comm\finalandcomma\ and afterw}}, + editorstrcoaf = {{editors, translators, commentators\finalandcomma\ and afterword}% + {eds,\addabbrvspace trans, comm\finalandcomma\ and afterw}}, + editortranin = {{editor, translator, annotator\finalandcomma\ and introduction}% + {ed,\addabbrvspace trans, annot\finalandcomma\ and introd}}, + editorstranin = {{editors, translators, annotators\finalandcomma\ and introduction}% + {eds,\addabbrvspace trans, annot\finalandcomma\ and introd}}, + editortranfo = {{editor, translator, annotator\finalandcomma\ and foreword}% + {ed,\addabbrvspace trans, annot\finalandcomma\ and forew}}, + editorstranfo = {{editors, translators, annotators\finalandcomma\ and foreword}% + {eds,\addabbrvspace trans, annot\finalandcomma\ and forew}}, + editortranaf = {{editor, translator, annotator\finalandcomma\ and afterword}% + {ed,\addabbrvspace trans, annot\finalandcomma\ and afterw}}, + editorstranaf = {{editors, translators, annotators\finalandcomma\ and afterword}% + {eds,\addabbrvspace trans, annot\finalandcomma\ and afterw}}, + translatorco = {{translator and commentator}% + {trans\ and comm}}, + translatorsco = {{translators and commentators}% + {trans\ and comm}}, + translatoran = {{translator and annotator}% + {trans\ and annot}}, + translatorsan = {{translators and annotators}% + {trans\ and annot}}, + translatorin = {{translation and introduction}% + {trans\ and introd}}, + translatorsin = {{translation and introduction}% + {trans\ and introd}}, + translatorfo = {{translation and foreword}% + {trans\ and forew}}, + translatorsfo = {{translation and foreword}% + {trans\ and forew}}, + translatoraf = {{translation and afterword}% + {trans\ and afterw}}, + translatorsaf = {{translation and afterword}% + {trans\ and afterw}}, + translatorcoin = {{translation, commentary\finalandcomma\ and introduction}% + {trans, comm\finalandcomma\ and introd}}, + translatorscoin = {{translation, commentary\finalandcomma\ and introduction}% + {trans, comm\finalandcomma\ and introd}}, + translatorcofo = {{translation, commentary\finalandcomma\ and foreword}% + {trans, comm\finalandcomma\ and forew}}, + translatorscofo = {{translation, commentary\finalandcomma\ and foreword}% + {trans, comm\finalandcomma\ and forew}}, + translatorcoaf = {{translation, commentary\finalandcomma\ and afterword}% + {trans, comm\finalandcomma\ and afterw}}, + translatorscoaf = {{translation, commentary\finalandcomma\ and afterword}% + {trans, comm\finalandcomma\ and afterw}}, + translatoranin = {{translation, annotations\finalandcomma\ and introduction}% + {trans, annot\finalandcomma\ and introd}}, + translatorsanin = {{translation, annotations\finalandcomma\ and introduction}% + {trans, annot\finalandcomma\ and introd}}, + translatoranfo = {{translation, annotations\finalandcomma\ and foreword}% + {trans, annot\finalandcomma\ and forew}}, + translatorsanfo = {{translation, annotations\finalandcomma\ and foreword}% + {trans, annot\finalandcomma\ and forew}}, + translatoranaf = {{translation, annotations\finalandcomma\ and afterword}% + {trans, annot\finalandcomma\ and afterw}}, + translatorsanaf = {{translation, annotations\finalandcomma\ and afterword}% + {trans, annot\finalandcomma\ and afterw}}, + byauthor = {{by}{by}}, + byeditor = {{edited by}{ed}}, + bycompiler = {{compiled by}{compiler}}, + byredactor = {{redacted by}{redactor}}, + byfounder = {{founded by}{founder}}, + bycontinuator = {{continued by}{continuator}}, + bycollaborator = {{in collaboration with}{in collaboration with}}, % FIXME: unsure + bytranslator = {{translated \lbx@lfromlang\ by}{tr}}, + bycommentator = {{commented by}{commentator}}, + byannotator = {{annotated by}{annotator}}, + withcommentator = {{with a commentary by}{with a commentary by}}, + withannotator = {{with annotations by}{with annots\ by}}, + withintroduction = {{with an introduction by}{with an intro\ by}}, + withforeword = {{with a foreword by}{with a forew\ by}}, + withafterword = {{with an afterword by}{with an afterw\ by}}, + byeditortr = {{edited and translated \lbx@lfromlang\ by}% + {edspace and trans\ \lbx@sfromlang\ by}}, + byeditorco = {{edited and commented by}% + {edspace and comm\ by}}, + byeditoran = {{edited and annotated by}% + {edspace and annot\ by}}, + byeditorin = {{edited, with an introduction, by}% + {ed,\addabbrvspace with an introd, by}}, + byeditorfo = {{edited, with a foreword, by}% + {ed,\addabbrvspace with a forew, by}}, + byeditoraf = {{edited, with an afterword, by}% + {ed,\addabbrvspace with an afterw, by}}, + byeditortrco = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm\ by}}, + byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot\ by}}, + byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}% + {edspace and trans\ \lbx@sfromlang, with an introd, by}}, + byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}% + {edspace and trans\ \lbx@sfromlang, with a forew, by}}, + byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}% + {edspace and trans\ \lbx@sfromlang, with an afterw, by}}, + byeditorcoin = {{edited and commented, with an introduction, by}% + {edspace and comm, with an introd, by}}, + byeditorcofo = {{edited and commented, with a foreword, by}% + {edspace and comm, with a forew, by}}, + byeditorcoaf = {{edited and commented, with an afterword, by}% + {edspace and comm, with an afterw, by}}, + byeditoranin = {{edited and annotated, with an introduction, by}% + {edspace and annot, with an introd, by}}, + byeditoranfo = {{edited and annotated, with a foreword, by}% + {edspace and annot, with a forew, by}}, + byeditoranaf = {{edited and annotated, with an afterword, by}% + {edspace and annot, with an afterw, by}}, + byeditortrcoin = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with an introd, by}}, + byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with a forew, by}}, + byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and comm, with an afterw, by}}, + byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with an introd, by}}, + byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with a forew, by}}, + byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}% + {ed,\addabbrvspace trans\ \lbx@sfromlang\finalandcomma\ and annot, with an afterw, by}}, + bytranslatorco = {{translated \lbx@lfromlang\ and commented by}% + {trans\ \lbx@sfromlang\ and comm\ by}}, + bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}% + {trans\ \lbx@sfromlang\ and annot\ by}}, + bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}% + {trans\ \lbx@sfromlang, with an introd, by}}, + bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}% + {trans\ \lbx@sfromlang, with a forew, by}}, + bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}% + {trans\ \lbx@sfromlang, with an afterw, by}}, + bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}% + {trans\ \lbx@sfromlang\ and comm, with an introd, by}}, + bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}% + {trans\ \lbx@sfromlang\ and comm, with a forew, by}}, + bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}% + {trans\ \lbx@sfromlang\ and comm, with an afterw, by}}, + bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}% + {trans\ \lbx@sfromlang\ and annot, with an introd, by}}, + bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}% + {trans\ \lbx@sfromlang\ and annot, with a forew, by}}, + bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}% + {trans\ \lbx@sfromlang\ and annot, with an afterw, by}}, + and = {{and}{and}}, + andothers = {{and others}{and others}}, + andmore = {{and others}{and others}}, + volume = {{volume}{vol}}, + volumes = {{volumes}{vols}}, + jourvol = {{volume}{vol}}, + jourser = {{series}{series}}, + newseries = {{new series}{ns}}, + oldseries = {{old series}{os}}, + edition = {{edition}{edn}}, + reprint = {{reprint}{repr}}, + reprintof = {{reprint of}{repr of}}, + reprintas = {{reprinted as}{rpt as}}, + page = {{page}{p}}, + pages = {{pages}{pp}}, + column = {{column}{col}}, + columns = {{columns}{cols}}, + line = {{line}{l}}, + lines = {{lines}{ll}}, + verse = {{verse}{v}}, + verses = {{verses}{vv}}, + section = {{section}{s}}, + sections = {{sections}{ss}}, + paragraph = {{paragraph}{para}}, + paragraphs = {{paragraphs}{paras}}, + regulation = {{regulation}{reg}}, + regulations = {{regulations}{regs}}, + in = {{in}{in}}, + inseries = {{in}{in}}, + ofseries = {{of}{of}}, + number = {{number}{no}}, + chapter = {{chapter}{chap}}, + mathesis = {{Master's thesis}{MA\addabbrvspace thesis}}, + phdthesis = {{PhD\addabbrvspace thesis}{PhD\addabbrvspace thesis}}, + resreport = {{research report}{research rep}}, + techreport = {{technical report}{techspace rep}}, + software = {{computer software}{compspace software}}, + datacd = {{CD-ROM}{CD-ROM}}, + audiocd = {{audio CD}{audio CD}}, + version = {{version}{version}}, + url = {{address}{address}}, + urlseen = {{accessed}{accessed}}, + inpress = {{in press}{in press}}, + inpreparation = {{in preparation}{in preparation}}, + submitted = {{submitted}{submitted}}, + citedas = {{hereinafter}{hereinafter}}, + thiscite = {{especially}{esp}}, + seenote = {{see note}{n}}, + quotedin = {{quoted in}{qtdspace in}}, + idem = {{idem}{idem}}, + idemsm = {{idem}{idem}}, + idemsf = {{eadem}{eadem}}, + idemsn = {{idem}{idem}}, + idempm = {{eidem}{eidem}}, + idempf = {{eaedem}{eaedem}}, + idempn = {{eadem}{eadem}}, + idempp = {{eidem}{eidem}}, + ibidem = {{ibidem}{ibid}}, + opcit = {{opspace cit}{opspace cit}}, + loccit = {{locspace cit}{locspace cit}}, + confer = {{cf}{cf}}, + sequens = {{sq}{sq}}, + sequentes = {{sqq}{sqq}}, + passim = {{passim}{pass}}, + see = {{see}{see}}, + seealso = {{see also}{see also}}, + backrefpage = {{cited on page}{citspace on p}}, + backrefpages = {{cited on pages}{citspace on pp}}, + january = {{January}{Jan}}, + february = {{February}{Feb}}, + march = {{March}{Mar}}, + april = {{April}{Apr}}, + may = {{May}{May}}, + june = {{June}{Jun}}, + july = {{July}{Jul}}, + august = {{August}{Aug}}, + september = {{September}{Sep}}, + october = {{October}{Oct}}, + november = {{November}{Nov}}, + december = {{December}{Dec}}, + langamerican = {{American}{American}}, + langbrazilian = {{Brazilian}{Brazilian}}, + langdanish = {{Danish}{Danish}}, + langdutch = {{Dutch}{Dutch}}, + langenglish = {{English}{English}}, + langfrench = {{French}{French}}, + langgerman = {{German}{German}}, + langgreek = {{Greek}{Greek}}, + langitalian = {{Italian}{Italian}}, + langlatin = {{Latin}{Latin}}, + langnorwegian = {{Norwegian}{Norwegian}}, + langportuguese = {{Portuguese}{Portuguese}}, + langspanish = {{Spanish}{Spanish}}, + langswedish = {{Swedish}{Swedish}}, + fromamerican = {{from the American}{from the American}}, + frombrazilian = {{from the Brazilian}{from the Brazilian}}, + fromdanish = {{from the Danish}{from the Danish}}, + fromdutch = {{from the Dutch}{from the Dutch}}, + fromenglish = {{from the English}{from the English}}, + fromfrench = {{from the French}{from the French}}, + fromgerman = {{from the German}{from the German}}, + fromgreek = {{from the Greek}{from the Greek}}, + fromitalian = {{from the Italian}{from the Italian}}, + fromlatin = {{from the Latin}{from the Latin}}, + fromnorwegian = {{from the Norwegian}{from the Norwegian}}, + fromportuguese = {{from the Portuguese}{from the Portuguese}}, + fromspanish = {{from the Spanish}{from the Spanish}}, + fromswedish = {{from the Swedish}{from the Swedish}}, + countryde = {{Germany}{DE}}, + countryeu = {{European Union}{EU}}, + countryep = {{European Union}{EP}}, + countryfr = {{France}{FR}}, + countryuk = {{United Kingdom}{GB}}, + countryus = {{United States of America}{US}}, + patent = {{patent}{pat}}, + patentde = {{German patent}{German pat}}, + patenteu = {{European patent}{European pat}}, + patentfr = {{French patent}{French pat}}, + patentuk = {{British patent}{British pat}}, + patentus = {{US patent}{US pat}}, + patreq = {{patent request}{pat\ req}}, + patreqde = {{German patent request}{German pat\ req}}, + patreqeu = {{European patent request}{European pat\ req}}, + patreqfr = {{French patent request}{French pat\ req}}, + patrequk = {{British patent request}{British pat\ req}}, + patrequs = {{US patent request}{US pat\ req}}, + file = {{file}{file}}, + library = {{library}{library}}, + abstract = {{abstract}{abstract}}, + annotation = {{annotations}{annotations}}, + eucase = {{Case}{Case}}, + eujoinedcases = {{Joined Cases}{Joined Cases}}, + commissiondecision = {{Commission Decision}{Commission Decision}}, + article = {{article}{art}}, + articles = {{articles}{arts}}, + application = {{Application}{App}}, + rule = {{rule}{r}}, + rules = {{rules}{rr}}, + order = {{Order}{Ord}}, + directive = {{Directive}{Dir}}, + decision = {{Decision}{Dec}}, + bill = {{Bill}{Bill}}, + draft = {{draft}{draft}}, + clause = {{clause}{cl}}, + clauses = {{clauses}{cll}}, + inforce = {{entered into force}{entered into force}}, + signed = {{signed}{signed}}, + opened = {{opened for signature}{opened for signature}}, + adopted = {{adopted}{adopted}}, + casenote = {{note}{note}}, + firstpublished = {{first published}{first published}}, +} + +\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} + + + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/english-oscola.lbx new/tex/latex/oscola/english-oscola.lbx --- old/tex/latex/oscola/english-oscola.lbx 2014-05-23 00:03:54.000000000 +0200 +++ new/tex/latex/oscola/english-oscola.lbx 2017-03-25 21:53:44.000000000 +0100 @@ -3,10 +3,9 @@ % oscola.lbx for copyright and licence information \ProvidesFile{english-oscola.lbx} -[2014/05/22 v 1.4 Biblatex localisation file for OSCOLA citations] +[2017/04/01 v 1.5 Biblatex localisation file for OSCOLA citations] -\DeclareRedundantLanguages{english}{english,british,american, -canadian,australian,newzealand,UKenglish,USenglish} +\DeclareRedundantLanguages{english}{english,american} \NewBibliographyString{regulation, regulations, @@ -93,6 +92,55 @@ \lbx@us@mkbibrangetruncextra@long{long}}% \protected\def\mkbibrangeterseextra{% \lbx@us@mkbibrangetruncextra@short{short}}% + \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {} + {\iffieldequalstr{#2endyear}{} + {\mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} + +\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \mbox{\bibdatedash}} + {\bibdatedash + \iffieldsequal{#2year}{#2endyear} + {\iffieldsequal{#2month}{#2endmonth} + {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} + {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% + \printfield{extrayear}}}}}} + +\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{% + \iffieldundef{#2year} + {} + {\printtext{% + \iffieldsequal{#2year}{#2endyear} + {\csuse{mkbibdate#1}{}{#2month}{#2day}} + {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% + \iffieldundef{#2endyear} + {\printfield{extrayear}} + {\iffieldequalstr{#2endyear}{} + {\printfield{extrayear}% + \mbox{\bibdatedash}} + {\bibdatedash + \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% + \printfield{extrayear}}}}}} } \UndeclareBibliographyExtras{% @@ -520,54 +568,6 @@ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}} -\protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{% - \iffieldundef{#2year} - {} - {\printtext{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% - \iffieldundef{#2endyear} - {} - {\iffieldequalstr{#2endyear}{} - {\mbox{\bibdatedash}} - {\bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}} -\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{% - \iffieldundef{#2year} - {} - {\printtext{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% - \iffieldundef{#2endyear} - {\printfield{extrayear}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extrayear}% - \mbox{\bibdatedash}} - {\bibdatedash - \iffieldsequal{#2year}{#2endyear} - {\iffieldsequal{#2month}{#2endmonth} - {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}} - {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% - \printfield{extrayear}}}}}} - -\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{% - \iffieldundef{#2year} - {} - {\printtext{% - \iffieldsequal{#2year}{#2endyear} - {\csuse{mkbibdate#1}{}{#2month}{#2day}} - {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}% - \iffieldundef{#2endyear} - {\printfield{extrayear}} - {\iffieldequalstr{#2endyear}{} - {\printfield{extrayear}% - \mbox{\bibdatedash}} - {\bibdatedash - \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}% - \printfield{extrayear}}}}}} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.bbx new/tex/latex/oscola/oscola.bbx --- old/tex/latex/oscola/oscola.bbx 2014-05-23 00:03:54.000000000 +0200 +++ new/tex/latex/oscola/oscola.bbx 2017-03-25 21:53:44.000000000 +0100 @@ -1,6 +1,6 @@ % Legal Style Citations using OSCOLA -% Copyright Paul Stanley 2014 -% This work consists of oscola.bbx, english-oscola.lbx, oscola.lbx +% Copyright Paul Stanley 2014-2017 +% This work consists of oscola.bbx, english-oscola.lbx, british-oscola.lbx, oscola.cbx % and oscola.ist. % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -13,13 +13,13 @@ % This work has the LPPL maintenance status 'maintained'. % The current maintainer of this work is Paul Stanley (pstanley(a)essexcourt.net) -\ProvidesFile{oscola.bbx}[2014/05/22 v1.4 Biblatex bibliography style for OSCOLA standard] +\ProvidesFile{oscola.bbx}[2017/03/15 v1.5 Biblatex bibliography style for OSCOLA standard] \RequireBibliographyStyle{authortitle} \RequireBiber[3] -\DeclareBibliographyOption{caseshorthands}[false]{ +\DeclareBibliographyOption{caseshorthands}[false]{% \ifstrequal{#1}{italic} {\DeclareFieldFormat[jurisdiction]{shorthand}{\textit{##1}}} {}} @@ -29,28 +29,49 @@ \ifstrequal{#1}{uc} {\global\toggletrue{bbx@capibid}} {\togglefalse{bbx@capibid}}} - + +\newtoggle{bbx@ecliuse}\newtoggle{bbx@eclionly} +\DeclareBibliographyOption{ecli}[add]{% + \ifstrequal{#1}{no} + {\global\togglefalse{bbx@ecliuse}\global\togglefalse{bbx@eclionly}} + {\global\toggletrue{bbx@ecliuse} + \ifstrequal{#1}{only} + {\global\toggletrue{bbx@eclionly}} + {}}} + +\newcommand{\bbx@juriscitationindexlist}{} +\listadd{\bbx@juriscitationindexlist}{{eu}{eujuriscitation:index}} +\listadd{\bbx@juriscitationindexlist}{{echr}{echrjuriscitation}} +\listadd{\bbx@juriscitationindexlist}{{int}{intjuriscitation}} +\listadd{\bbx@juriscitationindexlist}{{ca}{canjuriscitation}} +\listadd{\bbx@juriscitationindexlist}{{us}{usjuriscitation}} +\newcommand{\bbx@defaultjuriscitationindex}{enjuriscitation} + \newtoggle{bbx@shortindex} \DeclareBibliographyOption{shortindex}[true]{% - \settoggle{bbx@shortindex}{#1}} + \toggletrue{bbx@shortindex}% + \renewcommand{\bbx@juriscitationindexlist}{}% + \listadd{\bbx@juriscitationindexlist}{{eu}{eujuriscitation:index:short}}% + \renewcommand{\bbx@defaultjuriscitationindex}{juriscitation:index:short}} % We ensure that there will always be a trash index \AtEndPreamble{% \@ifpackageloaded{imakeidx}{\makeindex[name=trash]} - {\@ifpackageloaded{index}{\newindex{trash}{tdx}{tnd}{Miscellaneous}} - {\@ifpackageloaded{multind}{\PackageWarning{biblatex-oscola}{Multind is incompatible with biblatex-oscola. Use imakeidx or index}} - {\iftoggle{blx@citeindex} + {\@ifclassloaded{memoir}{\PackageWarning{biblatex-oscola}{To use indexing with OSCOLA and the memoir class, you need to load imakeidx.}} + {\@ifpackageloaded{index}{\newindex{trash}{tdx}{tnd}{Miscellaneous}} + {\@ifpackageloaded{multind}{\PackageWarning{biblatex-oscola}{Multind is incompatible with biblatex-oscola. Use imakeidx or index}} + {\iftoggle{blx@citeindex} {\PackageWarning{biblatex-oscola} - {You need to load imakeidx or index. Indexing will probably fail:}}{}}}}} + {You need to load imakeidx or index. Indexing will probably fail:}}{}}}}}} % The bibliography and citation styles use different forms of name \AtBeginBibliography{% - \toggletrue{blx@firstinits}% - \DeclareNameAlias{default}{last-first}% - \DeclareNameAlias{editor}{last-first}} + \toggletrue{abx@bool@giveninits}% + \DeclareNameAlias{default}{family-given}% + \DeclareNameAlias{editor}{given-family}} -\renewbibmacro*{name:last-first}[4]{% +\renewbibmacro*{name:family-given}[4]{% \ifuseprefix {\usebibmacro{name:delim}{#3#1}% \usebibmacro{name:hook}{#3#1}% @@ -59,18 +80,18 @@ {\mkbibnameprefix{\MakeCapital{#3}}\isdot} {\mkbibnameprefix{#3}\isdot}% \ifpunctmark{'}{}{\bibnamedelimc}}% - \mkbibnamelast{#1}\isdot - \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}} + \mkbibnamefamily{#1}\isdot + \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% + \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}} {\usebibmacro{name:delim}{#1}% \usebibmacro{name:hook}{#1}% - \mkbibnamelast{#1}\isdot - \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% + \mkbibnamefamily{#1}\isdot + \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}% \ifblank{#2#3}{}{}% - \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}% + \ifblank{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} -\DeclareNameAlias{sortname}{last-first} +\DeclareNameAlias{sortname}{family-given} % This deals with initials: we need to format them without dots % and close together: HLA not H.L.A. or H. L. A. or H L A @@ -142,6 +163,7 @@ % Language Mapping \DeclareLanguageMapping{english}{english-oscola} +\DeclareLanguageMapping{british}{british-oscola} % Various aliases \DeclareBibliographyAlias{inproceedings}{book} @@ -158,8 +180,6 @@ \DeclareBibliographyAlias{mvcollection}{book} \DeclareBibliographyAlias{supcollection}{inbook} - - % This deals with suppression of the postnote delimiter after brackets. It % should be refactored to use a toggle rather than a counter @@ -414,6 +434,7 @@ \DeclareFieldFormat[legislation]{title}{#1} \DeclareFieldFormat[legal]{title}{#1} \DeclareFieldFormat{untitle}{#1} +\DeclareFieldFormat{verba}{#1} \DeclareListFormat[jurisdiction]{extracites}{% \extracitedelim #1} @@ -818,7 +839,7 @@ \DeclareBibliographyDriver{thesis}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \printnames{author}% + \usebibmacro{author}% \setunit{\addcomma\space}% \newblock \printfield{title}% @@ -1219,6 +1240,19 @@ \usebibmacro{court-note}% } +\newbibmacro{eujuriscitation:index:short}{% + \iftoggle{bbx@numcite} + {\iffieldundef{userb}{}{\printfield{userb}\newunit} + \printfield{number}} + {\usebibmacro{title}% + \newunit + \iffieldundef{userb} + {} + {\printtext{\mkbibparens{\printfield{userb}}\newunit}}% + \printtext{\mkbibparens{\usebibmacro{euparenthetical}}}}% + \newunit% + \usebibmacro{court-note}} + \newbibmacro{eujuriscitation:index}{% \iftoggle{bbx@numcite} {\iffieldundef{userb}{}{\printfield{userb}\newunit} @@ -1267,20 +1301,39 @@ \printfield{number}} \newbibmacro*{eu:reportinfo}{% + \iftoggle{bbx@eclionly} + {\iffieldundef{verba} + {\usebibmacro{eu:osreport}}% + {\printfield{verba}}} + {\usebibmacro{eu:osreport}}} + + +\newbibmacro*{eu:osreport}{% + \iftoggle{bbx@ecliuse} + {\iffieldundef{verba} + {} + {\printfield{verba}% + \setunit{\addcomma\space}}}% + {}% \iffieldundef{journaltitle}% {\usebibmacro{eu:unreported}}% {\usebibmacro{eu:year+vol+report}}} \newbibmacro*{eu:unreported}{% - \ifboolexpr{( test {\iflistundef{institution}} - and test {\iffieldundef{date}} - and test {\iffieldundef{year}} )} - {} - {\ifboolexpr{( test {\iffieldundef{date}} and test {\iffieldundef{year}} )} - {\mkbibparens{\printlist[jurisdiction]{institution}}} - {\bbx@unsetpostnotedelim\iflistundef{institution}% - {\mkbibparens{\usebibmacro{date}}}% - {\printtext{\bibopenparen\printlist[jurisdiction]{institution}\addcomma\space}\usebibmacro{date}\bibcloseparen}}}} + \iffieldundef{verba} + {\ifboolexpr{( test {\iflistundef{institution}} + and test {\iffieldundef{date}} + and test {\iffieldundef{year}} )} + {}% + {\ifboolexpr{( test {\iffieldundef{date}} and test {\iffieldundef{year}} )} + {\mkbibparens{\printlist[jurisdiction]{institution}}} + {\bbx@unsetpostnotedelim\iflistundef{institution}% + {\mkbibparens{\usebibmacro{date}}}% + {\printtext{\bibopenparen% + \printlist[jurisdiction]{institution}\addcomma\space}\usebibmacro{date}\bibcloseparen}}}} + {\iftoggle{bbx@ecliuse} + {} + {\printfield{verba}}}} \newbibmacro*{eu:year+vol+report}{% \iffieldequals{journaltitle}{\ecrreporttitle}% @@ -1449,19 +1502,34 @@ {\printfield[casenotetitle]{title}}}} {\usebibmacro{title}}} -\newbibmacro{juriscitation}{% - \ifkeyword{eu}% - {\usebibmacro{eujuriscitation}}% EU Case - {\ifkeyword{echr}% - {\usebibmacro{echrjuriscitation}}% ECHR Case - {\ifkeyword{int}% - {\usebibmacro{intjuriscitation}}% PIL Case - {\ifkeyword{ca}% - {\usebibmacro{canjuriscitation}}% Canadian Case - {\ifkeyword{us} - {\usebibmacro{usjuriscitation}}% US Case - {\usebibmacro{enjuriscitation}}}}}}}% Default +\newcommand{\csusebibmacro}[1]{% + \edef\bbx@tempcsname{% + \noexpand\usebibmacro{#1}}% + \bbx@tempcsname} + +\newtoggle{bbx@juriscitedone} + +\newcommand{\bbx@juriscitationlist}{} +\listadd{\bbx@juriscitationlist}{{eu}{eujuriscitation}} +\listadd{\bbx@juriscitationlist}{{echr}{echrjuriscitation}} +\listadd{\bbx@juriscitationlist}{{int}{intjuriscitation}} +\listadd{\bbx@juriscitationlist}{{ca}{canjuriscitation}} +\listadd{\bbx@juriscitationlist}{{us}{usjuriscitation}} +\global\edef\bbx@defaultjuriscitation{enjuriscitation} + +\newbibmacro{juriscitation}{% + \togglefalse{bbx@juriscitedone}% + \renewcommand{\do}[1]{% + \edef\@tempa{\noexpand\ifkeyword{\expandafter\@firstoftwo ##1}}% + \edef\@tempb{\expandafter\@secondoftwo ##1}% + \@tempa + {\toggletrue{bbx@juriscitedone}\csusebibmacro{\@tempb}} + {}}% + \dolistloop{\bbx@juriscitationlist}% + \iftoggle{bbx@juriscitedone} + {} + {\csusebibmacro{\bbx@defaultjuriscitation}}} \newbibmacro{juriscitation:index}{% \savefield{indextitle}{\bbx@tempa}% @@ -1482,6 +1550,26 @@ {\usebibmacro{usjuriscitation}} {\usebibmacro{enjuriscitation}}}}}}} +\renewbibmacro{juriscitation:index}{% + \togglefalse{bbx@juriscitedone}% + \renewcommand{\do}[1]{% + \edef\@tempa{\noexpand\ifkeyword{\expandafter\@firstoftwo ##1}}% + \edef\@tempb{\expandafter\@secondoftwo ##1}% + \@tempa + {\toggletrue{bbx@juriscitedone}\csusebibmacro{\@tempb}} + {}}% + \dolistloop{\bbx@juriscitationindexlist}% + \iftoggle{bbx@juriscitedone} + {} + {\csusebibmacro{\bbx@defaultjuriscitationindex}}} + +\newbibmacro{juriscitation:index:short}{% + \printfield{title}% + \setunit*{\addspace}% + \iffieldundef{year} + {} + {\printtext{\mkbibparens{\printfield{year}}}}} + \newbibmacro*{jurisdictionpages}{% \iffieldequals{entrysubtype}{\subtypenewsp}% {} @@ -1672,7 +1760,7 @@ \renewbibmacro*{postnote}{% \ifboolexpr {test {\iffieldundef{postnote}} or test {\iftoggle{cbx@postnoteprinted}}}% - {\midsentence} + {}%<--- this used to read \midsentence {\ifboolexpr{test {\ifnumequal{\value{bbx@suppresspostnotedelim}}{1}}} {\setunit{\addspace}% \bbx@resetpostnotedelim} @@ -2881,11 +2969,11 @@ \field{sortkey} } \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} - \list{institution} + \field{sortname} + \field{author} + \field{editor} + \field{translator} + \field{institution} \field{sorttitle} \field{title} \field{booktitle} @@ -2993,6 +3081,8 @@ fieldtarget=institution] \step[fieldsource=additionalreports, fieldtarget=listb] + \step[fieldsource=ecli, + fieldtarget=verba] } \map[overwrite=false]{ \pertype{legal} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.cbx new/tex/latex/oscola/oscola.cbx --- old/tex/latex/oscola/oscola.cbx 2014-05-23 00:03:54.000000000 +0200 +++ new/tex/latex/oscola/oscola.cbx 2017-03-25 21:53:44.000000000 +0100 @@ -2,7 +2,7 @@ % Part of the OSCOLA package for biblatex: see the file % oscola.lbx for copyright and licence information -\ProvidesFile{oscola.cbx}[2014/05/22 v1.4 Biblatex citation style for OSCOLA standard] +\ProvidesFile{oscola.cbx}[2015/03/15 v1.5 Biblatex citation style for OSCOLA standard] \RequireCitationStyle{verbose-inote} @@ -53,13 +53,14 @@ {\usebibmacro{cite:full}}} \renewbibmacro*{footcite}{% + \bbx@resetpostnotedelim% \usebibmacro{cite:citepages}% \global\togglefalse{cbx:loccit}% \ifboolexpr {test {\ifciteseen} or test {\ifciteibid}} {\ifboolexpr {test {\iffieldundef{shorthand}} or test {\bbx@ifnottrackingcites}} {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage} - {\usebibmacro{footcite:ibid}} + {\usebibmacro{footcite:ibid}\bbx@unsetpostnotedelim} {\usebibmacro{footcite:note}}}% {\usebibmacro{footcite:shorthand}}} {\usebibmacro{footcite:full}% @@ -307,7 +308,8 @@ {\printtext[bibhyperlink]{\iftoggle{bbx@capibid}{}{\midsentence}\bibstring{ibidem}}% \ifloccit {\global\toggletrue{cbx:loccit}} - {}} + {}% + \bbx@unsetpostnotedelim}% {\usebibmacro{cite:refonlyfull}}} \DeclareCiteCommand{\footciteref}[\mkbibfootnote] 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 2016-04-14 19:32:00.000000000 +0200 +++ new/tlpkg/tlpobj/oscola.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -1,6 +1,6 @@ name oscola category Package -revision 34207 +revision 43599 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 @@ -9,13 +9,14 @@ longdesc Citation of Legal Authorities. It also includes facilities for longdesc constructing tables of cases and legislation from citations (in longdesc conjunction with appropriate indexing packages). -runfiles size=38 +runfiles size=47 RELOC/makeindex/oscola/oscola.ist + RELOC/tex/latex/oscola/british-oscola.lbx RELOC/tex/latex/oscola/english-oscola.lbx RELOC/tex/latex/oscola/oscola.bbx RELOC/tex/latex/oscola/oscola.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/oscola -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2017-03-25 19:30:52 +0100 catalogue-license lppl1.3 catalogue-topics legal biblatex -catalogue-version 1.4 +catalogue-version 1.5 ++++++ 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 2016-04-14 19:32:01.000000000 +0200 +++ new/tlpkg/tlpobj/ot-tableau.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/ot-tableau/ot-tableau.sty catalogue-ctan /macros/latex/contrib/ot-tableau -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:32:01.000000000 +0200 +++ new/tlpkg/tlpobj/othello.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -34,6 +34,6 @@ RELOC/fonts/tfm/public/othello/ot1whi20.tfm RELOC/tex/latex/othello/othello.sty catalogue-ctan /macros/latex/contrib/othello -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +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 2016-04-14 19:32:01.000000000 +0200 +++ new/tlpkg/tlpobj/othelloboard.tlpobj 2017-04-14 17:53:08.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/othelloboard/othelloboard.sty catalogue-also othello catalogue-ctan /macros/latex/contrib/othelloboard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics games catalogue-version 1.2 ++++++ otibet.doc.tar.xz ++++++ ++++++ otibet.tar.xz ++++++

1 0

Jump to page: