openSUSE Commits

Download

commit@lists.opensuse.org

June 2017

1 participants
2052 discussions

commit texlive-specs-o 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-o for openSUSE:Factory checked in at 2017-06-25 19:22:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-o (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-o" Sun Jun 25 19:22:18 2017 rev:26 rq:504805 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-o/texlive-specs-o.changes 2017-06-08 14:55:29.350651000 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-o.new/texlive-specs-o.changes 2017-06-25 19:27:24.507555514 +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: ---- luatex-def.doc.tar.xz luatex-def.tar.xz medstarbeamer.doc.tar.xz medstarbeamer.tar.xz meetingmins.doc.tar.xz meetingmins.tar.xz memdesign.doc.tar.xz memexsupp.doc.tar.xz memexsupp.tar.xz memoir.doc.tar.xz memoir.tar.xz memory.doc.tar.xz memory.tar.xz mentis.doc.tar.xz mentis.tar.xz menu.doc.tar.xz menu.tar.xz menukeys.doc.tar.xz menukeys.tar.xz merriweather.doc.tar.xz merriweather.tar.xz metafont-beginners.doc.tar.xz metafont.doc.tar.xz metafont.tar.xz metago.doc.tar.xz metago.tar.xz metalogo.doc.tar.xz metalogo.tar.xz metaobj.doc.tar.xz metaobj.tar.xz metaplot.doc.tar.xz metaplot.tar.xz metapost-examples.doc.tar.xz metapost.doc.tar.xz metapost.tar.xz metatex.doc.tar.xz metatex.tar.xz metatype1.source.tar.xz metauml.doc.tar.xz metauml.tar.xz method.doc.tar.xz method.tar.xz metre.doc.tar.xz metre.tar.xz metrix.doc.tar.xz metrix.tar.xz mex.doc.tar.xz mex.tar.xz mf2pt1.doc.tar.xz mf2pt1.tar.xz mfirstuc.doc.tar.xz mfirstuc.tar.xz mflogo-font.doc.tar.xz mflogo-font.tar.xz mflogo.doc.tar.xz mflogo.tar.xz mflua.tar.xz mfnfss.doc.tar.xz mfnfss.tar.xz mfpic.doc.tar.xz mfpic.tar.xz mfpic4ode.doc.tar.xz mfpic4ode.tar.xz mftinc.doc.tar.xz mftinc.tar.xz mfware.doc.tar.xz mfware.tar.xz mhchem.doc.tar.xz mhchem.tar.xz mhequ.doc.tar.xz mhequ.tar.xz miama.doc.tar.xz miama.tar.xz microtype-de.doc.tar.xz microtype.doc.tar.xz microtype.tar.xz midnight.doc.tar.xz midnight.tar.xz midpage.doc.tar.xz midpage.tar.xz mil3.doc.tar.xz miller.doc.tar.xz miller.tar.xz minibox.doc.tar.xz minibox.tar.xz New: ---- lshort-italian.doc.tar.xz lshort-japanese.doc.tar.xz lshort-korean.doc.tar.xz lshort-mongol.doc.tar.xz lshort-persian.doc.tar.xz lshort-polish.doc.tar.xz lshort-portuguese.doc.tar.xz lshort-russian.doc.tar.xz lshort-slovak.doc.tar.xz lshort-slovenian.doc.tar.xz lshort-spanish.doc.tar.xz lshort-thai.doc.tar.xz lshort-turkish.doc.tar.xz lshort-ukr.doc.tar.xz lshort-vietnamese.doc.tar.xz lstaddons.doc.tar.xz lstaddons.tar.xz lstbayes.doc.tar.xz lstbayes.tar.xz lt3graph.doc.tar.xz lt3graph.tar.xz ltablex.doc.tar.xz ltablex.tar.xz ltabptch.doc.tar.xz ltabptch.tar.xz ltb2bib.doc.tar.xz ltb2bib.tar.xz ltxdockit.doc.tar.xz ltxdockit.tar.xz ltxfileinfo.doc.tar.xz ltxfileinfo.tar.xz ltximg.doc.tar.xz ltximg.tar.xz ltxindex.doc.tar.xz ltxindex.tar.xz ltxkeys.doc.tar.xz ltxkeys.tar.xz ltxmisc.tar.xz ltxnew.doc.tar.xz ltxnew.tar.xz ltxtools.doc.tar.xz ltxtools.tar.xz lua-alt-getopt.doc.tar.xz lua-alt-getopt.tar.xz lua-check-hyphen.doc.tar.xz lua-check-hyphen.tar.xz lua-visual-debug.doc.tar.xz lua-visual-debug.tar.xz lua2dox.doc.tar.xz lua2dox.tar.xz luabibentry.doc.tar.xz luabibentry.tar.xz luabidi.doc.tar.xz luabidi.tar.xz luacode.doc.tar.xz luacode.tar.xz luahyphenrules.doc.tar.xz luahyphenrules.tar.xz luaindex.doc.tar.xz luaindex.tar.xz luainputenc.doc.tar.xz luainputenc.tar.xz luaintro.doc.tar.xz lualatex-doc-de.doc.tar.xz lualatex-doc.doc.tar.xz lualatex-math.doc.tar.xz lualatex-math.tar.xz luamesh.doc.tar.xz luamesh.tar.xz luapackageloader.doc.tar.xz luapackageloader.tar.xz lwarp.doc.tar.xz lwarp.tar.xz markdown.doc.tar.xz markdown.tar.xz math-into-latex-4.doc.tar.xz mathpunctspace.doc.tar.xz mathpunctspace.tar.xz mcexam.doc.tar.xz mcexam.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-o.spec ++++++ ++++ 26163 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-o/texlive-specs-o.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-o.new/texlive-specs-o.spec ++++++ luatex-def.doc.tar.xz -> luacode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luatex-def/README.md new/doc/lualatex/luatex-def/README.md --- old/doc/lualatex/luatex-def/README.md 2016-01-23 23:23:32.000000000 +0100 +++ new/doc/lualatex/luatex-def/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -# luatex-def - -luatex option file for LaTeX2e color and graphics - -Licence: LPPL -Maintained by the LaTeX3 project - -https://github.com/latex3/luatex-def - -This first version of luatex.def is a modified version of pdftex.def. - -This is only needed for LuaTeX releases from 0.87 on: it will not work with the version 0.80 in current TeX Live and MiKTeX distributions but is being made available for testing. - -If you have a test version of LuaTeX 0.88 you may use this file via - -`\usepackage[luatex]{graphicx}` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luacode/luacode.sty new/tex/lualatex/luacode/luacode.sty --- old/tex/lualatex/luacode/luacode.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/lualatex/luacode/luacode.sty 2016-11-25 19:34:04.000000000 +0100 @@ -0,0 +1,164 @@ +%% +%% This is file `luacode.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% luacode.dtx (with options: `texpackage') +%% +%% See the source file for author and licensing information. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% = and space + \catcode123 1 % { + \catcode125 2 % } + \catcode 35 6 % # + \toks0{\endlinechar\the\endlinechar}% + \edef\x{\endlinechar13}% + \def\y#1 #2 {% + \toks0\expandafter{\the\toks0 \catcode#1 \the\catcode#1}% + \edef\x{\x \catcode#1 #2}}% + \y 13 5 % carriage return + \y 61 12 % = + \y 32 10 % space + \y 123 1 % { + \y 125 2 % } + \y 35 6 % # + \y 64 11 % @ (letter) + \y 39 12 % ' + \y 40 12 % ( + \y 41 12 % ) + \y 42 12 % * + \y 45 12 % - + \y 46 12 % . + \y 47 12 % / + \y 91 12 % [ + \y 93 12 % ] + \y 94 7 % ^ + \y 96 12 % ` + \y 126 13 % ~ + \toks0\expandafter{\the\toks0 \relax\noexpand\endinput}% + \edef\y#1{\noexpand\expandafter\endgroup% + \noexpand\ifx#1\relax \edef#1{\the\toks0}\x\relax% + \noexpand\else \noexpand\expandafter\noexpand\endinput% + \noexpand\fi}% +\expandafter\y\csname luacode@sty@endinput\endcsname% +\ProvidesPackage{luacode}[2012/01/23 v1.2a lua-in-tex helpers (mpg)] +\RequirePackage{ifluatex} +\ifluatex\else + \PackageError{luacode}{LuaTeX is required for this package. Aborting.}{% + This package can only be used with the LuaTeX engine\MessageBreak + (command `lualatex'). Package loading has been stopped\MessageBreak + to prevent additional errors.} + \expandafter\luacode@sty@endinput +\fi +\RequirePackage{luatexbase} +\newcommand \luacode@printdbg [1] {% + texio.write_nl('log', + '-- BEGIN luacode debug (on input line \the\inputlineno)') + texio.write_nl('log', "\luatexluaescapestring{#1}") + texio.write_nl('log', + '-- END luacode debug (on input line \the\inputlineno)') +} +\newcommand \luacode@dbg@exec [1] {% + \directlua { + \luacode@maybe@printdbg{#1} + #1 + }% +} +\begingroup \catcode`\~\active \expandafter\endgroup +\@firstofone{% + \newcommand \luacode@execute [1] {% + \begingroup + \escapechar92 + \newlinechar10 + \edef\\{\string\\}% + \edef~{\string~}% + \let\%=\luacode@percentchar + \let\#=\luacode@sharpchar + \expandafter\expandafter\expandafter\endgroup + \luacode@dbg@exec{#1}} +} +\begingroup \escapechar\m@ne \edef\aux{\endgroup + \unexpanded{\newcommand\luacode@percentchar}{\string\%}% + \unexpanded{\newcommand\luacode@sharpchar }{\string\#}% +}\aux +\newcommand*\luacode@begin [1] {% + \begingroup + \escapechar92 + \luatexcatcodetable#1\relax + \edef\luacode@endmark{\string\end{\@currenvir}}% + \expandafter\def \expandafter\luacode@endmark \expandafter{% + \luatexscantextokens \expandafter{\luacode@endmark}}% + \luacode@grab@body} +\newcommand\luacode@end{% + \edef\luacode@next{% + \noexpand\luacode@execute{\the\luacode@lines}% + \noexpand\end{\@currenvir}}% + \expandafter\endgroup + \luacode@next} +\newtoks\luacode@lines +\newcommand*\luacode@addline [1] {% + \luacode@lines\expandafter{\the\luacode@lines#1^^J}} +\newcommand \luacode@grab@body [1] {% + \luacode@lines{}% + \endlinechar10 + \luacode@grab@lines} +\long\def\luacode@grab@lines#1^^J{% + \def\luacode@curr{#1}% + \luacode@strip@spaces + \ifx\luacode@curr\luacode@endmark + \expandafter\luacode@end + \else + \expandafter\luacode@addline\expandafter{\luacode@curr}% + \expandafter\luacode@grab@lines + \fi} +\begingroup\catcode32 12 \expandafter\endgroup +\@firstofone{\newcommand\luacode@spaceother{ }} +\newcommand \luacode@strip@spaces {% + \expandafter\luacode@strip@sp@peek\luacode@curr\@nil} +\newcommand \luacode@strip@sp@peek {% + \futurelet\@let@token\luacode@strip@sp@look} +\newcommand \luacode@strip@sp@look {% + \expandafter\ifx\luacode@spaceother\@let@token + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi{% + \afterassignment\luacode@strip@sp@peek + \let\@let@token= + }{% + \luacode@strip@sp@def + }} +\@ifdefinable \luacode@strip@sp@def \relax +\def \luacode@strip@sp@def #1\@nil{% + \def\luacode@curr{#1}} +\newluatexcatcodetable \luacode@table@soft +\begingroup +\ifdefined\SetCatcodeRange \else + \let\SetCatcodeRange\setcatcoderange +\fi +\setluatexcatcodetable \luacode@table@soft {% + \luatexcatcodetable\CatcodeTableOther + \catcode 92 0 + \catcode 123 1 + \catcode 125 2 + \SetCatcodeRange {65}{90} {11} + \SetCatcodeRange {97}{122}{11} +} +\endgroup +\newcommand \LuaCodeDebugOn {\let \luacode@maybe@printdbg \luacode@printdbg} +\newcommand \LuaCodeDebugOff {\let \luacode@maybe@printdbg \@gobble} +\LuaCodeDebugOff +\@ifdefinable\luadirect {\let\luadirect\luacode@dbg@exec} +\newcommand*\luaexec [1] {\luacode@execute{#1}} +\newenvironment {luacode} {\luacode@begin\luacode@table@soft} {} +\newenvironment {luacode*} {\luacode@begin\CatcodeTableOther} {} +\newcommand \luacodestar {\@nameuse{luacode*}} +\def \endluacodestar {\@nameuse{endluacode*}} +\newcommand \luastring [1] {"\luatexluaescapestring{#1}"} +\newcommand \luastringO [1] {\luastring{\unexpanded\expandafter{#1}}} +\newcommand \luastringN [1] {\luastring{\unexpanded{#1}}} +\luacode@sty@endinput +\endinput +%% +%% End of file `luacode.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luacode.tlpobj new/tlpkg/tlpobj/luacode.tlpobj --- old/tlpkg/tlpobj/luacode.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/luacode.tlpobj 2017-04-14 17:48:01.000000000 +0200 @@ -0,0 +1,17 @@ +name luacode +category Package +revision 25193 +shortdesc Helper for executing lua code from within TeX +relocated 1 +longdesc Executing Lua code from within TeX with directlua can sometimes +longdesc be tricky: there is no easy way to use the percent character, +longdesc counting backslashes may be hard, and Lua comments don't work +longdesc the way you expect. The package provides the \luaexec command +longdesc and the luacode(*) environments to help with these problems. +runfiles size=2 + RELOC/tex/lualatex/luacode/luacode.sty +catalogue-ctan /macros/luatex/latex/luacode +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 +catalogue-topics lua-supp luatex +catalogue-version 1.2a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatex-def.doc.tlpobj new/tlpkg/tlpobj/luatex-def.doc.tlpobj --- old/tlpkg/tlpobj/luatex-def.doc.tlpobj 2016-04-14 19:19:16.000000000 +0200 +++ new/tlpkg/tlpobj/luatex-def.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name luatex-def.doc -category Package -revision 39467 -shortdesc doc files of luatex-def -relocated 1 -docfiles size=1 - RELOC/doc/lualatex/luatex-def/README.md ++++++ lualibs.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/lualibs/NEWS new/doc/luatex/lualibs/NEWS --- old/doc/luatex/lualibs/NEWS 2016-04-10 00:38:30.000000000 +0200 +++ new/doc/luatex/lualibs/NEWS 2017-02-06 01:01:05.000000000 +0100 @@ -1,4 +1,7 @@ History of the lualibs package +2017/02/01 v2.5/ + * sync with Context beta as of 2017-02-01 + 2016/04/06 v2.4/ * sync with Context beta as of 2016-04-06 * basic maintenance Binary files old/doc/luatex/lualibs/lualibs.pdf and new/doc/luatex/lualibs/lualibs.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lualibs.doc.tlpobj new/tlpkg/tlpobj/lualibs.doc.tlpobj --- old/tlpkg/tlpobj/lualibs.doc.tlpobj 2016-04-14 19:19:06.000000000 +0200 +++ new/tlpkg/tlpobj/lualibs.doc.tlpobj 2017-04-14 17:48:01.000000000 +0200 @@ -1,9 +1,9 @@ name lualibs.doc category Package -revision 40370 +revision 43153 shortdesc doc files of lualibs relocated 1 -docfiles size=27 +docfiles size=30 RELOC/doc/luatex/lualibs/LICENSE RELOC/doc/luatex/lualibs/NEWS RELOC/doc/luatex/lualibs/README ++++++ lualibs.tar.xz ++++++ ++++ 9636 lines of diff (skipped) ++++++ luamplib.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/NEWS new/doc/luatex/luamplib/NEWS --- old/doc/luatex/luamplib/NEWS 2016-04-02 23:57:49.000000000 +0200 +++ new/doc/luatex/luamplib/NEWS 2017-06-06 23:48:32.000000000 +0200 @@ -1,5 +1,10 @@ History of the luamplib package +2017/06/02 2.12.1 + * when \mplibglobaltextext{enable} is declared, metapost variables + containing btex ... etex labels can be inherited across code chunks. + Of course, \mplibcodeinherit should also be switched on. + 2016/03/31 2.11.3 * fix a bug regarding nested mplibcode environments (issue #63) Binary files old/doc/luatex/luamplib/luamplib.pdf and new/doc/luatex/luamplib/luamplib.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/test-luamplib-latex.tex new/doc/luatex/luamplib/test-luamplib-latex.tex --- old/doc/luatex/luamplib/test-luamplib-latex.tex 2015-03-26 22:52:52.000000000 +0100 +++ new/doc/luatex/luamplib/test-luamplib-latex.tex 2017-06-06 23:48:32.000000000 +0200 @@ -62,7 +62,21 @@ endfor; endfig; \end{mplibcode}% -B\par +B\par\leavevmode +\mplibcodeinherit{enable}% +\mplibglobaltextext{enable}% +\everymplib{ beginfig(0);}\everyendmplib{ endfig;}% +\begin{mplibcode} + label(btex $\sqrt{2}$ etex, origin); + draw fullcircle scaled 20; + picture pic; pic := currentpicture; +\end{mplibcode}% +\begin{mplibcode} + currentpicture := pic scaled 2; +\end{mplibcode}% +\everymplib{}\everyendmplib{}% +\mplibcodeinherit{disable}% +\mplibglobaltextext{disable}\par \mplibsetformat{metafun}% \begin{mplibcode} verbatimtex \moveright 0.4\hsize etex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/test-luamplib-plain.tex new/doc/luatex/luamplib/test-luamplib-plain.tex --- old/doc/luatex/luamplib/test-luamplib-plain.tex 2015-03-26 22:52:52.000000000 +0100 +++ new/doc/luatex/luamplib/test-luamplib-plain.tex 2017-06-06 23:48:32.000000000 +0200 @@ -60,7 +60,21 @@ endfor; endfig; \endmplibcode -B\par +B\par\leavevmode +\mplibcodeinherit{enable}% +\mplibglobaltextext{enable}% +\everymplib{ beginfig(0);}\everyendmplib{ endfig;}% +\mplibcode + label(btex $\sqrt{2}$ etex, origin); + draw fullcircle scaled 20; + picture pic; pic := currentpicture; +\endmplibcode +\mplibcode + currentpicture := pic scaled 2; +\endmplibcode +\everymplib{}\everyendmplib{}% +\mplibcodeinherit{disable}% +\mplibglobaltextext{disable}\par \mplibsetformat{metafun}% \mplibcode verbatimtex \moveright 0.4\hsize etex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luamplib.doc.tlpobj new/tlpkg/tlpobj/luamplib.doc.tlpobj --- old/tlpkg/tlpobj/luamplib.doc.tlpobj 2016-04-14 19:19:07.000000000 +0200 +++ new/tlpkg/tlpobj/luamplib.doc.tlpobj 2017-06-07 02:21:49.000000000 +0200 @@ -1,9 +1,9 @@ name luamplib.doc category Package -revision 40217 +revision 44496 shortdesc doc files of luamplib relocated 1 -docfiles size=44 +docfiles size=45 RELOC/doc/luatex/luamplib/NEWS RELOC/doc/luatex/luamplib/README RELOC/doc/luatex/luamplib/luamplib.pdf ++++++ luamplib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luamplib/luamplib.lua new/tex/luatex/luamplib/luamplib.lua --- old/tex/luatex/luamplib/luamplib.lua 2016-04-02 23:57:49.000000000 +0200 +++ new/tex/luatex/luamplib/luamplib.lua 2017-06-06 23:48:32.000000000 +0200 @@ -18,8 +18,8 @@ luatexbase.provides_module { name = "luamplib", - version = "2.11.3", - date = "2016/03/31", + version = "2.12.1", + date = "2017/06/02", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", } @@ -641,9 +641,12 @@ luamplib.textextlabelpreamble = textextlabelpreamble local TeX_code_t = {} +local texboxnum = { 2047 } local function domakeTEXboxes (data) - local num = 255 -- output box + local num = texboxnum[1] + texboxnum[2] = num + local global = luamplib.globaltextext and "\\global" or "" if data and data.fig then local figures = data.fig for f=1, #figures do @@ -658,7 +661,7 @@ local str = prescript and prescript.MPlibmkTEXbox if str then num = num + 1 - texsprint(format("\\setbox%i\\hbox{%s}",num,str)) + texsprint(format("%s\\setbox%i\\hbox{%s}", global, num, str)) end local texcode = prescript and prescript.MPlibVerbTeX if texcode and texcode ~= "" then @@ -668,6 +671,9 @@ end end end + if luamplib.globaltextext then + texboxnum[1] = num + end end local function protect_tex_text_common (data) @@ -754,7 +760,7 @@ local function processwithTEXboxes (data) if not data then return end - local num = 255 -- output box + local num = texboxnum[2] local prepreamble = format("TEXBOX_:=%i;\n",num) while true do num = num + 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luamplib/luamplib.sty new/tex/luatex/luamplib/luamplib.sty --- old/tex/luatex/luamplib/luamplib.sty 2016-04-02 23:57:49.000000000 +0200 +++ new/tex/luatex/luamplib/luamplib.sty 2017-06-06 23:48:32.000000000 +0200 @@ -14,7 +14,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2016/03/31 v2.11.3 mplib package for LuaTeX] + [2017/06/02 v2.12.1 mplib package for LuaTeX] \ifx\newluafunction\@undefined \input ltluatex \fi @@ -197,6 +197,16 @@ \fi \endgroup } +\def\mplibglobaltextext#1{% + \begingroup + \def\tempa{enable}\def\tempb{#1}% + \ifx\tempa\tempb + \directlua{luamplib.globaltextext = true}% + \else + \directlua{luamplib.globaltextext = false}% + \fi + \endgroup +} \ifx\mplibscratchbox\undefined \newbox\mplibscratchbox \fi \def\mplibstarttoPDF#1#2#3#4{% \hbox\bgroup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luamplib.tlpobj new/tlpkg/tlpobj/luamplib.tlpobj --- old/tlpkg/tlpobj/luamplib.tlpobj 2016-04-14 19:19:07.000000000 +0200 +++ new/tlpkg/tlpobj/luamplib.tlpobj 2017-06-07 02:21:49.000000000 +0200 @@ -1,6 +1,6 @@ name luamplib category Package -revision 40217 +revision 44496 shortdesc Use LuaTeX's built-in MetaPost interpreter relocated 1 longdesc The package enables the user to specify MetaPost diagrams @@ -11,7 +11,7 @@ RELOC/tex/luatex/luamplib/luamplib.lua RELOC/tex/luatex/luamplib/luamplib.sty catalogue-ctan /macros/luatex/generic/luamplib -catalogue-date 2016-04-02 19:29:34 +0200 +catalogue-date 2017-06-06 10:04:50 +0200 catalogue-license gpl2 catalogue-topics mp-use graphics-in-tex luatex -catalogue-version 2.11.3 +catalogue-version 2.12.1 ++++++ luaotfload.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/NEWS new/texmf-dist/doc/luatex/luaotfload/NEWS --- old/texmf-dist/doc/luatex/luaotfload/NEWS 2016-05-06 00:12:02.000000000 +0200 +++ new/texmf-dist/doc/luatex/luaotfload/NEWS 2017-01-31 01:01:04.000000000 +0100 @@ -1,5 +1,13 @@ Change History -------------- +2017-01-29, luaotfload v2.8: + * Latest fontloader code. + * Support for Luatex 1.0. + * Integration of the extended AFM handler. + * Fixes to font family assignment. + * Skip initialization if Luaotfload is already loaded. + * Optical sizes advertised by fonts treated as big points. + 2016/04/21, luaotfload v2.7: * Rework lookup chaining. * Combining glyphs from different fonts (``combo: ...`` requests). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/README new/texmf-dist/doc/luatex/luaotfload/README --- old/texmf-dist/doc/luatex/luaotfload/README 2016-04-21 22:55:25.000000000 +0200 +++ new/texmf-dist/doc/luatex/luaotfload/README 2017-02-06 01:01:05.000000000 +0100 @@ -39,7 +39,7 @@ Patrick Gundlach <gundlach(a)speedata.de> Philipp Stephani <st_philipp(a)yahoo.de> David Carlisle <d.p.carlisle(a)gmail.com> - +Yan Zhou @zhouyan Installation ------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ distribution's manual for details. 3. a. Grab the sources from CTAN or github. - b. Run 'make install TEXMFROOT=/path/to/texmf'. + b. Run 'make install DESTDIR=/path/to/texmf'. c. See 2c. 4. Try to figure it out by looking at the Makefile and comments in the sources. Binary files old/texmf-dist/doc/luatex/luaotfload/filegraph.pdf and new/texmf-dist/doc/luatex/luaotfload/filegraph.pdf differ Binary files old/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf and new/texmf-dist/doc/luatex/luaotfload/luaotfload.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/luaotfload-tool.1 new/texmf-dist/doc/man/man1/luaotfload-tool.1 --- old/texmf-dist/doc/man/man1/luaotfload-tool.1 2016-04-21 22:55:25.000000000 +0200 +++ new/texmf-dist/doc/man/man1/luaotfload-tool.1 2017-01-31 01:01:05.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH LUAOTFLOAD-TOOL 1 "2016-04-21" "2.7" "text processing" +.TH LUAOTFLOAD-TOOL 1 "2017-01-28" "2.8" "text processing" .SH NAME luaotfload-tool \- generate and query the Luaotfload font names database . Binary files old/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf and new/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man5/luaotfload.conf.5 new/texmf-dist/doc/man/man5/luaotfload.conf.5 --- old/texmf-dist/doc/man/man5/luaotfload.conf.5 2016-04-21 22:55:25.000000000 +0200 +++ new/texmf-dist/doc/man/man5/luaotfload.conf.5 2017-01-31 01:01:05.000000000 +0100 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH LUAOTFLOAD.CONF 5 "2016-04-21" "2.7" "text processing" +.TH LUAOTFLOAD.CONF 5 "2017-01-29" "2.8" "text processing" .SH NAME luaotfload.conf \- Luaotfload configuration file . @@ -200,6 +200,14 @@ T} _ T{ +designsize\-dimen +T} T{ +b +T} T{ +\fBbp\fP +T} +_ +T{ formats T} T{ s @@ -247,14 +255,6 @@ \fBtrue\fP T} _ -T{ -use\-fontforge -T} T{ -b -T} T{ -\fBfalse\fP -T} -_ .TE .sp The flag \fBcompress\fP determines whether the font index (usually @@ -264,6 +264,10 @@ and has no effect on the runtime behavior of Luaotfload, the flag should remain set. Most editors come with zlib support anyways. .sp +The setting \fBdesignsize\-dimen\fP applies when looking up fonts from +families with design sizes. The default of DTP\-style “big points” +can be changed for \fBpt\fP or even \fBdd\fP\&. +.sp The list of \fBformats\fP must be a comma separated sequence of strings containing one or more of these elements: .INDENT 0.0 @@ -302,12 +306,8 @@ .sp If \fBupdate\-live\fP is set, Luaotfload will reload the database if it cannot find a requested font. Those who prefer to update manually using -\fBluaotfload\-tool\fP should unset this flag. -.sp -The option \fBuse\-fontforge\fP switches name scanning back to the old -method that relies on the builtin \fBfontloader\fP library. This is -interesting for reference until the Fontforge code will be removed -eventually. +\fBluaotfload\-tool\fP should unset this flag. This option does not affect +rebuilds due to version mismatch. .SS Section \fBdefault\-features\fP .sp By default Luaotfload enables \fBnode\fP mode and picks the default font @@ -453,6 +453,14 @@ T} _ T{ +anon\-sequence +T} T{ +s +T} T{ +\fB"tex,path,name"\fP +T} +_ +T{ color\-callback T} T{ s @@ -494,6 +502,21 @@ _ .TE .sp +Unqualified font lookups are treated with the flexible “anonymous” +mechanism. This involves a chain of lookups applied successively until +the first one yields a match. By default, the lookup will first search +for TFM fonts using the Kpathsea library. If this wasn’t successful, an +attempt is made at interpreting the request as an absolute path (like +the \fB[/path/to/font/foo.ttf]\fP syntax) or a file name +(\fBfile:foo.ttf\fP). Finally, the request is interpreted as a font name +and retrieved from the index (\fBname:Foo Regular\fP). This behavior can +be configured by specifying a list as the value to \fBanon\-sequence\fP\&. +Available items are \fBtex\fP, \fBpath\fP, \fBname\fP \-\- representing the +lookups described above, respectively \-\-, and \fBfile\fP for searching a +filename but not an absolute path. Also, \fBmy\fP lookups are valid +values but they should only be used from within TeX documents, because +there is no means of customizing a \fBmy\fP lookups on the command line. +.sp The \fBcolor\-callback\fP option determines the stage at which fonts that defined with a \fBcolor=xxyyzz\fP feature will be colorized. By default this happens in a \fBpost_linebreak_filter\fP but alternatively the Binary files old/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf and new/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luaotfload.doc.tlpobj new/tlpkg/tlpobj/luaotfload.doc.tlpobj --- old/tlpkg/tlpobj/luaotfload.doc.tlpobj 2016-05-06 03:15:16.000000000 +0200 +++ new/tlpkg/tlpobj/luaotfload.doc.tlpobj 2017-04-14 17:48:02.000000000 +0200 @@ -1,8 +1,8 @@ name luaotfload.doc category Package -revision 40902 +revision 43194 shortdesc doc files of luaotfload -docfiles size=104 +docfiles size=102 texmf-dist/doc/luatex/luaotfload/COPYING texmf-dist/doc/luatex/luaotfload/NEWS texmf-dist/doc/luatex/luaotfload/README ++++++ luaotfload.tar.xz ++++++ ++++ 87001 lines of diff (skipped) ++++++ luaotfload_varfonts.dif ++++++ --- /var/tmp/diff_new_pack.jtuDIg/_old 2017-06-25 19:27:29.806806877 +0200 +++ /var/tmp/diff_new_pack.jtuDIg/_new 2017-06-25 19:27:29.810806311 +0200 @@ -5,7 +5,7 @@ --- texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua +++ texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua 2016-06-09 10:26:02.571996404 +0000 -@@ -161,6 +161,7 @@ do +@@ -162,6 +162,7 @@ do -- standard context tree setup local cachepaths = kpse.expand_var('$TEXMFCACHE') or "" @@ -13,7 +13,7 @@ -- quite like tex live or so (the weird $TEXMFCACHE test seems to be needed on miktex) -@@ -174,6 +175,31 @@ do +@@ -175,6 +176,31 @@ do cachepaths = kpse.expand_var('$VARTEXMF') or "" end @@ -47,7 +47,7 @@ if cachepaths == "" then --- texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua +++ texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua 2016-06-09 10:23:51.482497993 +0000 -@@ -3734,12 +3734,35 @@ if not caches.namespace or caches.namesp +@@ -4531,12 +4531,35 @@ if not caches.namespace or caches.namesp end do local cachepaths=kpse.expand_var('$TEXMFCACHE') or "" ++++++ luasseq.doc.tar.xz ++++++ ++++++ luasseq.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luasseq.tlpobj new/tlpkg/tlpobj/luasseq.tlpobj --- old/tlpkg/tlpobj/luasseq.tlpobj 2016-04-14 19:19:14.000000000 +0200 +++ new/tlpkg/tlpobj/luasseq.tlpobj 2017-04-14 17:48:05.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/scripts/luasseq/luasseq.lua RELOC/tex/lualatex/luasseq/luasseq.sty catalogue-ctan /macros/luatex/latex/luasseq -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths luatex ++++++ luatex.doc.tar.xz ++++++ ++++ 3557 lines of diff (skipped) ++++++ luatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/texmfcnf.lua new/texmf-dist/web2c/texmfcnf.lua --- old/texmf-dist/web2c/texmfcnf.lua 2016-04-07 00:40:36.000000000 +0200 +++ new/texmf-dist/web2c/texmfcnf.lua 2017-04-13 19:59:45.000000000 +0200 @@ -45,13 +45,13 @@ -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live TEXMFSYSVAR = "selfautoparent:texmf-var", - TEXMFVAR = "home:.texlive2016/texmf-var", + TEXMFVAR = "home:.texlive2017/texmf-var", -- We have only one cache path but there can be more. The first writable one -- will be chosen but there can be more readable paths. TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", - TEXMFCONFIG = "home:.texlive2016/texmf-config", + TEXMFCONFIG = "home:.texlive2017/texmf-config", -- I don't like this texmf under home and texmf-home would make more -- sense. One never knows what installers put under texmf anywhere and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatex.tlpobj new/tlpkg/tlpobj/luatex.tlpobj --- old/tlpkg/tlpobj/luatex.tlpobj 2016-05-09 03:15:55.000000000 +0200 +++ new/tlpkg/tlpobj/luatex.tlpobj 2017-05-04 02:07:05.000000000 +0200 @@ -1,6 +1,6 @@ name luatex category TLCore -revision 40963 +revision 44166 shortdesc The LuaTeX engine longdesc LuaTeX is an extended version of pdfTeX using Lua as an longdesc embedded scripting language. The LuaTeX project's main @@ -12,6 +12,14 @@ longdesc development; its specification has been declared stable, but longdesc absolute stability may not in practice be assumed. Source code longdesc is available from ctan:/systems/texlive/source. +depend cm +depend etex +depend hyphen-base +depend knuth-lib +depend luatex +depend plain +depend tex-ini-files +depend unicode-data depend luatex.ARCH execute AddFormat name=luatex engine=luatex options="luatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,luatex,plain,tex-ini-files,unicode-data execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,luatex,plain,tex-ini-files,unicode-data @@ -20,6 +28,6 @@ texmf-dist/tex/generic/config/luatex-unicode-letters.tex texmf-dist/tex/generic/config/luatexiniconfig.tex texmf-dist/web2c/texmfcnf.lua -catalogue-date 2016-04-09 08:42:09 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license gpl2 catalogue-topics engine ++++++ luatex85.doc.tar.xz ++++++ Binary files old/doc/generic/luatex85/luatex85.pdf and new/doc/generic/luatex85/luatex85.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatex85.doc.tlpobj new/tlpkg/tlpobj/luatex85.doc.tlpobj --- old/tlpkg/tlpobj/luatex85.doc.tlpobj 2016-04-14 19:24:33.000000000 +0200 +++ new/tlpkg/tlpobj/luatex85.doc.tlpobj 2017-04-14 17:49:59.000000000 +0200 @@ -1,8 +1,8 @@ name luatex85.doc category Package -revision 39902 +revision 41456 shortdesc doc files of luatex85 relocated 1 -docfiles size=42 +docfiles size=43 RELOC/doc/generic/luatex85/README.md RELOC/doc/generic/luatex85/luatex85.pdf ++++++ luatex85.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/luatex85/luatex85.sty new/tex/generic/luatex85/luatex85.sty --- old/tex/generic/luatex85/luatex85.sty 2016-03-02 00:22:50.000000000 +0100 +++ new/tex/generic/luatex85/luatex85.sty 2016-11-25 19:33:35.000000000 +0100 @@ -12,10 +12,11 @@ %% This file may be distributed under the terms of the LPPL. %% See README for details. \ifx\ProvidesPackage\undefined -\def\next#1#2[#3]{\wlog{#2 #3}} +\def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef +\csname ver(a)luatex85.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{luatex85} - [2016/03/01 v1.0 pdftex aliases for luatex] + [2016/06/15 v1.4 pdftex aliases for luatex] \ifx\pdfvariable\undefined \expandafter\endinput \fi @@ -49,14 +50,17 @@ \let\ifpdfprimitive \ifprimitive \let\ifpdfabsnum \ifabsnum \let\ifpdfabsdim \ifabsdim -\protected\def\pdftexversion {\numexpr\pdffeedback version\relax} - \def\pdftexrevision {\pdffeedback revision} +\directlua{tex.enableprimitives('pdf',{'tracingfonts'})} +\protected\def\pdftexversion {\numexpr 140\relax} + \def\pdftexrevision {7} \protected\def\pdflastlink {\numexpr\pdffeedback lastlink\relax} \protected\def\pdfretval {\numexpr\pdffeedback retval\relax} \protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax} \protected\def\pdflastannot {\numexpr\pdffeedback lastannot\relax} \def\pdfxformname {\pdffeedback xformname} - \def\pdfcreationdate {\pdffeedback creationdate} +{\outputmode=1 + \xdef\pdfcreationdate {\pdffeedback creationdate} +} \def\pdffontname {\pdffeedback fontname} \def\pdffontobjnum {\pdffeedback fontobjnum} \def\pdffontsize {\pdffeedback fontsize} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatex85.tlpobj new/tlpkg/tlpobj/luatex85.tlpobj --- old/tlpkg/tlpobj/luatex85.tlpobj 2016-04-14 19:24:33.000000000 +0200 +++ new/tlpkg/tlpobj/luatex85.tlpobj 2017-04-14 17:49:59.000000000 +0200 @@ -1,6 +1,6 @@ name luatex85 category Package -revision 39902 +revision 41456 shortdesc pdfTeX aliases for LuaTeX relocated 1 longdesc The package provides emulation of pdfTeX primitives for LuaTeX @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/generic/luatex85/luatex85.sty catalogue-ctan /macros/generic/luatex85 -catalogue-date 2016-03-10 05:58:30 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics lua-supp -catalogue-version 1.0 +catalogue-version 1.4 ++++++ luatex_cnf.dif ++++++ --- /var/tmp/diff_new_pack.jtuDIg/_old 2017-06-25 19:27:30.414720996 +0200 +++ /var/tmp/diff_new_pack.jtuDIg/_new 2017-06-25 19:27:30.418720431 +0200 @@ -1,9 +1,9 @@ --- - texmf-dist/web2c/texmfcnf.lua | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) + texmf-dist/web2c/texmfcnf.lua | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) --- texmf-dist/web2c/texmfcnf.lua -+++ texmf-dist/web2c/texmfcnf.lua 2017-05-26 12:17:09.907157993 +0000 ++++ texmf-dist/web2c/texmfcnf.lua 2017-06-13 14:14:48.228714762 +0000 @@ -42,16 +42,24 @@ return { -- "selfautoparent:", -- } @@ -18,7 +18,7 @@ -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live - TEXMFSYSVAR = "selfautoparent:texmf-var", -- TEXMFVAR = "home:.texlive2016/texmf-var", +- TEXMFVAR = "home:.texlive2017/texmf-var", + TEXMFSYSVAR = "/var/lib/texmf", + TEXMFVAR = "$TEXMFSYSVAR", + HOMECACHE = "home:.cache/texmf/fonts", @@ -27,7 +27,7 @@ -- will be chosen but there can be more readable paths. - TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", -- TEXMFCONFIG = "home:.texlive2016/texmf-config", +- TEXMFCONFIG = "home:.texlive2017/texmf-config", + TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR;$HOMECACHE", + TEXMFCONFIG = "$TEXMFSYSCONFIG", @@ -57,12 +57,3 @@ TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//", ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//", -@@ -100,7 +108,7 @@ return { - PERLINPUTS = ".;$TEXMF/scripts/context/perl", - PYTHONINPUTS = ".;$TEXMF/scripts/context/python", - RUBYINPUTS = ".;$TEXMF/scripts/context/ruby", -- LUAINPUTS = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//", -+ LUAINPUTS = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//", - CLUAINPUTS = ".;$SELFAUTOLOC/lib/{context,luatex,}/lua//", - - -- Not really used by MkIV so they might go away. ++++++ luatexbase.doc.tar.xz ++++++ ++++++ luatexbase.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexbase.tlpobj new/tlpkg/tlpobj/luatexbase.tlpobj --- old/tlpkg/tlpobj/luatexbase.tlpobj 2016-04-14 19:24:34.000000000 +0200 +++ new/tlpkg/tlpobj/luatexbase.tlpobj 2017-04-14 17:49:59.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/luatex/luatexbase/luatexbase.loader.lua RELOC/tex/luatex/luatexbase/luatexbase.sty catalogue-ctan /macros/luatex/generic/luatexbase -catalogue-date 2015-10-04 14:09:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics luatex catalogue-version 1.3 ++++++ luatexja.doc.tar.xz ++++++ ++++ 1776 lines of diff (skipped) ++++++ luatexja.tar.xz ++++++ ++++ 12681 lines of diff (skipped) ++++++ luatexko.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/ChangeLog new/doc/luatex/luatexko/ChangeLog --- old/doc/luatex/luatexko/ChangeLog 2016-05-15 00:11:33.000000000 +0200 +++ new/doc/luatex/luatexko/ChangeLog 2017-05-01 23:54:46.000000000 +0200 @@ -1,3 +1,16 @@ +2017-05-01 Dohyun Kim <nomos at ktug org> + + Version 1.17 + + * luatexko.lua: rewrite reorderTM (reorder-tone-marks) function + + +2017-02-06 Dohyun Kim <nomos at ktug org> + + Version 1.16 + + * luatexko.sty: patch {rm|sf|tt}family of fontspec 2017 + 2016-05-14 Dohyun Kim <nomos at ktug org> Version 1.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/README new/doc/luatex/luatexko/README --- old/doc/luatex/luatexko/README 2016-05-15 00:11:33.000000000 +0200 +++ new/doc/luatex/luatexko/README 2017-05-01 23:54:46.000000000 +0200 @@ -1,4 +1,4 @@ -LuaTeX-ko Package version 1.15 (2016/05/14) +LuaTeX-ko Package version 1.17 (2017/05/01) =========================================== This is a Lua(La)TeX macro package that supports typesetting Korean Binary files old/doc/luatex/luatexko/luatexko-doc.pdf and new/doc/luatex/luatexko/luatexko-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/luatexko-doc.tex new/doc/luatex/luatexko/luatexko-doc.tex --- old/doc/luatex/luatexko/luatexko-doc.tex 2016-05-15 00:11:33.000000000 +0200 +++ new/doc/luatex/luatexko/luatexko-doc.tex 2017-05-01 23:54:46.000000000 +0200 @@ -8,20 +8,21 @@ %% %% public domain -\RequirePackage{luatex85} +%\RequirePackage{luatex85} \documentclass[a4paper]{article} \usepackage[hmargin=3.8cm]{geometry} \usepackage[hangul]{luatexko} \usepackage{luamplib} -\setmainhangulfont{KoPubBatang_Pro}[ +\setmainhangulfont{Noto Serif CJK KR}[ AutoFakeSlant, + Script=Hangul, + Language=Korean, UprightFont=* Light, BoldFont=* Bold, InterLatinCJK=.125em, Expansion, Protrusion, ] \setsanshangulfont{Noto Sans CJK KR}[ - CharRaise=-0.1ex, Script=Hangul, Language=Korean, UprightFont=* DemiLight, @@ -61,7 +62,7 @@ \author{Dohyun Kim \normalsize |<nomos at ktug org>| \and Soojin Nam \normalsize |<jsunam at gmail com>| \and \normalsize \url{<http://github.com/dohyunkim/luatexko>}} -\date{Version 1.15\quad 2016/05/14} +\date{Version 1.17\quad 2017/05/01} \maketitle \begin{quote}\small @@ -321,6 +322,7 @@ \framebox[\linewidth]{\begin{vertical}{17em} \sffamily \addhangulfontfeature{Vertical=RotatedGlyphs, + RawFeature=vertical, CharacterWidth=Full, CharRaise=0.1ex, } \parindent-1em\leftskip1em \linespread{1.5}\selectfont \noindent 님의 침묵(The Silent Beloved) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexko.doc.tlpobj new/tlpkg/tlpobj/luatexko.doc.tlpobj --- old/tlpkg/tlpobj/luatexko.doc.tlpobj 2016-05-15 03:20:04.000000000 +0200 +++ new/tlpkg/tlpobj/luatexko.doc.tlpobj 2017-05-02 19:43:19.000000000 +0200 @@ -1,9 +1,9 @@ name luatexko.doc category Package -revision 41128 +revision 44141 shortdesc doc files of luatexko relocated 1 -docfiles size=61 +docfiles size=65 RELOC/doc/luatex/luatexko/ChangeLog RELOC/doc/luatex/luatexko/README RELOC/doc/luatex/luatexko/luatexko-doc.pdf ++++++ luatexko.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luatexko/luatexko-core.sty new/tex/luatex/luatexko/luatexko-core.sty --- old/tex/luatex/luatexko/luatexko-core.sty 2016-05-15 00:11:33.000000000 +0200 +++ new/tex/luatex/luatexko/luatexko-core.sty 2017-02-09 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ % luatexko-core.sty % -% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org> +% Copyright (c) 2013-2017 Dohyun Kim <nomos at ktug org> % Soojin Nam <jsunam at gmail com> % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ \ifcsname ifpdf\endcsname\else \input ifpdf.sty \fi \catcode`@ = 11 \else - \ProvidesPackage{luatexko-core}[2016/05/14 v1.15 Typesetting Korean with LuaTeX] + \ProvidesPackage{luatexko-core}[2017/02/06 v1.16 Typesetting Korean with LuaTeX] \RequirePackage{luaotfload}[2016/04/21] \RequirePackage{ifpdf} \fi @@ -32,7 +32,11 @@ \let\luaescapestring\luatexluaescapestring \fi \ifdefined\pdffontsize\else % luatex 0.87 - \def\pdffontsize{\pdffeedback fontsize} + \ifpdf + \def\pdffontsize{\pdffeedback fontsize} + \else + \def\pdffontsize{\the\fontdimen6 } + \fi \protected\def\pdfliteral{\pdfextension literal} \fi @@ -282,24 +286,25 @@ \global\advance\luakoulineboxcnt\@ne \count@\luakoulineboxcnt \leavevmode} -\protected\def\uline#1{% +\protected\def\ulineluatexko#1{% \luako@uline@code@common \luako@nested@ulinedown \dimen@\dimexpr\ulinedown+\ulinewidth\relax \dimen@ii-\dimexpr\ulinedown\relax \setbox\z@\hbox{\vrule width\z@ height\dimen@ii depth\dimen@}% \directlua{ luatexko.uline_boundary(\the\count(a),tex.box[0].head) }% - #1% + #1\relax \directlua{ luatexko.uline_boundary(\the\count@) }% \endgroup} -\protected\def\sout#1{{\def\ulinedown{-0.5ex-\ulinewidth/2}\uline{#1}}} -\protected\def\uuline#1{\uline{\uline{#1}}} +\let\uline\ulineluatexko +\protected\def\sout#1{{\def\ulinedown{-0.5ex-\ulinewidth/2}\ulineluatexko{#1}}} +\protected\def\uuline#1{\ulineluatexko{\ulineluatexko{#1}}} % ulem with arbitray box \protected\def\markoverwith#1#2{% \luako@uline@code@common \setbox\z@\hbox{#1}% \directlua{ luatexko.uline_boundary(\the\count(a),tex.box[0]) }% - #2% + #2\relax \directlua{ luatexko.uline_boundary(\the\count@) }% \endgroup} \protected\def\uwave{\ifx\ltxko@sixly\undefined \font\ltxko@sixly=lasy6 \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luatexko/luatexko-normalize.lua new/tex/luatex/luatexko/luatexko-normalize.lua --- old/tex/luatex/luatexko/luatexko-normalize.lua 2016-04-27 00:05:58.000000000 +0200 +++ new/tex/luatex/luatexko/luatexko-normalize.lua 2017-02-09 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ -- luatexko-normalize.lua -- --- Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org> +-- Copyright (c) 2013-2017 Dohyun Kim <nomos at ktug org> -- Soojin Nam <jsunam at gmail com> -- -- This work may be distributed and/or modified under the @@ -13,8 +13,8 @@ luatexbase.provides_module({ name = "luatexko-normalize", - version = "1.13", - date = "2016/04/25", + version = "1.16", + date = "2017/02/06", author = "Dohyun Kim, Soojin Nam", description = "Hangul normalization", license = "LPPL v1.3+", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luatexko/luatexko-uhc2utf8.lua new/tex/luatex/luatexko/luatexko-uhc2utf8.lua --- old/tex/luatex/luatexko/luatexko-uhc2utf8.lua 2016-04-27 00:05:58.000000000 +0200 +++ new/tex/luatex/luatexko/luatexko-uhc2utf8.lua 2017-02-09 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ -- luatexko-uhc2utf8.lua -- --- Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org> +-- Copyright (c) 2013-2017 Dohyun Kim <nomos at ktug org> -- Soojin Nam <jsunam at gmail com> -- -- This work may be distributed and/or modified under the @@ -13,8 +13,8 @@ luatexbase.provides_module({ name = "luatexko-uhc2utf8", - version = "1.13", - date = "2016/04/25", + version = "1.16", + date = "2017/02/06", author = "Dohyun Kim, Soojin Nam", description = "UHC (CP949) input encoding", license = "LPPL v1.3+", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luatexko/luatexko.lua new/tex/luatex/luatexko/luatexko.lua --- old/tex/luatex/luatexko/luatexko.lua 2016-05-15 00:11:33.000000000 +0200 +++ new/tex/luatex/luatexko/luatexko.lua 2017-05-01 23:54:46.000000000 +0200 @@ -1,6 +1,6 @@ -- luatexko.lua -- --- Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org> +-- Copyright (c) 2013-2017 Dohyun Kim <nomos at ktug org> -- Soojin Nam <jsunam at gmail com> -- -- This work may be distributed and/or modified under the @@ -13,8 +13,8 @@ luatexbase.provides_module { name = 'luatexko', - date = '2016/05/14', - version = '1.15', + date = '2017/05/01', + version = '1.17', description = 'Korean linebreaking and font-switching', author = 'Dohyun Kim, Soojin Nam', license = 'LPPL v1.3+', @@ -129,135 +129,113 @@ local cjkclass = { [0x2018] = 1, -- ‘ [0x201C] = 1, -- “ - [0xFF08] = 1, -- （ - [0xFE35] = 1, -- （ vert - [0x3014] = 1, -- 〔 - [0xFE39] = 1, -- 〔 vert - [0xFF3B] = 1, -- ［ - [0xFE47] = 1, -- ［ vert - [0xFF5B] = 1, -- ｛ - [0xFE37] = 1, -- ｛ vert + [0x2329] = 1, -- 〈 [0x3008] = 1, -- 〈 - [0xFE3F] = 1, -- 〈 vert [0x300A] = 1, -- 《 - [0xFE3D] = 1, -- 《 vert [0x300C] = 1, -- 「 - [0xFE41] = 1, -- 「 vert [0x300E] = 1, -- 『 - [0xFE43] = 1, -- 『 vert [0x3010] = 1, -- 【 - [0xFE3B] = 1, -- 【 vert - [0x3001] = 2, -- 、 - [0xFE11] = 2, -- 、 vert - [0xFF0C] = 2, -- ， - [0xFE10] = 2, -- ， vert + [0x3014] = 1, -- 〔 + [0x3016] = 1, -- 〖 + [0x3018] = 1, -- 〘 + [0x301A] = 1, -- 〚 + [0x301D] = 1, -- 〝 + [0xFE17] = 1, -- ︗ + [0xFE35] = 1, -- ︵ + [0xFE37] = 1, -- ︷ + [0xFE39] = 1, -- ︹ + [0xFE3B] = 1, -- ︻ + [0xFE3D] = 1, -- ︽ + [0xFE3F] = 1, -- ︿ + [0xFE41] = 1, -- ﹁ + [0xFE43] = 1, -- ﹃ + [0xFE47] = 1, -- ﹇ + [0xFF08] = 1, -- （ + [0xFF3B] = 1, -- ［ + [0xFF5B] = 1, -- ｛ + [0xFF5F] = 1, -- ｟ + [0xFF62] = 1, -- ｢ half [0x2019] = 2, -- ’ [0x201D] = 2, -- ” - [0xFF09] = 2, -- ） - [0xFE36] = 2, -- ） vert - [0x3015] = 2, -- 〕 - [0xFE3A] = 2, -- 〕 vert - [0xFF3D] = 2, -- ］ - [0xFE48] = 2, -- ］ vert - [0xFF5D] = 2, -- ｝ - [0xFE38] = 2, -- ｝ vert + [0x232A] = 2, -- 〉 + [0x3001] = 2, -- 、 [0x3009] = 2, -- 〉 - [0xFE40] = 2, -- 〉 vert [0x300B] = 2, -- 》 - [0xFE3E] = 2, -- 》 vert [0x300D] = 2, -- 」 - [0xFE42] = 2, -- 」 vert [0x300F] = 2, -- 』 - [0xFE44] = 2, -- 』 vert [0x3011] = 2, -- 】 - [0xFE3C] = 2, -- 】 vert + [0x3015] = 2, -- 〕 + [0x3017] = 2, -- 〗 + [0x3019] = 2, -- 〙 + [0x301B] = 2, -- 〛 + [0x301E] = 2, -- 〞 + [0x301F] = 2, -- 〟 + [0xFE10] = 2, -- ︐ + [0xFE11] = 2, -- ︑ + [0xFE18] = 2, -- ︘ + [0xFE36] = 2, -- ︶ + [0xFE38] = 2, -- ︸ + [0xFE3A] = 2, -- ︺ + [0xFE3C] = 2, -- ︼ + [0xFE3E] = 2, -- ︾ + [0xFE40] = 2, -- ﹀ + [0xFE42] = 2, -- ﹂ + [0xFE44] = 2, -- ﹄ + [0xFE48] = 2, -- ﹈ + [0xFF09] = 2, -- ） + [0xFF0C] = 2, -- ， + [0xFF3D] = 2, -- ］ + [0xFF5D] = 2, -- ｝ + [0xFF60] = 2, -- ｠ + [0xFF63] = 2, -- ｣ half + [0xFF64] = 2, -- ､ half [0x00B7] = 3, -- · [0x30FB] = 3, -- ・ [0xFF1A] = 3, -- ： --- [0xFE13] = 3, -- ： vert [0xFF1B] = 3, -- ； --- [0xFE14] = 3, -- ； vert + [0xFF65] = 3, -- ･ half [0x3002] = 4, -- 。 - [0xFE12] = 4, -- 。 vert + [0xFE12] = 4, -- ︒ [0xFF0E] = 4, -- ． - [0x2015] = 5, -- ― - [0x2026] = 5, -- … - [0xFE19] = 5, -- … vert + [0xFF61] = 4, -- ｡ half + [0x2015] = 5, -- ― [0x2025] = 5, -- ‥ - [0xFE30] = 5, -- ‥ vert - [0xFE31] = 5, -- ︱ vert - [0xFF1F] = 6, -- ？ + [0x2026] = 5, -- … + [0xFE19] = 5, -- ︙ + [0xFE30] = 5, -- ︰ + [0xFE31] = 5, -- ︱ + [0xFE15] = 6, -- ︕ + [0xFE16] = 6, -- ︖ [0xFF01] = 6, -- ！ - [0xFE16] = 6, -- ︖ vert - [0xFE15] = 6, -- ︕ vert + [0xFF1F] = 6, -- ？ } -local inhibitxspcode = { +local inhibitxspcode = setmetatable({ [0x002D] = 0, -- - hyphen minus [0x003C] = 0, -- < [0x003E] = 1, -- > - [0x00B0] = 1, - [0x2015] = 0, - [0x2018] = 2, - [0x2019] = 1, - [0x201C] = 2, - [0x201D] = 1, - [0x2026] = 0, - [0xFE19] = 0, - [0x2032] = 1, - [0x2033] = 1, - [0x3001] = 1, - [0xFE11] = 1, - [0x3002] = 1, - [0xFE12] = 1, - [0x3008] = 2, - [0xFE3F] = 2, - [0x3009] = 1, - [0xFE40] = 1, - [0x300A] = 2, - [0xFE3D] = 2, - [0x300B] = 1, - [0xFE3E] = 1, - [0x300C] = 2, - [0xFE41] = 2, - [0x300D] = 1, - [0xFE42] = 1, - [0x300E] = 2, - [0xFE43] = 2, - [0x300F] = 1, - [0xFE44] = 1, - [0x3010] = 2, - [0xFE3B] = 2, - [0x3011] = 1, - [0xFE3C] = 1, + [0x00B0] = 1, -- ° + [0x2032] = 1, -- ′ + [0x2033] = 1, -- ″ + [0x25CC] = 2, -- dotted circle [0x3012] = 2, -- 〒 - [0x3014] = 2, - [0xFE39] = 2, - [0x3015] = 1, - [0xFE3A] = 1, - [0x301C] = 0, - [0xFF08] = 2, - [0xFE35] = 2, - [0xFF09] = 1, - [0xFE36] = 1, - [0xFF0C] = 1, - [0xFE10] = 1, - [0xFF0E] = 1, - [0xFF1B] = 1, - [0xFE14] = 1, - [0xFF1F] = 1, - [0xFF3B] = 2, - [0xFE47] = 2, - [0xFF3D] = 1, - [0xFE48] = 1, - [0xFF5B] = 2, - [0xFE37] = 2, - [0xFF5D] = 1, - [0xFE38] = 1, - [0xFFE5] = 0, -} + [0x301C] = 0, -- 〜 + [0xFE14] = 1, -- ︔ + [0xFF1B] = 1, -- ； + [0xFFE5] = 0, -- ￥ +},{ + __index = function (_,c) + if cjkclass[c] == 1 then + return 2 + elseif cjkclass[c] == 2 or cjkclass[c] == 4 or cjkclass[c] == 6 then + return 1 + elseif cjkclass[c] == 5 then + return 0 + end + end +}) -local postbreakpenalty = { +local postbreakpenalty = setmetatable({ [0x0023] = 500, [0x0024] = 500, [0x0025] = 500, @@ -266,37 +244,24 @@ [0x003C] = 10000, -- < [0x005B] = 10000, [0x0060] = 10000, + [0x007B] = 10000, -- { + [0x00AB] = 10000, -- « [0x2013] = 50, -- en-dash [0x2014] = 50, -- em-dash - [0x2018] = 10000, - [0x201C] = 10000, - [0x3008] = 10000, - [0xFE3F] = 10000, - [0x300A] = 10000, - [0xFE3D] = 10000, - [0x300C] = 10000, - [0xFE41] = 10000, - [0x300E] = 10000, - [0xFE43] = 10000, - [0x3010] = 10000, - [0xFE3B] = 10000, - [0x3014] = 10000, - [0xFE39] = 10000, [0xFF03] = 200, [0xFF04] = 200, [0xFF05] = 200, [0xFF06] = 200, - [0xFF08] = 10000, - [0xFE35] = 10000, - [0xFF3B] = 10000, - [0xFE47] = 10000, - [0xFF40] = 10000, - [0xFF5B] = 10000, - [0xFE37] = 10000, - [0xFF62] = 10000, -- ｢ -} + [0xFF40] = 10000, -- ｀ +},{ + __index = function (_,c) + if cjkclass[c] == 1 then + return 10000 + end + end +}) -local prebreakpenalty = { +local prebreakpenalty = setmetatable({ [0x0021] = 10000, [0x0022] = 10000, [0x0027] = 10000, @@ -312,35 +277,18 @@ [0x003E] = 10000, -- > [0x003F] = 10000, [0x005D] = 10000, - [0x00B4] = 10000, - [0x00B7] = 10000, -- · + [0x007D] = 10000, -- } + [0x00B4] = 10000, -- ´ + [0x00BB] = 10000, -- » [0x2013] = 10000, -- – [0x2014] = 10000, -- — - [0x2015] = 10000, - [0x2019] = 10000, - [0x201D] = 10000, [0x2025] = 5000, -- 250, -- ‥ - [0xFE30] = 5000, -- 250, -- ︰ [0x2026] = 5000, -- 250, -- … - [0xFE19] = 5000, -- 250, -- ︙ [0x2212] = 5000, -- 200, -- − minus sign - [0x3001] = 10000, - [0xFE11] = 10000, - [0x3002] = 10000, - [0xFE12] = 10000, - [0x3005] = 10000, - [0x3009] = 10000, - [0xFE40] = 10000, - [0x300B] = 10000, - [0xFE3E] = 10000, - [0x300D] = 10000, - [0xFE42] = 10000, - [0x300F] = 10000, - [0xFE44] = 10000, - [0x3011] = 10000, - [0xFE3C] = 10000, - [0x3015] = 10000, - [0xFE3A] = 10000, + [0x3005] = 10000, -- 々 + [0x301C] = 10000, -- 〜 + [0x3035] = 10000, -- 〵 + [0x303B] = 10000, -- 〻 [0x3041] = 150, [0x3043] = 150, [0x3045] = 150, @@ -351,8 +299,13 @@ [0x3085] = 150, [0x3087] = 150, [0x308E] = 150, - [0x309B] = 10000, - [0x309C] = 10000, + [0x3095] = 150, + [0x3096] = 150, + [0x309B] = 10000, -- ゛ + [0x309C] = 10000, -- ゜ + [0x309D] = 10000, -- ゝ + [0x309E] = 10000, -- ゞ + [0x30A0] = 10000, -- ゠ [0x30A1] = 150, [0x30A3] = 150, [0x30A5] = 150, @@ -365,27 +318,25 @@ [0x30EE] = 150, [0x30F5] = 150, [0x30F6] = 150, - [0x30FB] = 10000, - [0x30FC] = 10000, - [0xFF01] = 10000, - [0xFF09] = 10000, - [0xFE36] = 10000, + [0x30FC] = 10000, -- ー + [0x30FD] = 10000, -- ヽ + [0x30FE] = 10000, -- ヾ + [0xFE13] = 10000, -- ︓ + [0xFE14] = 10000, -- ︔ + [0xFE19] = 5000, -- 250, -- ︙ + [0xFE30] = 5000, -- 250, -- ︰ + [0xFE32] = 10000, -- ︲ [0xFF0B] = 5000, -- 200, -- ＋ - [0xFF0C] = 10000, - [0xFE10] = 10000, - [0xFF0E] = 10000, - [0xFF1A] = 10000, - [0xFE13] = 10000, - [0xFF1B] = 10000, - [0xFE14] = 10000, [0xFF1D] = 5000, -- 200, -- ＝ - [0xFF1F] = 10000, - [0xFF3D] = 10000, - [0xFE48] = 10000, - [0xFF5D] = 10000, - [0xFE38] = 10000, - [0xFF63] = 10000, -- ｣ -} + [0xFF9E] = 10000, -- ﾞ + [0xFF9F] = 10000, -- ﾟ +},{ + __index = function (_,c) + if cjkclass[c] and cjkclass[c] > 1 then + return 10000 + end + end +}) local xspcode = { [0x0027] = 2, @@ -593,10 +544,14 @@ end end +local type1fonts = {} + local function get_font_table (fid) if fid then if fontdata[fid] then return fontdata[fid] + elseif type1fonts[fid] then + return type1fonts[fid] else return font.fonts[fid] end @@ -1479,11 +1434,37 @@ esh = esh and tex_round(esh) if esp == gsp and est == gst and esh == gsh then else return end local hf = get_font_table(hfontid) - if hf and hf.encodingbytes == 2 then else return end +-- if hf and hf.encodingbytes == 2 then else return end return gsp, hf end -local type1fonts = {} -- due to too verbose log +local function virtual_unifont (prefix,size) + local data = { + name = prefix.."vf", + type = "virtual", + fonts = {}, + characters = {}, + } + local fonts = data.fonts + local chars = data.characters + for index = 0, 255 do + local name = string.format(prefix.."%02x", index) + if kpse_find_file(name,"tfm") then + local tfm = font.read_tfm(name, size) + data.parameters = data.parameters or tfm.parameters + fonts[#fonts+1] = { name=name, size=size } + local fid = #fonts + local zro = 256 * index + for i,v in pairs(tfm.characters) do + local slot = zro + i + chars[slot] = v + chars[slot].commands = { { "slot", fid, i } } + end + end + end + return data +end + local function nanumtype1font(curr) local currchar, currfont = d_getchar(curr), d_getfont(curr) if currchar > 0xFFFF then return end @@ -1500,38 +1481,21 @@ series = fnt_t.name:find("^cmb") and "b" or "m" end local shape = fnt_t.parameters.slant > 0 and "o" or "" - local subfnt = stringformat("%s%s%s%02x",family,series,shape,currchar/256) + local prefix = stringformat("%s%s%s",family,series,shape) local fsize = fnt_t.size or 655360 - local fspec = stringformat("%s@%d",subfnt,fsize) - local newfnt = type1fonts[fspec] - if newfnt == false then return end - local newchr = currchar % 256 - local function ital_corr (curr,chr_t) - if shape ~= "o" then return end - local nxt = d_getnext(curr) - if nxt and d_getid(nxt) == kernnode and d_getsubtype(nxt) == kern_type_itlc and d_getfield(nxt,"kern") == 0 then - d_setfield(nxt,"kern", chr_t.italic or 0) - end - end - if newfnt then - local fntchr = get_font_char(newfnt,newchr) - if fntchr then - d_setfield(curr,"font", newfnt) - d_setchar(curr, newchr) - ital_corr(curr,fntchr) - end - elseif kpse_find_file(subfnt,"tfm") then - local ft, id = fonts.constructors.readanddefine(subfnt,fsize) - local fntchr = ft and ft.characters[newchr] - if id and fntchr then - type1fonts[fspec] = id - d_setfield(curr,"font", id) - d_setchar(curr, newchr) - ital_corr(curr,fntchr) + local fspec = stringformat("%s@%d",prefix,fsize) + local fontid = type1fonts[fspec] + if fontid == nil then -- bypass false + local fontdata = virtual_unifont(prefix, fsize) + fontid = fontdata and fontdefine(fontdata) + if fontid then + type1fonts[fspec] = fontid + type1fonts[fontid] = fontdata + else + type1fonts[fspec] = false end - else - type1fonts[fspec] = false end + return fontid end local function font_substitute(head) @@ -1569,58 +1533,60 @@ uni = uni and get_cjk_class(uni) if uni and uni < 7 then ftable = {hanja, hangul, fallback} end end + local fid for i = 1,3 do - local fid = ftable[i] + fid = ftable[i] myfontchar = fid and get_font_char(fid, currchar) - if myfontchar then - d_setfield(curr,"font",fid) - --- charraise option charraise - local charraise = get_font_feature(fid, "charraise") - if charraise then - charraise = tex_sp(charraise) - local curryoffset = d_getfield(curr,"yoffset") or 0 - d_setfield(curr,"yoffset", charraise + curryoffset) - end - --- - local nxt = d_getnext(curr) - local nxtid = nxt and d_getid(nxt) - if nxtid == glyphnode and is_unicode_vs(d_getchar(nxt)) then - nxt = d_getnext(nxt) - nxtid = nxt and d_getid(nxt) - end - if eng and nxtid then - local nxtsubtype = d_getsubtype(nxt) - -- adjust next glue by hangul font space - if nxtid == gluenode and nxtsubtype == glue_type_space and get_font_char(fid,32) then - local oldwd, ft = hangulspaceskip(eng, fid, nxt) - if oldwd and ft then - local newwd = ft.space_char_width - if not newwd then - local newsp = d_tonode(d_copy_node(curr)) - newsp.char = 32 - newsp = nodes.simple_font_handler(newsp) - newwd = newsp and newsp.width - ft.space_char_width = newwd - node.free(newsp) - end - if newwd and oldwd ~= newwd then - d_setglue(nxt, newwd, newwd/2, newwd/3) - end + if myfontchar then break end + end + if not myfontchar and not hangulpunctuations[currchar] then + fid = nanumtype1font(curr) + myfontchar = fid and get_font_char(fid, currchar) + end + if myfontchar then + d_setfield(curr,"font",fid) + --- charraise option charraise + local charraise = get_font_feature(fid, "charraise") + if charraise then + charraise = tex_sp(charraise) + local curryoffset = d_getfield(curr,"yoffset") or 0 + d_setfield(curr,"yoffset", charraise + curryoffset) + end + --- + local nxt = d_getnext(curr) + local nxtid = nxt and d_getid(nxt) + if nxtid == glyphnode and is_unicode_vs(d_getchar(nxt)) then + nxt = d_getnext(nxt) + nxtid = nxt and d_getid(nxt) + end + if eng and nxtid then + local nxtsubtype = d_getsubtype(nxt) + -- adjust next glue by hangul font space + if nxtid == gluenode and nxtsubtype == glue_type_space and get_font_char(fid,32) then + local oldwd, ft = hangulspaceskip(eng, fid, nxt) + if oldwd and ft then + local newwd = ft.space_char_width + if not newwd then + local newsp = d_tonode(d_copy_node(curr)) + newsp.char = 32 + newsp = nodes.simple_font_handler(newsp) + newwd = newsp and newsp.width + ft.space_char_width = newwd + node.free(newsp) end - -- adjust next italic correction kern - elseif nxtid == kernnode and nxtsubtype == kern_type_itlc and d_getfield(nxt,"kern") == 0 then - local ksl = get_font_table(fid).parameters.slant - if ksl and ksl > 0 then - d_setfield(nxt,"kern", myfontchar.italic or 0) + if newwd and oldwd ~= newwd then + d_setglue(nxt, newwd, newwd/2, newwd/3) end end + -- adjust next italic correction kern + elseif nxtid == kernnode and nxtsubtype == kern_type_itlc and d_getfield(nxt,"kern") == 0 then + local ksl = get_font_table(fid).parameters.slant + if ksl and ksl > 0 then + d_setfield(nxt,"kern", myfontchar.italic or 0) + end end - break end end - if not myfontchar then - nanumtype1font(curr) - end end end end @@ -1642,38 +1608,43 @@ -- reorder hangul tone marks ----------------------------- local function reorderTM (head) - local curr = d_nodetail(head) + local curr, todo = head, nil while curr do - if d_getid(curr) == glyphnode then + local nid = d_getid(curr) + if nid == glyphnode then local uni = d_get_unicode_char(curr) if uni == 0x302E or uni == 0x302F then - local done = false - local unichar = get_font_char(d_getfont(curr), uni) - if unichar and unichar.width > 0 then - local p = d_getprev(curr) - while p and d_getid(p) == glyphnode do - local pc = get_cjk_class(d_get_unicode_char(p)) - if pc == 9 then - elseif pc == 7 or pc == 8 then - head = d_remove_node(head,curr) - d_setprev(curr, nil) -- prev might survive! - head, curr = d_insert_before(head,p,curr) - done = true - break - else - break - end - p = d_getprev(p) + local tmgl = get_font_char(d_getfont(curr), uni) + local tmwidth = tmgl and tmgl.width or 0 + if todo then + if tmwidth > 0 then + local tm = curr + head, curr = d_remove_node(head, curr) + d_setprev(tm, nil) -- prev might survive! + head = d_insert_before(head, todo, tm) + curr = d_getprev(curr) + end + elseif get_font_char(d_getfont(curr), 0x25CC) then + local u25CC = d_copy_node(curr) + d_setchar(u25CC, 0x25CC) + if tmwidth > 0 then + head, curr = d_insert_after(head, curr, u25CC) + else + head = d_insert_before(head, curr, u25CC) end end - if not done and get_font_char(d_getfont(curr), 0x25CC) then - local u_25CC = d_copy_node(curr) - d_setchar(u_25CC, 0x25CC) - d_insert_after(head, curr, u_25CC) - end + todo = nil + elseif is_hangul(uni) or is_chosong(uni) or uni == 0x25CC then + todo = curr + elseif is_jungjongsong(uni) then + else + todo = nil end + elseif nid == kernnode then + else + todo = nil end - curr = d_getprev(curr) + curr = d_getnext(curr) end return head end @@ -1824,9 +1795,22 @@ end luatexko.uline_boundary = uline_boundary +local skippable = { + [gluenode ] = true, + [penaltynode] = true, + [kernnode ] = true, + [whatsitnode] = true, +} local function draw_underline(head,curr,glueset,gluesign,glueorder,ubox,start) - if not start then - start = d_getid(head) == gluenode and d_getsubtype(head) < 100 and d_getnext(head) or head + start = start or head + while start do + if not skippable[d_getid(start)] then break end + start = d_getnext(start) + end + while curr do + local p = d_getprev(curr) + if not skippable[d_getid(p)] then break end + curr = p end local width = d_nodedimensions(glueset,gluesign,glueorder,start,curr) if width and width > 0 then @@ -2085,7 +2069,7 @@ --- vertical gpos local res = vf.resources or {} if res.verticalgposhack then - return vf -- avoid multiple running + return -- avoid multiple running end local fea = shared.features or {} fea.kern = nil -- only for horizontal typesetting @@ -2120,7 +2104,6 @@ end end res.verticalgposhack = true - return vf end local otffeatures = fonts.constructors.newfeatures("otf") @@ -2159,11 +2142,6 @@ -- italic correction for fake-slant font ------------------------------------ local function fakeslant_itlc (tfmdata) - --[[ should be removed - if tfmdata.format == "unknown" then - tfmdata.name = tfmdata.name:gsub("^\"(.-)\"$","%1") - end - --]] local slfactor = tfmdata.parameters.slantfactor if slfactor and slfactor > 0 then else return end tfmdata.parameters.slant = slfactor * 65536 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luatexko/luatexko.sty new/tex/luatex/luatexko/luatexko.sty --- old/tex/luatex/luatexko/luatexko.sty 2016-05-15 00:11:33.000000000 +0200 +++ new/tex/luatex/luatexko/luatexko.sty 2017-02-09 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ % luatexko.sty % -% Copyright (c) 2013-2016 Dohyun Kim <nomos at ktug org> +% Copyright (c) 2013-2017 Dohyun Kim <nomos at ktug org> % Soojin Nam <jsunam at gmail com> % % This work may be distributed and/or modified under the @@ -23,7 +23,7 @@ \expandafter\endinput \fi -\ProvidesPackage{luatexko}[2016/05/14 v1.15 Typesetting Korean with LuaLaTeX] +\ProvidesPackage{luatexko}[2017/02/06 v1.16 Typesetting Korean with LuaLaTeX] \ifdefined\adjustspacing\else % luatex < 0.87 \let\adjustspacing\pdfadjustspacing @@ -87,19 +87,9 @@ ] {Ligatures=TeX} %% macros for Korean fonts - \cs_new:Nn \__luako_pass_args:nnn + \DeclareDocumentCommand \setmainhangulfont { O{} m O{} } { - \IfNoValueTF {#2} - { \__luako_post_args:w {#1} {#3} } - { #1 {#2} {#3} } - } - \NewDocumentCommand \__luako_post_args:w { m m O{} } - { #1 {#3} {#2} } - \DeclareDocumentCommand \setmainhangulfont { o m } - { \__luako_pass_args:nnn \__luako_setmainhangulfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmainhangulfont:nn - { - \newfontfamily \serifhangul@font [#1] {#2} + \newfontfamily \serifhangul@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \rmdefault { \cs_set_eq:NN \hangul@font \serifhangul@font @@ -107,11 +97,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setmainhanjafont { o m } - { \__luako_pass_args:nnn \__luako_setmainhanjafont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmainhanjafont:nn + \DeclareDocumentCommand \setmainhanjafont { O{} m O{} } { - \newfontfamily \serifhanja@font [#1] {#2} + \newfontfamily \serifhanja@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \rmdefault { \cs_set_eq:NN \hanja@font \serifhanja@font @@ -119,11 +107,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setmainfallbackfont { o m } - { \__luako_pass_args:nnn \__luako_setmainfallbackfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmainfallbackfont:nn + \DeclareDocumentCommand \setmainfallbackfont { O{} m O{} } { - \newfontfamily \seriffallback@font [#1] {#2} + \newfontfamily \seriffallback@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \rmdefault { \cs_set_eq:NN \fallback@font \seriffallback@font @@ -131,11 +117,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setsanshangulfont { o m } - { \__luako_pass_args:nnn \__luako_setsanshangulfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setsanshangulfont:nn + \DeclareDocumentCommand \setsanshangulfont { O{} m O{} } { - \newfontfamily \sanshangul@font [#1] {#2} + \newfontfamily \sanshangul@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \sfdefault { \cs_set_eq:NN \hangul@font \sanshangul@font @@ -143,11 +127,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setsanshanjafont { o m } - { \__luako_pass_args:nnn \__luako_setsanshanjafont:nn {#1} {#2} } - \cs_new:Nn \__luako_setsanshanjafont:nn + \DeclareDocumentCommand \setsanshanjafont { O{} m O{} } { - \newfontfamily \sanshanja@font [#1] {#2} + \newfontfamily \sanshanja@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \sfdefault { \cs_set_eq:NN \hanja@font \sanshanja@font @@ -155,11 +137,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setsansfallbackfont { o m } - { \__luako_pass_args:nnn \__luako_setsansfallbackfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setsansfallbackfont:nn + \DeclareDocumentCommand \setsansfallbackfont { O{} m O{} } { - \newfontfamily \sansfallback@font [#1] {#2} + \newfontfamily \sansfallback@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \sfdefault { \cs_set_eq:NN \fallback@font \sansfallback@font @@ -167,11 +147,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setmonohangulfont { o m } - { \__luako_pass_args:nnn \__luako_setmonohangulfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmonohangulfont:nn + \DeclareDocumentCommand \setmonohangulfont { O{} m O{} } { - \newfontfamily \monohangul@font [#1] {#2} + \newfontfamily \monohangul@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \ttdefault { \cs_set_eq:NN \hangul@font \monohangul@font @@ -179,11 +157,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setmonohanjafont { o m } - { \__luako_pass_args:nnn \__luako_setmonohanjafont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmonohanjafont:nn + \DeclareDocumentCommand \setmonohanjafont { O{} m O{} } { - \newfontfamily \monohanja@font [#1] {#2} + \newfontfamily \monohanja@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \ttdefault { \cs_set_eq:NN \hanja@font \monohanja@font @@ -191,11 +167,9 @@ } \ignorespaces } - \DeclareDocumentCommand \setmonofallbackfont { o m } - { \__luako_pass_args:nnn \__luako_setmonofallbackfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmonofallbackfont:nn + \DeclareDocumentCommand \setmonofallbackfont { O{} m O{} } { - \newfontfamily \monofallback@font [#1] {#2} + \newfontfamily \monofallback@font [#1,#3] {#2} \str_if_eq_x:nnT \familydefault \ttdefault { \cs_set_eq:NN \fallback@font \monofallback@font @@ -203,95 +177,77 @@ } \ignorespaces } - \DeclareDocumentCommand \newhangulfontfamily { m o m } - { \__luako_pass_args:nnn { \__luako_newhangulfontfamily:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newhangulfontfamily:Nnn + \DeclareDocumentCommand \newhangulfontfamily { m O{} m O{} } { - \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \hangul@font { luatexkofont@ \token_to_str:N #1 } \luatexko@hangul@selectfont } } - \DeclareDocumentCommand \newhanjafontfamily { m o m } - { \__luako_pass_args:nnn { \__luako_newhanjafontfamily:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newhanjafontfamily:Nnn + \DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} } { - \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \hanja@font { luatexkofont@ \token_to_str:N #1 } \luatexko@hanja@selectfont } } - \DeclareDocumentCommand \newfallbackfontfamily { m o m } - { \__luako_pass_args:nnn { \__luako_newfallbackfontfamily:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newfallbackfontfamily:Nnn + \DeclareDocumentCommand \newfallbackfontfamily { m O{} m O{} } { - \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontfamily { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \fallback@font { luatexkofont@ \token_to_str:N #1 } \luatexko@fallback@selectfont } } - \DeclareDocumentCommand \newhangulfontface { m o m } - { \__luako_pass_args:nnn { \__luako_newhangulfontface:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newhangulfontface:Nnn + \DeclareDocumentCommand \newhangulfontface { m O{} m O{} } { - \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \hangul@font { luatexkofont@ \token_to_str:N #1 } \luatexko@hangul@selectfont } } - \DeclareDocumentCommand \newhanjafontface { m o m } - { \__luako_pass_args:nnn { \__luako_newhanjafontface:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newhanjafontface:Nnn + \DeclareDocumentCommand \newhanjafontface { m O{} m O{} } { - \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \hanja@font { luatexkofont@ \token_to_str:N #1 } \luatexko@hanja@selectfont } } - \DeclareDocumentCommand \newfallbackfontface { m o m } - { \__luako_pass_args:nnn { \__luako_newfallbackfontface:Nnn #1 } {#2} {#3} } - \cs_new:Nn \__luako_newfallbackfontface:Nnn + \DeclareDocumentCommand \newfallbackfontface { m O{} m O{} } { - \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2] {#3} + \exp_args:Nc \newfontface { luatexkofont@ \token_to_str:N #1 } [#2,#4] {#3} \DeclareRobustCommand #1 { \cs_set_eq:Nc \fallback@font { luatexkofont@ \token_to_str:N #1 } \luatexko@fallback@selectfont } } - \DeclareDocumentCommand \hangulfontspec { o m } - { \__luako_pass_args:nnn \__luako_hangulfontspec:nn {#1} {#2} } - \cs_new:Nn \__luako_hangulfontspec:nn + \DeclareDocumentCommand \hangulfontspec { O{} m O{} } { - \newfontfamily \hangul@font [#1] {#2} + \newfontfamily \hangul@font [#1,#3] {#2} \luatexko@hangul@selectfont \ignorespaces } \cs_set_eq:NN \adhochangulfont \hangulfontspec - \DeclareDocumentCommand \hanjafontspec { o m } - { \__luako_pass_args:nnn \__luako_hanjafontspec:nn {#1} {#2} } - \cs_new:Nn \__luako_hanjafontspec:nn + \DeclareDocumentCommand \hanjafontspec { O{} m O{} } { - \newfontfamily \hanja@font [#1] {#2} + \newfontfamily \hanja@font [#1,#3] {#2} \luatexko@hanja@selectfont \ignorespaces } \cs_set_eq:NN \adhochanjafont \hanjafontspec - \DeclareDocumentCommand \fallbackfontspec { o m } - { \__luako_pass_args:nnn \__luako_fallbackfontspec:nn {#1} {#2} } - \cs_new:Nn \__luako_fallbackfontspec:nn + \DeclareDocumentCommand \fallbackfontspec { O{} m O{} } { - \newfontfamily \fallback@font [#1] {#2} + \newfontfamily \fallback@font [#1,#3] {#2} \luatexko@fallback@selectfont \ignorespaces } @@ -348,12 +304,63 @@ } \cs_set_eq:NN \addfallbackfontfeatures \addfallbackfontfeature % hangul math font command - \DeclareDocumentCommand \setmathhangulfont { o m } - { \__luako_pass_args:nnn \__luako_setmathhangulfont:nn {#1} {#2} } - \cs_new:Nn \__luako_setmathhangulfont:nn + \DeclareDocumentCommand \setmathhangulfont { O{} m O{} } { - \fontspec_set_family:Nnn \luatexko@math@hangul@family {#1} {#2} + \fontspec_set_family:Nnn \luatexko@math@hangul@family {#1,#3} {#2} } +% fontspec 2017 +\RenewDocumentCommand \setmainfont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2} + \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily } + { + \exp_not:N \luatexko@serif@fonts + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_rmfamily_family } + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\rmdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +\RenewDocumentCommand \setsansfont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2} + \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \sffamily } + { + \exp_not:N \luatexko@sans@fonts + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_sffamily_family } + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\sfdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +\RenewDocumentCommand \setmonofont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2} + \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily } + { + \exp_not:N \luatexko@mono@fonts + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_ttfamily_family } + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\ttdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +\cs_set_eq:NN \setromanfont \setmainfont \ExplSyntaxOff \fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexko.tlpobj new/tlpkg/tlpobj/luatexko.tlpobj --- old/tlpkg/tlpobj/luatexko.tlpobj 2016-05-15 03:20:05.000000000 +0200 +++ new/tlpkg/tlpobj/luatexko.tlpobj 2017-05-02 19:43:19.000000000 +0200 @@ -1,6 +1,6 @@ name luatexko category Package -revision 41128 +revision 44141 shortdesc Typeset Korean with Lua(La)TeX relocated 1 longdesc This is a Lua(La)TeX macro package that supports typesetting @@ -19,7 +19,7 @@ RELOC/tex/luatex/luatexko/luatexko.lua RELOC/tex/luatex/luatexko/luatexko.sty catalogue-ctan /macros/luatex/generic/luatexko -catalogue-date 2016-05-14 05:33:07 +0200 -catalogue-license lppl1.3 +catalogue-date 2017-05-01 10:20:42 +0200 +catalogue-license lppl1.3c catalogue-topics luatex korean -catalogue-version 1.15 +catalogue-version 1.17 ++++++ luatextra.doc.tar.xz ++++++ ++++++ luatextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatextra.tlpobj new/tlpkg/tlpobj/luatextra.tlpobj --- old/tlpkg/tlpobj/luatextra.tlpobj 2016-04-14 19:24:40.000000000 +0200 +++ new/tlpkg/tlpobj/luatextra.tlpobj 2017-04-14 17:50:01.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/lualatex/luatextra/luatextra.sty catalogue-ctan /macros/luatex/latex/luatextra -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics luatex catalogue-version 1.0.1 ++++++ luatodonotes.doc.tar.xz ++++++ ++++++ luatodonotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatodonotes.tlpobj new/tlpkg/tlpobj/luatodonotes.tlpobj --- old/tlpkg/tlpobj/luatodonotes.tlpobj 2016-04-14 19:24:40.000000000 +0200 +++ new/tlpkg/tlpobj/luatodonotes.tlpobj 2017-04-14 17:50:02.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/lualatex/luatodonotes/path_point.lua catalogue-also todonotes catalogue-ctan /macros/luatex/latex/luatodonotes -catalogue-date 2015-12-05 05:56:05 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics notes editorial luatex use-lua catalogue-version 0.3 ++++++ luaxml.doc.tar.xz ++++++ ++++++ luaxml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luaxml.tlpobj new/tlpkg/tlpobj/luaxml.tlpobj --- old/tlpkg/tlpobj/luaxml.tlpobj 2016-04-14 19:24:40.000000000 +0200 +++ new/tlpkg/tlpobj/luaxml.tlpobj 2017-04-14 17:50:02.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/luatex/luaxml/luaxml-stack.lua RELOC/tex/luatex/luaxml/luaxml-testxml.lua catalogue-ctan /macros/luatex/generic/luaxml -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics foreign-import luatex catalogue-version 0.0.2 ++++++ lxfonts.doc.tar.xz ++++++ ++++++ lxfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lxfonts.tlpobj new/tlpkg/tlpobj/lxfonts.tlpobj --- old/tlpkg/tlpobj/lxfonts.tlpobj 2016-04-14 19:24:41.000000000 +0200 +++ new/tlpkg/tlpobj/lxfonts.tlpobj 2017-04-14 17:50:03.000000000 +0200 @@ -107,7 +107,7 @@ RELOC/tex/latex/lxfonts/ulmsa.fd RELOC/tex/latex/lxfonts/ulmsb.fd catalogue-ctan /fonts/lxfonts -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-type1 font-sans font-maths catalogue-version 2.0b ++++++ ly1.doc.tar.xz ++++++ ++++++ ly1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ly1.tlpobj new/tlpkg/tlpobj/ly1.tlpobj --- old/tlpkg/tlpobj/ly1.tlpobj 2016-04-14 19:24:42.000000000 +0200 +++ new/tlpkg/tlpobj/ly1.tlpobj 2017-04-14 17:50:03.000000000 +0200 @@ -82,6 +82,6 @@ RELOC/tex/latex/ly1/texnansi.sty RELOC/tex/plain/ly1/texnansi.tex catalogue-ctan /fonts/psfonts/ly1 -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 ++++++ m-tx.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/prepmx.man1.pdf and new/texmf-dist/doc/man/man1/prepmx.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/m-tx.doc.tlpobj new/tlpkg/tlpobj/m-tx.doc.tlpobj --- old/tlpkg/tlpobj/m-tx.doc.tlpobj 2016-05-09 03:15:55.000000000 +0200 +++ new/tlpkg/tlpobj/m-tx.doc.tlpobj 2017-05-04 02:07:09.000000000 +0200 @@ -1,8 +1,8 @@ name m-tx.doc category Package -revision 40961 +revision 44166 shortdesc doc files of m-tx -docfiles size=230 +docfiles size=226 texmf-dist/doc/generic/m-tx/Makefile texmf-dist/doc/generic/m-tx/README texmf-dist/doc/generic/m-tx/README.devel ++++++ m-tx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/m-tx.tlpobj new/tlpkg/tlpobj/m-tx.tlpobj --- old/tlpkg/tlpobj/m-tx.tlpobj 2016-05-09 03:15:56.000000000 +0200 +++ new/tlpkg/tlpobj/m-tx.tlpobj 2017-05-04 02:07:09.000000000 +0200 @@ -1,6 +1,6 @@ name m-tx category Package -revision 40961 +revision 44166 shortdesc A preprocessor for pmx longdesc M-Tx is a preprocessor to pmx, which is itself a preprocessor longdesc to musixtex, a music typesetting system. The prime motivation @@ -12,7 +12,7 @@ texmf-dist/scripts/m-tx/m-tx.lua texmf-dist/tex/generic/m-tx/mtx.tex catalogue-ctan /support/m-tx -catalogue-date 2016-05-07 16:52:45 +0200 -catalogue-license gpl2 +catalogue-date 2017-04-18 05:31:40 +0200 +catalogue-license mit catalogue-topics music catalogue-version 0.62a ++++++ macros2e.doc.tar.xz ++++++ ++++++ macroswap.doc.tar.xz ++++++ ++++++ macroswap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/macroswap.tlpobj new/tlpkg/tlpobj/macroswap.tlpobj --- old/tlpkg/tlpobj/macroswap.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/macroswap.tlpobj 2017-04-14 17:50:05.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/macroswap/macroswap.sty catalogue-ctan /macros/latex/contrib/macroswap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics macro-supp catalogue-version 1.1 ++++++ mafr.doc.tar.xz ++++++ ++++++ mafr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mafr.tlpobj new/tlpkg/tlpobj/mafr.tlpobj --- old/tlpkg/tlpobj/mafr.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/mafr.tlpobj 2017-04-14 17:50:05.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/mafr/fiche.cls RELOC/tex/latex/mafr/mafr.sty catalogue-ctan /macros/latex/contrib/mafr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths french exercise catalogue-version 1.0 ++++++ magaz.doc.tar.xz ++++++ ++++++ magaz.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/magaz.tlpobj new/tlpkg/tlpobj/magaz.tlpobj --- old/tlpkg/tlpobj/magaz.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/magaz.tlpobj 2017-04-14 17:50:05.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/magaz/magaz.sty catalogue-ctan /macros/latex/contrib/magaz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics layout typesetting catalogue-version 0.4 ++++++ mailing.doc.tar.xz ++++++ ++++++ mailing.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mailing.tlpobj new/tlpkg/tlpobj/mailing.tlpobj --- old/tlpkg/tlpobj/mailing.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/mailing.tlpobj 2017-04-14 17:50:05.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/mailing/mailing.sty catalogue-ctan /macros/latex/contrib/mailing -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics mailing ++++++ mailmerge.doc.tar.xz ++++++ ++++++ mailmerge.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mailmerge.tlpobj new/tlpkg/tlpobj/mailmerge.tlpobj --- old/tlpkg/tlpobj/mailmerge.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/mailmerge.tlpobj 2017-04-14 17:50:05.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/mailmerge/mailmerge.sty catalogue-also mailing merge postcards catalogue-ctan /macros/latex/contrib/mailmerge -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics mailing catalogue-version 1.0 ++++++ make4ht.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/make4ht/README new/texmf-dist/doc/support/make4ht/README --- old/texmf-dist/doc/support/make4ht/README 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/doc/support/make4ht/README 2017-04-27 18:43:40.000000000 +0200 @@ -60,9 +60,12 @@ Make:htlatex() Make:match("html$", "tidy -m -xml -utf8 -q -i ${filename}") - `Make:htlatex()` is preconfigured command for calling LaTeX with `tex4ht` loaded on the input file. In this case it will be called one time. After compilation, `tidy` command is executed on the output `html` file. +`Make:htlatex()` is preconfigured command for calling LaTeX with `tex4ht` +loaded on the input file. In this case it will be called one time. After +compilation, `tidy` command is executed on the output `html` file. -Note that you don't have to call `tex4ht` and `t4ht` commands explicitly in the build file, they are called automatically. +Note that you don't have to call `tex4ht` and `t4ht` commands explicitly in the +build file, they are called automatically. You can add more commands like `Make:htlatex` with @@ -76,7 +79,11 @@ `command` can be text template, or function: Make:add("text", "hello, input file: ${input}") - Make:add("function", function(params) for k, v in pairs(params) do print(k..": "..v) end) + Make:add("function", function(params) + for k, v in pairs(params) do + print(k..": "..v) + end + ) `parameters` is a table or `nil` value. @@ -101,7 +108,7 @@ packages : insert additionl LaTeX code which is inserted before `\documentclass`. - useful for passing options to packages or additional packages loading + Useful for passing options to packages or additional packages loading tex4ht_sty_par @@ -125,7 +132,8 @@ correct_exit -: expected `exit code` from the command. +: expected `exit code` from the command. The compilation will be terminted + when the command `exit code` is different. You may add your own parameters, they will be accessible in templates and @@ -138,9 +146,9 @@ called also by `make4ht`. With `repetition`, second execution is blocked. You can set expected exit code from a command with `correct_exit`. Compilation -is stopped when command returns different exit code. Situation is little bit -difficult with LaTeX (all engines and formats in fact), because it doesn't -differentiate between fatal and non fatal errors and returns same exit code +is stopped when command returns different exit code. The situation is +different for LaTeX (for all TeX engines and formats, in fact), because it doesn't +differentiate between fatal and non fatal errors, and it returns the same exit code in all cases. Log parsing is used because of that, error code `1` is returned in the case of fatal error, `0` is used otherwise. @@ -193,10 +201,18 @@ : `\hrule` commands are translated to series of underscore characters by `tex4ht`, this filter translate these underscores to `<hr>` elements -entites -: convert prohibited named entities to numeric entities (currently, only ` `, as it causes validation errors, and `tex4ht` is producing it sometimes +entites +: convert prohibited named entities to numeric entities (currently, only + ` `, as it causes validation errors, and `tex4ht` is producing it + sometimes + +fix-links + +: replace colons in local links and `id` attributes with underscores. Some + cross-reference commands may produce colons in internal links, which results in + validation error. Function `filter` accepts also function arguments, in this case this function takes file contents as parameter and modified contents are returned. @@ -222,7 +238,7 @@ commands are called. This conversion is normally configured in the `env file`, -which is system dependent and which has a little bit unintuitive syntax. +which is system dependent and which has a bit unintuitive syntax. This configuration is processed by `t4ht` application and conversion commands are called for all pictures. @@ -243,9 +259,9 @@ - source - `dvi` file with the pictures - page - page number of the converted image -## `mode` variable +## The `mode` variable -Variable `mode` contains contents of `-mode` command line option. +The `mode` variable contains contents of `--mode` command line option. It can be used to run some commands conditionally. For example: if mode == "draft" then @@ -256,11 +272,22 @@ Make:htlatex{} end -In this example (which is default configuration used by `make4ht`), -LaTeX is called only once when `make4ht` is called with +In this example (which is the default configuration used by `make4ht`), +LaTeX is called only once when `make4ht` is called with `draft` mode: make4ht -m draft filename +## The `settings` table + +You may want to access to the parameters also outside commands, file matches +and image conversion functions. For example, if you want to convert your file to +the `OpenDocument Format`, you can use the following settings, based on `oolatex` +command: + + settings.tex4ht_sty_par = settings.tex4ht_sty_par ..",ooffice" + settings.tex4ht_par = settings.tex4ht_par .. " ooffice/! -cmozhtf" + settings.t4ht_par = settings.t4ht_par .. " -cooxtpipes -coo " + # Command line options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/make4ht/changelog.tex new/texmf-dist/doc/support/make4ht/changelog.tex --- old/texmf-dist/doc/support/make4ht/changelog.tex 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/doc/support/make4ht/changelog.tex 2017-04-27 18:43:40.000000000 +0200 @@ -2,6 +2,61 @@ \begin{itemize} \item + 2017/04/26 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + Released version \texttt{v0.1c} + \end{itemize} +\item + 2017/03/16 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + check for \texttt{TeX capacity exceeded} error in the \LaTeX~run. + \end{itemize} +\item + 2016/12/19 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + use full input name in \texttt{tex\_file} variable. This should + enable use of files without \texttt{.tex} extension. + \end{itemize} +\item + 2016/10/22 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + new command available in the build file: + \texttt{Make:add\_file(filename)}. This enables filters and commands + to register files to the output. + \item + use ipairs instead of pairs for traversing files and executing + filters. This should ensure correct order of executions. + \end{itemize} +\item + 2016/10/18 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + new filter: replace colons in \texttt{id} and \texttt{href} + attributes with underscores + \end{itemize} +\item + 2016/01/11 + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + fixed bug in loading documents with full path specified + \end{itemize} +\item 2015/12/06 version 0.1b \begin{itemize} Binary files old/texmf-dist/doc/support/make4ht/make4ht-doc.pdf and new/texmf-dist/doc/support/make4ht/make4ht-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/make4ht/make4ht-doc.tex new/texmf-dist/doc/support/make4ht/make4ht-doc.tex --- old/texmf-dist/doc/support/make4ht/make4ht-doc.tex 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/doc/support/make4ht/make4ht-doc.tex 2017-04-27 18:43:40.000000000 +0200 @@ -11,10 +11,11 @@ \setmainfont{TeX Gyre Schola} \fi \usepackage{microtype} +\providecommand\tightlist{\relax} \title{The \texttt{make4ht} build system} \author{Michal Hoftich\footnote{\url{michal.h21(a)gmail.com}}} -\date{Version 0.1b\\12/11/2015} +\date{Version \version\\\gitdate} \begin{document} \maketitle \tableofcontents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/make4ht/readme.tex new/texmf-dist/doc/support/make4ht/readme.tex --- old/texmf-dist/doc/support/make4ht/readme.tex 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/doc/support/make4ht/readme.tex 2017-04-27 18:43:40.000000000 +0200 @@ -93,7 +93,11 @@ \begin{verbatim} Make:add("text", "hello, input file: ${input}") -Make:add("function", function(params) for k, v in pairs(params) do print(k..": "..v) end) +Make:add("function", function(params) + for k, v in pairs(params) do + print(k..": "..v) + end +) \end{verbatim} \texttt{parameters} is a table or \texttt{nil} value. @@ -111,7 +115,7 @@ parameters to \texttt{latex} \item[packages] insert additionl LaTeX code which is inserted before -\texttt{\textbackslash{}documentclass}. useful for passing options to +\texttt{\textbackslash{}documentclass}. Useful for passing options to packages or additional packages loading \item[tex4ht\_sty\_par] parameters to \texttt{tex4ht.sty} @@ -124,7 +128,8 @@ \item[repetition] limit number of command execution. \item[correct\_exit] -expected \texttt{exit code} from the command. +expected \texttt{exit code} from the command. The compilation will be +terminted when the command \texttt{exit code} is different. \end{description} You may add your own parameters, they will be accessible in templates @@ -139,11 +144,11 @@ You can set expected exit code from a command with \texttt{correct\_exit}. Compilation is stopped when command returns -different exit code. Situation is little bit difficult with LaTeX (all -engines and formats in fact), because it doesn't differentiate between -fatal and non fatal errors and returns same exit code in all cases. Log -parsing is used because of that, error code \texttt{1} is returned in -the case of fatal error, \texttt{0} is used otherwise. +different exit code. The situation is different for LaTeX (for all TeX +engines and formats, in fact), because it doesn't differentiate between +fatal and non fatal errors, and it returns the same exit code in all +cases. Log parsing is used because of that, error code \texttt{1} is +returned in the case of fatal error, \texttt{0} is used otherwise. \subsection{File matches}\label{file-matches} @@ -197,6 +202,10 @@ convert prohibited named entities to numeric entities (currently, only \texttt{\ }, as it causes validation errors, and \texttt{tex4ht} is producing it sometimes +\item[fix-links] +replace colons in local links and \texttt{id} attributes with +underscores. Some cross-reference commands may produce colons in +internal links, which results in validation error. \end{description} Function \texttt{filter} accepts also function arguments, in this case @@ -226,7 +235,7 @@ \texttt{dvi to image} commands are called. This conversion is normally configured in the \texttt{env file}, which -is system dependent and which has a little bit unintuitive syntax. This +is system dependent and which has a bit unintuitive syntax. This configuration is processed by \texttt{t4ht} application and conversion commands are called for all pictures. @@ -254,10 +263,11 @@ page - page number of the converted image \end{itemize} -\subsection{\texttt{mode} variable}\label{mode-variable} +\subsection{The \texttt{mode} variable}\label{the-mode-variable} -Variable \texttt{mode} contains contents of \texttt{-mode} command line -option. It can be used to run some commands conditionally. For example: +The \texttt{mode} variable contains contents of \texttt{-{}-mode} +command line option. It can be used to run some commands conditionally. +For example: \begin{verbatim} if mode == "draft" then @@ -269,14 +279,27 @@ end \end{verbatim} -In this example (which is default configuration used by +In this example (which is the default configuration used by \texttt{make4ht}), LaTeX is called only once when \texttt{make4ht} is -called with +called with \texttt{draft} mode: \begin{verbatim} make4ht -m draft filename \end{verbatim} +\subsection{The \texttt{settings} table}\label{the-settings-table} + +You may want to access to the parameters also outside commands, file +matches and image conversion functions. For example, if you want to +convert your file to the \texttt{OpenDocument Format}, you can use the +following settings, based on \texttt{oolatex} command: + +\begin{verbatim} +settings.tex4ht_sty_par = settings.tex4ht_sty_par ..",ooffice" +settings.tex4ht_par = settings.tex4ht_par .. " ooffice/! -cmozhtf" +settings.t4ht_par = settings.t4ht_par .. " -cooxtpipes -coo " +\end{verbatim} + \section{Command line options}\label{command-line-options} \begin{verbatim} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/make4ht.doc.tlpobj new/tlpkg/tlpobj/make4ht.doc.tlpobj --- old/tlpkg/tlpobj/make4ht.doc.tlpobj 2016-04-14 19:24:46.000000000 +0200 +++ new/tlpkg/tlpobj/make4ht.doc.tlpobj 2017-04-28 02:09:02.000000000 +0200 @@ -1,8 +1,8 @@ name make4ht.doc category Package -revision 39075 +revision 44079 shortdesc doc files of make4ht -docfiles size=24 +docfiles size=26 texmf-dist/doc/support/make4ht/README texmf-dist/doc/support/make4ht/changelog.tex texmf-dist/doc/support/make4ht/make4ht-doc.pdf ++++++ make4ht.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/filters/make4ht-fix-links.lua new/texmf-dist/scripts/make4ht/filters/make4ht-fix-links.lua --- old/texmf-dist/scripts/make4ht/filters/make4ht-fix-links.lua 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/filters/make4ht-fix-links.lua 2017-04-27 18:43:40.000000000 +0200 @@ -0,0 +1,19 @@ +-- replace colons in `id` or `href` attributes for local links with underscores +-- + +local function fix_href_colons(s) + return s:gsub('(href=".-")', function(a) + if a:match("[a-z]%://") then return a end + return a:gsub(":","_") + end) +end + +local function fix_id_colons(s) + return s:gsub('(id=".-")', function(a) + return a:gsub(":", "_") + end) +end + +return function(s) + return fix_id_colons(fix_href_colons(s)) +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/make4ht new/texmf-dist/scripts/make4ht/make4ht --- old/texmf-dist/scripts/make4ht/make4ht 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/make4ht 2017-04-27 18:43:40.000000000 +0200 @@ -24,6 +24,11 @@ <filename> (string) Input file name ]] +-- set version number. the template should be replaced by the +-- actual version number by the build script +local version = "v0.1c" +mkparams.version_number = version + local args = mkparams.get_args() local parameters = mkparams.process_args(args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/make4ht-dom.lua new/texmf-dist/scripts/make4ht/make4ht-dom.lua --- old/texmf-dist/scripts/make4ht/make4ht-dom.lua 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/make4ht-dom.lua 2017-04-27 18:43:40.000000000 +0200 @@ -0,0 +1,448 @@ +--- DOM module for LuaXML +-- @module make4ht-dom +local dom = {} +local xml = require("luaxml-mod-xml") +local handler = require("luaxml-mod-handler") +local query = require("make4ht-parse-query") + + +local void = {area = true, base = true, br = true, col = true, hr = true, img = true, input = true, link = true, meta = true, param = true} + +local actions = { + TEXT = {text = "%s"}, + COMMENT = {start = ""}, + ELEMENT = {start = "<%s%s>", stop = "</%s>", void = "<%s%s />"}, + DECL = {start = "<?%s %s?>"}, + DTD = {start = "<!DOCTYPE ", text = "%s" , stop=">"} +} + +--- It serializes the DOM object back to XML +-- @function serialize_dom +-- @param parser DOM object +-- @param current +-- @param level +-- @param output +-- @return table +function serialize_dom(parser, current,level, output) + local output = output or {} + local function get_action(typ, action) + local ac = actions[typ] or {} + local format = ac[action] or "" + return format + end + local function insert(format, ...) + table.insert(output, string.format(format, ...)) + end + local function prepare_attributes(attr) + local t = {} + local attr = attr or {} + for k, v in pairs(attr) do + t[#t+1] = string.format("%s='%s'", k, v) + end + if #t == 0 then return "" end + -- add space before attributes + return " " .. table.concat(t, " ") + end + local function start(typ, el, attr) + local format = get_action(typ, "start") + insert(format, el, prepare_attributes(attr)) + end + local function text(typ, text) + local format = get_action(typ, "text") + insert(format, text) + end + local function stop(typ, el) + local format = get_action(typ, "stop") + insert(format,el) + end + local level = level or 0 + local spaces = string.rep(" ",level) + local root= current or parser._handler.root + local name = root._name or "unnamed" + local xtype = root._type or "untyped" + local text_content = root._text or "" + local attributes = root._attr or {} + -- if xtype == "TEXT" then + -- print(spaces .."TEXT : " .. root._text) + -- elseif xtype == "COMMENT" then + -- print(spaces .. "Comment : ".. root._text) + -- else + -- print(spaces .. xtype .. " : " .. name) + -- end + -- for k, v in pairs(attributes) do + -- print(spaces .. " ".. k.."="..v) + -- end + if xtype == "DTD" then + text_content = string.format('%s %s "%s" "%s"', name, attributes["_type"], attributes._name, attributes._uri ) + attributes = {} + elseif xtype == "ELEMENT" and void[name] then + local format = get_action(xtype, "void") + insert(format, name, prepare_attributes(attributes)) + return output + end + + start(xtype, name, attributes) + text(xtype,text_content) + local children = root._children or {} + for _, child in ipairs(children) do + output = serialize_dom(parser,child, level + 1, output) + end + stop(xtype, name) + return output +end + +local parse = function(x) + local domHandler = handler.domHandler() + local Parser = xml.xmlParser(domHandler) + -- preserve whitespace + Parser.options.stripWS = nil + Parser:parse(x) + Parser.current = Parser._handler.root + Parser.__index = Parser + + local function save_methods(element) + setmetatable(element,Parser) + local children = element._children or {} + for _, x in ipairs(children) do + save_methods(x) + end + end + local parser = setmetatable({}, Parser) + + --- @class Parser + function Parser.root_node(self) + return self._handler.root + end + + + function Parser.get_element_type(self, el) + local el = el or self + return el._type + end + function Parser.is_element(self, el) + local el = el or self + return self:get_element_type(el) == "ELEMENT" + end + + function Parser.is_text(self, el) + local el = el or self + return self:get_element_type(el) == "TEXT" + end + + local lower = string.lower + + function Parser.get_element_name(self, el) + local el = el or self + return el._name or "unnamed" + end + + function Parser.get_attribute(self, name) + local el = self + if self:is_element(el) then + local attr = el._attr or {} + return attr[name] + end + end + + function Parser.set_attribute(self, name, value) + local el = self + if self:is_element(el) then + el._attr[name] = value + return true + end + end + + + function Parser.serialize(self, current) + local current = current + -- if no current element is added and self is not plain parser object + -- (_type is then nil), use the current object as serialized root + if not current and self._type then + current = self + end + return table.concat(serialize_dom(self, current)) + end + + function Parser.get_path(self,path, current) + local function traverse_path(path_elements, current, t) + local t = t or {} + if #path_elements == 0 then + -- for _, x in ipairs(current._children or {}) do + -- table.insert(t,x) + -- end + table.insert(t,current) + return t + end + local current_path = table.remove(path_elements, 1) + for _, x in ipairs(self:get_children(current)) do + if self:is_element(x) then + local name = string.lower(self:get_element_name(x)) + if name == current_path then + t = traverse_path(path_elements, x, t) + end + end + end + return t + end + local current = current or self:root_node() -- self._handler.root + local path_elements = {} + local path = string.lower(path) + for el in path:gmatch("([^%s]+)") do table.insert(path_elements, el) end + return traverse_path(path_elements, current) + end + + function Parser.calculate_specificity(self, query) + local query = query or {} + local specificity = 0 + for _, item in ipairs(query.query or {}) do + for key, value in pairs(item) do + if key == "id" then + specificity = specificity + 100 + elseif key == "tag" then + specificity = specificity + 1 + else + specificity = specificity + 10 + end + end + end + return specificity + end + + function Parser.match_querylist(self, querylist) + local matches = {} + local querylist = querylist + + local function test_part(key, value, el) + -- print("testing", key, value, el:get_element_name()) + if key == "tag" then + return el:get_element_name() == value + elseif key == "id" then + local id = el:get_attribute "id" + return id and id == value + elseif key == "class" then + local class = el:get_attribute "class" + if not class then return false end + local c = {} + for part in class:gmatch "([^%s]+)" do + c[part] = true + end + return c[value] == true + end + -- TODO: Add more cases + -- just return true for not supported selectors + return true + end + + local function test_object(query, el) + -- test one object in CSS selector + local matched = {} + for key, value in pairs(query) do + matched[#matched+1] = test_part(key, value, el) + end + if #matched == 0 then return false end + for k, v in ipairs(matched) do + if v ~= true then return false end + end + return true + end + + local function match_query(query, el) + local query = query or {} + local object = table.remove(query) -- get current object from the query stack + if not object then return true end -- if the query stack is empty, then we can be sure that it matched previous items + if not el:is_element() then return false end -- if there is object to test, but current node isn't element, test failed + local result = test_object(object, el) + if result then + return match_query(query, el:get_parent()) + end + return false + end + for _,element in ipairs(querylist) do + local query = {} + for k,v in ipairs(element.query) do query[k] = v end + if #query > 0 then -- don't try to match empty query + local result = match_query(query, self) + if result then matches[#matches+1] = element end + end + end + return matches + end + + function Parser.get_selector_path(self, selectorlist) + local nodelist = {} + self:traverse_elements(function(el) + local matches = el:match_querylist(selectorlist) + print("Matching", el:get_element_name(), #matches) + if #matches > 0 then nodelist[#nodelist+1] = el + end + end) + return nodelist + end + + --- Parse CSS selector to match table + function Parser.prepare_selector(self, selector) + local querylist = {} + local function parse_selector(item) + local query = {} + -- for i = #item, 1, -1 do + -- local part = item[i] + for _, part in ipairs(item) do + local t = {} + for _, atom in ipairs(part) do + local key = atom[1] + local value = atom[2] + t[key] = value + end + query[#query + 1] = t + end + return query + end + -- for item in selector:gmatch("([^%s]+)") do + -- elements[#elements+1] = parse_selector(item) + -- end + local parts = query.parse_query(selector) or {} + -- several selectors may be separated using ",", we must process them separately + for _, part in ipairs(parts) do + querylist[#querylist+1] = {query = parse_selector(part)} + end + return querylist + end + + function Parser.get_children(self, el) + local el = el or self + local children = el._children or {} + return children + end + + function Parser.get_parent(self, el) + local el = el or self + return el._parent + end + + function Parser.traverse_elements(self, fn, current) + local current = current or self:root_node() + local status = true + if self:is_element(current) or self:get_element_type(current) == "ROOT"then + local status = fn(current) + -- don't traverse child nodes when the user function return false + if status ~= false then + for _, child in ipairs(self:get_children(current)) do + self:traverse_elements(fn, child) + end + end + end + end + + function Parser.traverse_node_list(self, nodelist, fn) + local nodelist = nodelist or {} + for _, node in ipairs(nodelist) do + for _, element in ipairs(node._children) do + fn(element) + end + end + end + + function Parser.replace_node(self, new) + local old = self + local parent = self:get_parent(old) + local id,msg = self:find_element_pos( old) + if id then + parent._children[id] = new + return true + end + return false, msg + end + + function Parser.add_child_node(self, child) + local parent = self + child._parent = parent + table.insert(parent._children, child) + end + + + function Parser.copy_node(self, element) + local element = element or self + local t = {} + for k, v in pairs(element) do + if type(v) == "table" and k~="_parent" then + t[k] = self:copy_node(v) + else + t[k] = v + end + end + save_methods(t) + return t + end + + function Parser.create_element(self, name, attributes, parent) + local parent = parent or self + local new = {} + new._type = "ELEMENT" + new._name = name + new._attr = attributes or {} + new._children = {} + new._parent = parent + save_methods(new) + return new + end + + function Parser.remove_node(self, element) + local element = element or self + local parent = self:get_parent(element) + local pos = self:find_element_pos(element) + -- if pos then table.remove(parent._children, pos) end + if pos then + -- table.remove(parent._children, pos) + parent._children[pos] = setmetatable({_type = "removed"}, Parser) + end + end + + function Parser.find_element_pos(self, el) + local el = el or self + local parent = self:get_parent(el) + if not self:is_element(parent) and self:get_element_type(parent) ~= "ROOT" then return nil, "The parent isn't element" end + for i, x in ipairs(parent._children) do + if x == el then return i end + end + return false, "Cannot find element" + end + + function Parser.get_siblibgs(self, el) + local el = el or self + local parent = el:get_parent() + if parent:is_element() then + return parent:get_children() + end + end + + function Parser.get_sibling_node(self, change) + local el = self + local pos = el:find_element_pos() + local siblings = el:get_siblibgs() + if pos and siblings then + return siblings[pos + change] + end + end + + function Parser.get_next_node(self, el) + local el = el or self + return el:get_sibling_node(1) + end + + function Parser.get_prev_node(self, el) + local el = el or self + return el:get_sibling_node(-1) + end + + + -- include the methods to all xml nodes + save_methods(parser._handler.root) + -- parser: + return parser +end + + +local M = {} +M.parse = parse +M.serialize= serialize_dom +return M diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/make4ht-lib.lua new/texmf-dist/scripts/make4ht/make4ht-lib.lua --- old/texmf-dist/scripts/make4ht/make4ht-lib.lua 2015-07-04 01:24:59.000000000 +0200 +++ new/texmf-dist/scripts/make4ht/make4ht-lib.lua 2017-04-27 18:43:40.000000000 +0200 @@ -116,9 +116,9 @@ self.matches[k].params = v end -- Loop over files, run command on matched - for _, file in pairs(files)do + for _, file in ipairs(files)do statuses[file] = {} - for _, s in pairs(self.matches) do + for _, s in ipairs(self.matches) do local pattern= s.pattern if file:match(pattern) then local status, msg = self:run_command(file,s) @@ -134,6 +134,27 @@ return statuses end +-- add files from the mk4 file +-- we must add them to the table generated from the lg file, so they can be processed later +-- +Make.add_file = function(self, filename) + -- self.lgfile should be present, as it is created once the lg_file was parsed for the first time + local lg = self.lgfile or {} + local files = lg.files or {} + -- run filters on the file + local filtertable = {filename} + -- should we care about return status? + self:file_matches(filtertable) + -- break if the file is present already + -- start at the end, it it was added by a build file, the file will be likely at the end + for i = #files,1,-1 do + if files[i] == filename then return false, "File was already added" end + end + -- save the added file to the lg_file + table.insert(lg.files, filename) + self.lg = lg +end + Make.run = function(self) local return_codes = {} local params = self.params or {} @@ -174,12 +195,13 @@ end local lgfile = params.input and params.input .. ".lg" or nil if lgfile then - local lg = mkutils.parse_lg(lgfile) + self.lgfile = self.lgfile or mkutils.parse_lg(lgfile) + local lg = self.lgfile -- First convert images from lg files self:image_convert(lg["images"]) -- Then run file matchers on lg files and converted images local files = lg["files"] - for _,v in pairs(lg["images"]) do + for _,v in ipairs(lg["images"]) do local v = v.output -- print(v) table.insert(files,v) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/mathnode.lua new/texmf-dist/scripts/make4ht/mathnode.lua --- old/texmf-dist/scripts/make4ht/mathnode.lua 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/mathnode.lua 2017-04-27 18:43:40.000000000 +0200 @@ -0,0 +1,87 @@ +-- local mathnodepath = os.getenv "mathjaxnodepath" +-- +-- print("mathnode", mathnodepath) +local mkutils = require "mkutils" +-- other possible value is page2svg +local mathnodepath = "page2html" +-- options for MathJax command +local options = "--format MathML" +-- math fonts position +-- don't alter fonts if not set +local fontdir = nil +-- if we copy fonts +local fontdest = nil +local fontformat = "otf" + +local function compile(src) + local tmpfile = os.tmpname() + local filename = src + print("Compile using MathJax") + local command = mathnodepath .. " ".. options .. " < " .. filename .. " > " .. tmpfile + print(command) + local status = os.execute(command) + print("Result written to: ".. tmpfile) + mkutils.cp(tmpfile, src) + os.remove(tmpfile) +end + +local function extract_css(file) + local f = io.open(file, "r") + local contents = f:read("*all") + f:close() + local css = "" + local filename = "" + contents = contents:gsub('<style id="(MathJax.-)">(.+)</style>', function(name, style) + css = style + filename = (name or "") .. ".css" + return '<link rel="stylesheet" type="text/css" href="'..filename ..'" />' + end) + local x = assert(io.open(file, "w")) + x:write(contents) + x:close() + return filename, css +end + +-- +local function use_fonts(css) + local family_pattern = "font%-family:%s*(.-);.-%/([^%/]+)%.".. fontformat + local family_build = "@font-face {font-family: %s; src: url('%s/%s.%s') format('%s')}" + local fontdir = fontdir:gsub("/$","") + css = css:gsub("(@font%-face%s*{.-})", function(face) + -- if not face:match("url%(") then return face end + if not face:match("url%(") then return "" end + -- print(face) + local family, filename = face:match(family_pattern) + print(family, filename) + local newfile = string.format("%s/%s.%s", fontdir, filename, fontformat) + Make:add_file(newfile) + return family_build:format(family, fontdir, filename, fontformat, fontformat) + -- return face + end) + return css +end + + +local function save_css(filename, css) + local f = io.open(filename, "w") + f:write(css) + f:close() +end + +return function(text, arguments) + -- if arguments.prg then mathnodepath = arguments.prg end + mathnodepath = arguments.prg or mathnodepath + options = arguments.options or options + fontdir = arguments.fontdir or fontdir + fontdest = arguments.fontdest or fontdest + fontformat = arguments.fontformat or fontformat + compile(text) + filename, css = extract_css(text) + if fontdir then + css = use_fonts(css) + end + save_css(filename, css) + Make:add_file(filename) + -- print(css) + print(filename) +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/mkparams.lua new/texmf-dist/scripts/make4ht/mkparams.lua --- old/texmf-dist/scripts/make4ht/mkparams.lua 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/mkparams.lua 2017-04-27 18:43:40.000000000 +0200 @@ -2,6 +2,12 @@ local mkutils = require "mkutils" local m = {} -- use ugly module system for new lua versions support +-- these two variables will be used in the version number +-- progname will be set in get_args +m.progname = "make4ht" +-- set the version number before call to process_args() +m.version_number = "v0.1" + m.optiontext = [[ ${progname} - build system for tex4ht Usage: @@ -43,7 +49,7 @@ end if args.version ==true then - print "make4ht version 0.1b" + print(string.format("%s version %s", m.progname, m.version_number)) os.exit() end @@ -66,14 +72,15 @@ local compiler = args.lua and "dvilualatex" or args.xetex and "xelatex --no-pdf" or "latex" + local tex_file = args.filename local input = mkutils.remove_extension(args.filename) - local latex_params = {} - local tex_file = input local insert_latex = get_inserter(args,latex_params) insert_latex("shell-escape","-shell-escape") local latex_cli_params = args[4] or "" if not latex_cli_params:match("%-jobname") then + -- we must strip out directories from jobname when full path to document is given + input = input:match("([^%/]+)$") table.insert(latex_params,"-jobname="..input) else -- when user specifies -jobname, we must change name of the input file, @@ -117,12 +124,13 @@ --end local tex4ht = "" + local dvi= args.xetex and "xdv" or "dvi" if args[2] and args[2] ~="" then tex4ht = args[2] else tex4ht = args.utf8 and " -cmozhtf -utf8" or "" - local xdv = args.xetex and " -.xdv" or "" - tex4ht = tex4ht .. xdv + if args.xetex then tex4ht = tex4ht .. " -.xdv" end + -- tex4ht = tex4ht .. xdv end local t4ht = args[3] or "" @@ -146,6 +154,7 @@ ,tex4ht_par=tex4ht ,t4ht_par=t4ht ,mode = mode + ,dvi = dvi ,build_file = build_file --,t4ht_dir_format=t4ht_dir_format } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/make4ht/mkutils.lua new/texmf-dist/scripts/make4ht/mkutils.lua --- old/texmf-dist/scripts/make4ht/mkutils.lua 2015-12-12 00:15:24.000000000 +0100 +++ new/texmf-dist/scripts/make4ht/mkutils.lua 2017-04-27 18:43:40.000000000 +0200 @@ -92,9 +92,13 @@ end +-- local cp_func = os.type == "unix" and "cp" or "copy" +-- maybe it would be better to actually move the files +-- in reality it isn't. +-- local cp_func = os.type == "unix" and "mv" or "move" function cp(src,dest) - local command = string.format('%s %s %s', cp_func, src, dest) + local command = string.format('%s "%s" "%s"', cp_func, src, dest) if cp_func == "copy" then command = command:gsub("/",'\\') end print("Copy: "..command) os.execute(command) @@ -262,15 +266,14 @@ return 1 end local len = f:seek("end") - - f:seek("set", len - 256) + f:seek("set", len - 1256) local text = f:read("*a") f:close() - if text:match("No pages of output") then return 1 end + if text:match("No pages of output") or text:match("TeX capacity exceeded, sorry") then return 1 end return 0 end ,{correct_exit=0}) -env.Make:add("tex4ht","tex4ht ${tex4ht_par} \"${input}\"", nil, 1) +env.Make:add("tex4ht","tex4ht ${tex4ht_par} \"${input}.${dvi}\"", nil, 1) env.Make:add("t4ht","t4ht ${t4ht_par} \"${input}.${ext}\"",{ext="dvi"},1) function load_config(settings, config_name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/make4ht.tlpobj new/tlpkg/tlpobj/make4ht.tlpobj --- old/tlpkg/tlpobj/make4ht.tlpobj 2016-04-14 19:24:47.000000000 +0200 +++ new/tlpkg/tlpobj/make4ht.tlpobj 2017-04-28 02:09:02.000000000 +0200 @@ -1,25 +1,28 @@ name make4ht category Package -revision 39075 +revision 44079 shortdesc A build system for tex4ht longdesc make4ht is a simple build system for tex4ht. It is both longdesc executable, which simplifies tex4ht execution, and a library longdesc which can be used to create customized conversion programs. depend make4ht.ARCH -runfiles size=17 +runfiles size=23 texmf-dist/scripts/make4ht/filters/make4ht-cleanspan-nat.lua texmf-dist/scripts/make4ht/filters/make4ht-cleanspan.lua texmf-dist/scripts/make4ht/filters/make4ht-entities.lua texmf-dist/scripts/make4ht/filters/make4ht-filter.lua + texmf-dist/scripts/make4ht/filters/make4ht-fix-links.lua texmf-dist/scripts/make4ht/filters/make4ht-fixligatures.lua texmf-dist/scripts/make4ht/filters/make4ht-hruletohr.lua texmf-dist/scripts/make4ht/lapp-mk4.lua texmf-dist/scripts/make4ht/make4ht + texmf-dist/scripts/make4ht/make4ht-dom.lua texmf-dist/scripts/make4ht/make4ht-lib.lua + texmf-dist/scripts/make4ht/mathnode.lua texmf-dist/scripts/make4ht/mkparams.lua texmf-dist/scripts/make4ht/mkutils.lua catalogue-ctan /support/make4ht -catalogue-date 2015-12-11 14:29:27 +0100 +catalogue-date 2017-04-26 13:36:53 +0200 catalogue-license lppl1.3 catalogue-topics cvt-html -catalogue-version 0.1b +catalogue-version 0.1c ++++++ makebarcode.doc.tar.xz ++++++ ++++++ makebarcode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makebarcode.tlpobj new/tlpkg/tlpobj/makebarcode.tlpobj --- old/tlpkg/tlpobj/makebarcode.tlpobj 2016-04-14 19:24:47.000000000 +0200 +++ new/tlpkg/tlpobj/makebarcode.tlpobj 2017-04-14 17:50:06.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=5 RELOC/tex/latex/makebarcode/makebarcode.sty catalogue-ctan /macros/latex/contrib/makebarcode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics barcode catalogue-version 1.0 ++++++ makebase.doc.tar.xz ++++++ ++++++ makebase.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makebase.tlpobj new/tlpkg/tlpobj/makebase.tlpobj --- old/tlpkg/tlpobj/makebase.tlpobj 2016-05-10 23:45:45.000000000 +0200 +++ new/tlpkg/tlpobj/makebase.tlpobj 2017-04-14 17:50:06.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/makebase/makebase.sty catalogue-ctan /macros/latex/contrib/makebase -catalogue-date 2016-05-10 19:30:05 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics numbers catalogue-version 0.2 ++++++ makebox.doc.tar.xz ++++++ ++++++ makebox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makebox.tlpobj new/tlpkg/tlpobj/makebox.tlpobj --- old/tlpkg/tlpobj/makebox.tlpobj 2016-04-14 19:24:47.000000000 +0200 +++ new/tlpkg/tlpobj/makebox.tlpobj 2017-04-14 17:50:06.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/makebox/makebox.sty catalogue-ctan /macros/latex/contrib/makebox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing catalogue-version 0.1 ++++++ makecell.doc.tar.xz ++++++ ++++++ makecell.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makecell.tlpobj new/tlpkg/tlpobj/makecell.tlpobj --- old/tlpkg/tlpobj/makecell.tlpobj 2016-04-14 19:24:48.000000000 +0200 +++ new/tlpkg/tlpobj/makecell.tlpobj 2017-04-14 17:50:06.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=4 RELOC/tex/latex/makecell/makecell.sty catalogue-ctan /macros/latex/contrib/makecell -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 0.1e ++++++ makecirc.doc.tar.xz ++++++ ++++++ makecirc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makecirc.tlpobj new/tlpkg/tlpobj/makecirc.tlpobj --- old/tlpkg/tlpobj/makecirc.tlpobj 2016-04-14 19:24:49.000000000 +0200 +++ new/tlpkg/tlpobj/makecirc.tlpobj 2017-04-14 17:50:07.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/metapost/makecirc/latex.mp RELOC/metapost/makecirc/makecirc.mp catalogue-ctan /graphics/metapost/contrib/macros/makecirc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram-circ ++++++ makecmds.doc.tar.xz ++++++ ++++++ makecmds.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makecmds.tlpobj new/tlpkg/tlpobj/makecmds.tlpobj --- old/tlpkg/tlpobj/makecmds.tlpobj 2016-04-14 19:24:49.000000000 +0200 +++ new/tlpkg/tlpobj/makecmds.tlpobj 2017-04-14 17:50:07.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/latex/makecmds/makecmds.sty catalogue-ctan /macros/latex/contrib/makecmds -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 ++++++ makedtx.doc.tar.xz ++++++ ++++++ makedtx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makedtx.tlpobj new/tlpkg/tlpobj/makedtx.tlpobj --- old/tlpkg/tlpobj/makedtx.tlpobj 2016-04-14 19:24:49.000000000 +0200 +++ new/tlpkg/tlpobj/makedtx.tlpobj 2017-04-14 17:50:07.000000000 +0200 @@ -13,7 +13,7 @@ texmf-dist/tex/latex/makedtx/creatdtx.sty catalogue-also sty2dtx catalogue-ctan /support/makedtx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics package-devel catalogue-version 0.94b ++++++ makeglos.doc.tar.xz ++++++ ++++++ makeglos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeglos.tlpobj new/tlpkg/tlpobj/makeglos.tlpobj --- old/tlpkg/tlpobj/makeglos.tlpobj 2016-04-14 19:24:50.000000000 +0200 +++ new/tlpkg/tlpobj/makeglos.tlpobj 2017-04-14 17:50:07.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/makeglos/makeglos.sty catalogue-also nomencl glosstex gloss catalogue-ctan /macros/latex/contrib/makeglos -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics glossary ++++++ makeindex.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/makeindex.man1.pdf and new/texmf-dist/doc/man/man1/makeindex.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/mkindex.man1.pdf and new/texmf-dist/doc/man/man1/mkindex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeindex.doc.tlpobj new/tlpkg/tlpobj/makeindex.doc.tlpobj --- old/tlpkg/tlpobj/makeindex.doc.tlpobj 2016-04-27 03:20:55.000000000 +0200 +++ new/tlpkg/tlpobj/makeindex.doc.tlpobj 2017-05-04 02:07:09.000000000 +0200 @@ -1,8 +1,8 @@ name makeindex.doc category Package -revision 40768 +revision 44166 shortdesc doc files of makeindex -docfiles size=131 +docfiles size=122 texmf-dist/doc/man/man1/makeindex.1 texmf-dist/doc/man/man1/makeindex.man1.pdf texmf-dist/doc/man/man1/mkindex.1 ++++++ makeindex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeindex.tlpobj new/tlpkg/tlpobj/makeindex.tlpobj --- old/tlpkg/tlpobj/makeindex.tlpobj 2016-04-27 03:20:56.000000000 +0200 +++ new/tlpkg/tlpobj/makeindex.tlpobj 2017-05-04 02:07:09.000000000 +0200 @@ -1,6 +1,6 @@ name makeindex category Package -revision 40768 +revision 44166 catalogue makeindexk shortdesc Makeindex development sources longdesc The package contains the development sources of makeindex, as @@ -16,6 +16,6 @@ texmf-dist/makeindex/base/tex.ist texmf-dist/tex/plain/makeindex/idxmac.tex catalogue-ctan /indexing/makeindexk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics index ++++++ makeplot.doc.tar.xz ++++++ ++++++ makeplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeplot.tlpobj new/tlpkg/tlpobj/makeplot.tlpobj --- old/tlpkg/tlpobj/makeplot.tlpobj 2016-04-14 19:24:53.000000000 +0200 +++ new/tlpkg/tlpobj/makeplot.tlpobj 2017-04-14 17:50:09.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/latex/makeplot/makeplot.sty catalogue-ctan /graphics/pstricks/contrib/makeplot -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 catalogue-version 1.0.6 ++++++ makeshape.doc.tar.xz ++++++ ++++++ makeshape.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeshape.tlpobj new/tlpkg/tlpobj/makeshape.tlpobj --- old/tlpkg/tlpobj/makeshape.tlpobj 2016-04-14 19:24:54.000000000 +0200 +++ new/tlpkg/tlpobj/makeshape.tlpobj 2017-04-14 17:50:09.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/makeshape/makeshape.sty catalogue-ctan /graphics/pgf/contrib/makeshape -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pgf-tikz catalogue-version 2.1 ++++++ mandi.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mandi/README new/doc/latex/mandi/README --- old/doc/latex/mandi/README 2016-03-17 00:24:03.000000000 +0100 +++ new/doc/latex/mandi/README 2016-11-25 19:29:27.000000000 +0100 @@ -4,7 +4,7 @@ the astronomical commands were inspired by my own classroom needs. This package does not do computations. It only provides commands for typesetting. -Run the file mandi.dtx through (pdf)LaTeX to generate mandi.ins, mandi.sty, -vdemo.py, and mandi.pdf (user documentation). I assume a TeX Live 2011 or later -distribution is installed. +Run mandi.ins through pdfLaTeX to generate files mandi.sty and vdemo.py. Run +mandi.dtx through pdfLaTeX to generate mandi.pdf (documentation). I assume a +TeX Live 2011 or later distribution is installed. Binary files old/doc/latex/mandi/mandi.pdf and new/doc/latex/mandi/mandi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mandi/vdemo.py new/doc/latex/mandi/vdemo.py --- old/doc/latex/mandi/vdemo.py 2014-12-30 23:59:31.000000000 +0100 +++ new/doc/latex/mandi/vdemo.py 2016-11-25 19:29:27.000000000 +0100 @@ -1,4 +1,4 @@ -from __future__ import division,print_function +from __future__ import division, print_function from visual import * G = 6.7e-11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mandi.doc.tlpobj new/tlpkg/tlpobj/mandi.doc.tlpobj --- old/tlpkg/tlpobj/mandi.doc.tlpobj 2016-04-14 19:24:55.000000000 +0200 +++ new/tlpkg/tlpobj/mandi.doc.tlpobj 2017-04-14 17:50:09.000000000 +0200 @@ -1,9 +1,9 @@ name mandi.doc category Package -revision 40050 +revision 41598 shortdesc doc files of mandi relocated 1 -docfiles size=288 +docfiles size=315 RELOC/doc/latex/mandi/README RELOC/doc/latex/mandi/mandi.pdf RELOC/doc/latex/mandi/vdemo.py ++++++ mandi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mandi/mandi.sty new/tex/latex/mandi/mandi.sty --- old/tex/latex/mandi/mandi.sty 2016-03-17 00:24:03.000000000 +0100 +++ new/tex/latex/mandi/mandi.sty 2016-11-25 19:33:53.000000000 +0100 @@ -19,16 +19,16 @@ %% %% The Current Maintainer of this work is Paul J. Heafner. %% -%% This work consists of the files mandi.dtx -%% README -%% mandi.pdf +%% This work consists of the files mandi.dtx +%% mandi.ins +%% mandi.pdf +%% README %% -%% and includes the derived files mandi.ins -%% mandi.sty and -%% vdemo.py. +%% and includes the derived files mandi.sty +%% vdemo.py. %% --------------------------------------------------------------------------- %% -\ProvidesPackage{mandi}[2016/03/15 2.5.1 Macros for physics and astronomy] +\ProvidesPackage{mandi}[2016/06/30 2.6.1 Macros for physics and astronomy] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{amsmath} @@ -36,6 +36,7 @@ \RequirePackage{array} \RequirePackage{cancel} \RequirePackage[dvipsnames]{xcolor} +\RequirePackage{enumitem} \RequirePackage{environ} \RequirePackage{esint} \RequirePackage[g]{esvect} @@ -52,12 +53,14 @@ \RequirePackage[framemethod=TikZ]{mdframed} \RequirePackage{stackengine} \RequirePackage{suffix} +\RequirePackage{tensor} \RequirePackage{xargs} \RequirePackage{xparse} \RequirePackage{xspace} \RequirePackage{ifthen} \RequirePackage{calligra} \RequirePackage{hyperref} +\hypersetup{colorlinks=true,urlcolor=blue} \DeclareMathAlphabet{\mathcalligra}{T1}{calligra}{m}{n} \DeclareFontShape{T1}{calligra}{m}{n}{<->s*[2.2]callig15}{} \DeclareGraphicsRule{.tif}{png}{.png}{`convert #1 `basename #1 .tif`.png} @@ -97,27 +100,32 @@ \newcolumntype{C}[1]{>{\centering}m{#1}} \newboolean{@optromanvectors} \newboolean{@optboldvectors} -\newboolean{@optsingleabsbars} +\newboolean{@optsinglemagbars} \newboolean{@optbaseunits} \newboolean{@optdrvdunits} \newboolean{@optapproxconsts} \newboolean{@optuseradians} \setboolean{@optromanvectors}{false} % this is where you set the default option \setboolean{@optboldvectors}{false} % this is where you set the default option -\setboolean{@optsingleabsbars}{false} % this is where you set the default option +\setboolean{@optsinglemagbars}{false} % this is where you set the default option \setboolean{@optbaseunits}{false} % this is where you set the default option \setboolean{@optdrvdunits}{false} % this is where you set the default option \setboolean{@optapproxconsts}{false} % this is where you set the default option \setboolean{@optuseradians}{false} % this is where you set the default option \DeclareOption{romanvectors}{\setboolean{@optromanvectors}{true}} \DeclareOption{boldvectors}{\setboolean{@optboldvectors}{true}} -\DeclareOption{singleabsbars}{\setboolean{@optsingleabsbars}{true}} +\DeclareOption{singlemagbars}{\setboolean{@optsinglemagbars}{true}} \DeclareOption{baseunits}{\setboolean{@optbaseunits}{true}} \DeclareOption{drvdunits}{\setboolean{@optdrvdunits}{true}} \DeclareOption{approxconsts}{\setboolean{@optapproxconsts}{true}} \DeclareOption{useradians}{\setboolean{@optuseradians}{true}} \ProcessOptions\relax -\newcommand*{\mandiversion}{2.5.0} +\newcommand*{\mandiversion}{\ifmmode% + 2.6.1\mbox{ dated }2016/06/30% + \else% + 2.6.1 dated 2016/06/30% + \fi + }% \typeout{mandi: You're using mandi version \mandiversion.} \@ifpackageloaded{amssymb}{% \csundef{square} @@ -242,9 +250,9 @@ {\ifthenelse{\boolean{@optromanvectors}} {\typeout{mandi: You'll get Roman vectors.}} {\typeout{mandi: You'll get italic vectors.}}} -\ifthenelse{\boolean{@optsingleabsbars}} - {\typeout{mandi: You'll get single absolute value bars.}} - {\typeout{mandi: You'll get double absolute value bars.}} +\ifthenelse{\boolean{@optsinglemagbars}} + {\typeout{mandi: You'll get single magnitude bars.}} + {\typeout{mandi: You'll get double magnitude bars.}} \ifthenelse{\boolean{@optbaseunits}} {\perpusebaseunit % \typeout{mandi: You'll get base units.}} @@ -587,6 +595,10 @@ {\kg\usk\s\reciprocalcubed}% [\W\per\m\squared]% [\W\per\m\squared] +\newphysicsquantity{momentumflux}% + {\reciprocal\m\usk\kg\usk\s\reciprocalsquared}% + [\N\per\m\squared]% + [\N\per\m\squared] \newphysicsquantity{electroncurrent}% {\reciprocal\s}% [\ensuremath{\mathrm{e}}\per\s]% @@ -631,7 +643,34 @@ {\m\usk\A}% [\m\usk\A]% [\m\usk\A] -\newcommand*{\lv}{\ensuremath{\left\langle}} +\newcommand*{\vectordisplacement}[1]{\ensuremath{\displacement{\mivector{#1}}}} +\newcommand*{\vectorvelocity}[1]{\ensuremath{\velocity{\mivector{#1}}}} +\newcommand*{\vectorvelocityc}[1]{\ensuremath{\velocityc{\mivector{#1}}}} +\newcommand*{\vectoracceleration}[1]{\ensuremath{\acceleration{\mivector{#1}}}} +\newcommand*{\vectormomentum}[1]{\ensuremath{\momentum{\mivector{#1}}}} +\newcommand*{\vectorforce}[1]{\ensuremath{\force{\mivector{#1}}}} +\newcommand*{\vectorgravitationalfield}[1] + {\ensuremath{\gravitationalfield{\mivector{#1}}}} +\newcommand*{\vectorimpulse}[1]{\ensuremath{\impulse{\mivector{#1}}}} +\newcommand*{\vectorangularvelocity}[1]{\ensuremath{\angularvelocity{\mivector{#1}}}} +\newcommand*{\vectorangularacceleration}[1] + {\ensuremath{\angularacceleration{\mivector{#1}}}} +\newcommand*{\vectorangularmomentum}[1]{\ensuremath{\angularmomentum{\mivector{#1}}}} +\newcommand*{\vectorangularimpulse}[1]{\ensuremath{\angularimpulse{\mivector{#1}}}} +\newcommand*{\vectortorque}[1]{\ensuremath{\torque{\mivector{#1}}}} +\newcommand*{\vectorwavenumber}[1]{\ensuremath{\wavenumber{\mivector{#1}}}} +\newcommand*{\vectorelectricfield}[1]{\ensuremath{\electricfield{\mivector{#1}}}} +\newcommand*{\vectorelectricdipolemoment}[1] + {\ensuremath{\electricdipolemoment{\mivector{#1}}}} +\newcommand*{\vectormagneticfield}[1]{\ensuremath{\magneticfield{\mivector{#1}}}} +\newcommand*{\vectorcmagneticfield}[1]{\ensuremath{\cmagneticfield{\mivector{#1}}}} +\newcommand*{\vectormagneticdipolemoment}[1] + {\ensuremath{\magneticdipolemoment{\mivector{#1}}}} +\newcommand*{\vectorcurrentdensity}[1]{\ensuremath{\currentdensity{\mivector{#1}}}} + \newcommand*{\lv}{\ensuremath{\left\langle}} +\newcommand*{\vectorenergyflux}[1]{\ensuremath{\energyflux{\mivector{#1}}}} +\newcommand*{\vectormomentumflux}[1]{\ensuremath{\momentumflux{\mivector{#1}}}} +\newcommand*{\poyntingvector}{\vectorenergyflux} \newcommand*{\rv}{\ensuremath{\right\rangle}} \ExplSyntaxOn % Written in LaTeX3 \NewDocumentCommand{\magvectncomps}{ m O{} } @@ -658,13 +697,12 @@ }% \ExplSyntaxOff \newcommand*{\zerovect}{\vect{0}} -\newcommand*{\ncompszerovect}{\mivector{0,0,0}} \ifthenelse{\boolean{@optboldvectors}} {\newcommand*{\vect}[1]{\ensuremath{\boldsymbol{#1}}}} {\ifthenelse{\boolean{@optromanvectors}} {\newcommand*{\vect}[1]{\ensuremath{\vv{\mathrm{#1}}}}} {\newcommand*{\vect}[1]{\ensuremath{\vv{#1}}}}} -\ifthenelse{\boolean{@optsingleabsbars}} +\ifthenelse{\boolean{@optsinglemagbars}} {\newcommand*{\magvect}[1]{\ensuremath{\absof{\vect{#1}}}}} {\newcommand*{\magvect}[1]{\ensuremath{\magof{\vect{#1}}}}} \newcommand*{\magsquaredvect}[1]{\ensuremath{\magvect{#1}\squared}} @@ -676,7 +714,8 @@ {\ifthenelse{\boolean{@optromanvectors}} {\newcommand*{\dirvect}[1]{\ensuremath{\widehat{\mathrm{#1}}}}} {\newcommand*{\dirvect}[1]{\ensuremath{\widehat{#1}}}}} -\newcommand*{\direction}{\dirvect} +\newcommand*{\direction}[1]{\ensuremath{\mivector{#1}}} +\newcommand*{\vectordirection}{\direction} \newcommand*{\componentalong}[2]{\ensuremath{\mathrm{comp}_{#1}{#2}}} \newcommand*{\expcomponentalong}[2]{\ensuremath{\frac{\vectdotvect{#2}{#1}} {\magof{#1}}}} @@ -714,7 +753,7 @@ \newcommand*{\ddirection}{\ddirvect} \newcommand*{\Ddirvect}[1]{\ensuremath{\Delta\dirvect{#1}}} \newcommand*{\Ddirection}{\Ddirvect} -\ifthenelse{\boolean{@optsingleabsbars}} +\ifthenelse{\boolean{@optsinglemagbars}} {\newcommand*{\magdvect}[1]{\ensuremath{\absof{\dvect{#1}}}} \newcommand*{\magDvect}[1]{\ensuremath{\absof{\Dvect{#1}}}}} {\newcommand*{\magdvect}[1]{\ensuremath{\magof{\dvect{#1}}}} @@ -741,7 +780,7 @@ \compDervect{#1}{x}{#2},% \compDervect{#1}{y}{#2},% \compDervect{#1}{z}{#2}\rv}} -\ifthenelse{\boolean{@optsingleabsbars}} +\ifthenelse{\boolean{@optsinglemagbars}} {\newcommand*{\magdervect}[2]{\ensuremath{\absof{\dervect{#1}{#2}}}} \newcommand*{\magDervect}[2]{\ensuremath{\absof{\Dervect{#1}{#2}}}}} {\newcommand*{\magdervect}[2]{\ensuremath{\magof{\dervect{#1}{#2}}}} @@ -764,7 +803,7 @@ \compvectsub{#1}{#2}{x},% \compvectsub{#1}{#2}{y},% \compvectsub{#1}{#2}{z}\rv}} -\ifthenelse{\boolean{@optsingleabsbars}} +\ifthenelse{\boolean{@optsinglemagbars}} {\newcommand*{\magvectsub}[2]{\ensuremath{\absof{\vectsub{#1}{#2}}}}} {\newcommand*{\magvectsub}[2]{\ensuremath{\magof{\vectsub{#1}{#2}}}}} \newcommand*{\magsquaredvectsub}[2]{\ensuremath{\magvectsub{#1}{#2}\squared}} @@ -793,7 +832,7 @@ \newcommand*{\Dermagvectsub}[3]{\ensuremath{\DbyD{\magvectsub{#1}{#2}}{#3}}} \newcommand*{\dervectsub}[3]{\ensuremath{\dbyd{\vectsub{#1}{#2}}{#3}}} \newcommand*{\Dervectsub}[3]{\ensuremath{\DbyD{\vectsub{#1}{#2}}{#3}}} -\ifthenelse{\boolean{@optsingleabsbars}} +\ifthenelse{\boolean{@optsinglemagbars}} {\newcommand*{\magdervectsub}[3]{\ensuremath{\absof{\dervectsub{#1}{#2}{#3}}}} \newcommand*{\magDervectsub}[3]{\ensuremath{\absof{\Dervectsub{#1}{#2}{#3}}}}} {\newcommand*{\magdervectsub}[3]{\ensuremath{\magof{\dervectsub{#1}{#2}{#3}}}} @@ -1462,10 +1501,9 @@ \newcommand*{\sumoverall}[1]{\ensuremath{\displaystyle \sum_{\substack{\text{\tiny{all }}\text{\tiny{{#1}}}}}}} \newcommand*{\dx}[1]{\ensuremath{\,\mathrm{d}{#1}}} -\newcommand*{\evalfromto}[3]{\ensuremath{% - \Bigg.{#1}\Bigg\rvert_{#2}^{#3}}} -\newcommand*{\evalat}[2]{\ensuremath{\Bigg.{#1}\Bigg\rvert_{#2}}} -\newcommand*{\evaluatedat}[1]{\ensuremath{\Bigg.\Bigg\rvert_{#1}}} +\newcommandx{\evaluatedfromto}[2][2,usedefault]{\ensuremath{% + \Bigg.\Bigg\rvert_{#1}^{#2}}} +\newcommand*{\evaluatedat}{\evaluatedfromto} \newcommandx{\integral}[4][1,2,usedefault]{\ensuremath{% \int_{\ifthenelse{\equal{#1}{}}{}{#4=#1}}^{\ifthenelse{% \equal{#2}{}}{}{#4=#2}}}{#3}\dx{#4}} @@ -1566,21 +1604,17 @@ \newcommand*{\Lagr}{\ensuremath{\mathcal{L}}} \newcommandx{\flux}[1][1]{\ensuremath{\ssub{\Phi}{#1}}} \newcommand*{\absof}[1]{\ensuremath{% - \left\lvert{\ifblank{#1}{\:\cdot\:}{#1}}\right\rvert}} + \left\lvert{\ifblank{#1}{\:\_\:}{#1}}\right\rvert}} \newcommand*{\inparens}[1]{\ensuremath{% - \left({\ifblank{#1}{\:\cdot\:}{#1}}\right)}} + \left({\ifblank{#1}{\:\_\:}{#1}}\right)}} \newcommand*{\magof}[1]{\ensuremath{% - \left\lVert{\ifblank{#1}{\:\cdot\:}{#1}}\right\rVert}} + \left\lVert{\ifblank{#1}{\:\_\:}{#1}}\right\rVert}} \newcommand*{\dimsof}[1]{\ensuremath{% - \left[{\ifblank{#1}{\:\cdot\:}{#1}}\right]}} + \left[{\ifblank{#1}{\:\_\:}{#1}}\right]}} \newcommand*{\unitsof}[1]{\ensuremath{% - \left[{\ifblank{#1}{\:\cdot\:}{#1}}\right]_u}} + \left[{\ifblank{#1}{\:\_\:}{#1}}\right]_u}} \newcommand*{\changein}[1]{\ensuremath{\delta{#1}}} \newcommand*{\Changein}[1]{\ensuremath{\Delta{#1}}} -\newcommandx{\scin}[3][1,3=\!\!,usedefault]{\ensuremath{% - \ifthenelse{\equal{#1}{}} - {\unit{10^{#2}}{#3}} - {\unit{{#1}\times 10^{#2}}{#3}}}} \newcommandx{\timestento}[2][2=\!\!,usedefault]{\ensuremath{% \ifthenelse{\equal{#2}{}} {\unit{\;\times\;10^{#1}}{}} @@ -1674,6 +1708,47 @@ \xLongleftarrow[\text{\tiny{#1}}]{}}} \newcommand*{\brelatedto}[2]{\ensuremath{% \xLongleftrightarrow[\text{\tiny{#1}}]{\text{\tiny{#2}}}}} +\newcommand*{\genericinteractionplaces}[5]{\ensuremath{\inparens{#1} + \frac{\inparens{#2}\inparens{#3}}{\inparens{#4}^2}{{\ifblank{#5}{% + \mivector{\_ , \_ , \_}}{#5}}}}} +\newcommand*{\genericfieldofparticleplaces}[4]{\ensuremath{\inparens{#1} + \frac{\inparens{#2}}{\inparens{#3}^2}{{\ifblank{#4}{\mivector{\_ , \_ , \_}}{#4}}}}} +\newcommand*{\genericpotentialenergyplaces}[4]{\ensuremath{% + \inparens{#1}\frac{\inparens{#2}\inparens{#3}}{\inparens{#4}}}} +\newcommand*{\genericelectricdipoleplaces}[5]{% + \ensuremath{\inparens{#1}\frac{\inparens{#2}\inparens{#3}}{\inparens{#4}^3}% + {{\ifblank{#5}{\mivector{\_ , \_ , \_}}{#5}}}}} +\newcommand*{\genericelectricdipoleonaxisplaces}[5]{% + \ensuremath{\inparens{#1}\frac{2\inparens{#2}\inparens{#3}}{\inparens{#4}^3}% + {{\ifblank{#5}{\mivector{\_ , \_ , \_}}{#5}}}}} +\newcommand*{\gfieldofparticle}{\ensuremath{\universalgravmathsymbol\frac{M}% + {\magsquaredvect{r}}\inparens{-\dirvect{r}}}} +\newcommand*{\gravitationalinteractionplaces}[4]{% + \genericinteractionplaces{\universalgrav}{#1}{#2}{#3}{#4}} +\newcommand*{\gfieldofparticleplaces}[3]{% + \genericfieldofparticleplaces{\universalgrav}{#1}{#2}{#3}} +\newcommand*{\electricinteractionplaces}[4]{% + \genericinteractionplaces{\oofpez}{#1}{#2}{#3}{#4}} +\newcommand*{\Efieldofparticleplaces}[3]{% + \genericfieldofparticleplaces{\oofpez}{#1}{#2}{#3}} +\newcommand*{\Bfieldofparticleplaces}[5]{\ensuremath{\inparens{\mzofp}% + \frac{\inparens{#1}\inparens{#2}}{\inparens{#3}^2}{{\ifblank{#4}{% + \mivector{\_ , \_ , \_}}{#4}}}\times{{\ifblank{#5}{\mivector{\_ , \_ , \_}}{#5}}}}} +\newcommand*{\springinteractionplaces}[3]{\ensuremath{\inparens{#1} + \inparens{#2}{{\ifblank{#3}{\mivector{\_ , \_ , \_}}{#3}}}}} +\newcommand*{\gravitationalpotentialenergyplaces}[3]{% + -\genericpotentialenergyplaces{\universalgrav}{#1}{#2}{#3}} +\newcommand*{\electricpotentialenergyplaces}[3]{% + \genericpotentialenergyplaces{\oofpez}{#1}{#2}{#3}} +\newcommand*{\springpotentialenergyplaces}[2]{\ensuremath{% + \onehalf\inparens{#1}\inparens{#2}^2}} +\newcommand*{\electricdipoleonaxisplaces}[4]{% + \genericelectricdipoleonaxisplaces{\oofpez}{\absof{#1}}{#2}{#3}{{\ifblank{#4}{% + \mivector{\_ , \_ , \_}}{#4}}}} +\newcommand*{\electricdipoleonbisectorplaces}[4]{% + \genericelectricdipoleplaces{\oofpez}{\absof{#1}}{#2}{#3}{{\ifblank{#4}{% + \mivector{\_ , \_ , \_}}{#4}}}} +\newcommand{\define}[2]{\newcommand{#1}{#2}} \newcommand*{\momentumprinciple}{\ensuremath{% \vectsub{p}{sys,final}=\vectsub{p}{sys,initial}+\Fnetsys\Delta t}} \newcommand*{\LHSmomentumprinciple}{\ensuremath{\vectsub{p}{sys,final}}} @@ -1702,10 +1777,10 @@ \dirvectsub{r}{12}}} \newcommand*{\springinteraction}{\ensuremath{\ks\magvect{s}(-\dirvect{s})}} \newcommand*{\Bfieldofparticle}{\ensuremath{% - \mzofpmathsymbol\frac{Q\magvect{v}}{\magvect{r}\squared}\dirvect{v}\times + \mzofpmathsymbol\frac{Q\magvect{v}}{\magsquaredvect{r}}\dirvect{v}\times \dirvect{r}}} \newcommand*{\Efieldofparticle}{\ensuremath{% - \oofpezmathsymbol\frac{Q}{\magvect{r}\squared}\dirvect{r}}} + \oofpezmathsymbol\frac{Q}{\magsquaredvect{r}}\dirvect{r}}} \newcommandx{\Esys}[1][1]{\ifthenelse{% \equal{#1}{}}{\ssub{E}{sys}}{\ssub{E}{sys,#1}}} \newcommandx{\Us}[1][1]{\ifthenelse{% @@ -1882,8 +1957,12 @@ \newcommandx{\Eulerlagrange}[1][1={q_i},usedefault]{\ensuremath{% \DbyD{\mathcal{L}}{#1}-\DbyDt\inparens{\DbyD{\mathcal{L}}{\dot{#1}}} = 0}} \newcommand*{\vpythonline}{\lstinline[style=vpython]} +\newcommand*{\glowscriptline}{\lstinline[style=vpython]} \lstnewenvironment{vpythonblock}[1][]{\lstset{style=vpython,caption={#1}}}{} +\lstnewenvironment{glowscriptblock}[1][]{\lstset{style=vpython,caption={#1}}}{} \newcommand*{\vpythonfile}[1][]{\newpage\lstinputlisting[style=vpython,caption={#1}]} +\newcommand*{\glowscriptfile}[1][]{% + \newpage\lstinputlisting[style=vpython,caption={#1}]} \newcommandx{\emptyanswer}[2][1=0.80,2=0.1,usedefault] {\begin{minipage}{#1\textwidth}\hfill\vspace{#2\textheight}\end{minipage}} \newenvironmentx{activityanswer}[5][1=white,2=black,3=black,4=0.90,% @@ -2259,6 +2338,13 @@ \BODY \end{align*} }% +\newenvironment{problem}[1]{% + \newpage% + \section*{#1}% + \newlist{parts}{enumerate}{2}% + \setlist[parts]{label=(\alph*)}}{\newpage} +\newcommand{\problempart}{\item}% +\newcommand{\reason}[1]{\parbox{2cm}{#1}} \newcommand*{\checkpoint}{% \vspace{1cm}\begin{center}% \colorbox{yellow!80}{|--------- CHECKPOINT ---------|}% @@ -2272,6 +2358,7 @@ \end{center}% \end{figure}} \newcommand*{\sneakyone}[1]{\ensuremath{\cancelto{1}{#1}}} +\newcommand*{\qed}{\ensuremath{\text{ Q.E.D.}}} \newcommand*{\chkquantity}[1]{% \begin{center} \begin{tabular}{C{4.5cm} C{4cm} C{4cm} C{4cm}} @@ -2281,7 +2368,6 @@ \end{tabular} \end{center} }% -\newcommand*{\qed}{\ensuremath{\text{ Q.E.D.}}} \newcommand*{\chkconstant}[1]{% \begin{center} \begin{tabular}{C{4cm} C{2cm} C{3cm} C{3cm} C{3cm} C{3cm}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mandi.tlpobj new/tlpkg/tlpobj/mandi.tlpobj --- old/tlpkg/tlpobj/mandi.tlpobj 2016-04-14 19:24:55.000000000 +0200 +++ new/tlpkg/tlpobj/mandi.tlpobj 2017-04-14 17:50:09.000000000 +0200 @@ -1,6 +1,6 @@ name mandi category Package -revision 40050 +revision 41598 shortdesc Macros for introductory physics and astronomy relocated 1 longdesc The package contains commands for students and teachers of @@ -8,11 +8,11 @@ longdesc intelligently handle SI units so the user need not do so. There longdesc are other features that should make LaTeX easy for introductory longdesc physics students. -runfiles size=22 +runfiles size=23 RELOC/tex/latex/mandi/mandi.sty catalogue-also siunitx catalogue-ctan /macros/latex/contrib/mandi -catalogue-date 2016-03-17 05:56:23 +0100 +catalogue-date 2016-07-01 11:44:17 +0200 catalogue-license lppl1.3 catalogue-topics physics -catalogue-version 2.5.1 +catalogue-version 2.6.1 ++++++ manfnt-font.tar.xz ++++++ ++++++ manfnt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/manfnt.tlpobj new/tlpkg/tlpobj/manfnt.tlpobj --- old/tlpkg/tlpobj/manfnt.tlpobj 2016-04-14 19:24:55.000000000 +0200 +++ new/tlpkg/tlpobj/manfnt.tlpobj 2017-04-14 17:50:10.000000000 +0200 @@ -1,6 +1,6 @@ name manfnt category Package -revision 35799 +revision 42428 shortdesc LaTeX support for the TeX book symbols relocated 1 longdesc A LaTeX package for easy access to the symbols of the Knuth's @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/manfnt/manfnt.sty catalogue-ctan /macros/latex/contrib/manfnt -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 ++++++ manuscript.doc.tar.xz ++++++ ++++++ manuscript.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/manuscript.tlpobj new/tlpkg/tlpobj/manuscript.tlpobj --- old/tlpkg/tlpobj/manuscript.tlpobj 2016-04-14 19:24:56.000000000 +0200 +++ new/tlpkg/tlpobj/manuscript.tlpobj 2017-04-14 17:50:10.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/manuscript/manuscript.sty catalogue-ctan /macros/latex/contrib/manuscript -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting catalogue-version 1.7 ++++++ margbib.doc.tar.xz ++++++ ++++++ margbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/margbib.tlpobj new/tlpkg/tlpobj/margbib.tlpobj --- old/tlpkg/tlpobj/margbib.tlpobj 2016-04-14 19:24:56.000000000 +0200 +++ new/tlpkg/tlpobj/margbib.tlpobj 2017-04-14 17:50:10.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/margbib/margbib.sty catalogue-ctan /macros/latex/contrib/margbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics cite-supp marginal catalogue-version 1.0c ++++++ marginfix.doc.tar.xz ++++++ ++++++ marginfix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/marginfix.tlpobj new/tlpkg/tlpobj/marginfix.tlpobj --- old/tlpkg/tlpobj/marginfix.tlpobj 2016-04-14 19:24:56.000000000 +0200 +++ new/tlpkg/tlpobj/marginfix.tlpobj 2017-04-14 17:50:10.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=4 RELOC/tex/latex/marginfix/marginfix.sty catalogue-ctan /macros/latex/contrib/marginfix -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics marginal catalogue-version 1.1 ++++++ marginnote.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/marginnote/README.txt new/doc/latex/marginnote/README.txt --- old/doc/latex/marginnote/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/marginnote/README.txt 2017-04-22 23:22:17.000000000 +0200 @@ -0,0 +1,18 @@ +LaTeX package marginnote +Copyright (c) Markus Kohm, 2005-2017 +------------------------------------------------------------------- +Version: + 2017/04/22 v1.2b +Licence: + 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 + version 2005/12/01 or later and of this work. +Abstract: + This package provides the command \marginnote that may be used + instead of \marginpar at almost every place, where \marginpar + cannot be used, e.g. inside floats, footnotes, frames made with + framed package. See marginnote.pdf for more information. +------------------------------------------------------------------- Binary files old/doc/latex/marginnote/marginnote.pdf and new/doc/latex/marginnote/marginnote.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/marginnote.doc.tlpobj new/tlpkg/tlpobj/marginnote.doc.tlpobj --- old/tlpkg/tlpobj/marginnote.doc.tlpobj 2016-04-14 19:24:56.000000000 +0200 +++ new/tlpkg/tlpobj/marginnote.doc.tlpobj 2017-04-23 02:07:09.000000000 +0200 @@ -1,7 +1,8 @@ name marginnote.doc category Package -revision 25880 +revision 43979 shortdesc doc files of marginnote relocated 1 -docfiles size=71 +docfiles size=76 + RELOC/doc/latex/marginnote/README.txt RELOC/doc/latex/marginnote/marginnote.pdf ++++++ marginnote.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/marginnote/marginnote.sty new/tex/latex/marginnote/marginnote.sty --- old/tex/latex/marginnote/marginnote.sty 2012-04-09 18:25:47.000000000 +0200 +++ new/tex/latex/marginnote/marginnote.sty 2017-04-22 23:22:17.000000000 +0200 @@ -6,36 +6,25 @@ %% %% marginnote.dtx (with options: `package') %% -%% IMPORTANT NOTE: +%% IMPORTANT NOTICE: %% -%% This is a generated file and you are not allowed to distribute it -%% without the source ot the work. See below about more informations -%% about the files the work consists of. +%% For the copyright see the source file. %% -%% Copyright (c) Markus Kohm 2005-2012 -%% -%% 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 author of the initial version of these work was -%% Markus Kohm <komascript(a)gmx.info> -%% -%% This work consists of the files marginnote.dtx, marginnote.ins, -%% and REAMDE. -%% -%% Important Recommendation: -%% The LPPL requires that distributions of the Work contain all the files of -%% the Work (see ``Important Recommendations'' at lppl.txt). -%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from marginnote.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file marginnote.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%%% From File: $Id: marginnote.dtx 13 2017-04-22 09:25:22Z mjk $ +\NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{marginnote}[% - 2012/03/29 v1.1i non floating margin notes for LaTeX] + 2017/04/22 v1.2b + non floating margin notes for LaTeX] \begingroup \def\@tempb{}% \def\@tempa{% @@ -117,9 +106,16 @@ \ProcessOptions\relax \newcommand*{\newmarginnote}{\@newl@bel{mn}} \newif\if@mn@pdfmode\@mn@pdfmodefalse +\newcommand*{\@mn@mode@prefix}{pdf} \AtBeginDocument{% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdflastxpos\endcsname\relax\else % bg or 1 + \expandafter\ifx\csname pdflastxpos\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname lastxpos\endcsname\relax\else + \@mn@pdfmodetrue + \renewcommand*{\@mn@mode@prefix}{}% + \fi + \else % bg or 1 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdftexversion\endcsname\relax % bg 2 \begingroup\expandafter\expandafter\expandafter\endgroup @@ -146,7 +142,8 @@ \if@mn@verbose \if@mn@pdfmode \PackageInfo{marginnote}{% - \string\pdfoutput\space not 0 and \string\pdflastxpos\space + \string\pdfoutput\space not 0 or unimportant and\MessageBreak + \string\pdflastxpos\space or \string\lastxpos\space available.\MessageBreak Extended position detection mode activated\@gobble }% @@ -185,10 +182,10 @@ \let\@mn@currpage\relax \let\@mn@currxpos\relax \if@mn@pdfmode - \pdfsavepos + \@nameuse{\@mn@mode@prefix savepos}% \protected@write\@auxout{\let\themn@abspage\relax}{% \string\newmarginnote{note.\@mn@thispage.\@mn@atthispage}{% - {\themn@abspage}{\noexpand\number\pdflastxpos sp}}% + {\themn@abspage}{\noexpand\number\@nameuse{\@mn@mode@prefix lastxpos}sp}}% }% \else \protected@write\@auxout{\let\themn@abspage\relax}{% @@ -215,16 +212,37 @@ \edef\@mn@currpage{\csname mn@note.\@mn@thispage.\@mn@atthispage\endcsname}% \edef\@mn@currxpos{\expandafter\@secondoftwo\@mn@currpage}% - \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfhorigin\endcsname\relax\else + \ifx\@mn@currxpos\@empty\else + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfoutput\endcsname\relax\else - \ifnum \pdfoutput=1 % - \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin - +1in\relax}% + \expandafter\ifx\csname pdfhorigin\endcsname\relax\else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfoutput\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname outputmode\endcsname\relax\else + \ifnum \outputmode=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi + \fi + \else + \ifnum \pdfoutput=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi \fi \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname \@mn@mode@prefix pagewidth\endcsname\relax\else + \@mn@if@RTL{% + \PackageInfo{marginnote}{Margin note + \@mn@thispage.\@mn@atthispage\space in RTL mode}% + \edef\@mn@currxpos{% + \the\dimexpr\@nameuse{\@mn@mode@prefix pagewidth} + -\@mn@currxpos\relax + }% + }{}% + \fi \fi \edef\@mn@currpage{\expandafter\@firstoftwo\@mn@currpage}% \if@mn@verbose @@ -245,6 +263,14 @@ \fi \fi } +\newcommand*{\@mn@if@RTL}{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname if@RTL\endcsname\iftrue + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \newcommand*{\marginnote}{% \@dblarg\@mn@marginnote } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/marginnote.tlpobj new/tlpkg/tlpobj/marginnote.tlpobj --- old/tlpkg/tlpobj/marginnote.tlpobj 2016-04-14 19:24:57.000000000 +0200 +++ new/tlpkg/tlpobj/marginnote.tlpobj 2017-04-23 02:07:09.000000000 +0200 @@ -1,6 +1,6 @@ name marginnote category Package -revision 25880 +revision 43979 shortdesc Notes in the margin, even where \marginpar fails relocated 1 longdesc This package provides the command \marginnote that may be used @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/marginnote/marginnote.sty catalogue-ctan /macros/latex/contrib/marginnote -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2017-04-22 12:44:46 +0200 +catalogue-license lppl1.3c catalogue-topics notes -catalogue-version 1.1i +catalogue-version 1.2b ++++++ marvosym.doc.tar.xz ++++++ ++++++ marvosym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/marvosym.tlpobj new/tlpkg/tlpobj/marvosym.tlpobj --- old/tlpkg/tlpobj/marvosym.tlpobj 2016-04-14 19:24:57.000000000 +0200 +++ new/tlpkg/tlpobj/marvosym.tlpobj 2017-04-14 17:50:11.000000000 +0200 @@ -21,7 +21,7 @@ RELOC/tex/latex/marvosym/marvosym.sty RELOC/tex/latex/marvosym/umvs.fd catalogue-ctan /fonts/marvosym -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-mf font-ttf font-symbol font-supp catalogue-version 2.2a ++++++ matc3.doc.tar.xz ++++++ ++++++ matc3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/matc3.tlpobj new/tlpkg/tlpobj/matc3.tlpobj --- old/tlpkg/tlpobj/matc3.tlpobj 2016-04-14 19:24:58.000000000 +0200 +++ new/tlpkg/tlpobj/matc3.tlpobj 2017-04-14 17:50:11.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/matc3/matc3.sty catalogue-also matc3mem catalogue-ctan /macros/latex/contrib/matc3 -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 catalogue-version 1.0.1 ++++++ matc3mem.doc.tar.xz ++++++ ++++++ matc3mem.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/matc3mem.tlpobj new/tlpkg/tlpobj/matc3mem.tlpobj --- old/tlpkg/tlpobj/matc3mem.tlpobj 2016-04-14 19:24:58.000000000 +0200 +++ new/tlpkg/tlpobj/matc3mem.tlpobj 2017-04-14 17:50:11.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/matc3mem/matc3mem.cls catalogue-also matc3 catalogue-ctan /macros/latex/contrib/matc3mem -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 catalogue-version 1.1 ++++++ match_parens.doc.tar.xz ++++++ ++++++ match_parens.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/match_parens.tlpobj new/tlpkg/tlpobj/match_parens.tlpobj --- old/tlpkg/tlpobj/match_parens.tlpobj 2016-04-14 19:24:58.000000000 +0200 +++ new/tlpkg/tlpobj/match_parens.tlpobj 2017-04-14 17:50:11.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 texmf-dist/scripts/match_parens/match_parens catalogue-ctan /support/match_parens -catalogue-date 2016-04-13 20:27:48 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics debug-supp catalogue-version 1.43 ++++++ math-e.doc.tar.xz ++++++ ++++++ mathabx-type1.doc.tar.xz ++++++ ++++++ mathabx-type1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathabx-type1.tlpobj new/tlpkg/tlpobj/mathabx-type1.tlpobj --- old/tlpkg/tlpobj/mathabx-type1.tlpobj 2016-04-14 19:25:01.000000000 +0200 +++ new/tlpkg/tlpobj/mathabx-type1.tlpobj 2017-04-14 17:50:13.000000000 +0200 @@ -35,6 +35,6 @@ RELOC/fonts/type1/public/mathabx-type1/mathx9.pfb catalogue-also mathabx catalogue-ctan /fonts/ps-type1/mathabx -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-type1 font-symbol-maths ++++++ mathabx.doc.tar.xz ++++++ ++++++ mathabx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathabx.tlpobj new/tlpkg/tlpobj/mathabx.tlpobj --- old/tlpkg/tlpobj/mathabx.tlpobj 2016-04-14 19:25:00.000000000 +0200 +++ new/tlpkg/tlpobj/mathabx.tlpobj 2017-04-14 17:50:13.000000000 +0200 @@ -94,6 +94,6 @@ RELOC/tex/generic/mathabx/mathabx.sty RELOC/tex/generic/mathabx/mathabx.tex catalogue-ctan /fonts/mathabx -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-symbol-maths ++++++ mathalfa.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathalfa/README new/doc/latex/mathalfa/README --- old/doc/latex/mathalfa/README 2016-03-28 23:52:09.000000000 +0200 +++ new/doc/latex/mathalfa/README 2017-02-25 00:01:03.000000000 +0100 @@ -9,9 +9,11 @@ alphabets in order to allow each to be scaled independently and without silently quantizing the sizes. -This version (1.08) adds two more alphabets---bb=libus sets blackboard bold to the double-struck alphabet from LibertinusT1Math, and cal=stix sets the calligraphic alphabet to the one in six-mathcal.pfb. +This version (1.09) adds two more calligraphic/script alphabets, both upright---txupr is based on the math calligraphic font from the TX fonts, and boondoxupr is derived from the stix math script fonts, version 1.1. -Copyright 2012--2016 Michael Sharpe +Version (1.08) adds two more alphabets---bb=libus sets blackboard bold to the double-struck alphabet from LibertinusT1Math, and cal=stix sets the calligraphic alphabet to the one in stix-mathcal.pfb. + +Copyright 2012--2017 Michael Sharpe msharpe at ucsd dot edu License: Binary files old/doc/latex/mathalfa/mathalfa.pdf and new/doc/latex/mathalfa/mathalfa.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathalfa/mathalfa.tex new/doc/latex/mathalfa/mathalfa.tex --- old/doc/latex/mathalfa/mathalfa.tex 2012-05-05 02:45:59.000000000 +0200 +++ new/doc/latex/mathalfa/mathalfa.tex 2017-02-25 00:01:03.000000000 +0100 @@ -1,4 +1,6 @@ \documentclass[11pt]{amsart} +\pdfmapfile{+TXUprCal.map} +\pdfmapfile{+BOONDOXUprScr.map} \usepackage[margin=1in]{geometry} \usepackage[parfill]{parskip}\usepackage{url} \usepackage{graphicx} @@ -85,10 +87,10 @@ after loading the {\tt mathalfa} package. (You may find this a useful option if you specified {\tt cal=dutchcal}, as that font is quite light.) \item Use of \textsf{zapfc} as a value for either \textsf{cal} or \textsf{scr} requires that you install the \textsf{urwchancal} package from\\ - \url{http://ctan.tug.org/tex-archive/fonts/urwchancal}.\\ + \url{http://mirror.tug.org/fonts/urwchancal}.\\ (It is distributed as part of \TeX\ Live as of March 2011.) \item Use of the \textsf{rsfso} as a value for either \textsf{cal} or \textsf{scr} requires that you install the \textsf{rsfso} package from\\ - \url{http://ctan.tug.org/tex-archive/fonts/rsfso}.\\ + \url{http://mirror.tug.org/fonts/rsfso}.\\ (It is distributed as part of \TeX\ Live as of March 2011.) \item Use of \textsf{mma} as a value requires that you download and install the fonts from\\ \url{http://support.wolfram.com/technotes/latestfonts.en.html}.\\ @@ -233,7 +235,7 @@ \sample{{\tt\small mt} (Mathtime Pro 2 fraktur-bold):} {\usefont{U}{mt2mf}{b}{n}\al} -\sample{{\tt\small boondox} (BOONDOX fraktur-bold):} {\usefont{U}{BOONDOX-frak}{b}{n}\al} +\sample{{\tt\small boondox} (BOONDOX fraktur-bold):} {\usefont{U}{BOONDOX-frak}{b}{n}\al} } \def\spc{\hspace*{7pt}} @@ -247,6 +249,10 @@ \sample{{\small\tt\spc mtc} (Mathtime Pro 2 Curly script):} {\usefont{U}{mt2ms}{m}{n}\al} +\sample{{\small\tt\spc txupr} (TXUprCal):} {\usefont{U}{txuprcal}{m}{n}\al} + +\sample{{\small\tt\spc boondoxupr} (BOONDOXUprScr):} {\usefont{U}{boondoxuprscr}{m}{n}\al} + \vspace{4pt}\textsc{Restrained:}\\[3pt] \sample{{\small\tt \spc cm} (CM calligraphic, cmsy):} {\usefont{OMS}{cmsy}{m}{n}\al} @@ -327,8 +333,6 @@ \sample{{\tt\small\spc pazo} (Mathpazo bb):} {\usefont{U}{fplmbb}{m}{n}\al} -\sample{{\tt\small\spc tx} (tx bb):} {\usefont{U}{tx-ds}{m}{n}\al} - \sample{{\tt\small\spc px} (px bb):} {\usefont{U}{px-ds}{m}{n}\al} \sample{{\tt\small\spc px} (px bb bold):} {\usefont{U}{px-ds}{b}{n}\al} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathalfa.doc.tlpobj new/tlpkg/tlpobj/mathalfa.doc.tlpobj --- old/tlpkg/tlpobj/mathalfa.doc.tlpobj 2016-04-14 19:25:02.000000000 +0200 +++ new/tlpkg/tlpobj/mathalfa.doc.tlpobj 2017-04-14 17:50:14.000000000 +0200 @@ -1,9 +1,9 @@ name mathalfa.doc category Package -revision 40164 +revision 43332 shortdesc doc files of mathalfa relocated 1 -docfiles size=104 +docfiles size=244 RELOC/doc/latex/mathalfa/README RELOC/doc/latex/mathalfa/mathalfa.pdf RELOC/doc/latex/mathalfa/mathalfa.tex ++++++ mathalfa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathalfa/mathalfa.sty new/tex/latex/mathalfa/mathalfa.sty --- old/tex/latex/mathalfa/mathalfa.sty 2016-03-28 23:52:09.000000000 +0200 +++ new/tex/latex/mathalfa/mathalfa.sty 2017-02-25 00:01:05.000000000 +0100 @@ -1,14 +1,14 @@ \NeedsTeXFormat{LaTeX2e} -\def\mathalfaVersion{1.08} -\def\mathalfaDate{2016/03/25} +\def\mathalfaVersion{1.09} +\def\mathalfaDate{2017/02/23} \ProvidesPackage{mathalfa}[\mathalfaDate\space-\space\mathalfaVersion mathalfa (License LPPL) Michael Sharpe] \RequirePackage{xkeyval} % available choices \def\bb@lst{ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof, libus} -\def\cal@lst{cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams, stix} +\def\cal@lst{cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams, stix,txupr,boondoxupr} \def\frak@lst{euler, lucida, mathpi, mma, mt, esstix, boondox, pxtx} -\def\scr@lst{rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams} +\def\scr@lst{rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal, pxtx, bickham, bickhams,txupr,boondoxupr} \def\mathalfa@bbnr{-1}\def\mathalfa@calnr{-1} \def\mathalfa@fraknr{-1}\def\mathalfa@scrnr{-1} \def\minusone{-1} @@ -61,7 +61,7 @@ %\ifx\mathalfa@scrnr\minusone\else\let\mathscr\relax\fi % Code to set up the math alphabets specified, not necessarily using the fd files % Blackboard Bold -\ifcase\mathalfa@bbnr\relax% item 0 of {ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof} +\ifcase\mathalfa@bbnr\relax% item 0 of {ams, lucida, mathpi, mma, mt, mth, pazo, fourier, esstix, boondox, px, tx, txof,libus} \DeclareFontFamily{U}{msb}{}% \DeclareFontShape{U}{msb}{m}{n}{<-7>\mathalfa@bbscaled msbm5 <7-9>\mathalfa@bbscaled msbm7 @@ -170,7 +170,7 @@ \DeclareMathAlphabet{\mathbb}{U}{libusbb}{m}{n} \fi % \mathcal -\ifcase\mathalfa@calnr\relax% item 0 of {cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx,bickham,stix} +\ifcase\mathalfa@calnr\relax% item 0 of {cm, euler, rsfso, rsfs, lucida, mathpi, mma, mt, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx,bickham,stix,txupr,boondoxupr} \DeclareFontFamily{U}{cmsy}{\skewchar\font48 } \DeclareFontShape{U}{cmsy}{m}{n}{% <-5.5>\mathalfa@calscaled cmsy5% @@ -330,6 +330,24 @@ \DeclareMathAlphabet{\mathcal}{U}{stixcal}{m}{n} \SetMathAlphabet{\mathcal}{bold}{U}{stixcal}{b}{n} \DeclareMathAlphabet{\mathbcal} {U}{stixcal}{b}{n} +\or %txupr + \DeclareFontFamily{U}{TXuprcal}{\skewchar \font =45} + \DeclareFontShape{U}{TXuprcal}{m}{n}{ + <-> \mathalfa@calscaled txUprCal-Regular}{} + \DeclareFontShape{U}{TXuprcal}{b}{n}{ + <-> \mathalfa@calscaled txUprCal-Bold}{} + \DeclareMathAlphabet{\mathcal}{U}{TXuprcal}{m}{n} + \SetMathAlphabet{\mathcal}{bold}{U}{TXuprcal}{b}{n} + \DeclareMathAlphabet{\mathbcal}{U}{TXuprcal}{b}{n} +\or %boondoxupr + \DeclareFontFamily{U}{boondoxuprcal}{\skewchar \font =45} + \DeclareFontShape{U}{boondoxuprcal}{m}{n}{ + <-> \mathalfa@calscaled BOONDOXUprScr-Regular}{} + \DeclareFontShape{U}{boondoxuprcal}{b}{n}{ + <-> \mathalfa@calscaled BOONDOXUprScr-Bold}{} + \DeclareMathAlphabet{\mathcal}{U}{boondoxuprcal}{m}{n} + \SetMathAlphabet{\mathcal}{bold}{U}{boondoxuprcal}{b}{n} + \DeclareMathAlphabet{\mathbcal}{U}{boondoxuprcal}{b}{n} \fi % \mathfrak \ifcase\mathalfa@fraknr\relax% item 0 of {euler, lucida, mathpi, mma, mt, esstix, boondox, pxtx} @@ -399,7 +417,7 @@ \DeclareMathAlphabet{\mathbfrak} {U}{txfrak}{b}{n} \fi % \mathscr -\ifcase\mathalfa@scrnr\relax% item 0 of {rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal} +\ifcase\mathalfa@scrnr\relax% item 0 of {rsfs, rsfso, euler, lucida, mathpi, mma, mtc, zapfc, esstix, boondox, boondoxo, dutchcal,pxtx, bickham, bickhams,txupr,boondoxupr} %rsfs--avoid using mathrsfs so as to avoid rounding of sizes and to get scaling \DeclareFontFamily{U}{rsfs}{\skewchar\font127 } \DeclareFontShape{U}{rsfs}{m}{n}{% @@ -517,6 +535,24 @@ \DeclareMathAlphabet{\mathscr}{U}{bickhamscr}{m}{n} \SetMathAlphabet{\mathscr}{bold}{U}{bickhamscr}{b}{n} \DeclareMathAlphabet{\mathbscr} {U}{bickhamscr}{b}{n} +\or %txupr + \DeclareFontFamily{U}{txuprscr}{\skewchar \font =45} + \DeclareFontShape{U}{txuprscr}{m}{n}{ + <-> \mathalfa@scrscaled txUprCal-Regular}{} + \DeclareFontShape{U}{txuprscr}{b}{n}{ + <-> \mathalfa@scrscaled txUprCal-Bold}{} + \DeclareMathAlphabet{\mathscr}{U}{txuprscr}{m}{n} + \SetMathAlphabet{\mathscr}{bold}{U}{txuprscr}{b}{n} + \DeclareMathAlphabet{\mathbscr}{U}{txuprscr}{b}{n} +\or %boondoxupr + \DeclareFontFamily{U}{Boondoxuprs}{\skewchar \font =45} + \DeclareFontShape{U}{Boondoxuprs}{m}{n}{ + <-> \mathalfa@scrscaled BOONDOXUprScr-Regular}{} + \DeclareFontShape{U}{Boondoxuprs}{b}{n}{ + <-> \mathalfa@scrscaled BOONDOXUprScr-Bold}{} + \DeclareMathAlphabet{\mathscr}{U}{Boondoxuprs}{m}{n} + \SetMathAlphabet{\mathscr}{bold}{U}{Boondoxuprs}{b}{n} + \DeclareMathAlphabet{\mathbscr}{U}{Boondoxuprs}{b}{n} \fi \ifnum\mathalfa@bbnr>-1\relax \def\Bbb{}\let\Bbb\mathbb\fi \ifx\mathbcal\@undefined\def\mathbcal{\PackageError{mathalfa} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathalfa.tlpobj new/tlpkg/tlpobj/mathalfa.tlpobj --- old/tlpkg/tlpobj/mathalfa.tlpobj 2016-04-14 19:25:03.000000000 +0200 +++ new/tlpkg/tlpobj/mathalfa.tlpobj 2017-04-14 17:50:14.000000000 +0200 @@ -1,6 +1,6 @@ name mathalfa category Package -revision 40164 +revision 43332 shortdesc General package for loading maths alphabets in LaTeX relocated 1 longdesc The package provides means of loading maths alphabets (such as @@ -10,7 +10,7 @@ runfiles size=7 RELOC/tex/latex/mathalfa/mathalfa.sty catalogue-ctan /macros/latex/contrib/mathalfa -catalogue-date 2016-03-28 07:37:54 +0200 +catalogue-date 2017-02-24 08:43:41 +0100 catalogue-license lppl1.3 catalogue-topics maths -catalogue-version 1.08 +catalogue-version 1.09 ++++++ mathastext.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathastext/README.md new/doc/latex/mathastext/README.md --- old/doc/latex/mathastext/README.md 2016-05-13 23:21:22.000000000 +0200 +++ new/doc/latex/mathastext/README.md 2016-11-25 19:29:28.000000000 +0100 @@ -14,7 +14,7 @@ Copyright (C) 2011-2016 Jean-Francois Burnol (`jfbu at free dot fr`) - Source: mathastext.dtx 1.3p 2016/05/13 + Source: mathastext.dtx 1.3r 2016/11/06 > cumulative Change Log at bottom of this file. @@ -83,10 +83,15 @@ INSTALLATION ============ +### Using the manager of your TeX installation + +mathastext is in TeXLive and MikTeX. Just use the package manager to upgrade +or install it. + ### From `mathastext.tds.zip` -This is the fastest way: `unzip -d <destfolder> mathastext.tds.zip`, -where `<destfolder>` could be `~/texmf` or (macosx), `~/Library/texmf`. +user install in \$HOME folder: `unzip -d <destfolder> mathastext.tds.zip`, +where `<destfolder>` could be `~/texmf` or on macosx `~/Library/texmf`. ### From `mathastext.dtx` @@ -119,11 +124,28 @@ other options therein. Alternative: pdflatex mathastext.dtx (thrice). This produces the documentation without the source code. -> (One cannot use lualatex/xelatex to compile the documentation.) +> (One cannot use lualatex or xelatex to compile the documentation.) CHANGE LOG ========== +1.3r \[2016/11/06\] +---- + +* documentation tweaks. + +1.3q \[2016/10/31\] +---- + +* new option `unicodeminus`. + +* the `Recent Changes` section of the documentation has been removed as it + was a duplicate of information available in the `Change Log`. + +* some other + changes in the documentation, in particular the use of straight quotes + in verbatim. + 1.3p \[2016/05/13\] ---- @@ -142,7 +164,7 @@ `node` and `base`, and only the latter is functional in math mode. But by default text fonts are declared in mode `node`. Thus `mathastext` now intervenes to make it so that the font it declares in math mode - will use mode `basic`. This fixes issues with for example old style + will use mode `base`. This fixes issues with for example old style figures being used while the text font used lining figures (or vice versa, depending on the font). But see the code comments for more. Binary files old/doc/latex/mathastext/mathastext.pdf and new/doc/latex/mathastext/mathastext.pdf differ Binary files old/doc/latex/mathastext/mathastexttestalphabets.pdf and new/doc/latex/mathastext/mathastexttestalphabets.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathastext.doc.tlpobj new/tlpkg/tlpobj/mathastext.doc.tlpobj --- old/tlpkg/tlpobj/mathastext.doc.tlpobj 2016-05-14 03:23:16.000000000 +0200 +++ new/tlpkg/tlpobj/mathastext.doc.tlpobj 2017-04-14 17:50:14.000000000 +0200 @@ -1,9 +1,9 @@ name mathastext.doc category Package -revision 41096 +revision 42447 shortdesc doc files of mathastext relocated 1 -docfiles size=126 +docfiles size=125 RELOC/doc/latex/mathastext/README.md RELOC/doc/latex/mathastext/mathastext.pdf RELOC/doc/latex/mathastext/mathastexttestalphabets.pdf ++++++ mathastext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathastext/mathastext.sty new/tex/latex/mathastext/mathastext.sty --- old/tex/latex/mathastext/mathastext.sty 2016-05-13 23:21:22.000000000 +0200 +++ new/tex/latex/mathastext/mathastext.sty 2016-11-25 19:33:53.000000000 +0100 @@ -23,7 +23,7 @@ %%---------------------------------------------------------------- %% Package: mathastext %% Info: Use the text font in math mode (JFB) -%% Version: 1.3p 2016/05/13 +%% Version: 1.3r 2016/11/06 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt) %% Copyright (C) 2011-2016 Jean-Francois Burnol <jfbu at free dot fr> %% Examples of use of mathastext: @@ -32,7 +32,7 @@ %%---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2016/05/13 v1.3p Use the text font in math mode (JFB)] + [2016/11/06 v1.3r Use the text font in math mode (JFB)] \let\mst@Umathcharnumdef\Umathcharnumdef \let\mst@Umathcodenum \Umathcodenum \let\mst@Umathcode \Umathcode @@ -200,8 +200,15 @@ \DeclareOption{fouriervec}{\mst@fouriervectrue} \newif\ifmst@subdued \DeclareOption{subdued}{\mst@subduedtrue} -\DeclareOption*{\PackageWarningNoLine{mathastext} - {Unknown option `\CurrentOption\string'}} +\def\mst@unicodeminus {2013} +\def\mst@checkoption #1unicodeminus#2\mst@#3\mst@@ + {\ifx\\#3\\\PackageWarningNoLine{mathastext} + {Unknown option `\CurrentOption\string'}\else + \ifx\\#2\\\def\mst@unicodeminus {2212}\else + \expandafter\def\expandafter\mst@unicodeminus\expandafter{\@secondoftwo#2}% + \fi\fi} +\DeclareOption*% + {\expandafter\mst@checkoption\CurrentOption\mst@ unicodeminus\mst@\mst@@} \ProcessOptions\relax \newmuskip\mst@exists@muskip %% v 1.15e \newmuskip\mst@forall@muskip @@ -1110,7 +1117,7 @@ \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{mtletterfont}{`#1}% \expandafter\mst@addtodo@az\expandafter #1\csname mst@#1\endcsname }% -\@for\mst@tmp:=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\do +\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do {\expandafter\mst@DeclareMathLetter\mst@tmp}% \ifmst@frenchmath \def\mst@font@tbu{mtoperatorfont}% \else \def\mst@font@tbu{mtletterfont}% @@ -1121,7 +1128,7 @@ \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{\mst@font@tbu}{`#1}% \expandafter\mst@addtodo@AZ\expandafter #1\csname mst@#1\endcsname }% -\@for\mst@tmp:=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\do +\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do {\expandafter\mst@DeclareMathLetter\mst@tmp}% \let\mst@DeclareMathLetter\relax %% @@ -1231,7 +1238,7 @@ \else \ifmst@XeOrLua \mst@Umathcharnumdef\mst@minus@sign=\mst@Umathcodenum`\-\relax -%% I used this prior to the new \luatexUmathcodenum, as available with TL2013: +%% I used this prior to the new \luatexUmathcodenum, as available since TL2013: %% \mathchardef\mst@minus@sign=8704\relax % "2200 \else \mathchardef\mst@minus@sign=\mathcode`\-\relax @@ -1249,8 +1256,8 @@ \def\mst@dothe@endashstuff{\edef\mst@tmp@enc{\encodingdefault} \if1\mst@OneifUniEnc \AtBeginDocument{% Unicode engines and font - \mst@Umathcode`\-=2 \symmtoperatorfont "2013\relax - \mst@Umathchardef\mst@varfam@minus=7 \symmtoperatorfont "2013\relax + \mst@Umathcode`\-=2 \symmtoperatorfont "\mst@unicodeminus\relax + \mst@Umathchardef\mst@varfam@minus=7 \symmtoperatorfont "\mst@unicodeminus\relax } \else \ifx\mst@tmp@enc\mst@ti % T1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathastext.tlpobj new/tlpkg/tlpobj/mathastext.tlpobj --- old/tlpkg/tlpobj/mathastext.tlpobj 2016-05-14 03:23:16.000000000 +0200 +++ new/tlpkg/tlpobj/mathastext.tlpobj 2017-04-14 17:50:14.000000000 +0200 @@ -1,6 +1,6 @@ name mathastext category Package -revision 41096 +revision 42447 shortdesc Use the text font in maths mode relocated 1 longdesc The package uses a text font (usually the document's text font) @@ -12,13 +12,13 @@ longdesc fonts are available. The package also offers a simple mechanism longdesc for using many different choices of (text hence, now, maths) longdesc font in the same document. Of course, using one font for two -longdesc purposes helps produce smaller PDF files. The package, running -longdesc under LuaTeX, requires the TeX live 2013 distribution (or -longdesc later). +longdesc purposes helps produce smaller PDF files. The package, if +longdesc running under LuaTeX, requires the TeX live 2013 distribution +longdesc (or later). runfiles size=21 RELOC/tex/latex/mathastext/mathastext.sty catalogue-ctan /macros/latex/contrib/mathastext -catalogue-date 2016-05-13 15:48:16 +0200 +catalogue-date 2016-11-06 20:13:27 +0100 catalogue-license lppl1.3 catalogue-topics font font-maths font-sel -catalogue-version 1.3p +catalogue-version 1.3r ++++++ mathcomp.doc.tar.xz ++++++ ++++++ mathcomp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathcomp.tlpobj new/tlpkg/tlpobj/mathcomp.tlpobj --- old/tlpkg/tlpobj/mathcomp.tlpobj 2016-04-14 19:25:04.000000000 +0200 +++ new/tlpkg/tlpobj/mathcomp.tlpobj 2017-04-14 17:50:14.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/mathcomp/mathcomp.sty catalogue-also textcomp catalogue-ctan /macros/latex/contrib/mathcomp -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-maths catalogue-version 0.1f ++++++ mathdesign.doc.tar.xz ++++++ ++++++ mathdesign.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathdesign.tlpobj new/tlpkg/tlpobj/mathdesign.tlpobj --- old/tlpkg/tlpobj/mathdesign.tlpobj 2016-04-14 19:25:04.000000000 +0200 +++ new/tlpkg/tlpobj/mathdesign.tlpobj 2017-04-14 17:50:15.000000000 +0200 @@ -1256,7 +1256,7 @@ RELOC/tex/latex/mathdesign/omlmdgrdc.fd catalogue-also fourier catalogue-ctan /fonts/mathdesign -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-maths font-supp-maths catalogue-version 2.31 ++++++ mathdots.doc.tar.xz ++++++ ++++++ mathdots.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathdots.tlpobj new/tlpkg/tlpobj/mathdots.tlpobj --- old/tlpkg/tlpobj/mathdots.tlpobj 2016-04-14 19:25:12.000000000 +0200 +++ new/tlpkg/tlpobj/mathdots.tlpobj 2017-04-14 17:50:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/mathdots/mathdots.sty RELOC/tex/generic/mathdots/mathdots.tex catalogue-ctan /macros/generic/mathdots -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 0.9 ++++++ mathexam.doc.tar.xz ++++++ ++++++ mathexam.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathexam.tlpobj new/tlpkg/tlpobj/mathexam.tlpobj --- old/tlpkg/tlpobj/mathexam.tlpobj 2016-04-14 19:25:12.000000000 +0200 +++ new/tlpkg/tlpobj/mathexam.tlpobj 2017-04-14 17:50:18.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/mathexam/mathexam.sty catalogue-ctan /macros/latex/contrib/mathexam -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics exam maths catalogue-version 1.00 ++++++ mathpartir.doc.tar.xz ++++++ ++++++ mathpartir.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathpartir.tlpobj new/tlpkg/tlpobj/mathpartir.tlpobj --- old/tlpkg/tlpobj/mathpartir.tlpobj 2016-04-14 19:25:12.000000000 +0200 +++ new/tlpkg/tlpobj/mathpartir.tlpobj 2017-04-14 17:50:18.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=4 RELOC/tex/latex/mathpartir/mathpartir.sty catalogue-ctan /macros/latex/contrib/mathpartir -catalogue-date 2016-03-02 05:15:12 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics maths catalogue-version 1.3.2 ++++++ mathpazo.doc.tar.xz ++++++ ++++++ mathpazo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathpazo.tlpobj new/tlpkg/tlpobj/mathpazo.tlpobj --- old/tlpkg/tlpobj/mathpazo.tlpobj 2016-04-14 19:25:13.000000000 +0200 +++ new/tlpkg/tlpobj/mathpazo.tlpobj 2017-04-14 17:50:18.000000000 +0200 @@ -19,11 +19,9 @@ longdesc regular and bold weights, other glyphs (Euro and dotlessj) in longdesc upright and slanted shapes in regular and bold weights, and the longdesc uppercase letters commonly used to represent various number -longdesc sets (C, I, N, Q, R, and Z) in blackboard bold. The set also -longdesc includes a set of 'true' small-caps fonts, also suitable for -longdesc use with Palatino (or one of its clones). LaTeX macro support -longdesc (using package mathpazo.sty) is provided in psnfss (a required -longdesc part of any LaTeX distribution). +longdesc sets (C, I, N, Q, R, and Z) in blackboard bold. LaTeX macro +longdesc support (using package mathpazo.sty) is provided in psnfss (a +longdesc required part of any LaTeX distribution). runfiles size=41 RELOC/fonts/afm/public/mathpazo/fplmb.afm RELOC/fonts/afm/public/mathpazo/fplmbb.afm @@ -56,7 +54,7 @@ RELOC/fonts/vf/public/mathpazo/zplmr7y.vf catalogue-also pxfonts newpx tex-gyre-math-pagella catalogue-ctan /fonts/mathpazo -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-maths font-bbd catalogue-version 1.003 ++++++ maths-symbols.doc.tar.xz ++++++ ++++++ mathspec.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/mathspec/README new/doc/xelatex/mathspec/README --- old/doc/xelatex/mathspec/README 2009-10-03 16:59:49.000000000 +0200 +++ new/doc/xelatex/mathspec/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -The mathspec package --------------------- -Font selection for mathematics with XeLaTeX -version 0.2 -Andrew Gilbert Moschou -Wednesday, 30 September 2009 - -This work is released under the LPPL v1.3c or later. - -The mathspec package provides an interface to select ordinary text fonts for -typesetting mathematics with XeLaTeX. - - -The package is developmental and later versions might to be incompatible with -this version. This version is incompatible with earlier versions. The package -requires at least version 0.9995 of XeTeX. - -Implementation --------------- - -\usepackage[<mathspec and fontspec options>]{mathspec} - -End user commands ------------------ - -\setmathsfont(<set>)[<shapes, font features>]{} -\setmathfont(<set>)[<shapes, font features>]{} - -\setmathrm[]{} -\setmathsf[]{} -\setmathtt[]{} -\setmathcal[]{} -\setmathbb[]{} -\setmathfrak[]{} - -\setallmainfonts(<sets>)[]{} -\setprimaryfont[]{} -\setallsansfont[]{} -\setallmonofonts[]{} - -\exchangeforms{<list>} -\normalisevarforms[<list>] -\normalizevarforms[<list>] - -"<character> -\"<string>" -\setminwhitespace - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/mathspec/README.txt new/doc/xelatex/mathspec/README.txt --- old/doc/xelatex/mathspec/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/xelatex/mathspec/README.txt 2016-12-23 00:01:03.000000000 +0100 @@ -0,0 +1,49 @@ +The mathspec package +-------------------- +Font selection for mathematics with XeLaTeX +version 0.2b +Andrew Gilbert Moschou +22 Dec 2016 + +* v0.2b by Will Robertson: a bug fix update for fontspec and the new TU encoding + +This work is released under the LPPL v1.3c or later. + +The mathspec package provides an interface to select ordinary text fonts for +typesetting mathematics with XeLaTeX. + +The package is developmental and later versions might to be incompatible with +this version. This version is incompatible with earlier versions. The package +requires at least version 0.9995 of XeTeX. + +Implementation +-------------- + +\usepackage[<mathspec and fontspec options>]{mathspec} + +End user commands +----------------- + +\setmathsfont(<set>)[<shapes, font features>]{} +\setmathfont(<set>)[<shapes, font features>]{} + +\setmathrm[]{} +\setmathsf[]{} +\setmathtt[]{} +\setmathcal[]{} +\setmathbb[]{} +\setmathfrak[]{} + +\setallmainfonts(<sets>)[]{} +\setprimaryfont[]{} +\setallsansfont[]{} +\setallmonofonts[]{} + +\exchangeforms{<list>} +\normalisevarforms[<list>] +\normalizevarforms[<list>] + +"<character> +\"<string>" +\setminwhitespace + Binary files old/doc/xelatex/mathspec/mathspec.pdf and new/doc/xelatex/mathspec/mathspec.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/mathspec/mathspec.tex new/doc/xelatex/mathspec/mathspec.tex --- old/doc/xelatex/mathspec/mathspec.tex 2009-10-03 16:59:49.000000000 +0200 +++ new/doc/xelatex/mathspec/mathspec.tex 2016-12-23 00:01:03.000000000 +0100 @@ -30,16 +30,51 @@ style=latex,#1}} {} -\setmainfont[Numbers=OldStyle]{Sabon LT Std} -\setallsansfonts[Numbers={OldStyle,Proportional},Scale=MatchLowercase]{Candara} -\setallmonofonts[Numbers=OldStyle,Scale=MatchLowercase]{Consolas} -\setmathsfont(Digits,Latin)[Scale=MatchLowercase]{Bembo MT} -\setmathsfont(Greek)[Scale=MatchLowercase]{STIXGeneral} -\setmathrm{Sabon LT Std} +\linespread{1.05} +\setmainfont[ + Extension = .otf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, + Numbers=OldStyle, + Scale=MatchLowercase, + ]{texgyrepagella} +\setallsansfonts[ + Extension = .otf, + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + Numbers={OldStyle,Proportional}, + Scale=MatchLowercase + ]{UniversalisADFStd} +\setallmonofonts[ + Scale=MatchLowercase, + BoldFont=Inconsolatazi4-Bold.otf, + AutoFakeSlant]{Inconsolatazi4-Regular.otf} +\setmathsfont(Digits,Latin)[ + Scale = 0.85, + Extension = .otf , + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + ]{LibreBaskerville} +\setmathsfont(Greek)[ + Extension = .otf , + UprightFont = *-Regular, + ItalicFont = *-Italic, + BoldFont = *-Bold, + BoldItalicFont = *-BoldItalic, + Scale=MatchLowercase, + ]{STIX} +\setmathrm[Scale=MatchLowercase]{LibreBaskerville-Regular.otf} + \exchangeforms{phi} \setminwhitespace[750] -\newfontfamily\MathematicalPi{Mathematical Pi LT Std} +\newfontfamily\MathematicalPi{STIXMath-Regular.otf} \newcommand\MP[1]{{\MathematicalPi #1}} \makeatletter @@ -132,8 +167,9 @@ pdfsubject={Font selection for mathematics with XeLaTeX}, pdfauthor={Andrew Gilbert Moschou}} -\title{The \textsf{\spotcolor mathspec} package\\[0.25em]\mdseries\itshape\normalsize Font selection for mathematics with \XeLaTeX\\[1ex]\mdseries\upshape version 0.2} -\author{Andrew Gilbert Moschou\\\texttt{andmos(a)gmail.com}} +\title{The \textsf{\spotcolor mathspec} package\\[0.25em]\mdseries\itshape\normalsize Font selection for mathematics with \XeLaTeX\\[1ex]\mdseries\upshape version 0.2b} +\author{Andrew Gilbert Moschou\thanks{v0.2b update by Will Robertson (\texttt{will.robertson@latex-project.org}).}\\\texttt{andmos@gmail.com} +} \makeatletter\let\@today\today\def\today{\scshape\MakeLowercase{\@today}}\makeatother \hyphenation{in-com-pa-ti-ble Hoef-ler ma-the-ma-tics des-pite} @@ -170,7 +206,11 @@ \cmditem{usepackage}\oprm{\sty{mathspec} and \sty{fontspec} options}|{mathspec}| -\noindent To use the package, put \cmd{usepackage}|{mathspec}| in the preamble of the document. It is not necessary to put \cmd{usepackage}|{fontspec}| because \sty{mathspec} will ensure that \sty{fontspec} is loaded anyway. To load \sty{fontspec} with some options, parse them through \sty{mathspec}, for example, \cmd{usepackage}|[quiet]|\permitbreak|{mathspec}| is equivalent to \cmd{usepackage}\permitbreak|[quiet]|\permitbreak|{fontspec}|\cmd{usepackage}|{mathspec}|. +\noindent To use the package, put \cmd{usepackage}|{mathspec}| in the preamble of the document. It is not necessary to put \cmd{usepackage}|{fontspec}| because \sty{mathspec} will ensure that \sty{fontspec} is loaded anyway. To load \sty{fontspec} with some options, parse them through \sty{mathspec}, for example, \cmd{usepackage}|[quiet]|\permitbreak|{mathspec}| is equivalent to: +\begin{verbatim} + \usepackage[quiet]{fontspec} + \usepackage{mathspec} +\end{verbatim} Actually, \sty{mathspec} ordinarily loads \sty{fontspec} with the \opt{no-math} option. To cancel this, explicitly use the \opt{math} option: e.g.\ \cmd{usepackage}|[math]{mathspec}|. @@ -253,6 +293,7 @@ \subsection{Examples} +The following command: \begin{example} \setmathsfont(Digits,Latin,Greek) [Numbers={Lining,Proportional}]{Minion Pro} @@ -265,8 +306,7 @@ \end{example} and indicates that all digits, Latin and Greek characters are to be set in Minion Pro with lining, proportional digits, with digits and uppercase Greek in regular and Latin and lowercase Greek in italic, which are the default shapes. -\bigskip - +The following command: \begin{example} \setmathsfont(Digits,Greek) [Uppercase=Plain,Lowercase=Regular,Scale=MatchLowercase] @@ -353,7 +393,7 @@ \subsection{A further example} -This document is typeset with the following: +This document used to be typeset with the following: \begin{example} \setmainfont[Numbers=OldStyle]{Sabon LT Std} @@ -511,10 +551,10 @@ \begin{table} \begin{tabular}{@{}rl@{}}\topbottomrule -Text & \fontspec{Bembo MT}\itshape abcdefghijklmnopqrstuvwxyz\\ +Text & \fontspec[ItalicFont=LibreBaskerville-Italic.otf]{LibreBaskerville-Regular.otf}\itshape abcdefghijklmnopqrstuvwxyz\\ Mathematics & $\"abcdefghijklmnopqrstuvwxyz"$\\\bottomrule \end{tabular} -\caption{Bembo \acr{MT} in text and spaced mathematics.\label{tab:stix}} +\caption{Libre Baskerville in text and spaced mathematics.\label{tab:stix}} \end{table} \end{ltxsyntax} @@ -523,16 +563,16 @@ \begin{example} \begin{align} "f\left("x\right) &= \sum_{"n = -\infty}^\infty"c_{"n}"e^{\"jnx"} \\ -"c_{"n} &= \frac{1}{2"π}\int_{-"π}^"π"f\left("x\right)"e^{-\"jnx"}\,\mathrm d"x +"c_{"n} &= \frac{1}{2"π}\int_{-"π}^"π"f\bigl("x\bigr)"e^{-\"jnx"}\,\mathrm d"x \end{align} \end{example} \begin{align} "f\left("x\right) &= \sum_{"n = -\infty}^\infty "c_{"n}"e^{\"jnx"}\\ -"c_{"n} &= \frac 1{2"π}\int_{-"π}^{"π}"f\left("x\right)"e^{-\"jnx"}\,\mathrm d"x +"c_{"n} &= \frac 1{2"π}\int_{-"π}^{"π}"f\bigl("x\bigr)"e^{-\"jnx"}\,\mathrm d"x \end{align} -Also note that the spacing is improved by replacing |(x)| with |\left(x\right)| (which you should be doing anyway). +Also note that the spacing is improved by replacing |(x)| with |\bigl(x\bigr)| (which you should be doing anyway). %% changed from \left..\right to \bigl..\bigr (WSPR) \section{Compatability} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathspec.doc.tlpobj new/tlpkg/tlpobj/mathspec.doc.tlpobj --- old/tlpkg/tlpobj/mathspec.doc.tlpobj 2016-04-14 19:25:14.000000000 +0200 +++ new/tlpkg/tlpobj/mathspec.doc.tlpobj 2017-04-14 17:50:19.000000000 +0200 @@ -1,9 +1,9 @@ name mathspec.doc category Package -revision 15878 +revision 42773 shortdesc doc files of mathspec relocated 1 -docfiles size=94 - RELOC/doc/xelatex/mathspec/README +docfiles size=50 + RELOC/doc/xelatex/mathspec/README.txt RELOC/doc/xelatex/mathspec/mathspec.pdf RELOC/doc/xelatex/mathspec/mathspec.tex ++++++ mathspec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/mathspec/mathspec.sty new/tex/xelatex/mathspec/mathspec.sty --- old/tex/xelatex/mathspec/mathspec.sty 2009-10-03 16:59:49.000000000 +0200 +++ new/tex/xelatex/mathspec/mathspec.sty 2016-12-23 00:01:03.000000000 +0100 @@ -1,14 +1,12 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{mathspec} - [2009/09/30 v0.2 LaTeX Package (Mathematics font selection for XeLaTeX)] + [2016/12/22 v0.2b LaTeX Package (Mathematics font selection for XeLaTeX)] -%% Require etoolbox for convenience and amstext for well sized text in maths -%% mode. ifxetex is obvious. +%% Requirements: \RequirePackage{etoolbox} \RequirePackage{amstext} -\RequirePackage{ifxetex} -%% Require a recent XeTeX version. +\RequirePackage{ifxetex} \RequireXeTeX \ifcsundef{XeTeXglyphbounds} {\PackageError{mathspec} @@ -51,7 +49,7 @@ \ifnumcomp{#3}{<}{#1}{\boolfalse{temp}}{\relax}% \ifbool{temp}} -%% Options. +%% Options: \DeclareOption{normalskips} {\PackageWarning{mathspec} {Package option `normalskips' is deprecated}} @@ -70,14 +68,23 @@ \providecommand\currentmathstyle{\relax} -%% Check whether a package is loaded. -%% \eu@package@loaded{<package>} -\newcommand\eu@package@loaded[1]{ - \@ifpackageloaded{#1} - {\eu@booltrue{eu@#1@loaded}} - {\eu@boolfalse{eu@#1@loaded}}} -%% Test for amsmath. Do I need to do this here or at all? -\eu@package@loaded{amsmath} +%% @-namespace fontspec variable: +\ExplSyntaxOn +\def\eu@enc{\g_fontspec_encoding_tl} +\ExplSyntaxOff +%% This is needed to transition to the TU encoding instead of EU1 (WSPR) + +%% Deprecated commands in fontspec: +\ExplSyntaxOn +\tl_set:Nn \zf@enc { \g_fontspec_encoding_tl } +\cs_set:Npn \zf@fontspec #1 #2 + { + \fontspec_select:nn {#1} {#2} + \tl_set:Nn \zf@family { \l_fontspec_family_tl } + \tl_set:Nn \zf@basefont { \l_fontspec_font } + } +\ExplSyntaxOff +%% These are still defined in fontspec at time of writing but maybe be removed in the future. (WSPR) %% Define the undefined Greek letters. Include all variant forms (same as normal %% forms if variant forms are unavailable). Latin F for digamma is better than @@ -97,15 +104,12 @@ \DeclareMathSymbol{\Chi}{\mathalpha}{operators}{"58} \DeclareMathSymbol{\omicron}{\mathord}{letters}{"6F} \let\varbeta\beta -\ifdef{\varkappa} - {\relax} +\ifdef{\varkappa}{\relax} {\let\varkappa\kappa} -\ifdef{\varTheta} - {\let\eu@cm@varTheta\varTheta} +\ifdef{\varTheta}{\let\eu@cm@varTheta\varTheta} {\relax} \let\varTheta\Theta -\ifdef{\digamma} - {\let\Digamma\digamma} +\ifdef{\digamma}{\let\Digamma\digamma} {\DeclareMathSymbol{\Digamma}{\mathalpha}{operators}{"46} \DeclareMathSymbol{\digamma}{\mathord}{letters}{"46}} @@ -257,7 +261,7 @@ \eu@boolfalse{Digits} \fi \eu@ifsomebooltrue{Digits} - {\DeclareSymbolFont{Digits:m:n}{EU1}{\eu@Digitsmathsfont}{m}{n}} + {\DeclareSymbolFont{Digits:m:n}{\eu@enc}{\eu@Digitsmathsfont}{m}{n}} \eu@ifbooltrue{Digits} {\fontfamily\eu@Digitsmathsfont\selectfont \DeclareMathSymbol{0}{\mathord}{\eu@DigitsArabic@symfont}{`0} @@ -298,8 +302,8 @@ \eu@boolfalse{LatinLowercase} \fi \eu@ifsomebooltrue{LatinUppercase,LatinLowercase} - {\DeclareSymbolFont{Latin:m:n}{EU1}{\eu@Latinmathsfont}{m}{n} - \DeclareSymbolFont{Latin:m:it}{EU1}{\eu@Latinmathsfont}{m}{it}} + {\DeclareSymbolFont{Latin:m:n}{\eu@enc}{\eu@Latinmathsfont}{m}{n} + \DeclareSymbolFont{Latin:m:it}{\eu@enc}{\eu@Latinmathsfont}{m}{it}} \eu@ifbooltrue{LatinUppercase} {\fontfamily\eu@Latinmathsfont\selectfont \DeclareMathSymbol{A}{\mathalpha}{\eu@LatinUppercase@symfont}{`A} @@ -384,8 +388,8 @@ \eu@boolfalse{GreekLowercase} \fi \eu@ifsomebooltrue{GreekUppercase,GreekLowercase} - {\DeclareSymbolFont{Greek:m:n}{EU1}{\eu@Greekmathsfont}{m}{n} - \DeclareSymbolFont{Greek:m:it}{EU1}{\eu@Greekmathsfont}{m}{it}} + {\DeclareSymbolFont{Greek:m:n}{\eu@enc}{\eu@Greekmathsfont}{m}{n} + \DeclareSymbolFont{Greek:m:it}{\eu@enc}{\eu@Greekmathsfont}{m}{it}} \eu@ifbooltrue{GreekUppercase} {\fontfamily\eu@Greekmathsfont\selectfont \XeTeXDeclareMathSymbol{Α}{\mathalpha}{\eu@GreekUppercase@symfont}{`Α}[\Alpha] @@ -932,34 +936,34 @@ \ernewcommand\setmathrm[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathrm\zf@family - \DeclareMathAlphabet{\mathrm}{EU1}{\eu@mathrm}{m}{n} - \SetMathAlphabet{\mathrm}{bold}{EU1}{\eu@mathrm}{bx}{n} - \DeclareMathAlphabet{\mathit}{EU1}{\eu@mathrm}{m}{it} - \DeclareMathAlphabet{\mathbf}{EU1}{\eu@mathrm}{bx}{n} - \SetMathAlphabet{\mathit}{bold}{EU1}{\eu@mathrm}{bx}{it} - \DeclareSymbolFont{Operators:m:n}{EU1}{\eu@mathrm}{m}{n} + \DeclareMathAlphabet{\mathrm}{\eu@enc}{\eu@mathrm}{m}{n} + \SetMathAlphabet{\mathrm}{bold}{\eu@enc}{\eu@mathrm}{bx}{n} + \DeclareMathAlphabet{\mathit}{\eu@enc}{\eu@mathrm}{m}{it} + \DeclareMathAlphabet{\mathbf}{\eu@enc}{\eu@mathrm}{bx}{n} + \SetMathAlphabet{\mathit}{bold}{\eu@enc}{\eu@mathrm}{bx}{it} + \DeclareSymbolFont{Operators:m:n}{\eu@enc}{\eu@mathrm}{m}{n} \def\operator@font{\expandafter\mathgroup\csname symOperators:m:n\endcsname}} \ernewcommand\setmathcal[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathcal\zf@family - \DeclareMathAlphabet{\mathcal}{EU1}{\eu@mathcal}{m}{n}} + \DeclareMathAlphabet{\mathcal}{\eu@enc}{\eu@mathcal}{m}{n}} \ernewcommand\setmathsf[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathsf\zf@family - \DeclareMathAlphabet{\mathsf}{EU1}{\eu@mathsf}{m}{n} - \SetMathAlphabet{\mathsf}{bold}{EU1}{\eu@mathsf}{bx}{n}} + \DeclareMathAlphabet{\mathsf}{\eu@enc}{\eu@mathsf}{m}{n} + \SetMathAlphabet{\mathsf}{bold}{\eu@enc}{\eu@mathsf}{bx}{n}} \ernewcommand\setmathtt[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathtt\zf@family - \DeclareMathAlphabet{\mathtt}{EU1}{\eu@mathtt}{m}{n}} + \DeclareMathAlphabet{\mathtt}{\eu@enc}{\eu@mathtt}{m}{n}} \ernewcommand\setmathfrak[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathfrak\zf@family - \DeclareMathAlphabet{\mathfrak}{EU1}{\eu@mathfrak}{m}{n}} + \DeclareMathAlphabet{\mathfrak}{\eu@enc}{\eu@mathfrak}{m}{n}} \ernewcommand\setmathbb[2][]{ \zf@fontspec{#1}{#2} \let\eu@mathbb\zf@family - \DeclareMathAlphabet{\mathbb}{EU1}{\eu@mathbb}{m}{n}} + \DeclareMathAlphabet{\mathbb}{\eu@enc}{\eu@mathbb}{m}{n}} %% If amsmath is loaded, it must be loaded before mathspec. Checking for its %% existence \AtBeginDocument is too late because the damage is already done @@ -988,14 +992,10 @@ %% conditions of the LaTeX Project Public License, either version 1.3c %% 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 recent distributions of LaTeX. %% %% This work has the LPPL maintenance status ‘maintained’. -%% %% The Current Maintainer of this work is Andrew Gilbert Moschou. -%% -%% This work consists of the files mathspec.sty and mathsepc4.tex. +%% This work consists of the files mathspec.sty and mathspec.tex. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathspec.tlpobj new/tlpkg/tlpobj/mathspec.tlpobj --- old/tlpkg/tlpobj/mathspec.tlpobj 2016-04-14 19:25:14.000000000 +0200 +++ new/tlpkg/tlpobj/mathspec.tlpobj 2017-04-14 17:50:19.000000000 +0200 @@ -1,6 +1,6 @@ name mathspec category Package -revision 15878 +revision 42773 shortdesc Specify arbitrary fonts for mathematics in XeTeX relocated 1 longdesc The mathspec package provides an interface to typeset @@ -12,7 +12,7 @@ runfiles size=11 RELOC/tex/xelatex/mathspec/mathspec.sty catalogue-ctan /macros/xetex/latex/mathspec -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-12-23 08:58:28 +0100 catalogue-license lppl catalogue-topics font-maths font-sel -catalogue-version 0.2 +catalogue-version 0.2b ++++++ mathspic.doc.tar.xz ++++++ ++++++ mathspic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathspic.tlpobj new/tlpkg/tlpobj/mathspic.tlpobj --- old/tlpkg/tlpobj/mathspic.tlpobj 2016-04-14 19:25:19.000000000 +0200 +++ new/tlpkg/tlpobj/mathspic.tlpobj 2017-04-14 17:50:21.000000000 +0200 @@ -20,7 +20,7 @@ texmf-dist/scripts/mathspic/mathspic.pl texmf-dist/tex/latex/mathspic/mathspic.sty catalogue-ctan /graphics/mathspic -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 catalogue-version 1.13 ++++++ mathtools.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathtools/README new/doc/latex/mathtools/README --- old/doc/latex/mathtools/README 2015-11-12 23:18:09.000000000 +0100 +++ new/doc/latex/mathtools/README 2017-06-06 23:53:26.000000000 +0200 @@ -39,6 +39,7 @@ gathered environments. -- Math versions of \makebox, \llap, \rlap etc. -- Cramped math styles. + -- Macro generators. -- and more... mathtools requires mhsetup. @@ -63,8 +64,9 @@ ======= The mhsetup package defines various programming tools needed by -both empheq and mathtools. In the future, most of these tools will -probably be an integral part of LaTeX3. +both empheq and mathtools. The syntax is the same as for expl3, +but there is no code overlap (anymore as of May 2017). +In the future, most of these tools will probably be an integral part of LaTeX3 (they were). BUG REPORTS @@ -79,4 +81,4 @@ Please report bugs to daleif(a)math.au.dk =========== -This README file was last revised 2015/05/11. +This README file was last revised 2017/05/24. Binary files old/doc/latex/mathtools/empheq.pdf and new/doc/latex/mathtools/empheq.pdf differ Binary files old/doc/latex/mathtools/mathtools.pdf and new/doc/latex/mathtools/mathtools.pdf differ Binary files old/doc/latex/mathtools/mhsetup.pdf and new/doc/latex/mathtools/mhsetup.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathtools.doc.tlpobj new/tlpkg/tlpobj/mathtools.doc.tlpobj --- old/tlpkg/tlpobj/mathtools.doc.tlpobj 2016-04-14 19:25:20.000000000 +0200 +++ new/tlpkg/tlpobj/mathtools.doc.tlpobj 2017-06-07 02:21:50.000000000 +0200 @@ -1,9 +1,9 @@ name mathtools.doc category Package -revision 38833 +revision 44504 shortdesc doc files of mathtools relocated 1 -docfiles size=242 +docfiles size=243 RELOC/doc/latex/mathtools/README RELOC/doc/latex/mathtools/empheq.pdf RELOC/doc/latex/mathtools/mathtools.pdf ++++++ mathtools.tar.xz ++++++ ++++ 2148 lines of diff (skipped) ++++++ matlab-prettifier.doc.tar.xz ++++++ ++++++ matlab-prettifier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/matlab-prettifier.tlpobj new/tlpkg/tlpobj/matlab-prettifier.tlpobj --- old/tlpkg/tlpobj/matlab-prettifier.tlpobj 2016-04-14 19:25:21.000000000 +0200 +++ new/tlpkg/tlpobj/matlab-prettifier.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/matlab-prettifier/matlab-prettifier.sty catalogue-also matlabweb catalogue-ctan /macros/latex/contrib/matlab-prettifier -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 catalogue-version 0.3 ++++++ mattens.doc.tar.xz ++++++ ++++++ mattens.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mattens.tlpobj new/tlpkg/tlpobj/mattens.tlpobj --- old/tlpkg/tlpobj/mattens.tlpobj 2016-04-14 19:25:22.000000000 +0200 +++ new/tlpkg/tlpobj/mattens.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/mattens/mattens.sty catalogue-ctan /macros/latex/contrib/mattens -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths engineering catalogue-version 1.3 ++++++ maybemath.doc.tar.xz ++++++ ++++++ maybemath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/maybemath.tlpobj new/tlpkg/tlpobj/maybemath.tlpobj --- old/tlpkg/tlpobj/maybemath.tlpobj 2016-04-14 19:25:22.000000000 +0200 +++ new/tlpkg/tlpobj/maybemath.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -18,6 +18,6 @@ runfiles size=1 RELOC/tex/latex/maybemath/maybemath.sty catalogue-ctan /macros/latex/contrib/maybemath -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths font-sel ++++++ mbenotes.doc.tar.xz ++++++ ++++++ mbenotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mbenotes.tlpobj new/tlpkg/tlpobj/mbenotes.tlpobj --- old/tlpkg/tlpobj/mbenotes.tlpobj 2016-04-14 19:25:23.000000000 +0200 +++ new/tlpkg/tlpobj/mbenotes.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=10 RELOC/tex/latex/mbenotes/mbenotes.sty catalogue-ctan /macros/latex/contrib/mbenotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics notes catalogue-version 2 ++++++ mcaption.doc.tar.xz ++++++ ++++++ mcaption.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mcaption.tlpobj new/tlpkg/tlpobj/mcaption.tlpobj --- old/tlpkg/tlpobj/mcaption.tlpobj 2016-04-14 19:25:23.000000000 +0200 +++ new/tlpkg/tlpobj/mcaption.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/mcaption/mcaption.sty catalogue-ctan /macros/latex/contrib/mcaption -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption catalogue-version 3.0 ++++++ mceinleger.doc.tar.xz ++++++ ++++++ mceinleger.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mceinleger.tlpobj new/tlpkg/tlpobj/mceinleger.tlpobj --- old/tlpkg/tlpobj/mceinleger.tlpobj 2016-04-14 19:25:23.000000000 +0200 +++ new/tlpkg/tlpobj/mceinleger.tlpobj 2017-04-14 17:50:22.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/mceinleger/mceinleger.sty catalogue-also cdcover catalogue-ctan /macros/latex/contrib/mceinleger -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics covers ++++++ mcf2graph.doc.tar.xz ++++++ ++++ 5138 lines of diff (skipped) ++++++ mcf2graph.tar.xz ++++++ ++++ 1943 lines of diff (skipped) ++++++ mcite.doc.tar.xz ++++++ ++++++ mcite.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mcite.tlpobj new/tlpkg/tlpobj/mcite.tlpobj --- old/tlpkg/tlpobj/mcite.tlpobj 2016-04-14 19:25:24.000000000 +0200 +++ new/tlpkg/tlpobj/mcite.tlpobj 2017-04-14 17:50:23.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/mcite/mcite.sty catalogue-ctan /macros/latex/contrib/mcite -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics cite-supp catalogue-version 1.6 ++++++ mciteplus.doc.tar.xz ++++++ ++++++ mciteplus.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mciteplus.tlpobj new/tlpkg/tlpobj/mciteplus.tlpobj --- old/tlpkg/tlpobj/mciteplus.tlpobj 2016-04-14 19:25:25.000000000 +0200 +++ new/tlpkg/tlpobj/mciteplus.tlpobj 2017-04-14 17:50:23.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/bibtex/bst/mciteplus/apsrmpM.bst RELOC/tex/latex/mciteplus/mciteplus.sty catalogue-ctan /macros/latex/contrib/mciteplus -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cite-supp catalogue-version 1.2 ++++++ mcmthesis.doc.tar.xz ++++++ ++++++ mcmthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mcmthesis.tlpobj new/tlpkg/tlpobj/mcmthesis.tlpobj --- old/tlpkg/tlpobj/mcmthesis.tlpobj 2016-04-14 19:25:26.000000000 +0200 +++ new/tlpkg/tlpobj/mcmthesis.tlpobj 2017-04-14 17:50:23.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/mcmthesis/mcmthesis.cls catalogue-ctan /macros/latex/contrib/mcmthesis -catalogue-date 2016-02-01 08:18:51 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class catalogue-version 6.2 ++++++ mdframed.doc.tar.xz ++++++ ++++++ mdframed.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mdframed.tlpobj new/tlpkg/tlpobj/mdframed.tlpobj --- old/tlpkg/tlpobj/mdframed.tlpobj 2016-04-14 19:25:28.000000000 +0200 +++ new/tlpkg/tlpobj/mdframed.tlpobj 2017-04-14 17:50:24.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/mdframed/mdframed.sty catalogue-also framed catalogue-ctan /macros/latex/contrib/mdframed -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing box-breaking decoration catalogue-version 1.9b ++++++ mdputu.doc.tar.xz ++++++ ++++++ mdputu.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mdputu.tlpobj new/tlpkg/tlpobj/mdputu.tlpobj --- old/tlpkg/tlpobj/mdputu.tlpobj 2016-04-14 19:25:28.000000000 +0200 +++ new/tlpkg/tlpobj/mdputu.tlpobj 2017-04-14 17:50:24.000000000 +0200 @@ -21,7 +21,7 @@ RELOC/tex/latex/mdputu/ot1mdputu.fd RELOC/tex/latex/mdputu/t1mdputu.fd catalogue-ctan /fonts/mdputu -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-maths font-virtual catalogue-version 1.2 ++++++ mdsymbol.doc.tar.xz ++++++ ++++++ mdsymbol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mdsymbol.tlpobj new/tlpkg/tlpobj/mdsymbol.tlpobj --- old/tlpkg/tlpobj/mdsymbol.tlpobj 2016-04-14 19:25:28.000000000 +0200 +++ new/tlpkg/tlpobj/mdsymbol.tlpobj 2017-04-14 17:50:24.000000000 +0200 @@ -107,7 +107,7 @@ RELOC/fonts/type1/public/mdsymbol/MdSymbolF-Semibold.pfb RELOC/tex/latex/mdsymbol/mdsymbol.sty catalogue-ctan /fonts/mdsymbol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font-symbol font-symbol-maths font-mf font-type1 font-otf catalogue-version 0.5 ++++++ mdwtools.doc.tar.xz ++++++ ++++++ mdwtools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mdwtools.tlpobj new/tlpkg/tlpobj/mdwtools.tlpobj --- old/tlpkg/tlpobj/mdwtools.tlpobj 2016-04-14 19:25:32.000000000 +0200 +++ new/tlpkg/tlpobj/mdwtools.tlpobj 2017-04-14 17:50:26.000000000 +0200 @@ -24,7 +24,7 @@ RELOC/tex/latex/mdwtools/sverb.sty RELOC/tex/latex/mdwtools/syntax.sty catalogue-ctan /macros/latex/contrib/mdwtools -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics list-supp notes footnote syntax maths macro-supp table verbatim catalogue-version 1.05.4 ++++++ media9.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/media9/ChangeLog new/doc/latex/media9/ChangeLog --- old/doc/latex/media9/ChangeLog 2016-03-24 23:27:10.000000000 +0100 +++ new/doc/latex/media9/ChangeLog 2017-04-26 00:27:45.000000000 +0200 @@ -1,3 +1,61 @@ +2017-04-25 + * v0.79 : media9.sty + * v0.14 : pdfbase.sty + * fix: improved A-Reader-related workaround for annotations/links + located on OCGs + +2017-03-23 + * v0.78 : media9.sty + * v0.13 : pdfbase.sty + * fix: ocg-related improvements + +2017-03-16 + * v0.77 : media9.sty + * v0.12 : pdfbase.sty + * fix: PDF annotation and Form XObject producing macros improved + +2017-02-08 + * v0.76 : media9.sty + * fix: error in the caption of Fig. 8, documentation `media9.pdf' rebuilt + +2017-02-03 + * v0.75 : media9.sty + * fix: RTL related (luaTeX) + +2017-01-30 + * v0.74 : media9.sty + * fix: usability in righ-to-left typesetting context + +2017-01-24 + * v0.73 : media9.sty + * v0.13 : pdfbase.sty + * fix: pdfbase.sty: xform generation via dvips: rescale oversized boxes to + fit within papersize to prevent cropping + +2017-01-10 + * v0.72 : media9.sty + * v0.12 : pdfbase.sty + * fix: pdfbase.sty, media9.sty: `landscape' environment: + drivers XeTeX and dvipdfmx also supported + +2017-01-09 + * v0.71 : media9.sty + * v0.11 : pdfbase.sty + * fix: pdfbase.sty: support for `landscape' environment of + the pdflscape/lscape packages + +2016-11-08 + * v0.70 : media9.sty + * v0.10 : pdfbase.sty + * fix: pdfbase.sty & pdftex: sometimes, incorrect page ressources + for marked content were written when using \pbs_pdfbdc:nn; + reported by _FrnchFrgg_ + +2016-06-08 + * v0.69 : media9.sty + * v0.9 : pdfbase.sty + * fix: incompatibility with LuaTeX 0.95.0 + 2016-03-22 * v0.68 : media9.sty * v0.8 : pdfbase.sty Binary files old/doc/latex/media9/media9.pdf and new/doc/latex/media9/media9.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/media9.doc.tlpobj new/tlpkg/tlpobj/media9.doc.tlpobj --- old/tlpkg/tlpobj/media9.doc.tlpobj 2016-04-14 19:25:33.000000000 +0200 +++ new/tlpkg/tlpobj/media9.doc.tlpobj 2017-04-26 02:08:12.000000000 +0200 @@ -1,9 +1,9 @@ name media9.doc category Package -revision 40124 +revision 44045 shortdesc doc files of media9 relocated 1 -docfiles size=885 +docfiles size=941 RELOC/doc/latex/media9/ChangeLog RELOC/doc/latex/media9/README RELOC/doc/latex/media9/media9.pdf ++++++ media9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/media9/media9.sty new/tex/latex/media9/media9.sty --- old/tex/latex/media9/media9.sty 2016-03-24 23:27:10.000000000 +0100 +++ new/tex/latex/media9/media9.sty 2017-04-26 00:27:45.000000000 +0200 @@ -39,10 +39,9 @@ \RequirePackage{l3keys2e} \RequirePackage{xparse} \RequirePackage{atbegshi} -\RequirePackage{atenddvi} -\def\g@mix@date@tl{2016/03/22} -\def\g@mix@version@tl{0.68} +\def\g@mix@date@tl{2017/04/25} +\def\g@mix@version@tl{0.79} \def\g@mix@liiikerneldate{2015/09/27} \def\g@mix@liiipkgdate{2015/09/27} @@ -328,7 +327,7 @@ \cs_set_eq:NN\mix_pdfannot:nnnn\pbs_pdfannot:nnnn \cs_set_eq:NN\mix_appendtofields:n\pbs_appendtofields:n \cs_set_eq:NN\mix_pdflink:nn \pbs_pdflink:nn -\cs_new:Nn\mix_pdfxform:n{\pbs_pdfxform:nnn{1}{1}{#1}} +\cs_new:Nn\mix_pdfxform:n{\pbs_pdfxform:nnnnn{1}{1}{}{}{#1}} \cs_set_eq:NN\mix_pdfximage:n \pbs_pdfximage:n \cs_set_eq:NN\mix_pdfcatalog:n \pbs_pdfcatalog:n @@ -379,15 +378,24 @@ }{ \sys_if_engine_luatex:TF{ \RequirePackage{pdftexcmds} - \cs_new:Nn\mix_filemdfivesum:n{\pdf@filemdfivesum{#1}} - \cs_new:Nn\mix_unescapehex:n{<#1>} + \cs_new_nopar:Nn\mix_filemdfivesum:n{\pdf@filemdfivesum{#1}} + %\cs_new:Nn\mix_unescapehex:n{<#1>} + \cs_new_nopar:Nn\mix_unescapehex:n{(\pdf@unescapehex{#1})} }{ - \cs_new:Nn\mix_filemdfivesum:n{#1} + \cs_if_exist:NTF\mdfivesum{ + \cs_new_nopar:Nn\mix_filemdfivesum:n{\mdfivesum file {#1}} + }{ + \cs_new_nopar:Nn\mix_filemdfivesum:n{#1} + } } } %creating global definitions \cs_new:Npn\mix@newkey#1#2{\tl_gset:cx{#1}{#2}} +\AtBeginDocument{ + \iow_now:Nx\@mainaux{ + \token_to_str:N\providecommand\token_to_str:N\mix@newkey[2]{}} +} %macros for writing global defs to \jobname.aux \msg_set:nnn{media9}{rerun}{Rerun~to~get~internal~references~right!} @@ -427,24 +435,6 @@ } } -\cs_gset_eq:NN\mix_atenddvi_checkimpl_orig:\AtEndDvi@CheckImpl% -\def\AtEndDvi@CheckImpl{ - \mix_atenddvi_checkimpl_orig: - \cs_if_exist:NTF\AtEndDvi@LastPage{ - \int_compare:nF{\AtEndDvi@LastPage=\value{abspage}}{ - \cs_if_exist:NF\g_mix_rerunwarned_tl{ - \tl_new:N\g_mix_rerunwarned_tl - \msg_warning:nn{media9}{rerun} - } - } - }{ - \cs_if_exist:NF\g_mix_rerunwarned_tl{ - \tl_new:N\g_mix_rerunwarned_tl - \msg_warning:nn{media9}{rerun} - } - } -} - %reset various variables for every new media inclusion \cs_new:Nn\mix_reset:{ \tl_gset:Nx\g_mix_label_tl{rm@\int_use:N\g_mix_rmcnt_int} @@ -881,10 +871,23 @@ } \ExplSyntaxOn +%environment for setting LTR typesetting direction with e-TeX based engines +\cs_new:Nn\mix_beginLTR:{ + \cs_if_exist:NT\TeXXeTstate{ + \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL} + } +} +\cs_new:Nn\mix_endLTR:{ + \cs_if_exist:NT\TeXXeTstate{ + \int_compare:nT{\TeXXeTstate>\c_zero}{\endL} + } +} + \ior_new:N\l_mix_vfile_stream %file stream for 3D views files \NewDocumentCommand\includemedia{O{}mm}{%#1 options, #2 text/image #3 media file \mix_uriend: \group_begin: + \mix_beginLTR: \leavevmode %empty stream as appearance dummy \cs_if_exist:NF\g_mix_appearance_tl{ @@ -1131,7 +1134,7 @@ % #1:width, #2:height, #3:depth, #4:content (key-value) \mix_pdfannot:nnnn{\g_mix_wd_tl}{\g_mix_ht_tl}{\g_mix_dp_tl}{ /Subtype/RichMedia - /F~4\cs_if_exist_use:N\ocgxii@insert@OC + /F~4 /BS~<</W~0/S/S>> /Contents~(media~embedded~by~media9~[\g_mix_version_tl~(\g_mix_date_tl)]) /NM~(\g_mix_label_tl) @@ -1191,21 +1194,24 @@ }{%insert play button overlay \mix_insert_btnocg: %create OCG \cs_gset_eq:Nc\mix_pbtn:NN{g@mix@pbtn@\g_mix_usrpbtn_tl @tl} - %\hbox_set:Nn\l_mix_pbtn_box{\mix_pbtn:NN\g_mix_wd_tl\g_mix_tt_tl} - \sbox\l_mix_pbtn_box{\mix_pbtn:NN\g_mix_wd_tl\g_mix_tt_tl} - \box_move_down:nn{\g_mix_dp_tl}{ - \hbox_to_wd:nn{\g_mix_wd_tl}{ - \vbox_to_ht:nn{\g_mix_tt_tl}{ - \vss - \ocgbase_oc_bdc:n{\g_mix_btnocg_tl} - \box_use:N\l_mix_pbtn_box - \ocgbase_oc_emc: + \group_begin: + \cs_if_exist:NT\textdir{\textdir TLT} + \sbox\l_mix_pbtn_box{\mix_pbtn:NN\g_mix_wd_tl\g_mix_tt_tl} + \box_move_down:nn{\g_mix_dp_tl}{ + \hbox_to_wd:nn{\g_mix_wd_tl}{ + \vbox_to_ht:nn{\g_mix_tt_tl}{ + \vss + \ocgbase_oc_bdc:n{\g_mix_btnocg_tl} + \box_use:N\l_mix_pbtn_box + \ocgbase_oc_emc: + } } } - } + \group_end: } \int_gincr:N\g_mix_rmcnt_int } + \mix_endLTR: \group_end: } \tl_set_eq:NN\l_mix_includemedia_tl\includemedia @@ -2177,16 +2183,16 @@ tooltip .value_required:n = {true}, overface .code:n = { - %\hbox_set:Nn\l_mix_poster_box{#1} - \sbox\l_mix_poster_box{#1} + \sbox\l_mix_poster_box{ + \bool_if:NTF\g_pbs_lscape_bool{\rotatebox{90}{#1}}{#1}} \mix_pdfxform:n{\l_mix_poster_box} \tl_gset:Nx\g_mix_overbtn_tl{\mix_pdflastxform:} }, overface .value_required:n = {true}, downface .code:n = { - %\hbox_set:Nn\l_mix_poster_box{#1} - \sbox\l_mix_poster_box{#1} + \sbox\l_mix_poster_box{ + \bool_if:NTF\g_pbs_lscape_bool{\rotatebox{90}{#1}}{#1}} \mix_pdfxform:n{\l_mix_poster_box} \tl_gset:Nx\g_mix_downbtn_tl{\mix_pdflastxform:} }, @@ -2353,6 +2359,7 @@ \NewDocumentCommand\mediabutton{O{}m}{%#1 options, #2 normal button text \mix_uriend: \group_begin: + \mix_beginLTR: \leavevmode %reset various variables \tl_gclear:N\g_mix_overbtn_tl @@ -2372,22 +2379,16 @@ \tl_set:Nx\height{\dim_use:N\box_ht:N\l_mix_poster_box} \tl_set:Nx\depth {\dim_use:N\box_dp:N\l_mix_poster_box} \bool_if:NTF\g_mix_btndraft_bool{\box_use:N\l_mix_poster_box}{ + \sbox\l_mix_poster_box{\bool_if:NTF\g_pbs_lscape_bool{\rotatebox{90}{ + \box_use:N\l_mix_poster_box}}{\box_use:N\l_mix_poster_box}} \mix_pdfxform:n{\l_mix_poster_box} \tl_set:Nx\g_mix_normalbtn_tl{\mix_pdflastxform:} - \bool_if:nT{ %dummy Widget for ocgx2, AR seems to need it -% \cs_if_exist_p:N\ocgxii@insert@OC && !\tl_if_blank_p:V\ocgxii@insert@OC - !\cs_if_exist:NTF\ocgxii@insert@OC{ - \tl_if_blank_p:V\ocgxii@insert@OC - }{ - \c_true_bool - } - }{\mix_pdfannot:nnnn{\width}{\height}{\depth}{/Subtype/Widget/F~2}} %insert widget annotation \mix_pdfannot:nnnn{\width}{\height}{\depth}{ /Subtype/Widget /T~(mbtn@\int_use:N\g_mix_mbtncnt_int) \tl_if_empty:NF\g_mix_tooltip_tl{/TU~(\g_mix_tooltip_tl)} - /FT/Btn/Ff~65536\cs_if_exist_use:N\ocgxii@insert@OC + /FT/Btn/Ff~65536 \tl_if_empty:NTF\g_mix_downbtn_tl{/H/I}{/H/P} /AP~<< /N~\g_mix_normalbtn_tl @@ -2412,7 +2413,9 @@ } \int_gincr:N\g_mix_mbtncnt_int } + \mix_endLTR: \group_end: } \tl_set_eq:NN\l_mix_mediabutton_tl\mediabutton \tl_set:Nn\mediabutton{\mix_uribegin:\l_mix_mediabutton_tl} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/media9/pdfbase.sty new/tex/latex/media9/pdfbase.sty --- old/tex/latex/media9/pdfbase.sty 2016-03-24 23:27:10.000000000 +0100 +++ new/tex/latex/media9/pdfbase.sty 2017-04-26 00:27:45.000000000 +0200 @@ -67,10 +67,12 @@ % % -------- % -% \pbs_pdfxform:nnn -% #1: add pgf/tikz transparency, shading etc. resources? (1|0) -% #2: used as PDF annotation appearance? (1|0) -% #3: savebox number +% \pbs_pdfxform:nnnnn +% #1: add pgf/tikz resources (transparency, shading)? (1|0) %dvipdfmx/xetex +% #2: used as PDF annotation appearance? (1|0) %dvips/pdftex +% #3: additional resources %all BUT dvips +% #4: additional dictionary entries +% #5: savebox number % creates PDF Form XObject from savebox content % % \pbs_pdflastxform: @@ -105,6 +107,12 @@ % ... \pbs_pdfemc: % #1: tag, #2: properties dictionary obj ID % +% -------- +% +% alternative \AtEndDvi +% \pbs_at_end_dvi:n +% #1: \specials or \write to be inserted on the very last page +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This work may be distributed and/or modified under the @@ -121,15 +129,26 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\RequirePackage{atbegshi} -\RequirePackage{atenddvi} -\def\g@pbs@date@tl{2016/03/22} -\def\g@pbs@version@tl{0.8} +\def\g@pbs@date@tl{2017/03/23} +\def\g@pbs@version@tl{0.14} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} +\int_new:N\g_pbs_page_int %abs. page counter + +%creating global definitions +\cs_new:Npn\pbs@newkey#1#2{\tl_gset:cx{#1}{#2}} + +\msg_set:nnn{pdfbase}{rerun}{Rerun~to~get~internal~references~right!} + +%LaTeX2e wrapper +\cs_new_nopar:Npn\pbs@seq@push@cx#1#2{ + \seq_if_exist:cF{#1}{\seq_new:c{#1}} + \seq_gput_right:cx{#1}{#2} +} + %wrong image file type for Image XObject generation \msg_gset:nnn{pdfbase}{wrong~image~resource}{ Image~resource~file\\~~'#1'\\has~wrong~type.\\\\ @@ -144,7 +163,43 @@ } } +% page (bop, eop) hooks +\cs_new:Nn\pbs_bop_action:n{\seq_gput_right:Nn\g_pbs_bop_seq{#1}} +\cs_new:Nn\pbs_eop_action:n{\seq_gput_right:Nn\g_pbs_eop_seq{#1}} +\seq_new:N\g_pbs_bop_seq +\seq_new:N\g_pbs_eop_seq + +% own AtEndDvi implementation +\cs_new:Nn\pbs_at_end_dvi:n{\seq_gput_right:Nn\g_pbs_eod_seq{#1}} +\seq_new:N\g_pbs_eod_seq +\pbs@newkey{pbs@last@page}{0} + +% AtEndDvi check +\AtBeginDocument{ + \iow_now:Nx\@mainaux{ + \token_to_str:N\providecommand\token_to_str:N\pbs@newkey[2]{} + \token_to_str:N\providecommand\token_to_str:N\pbs@seq@push@cx[2]{} + \token_to_str:N\providecommand\token_to_str:N\pbs@at@end@dvi@check{}} + \iow_now:Nx\@mainaux{\token_to_str:N\pbs@at@end@dvi@check} + \cs_new:Npn\pbs@at@end@dvi@check{ + \bool_if:nT{ + !\tl_if_exist:NTF\pbs@last@page{ + \int_compare_p:n{\pbs@last@page=\g_pbs_page_int} + }{ + \c_false_bool + } + }{ + \cs_if_exist:NF\g_pbs_rerunwarned_tl{ + \tl_new:N\g_pbs_rerunwarned_tl + \msg_warning:nn{pdfbase}{rerun} + } + } + } +} + +%%%%%%%%%%%%%%%%% %package options +%%%%%%%%%%%%%%%%% %unknown package option error message \msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{ @@ -154,6 +209,13 @@ \bool_new:N\g_pbs_pkgbigfiles_bool \bool_new:N\g_pbs_dvipdfmx_bool +\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env +\AtBeginDocument{ + \cs_if_exist:NT\landscape{% + \tl_put_right:Nn\landscape{\bool_gset_true:N\g_pbs_lscape_bool} + \tl_put_left:Nn\endlandscape{\bool_gset_false:N\g_pbs_lscape_bool} + } +} \keys_define:nn{pdfbase}{ xetex .bool_gset:N = \g_pbs_dvipdfmx_bool, @@ -171,13 +233,40 @@ \ProcessKeysOptions{pdfbase} \sys_if_engine_xetex:T{\bool_gset_true:N\g_pbs_dvipdfmx_bool} -\cs_new:Nn\pbs_first_of_two:nn{#1} %helpers -\cs_new:Nn\pbs_second_of_two:nn{#2} +\cs_new_nopar:Nn\pbs_first_of_two:nn{#1} %helpers +\cs_new_nopar:Nn\pbs_second_of_two:nn{#2} +\cs_new_nopar:Nn\pbs_insert_properties_entry:{} +\cs_new_nopar:Nn\pbs_delete_properties_entry:{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %commands for creating PDF objects, annots etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \sys_if_output_pdf:TF{ + %in LuaTeX-0.95.0, pdfTeX primitives got new names + \bool_if:nT{ + \sys_if_engine_luatex_p: && !\int_compare_p:n{\luatexversion<95} + }{ + \cs_set_protected:Npn\pdfnames{\pdfextension~names~} + \cs_set_protected:Npn\pdfobj{\pdfextension~obj~} + \cs_set_protected:Npn\pdfrefobj{\pdfextension~refobj~} + \cs_set_protected:Npn\pdfannot{\pdfextension~annot~} + \cs_set_protected:Npn\pdfstartlink{\pdfextension~startlink~} + \cs_set_protected:Npn\pdfendlink{\pdfextension~endlink\relax} + \cs_set_protected:Npn\pdfliteral{\pdfextension~literal~} + \cs_set_protected:Npn\pdfcatalog{\pdfextension~catalog~} + \cs_set:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} + \cs_set:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} + \cs_set:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} + \cs_set:Npn\pdfpageref{\numexpr\pdffeedback~pageref\relax} + \cs_set:Npx\pdfpageresources{\pdfvariable~pageresources} + \cs_set_eq:NN\pdfximage\saveimageresource + \cs_set_eq:NN\pdfrefximage\useimageresource + \cs_set_eq:NN\pdflastximage\lastsavedimageresourceindex + \cs_set_eq:NN\pdflastximagepages\lastsavedimageresourcepages + \cs_set_eq:NN\pdfxform\saveboxresource + \cs_set_eq:NN\pdfrefxform\useboxresource + \cs_set_eq:NN\pdflastxform\lastsavedboxresourceindex + } %helper func to remove `0 R' part from pdf obj reference \cs_new_nopar:Nn\pbs_reftonum:n{\_pbs_reftonum:f{#1}} \cs_new_nopar:Nn\_pbs_reftonum:n{\exp_after:wN\_pbs_reftonum:w#1} @@ -205,23 +294,45 @@ } \tl_gset:Nx\g_pbs_pdflastobj_tl{\the\pdflastobj\space 0~R} } - \cs_new_nopar:Nn\pbs_pdfannot:nnnn{ - \immediate\pdfannot~width~#1~height~#2~depth~#3 {#4} + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \immediate\pdfannot~width~3pt~height~3pt~depth~\c_zero_dim { + /Ff~65537/FT/Btn/Subtype/Widget + } + } + \immediate\pdfannot~width~#1~height~#2~depth~#3 { + \cs_if_exist_use:N\ocgbase_insert_oc:~#4} \tl_gset:Nx\g_pbs_pdflastann_tl{\the\pdflastannot\space 0~R} } \cs_new:Nn\pbs_pdflink:nn{ - \immediate\pdfstartlink~user~{#1}#2\pdfendlink - } - - \cs_new_nopar:Nn\pbs_pdfxform:nnn{ % #1 not used + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \immediate\pdfannot~width~3pt~height~3pt~depth~\c_zero_dim { + /Ff~65537/FT/Btn/Subtype/Widget + } + } + \immediate\pdfstartlink~user~{ + \cs_if_exist_use:N\ocgbase_insert_oc:~#1}#2\pdfendlink + } + + \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #1 not used + %additional resources + \tl_set:Nx\l_tmpa_tl{\the\pdfpageresources~#3}\tl_trim_spaces:N\l_tmpa_tl + %additional dict entries + \tl_set:Nx\l_tmpb_tl{#4} + \tl_trim_spaces:N\l_tmpb_tl \int_compare:nT{#2>\c_zero}{\immediate} - \pdfxform~resources~{\the\pdfpageresources}~#3 + \pdfxform~ + \str_if_eq_x:nnF{\l_tmpb_tl}{}{attr~{\l_tmpb_tl}~} + \str_if_eq_x:nnF{\l_tmpa_tl}{}{resources~{\l_tmpa_tl}~}#5 \tl_gset:Nx\g_pbs_pdflastxform_tl{\the\pdflastxform\space 0~R} } - \cs_new:Nn\pbs_pdfrefxform:n{% #1: xform obj ID + \cs_new_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID \hbox_overlap_right:n{\smash{\pdfrefxform\pbs_reftonum:n{#1}}} } @@ -264,30 +375,50 @@ \cs_new_nopar:Nn\pbs_pdfbdc:nn{ \pdfliteral~page~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC} - \tl_if_empty:NTF\g_pbs_ocmap_tl{ - \tl_gset:Nx\g_pbs_ocmap_tl{/rm@oc\int_use:N\g_pbs_oc_int\space#2} + %decide whether the current property is to be written to the page + %resources or to the xobject resources, depending on whether marked content + %is written to a page stream or to an xobject stream (for compatibility with + %`xsavebox' package) + \bool_if:nTF{ + \cs_if_exist:NTF\xsb_count_props:{ + \int_compare_p:n{\xsb_count_props:>\c_zero} + }{ + \c_false_bool + } }{ - \tl_gput_right:Nx\g_pbs_ocmap_tl{~/rm@oc\int_use:N\g_pbs_oc_int\space#2} + \xsb_addto_props:n{/rm@oc\int_use:N\g_pbs_oc_int\space#2} + }{ + \iow_shipout_x:Nx\@mainaux{\token_to_str:N\pbs@seq@push@cx{ + pbs@props@\exp_not:N\int_use:N\g_pbs_page_int + }{/rm@oc\int_use:N\g_pbs_oc_int\space#2}} } - \pbs_zap_properties: - \group_begin: - \tl_set:Nx\l_pbs_temp_tl{\group_end: - \global\pdfpageresources{ - \the\pdfpageresources - /Properties<<\g_pbs_ocmap_tl>> - } - }\l_pbs_temp_tl \int_gincr:N\g_pbs_oc_int } - \tl_new:N\g_pbs_ocmap_tl \cs_new_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}} - %modify output routine to strip OCG properties from \pdfpageresources - \AtBeginShipout{\tl_gclear:N\g_pbs_ocmap_tl} - \tl_gset:Nx\g_pbs_output_tl{\the\output} - \global\output{ - \g_pbs_output_tl \tl_if_blank:VT\g_pbs_ocmap_tl{\pbs_zap_properties:} + %inserts /Properties <<...>> entry into page resources + \cs_gset:Nn\pbs_insert_properties_entry:{ + \pbs_zap_properties: %purge those from previous page + \tl_set:Nx\l_tmpa_tl{\seq_if_exist:cT{pbs@props@\int_use:N\g_pbs_page_int}{ + \seq_use:cn{pbs@props@\int_use:N\g_pbs_page_int}{~}}} + \tl_trim_spaces:N\l_tmpa_tl + \str_if_eq_x:nnF{\l_tmpa_tl}{}{ + \group_begin: + \tl_set:Nx\l_pbs_temp_tl{\group_end: + \global\pdfpageresources{ + \the\pdfpageresources + /Properties<<\seq_if_exist:cT{pbs@props@\int_use:N\g_pbs_page_int}{ + \seq_use:cn{pbs@props@\int_use:N\g_pbs_page_int}{~} + }>> + } + }\l_pbs_temp_tl + } + } + + %deletes /Properties <<...>> from page resources + \cs_gset:Nn\pbs_delete_properties_entry:{ + \pbs_zap_properties: } }{ %pgf + transparency related settings @@ -322,47 +453,87 @@ } \tl_gset_eq:NN\g_pbs_pdflastobj_tl\l_pbs_usenum_tl } - \cs_new_nopar:Nn\pbs_pdfannot:nnnn{ - \special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space - width~\dim_eval:n{#1}\space - height~\dim_eval:n{#2}\space - depth~\dim_eval:n{#3}~<<#4>> + \bool_if:NTF\g_pbs_lscape_bool{ + %fix missing annotation rotation of (x)dvipdfmx on landscape pages + \box_move_up:nn{\dim_eval:n{#2}}{\vbox:n{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \special{pdf:ann~ + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> + } + } + \special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space + width~\dim_eval:n{#2+#3}\space + height~\dim_eval:n{#1}\space + depth~\dim_eval:n{\c_zero_dim}~<< + \cs_if_exist_use:N\ocgbase_insert_oc:~#4>> + } + }} + }{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \special{pdf:ann~ + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> + } + } + \special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space + width~\dim_eval:n{#1}\space + height~\dim_eval:n{#2}\space + depth~\dim_eval:n{#3}~<<\cs_if_exist_use:N\ocgbase_insert_oc:~#4>> + } } \tl_gset:Nx\g_pbs_pdflastann_tl{@pbs@obj\int_use:N\g_pbs_obj_int} \int_gincr:N\g_pbs_obj_int } \cs_new:Nn\pbs_pdflink:nn{ - \special{pdf:bann~<<#1>>}#2\special{pdf:eann} + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \special{pdf:ann~ + width~3pt~height~3pt~depth~0pt~<</Ff~65537/FT/Btn/Subtype/Widget>> + } + } + \special{pdf:bann~<<\cs_if_exist_use:N\ocgbase_insert_oc:~#1>>}#2 + \special{pdf:eann} } - \cs_new_nopar:Nn\pbs_pdfxform:nnn{ % #2 not used + \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #2 not used \begin{picture}(0,0) \put(0,0){ \special{pdf:bxobj~@pbs@obj\int_use:N\g_pbs_obj_int\space - width\space \dim_use:N\box_wd:N#3\space - height\space\dim_use:N\box_ht:N#3\space - depth\space \dim_use:N\box_dp:N#3 + width\space \dim_use:N\box_wd:N#5\space + height\space\dim_use:N\box_ht:N#5\space + depth\space \dim_use:N\box_dp:N#5 } - \box_use:N#3 + \box_use:N#5 + \tl_clear:N\l_tmpa_tl{} %transparency et al. for PGF \bool_if:nT{\int_compare_p:n{#1>\c_zero} && \g_pbs_pgfloaded_bool}{ - \tl_set:Nn\l_pbs_temp_tl{} \ifpgf@sys@pdf@extgs@exists - \tl_set:Nn\l_pbs_temp_tl{/ExtGState~@pgfextgs} + \tl_set:Nn\l_tmpa_tl{/ExtGState~@pgfextgs} \fi \ifpgf@sys@pdf@patterns@exists - \tl_put_right:Nn\l_pbs_temp_tl{/Pattern~@pgfpatterns} + \tl_put_right:Nn\l_tmpa_tl{/Pattern~@pgfpatterns} \fi \ifpgf@sys@pdf@colorspaces@exists - \tl_put_right:Nn\l_pbs_temp_tl{/ColorSpace~@pgfcolorspaces} + \tl_put_right:Nn\l_tmpa_tl{/ColorSpace~@pgfcolorspaces} \fi - \tl_if_blank:VF\l_pbs_temp_tl{ - \special{pdf:put~@resources~<<\l_pbs_temp_tl>>} - } } - \special{pdf:exobj} + %additional resources + \tl_put_right:Nx\l_tmpa_tl{~#3}\tl_trim_spaces:N\l_tmpa_tl + \str_if_eq_x:nnF{\l_tmpa_tl}{}{ + \special{pdf:put~@resources~<<\l_tmpa_tl>>} + } + %additional dict entries + \tl_set:Nx\l_tmpa_tl{#4} + \tl_trim_spaces:N\l_tmpa_tl + \special{pdf:exobj %close form xobject + \str_if_eq_x:nnF{\l_tmpa_tl}{}{<<\l_tmpa_tl>>} + } } \end{picture} \tl_gset:Nx\g_pbs_pdflastxform_tl{@pbs@obj\int_use:N\g_pbs_obj_int} @@ -433,8 +604,8 @@ \bool_if:NT\g_pbs_pkgbigfiles_bool{ \special{psfile=\jobname.pbsdat} - %open auxiliary file \jobname.pbsdat for writing hex encoded streams of the - %files to be embedded. This file is inserted into PS during dvips run + %open auxiliary file \jobname.pbsdat for writing hex encoded streams of + %the files to be embedded. This file is inserted into PS during dvips run \iow_new:N\g_pbs_mstreams_stream \iow_open:Nn\g_pbs_mstreams_stream{\jobname.pbsdat} \iow_now:Nn\g_pbs_mstreams_stream{ @@ -471,17 +642,17 @@ {stream}{/stream} {fstream}{/stream} }~ - /OBJ~pdfmark~ + /OBJ~pdfmark } } \str_case:nn{#2}{ - {dict}{\special{ps:~mark~\l_pbs_usenum_tl~<<#3>>/PUT~pdfmark~}} + {dict}{\special{ps:~mark~\l_pbs_usenum_tl~<<#3>>/PUT~pdfmark}} {array}{ - \special{ps:~mark~\l_pbs_usenum_tl~0~[#3]/PUTINTERVAL~pdfmark~} + \special{ps:~mark~\l_pbs_usenum_tl~0~[#3]/PUTINTERVAL~pdfmark} } {stream}{\special{ps::[nobreak] ~mark~\l_pbs_usenum_tl~(\pbs_second_of_two:nn#3)/PUT~pdfmark~ - ~mark~\l_pbs_usenum_tl~<<\pbs_first_of_two:nn#3>>/PUT~pdfmark~ + ~mark~\l_pbs_usenum_tl~<<\pbs_first_of_two:nn#3>>/PUT~pdfmark }} {fstream}{ \tl_set:Nn\l_pbs_offset_tl{0} @@ -507,7 +678,7 @@ \pbs_second_of_two:nn#3 })~ /ASCIIHexDecode~filter~/PUT~ - pdfmark~ + pdfmark } } \tl_set:Nx\l_pbs_offset_tl{\int_eval:n{\l_pbs_offset_tl+32767}} @@ -521,7 +692,7 @@ }{ \special{ps:~ mark~\l_pbs_usenum_tl~<<\pbs_first_of_two:nn#3>>~/PUT~pdfmark~ - mark~\l_pbs_usenum_tl~/CLOSE~pdfmark~ + mark~\l_pbs_usenum_tl~/CLOSE~pdfmark } } \message{>} @@ -543,20 +714,39 @@ } \end{picture} \group_end: - \special{ps:~ - mark~ - /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} - /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] - #4 - /ANN~pdfmark~ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{ + \special{ps:~ + mark~ + /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} + /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] + /Ff~65537/FT/Btn/Subtype/Widget + /ANN~pdfmark + } + \int_gincr:N\g_pbs_obj_int + } + %the actual annotation + \str_if_eq_x:nnF{#4}{}{ + \special{ps:~ + mark~ + /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} + /Rect~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] + \cs_if_exist_use:N\ocgbase_insert_oc:~#4 + /ANN~pdfmark + } + \tl_gset:Nx\g_pbs_pdflastann_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} + \int_gincr:N\g_pbs_obj_int } - \tl_gset:Nx\g_pbs_pdflastann_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} - \int_gincr:N\g_pbs_obj_int } \cs_new:Nn\pbs_pdflink:nn{ + %dumb dummy Widget, workaround for AR bug; + %see https://forums.adobe.com/message/5787612#5787612 + \pbs_pdfannot:nnnn{3pt}{3pt}{0pt}{} \cs_if_exist:NTF\pdfmark{ - \pdfmark[#2]{pdfmark=/ANN,Raw={#1}} + \pdfmark[#2]{pdfmark=/ANN,Raw={ + \cs_if_exist_use:N\ocgbase_insert_oc:~#1}} }{ \hbox_set:Nn\l_tmpb_box{#2} \pbs_pdfannot:nnnn{ @@ -575,67 +765,56 @@ output. } - \cs_new_nopar:Nn\pbs_pdfxform:nnn{ % #1 not used - \bool_if:nT{ - \dim_compare_p:n{\box_wd:N#3>\paperwidth} || - \dim_compare_p:n{\box_ht:N#3+\box_dp:N#3>\paperheight} + \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #1, #3 not used (resources are + %managed by pdfmarks) + %rescale box to fit within the papersize while distilling + \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0, + \dim_ratio:nn{\paperwidth}{\box_wd:N#5}, + \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5} + )}} + \box_scale:Nnn#5{ + \tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}} }{ - \msg_warning:nn{pdfbase}{content~too~large} + \tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}} } - %mark bbox of box#3 \group_begin: + %mark bbox of box#5 \dim_set:Nn\unitlength{1pt} \begin{picture}(0,0) - %mark BBox of the graphics - \put(0,-\dim_to_decimal:n{\box_dp:N#3}){ + \put(0,-\dim_to_decimal:n{\box_dp:N#5}){ \special{ps: - currentpoint~/pbs@lly~exch~def~/pbs@llx~exch~def~ + currentpoint~/pbs@lly~exch~def~/pbs@llx~exch~def } } \put( - \dim_to_decimal:n{\box_wd:N#3}, - \dim_to_decimal:n{\box_ht:N#3} + \dim_to_decimal:n{\box_wd:N#5}, + \dim_to_decimal:n{\box_ht:N#5} ){ \special{ps: - currentpoint~/pbs@ury~exch~def~/pbs@urx~exch~def~ - } - } - %define some length values in current PS coordinate units - \put(0,0){ - \special{ps: - currentpoint~/origin@y~exch~def~/origin@x~exch~def~ - } - } - \dim_set:Nn\unitlength{1in} - \put(1,1){ - \special{ps: - currentpoint~origin@y~exch~sub~/one@inch@y~exch~def~ - origin@x~sub~/one@inch@x~exch~def~ + currentpoint~/pbs@ury~exch~def~/pbs@urx~exch~def } } \end{picture} \group_end: - \tl_gset:cx{origin:{pbs@obj\int_use:N\g_pbs_obj_int}}{ - origin@pbs@\int_use:N\g_pbs_obj_int - } \special{ps:~ gsave~ - %keep a record of lower left corner coordinates - true~setglobal~globaldict~ - /origin@pbs@\int_use:N\g_pbs_obj_int~[currentpoint]~cvx~put~ - false~setglobal~ + currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~ %translate graphics to upper left page corner - \bool_if:NF\g_pbs_powerdot_bool{ + \bool_if:nF{\g_pbs_powerdot_bool||\g_pbs_lscape_bool}{ { pbs@llx~neg~pbs@ury~neg~translate~ - one@inch@x~DVImag~div~neg~one@inch@y~DVImag~div~neg~translate + Resolution~neg~VResolution~neg~translate %one inch left, one inch up }?pdfmark~ } %distill graphics into XObject - mark~ + gsave~pbs@curx~pbs@cury~translate~ %move origin (0,0) to the current + mark~ %position /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int} - /BBox~[pbs@llx~pbs@lly~pbs@urx~pbs@ury] - /BP~pdfmark~ + /BBox~[ + pbs@llx~pbs@curx~sub~pbs@lly~pbs@cury~sub~ + pbs@urx~pbs@curx~sub~pbs@ury~pbs@cury~sub + ] + /BP~pdfmark~grestore~ \int_compare:nT{#2>\c_zero}{ %operations needed if used as annotation appearance { @@ -657,40 +836,43 @@ }{%flip around horizontal axis in portrait mode [1~0~0~-1~0~pbs@lly~pbs@ury~add]~concat }ifelse - }?pdfmark~ + }?pdfmark } } - \begin{picture}(0,0)\put(0,0){\box_use:N#3}\end{picture} + \begin{picture}(0,0)\put(0,0){\box_use:N#5}\end{picture} \special{ps:~mark~/EP~pdfmark~grestore} + %additional dict entries + \tl_set:Nx\l_tmpa_tl{#4} + \tl_trim_spaces:N\l_tmpa_tl + \str_if_eq_x:nnF{\l_tmpa_tl}{}{ + \special{ps:~mark~{pbs@obj\int_use:N\g_pbs_obj_int}~<<\l_tmpa_tl>>~ + /PUT~pdfmark} + } \tl_gset:Nx\g_pbs_pdflastxform_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} \int_gincr:N\g_pbs_obj_int - \int_compare:nTF{#2>\c_zero}{ + \int_compare:nT{#2>\c_zero}{ %Form XObjects for use as annotation appearances require that - %dvips generated PostScript to be further precessed with ps2pdf - %may not have the exaggerated dpi resolution resulting from dvips + %dvips generated PostScript to be further processed with ps2pdf + %must not have the exaggerated dpi resolution resulting from dvips %option `-Ppdf'. \tl_if_exist:NF\g_pbs_dpiwarned_tl{ \tl_new:N\g_pbs_dpiwarned_tl - \AtEndDvi{\special{ps::[nobreak]\pbs_dpiwarning:}} - } - }{%Form XObject to be inserted using \SP pdfmark: - %The /SP pdfmark for placement of Form XObjects works reliably only - %since gs-9.14. As gs-9.14 had some other TeX-related issues, we - %require 9.15. - \tl_if_exist:NF\g_pbs_gsoldwarned_tl{ - \tl_new:N\g_pbs_gsoldwarned_tl - \AtEndDvi{\special{ps::[nobreak]\pbs_gsoldwarning:}} + \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_dpiwarning:}} } } } \cs_new_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID + %The /SP pdfmark for placement of Form XObjects works reliably only + %since gs-9.14. As gs-9.14 had some other TeX-related issues, we + %require 9.15. + \tl_if_exist:NF\g_pbs_gsoldwarned_tl{ + \tl_new:N\g_pbs_gsoldwarned_tl + \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_gsoldwarning:}} + } \special{ps:~ - gsave~ - currentpoint~pop~\tl_use:c{origin:#1}~pop~sub~ - currentpoint~exch~pop~\tl_use:c{origin:#1}~exch~pop~sub~translate~ - mark~#1~/SP~pdfmark~ - grestore~ + gsave~currentpoint~translate~1~\tl_use:c{scale_#1}~div~dup~scale~ + mark~#1~/SP~pdfmark~grestore } } @@ -702,13 +884,13 @@ ||\str_if_eq_p:Vn\l_pbs_ext_tl{eps} }{ \special{ps:~ - mark~/_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~/NI~pdfmark~ + mark~/_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~/NI~pdfmark } \special{psfile=#1~hsize=0~vsize=0} \special{ps:~ { 0~0~1~[1~0~0~1~0~0]~{}~image~%empty dummy, in case #1 is not - }?pdfmark~ %a valid raster image file + }?pdfmark %a valid raster image file } \tl_gset:Nx\g_pbs_pdflastximage_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} \int_gincr:N\g_pbs_obj_int @@ -729,7 +911,7 @@ \special{ps:~mark~#1~#2~/BDC~pdfmark} \tl_if_exist:NF\g_pbs_gsoldwarned_tl{ \tl_new:N\g_pbs_gsoldwarned_tl - \AtEndDvi{\special{ps::[nobreak]\pbs_gsoldwarning:}} + \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_gsoldwarning:}} } } \cs_new_nopar:Nn\pbs_pdfemc:{\special{ps:~mark~/EMC~pdfmark}} @@ -744,7 +926,7 @@ %adding AcroForm dict to PDF Catalog \tl_new:N\g_pbs_fields_tl %takes object IDs of Fields (aka annots with \tl_if_exist:NF\g_pbs_acroFormAdded_tl{ % /Subtype/Widget) - \AtEndDvi{ + \pbs_at_end_dvi:n{ \tl_if_empty:NF\g_pbs_fields_tl{ \pbs_pdfobj:nnn{}{array}{\g_pbs_fields_tl} \pbs_pdfcatalog:n{ @@ -757,6 +939,32 @@ \tl_gput_right:Nx\g_pbs_fields_tl{#1\space} } +%modify output routine for output box insertions +\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage +\cs_set_nopar:Npn\@outputpage{ + \int_gincr:N\g_pbs_page_int + \iow_now:Nx\@mainaux{ + \token_to_str:N\pbs@newkey{pbs@last@page}{\int_use:N\g_pbs_page_int} + } + \hbox_set:Nn\@outputbox{ + \seq_map_inline:Nn\g_pbs_bop_seq{\hbox_to_zero:n{##1\hss}} + \tl_set:Nx\l_pbs_box_wd_tl{\dim_use:N\box_wd:N\@outputbox} + \box_use_clear:N\@outputbox + \skip_horizontal:n{-\l_pbs_box_wd_tl} + \seq_map_inline:Nn\g_pbs_eop_seq{\hbox_to_zero:n{##1\hss}} + %at end of dvi + \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{ + \seq_map_inline:Nn\g_pbs_eod_seq{\hbox_to_zero:n{##1\hss}} + } + } + %insert /Properties into current page's resources + \pbs_insert_properties_entry: + \pbs_outputpage_orig: + %purge /Properties from current page's resources, + %because they aren't needed any longer + \pbs_delete_properties_entry: +} + \group_begin: \char_set_catcode_active:N\+\let+\space \cs_new_nopar:Nx\pbs_gsoldwarning:{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/media9.tlpobj new/tlpkg/tlpobj/media9.tlpobj --- old/tlpkg/tlpobj/media9.tlpobj 2016-04-14 19:25:36.000000000 +0200 +++ new/tlpkg/tlpobj/media9.tlpobj 2017-04-26 02:08:13.000000000 +0200 @@ -1,6 +1,6 @@ name media9 category Package -revision 40124 +revision 44045 shortdesc Multimedia inclusion package with Adobe Reader-9/X compatibility relocated 1 longdesc The package provides an interface to embed interactive Flash @@ -13,7 +13,7 @@ longdesc compression. The package is based on the RichMedia Annotation, longdesc an Adobe addition to the PDF specification. It replaces the now longdesc obsolete movie15 package. -runfiles size=497 +runfiles size=499 RELOC/tex/latex/media9/javascript/3Dmenu.js RELOC/tex/latex/media9/javascript/3Dspintool.js RELOC/tex/latex/media9/javascript/animation.js @@ -27,7 +27,7 @@ RELOC/tex/latex/media9/players/VPlayer.swf RELOC/tex/latex/media9/players/VPlayer9.swf catalogue-ctan /macros/latex/contrib/media9 -catalogue-date 2016-03-22 13:28:35 +0100 +catalogue-date 2017-04-25 16:46:53 +0200 catalogue-license lppl1.3 catalogue-topics multimedia -catalogue-version 0.68 +catalogue-version 0.79

1 0

commit texlive-specs-l 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-l for openSUSE:Factory checked in at 2017-06-25 19:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-l (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-l.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-l" Sun Jun 25 19:22:11 2017 rev:26 rq:504802 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-l/texlive-specs-l.changes 2017-06-08 14:55:11.657148185 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-l.new/texlive-specs-l.changes 2017-06-25 19:27:05.262274329 +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: ---- 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 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 japanese.doc.tar.xz japanese.tar.xz jfontmaps.doc.tar.xz jfontmaps.tar.xz New: ---- hitec.doc.tar.xz hitec.tar.xz hletter.doc.tar.xz hletter.tar.xz hlist.doc.tar.xz hlist.tar.xz hobby.doc.tar.xz hobby.tar.xz hobete.doc.tar.xz hobete.tar.xz hook-pre-commit-pkg.doc.tar.xz horoscop.doc.tar.xz horoscop.tar.xz hpsdiss.doc.tar.xz hpsdiss.tar.xz hrefhide.doc.tar.xz hrefhide.tar.xz hrlatex.doc.tar.xz hrlatex.tar.xz hustthesis.doc.tar.xz hustthesis.tar.xz hvfloat.doc.tar.xz hvfloat.tar.xz hvindex.doc.tar.xz hvindex.tar.xz hypdvips.doc.tar.xz hypdvips.tar.xz hyper.doc.tar.xz hyper.tar.xz hypernat.doc.tar.xz hypernat.tar.xz hyperref-docsrc.doc.tar.xz hyperref.doc.tar.xz hyperref.tar.xz hyperxmp.doc.tar.xz hyperxmp.tar.xz hyph-utf8.doc.tar.xz hyph-utf8.tar.xz hyphen-afrikaans.tar.xz hyphen-ancientgreek.tar.xz hyphen-arabic.tar.xz hyphen-armenian.tar.xz hyphen-base.tar.xz hyphen-basque.tar.xz hyphen-belarusian.tar.xz hyphen-bulgarian.doc.tar.xz hyphen-bulgarian.tar.xz hyphen-catalan.tar.xz hyphen-chinese.tar.xz hyphen-churchslavonic.tar.xz hyphen-coptic.tar.xz hyphen-croatian.tar.xz hyphen-czech.tar.xz hyphen-danish.tar.xz hyphen-dutch.tar.xz ietfbibs.doc.tar.xz ifptex.doc.tar.xz ifptex.tar.xz ijsra.doc.tar.xz ijsra.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-l.spec ++++++ ++++ 28507 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-l/texlive-specs-l.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-l.new/texlive-specs-l.spec ++++++ hyphen-english.tar.xz ++++++ ++++++ hyphen-esperanto.tar.xz ++++++ ++++++ hyphen-estonian.tar.xz ++++++ ++++++ hyphen-ethiopic.tar.xz ++++++ ++++++ hyphen-farsi.tar.xz ++++++ ++++++ hyphen-finnish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-finnish.tlpobj new/tlpkg/tlpobj/hyphen-finnish.tlpobj --- old/tlpkg/tlpobj/hyphen-finnish.tlpobj 2016-04-14 19:07:10.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-finnish.tlpobj 2017-04-14 17:42:50.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.pat.txt catalogue-ctan /language/hyphenation/fihyph -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-20 08:22:15 +0200 catalogue-license pd catalogue-topics hyphenation finnish ++++++ hyphen-french.tar.xz ++++++ ++++++ hyphen-friulan.tar.xz ++++++ ++++++ hyphen-galician.tar.xz ++++++ ++++++ hyphen-georgian.tar.xz ++++++ ++++++ hyphen-german.tar.xz ++++++ ++++ 264269 lines of diff (skipped) ++++++ hyphen-greek.doc.tar.xz ++++++ ++++++ hyphen-greek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-greek.tlpobj new/tlpkg/tlpobj/hyphen-greek.tlpobj --- old/tlpkg/tlpobj/hyphen-greek.tlpobj 2016-04-14 19:07:12.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-greek.tlpobj 2017-04-14 17:42:51.000000000 +0200 @@ -28,7 +28,7 @@ RELOC/tex/generic/hyphen/grmhyph5.tex RELOC/tex/generic/hyphen/grphyph5.tex catalogue-ctan /language/hyphenation/elhyphen -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-20 08:10:44 +0200 catalogue-license other-free catalogue-topics greek hyphenation catalogue-version 5 ++++++ hyphen-hungarian.doc.tar.xz ++++++ ++++++ hyphen-hungarian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-hungarian.tlpobj new/tlpkg/tlpobj/hyphen-hungarian.tlpobj --- old/tlpkg/tlpobj/hyphen-hungarian.tlpobj 2016-04-14 19:07:12.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-hungarian.tlpobj 2017-04-14 17:42:51.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.pat.txt catalogue-ctan /language/hungarian/hyphenation -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-05 05:59:04 +0100 catalogue-license gpl catalogue-topics hyphenation hungarian ++++++ hyphen-icelandic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-icelandic.tlpobj new/tlpkg/tlpobj/hyphen-icelandic.tlpobj --- old/tlpkg/tlpobj/hyphen-icelandic.tlpobj 2016-04-14 19:07:14.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-icelandic.tlpobj 2017-04-14 17:42:52.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.pat.txt catalogue-ctan /language/hyphenation/icehyph.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-05 05:59:04 +0100 catalogue-license lppl catalogue-topics hyphenation icelandic ++++++ hyphen-indic.tar.xz ++++++ ++++++ hyphen-indonesian.tar.xz ++++++ ++++++ hyphen-interlingua.tar.xz ++++++ ++++++ hyphen-irish.tar.xz ++++++ ++++++ hyphen-italian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-italian.tlpobj new/tlpkg/tlpobj/hyphen-italian.tlpobj --- old/tlpkg/tlpobj/hyphen-italian.tlpobj 2016-04-14 19:07:14.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-italian.tlpobj 2017-04-14 17:42:52.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.pat.txt catalogue-ctan /language/hyphenation/ithyph.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-05 05:59:04 +0100 catalogue-license lgpl catalogue-topics hyphenation italian catalogue-version 4.8g ++++++ hyphen-kurmanji.tar.xz ++++++ ++++++ hyphen-latin.tar.xz ++++++ ++++ 7054 lines of diff (skipped) ++++++ hyphen-latvian.tar.xz ++++++ ++++++ hyphen-lithuanian.tar.xz ++++++ ++++++ hyphen-mongolian.tar.xz ++++++ ++++++ hyphen-norwegian.tar.xz ++++++ ++++++ hyphen-occitan.tar.xz ++++++ ++++++ hyphen-piedmontese.tar.xz ++++++ ++++++ hyphen-polish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-polish.tlpobj new/tlpkg/tlpobj/hyphen-polish.tlpobj --- old/tlpkg/tlpobj/hyphen-polish.tlpobj 2016-05-15 03:19:32.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-polish.tlpobj 2017-04-14 17:42:52.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.pat.txt catalogue-ctan /language/polish/plhyph.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-17 15:05:50 +0200 catalogue-license knuth catalogue-topics hyphenation polish catalogue-version 3.0a ++++++ hyphen-portuguese.tar.xz ++++++ ++++++ hyphen-romanian.tar.xz ++++++ ++++++ hyphen-romansh.tar.xz ++++++ ++++++ hyphen-russian.tar.xz ++++++ ++++++ hyphen-sanskrit.doc.tar.xz ++++++ ++++++ hyphen-sanskrit.tar.xz ++++++ ++++++ hyphen-serbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-serbian.tlpobj new/tlpkg/tlpobj/hyphen-serbian.tlpobj --- old/tlpkg/tlpobj/hyphen-serbian.tlpobj 2016-04-14 19:07:16.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-serbian.tlpobj 2017-04-14 17:42:53.000000000 +0200 @@ -36,7 +36,7 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.pat.txt catalogue-also shhyphl catalogue-ctan /language/hyphenation/srhyphc.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-05 05:59:04 +0100 catalogue-license gpl catalogue-topics hyphenation serbian catalogue-version 1.0a ++++++ hyphen-slovak.tar.xz ++++++ ++++++ hyphen-slovenian.tar.xz ++++++ ++++++ hyphen-spanish.doc.tar.xz ++++++ ++++++ hyphen-spanish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-spanish.tlpobj new/tlpkg/tlpobj/hyphen-spanish.tlpobj --- old/tlpkg/tlpobj/hyphen-spanish.tlpobj 2016-04-14 19:07:16.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-spanish.tlpobj 2017-04-14 17:42:53.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-es.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-es.pat.txt catalogue-ctan /language/spanish/hyphen/base -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyphenation spanish catalogue-version 4.5 ++++++ hyphen-swedish.tar.xz ++++++ ++++++ hyphen-thai.tar.xz ++++++ ++++++ hyphen-turkish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-turkish.tlpobj new/tlpkg/tlpobj/hyphen-turkish.tlpobj --- old/tlpkg/tlpobj/hyphen-turkish.tlpobj 2016-04-14 19:07:17.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-turkish.tlpobj 2017-04-14 17:42:53.000000000 +0200 @@ -23,6 +23,6 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.pat.txt catalogue-ctan /language/hyphenation/tkhyph.tex -catalogue-date 2015-11-14 11:46:45 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics hyphenation turkish ++++++ hyphen-turkmen.tar.xz ++++++ ++++++ hyphen-ukrainian.tar.xz ++++++ ++++++ hyphen-uppersorbian.tar.xz ++++++ ++++++ hyphen-welsh.tar.xz ++++++ ++++++ hyphenat.doc.tar.xz ++++++ ++++++ hyphenat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphenat.tlpobj new/tlpkg/tlpobj/hyphenat.tlpobj --- old/tlpkg/tlpobj/hyphenat.tlpobj 2016-04-14 19:07:18.000000000 +0200 +++ new/tlpkg/tlpobj/hyphenat.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/hyphenat/hyphenat.sty catalogue-ctan /macros/latex/contrib/hyphenat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics hyphenation catalogue-version 2.3c ++++++ hyphenex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphenex.tlpobj new/tlpkg/tlpobj/hyphenex.tlpobj --- old/tlpkg/tlpobj/hyphenex.tlpobj 2016-04-14 19:07:18.000000000 +0200 +++ new/tlpkg/tlpobj/hyphenex.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/generic/hyphenex/ushyphex.tex catalogue-also tugboat tugboat-plain catalogue-ctan /info/digests/tugboat/hyphenex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics hyphenation ++++++ hyplain.doc.tar.xz ++++++ ++++++ hyplain.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyplain.tlpobj new/tlpkg/tlpobj/hyplain.tlpobj --- old/tlpkg/tlpobj/hyplain.tlpobj 2016-04-14 19:07:18.000000000 +0200 +++ new/tlpkg/tlpobj/hyplain.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/plain/hyplain/hyrules.tex catalogue-also babel catalogue-ctan /macros/plain/contrib/hyplain -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics multilingual hyphenation plain-ext catalogue-version 1.0 ++++++ ibycus-babel.doc.tar.xz ++++++ ++++++ ibycus-babel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ibycus-babel.tlpobj new/tlpkg/tlpobj/ibycus-babel.tlpobj --- old/tlpkg/tlpobj/ibycus-babel.tlpobj 2016-04-14 19:07:18.000000000 +0200 +++ new/tlpkg/tlpobj/ibycus-babel.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/ibycus-babel/lgienc.def RELOC/tex/latex/ibycus-babel/lgifib.fd catalogue-ctan /language/greek/ibycus-babel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics greek multilingual-addon catalogue-version 3.0 ++++++ ibygrk.doc.tar.xz ++++++ ++++++ ibygrk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ibygrk.tlpobj new/tlpkg/tlpobj/ibygrk.tlpobj --- old/tlpkg/tlpobj/ibygrk.tlpobj 2016-04-14 19:07:18.000000000 +0200 +++ new/tlpkg/tlpobj/ibygrk.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -67,7 +67,7 @@ RELOC/tex/generic/ibygrk/tlgsqq.tex RELOC/tex/generic/ibygrk/version4.tex catalogue-ctan /fonts/greek/ibygrk -catalogue-date 2015-11-14 11:43:00 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-greek greek catalogue-version 4.5 ++++++ icsv.doc.tar.xz ++++++ ++++++ icsv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/icsv.tlpobj new/tlpkg/tlpobj/icsv.tlpobj --- old/tlpkg/tlpobj/icsv.tlpobj 2016-04-14 19:07:19.000000000 +0200 +++ new/tlpkg/tlpobj/icsv.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/icsv/icsv.cls catalogue-ctan /macros/latex/contrib/conferences/icsv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics confproc catalogue-version 0.2 ++++++ idxcmds.doc.tar.xz ++++++ ++++++ idxcmds.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/idxcmds.tlpobj new/tlpkg/tlpobj/idxcmds.tlpobj --- old/tlpkg/tlpobj/idxcmds.tlpobj 2016-04-14 19:07:19.000000000 +0200 +++ new/tlpkg/tlpobj/idxcmds.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/idxcmds/idxcmds.sty catalogue-ctan /macros/latex/contrib/idxcmds -catalogue-date 2015-08-13 13:06:19 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics index catalogue-version 0.2c ++++++ idxlayout.doc.tar.xz ++++++ ++++++ idxlayout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/idxlayout.tlpobj new/tlpkg/tlpobj/idxlayout.tlpobj --- old/tlpkg/tlpobj/idxlayout.tlpobj 2016-04-14 19:07:20.000000000 +0200 +++ new/tlpkg/tlpobj/idxlayout.tlpobj 2017-04-14 17:42:54.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/idxlayout/idxlayout.sty catalogue-ctan /macros/latex/contrib/idxlayout -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.4d ++++++ ieeepes.doc.tar.xz ++++++ ++++++ ieeepes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ieeepes.tlpobj new/tlpkg/tlpobj/ieeepes.tlpobj --- old/tlpkg/tlpobj/ieeepes.tlpobj 2016-04-14 19:07:20.000000000 +0200 +++ new/tlpkg/tlpobj/ieeepes.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/bibtex/bst/ieeepes/ieeepes.bst RELOC/tex/latex/ieeepes/ieeepes.sty catalogue-ctan /macros/latex/contrib/ieeepes -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 4.0 ++++++ ifetex.doc.tar.xz ++++++ ++++++ ifetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifetex.tlpobj new/tlpkg/tlpobj/ifetex.tlpobj --- old/tlpkg/tlpobj/ifetex.tlpobj 2016-04-14 19:07:20.000000000 +0200 +++ new/tlpkg/tlpobj/ifetex.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/ifetex/ifetex.sty RELOC/tex/plain/ifetex/ifetex.tex catalogue-ctan /macros/latex/contrib/ifetex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics env-query catalogue-version 1.2 ++++++ iffont.doc.tar.xz ++++++ ++++++ iffont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iffont.tlpobj new/tlpkg/tlpobj/iffont.tlpobj --- old/tlpkg/tlpobj/iffont.tlpobj 2016-04-14 19:07:20.000000000 +0200 +++ new/tlpkg/tlpobj/iffont.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/iffont/iffont.sty catalogue-ctan /macros/latex/contrib/iffont -catalogue-date 2015-11-18 06:11:07 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-mgmt catalogue-version 1.0.0 ++++++ ifluatex.doc.tar.xz ++++++ Binary files old/doc/latex/oberdiek/ifluatex.pdf and new/doc/latex/oberdiek/ifluatex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifluatex.doc.tlpobj new/tlpkg/tlpobj/ifluatex.doc.tlpobj --- old/tlpkg/tlpobj/ifluatex.doc.tlpobj 2016-05-19 17:30:57.000000000 +0200 +++ new/tlpkg/tlpobj/ifluatex.doc.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -1,9 +1,9 @@ name ifluatex.doc category Package -revision 41247 +revision 43610 shortdesc doc files of ifluatex relocated 1 -docfiles size=81 +docfiles size=35 RELOC/doc/latex/oberdiek/ifluatex.pdf RELOC/doc/latex/oberdiek/test/ifluatex-test1.tex RELOC/doc/latex/oberdiek/test/ifluatex-test2.tex ++++++ ifluatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifluatex.tlpobj new/tlpkg/tlpobj/ifluatex.tlpobj --- old/tlpkg/tlpobj/ifluatex.tlpobj 2016-05-19 17:30:57.000000000 +0200 +++ new/tlpkg/tlpobj/ifluatex.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -1,6 +1,6 @@ name ifluatex category Package -revision 41247 +revision 43610 shortdesc Provides the \ifluatex switch relocated 1 longdesc The package looks for LuaTeX regardless of its mode and @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/generic/oberdiek/ifluatex.sty catalogue-ctan /macros/latex/contrib/oberdiek/ifluatex.dtx -catalogue-date 2016-05-18 17:47:11 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics env-query catalogue-version 1.4 ++++++ ifmslide.doc.tar.xz ++++++ ++++++ ifmslide.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifmslide.tlpobj new/tlpkg/tlpobj/ifmslide.tlpobj --- old/tlpkg/tlpobj/ifmslide.tlpobj 2016-04-14 19:07:21.000000000 +0200 +++ new/tlpkg/tlpobj/ifmslide.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/tex/latex/ifmslide/liquid_helium.jpg catalogue-also prosper catalogue-ctan /macros/latex/contrib/ifmslide -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 0.47 ++++++ ifmtarg.doc.tar.xz ++++++ ++++++ ifmtarg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifmtarg.tlpobj new/tlpkg/tlpobj/ifmtarg.tlpobj --- old/tlpkg/tlpobj/ifmtarg.tlpobj 2016-04-14 19:07:22.000000000 +0200 +++ new/tlpkg/tlpobj/ifmtarg.tlpobj 2017-04-14 17:42:55.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=1 RELOC/tex/latex/ifmtarg/ifmtarg.sty catalogue-ctan /macros/latex/contrib/ifmtarg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license lppl catalogue-topics macro-supp catalogue-version 1.2a ++++++ ifnextok.doc.tar.xz ++++++ ++++++ ifnextok.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifnextok.tlpobj new/tlpkg/tlpobj/ifnextok.tlpobj --- old/tlpkg/tlpobj/ifnextok.tlpobj 2016-04-14 19:07:22.000000000 +0200 +++ new/tlpkg/tlpobj/ifnextok.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=8 RELOC/tex/latex/ifnextok/ifnextok.sty catalogue-ctan /macros/latex/contrib/ifnextok -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.3 ++++++ ifoddpage.doc.tar.xz ++++++ ++++++ ifoddpage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifoddpage.tlpobj new/tlpkg/tlpobj/ifoddpage.tlpobj --- old/tlpkg/tlpobj/ifoddpage.tlpobj 2016-04-25 03:14:25.000000000 +0200 +++ new/tlpkg/tlpobj/ifoddpage.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/ifoddpage/ifoddpage.sty catalogue-ctan /macros/latex/contrib/ifoddpage -catalogue-date 2016-04-23 21:21:39 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting macro-supp catalogue-version 1.1 ++++++ ifplatform.doc.tar.xz ++++++ ++++++ ifplatform.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifplatform.tlpobj new/tlpkg/tlpobj/ifplatform.tlpobj --- old/tlpkg/tlpobj/ifplatform.tlpobj 2016-04-14 19:07:22.000000000 +0200 +++ new/tlpkg/tlpobj/ifplatform.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/ifplatform/ifplatform.sty catalogue-ctan /macros/latex/contrib/ifplatform -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics env-query catalogue-version 0.4 ++++++ ifsym.doc.tar.xz ++++++ ++++++ ifsym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifsym.tlpobj new/tlpkg/tlpobj/ifsym.tlpobj --- old/tlpkg/tlpobj/ifsym.tlpobj 2016-04-14 19:07:23.000000000 +0200 +++ new/tlpkg/tlpobj/ifsym.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -49,6 +49,6 @@ RELOC/tex/latex/ifsym/uifsym.fd RELOC/tex/latex/ifsym/uifwea.fd catalogue-ctan /fonts/ifsym -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-symbol ++++++ iftex.doc.tar.xz ++++++ ++++++ iftex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iftex.tlpobj new/tlpkg/tlpobj/iftex.tlpobj --- old/tlpkg/tlpobj/iftex.tlpobj 2016-04-14 19:07:23.000000000 +0200 +++ new/tlpkg/tlpobj/iftex.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/generic/iftex/iftex.sty catalogue-also ifpdf ifluatex catalogue-ctan /macros/latex/contrib/iftex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics env-query catalogue-version 0.2 ++++++ ifthenx.doc.tar.xz ++++++ ++++++ ifthenx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifthenx.tlpobj new/tlpkg/tlpobj/ifthenx.tlpobj --- old/tlpkg/tlpobj/ifthenx.tlpobj 2016-04-14 19:07:23.000000000 +0200 +++ new/tlpkg/tlpobj/ifthenx.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/ifthenx/ifthenx.sty catalogue-also xifthen catalogue-ctan /macros/latex/contrib/ifthenx -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 cond-comp catalogue-version 0.1a ++++++ ifxetex.doc.tar.xz ++++++ ++++++ ifxetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifxetex.tlpobj new/tlpkg/tlpobj/ifxetex.tlpobj --- old/tlpkg/tlpobj/ifxetex.tlpobj 2016-04-14 19:07:23.000000000 +0200 +++ new/tlpkg/tlpobj/ifxetex.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/ifxetex/ifxetex.sty catalogue-also ifpdf ifvtex ifluatex catalogue-ctan /macros/generic/ifxetex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics env-query catalogue-version 0.6 ++++++ iitem.doc.tar.xz ++++++ ++++++ iitem.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iitem.tlpobj new/tlpkg/tlpobj/iitem.tlpobj --- old/tlpkg/tlpobj/iitem.tlpobj 2016-04-14 19:07:24.000000000 +0200 +++ new/tlpkg/tlpobj/iitem.tlpobj 2017-04-14 17:42:56.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/iitem/iitem.sty catalogue-ctan /macros/latex/contrib/iitem -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list catalogue-version 1.0 ++++++ ijmart.doc.tar.xz ++++++ ++++++ ijmart.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ijmart.tlpobj new/tlpkg/tlpobj/ijmart.tlpobj --- old/tlpkg/tlpobj/ijmart.tlpobj 2016-04-14 19:07:24.000000000 +0200 +++ new/tlpkg/tlpobj/ijmart.tlpobj 2017-04-14 17:42:57.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/bibtex/bst/ijmart/ijmart.bst RELOC/tex/latex/ijmart/ijmart.cls catalogue-ctan /macros/latex/contrib/ijmart -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.7 ++++++ ijqc.doc.tar.xz ++++++ ++++++ ijqc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ijqc.tlpobj new/tlpkg/tlpobj/ijqc.tlpobj --- old/tlpkg/tlpobj/ijqc.tlpobj 2016-04-14 19:07:25.000000000 +0200 +++ new/tlpkg/tlpobj/ijqc.tlpobj 2017-04-14 17:42:57.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=7 RELOC/bibtex/bst/ijqc/ijqc.bst catalogue-ctan /biblio/bibtex/contrib/ijqc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty journalpub catalogue-version 1.2 ++++++ imac.doc.tar.xz ++++++ ++++++ imac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imac.tlpobj new/tlpkg/tlpobj/imac.tlpobj --- old/tlpkg/tlpobj/imac.tlpobj 2016-04-14 19:07:25.000000000 +0200 +++ new/tlpkg/tlpobj/imac.tlpobj 2017-04-14 17:42:57.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/bibtex/bst/imac/imac.bst RELOC/tex/latex/imac/imac.sty catalogue-ctan /macros/latex/contrib/imac -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics confproc ++++++ image-gallery.doc.tar.xz ++++++ ++++++ image-gallery.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/image-gallery.tlpobj new/tlpkg/tlpobj/image-gallery.tlpobj --- old/tlpkg/tlpobj/image-gallery.tlpobj 2016-04-14 19:07:26.000000000 +0200 +++ new/tlpkg/tlpobj/image-gallery.tlpobj 2017-04-14 17:42:57.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/image-gallery/image-gallery.cls catalogue-ctan /macros/latex/contrib/image-gallery -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 class catalogue-version 1.0j ++++++ imakeidx.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/imakeidx/README new/doc/latex/imakeidx/README --- old/doc/latex/imakeidx/README 2016-05-18 23:57:59.000000000 +0200 +++ new/doc/latex/imakeidx/README 2016-11-25 19:29:11.000000000 +0100 @@ -1,5 +1,5 @@ -This is the README file relative to package imakeidx version 1.3c -dated 16 May 2016. +This is the README file relative to package imakeidx version 1.3e +dated 15 October 2016. Copyright 2010-2016 by Enrico Gregorio @@ -7,6 +7,7 @@ README this file imakeidx.dtx the documented source TeX file +imakeidx.pdf the documentation extracted from the dtx manifest.txt legalese information. WARNING: the derived files: @@ -16,38 +17,37 @@ are SIMULTANEOUSLY produced while running pdflatex on imakeidx.dtx. -The bundle is distributed under the LPPL license version 1.3c or +The bundle is distributed under the LPPL license version 1.3c or any later version. The bundle has the status of author maintained. The various files should be moved to the TDS folders as such: in source/latex/imakeidx/ file: imakeidx.dtx -in doc/latex/imakeidx/ files: README, manifest.txt.imakidx.pdf -in /tex/latex/imakeidx/ file: imakeidx.sty +in doc/latex/imakeidx/ files: README, manifest.txt, imakeidx.pdf +in tex/latex/imakeidx/ file: imakeidx.sty - -The main purpose of this bundle is to exploit the possibility of -running an index formatting program from within a document -typesetting task (tested with the engines pdftex, xetex, and luatex -in their incarnation set up to process the LaTeX markup) at the -\printindex level, so that one or more indices can be typeset in -such a way that they are always synchronous with the document they +The main purpose of this bundle is to exploit the possibility of +running an index formatting program from within a document +typesetting task (tested with the engines pdftex, xetex, and luatex +in their incarnation set up to process the LaTeX markup) at the +\printindex level, so that one or more indices can be typeset in +such a way that they are always synchronous with the document they belong to. -With the TeXlive 2010 release the makeindex program can be safely -run within a TeX run; with previous distributions the shell escape -feature had to be explicitly enabled. With the 2010 and later -distributions the makeindex program is directly accessible. If the -xindy program is used to sort index entries and format the index +With the TeXlive 2010 release the makeindex program can be safely +run within a TeX run; with previous distributions the shell escape +feature had to be explicitly enabled. With the 2010 and later +distributions the makeindex program is directly accessible. If the +xindy program is used to sort index entries and format the index files, it is still necessary to use the full shell escape option. -This bundle is compatible with most existing classes; some -conflicts with other packages have been reported and have been -resolved, or at least advice is given so as to overcome such +This bundle is compatible with most existing classes; some +conflicts with other packages have been reported and have been +resolved, or at least advice is given so as to overcome such conflicts. -This version 1.3c fixes a problem whereby fancyhdr would not produce -the correct headers; as a consequence, xpatch is not loaded any more. +This version 1.3e is a maintenance release for solving an issue +with the CTAN upload. Enrico Gregorio enrico dot gregorio at univr.it Binary files old/doc/latex/imakeidx/imakeidx.pdf and new/doc/latex/imakeidx/imakeidx.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/imakeidx/manifest.txt new/doc/latex/imakeidx/manifest.txt --- old/doc/latex/imakeidx/manifest.txt 2016-05-18 23:57:59.000000000 +0200 +++ new/doc/latex/imakeidx/manifest.txt 2016-11-25 19:29:11.000000000 +0100 @@ -1,5 +1,5 @@ The imakeidx extension package - version 1.3c of 16 May 2016 + version 1.3e of 15 October 2016 Copyright 2010-2016 by Enrico Gregorio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imakeidx.doc.tlpobj new/tlpkg/tlpobj/imakeidx.doc.tlpobj --- old/tlpkg/tlpobj/imakeidx.doc.tlpobj 2016-05-19 17:30:57.000000000 +0200 +++ new/tlpkg/tlpobj/imakeidx.doc.tlpobj 2017-04-14 17:42:57.000000000 +0200 @@ -1,8 +1,9 @@ name imakeidx.doc category Package -revision 41241 +revision 42287 shortdesc doc files of imakeidx relocated 1 -docfiles size=2 +docfiles size=129 RELOC/doc/latex/imakeidx/README + RELOC/doc/latex/imakeidx/imakeidx.pdf RELOC/doc/latex/imakeidx/manifest.txt ++++++ imakeidx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/imakeidx/imakeidx.sty new/tex/latex/imakeidx/imakeidx.sty --- old/tex/latex/imakeidx/imakeidx.sty 2016-05-18 23:57:59.000000000 +0200 +++ new/tex/latex/imakeidx/imakeidx.sty 2016-11-25 19:33:51.000000000 +0100 @@ -7,14 +7,14 @@ %% imakeidx.dtx (with options: `package') %% ___________________________________________________________ %% The imakeidx package for LaTeX -%% Copyright (C) 2010-2013 Enrico Gregorio +%% Copyright (C) 2010-2016 Enrico Gregorio %% All rights reserved %% %% License information appended %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{imakeidx}% - [2016/05/16 v1.3c Package for typesetting indices in a synchronous mode] + [2016/10/15 v1.3e Package for typesetting indices in a synchronous mode] @@ -195,9 +195,11 @@ \def\imki@shellwarn{} \ifdefined\imki@shellescape % luatex \else - \@ifundefined{shellescape} - {\let\imki@shellescape\pdfshellescape} % pdftex - {\let\imki@shellescape\shellescape} % xetex + \ifdefined\shellescape + \let\imki@shellescape\shellescape % xetex + \else + \let\imki@shellescape\pdfshellescape % pdftex + \fi \fi \ifnum\imki@shellescape=\z@ \let\KV@imki@noautomaticfalse\KV@imki@noautomatictrue @@ -393,7 +395,7 @@ \@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex \AtBeginDocument{\hideindexmarks}}{} %% -%% Copyright 2010--2013 Enrico Gregorio <Enrico dot Gregorio at univr dot it> +%% Copyright 2010--2016 Enrico Gregorio <Enrico dot Gregorio at univr dot it> %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imakeidx.tlpobj new/tlpkg/tlpobj/imakeidx.tlpobj --- old/tlpkg/tlpobj/imakeidx.tlpobj 2016-05-19 17:30:57.000000000 +0200 +++ new/tlpkg/tlpobj/imakeidx.tlpobj 2017-04-14 17:42:58.000000000 +0200 @@ -1,6 +1,6 @@ name imakeidx category Package -revision 41241 +revision 42287 shortdesc A package for producing multiple indexes relocated 1 longdesc The package enables the user to produce and typeset one or more @@ -14,7 +14,7 @@ runfiles size=4 RELOC/tex/latex/imakeidx/imakeidx.sty catalogue-ctan /macros/latex/contrib/imakeidx -catalogue-date 2016-05-17 05:19:32 +0200 +catalogue-date 2016-10-15 23:51:37 +0200 catalogue-license lppl1.3 catalogue-topics index -catalogue-version 1.3c +catalogue-version 1.3e ++++++ imfellenglish.doc.tar.xz ++++++ ++++++ imfellenglish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imfellenglish.tlpobj new/tlpkg/tlpobj/imfellenglish.tlpobj --- old/tlpkg/tlpobj/imfellenglish.tlpobj 2016-04-14 19:07:26.000000000 +0200 +++ new/tlpkg/tlpobj/imfellenglish.tlpobj 2017-04-14 17:42:58.000000000 +0200 @@ -76,6 +76,6 @@ RELOC/tex/latex/imfellenglish/TS1IMFELLEnglish-TLF.fd RELOC/tex/latex/imfellenglish/imfellEnglish.sty catalogue-ctan /fonts/imfellenglish -catalogue-date 2015-11-09 20:28:48 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-otf font-type1 ++++++ impatient-cn.doc.tar.xz ++++++ ++++++ impatient-fr.doc.tar.xz ++++++ ++++++ impatient.doc.tar.xz ++++++ ++++++ impnattypo.doc.tar.xz ++++++ ++++++ impnattypo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/impnattypo.tlpobj new/tlpkg/tlpobj/impnattypo.tlpobj --- old/tlpkg/tlpobj/impnattypo.tlpobj 2016-04-14 19:07:40.000000000 +0200 +++ new/tlpkg/tlpobj/impnattypo.tlpobj 2017-04-14 17:43:03.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/impnattypo/impnattypo.sty catalogue-also e-french catalogue-ctan /macros/latex/contrib/impnattypo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting catalogue-version 1.4 ++++++ import.doc.tar.xz ++++++ ++++++ import.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/import.tlpobj new/tlpkg/tlpobj/import.tlpobj --- old/tlpkg/tlpobj/import.tlpobj 2016-04-14 19:07:40.000000000 +0200 +++ new/tlpkg/tlpobj/import.tlpobj 2017-04-14 17:43:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/import/import.sty catalogue-ctan /macros/latex/contrib/import -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics file-control catalogue-version 5.1 ++++++ imsproc.doc.tar.xz ++++++ ++++++ imsproc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imsproc.tlpobj new/tlpkg/tlpobj/imsproc.tlpobj --- old/tlpkg/tlpobj/imsproc.tlpobj 2016-04-14 19:07:40.000000000 +0200 +++ new/tlpkg/tlpobj/imsproc.tlpobj 2017-04-14 17:43:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=14 RELOC/tex/xelatex/imsproc/imsproc.cls catalogue-ctan /macros/xetex/latex/imsproc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics confproc catalogue-version 0.1 ++++++ imtekda.doc.tar.xz ++++++ ++++++ imtekda.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/imtekda.tlpobj new/tlpkg/tlpobj/imtekda.tlpobj --- old/tlpkg/tlpobj/imtekda.tlpobj 2016-04-14 19:07:41.000000000 +0200 +++ new/tlpkg/tlpobj/imtekda.tlpobj 2017-04-14 17:43:04.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=4 RELOC/tex/latex/imtekda/IMTEKda.cls catalogue-ctan /macros/latex/contrib/imtekda -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.7 ++++++ incgraph.doc.tar.xz ++++++ ++++++ incgraph.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/incgraph.tlpobj new/tlpkg/tlpobj/incgraph.tlpobj --- old/tlpkg/tlpobj/incgraph.tlpobj 2016-04-14 19:07:42.000000000 +0200 +++ new/tlpkg/tlpobj/incgraph.tlpobj 2017-04-14 17:43:05.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/incgraph/incgraph.sty catalogue-also graphicx catalogue-ctan /macros/latex/contrib/incgraph -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-incl catalogue-version 1.12 ++++++ inconsolata.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/README new/doc/fonts/inconsolata/README --- old/doc/fonts/inconsolata/README 2016-02-23 22:26:18.000000000 +0100 +++ new/doc/fonts/inconsolata/README 2017-01-06 00:01:03.000000000 +0100 @@ -8,11 +8,23 @@ part of all distributions of LaTeX version 2003/12/01 or later. Those files and LaTeX support file zi4.sty are - Copyright (c) 2013--2016 Michael Sharpe + Copyright (c) 2013--2017 Michael Sharpe Files provided "as is", with no warranties. -Current version: 1.10 +Current version: 1.112 + +Changes in version 1.112 +Corrected a bug in sty file handling of scale[d] option. (Thanks Isaac Sánchez Barrera.) + +Changes in version 1.111 +Corrected internal filename for zi4.sty. + +Changes in version 1.11 +1. Added narrow versions of the Inconsolata fonts, reducing widths by 10%. The narrow versions may be better for printing code. +2. Added a number of options to allow control over hyphenation and word spacing. +3. Some small changes to glyph shapes. +4. Added documentation for the above. Changes in version 1.10 Fixed names of Stylistic Sets and added to documentation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/afmcmds.txt new/doc/fonts/inconsolata/afmcmds.txt --- old/doc/fonts/inconsolata/afmcmds.txt 2013-06-28 01:33:43.000000000 +0200 +++ new/doc/fonts/inconsolata/afmcmds.txt 2016-12-31 05:01:05.000000000 +0100 @@ -70,3 +70,75 @@ afm2tfm Inconsolata-zi4r -T i4-ts1.enc ts1-zi4r.tfm afm2tfm Inconsolata-zi4b -T i4-ts1.enc ts1-zi4b.tfm + +# same again with narrow +afm2tfm InconsolataN-Regular -T i4-t1-0.enc t1-zi4nr-0.tfm +afm2tfm InconsolataN-Regular -T i4-t1-1.enc t1-zi4nr-1.tfm +afm2tfm InconsolataN-Regular -T i4-t1-2.enc t1-zi4nr-2.tfm +afm2tfm InconsolataN-Regular -T i4-t1-3.enc t1-zi4nr-3.tfm +afm2tfm InconsolataN-Regular -T i4-t1-4.enc t1-zi4nr-4.tfm +afm2tfm InconsolataN-Regular -T i4-t1-5.enc t1-zi4nr-5.tfm +afm2tfm InconsolataN-Regular -T i4-t1-6.enc t1-zi4nr-6.tfm +afm2tfm InconsolataN-Regular -T i4-t1-7.enc t1-zi4nr-7.tfm +afm2tfm InconsolataN-Bold -T i4-t1-0.enc t1-zi4nb-0.tfm +afm2tfm InconsolataN-Bold -T i4-t1-1.enc t1-zi4nb-1.tfm +afm2tfm InconsolataN-Bold -T i4-t1-2.enc t1-zi4nb-2.tfm +afm2tfm InconsolataN-Bold -T i4-t1-3.enc t1-zi4nb-3.tfm +afm2tfm InconsolataN-Bold -T i4-t1-4.enc t1-zi4nb-4.tfm +afm2tfm InconsolataN-Bold -T i4-t1-5.enc t1-zi4nb-5.tfm +afm2tfm InconsolataN-Bold -T i4-t1-6.enc t1-zi4nb-6.tfm +afm2tfm InconsolataN-Bold -T i4-t1-7.enc t1-zi4nb-7.tfm + +afm2tfm InconsolataN-Regular -T i4-ot1-0.enc ot1-zi4nr-0.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-1.enc ot1-zi4nr-1.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-2.enc ot1-zi4nr-2.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-3.enc ot1-zi4nr-3.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-4.enc ot1-zi4nr-4.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-5.enc ot1-zi4nr-5.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-6.enc ot1-zi4nr-6.tfm +afm2tfm InconsolataN-Regular -T i4-ot1-7.enc ot1-zi4nr-7.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-0.enc ot1-zi4nb-0.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-1.enc ot1-zi4nb-1.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-2.enc ot1-zi4nb-2.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-3.enc ot1-zi4nb-3.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-4.enc ot1-zi4nb-4.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-5.enc ot1-zi4nb-5.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-6.enc ot1-zi4nb-6.tfm +afm2tfm InconsolataN-Bold -T i4-ot1-7.enc ot1-zi4nb-7.tfm + +afm2tfm InconsolataN-Regular -T i4-ly1-0.enc ly1-zi4nr-0.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-1.enc ly1-zi4nr-1.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-2.enc ly1-zi4nr-2.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-3.enc ly1-zi4nr-3.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-4.enc ly1-zi4nr-4.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-5.enc ly1-zi4nr-5.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-6.enc ly1-zi4nr-6.tfm +afm2tfm InconsolataN-Regular -T i4-ly1-7.enc ly1-zi4nr-7.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-0.enc ly1-zi4nb-0.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-1.enc ly1-zi4nb-1.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-2.enc ly1-zi4nb-2.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-3.enc ly1-zi4nb-3.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-4.enc ly1-zi4nb-4.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-5.enc ly1-zi4nb-5.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-6.enc ly1-zi4nb-6.tfm +afm2tfm InconsolataN-Bold -T i4-ly1-7.enc ly1-zi4nb-7.tfm + +afm2tfm InconsolataN-Regular -T i4-qx-0.enc qx-zi4nr-0.tfm +afm2tfm InconsolataN-Regular -T i4-qx-1.enc qx-zi4nr-1.tfm +afm2tfm InconsolataN-Regular -T i4-qx-2.enc qx-zi4nr-2.tfm +afm2tfm InconsolataN-Regular -T i4-qx-3.enc qx-zi4nr-3.tfm +afm2tfm InconsolataN-Regular -T i4-qx-4.enc qx-zi4nr-4.tfm +afm2tfm InconsolataN-Regular -T i4-qx-5.enc qx-zi4nr-5.tfm +afm2tfm InconsolataN-Regular -T i4-qx-6.enc qx-zi4nr-6.tfm +afm2tfm InconsolataN-Regular -T i4-qx-7.enc qx-zi4nr-7.tfm +afm2tfm InconsolataN-Bold -T i4-qx-0.enc qx-zi4nb-0.tfm +afm2tfm InconsolataN-Bold -T i4-qx-1.enc qx-zi4nb-1.tfm +afm2tfm InconsolataN-Bold -T i4-qx-2.enc qx-zi4nb-2.tfm +afm2tfm InconsolataN-Bold -T i4-qx-3.enc qx-zi4nb-3.tfm +afm2tfm InconsolataN-Bold -T i4-qx-4.enc qx-zi4nb-4.tfm +afm2tfm InconsolataN-Bold -T i4-qx-5.enc qx-zi4nb-5.tfm +afm2tfm InconsolataN-Bold -T i4-qx-6.enc qx-zi4nb-6.tfm +afm2tfm InconsolataN-Bold -T i4-qx-7.enc qx-zi4nb-7.tfm + +afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr.tfm +afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb.tfm Binary files old/doc/fonts/inconsolata/inconsolata-doc.pdf and new/doc/fonts/inconsolata/inconsolata-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/inconsolata-doc.tex new/doc/fonts/inconsolata/inconsolata-doc.tex --- old/doc/fonts/inconsolata/inconsolata-doc.tex 2016-02-23 22:26:18.000000000 +0100 +++ new/doc/fonts/inconsolata/inconsolata-doc.tex 2016-12-31 05:01:05.000000000 +0100 @@ -4,21 +4,21 @@ \usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent \usepackage{graphicx} \usepackage{booktabs} -%\pdfmapfile{+zi4.map} +\pdfmapfile{=zi4.map} %SetFonts % libertine text and newtxmath %\usepackage{lmodern} -\usepackage[lining]{libertine} +\usepackage[osf,sups]{baskervillef} \usepackage[T1]{fontenc} %\usepackage[scaled=.83]{beramono} \usepackage[varqu]{zi4} %\usepackage{amsmath,amsthm} -\usepackage[libertine,cmbraces]{newtxmath} +\usepackage[baskerville]{newtxmath} \usepackage{textcomp} -\renewcommand\rmdefault{LinuxLibertineT-OsF} -\usepackage[supstfm=libertinesups,% - supscaled=1.2,% - raised=-.13em]{superiors} +%\renewcommand\rmdefault{LinuxLibertineT-OsF} +%\usepackage[supstfm=libertinesups,% +% supscaled=1.2,% +% raised=-.13em]{superiors} %SetFonts %\UndeclareTextCommand{\textquotesingle}{LY1} %\DeclareTextSymbol{\textquotesingle}{TS1}{39} @@ -31,22 +31,33 @@ %\show\textquotesingle \maketitle The package provides updated PostScript and Opentype versions of Raph Levien's fine sans serif typewriter font -\texttt{Inconsolata} in regular and bold weights, adding some glyphs which may optionally replace existing \texttt{quotedbl} and \texttt{quotesingle} and lower-case~L, along with new slashed zero, \texttt{arrowright} and \texttt{arrowleft} glyphs. \LaTeX\ support files are also provided. +\texttt{Inconsolata} in regular and bold weights, adding some glyphs which may optionally replace existing \texttt{quotedbl} and \texttt{quotesingle} and lower-case~L, along with new slashed zero, \texttt{arrowright} and \texttt{arrowleft} glyphs. As of version 1.11, narrower renditions are also provided, with widths reduced from 500 units to 450 units. \LaTeX\ support files are also provided for both. \section*{\LaTeX\ usage} -To use {\texttt{Inconsolata} as your typewriter font, add \verb|\usepackage{zi4}| to your preamble after any other packages that might load another typewriter font. This +To use {\texttt{Inconsolata} as your typewriter font, add \verb|\usepackage{inconsolata}| (or \verb|\usepackage{zi4}|) to your preamble after any other packages that might load another typewriter font. This will change the typewriter font family to \texttt{zi4}, the family name used -by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}. (The original {\tt inconsolata} is now obsolete and a new version of {\tt inconsolata.sty} is included in the package, so that \verb|\usepackage{inconsolata}| should have the same effect as \verb|\usepackage{zi4}|, unless you still have the original package somewhere taaking priority over the new one.) +by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}. (The original {\tt inconsolata} is now obsolete and is no longer distributed as part of \TeX Live.) -As with Karl Berry's original \texttt{inconsolata} package, the \LaTeX\ package \texttt{zi4} offers four encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---and provides the following options which some may find improve its utility for displaying verbatim text such as code fragments. +As with Karl Berry's original \texttt{inconsolata} package, the new package offers four basic encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---, plus a \texttt{TS1} text comanion encoding. It provides the following options which some may find improve its utility for displaying verbatim text such as code fragments. \begin{itemize} -\item The option \texttt{scaled=x} allows you to scale all typewriter text and verbatim text by the factor \texttt{x}. +\item The option \texttt{scaled=x} (or \texttt{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \texttt{x}. \item The default zero in \texttt{zi4} is now slashed. The unslashed zero may be specified with the option \texttt{var0}. \item For those who find the default lower-case L(\texttt{l}) a bit too close to the numeral~\texttt{1}, there is an option \texttt{varl} which substitutes a more distinctive shape for all glyphs related to lower-case L. \item The \texttt{zi4} package loads the \texttt{textcomp} package, which points to a TS$1$-encoded font that has been modified to have uncurved left and right quotes, especially important in code fragments, by use of \texttt{textcomp} glyphs \verb|\textasciigrave| and \verb|\textquotesingle|. The \texttt{varqu} option provides further upright quote forms for glyphs that are not part of the \texttt{textcomp} package, such as the default double quote glyph \texttt{quotedbl} and \texttt{quotesingle}, which by default have a small slant. (Note that the latter is not part of all encodings---it is present in \texttt{OT1}, \texttt{LY1} and \texttt{QX}, but not in \texttt{T1}.) \item The package loads \texttt{upquote} by default, but provides an option \texttt{noupquote} to override it. +\item (new in v.1.11) The option \texttt{narrow} causes the narrow versions to be used, having widths reduced by 10\%. +\item (new in v.1.11) The default behavior of {\tt inconsolata} is to prevent all automatic hyphenation, to permit spacing to stretch and shrink, and to place some extra space after a line ending period. This version offers the following options to change the default behavior. +\begin{itemize} +\item +Option {\tt hyphenate} allows automatic hyphenation to occur, which may be useful if your usage is simply to have blocks of text is quasi-typewritten form, though with variable word-spacing. +\item option {\tt mono} forces the behavior to mimic that of the Computer Modern Typewriter font---all spaces have the same width as the glyphs, and a full extra space is inserted after a line-ending period. +\item You may modify individual {\tt fontdimen} values that govern this behavior by means of the options {\tt spacing}, {\tt stretch}, {\tt shrink} and {\tt extrasp}. These will override any values changed by the option {\tt mono}, for example, giving you a way to get monospacing but prevent extra space after a period, with +\begin{verbatim} +\usepackage[mono,extrasp=0em]{inconsolata} +\end{verbatim} +\end{itemize} \end{itemize} When used in ordinary typewriter mode (ie, with \verb|\texttt{}| or the deprecated form \verb|{\tt }|), left and right quotes are rendered as in ordinary text. For example, \begin{verbatim} @@ -104,9 +115,10 @@ \usepackage{upquote} \end{verbatim} which is built-in to the \texttt{zi4.sty} code and need not be repeated. -\section*{Opentype issues} The package includes two Opentype fonts named \textsf{Inconsolatazi4-Regular} and \textsf{Inconsolatazi4-Bold}, which may be loaded with \texttt{fontspec}: +\section*{Opentype issues} The package includes four Opentype fonts named \textsf{Inconsolatazi4-Regular}, \textsf{Inconsolatazi4-Bold}, \textsf{InconsolataN-Regular} and \textsf{InconsolataN-Bold}, the last two being for the narrow variant. The narrow and the normal width versions may be loaded using \texttt{fontspec}: \begin{verbatim} -\fontspec{Inconsolatazi4} %slashed zero, curly quotes, default l +\fontspec{inconsolata} % normal width, slashed zero, curly quotes, default l +\fontspec{inconsolatan} % nnarrow width, slashed zero, curly quotes, default l \end{verbatim} The fonts contain three Stylistic Set variants that may be used to control the shape of lower case l (\texttt{ss01}), the form of zero (\texttt{ss02}) and the shape of quotes (\texttt{ss03}). One or more of these may be specified using one of the following example lines: \begin{verbatim} @@ -115,7 +127,7 @@ \setmonofont[StylisticSet=3]{Inconsolatazi4} % straight quotes \setmonofont[StylisticSet={1,3}]{Inconsolatazi4} % shapely l, upright quotes \end{verbatim} -(Specifying {\tt Inconsolatazi4} as the font name tells {\tt fontspec} to look for the file {\tt Inconsolatazi4.fontspec} which spells out the names of the associated {\tt.otf} files.) +To prevent automatic hyphenation, add the option {\tt HyphenChar=None} to the call. (Specifying {\tt inconsolata} as the font name tells {\tt fontspec} to look for the file {\tt inconsolata.fontspec} which spells out the names of the associated {\tt.otf} files.) Note that one cannot expect exactly the same rendition from \LaTeX\ typewriter modes and the \textsf{fontspec} typewriter modes. For one thing, in \LaTeX, the typewriter left quote symbol is \texttt{quoteleft}, while under \textsf{fontspec}, it is the \texttt{grave} symbol. \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inconsolata.doc.tlpobj new/tlpkg/tlpobj/inconsolata.doc.tlpobj --- old/tlpkg/tlpobj/inconsolata.doc.tlpobj 2016-04-14 19:07:43.000000000 +0200 +++ new/tlpkg/tlpobj/inconsolata.doc.tlpobj 2017-04-14 17:43:05.000000000 +0200 @@ -1,9 +1,9 @@ name inconsolata.doc category Package -revision 39839 +revision 42871 shortdesc doc files of inconsolata relocated 1 -docfiles size=188 +docfiles size=161 RELOC/doc/fonts/inconsolata/OFL.txt RELOC/doc/fonts/inconsolata/README RELOC/doc/fonts/inconsolata/afmcmds.txt ++++++ inconsolata.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/inconsolata/zi4.map new/fonts/map/dvips/inconsolata/zi4.map --- old/fonts/map/dvips/inconsolata/zi4.map 2016-02-17 22:44:57.000000000 +0100 +++ new/fonts/map/dvips/inconsolata/zi4.map 2016-12-31 05:01:05.000000000 +0100 @@ -64,3 +64,70 @@ qx-zi4b-7 Inconsolatazi4-Bold " zi4QXTTEncoding7 ReEncodeFont " <i4-qx-7.enc <Inconsolata-zi4b.pfb ts1-zi4r Inconsolatazi4-Regular " zi4TS1Encoding ReEncodeFont " <i4-ts1.enc <Inconsolata-zi4r.pfb ts1-zi4b Inconsolatazi4-Bold " zi4TS1Encoding ReEncodeFont " <i4-ts1.enc <Inconsolata-zi4b.pfb + +t1-zi4nr-0 InconsolataN-Regular " zi4T1Encoding0 ReEncodeFont " <i4-t1-0.enc <InconsolataN-Regular.pfb +t1-zi4nr-1 InconsolataN-Regular " zi4T1Encoding1 ReEncodeFont " <i4-t1-1.enc <InconsolataN-Regular.pfb +t1-zi4nr-2 InconsolataN-Regular " zi4T1Encoding2 ReEncodeFont " <i4-t1-2.enc <InconsolataN-Regular.pfb +t1-zi4nr-3 InconsolataN-Regular " zi4T1Encoding3 ReEncodeFont " <i4-t1-3.enc <InconsolataN-Regular.pfb +t1-zi4nr-4 InconsolataN-Regular " zi4T1Encoding4 ReEncodeFont " <i4-t1-4.enc <InconsolataN-Regular.pfb +t1-zi4nr-5 InconsolataN-Regular " zi4T1Encoding5 ReEncodeFont " <i4-t1-5.enc <InconsolataN-Regular.pfb +t1-zi4nr-6 InconsolataN-Regular " zi4T1Encoding6 ReEncodeFont " <i4-t1-6.enc <InconsolataN-Regular.pfb +t1-zi4nr-7 InconsolataN-Regular " zi4T1Encoding7 ReEncodeFont " <i4-t1-7.enc <InconsolataN-Regular.pfb +t1-zi4nb-0 InconsolataN-Bold " zi4T1Encoding0 ReEncodeFont " <i4-t1-0.enc <InconsolataN-Bold.pfb +t1-zi4nb-1 InconsolataN-Bold " zi4T1Encoding1 ReEncodeFont " <i4-t1-1.enc <InconsolataN-Bold.pfb +t1-zi4nb-2 InconsolataN-Bold " zi4T1Encoding2 ReEncodeFont " <i4-t1-2.enc <InconsolataN-Bold.pfb +t1-zi4nb-3 InconsolataN-Bold " zi4T1Encoding3 ReEncodeFont " <i4-t1-3.enc <InconsolataN-Bold.pfb +t1-zi4nb-4 InconsolataN-Bold " zi4T1Encoding4 ReEncodeFont " <i4-t1-4.enc <InconsolataN-Bold.pfb +t1-zi4nb-5 InconsolataN-Bold " zi4T1Encoding5 ReEncodeFont " <i4-t1-5.enc <InconsolataN-Bold.pfb +t1-zi4nb-6 InconsolataN-Bold " zi4T1Encoding6 ReEncodeFont " <i4-t1-6.enc <InconsolataN-Bold.pfb +t1-zi4nb-7 InconsolataN-Bold " zi4T1Encoding7 ReEncodeFont " <i4-t1-7.enc <InconsolataN-Bold.pfb +ot1-zi4nr-0 InconsolataN-Regular " zi4OT1TypewriterEncoding0 ReEncodeFont " <i4-ot1-0.enc <InconsolataN-Regular.pfb +ot1-zi4nr-1 InconsolataN-Regular " zi4OT1TypewriterEncoding1 ReEncodeFont " <i4-ot1-1.enc <InconsolataN-Regular.pfb +ot1-zi4nr-2 InconsolataN-Regular " zi4OT1TypewriterEncoding2 ReEncodeFont " <i4-ot1-2.enc <InconsolataN-Regular.pfb +ot1-zi4nr-3 InconsolataN-Regular " zi4OT1TypewriterEncoding3 ReEncodeFont " <i4-ot1-3.enc <InconsolataN-Regular.pfb +ot1-zi4nr-4 InconsolataN-Regular " zi4OT1TypewriterEncoding4 ReEncodeFont " <i4-ot1-4.enc <InconsolataN-Regular.pfb +ot1-zi4nr-5 InconsolataN-Regular " zi4OT1TypewriterEncoding5 ReEncodeFont " <i4-ot1-5.enc <InconsolataN-Regular.pfb +ot1-zi4nr-6 InconsolataN-Regular " zi4OT1TypewriterEncoding6 ReEncodeFont " <i4-ot1-6.enc <InconsolataN-Regular.pfb +ot1-zi4nr-7 InconsolataN-Regular " zi4OT1TypewriterEncoding7 ReEncodeFont " <i4-ot1-7.enc <InconsolataN-Regular.pfb +ot1-zi4nb-0 InconsolataN-Bold " zi4OT1TypewriterEncoding0 ReEncodeFont " <i4-ot1-0.enc <InconsolataN-Bold.pfb +ot1-zi4nb-1 InconsolataN-Bold " zi4OT1TypewriterEncoding1 ReEncodeFont " <i4-ot1-1.enc <InconsolataN-Bold.pfb +ot1-zi4nb-2 InconsolataN-Bold " zi4OT1TypewriterEncoding2 ReEncodeFont " <i4-ot1-2.enc <InconsolataN-Bold.pfb +ot1-zi4nb-3 InconsolataN-Bold " zi4OT1TypewriterEncoding3 ReEncodeFont " <i4-ot1-3.enc <InconsolataN-Bold.pfb +ot1-zi4nb-4 InconsolataN-Bold " zi4OT1TypewriterEncoding4 ReEncodeFont " <i4-ot1-4.enc <InconsolataN-Bold.pfb +ot1-zi4nb-5 InconsolataN-Bold " zi4OT1TypewriterEncoding5 ReEncodeFont " <i4-ot1-5.enc <InconsolataN-Bold.pfb +ot1-zi4nb-6 InconsolataN-Bold " zi4OT1TypewriterEncoding6 ReEncodeFont " <i4-ot1-6.enc <InconsolataN-Bold.pfb +ot1-zi4nb-7 InconsolataN-Bold " zi4OT1TypewriterEncoding7 ReEncodeFont " <i4-ot1-7.enc <InconsolataN-Bold.pfb +ly1-zi4nr-0 InconsolataN-Regular " zi4LY1Encoding0 ReEncodeFont " <i4-ly1-0.enc <InconsolataN-Regular.pfb +ly1-zi4nr-1 InconsolataN-Regular " zi4LY1Encoding1 ReEncodeFont " <i4-ly1-1.enc <InconsolataN-Regular.pfb +ly1-zi4nr-2 InconsolataN-Regular " zi4LY1Encoding2 ReEncodeFont " <i4-ly1-2.enc <InconsolataN-Regular.pfb +ly1-zi4nr-3 InconsolataN-Regular " zi4LY1Encoding3 ReEncodeFont " <i4-ly1-3.enc <InconsolataN-Regular.pfb +ly1-zi4nr-4 InconsolataN-Regular " zi4LY1Encoding4 ReEncodeFont " <i4-ly1-4.enc <InconsolataN-Regular.pfb +ly1-zi4nr-5 InconsolataN-Regular " zi4LY1Encoding5 ReEncodeFont " <i4-ly1-5.enc <InconsolataN-Regular.pfb +ly1-zi4nr-6 InconsolataN-Regular " zi4LY1Encoding6 ReEncodeFont " <i4-ly1-6.enc <InconsolataN-Regular.pfb +ly1-zi4nr-7 InconsolataN-Regular " zi4LY1Encoding7 ReEncodeFont " <i4-ly1-7.enc <InconsolataN-Regular.pfb +ly1-zi4nb-0 InconsolataN-Bold " zi4LY1Encoding0 ReEncodeFont " <i4-ly1-0.enc <InconsolataN-Bold.pfb +ly1-zi4nb-1 InconsolataN-Bold " zi4LY1Encoding1 ReEncodeFont " <i4-ly1-1.enc <InconsolataN-Bold.pfb +ly1-zi4nb-2 InconsolataN-Bold " zi4LY1Encoding2 ReEncodeFont " <i4-ly1-2.enc <InconsolataN-Bold.pfb +ly1-zi4nb-3 InconsolataN-Bold " zi4LY1Encoding3 ReEncodeFont " <i4-ly1-3.enc <InconsolataN-Bold.pfb +ly1-zi4nb-4 InconsolataN-Bold " zi4LY1Encoding4 ReEncodeFont " <i4-ly1-4.enc <InconsolataN-Bold.pfb +ly1-zi4nb-5 InconsolataN-Bold " zi4LY1Encoding5 ReEncodeFont " <i4-ly1-5.enc <InconsolataN-Bold.pfb +ly1-zi4nb-6 InconsolataN-Bold " zi4LY1Encoding6 ReEncodeFont " <i4-ly1-6.enc <InconsolataN-Bold.pfb +ly1-zi4nb-7 InconsolataN-Bold " zi4LY1Encoding7 ReEncodeFont " <i4-ly1-7.enc <InconsolataN-Bold.pfb +qx-zi4nr-0 InconsolataN-Regular " zi4QXTTEncoding0 ReEncodeFont " <i4-qx-0.enc <InconsolataN-Regular.pfb +qx-zi4nr-1 InconsolataN-Regular " zi4QXTTEncoding1 ReEncodeFont " <i4-qx-1.enc <InconsolataN-Regular.pfb +qx-zi4nr-2 InconsolataN-Regular " zi4QXTTEncoding2 ReEncodeFont " <i4-qx-2.enc <InconsolataN-Regular.pfb +qx-zi4nr-3 InconsolataN-Regular " zi4QXTTEncoding3 ReEncodeFont " <i4-qx-3.enc <InconsolataN-Regular.pfb +qx-zi4nr-4 InconsolataN-Regular " zi4QXTTEncoding4 ReEncodeFont " <i4-qx-4.enc <InconsolataN-Regular.pfb +qx-zi4nr-5 InconsolataN-Regular " zi4QXTTEncoding5 ReEncodeFont " <i4-qx-5.enc <InconsolataN-Regular.pfb +qx-zi4nr-6 InconsolataN-Regular " zi4QXTTEncoding6 ReEncodeFont " <i4-qx-6.enc <InconsolataN-Regular.pfb +qx-zi4nr-7 InconsolataN-Regular " zi4QXTTEncoding7 ReEncodeFont " <i4-qx-7.enc <InconsolataN-Regular.pfb +qx-zi4nb-0 InconsolataN-Bold " zi4QXTTEncoding0 ReEncodeFont " <i4-qx-0.enc <InconsolataN-Bold.pfb +qx-zi4nb-1 InconsolataN-Bold " zi4QXTTEncoding1 ReEncodeFont " <i4-qx-1.enc <InconsolataN-Bold.pfb +qx-zi4nb-2 InconsolataN-Bold " zi4QXTTEncoding2 ReEncodeFont " <i4-qx-2.enc <InconsolataN-Bold.pfb +qx-zi4nb-3 InconsolataN-Bold " zi4QXTTEncoding3 ReEncodeFont " <i4-qx-3.enc <InconsolataN-Bold.pfb +qx-zi4nb-4 InconsolataN-Bold " zi4QXTTEncoding4 ReEncodeFont " <i4-qx-4.enc <InconsolataN-Bold.pfb +qx-zi4nb-5 InconsolataN-Bold " zi4QXTTEncoding5 ReEncodeFont " <i4-qx-5.enc <InconsolataN-Bold.pfb +qx-zi4nb-6 InconsolataN-Bold " zi4QXTTEncoding6 ReEncodeFont " <i4-qx-6.enc <InconsolataN-Bold.pfb +qx-zi4nb-7 InconsolataN-Bold " zi4QXTTEncoding7 ReEncodeFont " <i4-qx-7.enc <InconsolataN-Bold.pfb +ts1-zi4nr InconsolataN-Regular " zi4TS1Encoding ReEncodeFont " <i4-ts1.enc <InconsolataN-Regular.pfb +ts1-zi4nb InconsolataN-Bold " zi4TS1Encoding ReEncodeFont " <i4-ts1.enc <InconsolataN-Bold.pfb Binary files old/fonts/opentype/public/inconsolata/InconsolataN-Bold.otf and new/fonts/opentype/public/inconsolata/InconsolataN-Bold.otf differ Binary files old/fonts/opentype/public/inconsolata/InconsolataN-Regular.otf and new/fonts/opentype/public/inconsolata/InconsolataN-Regular.otf differ Binary files old/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf and new/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-0.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-2.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-4.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-6.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-1.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-3.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-5.tfm differ Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-7.tfm differ Binary files old/fonts/tfm/public/inconsolata/ts1-zi4nb.tfm and new/fonts/tfm/public/inconsolata/ts1-zi4nb.tfm differ Binary files old/fonts/tfm/public/inconsolata/ts1-zi4nr.tfm and new/fonts/tfm/public/inconsolata/ts1-zi4nr.tfm differ Binary files old/fonts/type1/public/inconsolata/Inconsolata-zi4r.pfb and new/fonts/type1/public/inconsolata/Inconsolata-zi4r.pfb differ Binary files old/fonts/type1/public/inconsolata/InconsolataN-Bold.pfb and new/fonts/type1/public/inconsolata/InconsolataN-Bold.pfb differ Binary files old/fonts/type1/public/inconsolata/InconsolataN-Regular.pfb and new/fonts/type1/public/inconsolata/InconsolataN-Regular.pfb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/Inconsolatazi4.fontspec new/tex/latex/inconsolata/Inconsolatazi4.fontspec --- old/tex/latex/inconsolata/Inconsolatazi4.fontspec 2015-01-10 01:16:56.000000000 +0100 +++ new/tex/latex/inconsolata/Inconsolatazi4.fontspec 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -\defaultfontfeatures[inconsolata] - { - Extension = .otf , - UprightFont = Inconsolatazi4-Regular, - BoldFont = Inconsolatazi4-Bold - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/inconsolata.fontspec new/tex/latex/inconsolata/inconsolata.fontspec --- old/tex/latex/inconsolata/inconsolata.fontspec 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/inconsolata/inconsolata.fontspec 2016-12-31 05:01:06.000000000 +0100 @@ -0,0 +1,6 @@ +\defaultfontfeatures[inconsolata] + { + Extension = .otf , + UprightFont = Inconsolatazi4-Regular, + BoldFont = Inconsolatazi4-Bold + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/inconsolata.sty new/tex/latex/inconsolata/inconsolata.sty --- old/tex/latex/inconsolata/inconsolata.sty 2016-02-23 22:26:18.000000000 +0100 +++ new/tex/latex/inconsolata/inconsolata.sty 2017-01-06 00:01:05.000000000 +0100 @@ -1,52 +1,117 @@ -% Copyright 2014 Michael Sharpe +% Copyright 2014--2017 Michael Sharpe % Based initially on Karl Berry's inconsolata.sty. % You may freely use, modify and/or distribute this file. -\def\fileversion{1.10} -\def\filedate{2016/02/22} +\def\fileversion{1.112} +\def\filedate{2017/01/04} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{inconsolata}[\filedate\space v\fileversion] \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)} \RequirePackage{textcomp} -\RequirePackage{keyval} +\RequirePackage{xkeyval} \newcount\zifour@ocount \newif\ifzifour@altzero \newif\ifzifour@noupq -\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}} - -\DeclareOption*{% - \begingroup - \edef\x{\endgroup - \noexpand\setkeys{zifour}{\CurrentOption}}% - \x} +\newif\ifzifour@mono +\newif\ifzifour@hyphen +% hyphenation is inhibited by default, but word spacing is, by default +% variable. The option mono makes word spacing mono also. +\def\zifour(a)sp{.5em} +\def\zifour(a)stretch{.25em} +\def\zifour(a)shrink{.167em} +\def\zifour(a)extrasp{.167em} +\def\zifour(a)spn{.45em} +\def\zifour(a)stretchn{.225em} +\def\zifour(a)shrinkn{.15em} +\def\zifour(a)extraspn{.15em} % by default, change \tt to mean zi4. \newcommand*{\zifour@default}{% - \renewcommand*{\ttdefault}{zi4}% -} + \renewcommand*{\ttdefault}{zi4}}% + +\newcommand\zifour@scaled{s*[1]} +%\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}} +\DeclareOptionX{scaled}[1.0]{\renewcommand{\zifour@scaled}{s*[#1]}} +\DeclareOptionX{scale}[1.0]{\renewcommand{\zifour@scaled}{s*[#1]}} +%\DeclareOption*{% +% \begingroup +% \edef\x{\endgroup +% \noexpand\setkeys{zifour}{\CurrentOption}}% +% \x} + +\DeclareOptionX{hyphenate}{% + \zifour@hyphentrue} + +\DeclareOptionX{mono}{% + \zifour@monotrue} % option [nott] to avoid changing tt. -\DeclareOption{nott}{% +\DeclareOptionX{nott}{% \renewcommand*{\zifour@default}{}% } % option [noupquote] to prevent loading upquote. -\DeclareOption{noupquote}{% +\DeclareOptionX{noupquote}{% \zifour@noupqtrue}% % option var0---use unslashed zero (slashed is default) -\DeclareOption{var0}{% +\DeclareOptionX{var0}{% \zifour@altzerotrue\advance\zifour@ocount \tw@ % } -\DeclareOption{varl}{% +\DeclareOptionX{varl}{% \advance\zifour@ocount \@ne % } -\DeclareOption{varqu}{% +\DeclareOptionX{varqu}{% \advance\zifour@ocount 4\relax % } - -\ProcessOptions* +\DeclareOptionX{narrow}{% + \gdef\zifour@narrow{n} % +} +\DeclareOptionX{spacing}[.5em]{% + \gdef\zifour@spx{#1}} +\DeclareOptionX{stretch}[.25em]{% + \gdef\zifour@stretchx{#1}} +\DeclareOptionX{shrink}[.167em]{% + \gdef\zifour@shrinkx{#1}} +\DeclareOptionX{extrasp}[.167em]{% + \gdef\zifour@extraspx{#1}} + +\ProcessOptionsX + +\ifzifour@mono% +\def\zifour@stretch{0em} +\def\zifour@shrink{0em} +\def\zifour(a)extrasp{.5em} +\def\zifour@stretchn{0em} +\def\zifour@shrinkn{0em} +\def\zifour(a)extraspn{.45em} +\fi +\ifdefined\zifour@narrow% + \let\zifour@sp\zifour@spn + \let\zifour@stretch\zifour@stretchn + \let\zifour@shrink\zifour@shrinkn + \let\zifour@extrasp\zifour@extraspn +\fi +% Allow values specified in options to override mono +\ifdefined\zifour@spx\let\zifour@sp\zifour@spx\fi +\ifdefined\zifour@stretchx\let\zifour@stretch\zifour@stretchx\fi +\ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi +\ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi + +\ifzifour@hyphen% + \def\zifour@hyph{} +\else% + \def\zifour@hyph{\hyphenchar\font=\m@ne} +\fi +\def\zifour@spc{% + \fontdimen2\font=\zifour@sp% + \fontdimen3\font=\zifour@stretch% + \fontdimen4\font=\zifour@shrink% + \fontdimen7\font=\zifour@extrasp% + \zifour@hyph% +} % used to change default text spacing via fd files +%\show\zifour@spc \zifour@default \edef\zifour@opt{\the\zifour@ocount} \ifzifour@altzero @@ -59,6 +124,7 @@ \def\altzero{{\fontfamily{zi4}% \fontshape{scit}% \selectfont 0}} + \def\zifour@T@ne@nc{T1} \def\zifour@OT@ne@nc{OT1} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/inconsolatan.fontspec new/tex/latex/inconsolata/inconsolatan.fontspec --- old/tex/latex/inconsolata/inconsolatan.fontspec 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/inconsolata/inconsolatan.fontspec 2016-12-31 05:01:06.000000000 +0100 @@ -0,0 +1,6 @@ +\defaultfontfeatures[inconsolatan] + { + Extension = .otf , + UprightFont = InconsolataN-Regular, + BoldFont = InconsolataN-Bold + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/ly1zi4.fd new/tex/latex/inconsolata/ly1zi4.fd --- old/tex/latex/inconsolata/ly1zi4.fd 2014-06-24 01:27:20.000000000 +0200 +++ new/tex/latex/inconsolata/ly1zi4.fd 2016-12-31 05:01:06.000000000 +0100 @@ -1,27 +1,37 @@ -% Copyright 2014 Michael Sharpe. +% Copyright 2014--2016 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{ly1zi4.fd}[2014/06/22 LY1/zi4 (Inconsolata)] +\ProvidesFile{ly1zi4.fd}[2016/12/29 LY1/zi4 (Inconsolata)] \ifdefined\zifour@scaled \else \def\zifour@scaled{} \fi +\ifdefined\zifour@narrow +\else + \def\zifour@narrow{} +\fi + \ifdefined\zifour@opt \else \def\zifour@opt{0}\def\zifour@altopt{2} \fi -\DeclareFontFamily{LY1}{zi4}{\hyphenchar\font=\m@ne} +\ifdefined\zifour@spc +\else + \def\zifour@spc{\hyphenchar\font=\m@ne} +\fi + +\DeclareFontFamily{LY1}{zi4}{\zifour@spc} \DeclareFontShape{LY1}{zi4}{m}{n}{% - <-> \zifour@scaled ly1-zi4r-\zifour@opt}{} + <-> \zifour@scaled ly1-zi4\zifour@narrow r-\zifour@opt}{} \DeclareFontShape{LY1}{zi4}{m}{scit}{% - <-> \zifour@scaled ly1-zi4r-\zifour@altopt}{} + <-> \zifour@scaled ly1-zi4\zifour@narrow r-\zifour@altopt}{} \DeclareFontShape{LY1}{zi4}{b}{n}{% - <-> \zifour@scaled ly1-zi4b-\zifour@opt}{} + <-> \zifour@scaled ly1-zi4\zifour@narrow b-\zifour@opt}{} \DeclareFontShape{LY1}{zi4}{b}{scit}{% - <-> \zifour@scaled ly1-zi4b-\zifour@altopt}{} + <-> \zifour@scaled ly1-zi4\zifour@narrow b-\zifour@altopt}{} \DeclareFontShape{LY1}{zi4}{bx}{n}{% <-> ssub * zi4/b/n}{} \DeclareFontShape{LY1}{zi4}{bx}{scit}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/ot1zi4.fd new/tex/latex/inconsolata/ot1zi4.fd --- old/tex/latex/inconsolata/ot1zi4.fd 2014-06-24 01:27:20.000000000 +0200 +++ new/tex/latex/inconsolata/ot1zi4.fd 2016-12-31 05:01:06.000000000 +0100 @@ -1,27 +1,37 @@ -% Copyright 2014 Michael Sharpe. +% Copyright 2014--2016 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{ot1zi4.fd}[2014/06/22 OT1/zi4 (Inconsolata)] +\ProvidesFile{ot1zi4.fd}[2016/12/29 OT1/zi4 (Inconsolata)] \ifdefined\zifour@scaled \else \def\zifour@scaled{} \fi +\ifdefined\zifour@narrow +\else + \def\zifour@narrow{} +\fi + \ifdefined\zifour@opt \else \def\zifour@opt{0}\def\zifour@altopt{2} \fi -\DeclareFontFamily{OT1}{zi4}{\hyphenchar\font=\m@ne} +\ifdefined\zifour@spc +\else + \def\zifour@spc{\hyphenchar\font=\m@ne} +\fi + +\DeclareFontFamily{OT1}{zi4}{\zifour@spc} \DeclareFontShape{OT1}{zi4}{m}{n}{% - <-> \zifour@scaled ot1-zi4r-\zifour@opt}{} + <-> \zifour@scaled ot1-zi4\zifour@narrow r-\zifour@opt}{} \DeclareFontShape{OT1}{zi4}{m}{scit}{% - <-> \zifour@scaled ot1-zi4r-\zifour@altopt}{} + <-> \zifour@scaled ot1-zi4\zifour@narrow r-\zifour@altopt}{} \DeclareFontShape{OT1}{zi4}{b}{n}{% - <-> \zifour@scaled ot1-zi4b-\zifour@opt}{} + <-> \zifour@scaled ot1-zi4\zifour@narrow b-\zifour@opt}{} \DeclareFontShape{OT1}{zi4}{b}{scit}{% - <-> \zifour@scaled ot1-zi4b-\zifour@altopt}{} + <-> \zifour@scaled ot1-zi4\zifour@narrow b-\zifour@altopt}{} \DeclareFontShape{OT1}{zi4}{bx}{n}{% <-> ssub * zi4/b/n}{} \DeclareFontShape{OT1}{zi4}{bx}{scit}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/qxzi4.fd new/tex/latex/inconsolata/qxzi4.fd --- old/tex/latex/inconsolata/qxzi4.fd 2014-06-24 01:27:20.000000000 +0200 +++ new/tex/latex/inconsolata/qxzi4.fd 2016-12-31 05:01:06.000000000 +0100 @@ -1,27 +1,37 @@ -% Copyright 2014 Michael Sharpe. +% Copyright 2014--2016 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{qxzi4.fd}[2014/06/22 QX/zi4 (Inconsolata)] +\ProvidesFile{qxzi4.fd}[2016/12/29 QX/zi4 (Inconsolata)] \ifdefined\zifour@scaled \else \def\zifour@scaled{} \fi +\ifdefined\zifour@narrow +\else + \def\zifour@narrow{} +\fi + \ifdefined\zifour@opt \else \def\zifour@opt{0}\def\zifour@altopt{2} \fi -\DeclareFontFamily{QX}{zi4}{\hyphenchar\font=\m@ne} +\ifdefined\zifour@spc +\else + \def\zifour@spc{\hyphenchar\font=\m@ne} +\fi + +\DeclareFontFamily{QX}{zi4}{\zifour@spc} \DeclareFontShape{QX}{zi4}{m}{n}{% - <-> \zifour@scaled qx-zi4r-\zifour@opt}{} + <-> \zifour@scaled qx-zi4\zifour@narrow r-\zifour@opt}{} \DeclareFontShape{QX}{zi4}{m}{scit}{% - <-> \zifour@scaled qx-zi4r-\zifour@altopt}{} + <-> \zifour@scaled qx-zi4\zifour@narrow r-\zifour@altopt}{} \DeclareFontShape{QX}{zi4}{b}{n}{% - <-> \zifour@scaled qx-zi4b-\zifour@opt}{} + <-> \zifour@scaled qx-zi4\zifour@narrow b-\zifour@opt}{} \DeclareFontShape{QX}{zi4}{b}{scit}{% - <-> \zifour@scaled qx-zi4b-\zifour@altopt}{} + <-> \zifour@scaled qx-zi4\zifour@narrow b-\zifour@altopt}{} \DeclareFontShape{QX}{zi4}{bx}{n}{% <-> ssub * zi4/b/n}{} \DeclareFontShape{QX}{zi4}{bx}{scit}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/t1zi4.fd new/tex/latex/inconsolata/t1zi4.fd --- old/tex/latex/inconsolata/t1zi4.fd 2014-06-24 01:27:20.000000000 +0200 +++ new/tex/latex/inconsolata/t1zi4.fd 2016-12-31 05:01:06.000000000 +0100 @@ -1,27 +1,37 @@ -% Copyright 2014 Michael Sharpe. +% Copyright 2014--2016 Michael Sharpe. % You may freely use, modify and/or distribute this file. -\ProvidesFile{t1zi4.fd}[2014/06/22 T1/zi4 (Inconsolata)] +\ProvidesFile{t1zi4.fd}[2016/12/29 T1/zi4 (Inconsolata)] \ifdefined\zifour@scaled \else \def\zifour@scaled{} \fi +\ifdefined\zifour@narrow +\else + \def\zifour@narrow{} +\fi + \ifdefined\zifour@opt \else \def\zifour@opt{0}\def\zifour@altopt{2} \fi -\DeclareFontFamily{T1}{zi4}{\hyphenchar\font=\m@ne} +\ifdefined\zifour@spc +\else + \def\zifour@spc{\hyphenchar\font=\m@ne} +\fi + +\DeclareFontFamily{T1}{zi4}{\zifour@spc} \DeclareFontShape{T1}{zi4}{m}{n}{% - <-> \zifour@scaled t1-zi4r-\zifour@opt}{} + <-> \zifour@scaled t1-zi4\zifour@narrow r-\zifour@opt}{} \DeclareFontShape{T1}{zi4}{m}{scit}{% - <-> \zifour@scaled t1-zi4r-\zifour@altopt}{} + <-> \zifour@scaled t1-zi4\zifour@narrow r-\zifour@altopt}{} \DeclareFontShape{T1}{zi4}{b}{n}{% - <-> \zifour@scaled t1-zi4b-\zifour@opt}{} + <-> \zifour@scaled t1-zi4\zifour@narrow b-\zifour@opt}{} \DeclareFontShape{T1}{zi4}{b}{scit}{% - <-> \zifour@scaled t1-zi4b-\zifour@altopt}{} + <-> \zifour@scaled t1-zi4\zifour@narrow b-\zifour@altopt}{} \DeclareFontShape{T1}{zi4}{bx}{n}{% <-> ssub * zi4/b/n}{} \DeclareFontShape{T1}{zi4}{bx}{scit}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/ts1zi4.fd new/tex/latex/inconsolata/ts1zi4.fd --- old/tex/latex/inconsolata/ts1zi4.fd 2014-06-24 01:27:20.000000000 +0200 +++ new/tex/latex/inconsolata/ts1zi4.fd 2016-12-31 05:01:06.000000000 +0100 @@ -1,24 +1,30 @@ -%Filename: ts1zi4.fd -%Created by: tex zi4-drv -%Created using fontinst v1.933 +% Copyright 2014--2016 Michael Sharpe. +% You may freely use, modify and/or distribute this file. -%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY - -\ProvidesFile{ts1zi4.fd} - [2014/06/22 Fontinst v1.933 font definitions for TS1/zi4.] +\ProvidesFile{ts1zi4.fd}[2016/12/29 TS1/zi4 (Inconsolata)] \ifdefined\zifour@scaled \else \def\zifour@scaled{} \fi -\DeclareFontFamily{TS1}{zi4}{\hyphenchar\font=\m@ne} +\ifdefined\zifour@narrow +\else + \def\zifour@narrow{} +\fi + +\ifdefined\zifour@spc +\else + \def\zifour@spc{\hyphenchar\font=\m@ne} +\fi + +\DeclareFontFamily{TS1}{zi4}{\zifour@spc} \DeclareFontShape{TS1}{zi4}{m}{n}{ - <-> \zifour@scaled ts1-zi4r + <-> \zifour@scaled ts1-zi4\zifour@narrow r }{} \DeclareFontShape{TS1}{zi4}{b}{n}{ - <-> \zifour@scaled ts1-zi4b + <-> \zifour@scaled ts1-zi4\zifour@narrow b }{} \DeclareFontShape{TS1}{zi4}{m}{scit}{ <-> ssub * zi4/m/n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/zi4.sty new/tex/latex/inconsolata/zi4.sty --- old/tex/latex/inconsolata/zi4.sty 2016-02-23 22:26:18.000000000 +0100 +++ new/tex/latex/inconsolata/zi4.sty 2017-01-06 00:01:05.000000000 +0100 @@ -1,52 +1,117 @@ -% Copyright 2014 Michael Sharpe +% Copyright 2014--2017 Michael Sharpe % Based initially on Karl Berry's inconsolata.sty. % You may freely use, modify and/or distribute this file. -\def\fileversion{1.10} -\def\filedate{2016/02/22} +\def\fileversion{1.112} +\def\filedate{2017/01/04} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zi4}[\filedate\space v\fileversion] \message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)} \RequirePackage{textcomp} -\RequirePackage{keyval} +\RequirePackage{xkeyval} \newcount\zifour@ocount \newif\ifzifour@altzero \newif\ifzifour@noupq -\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}} - -\DeclareOption*{% - \begingroup - \edef\x{\endgroup - \noexpand\setkeys{zifour}{\CurrentOption}}% - \x} +\newif\ifzifour@mono +\newif\ifzifour@hyphen +% hyphenation is inhibited by default, but word spacing is, by default +% variable. The option mono makes word spacing mono also. +\def\zifour(a)sp{.5em} +\def\zifour(a)stretch{.25em} +\def\zifour(a)shrink{.167em} +\def\zifour(a)extrasp{.167em} +\def\zifour(a)spn{.45em} +\def\zifour(a)stretchn{.225em} +\def\zifour(a)shrinkn{.15em} +\def\zifour(a)extraspn{.15em} % by default, change \tt to mean zi4. \newcommand*{\zifour@default}{% - \renewcommand*{\ttdefault}{zi4}% -} + \renewcommand*{\ttdefault}{zi4}}% + +\newcommand\zifour@scaled{s*[1]} +%\define@key{zifour}{scaled}[1.0]{\def\zifour@scaled{s*[#1]}} +\DeclareOptionX{scaled}[1.0]{\renewcommand{\zifour@scaled}{s*[#1]}} +\DeclareOptionX{scale}[1.0]{\renewcommand{\zifour@scaled}{s*[#1]}} +%\DeclareOption*{% +% \begingroup +% \edef\x{\endgroup +% \noexpand\setkeys{zifour}{\CurrentOption}}% +% \x} + +\DeclareOptionX{hyphenate}{% + \zifour@hyphentrue} + +\DeclareOptionX{mono}{% + \zifour@monotrue} % option [nott] to avoid changing tt. -\DeclareOption{nott}{% +\DeclareOptionX{nott}{% \renewcommand*{\zifour@default}{}% } % option [noupquote] to prevent loading upquote. -\DeclareOption{noupquote}{% +\DeclareOptionX{noupquote}{% \zifour@noupqtrue}% % option var0---use unslashed zero (slashed is default) -\DeclareOption{var0}{% +\DeclareOptionX{var0}{% \zifour@altzerotrue\advance\zifour@ocount \tw@ % } -\DeclareOption{varl}{% +\DeclareOptionX{varl}{% \advance\zifour@ocount \@ne % } -\DeclareOption{varqu}{% +\DeclareOptionX{varqu}{% \advance\zifour@ocount 4\relax % } - -\ProcessOptions* +\DeclareOptionX{narrow}{% + \gdef\zifour@narrow{n} % +} +\DeclareOptionX{spacing}[.5em]{% + \gdef\zifour@spx{#1}} +\DeclareOptionX{stretch}[.25em]{% + \gdef\zifour@stretchx{#1}} +\DeclareOptionX{shrink}[.167em]{% + \gdef\zifour@shrinkx{#1}} +\DeclareOptionX{extrasp}[.167em]{% + \gdef\zifour@extraspx{#1}} + +\ProcessOptionsX + +\ifzifour@mono% +\def\zifour@stretch{0em} +\def\zifour@shrink{0em} +\def\zifour(a)extrasp{.5em} +\def\zifour@stretchn{0em} +\def\zifour@shrinkn{0em} +\def\zifour(a)extraspn{.45em} +\fi +\ifdefined\zifour@narrow% + \let\zifour@sp\zifour@spn + \let\zifour@stretch\zifour@stretchn + \let\zifour@shrink\zifour@shrinkn + \let\zifour@extrasp\zifour@extraspn +\fi +% Allow values specified in options to override mono +\ifdefined\zifour@spx\let\zifour@sp\zifour@spx\fi +\ifdefined\zifour@stretchx\let\zifour@stretch\zifour@stretchx\fi +\ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi +\ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi + +\ifzifour@hyphen% + \def\zifour@hyph{} +\else% + \def\zifour@hyph{\hyphenchar\font=\m@ne} +\fi +\def\zifour@spc{% + \fontdimen2\font=\zifour@sp% + \fontdimen3\font=\zifour@stretch% + \fontdimen4\font=\zifour@shrink% + \fontdimen7\font=\zifour@extrasp% + \zifour@hyph% +} % used to change default text spacing via fd files +%\show\zifour@spc \zifour@default \edef\zifour@opt{\the\zifour@ocount} \ifzifour@altzero @@ -59,6 +124,7 @@ \def\altzero{{\fontfamily{zi4}% \fontshape{scit}% \selectfont 0}} + \def\zifour@T@ne@nc{T1} \def\zifour@OT@ne@nc{OT1} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inconsolata.tlpobj new/tlpkg/tlpobj/inconsolata.tlpobj --- old/tlpkg/tlpobj/inconsolata.tlpobj 2016-04-14 19:07:43.000000000 +0200 +++ new/tlpkg/tlpobj/inconsolata.tlpobj 2017-04-14 17:43:05.000000000 +0200 @@ -1,6 +1,6 @@ name inconsolata category Package -revision 39839 +revision 42871 shortdesc A monospaced font, with support files for use with TeX relocated 1 longdesc Inconsolata is a monospaced font designed by Raph Levien. This @@ -10,7 +10,7 @@ longdesc shapelier lower-case L, plus metric files for use with TeX, and longdesc LaTeX font definition and other relevant files. execute addMap zi4.map -runfiles size=208 +runfiles size=318 RELOC/fonts/enc/dvips/inconsolata/i4-ly1-0.enc RELOC/fonts/enc/dvips/inconsolata/i4-ly1-1.enc RELOC/fonts/enc/dvips/inconsolata/i4-ly1-2.enc @@ -45,6 +45,8 @@ RELOC/fonts/enc/dvips/inconsolata/i4-t1-7.enc RELOC/fonts/enc/dvips/inconsolata/i4-ts1.enc RELOC/fonts/map/dvips/inconsolata/zi4.map + RELOC/fonts/opentype/public/inconsolata/InconsolataN-Bold.otf + RELOC/fonts/opentype/public/inconsolata/InconsolataN-Regular.otf RELOC/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf RELOC/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf RELOC/fonts/tfm/public/inconsolata/ly1-zi4b-0.tfm @@ -55,6 +57,22 @@ RELOC/fonts/tfm/public/inconsolata/ly1-zi4b-5.tfm RELOC/fonts/tfm/public/inconsolata/ly1-zi4b-6.tfm RELOC/fonts/tfm/public/inconsolata/ly1-zi4b-7.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-0.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-1.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-2.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-3.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-4.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-5.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-6.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nb-7.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-0.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-1.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-2.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-3.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-4.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-5.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-6.tfm + RELOC/fonts/tfm/public/inconsolata/ly1-zi4nr-7.tfm RELOC/fonts/tfm/public/inconsolata/ly1-zi4r-0.tfm RELOC/fonts/tfm/public/inconsolata/ly1-zi4r-1.tfm RELOC/fonts/tfm/public/inconsolata/ly1-zi4r-2.tfm @@ -71,6 +89,22 @@ RELOC/fonts/tfm/public/inconsolata/ot1-zi4b-5.tfm RELOC/fonts/tfm/public/inconsolata/ot1-zi4b-6.tfm RELOC/fonts/tfm/public/inconsolata/ot1-zi4b-7.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-0.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-1.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-2.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-3.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-4.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-5.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-6.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nb-7.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-0.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-1.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-2.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-3.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-4.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-5.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-6.tfm + RELOC/fonts/tfm/public/inconsolata/ot1-zi4nr-7.tfm RELOC/fonts/tfm/public/inconsolata/ot1-zi4r-0.tfm RELOC/fonts/tfm/public/inconsolata/ot1-zi4r-1.tfm RELOC/fonts/tfm/public/inconsolata/ot1-zi4r-2.tfm @@ -87,6 +121,22 @@ RELOC/fonts/tfm/public/inconsolata/qx-zi4b-5.tfm RELOC/fonts/tfm/public/inconsolata/qx-zi4b-6.tfm RELOC/fonts/tfm/public/inconsolata/qx-zi4b-7.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-0.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-1.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-2.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-3.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-4.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-5.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-6.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nb-7.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-0.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-1.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-2.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-3.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-4.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-5.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-6.tfm + RELOC/fonts/tfm/public/inconsolata/qx-zi4nr-7.tfm RELOC/fonts/tfm/public/inconsolata/qx-zi4r-0.tfm RELOC/fonts/tfm/public/inconsolata/qx-zi4r-1.tfm RELOC/fonts/tfm/public/inconsolata/qx-zi4r-2.tfm @@ -103,6 +153,22 @@ RELOC/fonts/tfm/public/inconsolata/t1-zi4b-5.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4b-6.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4b-7.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-0.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-1.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-2.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-3.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-4.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-5.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-6.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nb-7.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-0.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-1.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-2.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-3.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-4.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-5.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-6.tfm + RELOC/fonts/tfm/public/inconsolata/t1-zi4nr-7.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4r-0.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4r-1.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4r-2.tfm @@ -112,11 +178,16 @@ RELOC/fonts/tfm/public/inconsolata/t1-zi4r-6.tfm RELOC/fonts/tfm/public/inconsolata/t1-zi4r-7.tfm RELOC/fonts/tfm/public/inconsolata/ts1-zi4b.tfm + RELOC/fonts/tfm/public/inconsolata/ts1-zi4nb.tfm + RELOC/fonts/tfm/public/inconsolata/ts1-zi4nr.tfm RELOC/fonts/tfm/public/inconsolata/ts1-zi4r.tfm RELOC/fonts/type1/public/inconsolata/Inconsolata-zi4b.pfb RELOC/fonts/type1/public/inconsolata/Inconsolata-zi4r.pfb - RELOC/tex/latex/inconsolata/Inconsolatazi4.fontspec + RELOC/fonts/type1/public/inconsolata/InconsolataN-Bold.pfb + RELOC/fonts/type1/public/inconsolata/InconsolataN-Regular.pfb + RELOC/tex/latex/inconsolata/inconsolata.fontspec RELOC/tex/latex/inconsolata/inconsolata.sty + RELOC/tex/latex/inconsolata/inconsolatan.fontspec RELOC/tex/latex/inconsolata/ly1zi4.fd RELOC/tex/latex/inconsolata/ot1zi4.fd RELOC/tex/latex/inconsolata/qxzi4.fd @@ -124,7 +195,7 @@ RELOC/tex/latex/inconsolata/ts1zi4.fd RELOC/tex/latex/inconsolata/zi4.sty catalogue-ctan /fonts/inconsolata -catalogue-date 2016-02-23 06:55:46 +0100 -catalogue-license ofl -catalogue-topics font font-mono font-type1 font-otf -catalogue-version 1.10 +catalogue-date 2017-01-04 22:39:25 +0100 +catalogue-license oflapache2lppl1.3 +catalogue-topics font font-mono font-type1 font-otf font-t1enc +catalogue-version 1.112 ++++++ index.doc.tar.xz ++++++ ++++++ index.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/index.tlpobj new/tlpkg/tlpobj/index.tlpobj --- old/tlpkg/tlpobj/index.tlpobj 2016-04-14 19:07:44.000000000 +0200 +++ new/tlpkg/tlpobj/index.tlpobj 2017-04-14 17:43:05.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/index/index.sty catalogue-also splitindex multind catalogue-ctan /macros/latex/contrib/index -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics index index-multi catalogue-version 4.1beta ++++++ indextools.doc.tar.xz ++++++ ++++++ indextools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/indextools.tlpobj new/tlpkg/tlpobj/indextools.tlpobj --- old/tlpkg/tlpobj/indextools.tlpobj 2016-04-14 19:07:45.000000000 +0200 +++ new/tlpkg/tlpobj/indextools.tlpobj 2017-04-14 17:43:06.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/indextools/indextools.sty catalogue-also imakeidx catalogue-ctan /macros/latex/contrib/indextools -catalogue-date 2015-11-22 13:03:51 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics index catalogue-version 1.5.1 ++++++ initials.doc.tar.xz ++++++ ++++++ initials.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/initials.tlpobj new/tlpkg/tlpobj/initials.tlpobj --- old/tlpkg/tlpobj/initials.tlpobj 2016-04-14 19:07:45.000000000 +0200 +++ new/tlpkg/tlpobj/initials.tlpobj 2017-04-14 17:43:06.000000000 +0200 @@ -168,6 +168,6 @@ RELOC/tex/latex/initials/Typocaps.fd RELOC/tex/latex/initials/Zallman.fd catalogue-ctan /fonts/initials -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-type1 font-decor ++++++ inlinebib.doc.tar.xz ++++++ ++++++ inlinebib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inlinebib.tlpobj new/tlpkg/tlpobj/inlinebib.tlpobj --- old/tlpkg/tlpobj/inlinebib.tlpobj 2016-04-14 19:07:47.000000000 +0200 +++ new/tlpkg/tlpobj/inlinebib.tlpobj 2017-04-14 17:43:07.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/inlinebib/inlinebib.sty RELOC/tex/latex/inlinebib/pageranges.sty catalogue-ctan /biblio/bibtex/contrib/inlinebib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cite-foot

1 0

commit texlive-specs-k 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-k for openSUSE:Factory checked in at 2017-06-25 19:22:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-k (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-k" Sun Jun 25 19:22:06 2017 rev:27 rq:504801 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-k/texlive-specs-k.changes 2017-06-08 14:55:03.922239858 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-k.new/texlive-specs-k.changes 2017-06-25 19:26:43.881294848 +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: ---- hitec.doc.tar.xz hitec.tar.xz hletter.doc.tar.xz hletter.tar.xz hobby.doc.tar.xz hobby.tar.xz hobete.doc.tar.xz hobete.tar.xz hook-pre-commit-pkg.doc.tar.xz horoscop.doc.tar.xz horoscop.tar.xz hpsdiss.doc.tar.xz hpsdiss.tar.xz hrefhide.doc.tar.xz hrefhide.tar.xz hrlatex.doc.tar.xz hrlatex.tar.xz hvfloat.doc.tar.xz hvfloat.tar.xz hvindex.doc.tar.xz hvindex.tar.xz hypdvips.doc.tar.xz hypdvips.tar.xz hyper.doc.tar.xz hyper.tar.xz hypernat.doc.tar.xz hypernat.tar.xz hyperref-docsrc.doc.tar.xz hyperref.doc.tar.xz hyperref.tar.xz hyperxmp.doc.tar.xz hyperxmp.tar.xz hyph-utf8.doc.tar.xz hyph-utf8.tar.xz hyphen-afrikaans.tar.xz hyphen-ancientgreek.tar.xz hyphen-arabic.tar.xz hyphen-armenian.tar.xz hyphen-base.tar.xz hyphen-basque.tar.xz hyphen-bulgarian.doc.tar.xz hyphen-bulgarian.tar.xz hyphen-catalan.tar.xz hyphen-chinese.tar.xz hyphen-churchslavonic.tar.xz hyphen-coptic.tar.xz hyphen-croatian.tar.xz hyphen-czech.tar.xz hyphen-danish.tar.xz hyphen-dutch.tar.xz New: ---- gfsbodoni.doc.tar.xz gfsbodoni.tar.xz gfscomplutum.doc.tar.xz gfscomplutum.tar.xz gfsdidot.doc.tar.xz gfsdidot.tar.xz gfsneohellenic.doc.tar.xz gfsneohellenic.tar.xz gfsporson.doc.tar.xz gfsporson.tar.xz gfssolomos.doc.tar.xz gfssolomos.tar.xz ghab.doc.tar.xz ghab.tar.xz ghsystem.doc.tar.xz ghsystem.tar.xz gillcm.doc.tar.xz gillcm.tar.xz gillius.doc.tar.xz gillius.tar.xz gincltex.doc.tar.xz gincltex.tar.xz ginpenc.doc.tar.xz ginpenc.tar.xz gitfile-info.doc.tar.xz gitfile-info.tar.xz gitinfo.doc.tar.xz gitinfo.tar.xz gitinfo2.doc.tar.xz gitinfo2.tar.xz gitlog.doc.tar.xz gitlog.tar.xz gloss-occitan.doc.tar.xz gloss-occitan.tar.xz gloss.doc.tar.xz gloss.tar.xz glossaries-danish.doc.tar.xz glossaries-danish.tar.xz glossaries-dutch.doc.tar.xz glossaries-dutch.tar.xz glossaries-english.doc.tar.xz glossaries-english.tar.xz glossaries-extra.doc.tar.xz glossaries-extra.tar.xz glossaries-french.doc.tar.xz glossaries-french.tar.xz glossaries-german.doc.tar.xz glossaries-german.tar.xz glossaries-irish.doc.tar.xz glossaries-irish.tar.xz glossaries-italian.doc.tar.xz glossaries-italian.tar.xz glossaries-magyar.doc.tar.xz glossaries-magyar.tar.xz glossaries-polish.doc.tar.xz glossaries-polish.tar.xz glossaries-portuges.doc.tar.xz glossaries-portuges.tar.xz glossaries.doc.tar.xz glossaries.tar.xz gofonts.doc.tar.xz gofonts.tar.xz gotoh.doc.tar.xz gotoh.tar.xz grant.doc.tar.xz grant.tar.xz graphics-def.doc.tar.xz graphics-def.tar.xz grayhints.doc.tar.xz grayhints.tar.xz gtrlib-largetrees.doc.tar.xz gtrlib-largetrees.tar.xz halloweenmath.doc.tar.xz halloweenmath.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-k.spec ++++++ ++++ 25304 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-k/texlive-specs-k.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-k.new/texlive-specs-k.spec ++++++ glossaries-serbian.doc.tar.xz ++++++ ++++++ glossaries-serbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-serbian.tlpobj new/tlpkg/tlpobj/glossaries-serbian.tlpobj --- old/tlpkg/tlpobj/glossaries-serbian.tlpobj 2016-04-14 19:05:01.000000000 +0200 +++ new/tlpkg/tlpobj/glossaries-serbian.tlpobj 2017-04-14 17:41:46.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/glossaries-serbian/glossaries-serbian-utf8.ldf RELOC/tex/latex/glossaries-serbian/glossaries-serbian.ldf catalogue-ctan /macros/latex/contrib/glossaries-serbian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics glossary catalogue-version 1.0 ++++++ glossaries-spanish.doc.tar.xz ++++++ ++++++ glossaries-spanish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-spanish.tlpobj new/tlpkg/tlpobj/glossaries-spanish.tlpobj --- old/tlpkg/tlpobj/glossaries-spanish.tlpobj 2016-04-14 19:05:01.000000000 +0200 +++ new/tlpkg/tlpobj/glossaries-spanish.tlpobj 2017-04-14 17:41:46.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/glossaries-spanish/glossaries-spanish-utf8.ldf RELOC/tex/latex/glossaries-spanish/glossaries-spanish.ldf catalogue-ctan /macros/latex/contrib/glossaries-spanish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics glossary catalogue-version 1.0 ++++++ glyphlist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/glyphlist/glyphlist.txt new/fonts/map/glyphlist/glyphlist.txt --- old/fonts/map/glyphlist/glyphlist.txt 2007-09-13 19:41:07.000000000 +0200 +++ new/fonts/map/glyphlist/glyphlist.txt 2016-11-25 19:31:10.000000000 +0100 @@ -1,43 +1,26 @@ -# ################################################################################### -# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this documentation file to use, copy, publish, distribute, -# sublicense, and/or sell copies of the documentation, and to permit -# others to do the same, provided that: -# - No modification, editing or other alteration of this document is -# allowed; and -# - The above copyright notice and this permission notice shall be -# included in all copies of the documentation. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this documentation file, to create their own derivative works -# from the content of this document to use, copy, publish, distribute, -# sublicense, and/or sell the derivative works, and to permit others to do -# the same, provided that the derived work is not represented as being a -# copy or version of this document. -# -# Adobe shall not be liable to any party for any loss of revenue or profit -# or for indirect, incidental, special, consequential, or other similar -# damages, whether based on tort (including without limitation negligence -# or strict liability), contract or other legal or equitable grounds even -# if Adobe has been advised or had reason to know of the possibility of -# such damages.� The Adobe materials are provided on an "AS IS" basis.� -# Adobe specifically disclaims all express, statutory, or implied -# warranties relating to the Adobe materials, including but not limited to -# those concerning merchantability or fitness for a particular purpose or -# non-infringement of any third party rights regarding the Adobe -# materials. -# ################################################################################### +# ----------------------------------------------------------- +# Copyright 2002, 2010, 2015 Adobe Systems Incorporated. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you +# may not use this file except in compliance with the License. You may +# obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# ----------------------------------------------------------- # Name: Adobe Glyph List # Table version: 2.0 # Date: September 20, 2002 +# URL: https://github.com/adobe-type-tools/agl-aglfn # -# See http://partners.adobe.com/asn/developer/typeforum/unicodegn.html +# Format: two semicolon-delimited fields: +# (1) glyph name--upper/lowercase letters and digits +# (2) Unicode scalar value--four uppercase hexadecimal digits # -# Format: Semicolon-delimited fields: -# (1) glyph name -# (2) Unicode scalar value A;0041 AE;00C6 AEacute;01FC @@ -4319,4 +4302,4 @@ zstroke;01B6 zuhiragana;305A zukatakana;30BA -#--end +#END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glyphlist.tlpobj new/tlpkg/tlpobj/glyphlist.tlpobj --- old/tlpkg/tlpobj/glyphlist.tlpobj 2016-04-14 19:05:02.000000000 +0200 +++ new/tlpkg/tlpobj/glyphlist.tlpobj 2017-04-14 17:41:46.000000000 +0200 @@ -1,8 +1,8 @@ name glyphlist category Package -revision 28576 +revision 41545 relocated 1 -runfiles size=25 +runfiles size=24 RELOC/fonts/map/glyphlist/glyphlist.txt RELOC/fonts/map/glyphlist/pdfglyphlist.txt RELOC/fonts/map/glyphlist/texglyphlist.txt ++++++ gmdoc-enhance.doc.tar.xz ++++++ ++++++ gmdoc-enhance.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmdoc-enhance.tlpobj new/tlpkg/tlpobj/gmdoc-enhance.tlpobj --- old/tlpkg/tlpobj/gmdoc-enhance.tlpobj 2016-04-14 19:05:06.000000000 +0200 +++ new/tlpkg/tlpobj/gmdoc-enhance.tlpobj 2017-04-14 17:41:48.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/gmdoc-enhance/gmdoc-enhance.sty catalogue-also gmdoc catalogue-ctan /macros/latex/contrib/gmdoc-enhance -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-supp catalogue-version 0.2 ++++++ gmdoc.doc.tar.xz ++++++ ++++++ gmdoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmdoc.tlpobj new/tlpkg/tlpobj/gmdoc.tlpobj --- old/tlpkg/tlpobj/gmdoc.tlpobj 2016-04-14 19:05:05.000000000 +0200 +++ new/tlpkg/tlpobj/gmdoc.tlpobj 2017-04-14 17:41:47.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/latex/gmdoc/gmoldcomm.sty catalogue-also gmdoc-enhance catalogue-ctan /macros/latex/contrib/gmdoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-supp class catalogue-version 0.993 ++++++ gmiflink.doc.tar.xz ++++++ ++++++ gmiflink.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmiflink.tlpobj new/tlpkg/tlpobj/gmiflink.tlpobj --- old/tlpkg/tlpobj/gmiflink.tlpobj 2016-04-14 19:05:06.000000000 +0200 +++ new/tlpkg/tlpobj/gmiflink.tlpobj 2017-04-14 17:41:48.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/gmiflink/gmiflink.sty catalogue-also hyperref catalogue-ctan /macros/latex/contrib/gmiflink -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyper catalogue-version 0.97 ++++++ gmp.doc.tar.xz ++++++ ++++++ gmp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmp.tlpobj new/tlpkg/tlpobj/gmp.tlpobj --- old/tlpkg/tlpobj/gmp.tlpobj 2016-04-14 19:05:06.000000000 +0200 +++ new/tlpkg/tlpobj/gmp.tlpobj 2017-04-14 17:41:48.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/gmp/gmp.sty catalogue-ctan /macros/latex/contrib/gmp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics mp-supp graphics catalogue-version 1.0 ++++++ gmutils.doc.tar.xz ++++++ ++++++ gmutils.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmutils.tlpobj new/tlpkg/tlpobj/gmutils.tlpobj --- old/tlpkg/tlpobj/gmutils.tlpobj 2016-04-14 19:05:07.000000000 +0200 +++ new/tlpkg/tlpobj/gmutils.tlpobj 2017-04-14 17:41:48.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/gmutils/gmurl.sty RELOC/tex/latex/gmutils/gmutils.sty catalogue-ctan /macros/latex/contrib/gmutils -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 0.996 ++++++ gmverb.doc.tar.xz ++++++ ++++++ gmverb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmverb.tlpobj new/tlpkg/tlpobj/gmverb.tlpobj --- old/tlpkg/tlpobj/gmverb.tlpobj 2016-04-14 19:05:08.000000000 +0200 +++ new/tlpkg/tlpobj/gmverb.tlpobj 2017-04-14 17:41:49.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=12 RELOC/tex/latex/gmverb/gmverb.sty catalogue-ctan /macros/latex/contrib/gmverb -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.98 ++++++ gmverse.doc.tar.xz ++++++ ++++++ gmverse.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gmverse.tlpobj new/tlpkg/tlpobj/gmverse.tlpobj --- old/tlpkg/tlpobj/gmverse.tlpobj 2016-04-14 19:05:08.000000000 +0200 +++ new/tlpkg/tlpobj/gmverse.tlpobj 2017-04-14 17:41:49.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=8 RELOC/tex/latex/gmverse/gmverse.sty catalogue-ctan /macros/latex/contrib/gmverse -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 0.73 ++++++ gnu-freefont.doc.tar.xz ++++++ ++++++ gnu-freefont.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-k/gnu-freefont.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-k.new/gnu-freefont.tar.xz differ: char 27, line 1 ++++++ gnuplottex.doc.tar.xz ++++++ Binary files old/doc/latex/gnuplottex/gnuplottex.pdf and new/doc/latex/gnuplottex/gnuplottex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gnuplottex.doc.tlpobj new/tlpkg/tlpobj/gnuplottex.doc.tlpobj --- old/tlpkg/tlpobj/gnuplottex.doc.tlpobj 2016-04-14 19:06:05.000000000 +0200 +++ new/tlpkg/tlpobj/gnuplottex.doc.tlpobj 2017-04-14 17:42:11.000000000 +0200 @@ -1,9 +1,9 @@ name gnuplottex.doc category Package -revision 39108 +revision 41904 shortdesc doc files of gnuplottex relocated 1 -docfiles size=107 +docfiles size=110 RELOC/doc/latex/gnuplottex/README RELOC/doc/latex/gnuplottex/SomeValuesForGnuplot.txt RELOC/doc/latex/gnuplottex/example-pdf.tex ++++++ gnuplottex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gnuplottex/gnuplottex.sty new/tex/latex/gnuplottex/gnuplottex.sty --- old/tex/latex/gnuplottex/gnuplottex.sty 2015-12-14 23:16:08.000000000 +0100 +++ new/tex/latex/gnuplottex/gnuplottex.sty 2016-11-25 19:33:50.000000000 +0100 @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{gnuplottex} - [2015/12/13 v0.9.1 gnuplot graphs in LaTeX] + [2016/08/21 v0.9.2 gnuplot graphs in LaTeX] \RequirePackage{graphicx,moreverb,keyval,ifthen,catchfile} \newif\ifShellEscape \newif\ifmiktex \miktexfalse @@ -203,12 +203,14 @@ \AtEndDocument{% \ifmiktex \else - \CatchFileDef\gnuploterrors(a){\jobname.gnuploterrors}{\endlinechar=`^^J \catcode`\ =12 }% - \expandafter\gnuploterrors@eatpar\gnuploterrors@\@nil - \ifx\gnuploterrors@\@empty\else - \PackageWarningNoLine{gnuplottex}{Gnuplot execution produced errors:^^J% - \detokenize\expandafter{\gnuploterrors@}}% - \fi + \IfFileExists{\jobname.gnuploterrors}{% + \CatchFileDef\gnuploterrors(a){\jobname.gnuploterrors}{\endlinechar=`^^J \catcode`\ =12 }% + \expandafter\gnuploterrors@eatpar\gnuploterrors@\@nil + \ifx\gnuploterrors@\@empty\else + \PackageWarningNoLine{gnuplottex}{Gnuplot execution produced errors:^^J% + \detokenize\expandafter{\gnuploterrors@}}% + \fi + }{}% \fi } \long\gdef\gnuplotgraphicsinclude{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gnuplottex.tlpobj new/tlpkg/tlpobj/gnuplottex.tlpobj --- old/tlpkg/tlpobj/gnuplottex.tlpobj 2016-04-14 19:06:05.000000000 +0200 +++ new/tlpkg/tlpobj/gnuplottex.tlpobj 2017-04-14 17:42:12.000000000 +0200 @@ -1,6 +1,6 @@ name gnuplottex category Package -revision 39108 +revision 41904 shortdesc Embed Gnuplot commands in LaTeX documents relocated 1 longdesc This package allows you to include Gnuplot graphs in your LaTeX @@ -14,7 +14,7 @@ RELOC/tex/latex/gnuplottex/gnuplottex.sty catalogue-also context-gnuplot catalogue-ctan /macros/latex/contrib/gnuplottex -catalogue-date 2015-12-13 21:58:18 +0100 +catalogue-date 2016-08-21 22:13:00 +0200 catalogue-license gpl2 catalogue-topics graphics-inline -catalogue-version 0.9.1 +catalogue-version 0.9.2 ++++++ go.doc.tar.xz ++++++ ++++++ go.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/go.tlpobj new/tlpkg/tlpobj/go.tlpobj --- old/tlpkg/tlpobj/go.tlpobj 2016-04-14 19:06:05.000000000 +0200 +++ new/tlpkg/tlpobj/go.tlpobj 2017-04-14 17:42:12.000000000 +0200 @@ -46,6 +46,6 @@ RELOC/tex/latex/go/go.sty catalogue-also igo catalogue-ctan /fonts/go -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics games font font-symbol font-mf ++++++ gobble.doc.tar.xz ++++++ ++++++ gobble.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gobble.tlpobj new/tlpkg/tlpobj/gobble.tlpobj --- old/tlpkg/tlpobj/gobble.tlpobj 2016-05-08 03:15:21.000000000 +0200 +++ new/tlpkg/tlpobj/gobble.tlpobj 2017-04-14 17:42:12.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/generic/gobble/gobble.sty RELOC/tex/generic/gobble/gobble.tex catalogue-ctan /macros/generic/gobble -catalogue-date 2016-03-10 05:58:30 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 0.1 ++++++ gost.doc.tar.xz ++++++ ++++ 49148 lines of diff (skipped) ++++++ gost.tar.xz ++++++ ++++ 16049 lines of diff (skipped) ++++++ gothic.doc.tar.xz ++++++ ++++++ gothic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gothic.tlpobj new/tlpkg/tlpobj/gothic.tlpobj --- old/tlpkg/tlpobj/gothic.tlpobj 2016-04-14 19:06:09.000000000 +0200 +++ new/tlpkg/tlpobj/gothic.tlpobj 2017-04-14 17:42:15.000000000 +0200 @@ -84,6 +84,6 @@ RELOC/fonts/tfm/public/gothic/ysmfrak.tfm RELOC/fonts/tfm/public/gothic/yswab.tfm catalogue-ctan /fonts/gothic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-29 06:41:49 +0200 catalogue-license collection catalogue-topics font font-collection font-gothic ++++++ gradientframe.doc.tar.xz ++++++ ++++++ gradientframe.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gradientframe.tlpobj new/tlpkg/tlpobj/gradientframe.tlpobj --- old/tlpkg/tlpobj/gradientframe.tlpobj 2016-04-14 19:06:10.000000000 +0200 +++ new/tlpkg/tlpobj/gradientframe.tlpobj 2017-04-14 17:42:15.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/gradientframe/gradientframe.sty catalogue-ctan /macros/latex/contrib/gradientframe -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics decoration catalogue-version 0.2 ++++++ gradstudentresume.doc.tar.xz ++++++ ++++++ gradstudentresume.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gradstudentresume.tlpobj new/tlpkg/tlpobj/gradstudentresume.tlpobj --- old/tlpkg/tlpobj/gradstudentresume.tlpobj 2016-04-14 19:06:10.000000000 +0200 +++ new/tlpkg/tlpobj/gradstudentresume.tlpobj 2017-04-14 17:42:15.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/gradstudentresume/gradstudentresume.cls catalogue-ctan /macros/latex/contrib/gradstudentresume -catalogue-date 2015-11-12 16:04:41 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv class ++++++ grafcet.doc.tar.xz ++++++ ++++++ grafcet.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grafcet.tlpobj new/tlpkg/tlpobj/grafcet.tlpobj --- old/tlpkg/tlpobj/grafcet.tlpobj 2016-04-14 19:06:11.000000000 +0200 +++ new/tlpkg/tlpobj/grafcet.tlpobj 2017-04-14 17:42:15.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/latex/grafcet/grafcet.sty catalogue-ctan /graphics/pgf/contrib/grafcet -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics diagram pgf-tikz catalogue-version 1.3.5 ++++++ graphbox.doc.tar.xz ++++++ ++++++ graphbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphbox.tlpobj new/tlpkg/tlpobj/graphbox.tlpobj --- old/tlpkg/tlpobj/graphbox.tlpobj 2016-04-14 19:06:11.000000000 +0200 +++ new/tlpkg/tlpobj/graphbox.tlpobj 2017-04-14 17:42:16.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/latex/graphbox/graphbox.sty catalogue-ctan /macros/latex/contrib/graphbox -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 graphics-incl catalogue-version 1.0 ++++++ graphics-cfg.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics-cfg/README.md new/doc/latex/graphics-cfg/README.md --- old/doc/latex/graphics-cfg/README.md 2016-04-06 23:37:33.000000000 +0200 +++ new/doc/latex/graphics-cfg/README.md 2016-11-25 19:29:05.000000000 +0100 @@ -19,9 +19,6 @@ Note that pdftex option is used for luatex versions older than luatex 0.87. -graphics.cfg also has code to enable EPS to PDF conversion if used -with pdftex, this code may be moved to pdftex.def later. - These files are currently maintained by the LaTeX3 project but diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-cfg.doc.tlpobj new/tlpkg/tlpobj/graphics-cfg.doc.tlpobj --- old/tlpkg/tlpobj/graphics-cfg.doc.tlpobj 2016-04-14 19:06:13.000000000 +0200 +++ new/tlpkg/tlpobj/graphics-cfg.doc.tlpobj 2017-04-14 17:42:16.000000000 +0200 @@ -1,6 +1,6 @@ name graphics-cfg.doc category Package -revision 40269 +revision 41448 shortdesc doc files of graphics-cfg relocated 1 docfiles size=1 ++++++ graphics-cfg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics-cfg/graphics.cfg new/tex/latex/graphics-cfg/graphics.cfg --- old/tex/latex/graphics-cfg/graphics.cfg 2016-04-06 23:37:33.000000000 +0200 +++ new/tex/latex/graphics-cfg/graphics.cfg 2016-11-25 19:33:50.000000000 +0100 @@ -1,7 +1,7 @@ % https://creativecommons.org/publicdomain/zero/1.0/ \ProvidesFile{graphics.cfg}% - [2016/01/02 v1.10 sample graphics configuration]% + [2016/06/04 v1.11 sample graphics configuration]% % Select an appropriate default driver \begingroup @@ -43,48 +43,6 @@ % pdfTeX is running in pdf mode \def\Gin(a)driver{pdftex.def}% \ExecuteOptions{pdftex}% - % Load package epstopdf if - % a) LaTeX is running (plain TeX users are on their own), - % b) and shell escape (\write18) is enabled (possibly restricted), - % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, - % d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). - % - % In other words, by default .eps files will be automatically - % converted to .pdf files when outputting pdf. This can be wrong! - % If the .pdf is the source, rather than the .eps, you should put - % \newcommand{\DoNotLoadEpstopdf}{} - % before even the \documentclass line of your document. - % - % More information about the epstopdf run will be in the .log file; - % see http://ctan.org/pkg/epstopdf-pkg for more info about the - % epstopdf package itself. In turn, it calls the epstopdf script - % (http://ctan.org/pkg/epstopdf). - % - % For the first discussion and background on this, see the thread on latex-l: - % http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465 - % - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname DoNotLoadEpstopdf\endcsname\relax - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname AtEndOfPackage\endcsname\relax - \else - \AtEndOfPackage{% - \AtBeginDocument{% - \@ifpackageloaded{pst-pdf}{}{% - \@ifpackageloaded{pdftricks}{}{% - \RequirePackage{pdftexcmds}[2007/11/11]% - \expandafter\ifx\csname pdf@shellescape\endcsname\relax - \else - \ifnum\pdf@shellescape>0 % - \RequirePackage{epstopdf-base}[2009/07/12]% - \fi - \fi - }% pdftricks not loaded - }% pst-pdf not loaded - }% AtBeginDocument block - }% AtEndofPackage block - \fi % AtEndofPackage not defined - \fi % DoNotLoadEpstopdf not defined \or % VTeX is running \def\Gin(a)driver{vtex.def}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-cfg.tlpobj new/tlpkg/tlpobj/graphics-cfg.tlpobj --- old/tlpkg/tlpobj/graphics-cfg.tlpobj 2016-04-14 19:06:13.000000000 +0200 +++ new/tlpkg/tlpobj/graphics-cfg.tlpobj 2017-04-14 17:42:16.000000000 +0200 @@ -1,6 +1,6 @@ name graphics-cfg category Package -revision 40269 +revision 41448 shortdesc Sample configuration files for LaTeX color and graphics relocated 1 longdesc This bundle includes color.cfg and graphics.cfg files that set @@ -14,6 +14,6 @@ RELOC/tex/latex/graphics-cfg/graphics.cfg catalogue-also color graphics catalogue-ctan /macros/latex/contrib/graphics-cfg -catalogue-date 2016-03-01 21:50:00 +0100 +catalogue-date 2016-11-05 08:51:03 +0100 catalogue-license pd catalogue-topics graphics colour ++++++ graphics-pln.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/00readme.txt new/doc/plain/graphics-pln/00readme.txt --- old/doc/plain/graphics-pln/00readme.txt 2009-11-22 19:58:23.000000000 +0100 +++ new/doc/plain/graphics-pln/00readme.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ - -Graphics code for non-LaTeX users. -================================== - -This directory provides a small wrapper file such that users of -formats based on plain TeX may make use of some of the parts of the -standard LaTeX distribution. - -These files are *NOT* supported by the LaTeX3 project, and any -problems with them should *NOT* be reported to the LaTeX bugs system. - -Currently problems may be reported to me, david(a)dcarlisle.demon.co.uk -although as I only ever use LaTeX for documents, these files have not -been extensively tested. If some plain TeX user wants to `adopt' them -and take over their support then they are welcome to it:-) - -David Carlisle 1995/01/29 - 1996/11/13 - -Copyright 1995 1996 David Carlisle - - All the files in this directory may 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; either - version 1 of the License, or (at your option) any later version. - - - -This directory contains - -00readme.txt This file. - -exmplpic.tex - A plain TeX document using LaTeX' `picture mode': a portable - means of producing simple diagrams. - -exmplgrf.tex - A plain TeX document using the LaTeX graphicx package, for - rotating and scaling text, and include PostScript and other - graphics formats. (This will include the file a.ps available - in the LaTeX graphics distribution.) - -exmplcol.tex - A plain TeX document using the LaTeX color package, for - producing colour. - -exmplpfg.tex - A plain TeX document using the contributed LaTeX psfrag package, - for including PostScript documents, while replacing certain text - strings with TeX typeset replacements. This uses the example.eps - figure from the psfrag 3.0 distribution. - -miniltx.tex - A small `miniLaTeX' that defines fakes or otherwise hacks - sufficient bits of LaTeX internals so that the packages can load. - -picture.tex - The user interface to the picture environment. - \input picture. - Normally a plain-style syntax is used, viz - \picture(100,100) - .... - \endpicture - - However if the command \LaTeXbegin is issued, then a LaTeX - syntax of - \begin{picture}(100,100) - .... - \end{picture} - May be used. this may be prefered if the picture is being copied - from a LaTeX document, or if it is produced automatically from - a drawing tool such as xfig or texcad. - -autopict.ins - picture.tex requires the use of the Standard LaTeX file - autopict.sty. To generate this, either run the autoload.ins - install file in the main LaTeX distribution, which will make - autopict.sty along with some other files (not needed here) or - alternatively just obtain obtain ltpictur.dtx and docstrip.tex - from the LaTeX distribution, and TeX the file autopict.ins that - is included in this distribution. - - -graphicx.tex - The user interface to the graphicx package. - \input graphicx - See the documentation in grfguide.ps in the LaTeX graphics - distribution. - This file sets the driver to be dvips. If you - use another driver, edit accordingly. - -color.tex - The user interface to the color package. - \input color - See the documentation in grfguide.ps in the LaTeX graphics - distribution. - This file sets the driver to be dvips. If you - use another driver, edit accordingly. - - -psfrag.tex - The user interface to the psfrag package. - \input psfrag - See the documentation in pfgguide.tex in the psfrag distribution, - and the example document pfgexmpl.tex included here. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/README.txt new/doc/plain/graphics-pln/README.txt --- old/doc/plain/graphics-pln/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/plain/graphics-pln/README.txt 2017-06-11 23:49:52.000000000 +0200 @@ -0,0 +1,106 @@ + +Graphics code for non-LaTeX users. +================================== + +This directory provides a small wrapper file such that users of +formats based on plain TeX may make use of some of the parts of the +standard LaTeX distribution. + +These files are *NOT* supported by the LaTeX3 project, and any +problems with them should *NOT* be reported to the LaTeX bugs system. + +Problems should be reported as issues at +https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln + + +David Carlisle 1995/01/29 + 1996/11/13 + 2016/08/17 + 2017/06/01 + +Copyright 1995 1996 2016 2017 David Carlisle + + All the files in this directory may 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; either + version 1 of the License, or (at your option) any later version. + + + +This directory contains + +README.txt This file. + +exmplpic.tex + A plain TeX document using LaTeX' `picture mode': a portable + means of producing simple diagrams. + +exmplgrf.tex + A plain TeX document using the LaTeX graphicx package, for + rotating and scaling text, and include PostScript and other + graphics formats. (This will include the file a.ps available + in the LaTeX graphics distribution.) + +exmplcol.tex + A plain TeX document using the LaTeX color package, for + producing colour. + +exmplpfg.tex + A plain TeX document using the contributed LaTeX psfrag package, + for including PostScript documents, while replacing certain text + strings with TeX typeset replacements. This uses the example.eps + figure from the psfrag 3.0 distribution. + +miniltx.tex + A small `miniLaTeX' that defines fakes or otherwise hacks + sufficient bits of LaTeX internals so that the packages can load. + +picture.tex + The user interface to the picture environment. + \input picture. + Normally a plain-style syntax is used, viz + \picture(100,100) + .... + \endpicture + + However if the command \LaTeXbegin is issued, then a LaTeX + syntax of + \begin{picture}(100,100) + .... + \end{picture} + May be used. this may be prefered if the picture is being copied + from a LaTeX document, or if it is produced automatically from + a drawing tool such as xfig or texcad. + +autopict.ins + picture.tex requires the use of the Standard LaTeX file + autopict.sty. To generate this, either run the autoload.ins + install file in the main LaTeX distribution, which will make + autopict.sty along with some other files (not needed here) or + alternatively just obtain obtain ltpictur.dtx and docstrip.tex + from the LaTeX distribution, and TeX the file autopict.ins that + is included in this distribution. + + +graphicx.tex + The user interface to the graphicx package. + \input graphicx + See the documentation in grfguide.ps in the LaTeX graphics + distribution. + This file sets the driver to be dvips. If you + use another driver, edit accordingly. + +color.tex + The user interface to the color package. + \input color + See the documentation in grfguide.ps in the LaTeX graphics + distribution. + This file sets the driver to be dvips. If you + use another driver, edit accordingly. + + +psfrag.tex + The user interface to the psfrag package. + \input psfrag + See the documentation in pfgguide.tex in the psfrag distribution, + and the example document pfgexmpl.tex included here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-pln.doc.tlpobj new/tlpkg/tlpobj/graphics-pln.doc.tlpobj --- old/tlpkg/tlpobj/graphics-pln.doc.tlpobj 2016-04-14 19:06:13.000000000 +0200 +++ new/tlpkg/tlpobj/graphics-pln.doc.tlpobj 2017-06-12 02:21:26.000000000 +0200 @@ -1,10 +1,10 @@ name graphics-pln.doc category Package -revision 16917 +revision 44567 shortdesc doc files of graphics-pln relocated 1 docfiles size=5 - RELOC/doc/plain/graphics-pln/00readme.txt + RELOC/doc/plain/graphics-pln/README.txt RELOC/doc/plain/graphics-pln/exmplcol.tex RELOC/doc/plain/graphics-pln/exmplgrf.tex RELOC/doc/plain/graphics-pln/exmplpfg.tex ++++++ graphics-pln.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/autopict.sty new/tex/plain/graphics-pln/autopict.sty --- old/tex/plain/graphics-pln/autopict.sty 2009-11-22 19:58:23.000000000 +0100 +++ new/tex/plain/graphics-pln/autopict.sty 2016-11-25 19:34:06.000000000 +0100 @@ -75,341 +75,6 @@ %% %% %%% From File: ltpictur.dtx -\ProvidesFile{autopict.sty} - [2001/08/27 v1.1k Picture mode autoload file] -\long\gdef\picture#1{\pictur@#1} -\gdef\pictur@(#1){% - \@ifnextchar({\@picture(#1)}{\@picture(#1)(0,0)}} -\gdef\@picture(#1,#2)(#3,#4){% - \@picht#2\unitlength - \setbox\@picbox\hb@xt@#1\unitlength\bgroup - \hskip -#3\unitlength - \lower #4\unitlength\hbox\bgroup - \ignorespaces} -\gdef\endpicture{% - \egroup\hss\egroup - \ht\@picbox\@picht\dp\@picbox\z@ - \mbox{\box\@picbox}} -\long\gdef\put(#1,#2)#3{% - \@killglue\raise#2\unitlength - \hb@xt@\z@{\kern#1\unitlength #3\hss}% - \ignorespaces} -\gdef\multiput(#1,#2)#3{% - \@xdim #1\unitlength - \@ydim #2\unitlength - \@multiput(} -\long\gdef\@multiput(#1,#2)#3#4{% - \@killglue\@multicnt #3\relax - \@whilenum \@multicnt >\z@\do - {\raise\@ydim\hb@xt@\z@{\kern\@xdim #4\hss}% - \advance\@multicnt\m@ne - \advance\@xdim#1\unitlength\advance\@ydim#2\unitlength}% - \ignorespaces} -\gdef\@killglue{\unskip\@whiledim \lastskip >\z@\do{\unskip}} -\gdef\thinlines{\let\@linefnt\tenln \let\@circlefnt\tencirc - \@wholewidth\fontdimen8\tenln \@halfwidth .5\@wholewidth} -\gdef\thicklines{\let\@linefnt\tenlnw \let\@circlefnt\tencircw - \@wholewidth\fontdimen8\tenlnw \@halfwidth .5\@wholewidth} -\gdef\linethickness#1{\@wholewidth #1\relax \@halfwidth .5\@wholewidth} -\gdef\shortstack{\@ifnextchar[\@shortstack{\@shortstack[c]}} -\gdef\@shortstack[#1]{% - \leavevmode - \vbox\bgroup - \baselineskip-\p@\lineskip 3\p@ - \let\mb@l\hss\let\mb@r\hss - \expandafter\let\csname mb@#1\endcsname\relax - \let\\\@stackcr - \@ishortstack} -\gdef\@ishortstack#1{\ialign{\mb@l {##}\unskip\mb@r\cr #1\crcr}\egroup} -\gdef\@stackcr{\@ifstar\@ixstackcr\@ixstackcr} -\gdef\@ixstackcr{\@ifnextchar[\@istackcr{\cr\ignorespaces}} -\gdef\@istackcr[#1]{\cr\noalign{\vskip #1}\ignorespaces} -\newif\if@negarg -\gdef\line(#1,#2)#3{\@xarg #1\relax \@yarg #2\relax - \@linelen #3\unitlength - \ifdim\@linelen<\z@\@badlinearg\else - \ifnum\@xarg =\z@ \@vline - \else \ifnum\@yarg =\z@ \@hline \else \@sline\fi - \fi - \fi} -\gdef\@sline{% - \ifnum\@xarg<\z@ \@negargtrue \@xarg -\@xarg \@yyarg -\@yarg - \else \@negargfalse \@yyarg \@yarg \fi -\ifnum \@yyarg >\z@ \@tempcnta\@yyarg \else \@tempcnta -\@yyarg \fi -\ifnum\@tempcnta>6 \@badlinearg\@tempcnta\z@ \fi -\ifnum\@xarg>6 \@badlinearg\@xarg \@ne \fi -\setbox\@linechar\hbox{\@linefnt\@getlinechar(\@xarg,\@yyarg)}% -\ifdim\wd\@linechar=\z@ - \setbox\(a)linechar\hbox{.}% - \@badlinearg -\fi -\ifnum \@yarg >\z@ \let\@upordown\raise \@clnht\z@ - \else\let\@upordown\lower \@clnht \ht\@linechar\fi -\@clnwd \wd\@linechar -\if@negarg - \hskip -\wd\@linechar \def\reserved@a{\hskip -2\wd\@linechar}% -\else - \let\reserved@a\relax -\fi -\@whiledim \@clnwd <\@linelen \do - {\@upordown\@clnht\copy\@linechar - \reserved@a - \advance\@clnht \ht\@linechar - \advance\@clnwd \wd\@linechar}% -\advance\@clnht -\ht\@linechar -\advance\@clnwd -\wd\@linechar -\@tempdima\@linelen\advance\@tempdima -\@clnwd -\@tempdimb\@tempdima\advance\@tempdimb -\wd\@linechar -\if@negarg \hskip -\@tempdimb \else \hskip \@tempdimb \fi -\multiply\@tempdima \@m -\@tempcnta \@tempdima -\@tempdima \wd\@linechar \divide\@tempcnta \@tempdima -\@tempdima \ht\@linechar \multiply\@tempdima \@tempcnta -\divide\@tempdima \@m -\advance\@clnht \@tempdima -\ifdim \@linelen <\wd\@linechar - \hskip \wd\@linechar - \ifdim \@linelen = \z@ - \else - \@picture@warn - \fi - \else\@upordown\@clnht\copy\@linechar\fi} -\gdef\@hline{\ifnum \@xarg <\z@ \hskip -\@linelen \fi -\vrule \@height \@halfwidth \@depth \@halfwidth \@width \@linelen -\ifnum \@xarg <\z@ \hskip -\@linelen \fi} -\gdef\@getlinechar(#1,#2){\@tempcnta#1\relax\multiply\@tempcnta 8% - \advance\@tempcnta -9\ifnum #2>\z@ \advance\@tempcnta #2\relax\else - \advance\@tempcnta -#2\relax\advance\@tempcnta 64 \fi - \char\@tempcnta} -\gdef\vector(#1,#2)#3{\@xarg #1\relax \@yarg #2\relax - \@tempcnta \ifnum\@xarg<\z@ -\@xarg\else\@xarg\fi - \ifnum\@tempcnta<5\relax - \@linelen #3\unitlength - \ifdim\@linelen<\z@\@badlinearg\else - \ifnum\@xarg =\z@ \@vvector - \else \ifnum\@yarg =\z@ \@hvector \else \@svector\fi - \fi - \fi - \else\@badlinearg\fi} -\gdef\@hvector{\@hline\hb@xt@\z@{\@linefnt - \ifnum \@xarg <\z@ \@getlarrow(1,0)\hss\else - \hss\@getrarrow(1,0)\fi}} -\gdef\@vvector{\ifnum \@yarg <\z@ \@downvector \else \@upvector \fi} -\gdef\@svector{\@sline - \@tempcnta\@yarg \ifnum\@tempcnta <\z@ \@tempcnta -\@tempcnta\fi - \ifnum\@tempcnta <5% - \hskip -\wd\@linechar - \@upordown\@clnht \hbox{\@linefnt \if@negarg - \@getlarrow(\@xarg,\@yyarg)\else \@getrarrow(\@xarg,\@yyarg)\fi}% - \else\@badlinearg\fi} -\gdef\@getlarrow(#1,#2){\ifnum #2=\z@ \@tempcnta 27 % '33 - \else - \@tempcnta #1\relax\multiply\@tempcnta \sixt@@n - \advance\@tempcnta -9 \@tempcntb #2\relax\multiply\@tempcntb \tw@ - \ifnum \@tempcntb >\z@ \advance\@tempcnta \@tempcntb - \else\advance\@tempcnta -\@tempcntb\advance\@tempcnta 64 - \fi\fi\char\@tempcnta} -\gdef\@getrarrow(#1,#2){\@tempcntb #2\relax -\ifnum\@tempcntb <\z@ \@tempcntb -\@tempcntb\relax\fi -\ifcase \@tempcntb\relax \@tempcnta 45 % '55 -\or -\ifnum #1<\thr@@ \@tempcnta #1\relax\multiply\@tempcnta -24\advance\@tempcnta -6 \else \ifnum #1=\thr@@ \@tempcnta 49 -\else\@tempcnta 58 \fi\fi\or -\ifnum #1<\thr@@ \@tempcnta=#1\relax\multiply\@tempcnta -24\advance\@tempcnta -\thr@@ \else \@tempcnta 51 \fi\or -\@tempcnta #1\relax\multiply\@tempcnta -\sixt@@n \advance\@tempcnta -\tw@ \else -\@tempcnta #1\relax\multiply\@tempcnta -\sixt@@n \advance\@tempcnta 7 \fi\ifnum #2<\z@ \advance\@tempcnta 64 \fi -\char\@tempcnta} -\gdef\@vline{\ifnum \@yarg <\z@ \@downline \else \@upline\fi} -\gdef\@upline{% - \hb@xt@\z@{\hskip -\@halfwidth \vrule \@width \@wholewidth - \@height \@linelen \@depth \z@\hss}} -\gdef\@downline{% - \hb@xt@\z@{\hskip -\@halfwidth \vrule \@width \@wholewidth - \@height \z@ \@depth \@linelen \hss}} -\gdef\@upvector{\@upline\setbox\@tempboxa\hbox{\@linefnt\char 54}% % '66 - \raise \@linelen \hb@xt@\z@{\lower \ht\@tempboxa\box\@tempboxa\hss}} -\gdef\@downvector{\@downline\lower \@linelen - \hb@xt@\z@{\@linefnt\char 63 % '77 - \hss}} -\gdef\dashbox#1(#2,#3){\leavevmode\hb@xt@\z@{\baselineskip \z@skip -\lineskip \z@skip -\@dashdim #2\unitlength -\@dashcnt \@dashdim \advance\@dashcnt 200 -\@dashdim #1\unitlength\divide\@dashcnt \@dashdim -\ifodd\@dashcnt\@dashdim \z@ -\advance\@dashcnt \@ne \divide\@dashcnt \tw@ -\else \divide\@dashdim \tw@ \divide\@dashcnt \tw@ -\advance\@dashcnt \m@ne -\setbox\@dashbox \hbox{\vrule \@height \@halfwidth \@depth \@halfwidth -\@width \@dashdim}\put(0,0){\copy\@dashbox}% -\put(0,#3){\copy\@dashbox}% -\put(#2,0){\hskip-\@dashdim\copy\@dashbox}% -\put(#2,#3){\hskip-\@dashdim\box\@dashbox}% -\multiply\@dashdim \thr@@ -\fi -\setbox\@dashbox \hbox{\vrule \@height \@halfwidth \@depth \@halfwidth -\@width #1\unitlength\hskip #1\unitlength}\@tempcnta\z@ -\put(0,0){\hskip\@dashdim \@whilenum \@tempcnta <\@dashcnt -\do{\copy\@dashbox\advance\@tempcnta \@ne }}\@tempcnta\z@ -\put(0,#3){\hskip\@dashdim \@whilenum \@tempcnta <\@dashcnt -\do{\copy\@dashbox\advance\@tempcnta \@ne }}% -\@dashdim #3\unitlength -\@dashcnt \@dashdim \advance\@dashcnt 200 -\@dashdim #1\unitlength\divide\@dashcnt \@dashdim -\ifodd\@dashcnt \@dashdim \z@ -\advance\@dashcnt \@ne \divide\@dashcnt \tw@ -\else -\divide\@dashdim \tw@ \divide\@dashcnt \tw@ -\advance\@dashcnt \m@ne -\setbox\@dashbox\hbox{\hskip -\@halfwidth -\vrule \@width \@wholewidth -\@height \@dashdim}\put(0,0){\copy\@dashbox}% -\put(#2,0){\copy\@dashbox}% -\put(0,#3){\lower\@dashdim\copy\@dashbox}% -\put(#2,#3){\lower\@dashdim\copy\@dashbox}% -\multiply\@dashdim \thr@@ -\fi -\setbox\@dashbox\hbox{\vrule \@width \@wholewidth -\@height #1\unitlength}\@tempcnta\z@ -\put(0,0){\hskip -\@halfwidth \vbox{\@whilenum \@tempcnta <\@dashcnt -\do{\vskip #1\unitlength\copy\@dashbox\advance\@tempcnta \@ne }% -\vskip\@dashdim}}\@tempcnta\z@ -\put(#2,0){\hskip -\@halfwidth \vbox{\@whilenum \@tempcnta<\@dashcnt -\do{\vskip #1\unitlength\copy\@dashbox\advance\@tempcnta \@ne }% -\vskip\@dashdim}}}\@makepicbox(#2,#3)} -\newif\if@ovt -\newif\if@ovb -\newif\if@ovl -\newif\if@ovr -\gdef\@getcirc#1{\@tempdima #1\relax \advance\@tempdima 2\p@ - \@tempcnta\@tempdima - \@tempdima 4\p@ \divide\@tempcnta\@tempdima - \ifnum \@tempcnta >10\relax - \@picture@warn - \@tempcnta 10\relax - \fi - \ifnum \@tempcnta >\z@ \advance\@tempcnta\m@ne - \else \@picture@warn \fi - \multiply\@tempcnta 4\relax - \setbox \@tempboxa \hbox{\@circlefnt - \char \@tempcnta}\@tempdima \wd \@tempboxa} -\def\@picture@warn{\@latex@warning{% - \string\oval, \string\circle, or \string\line\space - size unavailable}} -\gdef\@put#1#2#3{\raise #2\hb@xt@\z@{\hskip #1#3\hss}} -\gdef\oval(#1,#2){\@ifnextchar[{\@oval(#1,#2)}{\@oval(#1,#2)[]}} -\gdef\@oval(#1,#2)[#3]{\begingroup\boxmaxdepth \maxdimen - \@ovttrue \@ovbtrue \@ovltrue \@ovrtrue - \@tfor\reserved@a :=#3\do{\csname @ov\reserved@a false\endcsname}% - \@ovxx - #1\unitlength \@ovyy #2\unitlength - \@tempdimb \ifdim \@ovyy >\@ovxx \@ovxx\else \@ovyy \fi - \advance \@tempdimb -2\p@ - \@getcirc \@tempdimb - \@ovro \ht\@tempboxa \@ovri \dp\@tempboxa - \@ovdx\@ovxx \advance\@ovdx -\@tempdima \divide\@ovdx \tw@ - \@ovdy\@ovyy \advance\@ovdy -\@tempdima \divide\@ovdy \tw@ - \@circlefnt \setbox\@tempboxa - \hbox{\if@ovr \@ovvert32\kern -\@tempdima \fi - \if@ovl \kern \@ovxx \@ovvert01\kern -\@tempdima \kern -\@ovxx \fi - \if@ovt \@ovhorz \kern -\@ovxx \fi - \if@ovb \raise \@ovyy \@ovhorz \fi}\advance\@ovdx\@ovro - \advance\@ovdy\@ovro \ht\@tempboxa\z@ \dp\@tempboxa\z@ - \@put{-\@ovdx}{-\@ovdy}{\box\@tempboxa}% - \endgroup} -\gdef\@ovvert#1#2{\vbox to\@ovyy{% - \if@ovb \@tempcntb \@tempcnta \advance \@tempcntb #1\relax - \kern -\@ovro \hbox{\char \@tempcntb}\nointerlineskip - \else \kern \@ovri \kern \@ovdy \fi - \leaders\vrule \@width \@wholewidth\vfil \nointerlineskip - \if@ovt \@tempcntb \@tempcnta \advance \@tempcntb #2\relax - \hbox{\char \@tempcntb}% - \else \kern \@ovdy \kern \@ovro \fi}} -\gdef\@ovhorz{\hb@xt@\@ovxx{\kern \@ovro - \if@ovr \else \kern \@ovdx \fi - \leaders \hrule \@height \@wholewidth \hfil - \if@ovl \else \kern \@ovdx \fi - \kern \@ovri}} -\gdef\circle{\@inmatherr\circle\@ifstar\@dot\@circle} -\gdef\@circle#1{% - \begingroup \boxmaxdepth \maxdimen \@tempdimb #1\unitlength - \ifdim \@tempdimb >15.5\p@ \@getcirc\@tempdimb - \@ovro\ht\@tempboxa - \setbox\@tempboxa\hbox{\@circlefnt - \advance\@tempcnta\tw@ \char \@tempcnta - \advance\@tempcnta\m@ne \char \@tempcnta \kern -2\@tempdima - \advance\@tempcnta\tw@ - \raise \@tempdima \hbox{\char\@tempcnta}\raise \@tempdima - \box\@tempboxa}\ht\@tempboxa\z@ \dp\@tempboxa\z@ - \@put{-\@ovro}{-\@ovro}{\box\@tempboxa}% - \else \@circ\@tempdimb{96}\fi\endgroup} -\gdef\@dot#1{\@tempdimb #1\unitlength \@circ\@tempdimb{112}} -\gdef\@circ#1#2{\@tempdima #1\relax \advance\@tempdima .5\p@ - \@tempcnta\@tempdima \@tempdima \p@ - \divide\@tempcnta\@tempdima - \ifnum\@tempcnta >15\relax \@tempcnta 15\relax \fi - \ifnum \@tempcnta >\z@ \advance\@tempcnta\m@ne\fi - \advance\@tempcnta #2\relax - \@circlefnt \char\@tempcnta} -\ifx\qbeziermax\@undefined -\gdef\qbeziermax{500} -\fi -\newcommand\qbezier[2][0]{\bezier{#1}#2} -\gdef\bezier#1)#2(#3)#4({\@bezier#1)(#3)(} -\gdef\@bezier#1(#2,#3)(#4,#5)(#6,#7){% - \ifnum #1=\z@ - \@ovxx #4\unitlength - \advance\@ovxx -#2\unitlength - \ifdim \@ovxx<\z@ \@ovxx -\@ovxx \fi - \@ovdx #6\unitlength - \advance\@ovdx -#4\unitlength - \ifdim \@ovdx<\z@ \@ovdx -\@ovdx \fi - \ifdim \@ovxx<\@ovdx \@ovxx \@ovdx \fi - \@ovyy #5\unitlength - \advance\@ovyy -#3\unitlength - \ifdim \@ovyy<\z@ \@ovyy -\@ovyy \fi - \@ovdy #7\unitlength - \advance\@ovdy -#5\unitlength - \ifdim \@ovdy<\z@ \@ovdy -\@ovdy \fi - \ifdim \@ovyy<\@ovdy \@ovyy \@ovdy \fi - \@multicnt - \ifdim \@ovxx>\@ovyy \@ovxx \else \@ovyy \fi - \@ovxx .5\@halfwidth \divide\@multicnt\@ovxx - \ifnum \qbeziermax<\@multicnt \@multicnt\qbeziermax\relax \fi - \else \@multicnt#1\relax \fi - \@tempcnta\@multicnt \advance\@tempcnta\@ne - \@ovdx #4\unitlength \advance\@ovdx -#2\unitlength - \multiply\@ovdx \tw@ - \@ovxx #6\unitlength \advance\@ovxx -#2\unitlength - \advance\@ovxx -\@ovdx \divide\@ovxx\@multicnt - \@ovdy #5\unitlength \advance\@ovdy -#3\unitlength - \multiply\@ovdy \tw@ - \@ovyy #7\unitlength \advance\@ovyy -#3\unitlength - \advance\@ovyy -\@ovdy \divide\@ovyy\@multicnt - \setbox\@tempboxa\hbox{% - \hskip -\@halfwidth - \vrule \@height\@halfwidth - \@depth \@halfwidth - \@width \@wholewidth}% - \put(#2,#3){% - \count@\z@ - \@whilenum{\count@<\@tempcnta}\do - {\@xdim\count@\@ovxx - \advance\@xdim\@ovdx - \divide\@xdim\@multicnt - \multiply\@xdim\count@ - \@ydim\count@\@ovyy - \advance\@ydim\@ovdy - \divide\@ydim\@multicnt - \multiply\@ydim\count@ - \raise \@ydim - \hb@xt@\z@{\kern\@xdim - \unhcopy\@tempboxa\hss}% - \advance\count@\@ne}}} \endinput %% %% End of file `autopict.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/color.tex new/tex/plain/graphics-pln/color.tex --- old/tex/plain/graphics-pln/color.tex 2009-11-22 19:58:23.000000000 +0100 +++ new/tex/plain/graphics-pln/color.tex 2016-11-25 19:34:06.000000000 +0100 @@ -2,7 +2,7 @@ % David Carlisle \input miniltx -\makeatletter + \def\Gin(a)driver{dvips.def} \input color.sty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/graphicx.tex new/tex/plain/graphics-pln/graphicx.tex --- old/tex/plain/graphics-pln/graphicx.tex 2009-11-22 19:58:23.000000000 +0100 +++ new/tex/plain/graphics-pln/graphicx.tex 2017-06-11 23:49:52.000000000 +0200 @@ -4,6 +4,11 @@ \input miniltx +% ttfamily used in draft mode to show filenames. +\ifx\ttfamily\@undefined + \let\ttfamily\tt +\fi + \def\Gin(a)driver{dvips.def} \input graphicx.sty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/miniltx.tex new/tex/plain/graphics-pln/miniltx.tex --- old/tex/plain/graphics-pln/miniltx.tex 2010-02-05 02:25:41.000000000 +0100 +++ new/tex/plain/graphics-pln/miniltx.tex 2017-06-11 23:49:52.000000000 +0200 @@ -2,19 +2,19 @@ %%% %%% Parts of LaTeX: Slightly changed/simplified in places. %%% Changes -%%% Copyright 1996 David Carlisle +%%% Copyright 1996-2017 David Carlisle LaTeX3 Project %%% Original Code %%% Copyright 1993-1996 LaTeX3 Project and original authors %%% -%%% Under no circumstances should any problems relating to this file -%%% be sent to the LaTeX bugs address, or any other LaTeX related -%%% support address. +%%% Problems relating to this fileshould not be sent to the LaTeX bugs address, +%%% or any other LaTeX related support address. %%% -%%% Problems can be sent to me directly at david(a)dcarlisle.demon.co.uk -%%% (but I don't promise to fix them). +%%% Problems should be reported as issues at +%%% https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln +%%% %%% %%% This file may be distributed under the terms of the LPPL, see -%%% 00readme.txt for details. +%%% README.txt for details. % 1996/01/29 initial version % 1996/05/09 a few missing commands added @@ -23,15 +23,21 @@ % (http://sourceforge.net/projects/asymptote/forums/forum/409349/topic/3405573) % 2010/01/07 import was incomplete [KB] % 2010/02/03 accept *-form of \ProcessOptions [KB/DL] +% 2016/08/17 fix catcode @ handling (again), document github address [DC] +% 2017/06/01 assorted updates to cover updated latex drivers \edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax} -\ifx\miniltx\undefined\else\endinput\fi -\let\miniltx\box \def\makeatletter{\catcode`\@11\relax} \def\makeatother{\catcode`\@12\relax} \makeatletter + +% 2016/08/17 move after \makeatletter +% so \input graphicx \input color works. +\ifx\miniltx\undefined\else\endinput\fi +\let\miniltx\box + \def\@makeother#1{\catcode`#1=12\relax} @@ -74,7 +80,9 @@ {\@pr@videpackage{#1}}{\@pr@videpackage#1[]}} \def\@pr@videpackage#1[#2]{\wlog{#1: #2}} \let\ProvidesFile\ProvidesPackage -\def\PackageInfo#1#2{\wlog{#1: #2}} +\def\PackageInfo#1#2{{% + \newlinechar`\^^J\def\MessageBreak{^^J#1: }% + \wlog{#1: #2}}} \let\DeclareOption\@gobbletwo \def\ProcessOptions{\@ifstar\relax\relax} @@ -297,10 +305,17 @@ \let\ExecuteOptions\@gobble -\def\PackageError#1#2#3{% - \errhelp{#3}\errmessage{#1: #2}} -\def\@latex@error#1#2{% - \errhelp{#2}\errmessage{#1}} +\def\on@line{ on input line \the\inputlineno} +\ifx\@ehc\@undefined\def\@ehc{}\fi + +\def\PackageError#1#2#3{{% + \newlinechar`\^^J\def\MessageBreak{^^J\space\space#1: }% + \errhelp{#3}\errmessage{#1: #2}}} +\def\@latex@error#1#2{\bgroup% + \newlinechar`\^^J\def\MessageBreak{^^J\space\space#1: }% + \edef\reserved@a{\egroup\errhelp{#2}\errmessage{#1}}% + \reserved@a} + \bgroup\uccode`\!`\%\uppercase{\egroup \def\@percentchar{!}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-pln.tlpobj new/tlpkg/tlpobj/graphics-pln.tlpobj --- old/tlpkg/tlpobj/graphics-pln.tlpobj 2016-04-14 19:06:13.000000000 +0200 +++ new/tlpkg/tlpobj/graphics-pln.tlpobj 2017-06-12 02:21:26.000000000 +0200 @@ -1,6 +1,6 @@ name graphics-pln category Package -revision 16917 +revision 44567 shortdesc LaTeX-style graphics for Plain TeX users relocated 1 longdesc The Plain TeX graphics package is mostly a thin shell around @@ -9,7 +9,7 @@ longdesc largest part of the bundle). The bundle also contains a file longdesc "picture.tex", which is a wrapper around the autopict.sty, and longdesc provides the LaTeX picture mode to Plain TeX users. -runfiles size=12 +runfiles size=9 RELOC/tex/plain/graphics-pln/autopict.sty RELOC/tex/plain/graphics-pln/color.tex RELOC/tex/plain/graphics-pln/graphicx.tex @@ -17,6 +17,6 @@ RELOC/tex/plain/graphics-pln/picture.tex RELOC/tex/plain/graphics-pln/psfrag.tex catalogue-ctan /macros/plain/graphics -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2017-06-11 12:48:18 +0200 +catalogue-license lppl1 catalogue-topics graphics-incl plain-ext ++++++ graphics.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/README.txt new/doc/latex/graphics/README.txt --- old/doc/latex/graphics/README.txt 2016-02-01 00:48:08.000000000 +0100 +++ new/doc/latex/graphics/README.txt 2017-04-16 00:59:15.000000000 +0200 @@ -1,5 +1,5 @@ %% -%% Copyright 1993-2016 LaTeX Project +%% Copyright 1993-2017 LaTeX Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% @@ -46,6 +46,7 @@ ===================== graphicx.dtx Source for graphicx package (extension of graphics) epsfig.dtx Source for epsfig package (extension of graphicx) +rotating.dtx Source for rotating package (extension of graphicx) keyval.dtx Source for keyval pacakge (required by both the above) lscape.sty Produce landscape pages in a (mainly) portrait document. @@ -65,6 +66,8 @@ \ExecuteOptions{dvips} Before running this file. +rotex.tex examples of use of rotating package. + ============================================= TO UNPACK THE PACKAGES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/cat.eps new/doc/latex/graphics/cat.eps --- old/doc/latex/graphics/cat.eps 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/graphics/cat.eps 2016-11-25 19:29:05.000000000 +0100 @@ -0,0 +1,305 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%BoundingBox: 44 527 80 559 +%%Creator: COREL DRAW +%%Title: CAT.TMP +%%CreationDate: Sat Jan 18 17:29:05 1992 + +%%DocumentFonts: +%%EndComments +%%BeginProlog +% -------------- POSTSCRIPT PROLOG FOR CORELDRAW 2.X ------ +% Copyright Corel Systems Corporation 1990 +/AutoFlatness 0 def/wCorelDict 300 dict def +wCorelDict begin/bd{bind def}bind def/ld{load def}bd +/xd{exch def}bd/_ null def/$c 0 def/$m 0 def +/$y 0 def/$k 0 def/$t 1 def/$n _ def/$o 0 def +/$fil 0 def/$C 0 def/$M 0 def/$Y 0 def/$K 0 def +/$T 1 def/$N _ def/$O 0 def/$PF false def +/$pan 0 def/$h false def/$al 0 def/$tr 0 def +/$le 0 def/$lx 0 def/$ly 0 def/$ctm matrix currentmatrix def +/$ptm matrix def/$ttm matrix def/$stm matrix def +/$skm matrix def/$fst 128 def/$pad 0 def/$rox 0 def +/$roy 0 def currentscreen/@dsp xd/$dsp/@dsp def +/$dsa xd/$dsf xd/$sdf false def/$SDF false def +/$Scra 0.0 def statusdict/pageparams known{statusdict begin +pageparams end 1 ne{/$Scra -90.0 def}if pop pop pop}if +/$sv 0 def/@cp/closepath ld/@gs/gsave ld/@gr/grestore ld +/@np/newpath ld/@sv{/$sv save def}bd/@rs{$sv restore}bd +/@ss{load setscreen}bd AutoFlatness 1 eq{/$cpx ([Error: PathTooComplex; OffendingCommand: AnyPaintingOperator;\n) def +/@err1{$cpx print flush newpath}bd/@ifl{currentflat dup 10 gt{pop @err1 exit}if 2 add setflat}bd +/@fill/fill ld/fill{currentflat{{@fill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +/@eofill/eofill ld/eofill{currentflat{{@eofill}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +/@clip/clip ld/clip{currentflat{{@clip}stopped{initclip @ifl}{exit}ifelse}bind loop setflat}bd +/@eoclip/eoclip ld/eoclip{currentflat{{@eoclip}stopped{initclip @ifl}{exit}ifelse}bind loop setflat}bd +/@stroke/stroke ld/stroke{currentflat{{@stroke}stopped{@ifl}{exit}ifelse}bind loop setflat}bd +}if/InRange{3 -1 roll 2 copy le{pop}{exch pop}ifelse +2 copy ge{pop}{exch pop}ifelse}bd/wDstChck{2 1 roll dup 3 -1 roll +eq{1 add}if}bd/@dot{dup mul exch dup mul add 1 exch sub 2 div}bd +/@lin{exch pop abs 1 exch sub}bd/@MN{2 copy le{pop}{exch pop}ifelse}bd +/setcmykcolor where{pop}{/setcmykcolor{4 1 roll +3{3 index add 1 @MN 1 exch sub 3 1 roll}repeat +setrgbcolor pop}bd}ifelse/colorimage where{pop}{/colorimage{/$ncl xd +pop pop pop pop{currentfile $dat readhexstring pop}repeat +pop}bd}ifelse/@tc{dup 1 ge{pop}{4{dup 6 -1 roll +mul exch}repeat pop}ifelse}bd/@spc{7 2 roll +ColorSeparationMode 1 eq{6 index @tc 0 4 $ink sub index +exch pop}{5 index dup _ eq{pop 0 4 $ink sub index +exch pop}{CurrentInkName eq{6 index}{0}ifelse}ifelse}ifelse +5 1 roll 8 -2 roll 6{pop}repeat 1 exch sub dup setgray +1 eq exch 1 eq and not}bd/@scc{$ink -1 eq +{$c $m $y $k $t @tc setcmykcolor true}{$o $c $m $y $k $t $n @spc +}ifelse}bd/@SCC{$ink -1 eq{$C $M $Y $K $T @tc setcmykcolor true}{ +$O $C $M $Y $K $T $N @spc}ifelse}bd/@sft{ +/$tx $tllx $pxf add dup $tllx gt{$pwid sub}if def +/$ty $tury $pyf sub dup $tury lt{$phei add}if def}bd +/@stb{pathbbox/$ury xd/$urx xd/$lly xd/$llx xd}bd +/@ep{{cvx exec}forall}bd/@tp{@sv/$in true def +2 copy dup $lly le{/$in false def}if $phei sub $ury ge{/$in false def}if +dup $urx ge{/$in false def}if $pwid add $llx le{/$in false def}if +$in{@np 2 copy moveto $pwid 0 rlineto 0 $phei neg rlineto +$pwid neg 0 rlineto 0 $phei rlineto clip @np +$pn cvlit load aload pop 7 -1 roll 5 index sub +7 -1 roll 3 index sub translate/$ctm matrix currentmatrix def +@ep pop pop pop pop}{pop pop}ifelse @rs}bd/@th{@sft +0 1 $tly 1 sub{dup $psx mul $tx add{dup $llx gt{$pwid sub}{exit}ifelse +}loop exch $phei mul $ty exch sub 0 1 $tlx 1 sub{$pwid mul +3 copy 3 -1 roll add exch @tp pop}for pop pop}for}bd +/@tv{@sft 0 1 $tlx 1 sub{dup $pwid mul $tx add +exch $psy mul $ty exch sub{dup $ury lt{$phei add}{exit}ifelse}loop +0 1 $tly 1 sub{$phei mul 3 copy sub @tp pop}for +pop pop}for}bd/@pf{@gs $ctm setmatrix $pm concat +@stb @gs ColorSeparationMode 0 eq{1 setgray eofill}{ +$o 0 0 0 0 0 (Black) @spc{eofill}if}ifelse +@gr eoclip Bburx Bbury $pm itransform/$tury xd/$turx xd +Bbllx Bblly $pm itransform/$tlly xd/$tllx xd +/$wid $turx $tllx sub def/$hei $tury $tlly sub def +$wid 0 gt $hei 0 gt and{$pn cvlit load aload pop +/$pd xd 3 -1 roll sub/$phei xd exch sub/$pwid xd +/$tlx $wid $pwid div ceiling 1 add def/$tly $hei $phei div ceiling 1 add def +$psx 0 eq{@tv}{@th}ifelse}if @gr @np}bd/@dlt{ColorSeparationMode 0 eq{ +/$dc $toc $tot mul $frc $frt mul dup/$c xd sub $fst 1 sub div def +/$dm $tom $tot mul $frm $frt mul dup/$m xd sub $fst 1 sub div def +/$dy $toy $tot mul $fry $frt mul dup/$y xd sub $fst 1 sub div def +/$dk $tok $tot mul $frk $frt mul dup/$k xd sub $fst 1 sub div def +true}{$o $frc $frm $fry $frk $frt $frn @spc +dup{/$frk 1 currentgray sub def}{/$frk 0 def}ifelse +$o $toc $tom $toy $tok $tot $ton @spc dup{/$tok 1 currentgray sub def} +{/$tok 0 def}ifelse or dup{/$c 0 def/$m 0 def/$y 0 def/$k $frk def +/$dc 0 def/$dm 0 def/$dy 0 def/$dk $tok $frk sub $fst 1 sub div def}if +}ifelse}bd/@ftl{1 index 4 index sub dup $pad mul dup/$pdw xd +2 mul sub $fst div/$wid xd 2 index sub/$hei xd +pop translate $c $m $y $k 4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +0 0 moveto 0 $hei lineto $pdw $hei lineto $pdw 0 lineto 0 0 lineto fill +$pdw 0 translate $fst{4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +0 0 moveto 0 $hei lineto $wid $hei lineto $wid 0 lineto 0 0 lineto fill +$wid 0 translate $dk add 4 1 roll $dy add 4 1 roll +$dm add 4 1 roll $dc add 4 1 roll}repeat $dk sub 4 1 roll +$dy sub 4 1 roll $dm sub 4 1 roll $dc sub 4 1 roll +ColorSeparationMode 0 ne{1 exch sub setgray pop pop pop} +{setcmykcolor}ifelse 0 0 moveto 0 $hei lineto $pdw $hei lineto $pdw 0 lineto 0 0 lineto fill +}bd/@ftr{1 index 4 index sub dup $rox mul/$row xd +2 div 1 index 4 index sub dup $roy mul/$roh xd +2 div 2 copy dup mul exch dup mul add sqrt +$row dup mul $roh dup mul add sqrt add dup/$hei xd $fst div/$wid xd +4 index add $roh add exch 5 index add $row add +exch translate pop pop pop pop currentflat 5 mul setflat +$c $m $y $k 4 copy ColorSeparationMode 0 ne +{1 exch sub setgray pop pop pop}{setcmykcolor}ifelse +$wid 0 moveto 0 0 $hei 0 360 arc fill 1.0 $pad 2 mul sub dup scale +$fst{4 copy ColorSeparationMode 0 ne{1 exch sub setgray pop pop pop} +{setcmykcolor}ifelse $wid 0 moveto 0 0 $hei 0 360 arc fill +/$hei $hei $wid sub def $dk add 4 1 roll $dy add 4 1 roll +$dm add 4 1 roll $dc add 4 1 roll}repeat pop pop pop pop}bd +/@ff{@gs @dlt{$ctm setmatrix eoclip newpath Bbllx Bblly moveto +Bbllx Bbury lineto Bburx Bbury lineto Bburx Bblly lineto +$fan rotate pathbbox newpath $fty 1 eq{@ftr}{@ftl}ifelse}if +@gr @np}bd/@Pf{@sv ColorSeparationMode 0 eq $ink 3 eq or{$ctm setmatrix +72 1000 div dup matrix scale dup concat dup Bburx exch Bbury exch itransform +ceiling cvi/Bbury xd ceiling cvi/Bburx xd Bbllx exch Bblly exch itransform +floor cvi/Bblly xd floor cvi/Bbllx xd $Prm aload pop +$Psn load exec}{1 setgray eofill}ifelse @rs +@np}bd/@ftx{{(0) dup 3 -1 roll 0 exch put +@gs true charpath currentpoint $ctm setmatrix +@@txt @gr @np moveto $tr 0 rmoveto}forall pop}bd +/@sm{/$ctm $ctm currentmatrix def}bd/@lorg{$lx $ly moveto +/$ly $ly $le sub def}bd/@ft{matrix currentmatrix 3 1 roll +$sdf{$scf $sca $scp @ss}if $fil 1 eq{/@@txt/@pf ld @ftx}{$fil 2 eq +{/@@txt/@ff ld @ftx}{$fil 3 eq{/@@txt/@Pf ld @ftx}{@scc +{dup $tr exch 0 exch ashow}if pop pop}ifelse}ifelse}ifelse +$sdf{$dsf $dsa $dsp @ss}if setmatrix}bd/@st{ +matrix currentmatrix 3 1 roll $SDF{$SCF $SCA $SCP @ss}if +@SCC{{(0) dup 3 -1 roll 0 exch put @gs true charpath currentpoint +$ctm setmatrix $ptm concat stroke @gr moveto $tr 0 rmoveto}forall +pop}{pop pop}ifelse $SDF{$dsf $dsa $dsp @ss}if +setmatrix}bd/@pt{dup length exch}bd/@te{@pt +@lorg @ft cleartomark [}bd/@tr{@pt @lorg @st cleartomark [}bd +/@ta{@pt @lorg 2 copy @gs @ft @gr @st cleartomark [}bd +/@t@a{@pt @lorg 2 copy @gs @st @gr @ft cleartomark [}bd +/g{1 exch sub/$k xd/$c 0 def/$m 0 def/$y 0 def/$t 1 def/$n _ def/$fil 0 def +}bd/G{1 exch sub/$K xd/$C 0 def/$M 0 def/$Y 0 def/$T 1 def/$N _ def}bd +/k{/$k xd/$y xd/$m xd/$c xd/$t 1 def/$n _ def/$fil 0 def}bd +/K{/$K xd/$Y xd/$M xd/$C xd/$T 1 def/$N _ def}bd +/x{1 exch sub/$t xd/$n xd/$k xd/$y xd/$m xd/$c xd/$fil 0 def}bd +/X{1 exch sub/$T xd/$N xd/$K xd/$Y xd/$M xd/$C xd}bd +/d/setdash ld/i{dup 0 ne{setflat}{pop}ifelse}bd +/j/setlinejoin ld/J/setlinecap ld/M/setmiterlimit ld +/w/setlinewidth ld/O{/$o xd}bd/R{/$O xd}bd +/c/curveto ld/C/c ld/v{4 -2 roll 2 copy 6 -2 roll curveto}bd +/V/v ld/y{2 copy curveto}bd/Y/y ld/l/lineto ld +/L/l ld/m/moveto ld/n/newpath ld/N/newpath ld +/F{matrix currentmatrix $sdf{$scf $sca $scp @ss}if +$fil 1 eq{@pf}{$fil 2 eq{@ff}{$fil 3 eq{@Pf}{@scc{eofill}{@np}ifelse +}ifelse}ifelse}ifelse $sdf{$dsf $dsa $dsp @ss}if +setmatrix}bd/f{@cp F}bd/S{matrix currentmatrix +$ctm setmatrix $SDF{$SCF $SCA $SCP @ss}if @SCC{$skm currentmatrix +$ptm concat stroke setmatrix}{@np}ifelse $SDF{$dsf $dsa $dsp @ss}if +setmatrix}bd/s{@cp S}bd/B{@gs F @gr S}bd/b{@cp B}bd +/W{eoclip}bd/p{/$pm xd 7{pop}repeat/$pyf xd/$pxf xd +/$pn xd/$fil 1 def}bd/P{11{pop}repeat}bd/z{/$al xd +/$tr xd/$le xd exch findfont exch scalefont setfont}bd +/Z{dup type 0 type eq{/$bDir xd}if findfont +dup maxlength 1 add dict exch dup{1 index/FID ne{3 index +3 1 roll put}{pop pop}ifelse}forall pop dup dup/Encoding get +256 array copy dup/$fe xd/Encoding exch put +dup/Fontname 3 index put 3 -1 roll dup length 0 ne{0 exch{ +dup type 0 type eq{exch pop}{$fe exch 2 index exch put +1 add}ifelse}forall pop}if definefont pop}bd +/e{@sm concat [/t{@te}def}bd/r{@sm concat [/t{@tr}def}bd +/o{@sm concat [/t{pop}def}bd/a{@sm concat [/t{@ta}def}bd +/t{@te}def/T{cleartomark @np/$lx 0 def/$ly 0 def +$ctm setmatrix/$ttm matrix def}bd/u{}bd/U{}bd +/A{pop}bd/H{/$h true def}bd/h{@cp H}bd/q/@gs ld +/Q/@gr ld/E{5 array astore exch cvlit exch def}bd +/`{}bd/~{}bd/@{}bd/&{}bd/CorelDrawRencodeVect [ +16#80/grave/circumflex/tilde/dotlessi/florin/quotedblleft/quotedblright/guilsinglleft +16#88/guilsinglright/fi/fl/dagger/daggerdbl/endash/periodcentered/breve +16#90/quotedblbase/ellipsis/perthousand/trademark/Pt/fractionbar +16#98/divide 16#a1/exclamdown/cent/sterling/currency/yen/bar/section +16#a8/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/emdash/registered/overbar +16#b0/ring/plusminus/twosuperior/threesuperior/acute/mu/paragraph/bullet +16#b8/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown +16#c0/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla +16#c8/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis +16#d0/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/OE +16#d8/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls +16#e0/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla +16#e8/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis +16#f0/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/oe +16#f8/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis +] def/@cc{currentfile $dat readhexstring pop}bd +/@ii{concat 3 index 3 index m 3 index 1 index l +2 copy l 1 index 3 index l 3 index 3 index l +clip pop pop pop pop}bd/@E{/Bbury xd/Bburx xd +/Bblly xd/Bbllx xd}bd/@c{@cp}bd/@p{/$fil 1 def +/$pm xd/$psy xd/$psx xd/$pyf xd/$pxf xd/$pn xd}bd +/@P{/$fil 3 def/$Psn xd array astore/$Prm xd}bd +/@k{/$fil 2 def/$roy xd/$rox xd/$pad xd/$fty xd/$fan xd +$fty 1 eq{/$fan 0 def}if/$tok xd/$toy xd/$tom xd/$toc xd +/$frk xd/$fry xd/$frm xd/$frc xd/$frn _ def/$frt 1 def/$ton _ def/$tot 1 def +}bd/@x{/$fil 2 def/$roy xd/$rox xd/$pad xd +/$fty xd/$fan xd 1 exch sub/$tot xd/$ton xd/$tok xd/$toy xd/$tom xd/$toc xd +1 exch sub/$frt xd/$frn xd/$frk xd/$fry xd/$frm xd/$frc xd}bd +/@i{@sm @gs @ii 5 index 1 ne{@gs 1 g F @gr}if +1 eq 5 index 1 eq and{@gs $ctm setmatrix F @gr}if +@np/$ury xd/$urx xd/$lly xd/$llx xd/$bts xd +/$hei xd/$wid xd/$dat $wid $bts mul 8 div ceiling cvi string def +$bts 1 eq{@SCC/$frg xd}{1 G @SCC/$frg xd}ifelse +$frg{$SDF{$SCF $SCA $SCP @ss}if $llx $lly translate +$urx $llx sub $ury $lly sub scale $wid $hei abs +$bts 1 eq{false}{$bts}ifelse [ $wid 0 0 $hei neg 0 +$hei 0 gt{$hei}{0}ifelse]/@cc load $bts 1 eq{imagemask}{image}ifelse +$SDF{$dsf $dsa $dsp @ss}if}{$hei{@cc pop}repeat}ifelse +@gr $ctm setmatrix}def/@M {@sv}bd/@N{/@cc{}def +12 -1 roll neg 12 1 roll @i @rs}bd/@I{@sm @gs +@ii @np/$ury xd/$urx xd/$lly xd/$llx xd/$ncl xd +/$bts xd/$hei xd/$wid xd/$dat $wid $bts mul $ncl mul 8 div ceiling cvi string def +$llx $lly translate $urx $llx sub $ury $lly sub scale +$wid $hei $bts [ $wid 0 0 $hei neg 0 $hei]/@cc load +false $ncl colorimage @gr $ctm setmatrix}bd +/@t{/$lx 0 def/$ly 0 def/$stm $stm currentmatrix def +3 1 roll translate $ttm concat 1 exch t $stm setmatrix}def +/@n{/$ttm exch matrix rotate def}bd/@z{ exch findfont exch scalefont setfont +}bd/@s{}bd/@l{}bd/@B{@gs S @gr F}bd/@b{@cp @B}bd +/@a{@sm concat [/t{@t@a}def}bd/@w{5 2 roll dup/$pan xd +matrix rotate/$ptm xd matrix scale $ptm dup concatmatrix/$ptm xd +1 eq{$ptm exch dup concatmatrix/$ptm xd}{pop}ifelse +1 w}bd/@g{1 eq dup/$sdf xd{/$scp xd/$sca xd +/$scf xd}if}bd/@G{1 eq dup/$SDF xd{/$SCP xd +/$SCA xd/$SCF xd}if}bd/@D{3 copy @ss/$dsp xd +/$dsa xd/$dsf xd}bd/@j{@sv @np}bind def/@J{@rs}bind def +/@sep{/ColorSeparationMode where{pop}{/ColorSeparationMode 0 def +/CurrentInkName (Composite) def}ifelse ColorSeparationMode 0 eq +{/CurrentInkName (Composite) def}if/CurrentInkName where{pop}{ +/CurrentInkName (Composite) def}ifelse CurrentInkName (Composite) eq{/$ink -1 def} +{CurrentInkName (Cyan) eq{/$ink 0 def} {CurrentInkName (Magenta) eq{/$ink 1 def} +{CurrentInkName (Yellow) eq{/$ink 2 def} {CurrentInkName (Black) eq{/$ink 3 def} +{/$ink 4 def}ifelse}ifelse}ifelse}ifelse}ifelse}bd +@sep/@whi{@gs -72000 dup moveto -72000 72000 lineto +72000 dup lineto 72000 -72000 lineto closepath 1 setgray fill +@gr}bd/@neg{ [{1 exch sub}/exec cvx currenttransfer/exec cvx] cvx settransfer +@whi}bd/@reg{[] 0 d 0 setgray .3 setlinewidth +2 copy 5.4 0 360 arc closepath 2 copy moveto 9 0 rlineto +2 copy moveto -9 0 rlineto 2 copy moveto 0 9 rlineto +moveto 0 -9 rlineto stroke}bd/leftbracket{(\050)}def +/rightbracket{(\051)}def + +%%EndProlog +%%BeginSetup +11.4737 setmiterlimit +1.00 setflat +/$fst 128 def + +%%EndSetup +@sv +/$ctm matrix currentmatrix def +u +%%Note: Object +45.22 528.19 78.98 558.14 @E +0 J 0 j [] 0 d 0 R 0 @G +0.00 0.00 0.00 1.00 K +1.01 1.01 0.00 [1.00000 0.00000 0.00000 1.00000 0.00000 0.00000] 0 @w +%%CURV 106 +73.30 539.78 m +73.08 538.42 72.22 537.26 71.78 536.33 C +72.79 534.67 73.73 531.43 74.81 530.64 C +74.59 530.64 77.04 528.84 73.87 529.06 C +73.08 529.34 73.08 530.93 70.20 533.81 C +69.70 533.74 70.56 530.57 71.50 529.63 c +73.15 528.19 70.27 528.55 70.13 528.62 C +68.98 529.34 68.62 534.60 67.03 536.26 c +66.24 537.19 65.16 536.98 64.30 536.90 C +63.22 536.62 60.62 537.19 60.55 534.02 C +60.62 532.66 62.14 530.21 62.86 529.78 c +65.30 528.41 62.06 528.34 61.70 528.77 C +61.13 529.34 60.19 530.64 59.26 531.65 C +57.74 532.44 56.38 533.66 56.02 534.96 C +54.94 534.74 53.86 534.17 53.64 533.23 C +53.42 532.22 53.86 531.58 54.86 530.14 C +56.02 529.85 56.38 529.27 56.02 528.98 c +55.87 528.84 53.71 528.62 53.57 528.91 C +52.70 529.49 51.70 531.86 51.19 533.16 c +50.90 533.88 49.97 535.82 51.55 537.77 C +51.98 538.49 51.91 539.86 51.77 540.65 c +51.55 541.94 51.55 542.74 52.42 544.46 C +49.75 546.77 45.22 551.23 49.61 557.14 C +50.11 557.64 51.55 558.14 50.76 556.27 C +49.82 553.68 46.66 551.45 53.42 546.19 C +54.50 546.91 58.97 546.48 60.48 546.19 c +64.66 545.33 65.52 545.33 68.40 546.05 C +68.76 546.19 68.83 547.99 70.34 549.22 C +70.06 550.15 72.00 551.45 72.22 552.53 C +72.65 553.39 73.66 550.73 73.66 550.66 C +73.58 551.23 74.66 552.31 74.81 552.96 C +75.74 553.25 75.10 550.94 75.89 549.50 c +76.32 548.93 76.68 549.07 77.11 547.70 C +77.47 546.34 78.98 545.18 76.54 543.89 c +75.17 543.17 74.59 543.31 73.58 542.88 C +73.58 542.23 73.51 540.79 73.30 539.78 c +@c +S +U +@rs +%%Trailer + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/changes.txt new/doc/latex/graphics/changes.txt --- old/doc/latex/graphics/changes.txt 2016-05-10 23:32:32.000000000 +0200 +++ new/doc/latex/graphics/changes.txt 2017-04-16 00:59:15.000000000 +0200 @@ -4,6 +4,59 @@ are not part of the distribution. ======================================================================= +2017-04-14 David Carlisle <latex-bugs(a)latex-project.org> + + * graphics.dtx: modify \Gscale@box for math mode usage + https://github.com/latex3/graphics-def/issues/6 + +2017-03-17 David Carlisle <latex-bugs(a)latex-project.org> + + * graphics.dtx: add \leavevmode to \includegraphics + so that \everypar is cleared. (The \leavevmode in \Gin@setfile is + too late for this use, but has been left for compatibility.) + +2016-12-23 David Carlisle <latex-bugs(a)latex-project.org> + + * grfguide.tex: fix the a.ps example file to match the Bounding box + change from 2014 (Rolf Niepraschk) + +2016-11-18 David Carlisle <latex-bugs(a)latex-project.org> + + * grfguide.tex: Updates to drivers section, and add a note about xcolor. + +2016-10-09 David Carlisle <latex-bugs(a)latex-project.org> + + * graphics.dtx: Avoid arithmetic overflow on very small lengths + eg 5sp/2sp http://tex.stackexchange.com/q/328825 + +2016-08-11 David Carlisle <latex-bugs(a)latex-project.org> + + * rotating.dtx: Fix name of examples file reference in the + documentation (rotex.tex not examples.tex) + +2016-07-10 David Carlisle <latex-bugs(a)latex-project.org> + + * graphics-drivers.ins: stop generating dvips.def + (moved to graphics-def) + +2016-06-17 David Carlisle <latex-bugs(a)latex-project.org> + + * drivers.dtx: guards for contributed packages and plain TeX. + +2016-06-02 David Carlisle <latex-bugs(a)latex-project.org> + + * graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips + option to match pdftex behaviour and add setpagesize and + nosetpagesize options to color and graphics packages to enable or + disable this feature for all drivers. + +2016-05-22 David Carlisle <latex-bugs(a)latex-project.org> + + * rotating.dtx: add from rotating distribution + * rotex.tex: add from rotating distribution (was example.tex} + * cat.eps: add from rotating distribution + * grfguide.tex: list the rotating package. + 2016-05-09 David Carlisle <latex-bugs(a)latex-project.org> * graphics.dtx, color.dtx: add dvisvgm option (Till Tantau) Binary files old/doc/latex/graphics/color.pdf and new/doc/latex/graphics/color.pdf differ Binary files old/doc/latex/graphics/drivers.pdf and new/doc/latex/graphics/drivers.pdf differ Binary files old/doc/latex/graphics/epsfig.pdf and new/doc/latex/graphics/epsfig.pdf differ Binary files old/doc/latex/graphics/graphics.pdf and new/doc/latex/graphics/graphics.pdf differ Binary files old/doc/latex/graphics/graphicx.pdf and new/doc/latex/graphics/graphicx.pdf differ Binary files old/doc/latex/graphics/grfguide.pdf and new/doc/latex/graphics/grfguide.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/grfguide.tex new/doc/latex/graphics/grfguide.tex --- old/doc/latex/graphics/grfguide.tex 2015-04-13 15:48:08.000000000 +0200 +++ new/doc/latex/graphics/grfguide.tex 2017-01-23 01:01:04.000000000 +0100 @@ -1,5 +1,5 @@ %% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle -%% Copyright (C) 2005 2014 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005 2014 2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -11,12 +11,12 @@ \begin{filecontents*}{a.ps} %! %%BoundingBox:0 0 72 72 -100 100 moveto +0 0 moveto 72 72 rlineto 72 neg 0 rlineto 72 72 neg rlineto stroke -100 100 moveto +0 0 moveto /Times-Roman findfont 72 scalefont setfont @@ -168,8 +168,8 @@ %% Just as an example, and to make sure, in case some %% driver option has not declared a default rule for %% .ps files: -\DeclareGraphicsRule{.ps}{eps}{.ps}{} -\DeclareGraphicsExtensions{.pdf,.ps} +%\DeclareGraphicsRule{.ps}{eps}{.ps}{} +%\DeclareGraphicsExtensions{.pdf,.ps} %% Which means: %% .ps files are (to be treated as) EncapsulatedPostScript %% files. The .ps file is to be read for the BoundingBox. @@ -190,7 +190,7 @@ \begin{document} \title{Packages in the `graphics' bundle} \author{D. P. Carlisle \and The \LaTeX3 Project} -\date{2014/04/27} +\date{2016/12/23} \maketitle @@ -210,69 +210,66 @@ drivers. Consequently all these packages take options such as `|dvips|' to specify which driver is being used. -You should to set up a site default for these -options, for the driver that you normally use. Suppose that you wish for +Normally you should \emph{not} specify the driver option explicitly +in the document, but allow it to be defaulted automatically. +This allows the document to be portable between different systems. + +Your \TeX\ distribution should have included |graphics.cfg| and +|color.cfg| configuration files to specify these defaults. +Standard versions of the configuration files are maintained by the +\LaTeX\ Project and distributed in the CTAN |graphics-cfg| collection. + +For special requirements you may edit a copy of these |cfg| files +to set up a site default for these options. Suppose that you wish the \package{color} package to always default to use specials for the -PostScript driver, |dvipsone|. In that case create a file |color.cfg| +PostScript driver, |dvisvgm|. In that case, create a file |color.cfg| containing the line:\\ -|\ExecuteOptions{dvipsone}|\\ +|\ExecuteOptions{dvisvgm}|\\ Normally you will want an identical file |graphics.cfg| to set a similar default for the graphics packages. The following driver options are declared in the packages. +The matching definition files (\emph{driver}|.def|) +are now also maintained by the \LaTeX\ project, +but distributed separately, in the CTAN |graphics-def| collection. \begin{quote}\raggedright - |dvips|, |xdvi|, |dvipdf|, |dvipdfm|, |dvipdfmx|, |pdftex|, - |dvipsone|, |dviwindo|, |emtex|, |dviwin|, |pctexps|, |pctexwin|, - |pctexhp|, |pctex32|, |truetex|, |tcidvi|, |vtex|, |oztex|, - |textures|, |xetex| + |dvipdfmx|, |dvips|, |dvisvgm|, |luatex|, |pdftex|, |xetex| \end{quote} -Note that the \LaTeX\ Team does not maintain these drivers; we merely -provide a way for a particular driver to work with the graphics -packages. -If you use a driver that is not in the list above you may add an option -for that driver by putting the appropriate |\DeclareOption| line into -|graphics.cfg| and |color.cfg|, before making it the default option -with |\ExecuteOptions|, as described above. - -For example to add the option `|dvi2ps|' for the original Unix dvi to -ps driver, and to make that the default, you just need configuration -files looking like: -\begin{verbatim} -\DeclareOption{dvi2ps}{\def\Gin(a)driver{dvi2ps.def}} -\ExecuteOptions{dvi2ps} -\end{verbatim} -There is a suitable |dvi2ps.def| file in the standard distribution. -It is not enabled by default as it is not well tested as the driver is -no longer available to me. The following driver files are similarly -distributed but not enabled by default. +The following two options are also supported, they do not correspond +to separate definition files, but are essentially aliases for the +|dvips| option (and |monochrome| in the case of |xdvi|). +\begin{quote}\raggedright + |xdvi|, |oztex| +\end{quote} + +The following set of options are supported by these packages +with associated driver files extracted from the |drivers.dtx| +documented source in this bundle. These are now, mainly of historic +interest but the documented sources do contain some useful code +and advice if you need to produce a new definition file for a new +driver or \TeX\ system. |drivers.dtx| also contains documented +sources for older driver files that are no longer extracted. \begin{quote}\raggedright - |dvi2ps|, |dvialw|, |dvilaser|, |dvitops|, |psprint|, |pubps|, |ln| + |dvipdf|, |dvipdfm|, |dviwin|, |dvipsone|, + |emtex|, |pctexps|, |pctexwin|, |pctexhp|, |pctex32|, + |truetex|, |tcidvi|, |vtex| \end{quote} -Most of these driver files are generated from the source file -|drivers.dtx|. That file has the sources for other versions (for -example older versions of dvips and textures) which are not generated -by default. - -Different \TeX\ systems support different drivers and the drivers are -usually maintained by the developers of the \TeX\ variants or -post-processors. Hence they are always linked to some program and -since the \TeX\ distributors decide which programs they support, it is -up to them to make sure the necessary drivers are included with their -distribution. The graphics bundle contains the installation file -|graphics-drivers.ins| which can be used to extract drivers from -|drivers.dtx| but we cannot guarantee that these are up to date. Not -all of the aforementioned drivers are available in |drivers.dtx| (some -like |pdftex| and |dvipdfm| can be found on CTAN). - -If you use a driver that is not covered by any of these possibilities, -you may try to write a |.def| file by analogy with one of the existing -ones, and then specify a suitable option in |graphics.cfg| and -|color.cfg|, as for the above example of |dvi2ps|. +The final driver option is an alias for |dvipsone|. +\begin{quote}\raggedright + |dviwindo| +\end{quote} + -\section{Colour} +\section[Colour]{Colour\footnote{% +The basic \package{color} package functionality described here +will be enough for many uses, however a much extended version +is available in the contributed \package{xcolor} package, distributed +and maintained separately. All the color commands described here are +also available if you specify \package{xcolor} in your document.}% +} The colour support is built around the idea of a system of \emph{Colour Models}. The Colour models supported by a driver vary, but typically include @@ -796,11 +793,8 @@ |{}| group (even if there is only one in the list). For example:\\ |\graphicspath{{eps/}{tiff/}}|\\ would cause the system to look in the subdirectories |eps| and |tiff| - of the current directory. This is unix syntax, on a Mac it would be:\\ - |\graphicspath{{:eps:}{:tiff:}}|\\ - Note the differing conventions, an initial |:| is needed on Macintosh - systems to denote the current folder, whereas on unix an initial |/| - would denote the top level `root' directory. + of the current directory. (All modern \TeX{} systems use |/| + as the directory separator, even on Windows.) The default setting of this path is |\input@path| that is: graphics files will be found wherever \TeX\ @@ -954,6 +948,10 @@ It also has a few more commands to make it slightly more compatible with the old \LaTeX~2.09 style of the same name. +\subsection{Rotating} +An extension package to \package{graphicx}, mainly used for providing +rotated float environments. + \subsection{Trig} The trig package is not intended to be used directly in documents. It calculates sine, cosine and tangent trigonometric functions. These Binary files old/doc/latex/graphics/keyval.pdf and new/doc/latex/graphics/keyval.pdf differ Binary files old/doc/latex/graphics/lscape.pdf and new/doc/latex/graphics/lscape.pdf differ Binary files old/doc/latex/graphics/rotating.pdf and new/doc/latex/graphics/rotating.pdf differ Binary files old/doc/latex/graphics/rotex.pdf and new/doc/latex/graphics/rotex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/rotex.tex new/doc/latex/graphics/rotex.tex --- old/doc/latex/graphics/rotex.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/graphics/rotex.tex 2016-11-25 19:29:05.000000000 +0100 @@ -0,0 +1,500 @@ +\errorcontextlines32 +\documentclass[twoside]{report} +\usepackage[chatter]{rotating} +\usepackage{fancyvrb} +\makeatletter +\newsavebox{\@display} +\newcommand\@@Display[1]{% + \sbox\@display{% + \begin{minipage}[b]{.45\textwidth}% + #1\end{minipage}% + }\raisebox{\depth}{\usebox{\@display}}% +} + +\newcommand\@@VDisplay[1]{% + \sbox\@display{% + \begin{minipage}[b]{.45\textwidth}% + \BVerbatimInput[fontsize=\small]{#1}% + \end{minipage}}% + \usebox{\@display}% +} +\newcommand\SideBySide[2]{% +\bgroup\def\baselinestretch{1}% + \trivlist\item[]% + \leavevmode + \makebox[\textwidth][l]{\@@Display{#1}\hspace{1em}% + \@@VDisplay{#2}}% + \endtrivlist + \egroup +} +\newcommand\BeginExample{% + \nobreak + \VerbatimEnvironment + \catcode`\<=12 + \begin{VerbatimOut}{\jobname.ex}% +} +\newcommand{\EndExample}{\end{VerbatimOut}} + +\newenvironment{example} + {\nobreak + \VerbatimEnvironment + \catcode`\<=12 + \begin{VerbatimOut}{\jobname.ex}% + } + {\end{VerbatimOut} + \SideBySide {\input{\jobname.ex}}% + {\jobname.ex}} +\makeatother +%------------------------------------------------------- +\def\degrees{{\small$^{\mathrm{o}}$}} +%------------------------------------------------------- + +\begin{document} + +\title{Test of `rotating' package} +\author{Sebastian Rahtz and Leonor Barroca\thanks{Now maintained as part of the \LaTeX\ graphics bundle.}} +\date{November 19th 1994\thanks{Updated for graphics bundle 2016/05/22}} +\maketitle + +`Rotating' provides a generalised rotation environment, where the text +will be rotated (anti-clockwise) by the number of degrees specified as +a parameter to the environment, but no special arrangement is made to +find space for the result. + +\begin{example} +Start here +\begin{rotate}{-56} +Save whales +\end{rotate} +End here +\end{example} + +A complete example of rotating text without leaving space +would the `Save the whale' text +written at 10 degree intervals round the compass. We use +`rlap' to ensure that all the texts are printed at the same point. +Just to show that \TeX\ can handle PostScript muckings-about +properly\ldots +\begin{example} +\newcount\wang +\newsavebox{\wangtext} +\newdimen\wangspace +\def\wheel#1{\savebox{\wangtext}{#1}% +\wangspace\wd\wangtext +\advance\wangspace by 1cm% +\centerline{% +\rule{0pt}{\wangspace}% +\rule[-\wangspace]{0pt}{\wangspace}% +\wang=-180\loop\ifnum\wang<180 +\rlap{\begin{rotate}{\the\wang}% +\rule{1cm}{0pt}#1\end{rotate}}% +\advance\wang by 10\repeat}} +\wheel{Save the whale} +\end{example} + +If the user +desires \LaTeX\ to leave space for the rotated box, then `turn' is used: +\begin{example} + Start here \begin{turn}{56}% + Save the whale + \end{turn} end here +\end{example} +The environment `Sideways' is a special case, setting the rotation to $-90$, +and leaving the correct space for the rotated box. +\begin{example} +Start here +\begin{sideways}% +Save the whale +\end{sideways} +End here +\end{example} + +If you deal with whole paragraphs of text, you realize that \TeX\ +boxes are not as simple as they sometimes look: they have a height +{\em and} a depth. So when you rotate, you rotate about the point on +the left-hand edge of the box that meets the baseline. The results can +be unexpected, as shown in the full set of paragraph rotations in +Figures \ref{angles1} and \ref{angles2}. If you really want to turn a +paragraph so that it appears to rotate about the {\em real} bottom of +the \TeX\ box, +you have to adjust the box in the normal \LaTeX\ way: +\begin{example} +\newsavebox{\foo} +\savebox{\foo}{\parbox{1in}{Save +the whales Save the whale +Save the whale +Save the whale}}% +Start +\begin{turn}{45}\usebox{\foo}\end{turn} +End +\end{example} +\begin{example} +\savebox{\foo}{\parbox[b]{1in}{Save +the whales Save the whale +Save the whale +Save the whale}}% +Start +\begin{turn}{45}\usebox{\foo}\end{turn} +End +\end{example} + +\def\testrot#1{% +\savebox{\foo}{\parbox{1in}{Save +the whales Save the whale Save the whale Save the whale}}% +\framebox{---\begin{turn}{#1}\framebox{\usebox{\foo}}\end{turn}---}}% + +\begin{figure*} +\begin{tabular}{|c|c|c|} +\hline +\testrot{0} &\testrot{-40}&\testrot{-80}\\ +0\degrees & -40\degrees & -80\degrees \\ +\hline +\testrot{-120}&\testrot{-160}&\testrot{-200}\\ +120\degrees & -160\degrees & -200\degrees \\ +\hline +\testrot{-240}&\testrot{-280}&\testrot{-320}\\ +-240\degrees & -280\degrees & -320\degrees \\ +\hline +\end{tabular} +\caption{Rotation of paragraphs between 0 and -320 degrees \label{angles1}} +\end{figure*} + +\begin{figure*} +\begin{tabular}{|c|c|c|} +\hline +\testrot{-180} &\testrot{40}&\testrot{80}\\ +-180\degrees & 40\degrees & 80\degrees \\ +\hline +\testrot{120}&\testrot{160}&\testrot{200}\\ +120\degrees & 160\degrees & 200\degrees \\ +\hline +\testrot{240}&\testrot{280}&\testrot{320}\\ +240\degrees & 280\degrees & 320\degrees \\ +\hline +\end{tabular} +\caption{Rotation of paragraphs between 0 and 320 degrees\label{angles2}} +\end{figure*} + + +We can set tabular material in this way; at the same time, we +demonstrate that the rotation can be nested: +\begin{example} +\begin{sideways} +\rule{1in}{0pt} +\begin{tabular}{|lr|} +\em Word & \begin{rotate}{90}% +Occurrences\end{rotate} +\\ +\hline +hello & 33\\ +goodbye & 34\\ +\hline +\end{tabular} +\end{sideways} +\end{example} + +\begin{example} +\begin{quote} +\rule{0pt}{1.5in}\begin{tabular}{rrr} +\begin{rotate}{45}Column 1\end{rotate}& +\begin{rotate}{45}Column 2\end{rotate}& +\begin{rotate}{45}Column 3\end{rotate}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{quote} +\begin{tabular}{rrr} +\begin{turn}{45}Column 1\end{turn}& +\begin{turn}{45}Column 2\end{turn}& +\begin{turn}{45}Column 3\end{turn}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{quote} +\rule{0pt}{1.5in}\begin{tabular}{rrr} +\begin{rotate}{45}Column 1\end{rotate} +\rule{.5cm}{0pt}& +\begin{rotate}{45}Column 2\end{rotate} +\rule{.5cm}{0pt}& +\begin{rotate}{45}Column 3\end{rotate} +\rule{.5cm}{0pt}\\ +\hline +1& 2& 3\\ +4& 5& 6\\ +7& 8& 9\\ +\hline +\end{tabular} +\end{quote} +\end{example} + +\begin{example} +\begin{sideways} +\begin{tabular}{|l|c|c|c|c|c|p{1in}|} +\hline +&&\multicolumn{4}{c}{NUMBER OF SITES}\vline &ACCEPT or\\ +\cline{3-6} &STUDY AREA&&\multicolumn{3}{c}{% +IN BOUNDARY ZONE}\vline&REJECT\\ +\cline{4-6}&&&&\multicolumn{2}{c}{EXPECTED} +\vline&NULL\\ +\cline{5-6}&&TOT&OBS&FROM&TO&HYPOTH\\ +\cline{2-7} +&FULL SAMPLE&41&31&10.3&27.0&REJECT\\ +&SAMPLE AREA 1&23&16&4.3&16.7&ACCEPT\\ +&SAMPLE AREA 2&18&15&2.8&13.7&REJECT\\ +&RUSHEN&13&9&1.2&10.4&ACCEPT\\ +&ARBORY&10&7&0.6&8.8&ACCEPT\\ +&MAROWN&10&8&0.4&8.6&ACCEPT\\ +\rule{0.5cm}{0pt} +\begin{rotate}{90}PRIMARY UNITS% +\end{rotate}\rule{0.5cm}{0pt} +&SANTON&8&7&0.0&7.3&ACCEPT\\ +\hline +\end{tabular} +\end{sideways} +\end{example} + +If you are interested in setting rotated material in tables or +figures, this presents no problem. Figure \ref{fig1} shows how +PostScript files which are being incorporated using can be +rotated at will, while Figure \ref{fig2} shows, in contrast, how +`includegraphics' itself handles rotation. It is also possible to rotate the +whole of the figure environment, including caption, +by using the `sidewaysfigure' ands `sidewaystable' environments +in place of `figure' and `table'. + +Sideways figures and tables always take up the whole page. They can be +rotated so that the bottom ot the figures is on the left or the right; +the default is to always turn to the right. If the `twoside' option +has been given to the main document class, this package then starts +rotating sideways figures according to the page number (this requires +two passes through \LaTeX{} at least). If you want the `twoside' +option, but want the figures always in one direction, use the +`figuresright' or `riguresleft' options to `rotating'. + +The code used to produce figures +\ref{rotfloat1}--\ref{rotfloat4} is as follows: +\begin{description} + +\item[Figure \ref{rotfloat1}] +{\small\begin{verbatim} +\begin{sidewaystable} +\centering +\caption{This is a narrow table, which should be centred vertically +on the final page.\label{rotfloat1}} + \begin{tabular}{|ll|} +\hline + a & b \\ + c & d \\ + e & f \\ + g & h \\ + i & j \\ +\hline + \end{tabular} +\end{sidewaystable} +\end{verbatim} +} + +\item[Figure \ref{rotfloat2}] +{\scriptsize\begin{verbatim} +\begin{sidewaystable} +\centering +\begin{tabular}{|llllllllp{1in}lp{1in}|} +\hline +Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\ + & &Diameter & & & & & +Bones&&&\\ +\hline +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Grooved Ware}&\\ +784 &--- &0.9m &0.18m &Sloping U &P1 &$\times$46 & $\times$8 && $\times$2 bone& 2150$\pm$ 100 BC\\ +785 &--- &1.00m &0.12 &Sloping U &P2--4 &$\times$23 & $\times$21 & Hammerstone &---&---\\ +962 &--- &1.37m &0.20m &Sloping U &P5--6 &$\times$48 & $\times$57* & ---& ---&1990 $\pm$ 80 BC (Layer 4) 1870 $\pm$90 BC (Layer 1)\\ +983 &0.83m &0.73m &0.25m &Stepped U &--- &$\times$18 & $\times$8 & ---& Fired clay&---\\ +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Beaker}&\\ +552 &--- &0.68m &0.12m &Saucer &P7--14 &--- & --- & --- &--- &---\\ +790 &--- &0.60m &0.25m &U &P15 &$\times$12 & --- & Quartzite-lump&--- &---\\ +794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\ +\hline +\end{tabular} + +\caption[Grooved Ware and Beaker Features, their Finds and +Radiocarbon Dates]{Grooved Ware and Beaker Features, their +Finds and Radiocarbon Dates; For a breakdown of the Pottery +Assemblages see Tables I and III; for +the Flints see Tables II and IV; for the +Animal Bones see Table V.}\label{rotfloat2} +\end{sidewaystable} +\end{verbatim} +} + +\item[Figure \ref{rotfloat3}] +{\small\begin{verbatim} +\begin{table} +\centering +\rotcaption{Minimum number of individuals; effect of rotating table +and caption separately}\label{rotfloat3}% +\begin{sideways} +\begin{tabular}[b]{cccccccccp{1cm}} +\hline +Phase&Total&Cattle&Sheep&Pig&Red Deer&Horse&Dog&Goat&Other\\ +\hline +&1121&54&12&32&1&1&1&1&1 polecat\\ +3&8255&58&6&35&1&1&1&1&1 roe deer, 1 hare, 1 cat, 1 otter\\ +4&543&45&6&45&4&1&1&---&---\\ +\hline +&9919&157&24&112&6&3&3&2&5\\ +\hline +\end{tabular} +\end{sideways} +\end{table} +\end{verbatim} +} + +\item[Figure \ref{rotfloat4}] +{\small\begin{verbatim} +\begin{sidewaysfigure} + \centering + \includegraphics[width=.8\textheight,height=.4\textwidth]{cat} +\caption{A pathetically squashed rotated pussycat}\label{rotfloat4} +\end{sidewaysfigure} +\end{verbatim} +} +\end{description} + +\begin{figure} +\begin{example} +---\begin{turn}{156} +\includegraphics[width=1in]{cat} +\end{turn}--- +\end{example} + +\begin{example} +---\begin{sideways} +\includegraphics[width=1in]{cat} +\end{sideways}--- +\end{example} + +\begin{example} +---\includegraphics[width=1in]{cat}--- +\end{example} +\caption{A normal, and sideways, pictures within a figure\label{fig1}} +\end{figure} + +\begin{figure} +\begin{example} +\includegraphics[width=1in,% +angle=-56]{cat} +\end{example} + +\caption{Figures rotated with `includegraphics'\label{fig2}} +\end{figure} +\begin{sidewaystable} +\centering +\caption{This is a narrow table, which should be centred vertically +on the final page.\label{rotfloat1}} + \begin{tabular}{|ll|} +\hline + a & b \\ + c & d \\ + e & f \\ + g & h \\ + i & j \\ +\hline + \end{tabular} +\end{sidewaystable} + + + +\begin{sidewaystable} +\centering +\begin{tabular}{|llllllllp{1in}lp{1in}|} +\hline +Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\ + & &Diameter & & & & & +Bones&&&\\ +\hline +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Grooved Ware}&\\ +784 &--- &0.9m &0.18m &Sloping U &P1 &$\times$46 & $\times$8 && $\times$2 bone& 2150$\pm$ 100 BC\\ +785 &--- &1.00m &0.12 &Sloping U &P2--4 &$\times$23 & $\times$21 & Hammerstone &---&---\\ +962 &--- &1.37m &0.20m &Sloping U &P5--6 &$\times$48 & $\times$57* & ---& ---&1990 $\pm$ 80 BC (Layer 4) 1870 $\pm$90 BC (Layer 1)\\ +983 &0.83m &0.73m &0.25m &Stepped U &--- &$\times$18 & $\times$8 & ---& Fired clay&---\\ +&&&&&&&&&&\\ +\multicolumn{10}{|l}{\bf Beaker}&\\ +552 &--- &0.68m &0.12m &Saucer &P7--14 &--- & --- & --- &--- &---\\ +790 &--- &0.60m &0.25m &U &P15 &$\times$12 & --- & Quartzite-lump&--- &---\\ +794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\ +\hline +\end{tabular} + +\caption[Grooved Ware and Beaker Features, their Finds and +Radiocarbon Dates]{Grooved Ware and Beaker Features, their +Finds and Radiocarbon Dates; For a breakdown of the Pottery +Assemblages see Tables I and III; for +the Flints see Tables II and IV; for the +Animal Bones see Table V.}\label{rotfloat2} +\end{sidewaystable} + +\begin{table} +\centering +\hbox{ +\rotcaption{Minimum number of individuals; effect of rotating table +and caption separately}\label{rotfloat3}% +\begin{sideways} +\begin{tabular}[t]{cccccccccp{1cm}} +\hline +Phase&Total&Cattle&Sheep&Pig&Red Deer&Horse&Dog&Goat&Other\\ +\hline +&1121&54&12&32&1&1&1&1&1 polecat\\ +3&8255&58&6&35&1&1&1&1&1 roe deer, 1 hare, 1 cat, 1 otter\\ +4&543&45&6&45&4&1&1&---&---\\ +\hline +&9919&157&24&112&6&3&3&2&5\\ +\hline +\end{tabular} +\end{sideways} +} +\end{table} + + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (1)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (2)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (3)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat (4)} +\end{sidewaysfigure} + +\begin{sidewaysfigure} + \centerline{\includegraphics[width=.8\textheight,height=.4\textwidth]{cat}} +\caption{A pathetically squashed rotated pussycat}\label{rotfloat4} +\end{sidewaysfigure} + +\end{document} Binary files old/doc/latex/graphics/trig.pdf and new/doc/latex/graphics/trig.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics.doc.tlpobj new/tlpkg/tlpobj/graphics.doc.tlpobj --- old/tlpkg/tlpobj/graphics.doc.tlpobj 2016-05-10 23:43:10.000000000 +0200 +++ new/tlpkg/tlpobj/graphics.doc.tlpobj 2017-04-17 16:25:10.000000000 +0200 @@ -1,10 +1,11 @@ name graphics.doc category Package -revision 41015 +revision 43813 shortdesc doc files of graphics relocated 1 -docfiles size=511 +docfiles size=621 RELOC/doc/latex/graphics/README.txt + RELOC/doc/latex/graphics/cat.eps RELOC/doc/latex/graphics/changes.txt RELOC/doc/latex/graphics/color.pdf RELOC/doc/latex/graphics/drivers.pdf @@ -15,4 +16,7 @@ RELOC/doc/latex/graphics/grfguide.tex RELOC/doc/latex/graphics/keyval.pdf RELOC/doc/latex/graphics/lscape.pdf + RELOC/doc/latex/graphics/rotating.pdf + RELOC/doc/latex/graphics/rotex.pdf + RELOC/doc/latex/graphics/rotex.tex RELOC/doc/latex/graphics/trig.pdf ++++++ graphics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/color.sty new/tex/latex/graphics/color.sty --- old/tex/latex/graphics/color.sty 2016-05-10 23:32:32.000000000 +0200 +++ new/tex/latex/graphics/color.sty 2016-11-25 19:33:50.000000000 +0100 @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [2016/05/09 v1.1c Standard LaTeX Color (DPC)] + [2016/07/10 v1.1e Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -51,6 +51,9 @@ \def\define@color#1#2{% \c@lor@special\m@ne{define #1 #2}}}} \DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} \DeclareOption{dvips}{\def\Gin(a)driver{dvips.def}% \def\c@lor@namefile{dvipsnam.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipdf.def new/tex/latex/graphics/dvipdf.def --- old/tex/latex/graphics/dvipdf.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/dvipdf.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipdf.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvips.def new/tex/latex/graphics/dvips.def --- old/tex/latex/graphics/dvips.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/dvips.def 1970-01-01 01:00:00.000000000 +0100 @@ -1,160 +0,0 @@ -%% -%% This is file `dvips.def', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% drivers.dtx (with options: `dvips,color1,psrulesZ,dosrules,macrules') -%% -%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project -%% -%% This file is part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.3 or, at your option, any later version. -%% -\ProvidesFile{dvips.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] -\def\c@lor@arg#1{% - \dimen@#1\p@ - \ifdim\dimen@<\z@\dimen@\maxdimen\fi - \ifdim\dimen@>\p@ - \PackageError{color}{Argument `#1' not in range [0,1]}\@ehd - \fi} -\def\color@gray#1#2{% - \c@lor@arg{#2}% - \edef#1{gray #2}% - } -\def\color@cmyk#1#2{\c@lor@@cmyk#2\@@#1} -\def\c@lor@@cmyk#1,#2,#3,#4\@@#5{% - \c@lor@arg{#4}% - \c@lor@arg{#1}% - \c@lor@arg{#2}% - \c@lor@arg{#3}% - \edef#5{cmyk #1 #2 #3 #4}% - } -\def\color@rgb#1#2{\c@lor@@rgb#2\@@#1} -\def\c@lor@@rgb#1,#2,#3\@@#4{% - \c@lor@arg{#1}% - \c@lor@arg{#2}% - \c@lor@arg{#3}% - \edef#4{rgb #1 #2 #3}% - } -\def\color@RGB#1#2{\c@lor@@RGB#2\@@#1} -\def\c@lor@@RGB#1,#2,#3\@@#4{% - \c@lor@RGB@rgb{#1}\@tempa - \c@lor@RGB@rgb{#2}\@tempb - \c@lor@RGB@rgb{#3}\@tempc - \c@lor@@rgb\@tempa,\@tempb,\@tempc\@@#4% - } -\def\c@lor@RGB@rgb#1#2{% - \dimen@#1\p@ - \divide\dimen@\@cclv - \edef#2{\strip@pt\dimen@}} -\def\color@hsb#1#2{\c@lor@@hsb#2\@@#1} -\def\c@lor@@hsb#1,#2,#3\@@#4{% - \c@lor@arg{#1}% - \c@lor@arg{#2}% - \c@lor@arg{#3}% - \edef#4{hsb #1 #2 #3}% - } -\def\color@named#1#2{\c@lor@@named#2,,\@@#1} -\def\c@lor@@named#1,#2,#3\@@#4{% - \@ifundefined{col@#1}% - {\PackageError{color}{Undefined color `#1'}\@ehd}% - {\edef#4{ #1}}% - } -\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@} -\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end} -\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor} -\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor} -\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor} -\def\c@lor@ps@gray#1\@@{#1 setgray} -\def\current@color{ Black} -\def\set@color{% - \special{color push \current@color - }\aftergroup\reset@color} -\def\reset@color{\special{% - color pop}} -\def\set@page@color{\special{% - background \current@color}} -\def\define@color@named#1#2{% - \expandafter\let\csname col@#1\endcsname\@nnil} - \def\no@page@color{\special{background \string"newpath clip}} -\def\Ginclude@eps#1{% - \message{<#1>}% - \bgroup - \def\@tempa{!}% - \dimen@\Gin@req@width - \dimen(a)ii.1bp% - \divide\dimen@\dimen@ii - \@tempdima\Gin@req@height - \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space - llx=\Gin@llx\space - lly=\Gin@lly\space - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi - \ifGin@clip clip\fi}% - \egroup} -\def\Ginclude@bmp#1{% - \message{<#1>}% - \dimen@\Gin@req@height - \advance\dimen@ by-\Gin@lly bp - \kern-\Gin@llx bp\raise\Gin@req@height\hbox{% - \ifdim\Gin@urx bp=\z@ - \ifdim\Gin@ury bp=\z@ - \special{em: graph #1}% - \else - \special{em: graph #1,\Gin@urx bp}% - \fi - \else - \special{em: graph #1,\Gin@urx bp,\Gin@ury bp}% - \fi - }% -} -\def\oztex@include#1#2{% - \dimen@1bp% - \divide\Gin@req@width\dimen@ - \divide\Gin@req@height\dimen@ - \special{#1=#2\space - \@width=\number\Gin@req@width \space - \@height=\number\Gin@req@height}} -\def\Ginclude@pntg{\oztex@include{pntg}} -\def\Ginclude@pict{\oztex@include{pict}} -\def\Grot@start{% - \special{ps: gsave currentpoint - currentpoint translate \Grot@angle\space neg - rotate neg exch neg exch translate}} -\def\Grot@end{\special{ps: currentpoint grestore moveto}} -\def\Gscale@start{\special{ps: currentpoint currentpoint translate - \Gscale@x\space \Gscale@y\space scale neg exch neg exch translate}} -\def\Gscale@end{\special{ps: currentpoint currentpoint translate - 1 \Gscale@x\space div 1 \Gscale@y\space div scale - neg exch neg exch translate}} -\def\Gin@PS@raw#1{\special{ps: #1}} -\def\Gin@PS@restored#1{\special{" #1}} -\def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}} -\def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}} -\def\Gin(a)extensions{.eps,.ps,.eps.gz,.ps.gz,.eps.Z,.mps} -\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} -\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} -\@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}} -\@namedef{Gin@rule@.pz}#1{{eps}{.bb}{#1}} -\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.bb}{#1}} -\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.bb}{#1}} -\@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.bb}{#1}} -\@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.bb}{#1}} -\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}} -\@namedef{Gin@rule@.pcx}#1{{bmp}{}{#1}} -\@namedef{Gin@rule@.bmp}#1{{bmp}{}{#1}} -\@namedef{Gin@rule@.msp}#1{{bmp}{}{#1}} -\@namedef{Gin@rule@.pict}#1{{pict}{}{#1}} -\@namedef{Gin@rule@.pntg}#1{{pntg}{}{#1}} -\endinput -%% -%% End of file `dvips.def'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipsnam.def new/tex/latex/graphics/dvipsnam.def --- old/tex/latex/graphics/dvipsnam.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/dvipsnam.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsnam.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \DefineNamedColor{named}{GreenYellow} {cmyk}{0.15,0,0.69,0} \DefineNamedColor{named}{Yellow} {cmyk}{0,0,1,0} \DefineNamedColor{named}{Goldenrod} {cmyk}{0,0.10,0.84,0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipsone.def new/tex/latex/graphics/dvipsone.def --- old/tex/latex/graphics/dvipsone.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/dvipsone.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsone.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dviwin.def new/tex/latex/graphics/dviwin.def --- old/tex/latex/graphics/dviwin.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/dviwin.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dviwin.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \@namedef{Gin@rule@*}#1{{bmp}{}{#1}} \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/emtex.def new/tex/latex/graphics/emtex.def --- old/tex/latex/graphics/emtex.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/emtex.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{emtex.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{\special{em:graph #1}}% \typeout{WARNING: emtex does not permit graphics to be scaled}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/graphics.sty new/tex/latex/graphics/graphics.sty --- old/tex/latex/graphics/graphics.sty 2016-05-10 23:32:32.000000000 +0200 +++ new/tex/latex/graphics/graphics.sty 2017-04-16 00:59:15.000000000 +0200 @@ -12,7 +12,7 @@ %% %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--2016 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2016/05/09 v1.0r Standard LaTeX Graphics (DPC,SPQR)] + [2017/04/14 v1.1b Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -53,6 +53,9 @@ \def\Ginclude@graphics#1{% \rule{\@ifundefined{Gin@@ewidth}{150pt}{\Gin@@ewidth}}% {\@ifundefined{Gin@@eheight}{100pt}{\Gin@@eheight}}}}} +\newif\ifGin@setpagesize\Gin@setpagesizetrue +\DeclareOption{setpagesize}{\Gin@setpagesizetrue} +\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse} \providecommand\Gin@driver{} \DeclareOption{dvips}{\def\Gin(a)driver{dvips.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips}} @@ -107,6 +110,7 @@ \edef\Gin@extensions{\zap@space#1 \@empty}} \providecommand\Gin@extensions{} \def\includegraphics{% + \leavevmode \@ifstar {\Gin@cliptrue\Gin@i}% {\Gin@clipfalse\Gin@i}} @@ -407,8 +411,7 @@ \ifdim#1\p@<\z@ \hb@xt@-#1\wd\z@{\kern-#1\wd\z@\box\tw@\hss}% \else - \wd\tw@#1\wd\z@ - \box\tw@ + \hb@xt@#1\wd\z@{\box\tw@\kern#1\wd\z@\hss}% \fi} \def\reflectbox{\Gscale@box-1[1]} \def\resizebox{% @@ -472,7 +475,7 @@ \fi \ifdim\dimen@>\z@ \loop - \ifdim\dimen@<8192\p@ + \ifdim\ifnum\count@<\tw@\maxdimen\else\dimen@\fi<8192\p@ \dimen@\tw@\dimen@ \divide\count@\tw@ \repeat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctex32.def new/tex/latex/graphics/pctex32.def --- old/tex/latex/graphics/pctex32.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/pctex32.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctex32.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexhp.def new/tex/latex/graphics/pctexhp.def --- old/tex/latex/graphics/pctexhp.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/pctexhp.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexhp.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@pcl#1{% \message{<#1>}% \ifGin@clip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexps.def new/tex/latex/graphics/pctexps.def --- old/tex/latex/graphics/pctexps.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/pctexps.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexps.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexwin.def new/tex/latex/graphics/pctexwin.def --- old/tex/latex/graphics/pctexwin.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/pctexwin.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexwin.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\Ginclude@eps#1{% \message{<#1>}% \ifGin@clip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/rotating.sty new/tex/latex/graphics/rotating.sty --- old/tex/latex/graphics/rotating.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/graphics/rotating.sty 2017-01-23 01:01:06.000000000 +0100 @@ -0,0 +1,277 @@ +%% +%% This is file `rotating.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% rotating.dtx (with options: `package') +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at http://latex-project.org/bugs.html +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca +%% Copyright 2001--2003,2007--2009 Robin Fairbairns +%% Copyright 2016 LaTeX3 Project +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{rotating}% + [2016/08/11 v2.16d + rotated objects in LaTeX% + ] +\DeclareOption{clockwise}{% + \AtBeginDocument{\setkeys{Grot}{units=360}}% +} +\DeclareOption{counterclockwise}{% + \AtBeginDocument{\setkeys{Grot}{units=-360}}% +} +\DeclareOption{anticlockwise}{\ds@counterclockwise} +\DeclareOption{figuresleft}{% + \@rot@twosidefalse + \def\rot@LR{0}% +} +\DeclareOption{figuresright}{% + \@rot@twosidefalse + \def\rot@LR{-1}% +} +\newif\ifrot@messages +\DeclareOption{quiet}{% + \rot@messagesfalse + \let\rot@message\@gobble % pro tem -- should suppress altogether +} +\DeclareOption{log}{% + \rot@messagestrue + \def\rot@message{\PackageInfo{rotating}}% +} +\DeclareOption{chatter}{% + \rot@messagestrue + \def\rot@message{\PackageWarning{rotating}}% +} +\newif\if@rot@twoside +\if@twoside + \@rot@twosidetrue +\else + \@rot@twosidefalse +\fi +\def\rot@LR{-1} +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} +\ExecuteOptions{clockwise,quiet} +\ProcessOptions +\RequirePackage{graphicx} +\RequirePackage{ifthen} +\def\rotdriver#1{\makeatletter\input{#1.def}\makeatother} +\newcounter{r@tfl@t} +\setcounter{r@tfl@t}{0} +\newskip\rotFPtop \rotFPtop=\@fptop +\newskip\rotFPbot \rotFPbot=\@fpbot +\def\sideways{% + \Grot@setangle{90}% + \setbox\z@\color@hbox\ignorespaces} +\def\endsideways{% + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \Grot@box +} +\def\turn#1{% + \Grot@setangle{#1}% + \setbox\z@\color@hbox\ignorespaces} +\def\endturn{% + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \Grot@box +} +\def\rotate#1{% + \Grot@setangle{#1}% + \setbox\z@\color@hbox\ignorespaces} +\def\endrotate{% + \unskip\color@endbox + \Grot@x\z@ + \Grot@y\z@ + \wd0\z@\dp0\z@\ht0\z@ + \Grot@box +} +\def\turnbox#1#2{% + \Grot@setangle{#1}% + \setbox\z@\hbox{{#2}}% + \Grot@x\z@\Grot@y\z@ + \wd0\z@\dp0\z@\ht0\z@ + \Grot@box +} +\newsavebox\rot@float@box +\def\@rotfloat#1{% + \@ifnextchar[% + {\@xrotfloat{#1}}% + {\edef\@tempa{\noexpand\@xrotfloat{#1}[\csname fps@#1\endcsname]}\@tempa}% +} +\def\@xrotfloat#1[#2]{% + \@float{#1}[#2]% + \begin{lrbox}\rot@float@box + \begin{minipage}\textheight + } +\def\end@rotfloat{% + \end{minipage}\end{lrbox}% + \stepcounter{r@tfl@t}% + \rot@label{RF\ther@tfl@t}% + \rot@pageref{RF\ther@tfl@t}{\R@@page}% + \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space} + \rot@mess@toks\expandafter{\@tempa} + \wd\rot@float@box\z@ + \ht\rot@float@box\z@ + \dp\rot@float@box\z@ + \vbox to \textheight{% + \setkeys{Grot}{units=360}% + \if@rot@twoside + \else + \let\R@@page\rot@LR + \fi + \ifthenelse{\isodd{\R@@page}}{% + \if@rot@twoside + \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% + \fi + \vfill + \@@line{% + \hskip\rotFPtop + \rotatebox{90}{\box\rot@float@box}% + \hskip\rotFPbot + }% + }{% + \if@rot@twoside + \rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}% + \fi + \@@line{% + \hskip\rotFPbot + \rotatebox{-90}{\box\rot@float@box}% + \hskip\rotFPtop + }% + \vfill + }% + \rot@message{\the\rot@mess@toks} + }% + \end@float +} +\def\sidewaysfigure{\@rotfloat{figure}} +\let\endsidewaysfigure\end@rotfloat +\def\sidewaystable{\@rotfloat{table}} +\let\endsidewaystable\end@rotfloat +\def\@rotdblfloat{% + \if@twocolumn\expandafter\@rotdbflt\else\expandafter\@rotfloat\fi +} +\def\@rotdbflt#1{\@ifnextchar[{\@rotxdblfloat{#1}}{\@rotxdblfloat{#1}[tp]}} +\def\@rotxdblfloat#1[#2]{% + \@float{#1}[#2]% + \hsize\textwidth\linewidth\textwidth + \begin{lrbox}\rot@float@box + \begin{minipage}\textheight +} +\def\end@rotdblfloat{% + \end{minipage}\end{lrbox}% + \stepcounter{r@tfl@t}% + \rot@label{RF\ther@tfl@t}% + \rot@pageref{RF\ther@tfl@t}{\R@@page}% + \edef\@tempa{Adding sideways \@captype\space on page \R@@page\space} + \rot@mess@toks\expandafter{\@tempa} + \@tempdima\ht\rot@float@box + \advance\@tempdima by \dp\rot@float@box + \wd\rot@float@box\z@ + \ht\rot@float@box\z@ + \dp\rot@float@box\z@ + \vbox to \textheight{% + \setkeys{Grot}{units=360}% + \if@rot@twoside + \else + \let\R@@page\rot@LR + \fi + \ifthenelse{\isodd{\R@@page}}{% + \ifrot@messages + \if@rot@twoside + \rot@mess@toks\expandafter{\the\rot@mess@toks (right hand page)}% +\fi + \fi + \vfill + \@@line{% + \hskip\rotFPtop + \rotatebox{90}{\box\rot@float@box}% + \hskip\rotFPbot + }% + }{% + \ifrot@messages + \if@rot@twoside + \rot@mess@toks\expandafter{\the\rot@mess@toks (left hand page)}% +\fi + \fi% + \@@line{% + \hskip\rotFPbot + \rotatebox{-90}{\box\rot@float@box}% + \hskip\rotFPtop + }% + \vfill + }% + \rot@message{\the\rot@mess@toks}% + }% + \end@dblfloat +} +\newenvironment{sidewaystable*} + {\@rotdblfloat{table}} + {\end@rotdblfloat} +\newenvironment{sidewaysfigure*} + {\@rotdblfloat{figure}} + {\end@rotdblfloat} + +\def\rot@thepage{\@arabic\c@page} +\def\rot@label#1{\@bsphack + \rot@protected@write{\@auxout}{}% + {\string\newlabel{#1}{\rot@thepage}}% + \@esphack} +\def\rot@pageref#1#2{% + \expandafter\ifx\csname r@#1\endcsname\relax + \global\@rot@refundefinedtrue + \def#2{0}% + \else + \edef#2{\csname r@#1\endcsname}% + \fi +} +\long\def\rot@protected@write#1#2#3{% + \begingroup + \let\rot@thepage\relax + #2% + \let\protect\@unexpandable@protect + \edef\reserved@a{\write#1{#3}}% + \reserved@a + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi +} +\newif\if@rot@refundefined +\global\@rot@refundefinedfalse +\newtoks\rot@mess@toks +\def\rotcaption{\refstepcounter\@captype\@dblarg{\@rotcaption\@captype}} +\long\def\@rotcaption#1[#2]#3{% + \addcontentsline{\csname ext@#1\endcsname}{#1}{% + \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}% + \par + \begingroup + \@parboxrestore + \normalsize + \@makerotcaption{\csname fnum@#1\endcsname}{#3}% + \endgroup} + \long\def\@makerotcaption#1#2{% + \setbox\@tempboxa\color@hbox#1: #2\color@endbox + \ifdim \wd\@tempboxa > .8\vsize + \rotatebox{90}{% + \begin{minipage}{.8\textheight}#1: #2\end{minipage}% + }% + \else% + \rotatebox{90}{\box\@tempboxa}% + \fi + \nobreak + \hspace{12pt}% +} +\AtBeginDocument{% + \providecommand\color@hbox{\hbox\bgroup}% + \providecommand\color@vbox{\vbox\bgroup}% + \providecommand\color@endbox{\egroup}% +} +\endinput +%% +%% End of file `rotating.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/tcidvi.def new/tex/latex/graphics/tcidvi.def --- old/tex/latex/graphics/tcidvi.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/tcidvi.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{tcidvi.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/truetex.def new/tex/latex/graphics/truetex.def --- old/tex/latex/graphics/truetex.def 2016-02-01 00:48:08.000000000 +0100 +++ new/tex/latex/graphics/truetex.def 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ %% %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -16,7 +16,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{truetex.def} - [2015/12/30 v3.0k Driver-dependent file (DPC,SPQR)] + [2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics.tlpobj new/tlpkg/tlpobj/graphics.tlpobj --- old/tlpkg/tlpobj/graphics.tlpobj 2016-05-10 23:43:11.000000000 +0200 +++ new/tlpkg/tlpobj/graphics.tlpobj 2017-04-17 16:25:11.000000000 +0200 @@ -1,6 +1,6 @@ name graphics category Package -revision 41015 +revision 43813 catalogue latex-graphics shortdesc The LaTeX standard graphics bundle relocated 1 @@ -8,10 +8,10 @@ longdesc including graphics (eg PostScript) files rotation and scaling longdesc of text in LaTeX documents. It comprises the packages color, longdesc graphics, graphicx, trig, epsfig, keyval, and lscape. +depend graphics-cfg runfiles size=30 RELOC/tex/latex/graphics/color.sty RELOC/tex/latex/graphics/dvipdf.def - RELOC/tex/latex/graphics/dvips.def RELOC/tex/latex/graphics/dvipsnam.def RELOC/tex/latex/graphics/dvipsone.def RELOC/tex/latex/graphics/dviwin.def @@ -25,10 +25,11 @@ RELOC/tex/latex/graphics/pctexhp.def RELOC/tex/latex/graphics/pctexps.def RELOC/tex/latex/graphics/pctexwin.def + RELOC/tex/latex/graphics/rotating.sty RELOC/tex/latex/graphics/tcidvi.def RELOC/tex/latex/graphics/trig.sty RELOC/tex/latex/graphics/truetex.def catalogue-ctan /macros/latex/required/graphics -catalogue-date 2016-05-09 23:24:57 +0200 +catalogue-date 2017-04-15 15:25:08 +0200 catalogue-license lppl1.3 catalogue-topics collection ++++++ graphicx-psmin.doc.tar.xz ++++++ ++++++ graphicx-psmin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphicx-psmin.tlpobj new/tlpkg/tlpobj/graphicx-psmin.tlpobj --- old/tlpkg/tlpobj/graphicx-psmin.tlpobj 2016-04-14 19:06:13.000000000 +0200 +++ new/tlpkg/tlpobj/graphicx-psmin.tlpobj 2017-04-14 17:42:17.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/graphicx-psmin/graphicx-psmin.sty catalogue-also graphics graphicx catalogue-ctan /macros/latex/contrib/graphicx-psmin -catalogue-date 2016-02-05 10:05:48 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-incl catalogue-version 1.1 ++++++ graphicxbox.doc.tar.xz ++++++ ++++++ graphicxbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphicxbox.tlpobj new/tlpkg/tlpobj/graphicxbox.tlpobj --- old/tlpkg/tlpobj/graphicxbox.tlpobj 2016-04-14 19:06:14.000000000 +0200 +++ new/tlpkg/tlpobj/graphicxbox.tlpobj 2017-04-14 17:42:17.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/graphicxbox/graphicxbox.sty catalogue-also graphicxsp color catalogue-ctan /macros/latex/contrib/graphicxbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-incl boxing catalogue-version 1.0 ++++++ graphviz.doc.tar.xz ++++++ ++++++ graphviz.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphviz.tlpobj new/tlpkg/tlpobj/graphviz.tlpobj --- old/tlpkg/tlpobj/graphviz.tlpobj 2016-04-14 19:06:14.000000000 +0200 +++ new/tlpkg/tlpobj/graphviz.tlpobj 2017-04-14 17:42:17.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/graphviz/graphviz.sty catalogue-also dottex catalogue-ctan /macros/latex/contrib/graphviz -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-inline catalogue-version 0.94 ++++++ greek-fontenc.doc.tar.xz ++++++ ++++++ greek-fontenc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greek-fontenc.tlpobj new/tlpkg/tlpobj/greek-fontenc.tlpobj --- old/tlpkg/tlpobj/greek-fontenc.tlpobj 2016-04-14 19:06:16.000000000 +0200 +++ new/tlpkg/tlpobj/greek-fontenc.tlpobj 2017-04-14 17:42:18.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/greek-fontenc/textalpha.sty catalogue-also lgrx catalogue-ctan /language/greek/greek-fontenc -catalogue-date 2016-02-06 08:21:44 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics greek inputenc catalogue-version 0.13.2 ++++++ greek-inputenc.doc.tar.xz ++++++ ++++++ greek-inputenc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greek-inputenc.tlpobj new/tlpkg/tlpobj/greek-inputenc.tlpobj --- old/tlpkg/tlpobj/greek-inputenc.tlpobj 2016-04-19 17:45:42.000000000 +0200 +++ new/tlpkg/tlpobj/greek-inputenc.tlpobj 2017-04-14 17:42:18.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/greek-inputenc/lgrenc.dfu RELOC/tex/latex/greek-inputenc/macgreek.def catalogue-ctan /language/greek/greek-inputenc -catalogue-date 2015-08-08 10:58:05 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics inputenc greek catalogue-version 1.6 ++++++ greekdates.doc.tar.xz ++++++ ++++++ greekdates.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greekdates.tlpobj new/tlpkg/tlpobj/greekdates.tlpobj --- old/tlpkg/tlpobj/greekdates.tlpobj 2016-04-14 19:06:17.000000000 +0200 +++ new/tlpkg/tlpobj/greekdates.tlpobj 2017-04-14 17:42:18.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=6 RELOC/tex/latex/greekdates/greekdates.sty catalogue-ctan /macros/latex/contrib/greekdates -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics date-time greek catalogue-version 1.0 ++++++ greektex.doc.tar.xz ++++++ ++++++ greektex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greektex.tlpobj new/tlpkg/tlpobj/greektex.tlpobj --- old/tlpkg/tlpobj/greektex.tlpobj 2016-04-14 19:06:18.000000000 +0200 +++ new/tlpkg/tlpobj/greektex.tlpobj 2017-04-14 17:42:19.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/greektex/greektex.sty catalogue-also greektex-fd catalogue-ctan /fonts/greek/greektex -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-greek ++++++ greektonoi.doc.tar.xz ++++++ ++++++ greektonoi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greektonoi.tlpobj new/tlpkg/tlpobj/greektonoi.tlpobj --- old/tlpkg/tlpobj/greektonoi.tlpobj 2016-04-14 19:06:18.000000000 +0200 +++ new/tlpkg/tlpobj/greektonoi.tlpobj 2017-04-14 17:42:19.000000000 +0200 @@ -21,6 +21,6 @@ RELOC/fonts/map/dvips/greektonoi/greektonoi.tec RELOC/tex/latex/greektonoi/greektonoi.sty catalogue-ctan /language/greek/greektonoi -catalogue-date 2016-01-18 15:17:12 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl3 catalogue-topics greek multilingual-addon ++++++ greenpoint.doc.tar.xz ++++++ ++++++ greenpoint.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greenpoint.tlpobj new/tlpkg/tlpobj/greenpoint.tlpobj --- old/tlpkg/tlpobj/greenpoint.tlpobj 2016-04-14 19:06:18.000000000 +0200 +++ new/tlpkg/tlpobj/greenpoint.tlpobj 2017-04-14 17:42:19.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/fonts/source/public/greenpoint/greenpoint.mf RELOC/fonts/tfm/public/greenpoint/greenpoint.tfm catalogue-ctan /fonts/greenpoint -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 ++++++ gregoriotex.doc.tar.xz ++++++ ++++ 4497 lines of diff (skipped) ++++++ gregoriotex.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-k/gregoriotex.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-k.new/gregoriotex.tar.xz differ: char 26, line 1 ++++++ grfpaste.doc.tar.xz ++++++ ++++++ grfpaste.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grfpaste.tlpobj new/tlpkg/tlpobj/grfpaste.tlpobj --- old/tlpkg/tlpobj/grfpaste.tlpobj 2016-04-14 19:06:24.000000000 +0200 +++ new/tlpkg/tlpobj/grfpaste.tlpobj 2017-04-14 17:42:31.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/grfpaste/grfpaste.sty catalogue-ctan /macros/latex/contrib/grfpaste -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-incl catalogue-version 0.2 ++++++ grid-system.doc.tar.xz ++++++ ++++++ grid-system.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grid-system.tlpobj new/tlpkg/tlpobj/grid-system.tlpobj --- old/tlpkg/tlpobj/grid-system.tlpobj 2016-04-14 19:06:25.000000000 +0200 +++ new/tlpkg/tlpobj/grid-system.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/grid-system/grid-system.sty catalogue-ctan /macros/latex/contrib/grid-system -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license apache2 catalogue-topics layout catalogue-version 0.3.0 ++++++ grid.doc.tar.xz ++++++ ++++++ grid.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grid.tlpobj new/tlpkg/tlpobj/grid.tlpobj --- old/tlpkg/tlpobj/grid.tlpobj 2016-04-14 19:06:25.000000000 +0200 +++ new/tlpkg/tlpobj/grid.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=3 RELOC/tex/latex/grid/grid.sty catalogue-ctan /macros/latex/contrib/grid -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 catalogue-version 1.0 ++++++ gridset.doc.tar.xz ++++++ ++++++ gridset.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gridset.tlpobj new/tlpkg/tlpobj/gridset.tlpobj --- old/tlpkg/tlpobj/gridset.tlpobj 2016-04-14 19:06:25.000000000 +0200 +++ new/tlpkg/tlpobj/gridset.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=5 RELOC/tex/latex/gridset/gridset.sty catalogue-ctan /macros/latex/contrib/gridset -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 catalogue-version 0.1 ++++++ grotesq.doc.tar.xz ++++++ ++++++ grotesq.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grotesq.tlpobj new/tlpkg/tlpobj/grotesq.tlpobj --- old/tlpkg/tlpobj/grotesq.tlpobj 2016-04-14 19:06:25.000000000 +0200 +++ new/tlpkg/tlpobj/grotesq.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -33,6 +33,6 @@ RELOC/tex/latex/grotesq/t1ugq.fd RELOC/tex/latex/grotesq/ts1ugq.fd catalogue-ctan /fonts/urw/grotesq -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-sans font-type1 ++++++ grundgesetze.doc.tar.xz ++++++ ++++++ grundgesetze.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grundgesetze.tlpobj new/tlpkg/tlpobj/grundgesetze.tlpobj --- old/tlpkg/tlpobj/grundgesetze.tlpobj 2016-04-14 19:06:25.000000000 +0200 +++ new/tlpkg/tlpobj/grundgesetze.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/grundgesetze/grundgesetze.sty catalogue-also begriff frege bguq catalogue-ctan /macros/latex/contrib/grundgesetze -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics maths logic catalogue-version 1.02 ++++++ gsemthesis.doc.tar.xz ++++++ ++++++ gsemthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gsemthesis.tlpobj new/tlpkg/tlpobj/gsemthesis.tlpobj --- old/tlpkg/tlpobj/gsemthesis.tlpobj 2016-04-14 19:06:26.000000000 +0200 +++ new/tlpkg/tlpobj/gsemthesis.tlpobj 2017-04-14 17:42:32.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/gsemthesis/gsemthesis.cls catalogue-ctan /macros/latex/contrib/gsemthesis -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 0.9.4 ++++++ gsftopk.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/gsftopk.man1.pdf and new/texmf-dist/doc/man/man1/gsftopk.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gsftopk.doc.tlpobj new/tlpkg/tlpobj/gsftopk.doc.tlpobj --- old/tlpkg/tlpobj/gsftopk.doc.tlpobj 2016-04-27 03:17:31.000000000 +0200 +++ new/tlpkg/tlpobj/gsftopk.doc.tlpobj 2017-05-04 02:07:03.000000000 +0200 @@ -1,7 +1,7 @@ name gsftopk.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of gsftopk -docfiles size=10 +docfiles size=5 texmf-dist/doc/man/man1/gsftopk.1 texmf-dist/doc/man/man1/gsftopk.man1.pdf ++++++ gsftopk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gsftopk.tlpobj new/tlpkg/tlpobj/gsftopk.tlpobj --- old/tlpkg/tlpobj/gsftopk.tlpobj 2016-04-27 03:17:32.000000000 +0200 +++ new/tlpkg/tlpobj/gsftopk.tlpobj 2017-05-04 02:07:03.000000000 +0200 @@ -1,6 +1,6 @@ name gsftopk category TLCore -revision 40768 +revision 44166 shortdesc Convert "Ghostscript fonts" to PK files longdesc Designed for use with xdvi and dvips this utility converts longdesc Adobe Type 1 fonts to PK bitmap format. It should not @@ -11,7 +11,7 @@ runfiles size=2 texmf-dist/dvips/gsftopk/render.ps catalogue-ctan /fonts/utilities/gsftopk -catalogue-date 2015-08-13 17:20:27 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license gpl catalogue-topics font-cvt catalogue-version 1.19.2 ++++++ gtl.doc.tar.xz ++++++ ++++++ gtl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gtl.tlpobj new/tlpkg/tlpobj/gtl.tlpobj --- old/tlpkg/tlpobj/gtl.tlpobj 2016-04-14 19:06:28.000000000 +0200 +++ new/tlpkg/tlpobj/gtl.tlpobj 2017-04-14 17:42:33.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/generic/gtl/gtl.sty catalogue-ctan /macros/generic/gtl -catalogue-date 2015-09-30 19:44:31 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp catalogue-version 0.2 ++++++ gtrcrd.doc.tar.xz ++++++ ++++++ gtrcrd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gtrcrd.tlpobj new/tlpkg/tlpobj/gtrcrd.tlpobj --- old/tlpkg/tlpobj/gtrcrd.tlpobj 2016-04-14 19:06:29.000000000 +0200 +++ new/tlpkg/tlpobj/gtrcrd.tlpobj 2017-04-14 17:42:33.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=5 RELOC/tex/latex/gtrcrd/gtrcrd.sty catalogue-ctan /macros/latex/contrib/gtrcrd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics music chords catalogue-version 1.1 ++++++ gu.doc.tar.xz ++++++ ++++++ gu.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gu.tlpobj new/tlpkg/tlpobj/gu.tlpobj --- old/tlpkg/tlpobj/gu.tlpobj 2016-04-14 19:06:29.000000000 +0200 +++ new/tlpkg/tlpobj/gu.tlpobj 2017-04-14 17:42:34.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=8 RELOC/tex/latex/gu/gu.sty catalogue-ctan /macros/latex/contrib/gu -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics crystallography ++++++ guide-to-latex.doc.tar.xz ++++++ ++++++ guitar.doc.tar.xz ++++++ ++++++ guitar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitar.tlpobj new/tlpkg/tlpobj/guitar.tlpobj --- old/tlpkg/tlpobj/guitar.tlpobj 2016-04-14 19:06:30.000000000 +0200 +++ new/tlpkg/tlpobj/guitar.tlpobj 2017-04-14 17:42:34.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/guitar/guitar.sty catalogue-ctan /macros/latex/contrib/guitar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics music chords catalogue-version 1.6 ++++++ guitarchordschemes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/guitarchordschemes/README new/doc/latex/guitarchordschemes/README --- old/doc/latex/guitarchordschemes/README 2014-09-16 00:57:22.000000000 +0200 +++ new/doc/latex/guitarchordschemes/README 2016-11-25 19:29:06.000000000 +0100 @@ -1,15 +1,15 @@ -------------------------------------------------------------------------- -the GUITARCHORDSCHEMES package v 0.6 +the GUITARCHORDSCHEMES package v0.7 Guitar Chord and Scale Tablatures with TikZ -2014/09/15 +2016/08/16 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/guitarchordschemes/ E-Mail: contact(a)mychemistry.eu -------------------------------------------------------------------------- -Copyright 2013-2014 Clemens Niederberger +Copyright 2013-2016 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 Binary files old/doc/latex/guitarchordschemes/guitarchordschemes_en.pdf and new/doc/latex/guitarchordschemes/guitarchordschemes_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/guitarchordschemes/guitarchordschemes_en.tex new/doc/latex/guitarchordschemes/guitarchordschemes_en.tex --- old/doc/latex/guitarchordschemes/guitarchordschemes_en.tex 2014-09-16 00:57:22.000000000 +0200 +++ new/doc/latex/guitarchordschemes/guitarchordschemes_en.tex 2016-11-25 19:29:06.000000000 +0100 @@ -12,7 +12,7 @@ % Web: https://bitbucket.org/cgnieder/guitarchordschemes/ % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2013 Clemens Niederberger +% Copyright 2013--2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -37,7 +37,7 @@ % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} \usepackage{guitarchordschemes} -\usepackage[chordnames]{leadsheets} +\usepackage[chords]{leadsheets} \setcnltx{ package = guitarchordschemes , @@ -48,6 +48,7 @@ add-cmds = { chordscheme, setchordscheme, + setfingering , scales } , add-silent-cmds = textsuperscript , @@ -118,7 +119,7 @@ % section~\ref{sec:realbookchords} for details on this option. \section{The Commands} -This package more or less provides a single command: +This package mainly provides two commands: \begin{commands} \command{chordscheme}[\oarg{options}] Typeset a guitar chord scheme. @@ -237,9 +238,9 @@ Set a whole predefined fingering. The types correspond to ones taught in \citeauthor{leavitt:mmfg:1}'s \citetitle{leavitt:mmfg:1}~\cite{leavitt:mmfg:1}. This option assumes an - ionic scale a places the roots correspondingly. + ionic scale and places the roots correspondingly. \keychoice{fingering*}{type 1,type 1A,type 2,type 3,type 4} - The same as \option{fingering} but not scale is assumed and no roots are + The same as \option{fingering} but no scale is assumed and no roots are indicated. \keychoice{fingering?}{type 1,type 1A,type 2,type 3,type 4} The same as \option{fingering*} but also no labels for the fingers are given. @@ -284,11 +285,34 @@ ] \end{example} +You can add other predefined fingerings or change the existing ones with the +following command: +\begin{commands} + \command{setfingering}[\marg{name}\marg{fingers}\marg{roots}] + \sinceversion{0.7}\marg{name} sets the name as chosen by + \option{fingering}, \option{fingering*} or \option{fingering?}, + \meta{fingers} is passed to the \option{finger} option and \meta{roots} + either to the \option{finger} option or the \option{root} option depending + if the fingering is called by \option{fingering}, \option{fingering*} or + \option{fingering?}. +\end{commands} +As an example here is how fingering type 1A has been defined: +\begin{sourcecode} + \setfingering{type 1A}{ + 3/1:2, 5/1:4, + 3/2:2, 5/2:4, + 2/3:1, 3/3:2, 5/3:4, + 2/4:1, 5/4:4, + 1/5:1s, 3/5:2, 5/5:4, + 3/6:2, 5/6:4 + }{1/1:1s, 3/4:2, 1/6:1s} +\end{sourcecode} + \section{Options} There are quite a number of options determining the layout of the tablatures. They can either be set as package options or via the setup command: \begin{commands} - \command{setchordscheme}{options} + \command{setchordscheme}[\marg{options}] The setup command for \guitarchordschemes. \end{commands} @@ -298,6 +322,8 @@ The basic $x$ unit for the \TikZ{} picture the chord scheme is set in. \keyval{y-unit}{dim}\Default{.8cm} The basic $y$ unit for the \TikZ{} picture the chord scheme is set in. + \keyval{rotate}{angle}\Default{0} + \sinceversion{0.7}Rotates the diagram counter-clockwise by \meta{angle}. \keyval{finger-format}{\TeX{} code}\Default{\cs*{sffamily}\cs*{small}} The format the numbers for the fingers are typeset with. \keyval{finger-format+}{\TeX{} code}\Default @@ -310,16 +336,23 @@ The format the chord name/symbol is typeset with. \keyval{name-format+}{\TeX{} code}\Default Code to be appended to \option{name-format}. - \keyval{chord-name-format}{cs}\Default{\cs*{@firstofone}} + \keybool{name-below}\Default{false} + \sinceversion{0.7}If set to \code{true} the name will be written below + instead of above the diagram. + \keyval{name-distance}{dim}\Default{.5em} + \sinceversion{0.7}The distance between name and chord diagram. + \keyval{chord-name-cs}{cs}\Default{\cs*{@firstofone}} \sinceversion{0.5}The command that is used to parse the chord name. \meta{cs} needs to be a command that takes a mandatory argument. - \keyval{scales-name-format}{cs}\Default{\cs*{@firstofone}} + \keyval{scales-name-cs}{cs}\Default{\cs*{@firstofone}} \sinceversion{0.5}The command that is used to parse the scales name. \meta{cs} needs to be a command that takes a mandatory argument. \keyval{string-name-format}{\TeX{} code}\Default{\cs*{sffamily}\cs*{small}} The format the names of the strings are typeset with. \keyval{string-name-format+}{\TeX{} code}\Default Code to be appended to \option{string-name-format}. + \keyval{strings}{num}\Default{6} + \sinceversion{0.7}Sets the number of strings. \keyval{chord-frets}{number}\Default{4} \sinceversion{0.6}The default number of frets of a chord scheme. \meta{number} must be at least 4. @@ -359,7 +392,12 @@ This is equivalent to \cs*{tikzset}\Marg{muted style/.style=\{\meta{\TikZ{} style}\}}. \keyval{tuning}{comma separated list of string names}\Default{E,B,G,D,A,E} - The tuning. + The tuning. The strings are named from first to sixth string. If you + want to remove all names use \keyis{tuning}{,,,,,}. + \keybool{restrict-bounding-box}\Default{false} + \sinceversion{0.7}If set to \code{true} the bounding box of the \TikZ{} + picture is not extended by string names, position labels etc.\@ but + restricted (more or less) only to the chord scheme diagram itself. \end{options} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj new/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj --- old/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj 2016-04-14 19:06:30.000000000 +0200 +++ new/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj 2017-04-14 17:42:34.000000000 +0200 @@ -1,9 +1,9 @@ name guitarchordschemes.doc category Package -revision 35179 +revision 41880 shortdesc doc files of guitarchordschemes relocated 1 -docfiles size=107 +docfiles size=108 RELOC/doc/latex/guitarchordschemes/README RELOC/doc/latex/guitarchordschemes/guitarchordschemes_en.pdf RELOC/doc/latex/guitarchordschemes/guitarchordschemes_en.tex ++++++ guitarchordschemes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/guitarchordschemes/guitarchordschemes.sty new/tex/latex/guitarchordschemes/guitarchordschemes.sty --- old/tex/latex/guitarchordschemes/guitarchordschemes.sty 2014-09-16 00:57:22.000000000 +0200 +++ new/tex/latex/guitarchordschemes/guitarchordschemes.sty 2016-11-25 19:33:50.000000000 +0100 @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/guitarchordschemes/ % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013-2016 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -34,8 +34,8 @@ % % package info and requirements: \NeedsTeXFormat{LaTeX2e} -\def\gcs@date{2014/09/15} -\def\gcs(a)version{v0.6} +\def\gcs@date{2016/08/16} +\def\gcs(a)version{v0.7} \def\gcs@description{Guitar Chord and Scale Tablatures with TikZ (CN)} \ProvidesPackage{guitarchordschemes}[\gcs@date\space \gcs@version\space \gcs@description] @@ -53,7 +53,7 @@ \cnltx@create@generic@message{gcs}{guitarchordschemes}{WarningNoLine}{} \cnltx@create@generic@message{gcs}{guitarchordschemes}{Info}{} -\def\gcs@missing@date@error#1#2{% +\newcommand*\gcs@missing@date@error[2]{% \gcs@error {#1: empty #2} {#1: It seems you didn't specify the #2}% @@ -72,7 +72,7 @@ {\protected\def#1}% } -\gcs@def\gcs@deprecated@option#1#2{% +\newrobustcmd*\gcs@deprecated@option[2]{% \gcs@warning{Since version #1 the option `#2' has been dropped}% } @@ -82,6 +82,7 @@ \newcommand*\gcs@position@font{\sffamily} \newcommand*\gcs@name@font{\large} \newcommand*\gcs@string@name@format{\sffamily\small} +\newcommand*\gcs@name@distance{.5em} \newcommand*\gcs@x@unit{.8cm} \newcommand*\gcs@y@unit{.8cm} @@ -89,14 +90,58 @@ \newcommand*\gcs@finger@radius{.1875} \newcommand*\gcs@finger@x@offset{.375} \newcommand*\gcs@finger@y@offset{.275} +\newcommand*\gcs@angle{0} + +\newcommand*\gcs@string@number{6} +\newcommand*\gcs@setstringnumber[1]{% + \ifnumless{#1}{1} + {% + \gcs@warning{You can't use less than one string. Setting string number + to 1}% + \def\gcs@string@number{1}% + } + {% + \ifnumgreater{#1}{7} + {% + \gcs@warning{You can't use more than seven + strings. Setting string number to 6}% + \def\gcs@string@number{6}% + } + {\def\gcs@string@number{#1}}% + }% +} + +\newbool{gcs@switch@name} \newcommand*\gcs@chordscheme@fret@number{4} \newcommand*\gcs@scales@fret@number{6} +\newrobustcmd*\gcs@chord@tuning[1]{% + \foreach \string@name [count=\x] in {#1} + {\csxdef{guitar@string@\x}{\expandonce\string@name}}% +} + +\newbool{gcs@restrict@boundingbox} +\newcommand*\gcs@restrictboundingbox[1]{ + \ifbool{gcs@restrict@boundingbox} + { + \ifnumequal{\gcs@string@number}{1} + {\useasboundingbox (0,-.4) --++ (1.5*\csname gcs@#1@fret@number\endcsname,.8) ; } + { + \useasboundingbox + (bass) + rectangle + (1.5*\csname gcs@#1@fret@number\endcsname,{.8*(\gcs@string@number-1)}) ; + } + }{} +} + \pgfkeys{ guitarchordschemes/.cd , x-unit/.code = \def\gcs@x@unit{#1} , y-unit/.code = \def\gcs@y@unit{#1} , + rotate/.code = \def\gcs@angle{#1} , + strings/.code = \gcs@setstringnumber{#1} , finger-format/.code = \def\gcs@finger@font{#1} , finger-format+/.code = \expandafter\def\expandafter\gcs@finger@font @@ -109,6 +154,8 @@ name-format+/.code = \expandafter\def\expandafter\gcs@name@font \expandafter{\gcs@name@font#1} , + name-distance/.code = \def\gcs@name@distance{#1} , + name-below/.is if = gcs@switch@name , chord-name-cs/.code = {\let\gcs@chord@name@command=#1} , scales-name-cs/.code = {\let\gcs@scales@name@command=#1} , string-name-format/.code = \def\gcs@string@name@format{#1} , @@ -139,23 +186,14 @@ ringing-style/.code = \tikzset{ringing style/.style={#1}} , muted-style/.code = \tikzset{muted style/.style={#1}} , tuning/.code = \gcs@chord@tuning{#1} , - use-rbc/.code = \gcs@deprecated@option{0.5}{use-rbc} + use-rbc/.code = \gcs@deprecated@option{0.5}{use-rbc} , + restrict-bounding-box/.is if = gcs@restrict@boundingbox } % the setup command: \newrobustcmd*\setchordscheme[1]{\pgfqkeys{/guitarchordschemes}{#1}} -\newcounter{gcs@string@number} -\newrobustcmd*\gcs@chord@tuning[1]{% - \setcounter{gcs@string@number}{0}% - \foreach \string@name in {#1} - {% - \stepcounter{gcs@string@number}% - \csxdef{guitar@string@\arabic{gcs@string@number}}{\expandonce\string@name}% - }% -} - -% some defaults - need to be set before options are processed: +% some defaults -- need to be set before options are processed: \setchordscheme{ tuning = {E,B,G,D,A,E} , muted-style = {cross out,draw} , @@ -181,7 +219,7 @@ % setting a chord scheme: \pgfkeys{ gcs/chord/.cd , - name/.code = \gcs@chord@name{#1} , + name/.code = \gdef\gcs@chord@name{#1} , position/.code = \def\gcs@chord@position{#1} , finger/.code = \gcs@chord@finger{#1} , root/.code = \gcs@chord@root{#1} , @@ -198,10 +236,34 @@ {\def\gcs@chordscheme@fret@number{#1}} } +\newrobustcmd*\setfingering[3]{% + \pgfkeys{ + gcs/scales/.cd , + fingering/#1/.code = + \gcs@scales@finger{#2} + \ifblank{#3}{}{\gcs@scales@root{#3}} , + fingering*/#1/.code = + \def\gcs@tmp{}% + \foreach \gcs@str in {#2,#3} + { \xappto\gcs@tmp{\gcs@str,} }% + \edef\gcs@tmp{\expandafter\cs@remove@comma\gcs@tmp\q@stop}% + \expandafter\gcs@scales@finger\expandafter{\gcs@tmp} , + fingering?/#1/.code = + \def\gcs@tmp{}% + \foreach \gcs@str in {#2,#3} + { \xappto\gcs@tmp{\expandafter\cs@remove@finger\gcs@str::\q@stop,} }% + \edef\gcs@tmp{\expandafter\cs@remove@comma\gcs@tmp\q@stop}% + \expandafter\gcs@scales@finger\expandafter{\gcs@tmp}% + }% +} + +\def\cs@remove@finger#1:#2:#3\q@stop{#1} +\def\cs@remove@comma#1,\q@stop{#1} + % setting a scale: \pgfkeys{ gcs/scales/.cd , - name/.code = \gcs@scales@name{#1} , + name/.code = \gdef\gcs@scales@name{#1} , position/.code = \def\gcs@scales@position{#1} , finger/.code = \gcs@scales@finger{#1} , root/.code = \gcs@scales@root{#1} , @@ -213,150 +275,55 @@ } {\def\gcs@scales@fret@number{#1}} , fingering/.is choice , - fingering/type 1/.code = - \gcs@scales@finger{% - 1/1:1s, 3/1:2, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 4/3:3, - 2/4:1, 3/4:2, 5/4:4, - 2/5:1, 5/5:4, - 1/6:1s, 3/6:2, 5/6:4 - }% - \gcs@scales@root{5/3:4, 3/5:2} , - fingering/type 1A/.code = - \gcs@scales@finger{% - 3/1:2, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 3/3:2, 5/3:4, - 2/4:1, 5/4:4, - 1/5:1s, 3/5:2, 5/5:4, - 3/6:2, 5/6:4 - }% - \gcs@scales@root{1/1:1s, 3/4:2, 1/6:1s} , - fingering/type 2/.code = - \gcs@scales@finger{% - 2/1:1, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 4/3:3, 5/3:4, - 2/4:1, 4/4:3, - 2/5:1, 3/5:2, 5/5:4, - 2/6:1, 5/6:4 - }% - \gcs@scales@root{3/1:2, 5/4:4, 3/6:2}, - fingering/type 3/.code = - \gcs@scales@finger{% - 2/1:1, 3/1:2, 5/1:4, - 2/2:1, 5/2:4, - 2/3:1, 4/3:3, - 2/4:1, 4/4:3, 5/4:4, - 2/5:1, 4/5:3, - 2/6:1, 3/6:2, 5/6:4 - }% - \gcs@scales@root{3/2:2, 5/5:4}, - fingering/type 4/.code = - \gcs@scales@finger{% - 2/1:1, 4/1:3, - 2/2:1, 3/2:2, 5/2:4, - 4/3:3, - 2/4:1, 4/4:3, 6/4:4s, - 2/5:1, 4/5:3, 5/5:4, - 2/6:1, 4/6:3 - }% - \gcs@scales@root{5/1:4, 2/3:1, 5/6:4}, fingering*/.is choice , - fingering*/type 1/.code = - \gcs@scales@finger{% - 1/1:1s, 3/1:2, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 4/3:3, 5/3:4, - 2/4:1, 3/4:2, 5/4:4, - 2/5:1, 3/5:2, 5/5:4, - 1/6:1s, 3/6:2, 5/6:4 - } , - fingering*/type 1A/.code = - \gcs@scales@finger{% - 1/1:1s, 3/1:2, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 3/3:2, 5/3:4, - 2/4:1, 3/4:2, 5/4:4, - 1/5:1s, 3/5:2, 5/5:4, - 1/6:1s, 3/6:2, 5/6:4 - } , - fingering*/type 2/.code = - \gcs@scales@finger{% - 2/1:1, 3/1:2, 5/1:4, - 3/2:2, 5/2:4, - 2/3:1, 4/3:3, 5/3:4, - 2/4:1, 4/4:3, 5/4:4, - 2/5:1, 3/5:2, 5/5:4, - 2/6:1, 3/6:2, 5/6:4 - } , - fingering*/type 3/.code = - \gcs@scales@finger{% - 2/1:1, 3/1:2, 5/1:4, - 2/2:1, 3/2:2, 5/2:4, - 2/3:1, 4/3:3, - 2/4:1, 4/4:3, 5/4:4, - 2/5:1, 4/5:3, 5/5:4, - 2/6:1, 3/6:2, 5/6:4 - } , - fingering*/type 4/.code = - \gcs@scales@finger{% - 2/1:1, 4/1:3, 5/1:4, - 2/2:1, 3/2:2, 5/2:4, - 2/3:1, 4/3:3, - 2/4:1, 4/4:3, 6/4:4s, - 2/5:1, 4/5:3, 5/5:4, - 2/6:1, 4/6:3, 5/6:4 - }, - fingering?/.is choice , - fingering?/type 1/.code = - \gcs@scales@finger{% - 1/1, 3/1, 5/1, - 3/2, 5/2, - 2/3, 4/3, 5/3, - 2/4, 3/4, 5/4, - 2/5, 3/5, 5/5, - 1/6, 3/6, 5/6 - } , - fingering?/type 1A/.code = - \gcs@scales@finger{% - 1/1, 3/1, 5/1, - 3/2, 5/2, - 2/3, 3/3, 5/3, - 2/4, 3/4, 5/4, - 1/5, 3/5, 5/5, - 1/6, 3/6, 5/6 - } , - fingering?/type 2/.code = - \gcs@scales@finger{% - 2/1, 3/1, 5/1, - 3/2, 5/2, - 2/3, 4/3, 5/3, - 2/4, 4/4, 5/4, - 2/5, 3/5, 5/5, - 2/6, 3/6, 5/6 - } , - fingering?/type 3/.code = - \gcs@scales@finger{% - 2/1, 3/1, 5/1, - 2/2, 3/2, 5/2, - 2/3, 4/3, - 2/4, 4/4, 5/4, - 2/5, 4/5, 5/5, - 2/6, 3/6, 5/6 - } , - fingering?/type 4/.code = - \gcs@scales@finger{% - 2/1, 4/1, 5/1, - 2/2, 3/2, 5/2, - 2/3, 4/3, - 2/4, 4/4, 6/4, - 2/5, 4/5, 5/5, - 2/6, 4/6, 5/6 - } + fingering?/.is choice } +\setfingering{type 1}{ + 1/1:1s, 3/1:2, 5/1:4, + 3/2:2, 5/2:4, + 2/3:1, 4/3:3, + 2/4:1, 3/4:2, 5/4:4, + 2/5:1, 5/5:4, + 1/6:1s, 3/6:2, 5/6:4 +}{5/3:4, 3/5:2} + +\setfingering{type 1A}{ + 3/1:2, 5/1:4, + 3/2:2, 5/2:4, + 2/3:1, 3/3:2, 5/3:4, + 2/4:1, 5/4:4, + 1/5:1s, 3/5:2, 5/5:4, + 3/6:2, 5/6:4 +}{1/1:1s, 3/4:2, 1/6:1s} + +\setfingering{type 2}{ + 2/1:1, 5/1:4, + 3/2:2, 5/2:4, + 2/3:1, 4/3:3, 5/3:4, + 2/4:1, 4/4:3, + 2/5:1, 3/5:2, 5/5:4, + 2/6:1, 5/6:4 +}{3/1:2, 5/4:4, 3/6:2} + +\setfingering{type 3}{ + 2/1:1, 3/1:2, 5/1:4, + 2/2:1, 5/2:4, + 2/3:1, 4/3:3, + 2/4:1, 4/4:3, 5/4:4, + 2/5:1, 4/5:3, + 2/6:1, 3/6:2, 5/6:4 +}{3/2:2, 5/5:4} + +\setfingering{type 4}{ + 2/1:1, 4/1:3, + 2/2:1, 3/2:2, 5/2:4, + 4/3:3, + 2/4:1, 4/4:3, 6/4:4s, + 2/5:1, 4/5:3, 5/5:4, + 2/6:1, 4/6:3 +}{5/1:4, 2/3:1, 5/6:4} + % -------------------------------------------------------------------------- % the internal commands @@ -373,7 +340,7 @@ \ifdefvoid\gcs@finger@y {\gcs@missing@date@error{finger}{string}} { - \pgfmathsetmacro\gcs@finger@string{(6-\gcs@finger@y)*4/5} + \pgfmathsetmacro\gcs@finger@string{(\gcs@string@number-\gcs@finger@y)*4/5} \draw[finger style] (\gcs@finger@fret,\gcs@finger@string) circle @@ -406,8 +373,8 @@ {\gcs@missing@date@error{barre}{string range}} { \expandafter\gcs@barre@getstrings\gcs@barre@fromto--\q@stop - \pgfmathsetmacro\gcs@barre@lower@string{(6-\gcs@barre@lower@y)*4/5} - \pgfmathsetmacro\gcs@barre@upper@string{(6-\gcs@barre@upper@y)*4/5} + \pgfmathsetmacro\gcs@barre@lower@string{(\gcs@string@number-\gcs@barre@lower@y)*4/5} + \pgfmathsetmacro\gcs@barre@upper@string{(\gcs@string@number-\gcs@barre@upper@y)*4/5} \draw[finger style,round cap-round cap,line width=2*\gcs@finger@radius*\gcs@x@unit] (\gcs@barre@fret,\gcs@barre@lower@string) node[gcs/finger] {\gcs@barre@finger} ++ (0,\gcs@finger@radius*\gcs@x@unit) @@ -448,7 +415,7 @@ \ifdefvoid\gcs@finger@y {\gcs@missing@date@error{root}{string}} { - \pgfmathsetmacro\gcs@finger@string{(6-\gcs@finger@y)*4/5} + \pgfmathsetmacro\gcs@finger@string{(\gcs@string@number-\gcs@finger@y)*4/5} \node[minimum size=2*\gcs@finger@radius*\gcs@x@unit,inner sep=0pt,root style] at (\gcs@finger@fret,\gcs@finger@string) {} ; \node[gcs/finger] @@ -473,7 +440,7 @@ \ifdefvoid\gcs@finger@x {\gcs@missing@date@error{show-root}{string}} { - \pgfmathsetmacro\gcs@finger@string{(6-\gcs@finger@y)*4/5} + \pgfmathsetmacro\gcs@finger@string{(\gcs@string@number-\gcs@finger@y)*4/5} \node[ minimum size=2*\gcs@finger@radius*\gcs@x@unit, inner sep=0pt, @@ -497,40 +464,44 @@ \newrobustcmd*\gcs@chord@ring[1]{% \foreach \ringing@string in {#1} { - \pgfmathsetmacro\ringing@string@pos{(6-\ringing@string)*4/5} + \pgfmathsetmacro\ringing@string@pos{(\gcs@string@number-\ringing@string)*4/5} \draw[ringing style] (0,\ringing@string@pos) circle (\gcs@finger@radius*\gcs@x@unit) ; } } % the chord name: -\newrobustcmd*\gcs@chord@name[1]{% - \node[above,yshift=4ex] at (.75*\gcs@chordscheme@fret@number,4) {% - \gcs@name@font - \foreach \gcs@chord@name@variant in {#1} - {% - \space - \expandafter\gcs@chord@name@command - \expandafter{\gcs@chord@name@variant}% - \space - }% - } ; +\newrobustcmd*\gcs@place@chord@name[1]{% + \node[ + label={[text height=1.5ex,text depth=.2ex,font=\gcs@name@font, + label distance=\gcs@name@distance]\ifbool{gcs@switch@name}{below}{above}:{% + \foreach \gcs@chord@name@variant in {#1} + {% + % \space + \expandafter\gcs@chord@name@command + \expandafter{\gcs@chord@name@variant}% + % \space + }% + }}] at + (diagram.\ifbool{gcs@switch@name}{south}{north}) {} ; } \newrobustcmd*\gcs@chord@name@command[1]{#1} % the scale name: -\newrobustcmd*\gcs@scales@name[1]{% - \node[above,yshift=4ex] at (.75*\gcs@scales@fret@number,4) {% - \gcs@name@font - \foreach \gcs@scales@name@variant in {#1} - {% - \space - \expandafter\gcs@scales@name@command - \expandafter{\gcs@scales@name@variant}% - \space - }% - } ; +\newrobustcmd*\gcs@place@scales@name[1]{% + \node[ + label={[text height=1.5ex,text depth=.2ex,font=\gcs@name@font, + label distance=\gcs@name@distance]\ifbool{gcs@switch@name}{below}{above}:{% + \foreach \gcs@scales@name@variant in {#1} + {% + % \space + \expandafter\gcs@scales@name@command + \expandafter{\gcs@scales@name@variant}% + % \space + }% + }}] at + (diagram.\ifbool{gcs@switch@name}{south}{north}) {} ; } \newrobustcmd*\gcs@scales@name@command[1]{#1} @@ -543,29 +514,43 @@ x=\gcs@x@unit, y=\gcs@y@unit, line width=\gcs@line@width, - baseline=(6thstring) + baseline=(bass) ] - \coordinate (6thstring) at (0,0) ; + \begin{scope}[rotate=\gcs@angle,local bounding box=diagram] + \coordinate (bass) at (0,0) ; + \gcs@restrictboundingbox{chordscheme} \pgfqkeys{/gcs/chord}{#1}% - \foreach \fret in {0,1,...,\gcs@chordscheme@fret@number} - { \draw (1.5*\fret,0) -- (1.5*\fret,4) ; } - \foreach \gcs@string@pos/\gcs@string@number in - { 0/6, 0.8/5, 1.6/4, 2.4/3, 3.2/2, 4/1, 0 } + \foreach \fretnumber + in {0,...,\gcs@chordscheme@fret@number} + { + \ifnumequal{\gcs@string@number}{1} + { \draw (1.5*\fretnumber,-.4) --++ (0,.8) ; } + { \draw (1.5*\fretnumber,0) -- ++(0,{.8*(\gcs@string@number-1)}) ; } + } + \foreach \gcs@string in {1,...,\gcs@string@number} { \draw - (0,\gcs@string@pos) - node[left,minimum width=2em] - {\gcs@string@name@format\csuse{guitar@string@\gcs@string@number}} - -- - (1.5*\gcs@chordscheme@fret@number,\gcs@string@pos) ; + (0,{.8*(\gcs@string@number-\gcs@string)}) + node[transform shape, + label={[text height=1.5ex,text depth=.2ex]left:% + \gcs@string@name@format\csuse{guitar@string@\gcs@string}}] {} + --++(1.5*\gcs@chordscheme@fret@number,0) ; } \ifdefvoid\gcs@chord@position {} { - \node[above,yshift=1ex,font=\gcs@position@font] - at (.75,4) {\gcs@chord@position} ; + \draw + (.75,{.8*(\gcs@string@number-1)}) + node[transform shape, + label={[text height=1.5ex,text depth=.2ex,font=\gcs@position@font]% + above:\gcs@chord@position}] {} ; } - \end{tikzpicture} + \end{scope} + \ifdefvoid\gcs@chord@name + {} + {\expandafter\gcs@place@chord@name\expandafter{\gcs@chord@name}} + \gdef\gcs@chord@name{} + \end{tikzpicture} \endgroup } @@ -577,28 +562,37 @@ x=\gcs@x@unit, y=\gcs@y@unit, line width=\gcs@line@width, - baseline=(6thstring) + baseline=(bass) ] + \begin{scope}[rotate=\gcs@angle,local bounding box=diagram] + \coordinate (bass) at (0,0) ; + \gcs@restrictboundingbox{scales} \pgfqkeys{/gcs/scales}{#1}% - \coordinate (6thstring) at (0,0) ; \foreach \fret in { 0,1,...,\gcs@scales@fret@number } - { \draw (1.5*\fret,0) -- (1.5*\fret,4) ; } - \foreach \gcs@string@pos/\gcs@string@number in - { 0/6, 0.8/5, 1.6/4, 2.4/3, 3.2/2, 4/1, 0 } + { \draw (1.5*\fret,0) -- (1.5*\fret,{.8*(\gcs@string@number-1)}) ; } + \foreach \gcs@string in {1,...,\gcs@string@number} { \draw - (0,\gcs@string@pos) - node[left,minimum width=2em] - {\gcs@string@name@format\csuse{guitar@string@\gcs@string@number}} - -- - (1.5*\gcs@scales@fret@number,\gcs@string@pos) ; + (0,{.8*(\gcs@string@number-\gcs@string)}) + node[transform shape, + label={[text height=1.5ex,text depth=.2ex]% + left:\gcs@string@name@format\csuse{guitar@string@\gcs@string}}] {} + --++(1.5*\gcs@scales@fret@number,0) ; } \ifdefvoid\gcs@scales@position {} - {% - \node[above,yshift=1ex,font=\gcs@position@font] - at (.75,4) {\gcs@scales@position} ; + { + \draw + (.75,{.8*(\gcs@string@number-1)}) + node[transform shape, + label={[text height=1.5ex,text depth=.2ex,font=\gcs@position@font]% + above:\gcs@scales@position}] {} ; } + \end{scope} + \ifdefvoid\gcs@scales@name + {} + {\expandafter\gcs@place@scales@name\expandafter{\gcs@scales@name}} + \gdef\gcs@scales@name{} \end{tikzpicture} \endgroup } @@ -645,5 +639,10 @@ 2013/08/25 v0.4 - added scale option that allows variable number of frets 2014/07/16 v0.5 - add `inner sep=0pt' to `root' and `show root' styles 2014/09/15 v0.6 - new options `chord-frets', `scales-frets' and `fret-number' - -TODO: +2016/08/16 v0.7 - new option `strings=<num>' makes the string number + adaptable which allows creation of ukulele and bass guitar + diagrams + - new option `name-below' + - new option `rotate=<angle>' + - new option `name-distance' + - new command \newfingering{name}{fingers}{roots} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitarchordschemes.tlpobj new/tlpkg/tlpobj/guitarchordschemes.tlpobj --- old/tlpkg/tlpobj/guitarchordschemes.tlpobj 2016-04-14 19:06:30.000000000 +0200 +++ new/tlpkg/tlpobj/guitarchordschemes.tlpobj 2017-04-14 17:42:34.000000000 +0200 @@ -1,6 +1,6 @@ name guitarchordschemes category Package -revision 35179 +revision 41880 shortdesc Guitar Chord and Scale Tablatures relocated 1 longdesc This package provides two commands (\chordscheme and \scales). @@ -12,7 +12,7 @@ RELOC/tex/latex/guitarchordschemes/guitarchordschemes.sty catalogue-also guitar catalogue-ctan /macros/latex/contrib/guitarchordschemes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-08-17 09:50:59 +0200 catalogue-license lppl1.3 catalogue-topics music chords -catalogue-version 0.6 +catalogue-version 0.7 ++++++ guitlogo.doc.tar.xz ++++++ ++++++ guitlogo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitlogo.tlpobj new/tlpkg/tlpobj/guitlogo.tlpobj --- old/tlpkg/tlpobj/guitlogo.tlpobj 2016-04-14 19:06:31.000000000 +0200 +++ new/tlpkg/tlpobj/guitlogo.tlpobj 2017-04-14 17:42:34.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/guitlogo/guit.cfg RELOC/tex/latex/guitlogo/guit.sty catalogue-ctan /macros/latex/contrib/GuIT/GuITlogo -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 0.9.2 ++++++ gustlib.doc.tar.xz ++++++ ++++++ gustlib.tar.xz ++++++ ++++++ gustprog.doc.tar.xz ++++++ ++++++ gzt.doc.tar.xz ++++++ ++++ 3849 lines of diff (skipped) ++++++ gzt.tar.xz ++++++ ++++ 18640 lines of diff (skipped) ++++++ h2020proposal.doc.tar.xz ++++++ ++++++ h2020proposal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/h2020proposal.tlpobj new/tlpkg/tlpobj/h2020proposal.tlpobj --- old/tlpkg/tlpobj/h2020proposal.tlpobj 2016-04-14 19:06:37.000000000 +0200 +++ new/tlpkg/tlpobj/h2020proposal.tlpobj 2017-04-14 17:42:35.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=11 RELOC/tex/latex/h2020proposal/h2020proposal.cls catalogue-ctan /macros/latex/contrib/h2020proposal -catalogue-date 2015-09-30 06:04:59 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics proposal class catalogue-version 1.0 ++++++ hacm.doc.tar.xz ++++++ ++++++ hacm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hacm.tlpobj new/tlpkg/tlpobj/hacm.tlpobj --- old/tlpkg/tlpobj/hacm.tlpobj 2016-04-14 19:06:37.000000000 +0200 +++ new/tlpkg/tlpobj/hacm.tlpobj 2017-04-14 17:42:35.000000000 +0200 @@ -54,7 +54,7 @@ RELOC/tex/latex/hacm/ot1hkar.fd RELOC/tex/latex/hacm/ot1hlan.fd catalogue-ctan /fonts/hacm -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-invented lang-invented catalogue-version 0.1 ++++++ handout.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/handout/README new/doc/latex/handout/README --- old/doc/latex/handout/README 2014-03-22 23:31:08.000000000 +0100 +++ new/doc/latex/handout/README 2016-11-25 19:29:06.000000000 +0100 @@ -1,4 +1,4 @@ Create handout for auditors of a speech. -Copyright 2014 Maïeul Rouquette +Copyright 2014-… Maïeul Rouquette LLPL 1.3 http://www.latex-project.org/lppl.txt \ No newline at end of file Binary files old/doc/latex/handout/examples/example1-minimal.pdf and new/doc/latex/handout/examples/example1-minimal.pdf differ Binary files old/doc/latex/handout/examples/example2-cancel-quotation.pdf and new/doc/latex/handout/examples/example2-cancel-quotation.pdf differ Binary files old/doc/latex/handout/examples/example3-defined-path.pdf and new/doc/latex/handout/examples/example3-defined-path.pdf differ Binary files old/doc/latex/handout/examples/example4-sectioning.pdf and new/doc/latex/handout/examples/example4-sectioning.pdf differ Binary files old/doc/latex/handout/examples/example5-numbering.pdf and new/doc/latex/handout/examples/example5-numbering.pdf differ Binary files old/doc/latex/handout/examples/example6-not-and-only.pdf and new/doc/latex/handout/examples/example6-not-and-only.pdf differ Binary files old/doc/latex/handout/examples/example7-biblatex.pdf and new/doc/latex/handout/examples/example7-biblatex.pdf differ Binary files old/doc/latex/handout/handout.pdf and new/doc/latex/handout/handout.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/handout/handout.tex new/doc/latex/handout/handout.tex --- old/doc/latex/handout/handout.tex 2015-04-16 23:14:55.000000000 +0200 +++ new/doc/latex/handout/handout.tex 2017-04-22 00:17:42.000000000 +0200 @@ -16,8 +16,8 @@ subtitle={to support your talk}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={1.2.1a}, - date={16/04/2015}, + revision={1.6.0}, + date={21/04/2017}, url={https://github.com/maieul/handout}} @@ -69,7 +69,7 @@ You have just to split your pdf in two parts to obtain your handout for your audience. See example~1. -\section{Code to be run at the beginning of the handout} +\section{Code to be run at the beginning / at the end of the handout} You can execute any code at the beginning of the handout by defining a command \cmd{beforehandout}. For example, to suppress the extra margins of the \env{quotation} environment: \begin{minted}{tex} @@ -82,10 +82,17 @@ Note that some actions are always performed before the handout: \begin{itemize} \item Start a new page. - \item Reset page and footnote. + \item Reset page, footnote, table and figure counters. \item Disable \cmd{index} and \cmd{label} command. \end{itemize} +You can also execute any code at the end of the handout by defining a command \cmd{afterhandout}. + For example, if you want to add additional remarks on your handout, but not in your main text. +\begin{minted}{tex} +\newcommand{\afterhandout}{% + Additional remarks. +} +\end{minted} \section{Putting all your examples in a single folder} In most cases, all your external files will be in a single folder. So you can fix this folder with the package's option \opt{dir}: @@ -138,10 +145,11 @@ The argument of a \cmd{onlyhandout} command will be printed only in the handout. Conversely, the argument of a command \cmd{nothandout} will be printed only in the main text. See example~6. \subsection{Insert code in the handout} - +\subsubsection{\cmd{forhandout} and \cmd{forhandout*}}\label{forhandout} The argument of the \cmd{forhandout} command will be added to the handout, even if used outside any included file. -\emph{Be careful}: if the content of the argument starts with a command, this command won't be run before the handout. +All the commands inside will be expanded, except the one which starts argument.. + The \cmd{forhandout} command is quite complex to manage, but can be useful if you want to insert bibliographic references automatically into your handout. If you use \emph{biblatex} to manage your bibliography, you can define a \cmd{citehandout} command with this code: @@ -155,7 +163,7 @@ \forhandout{% \cite[\strfield{postnote}]{\strfield{entrykey}}% }% - \forhandout{% + \forhandout{% \afterhandoutref% }% }% @@ -169,9 +177,36 @@ Note that the citation tracker is automatically reset at the beginning of the handout. +The starred version of \cmd{citehandout} command will not expand any macro inside the argument. For example, if you need to write instructions for readers: +\begin{minted}{latex} +\forhandout{Read the three following texts, looking for: +\begin{itemize} + \item Places. + \item Topics. + \item Characters. +\end{itemize} +} +\end{minted} +\subsubsection{\cmd{AtEveryHandout}}\label{forhandout} +You can also add define a \cs{AtEveryHandout} command to be executed in the handout, before each content added to the handout. \section{Change history} \begin{changelog} +\begin{release}{1.6.0}{2017-04-21} +\item Add starred version of \cs{forhandout} macro \see{forhandout}. +\end{release} + +\begin{release}{1.5.0}{2016-11-15} +\item Reset automatically table and figure counters before typesetting handout. +\end{release} + +\begin{release}{1.4.0}{2016-10-24} +\item Add possibility to add additional content before every element of an handout. +\end{release} + +\begin{release}{1.3.0}{2016-10-13} +\item Add possibility to add additional content at the end of the handout. +\end{release} \begin{release}{1.2.1}{2015-01-06} \item Optimize performance with \opt{sectioning} option. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/handout.doc.tlpobj new/tlpkg/tlpobj/handout.doc.tlpobj --- old/tlpkg/tlpobj/handout.doc.tlpobj 2016-04-14 19:06:37.000000000 +0200 +++ new/tlpkg/tlpobj/handout.doc.tlpobj 2017-04-22 02:08:25.000000000 +0200 @@ -1,9 +1,9 @@ name handout.doc category Package -revision 36877 +revision 43962 shortdesc doc files of handout relocated 1 -docfiles size=73 +docfiles size=74 RELOC/doc/latex/handout/README RELOC/doc/latex/handout/examples/example.bib RELOC/doc/latex/handout/examples/example1-minimal.pdf ++++++ handout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/handout/handout.sty new/tex/latex/handout/handout.sty --- old/tex/latex/handout/handout.sty 2015-04-16 23:14:55.000000000 +0200 +++ new/tex/latex/handout/handout.sty 2017-04-22 00:17:42.000000000 +0200 @@ -1,4 +1,4 @@ -%% Copyright 2014 Maïeul Rouquette +%% Copyright 2014… Maïeul Rouquette % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -13,8 +13,8 @@ % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files handout.sty and example and documentation files. -\ProvidesPackage{handout}[2015/04/16 1.2.1a Handout package] -\RequirePackage{kvoptions,etoolbox} +\ProvidesPackage{handout}[2017/04/21 1.6.0 Handout package] +\RequirePackage{kvoptions,etoolbox,suffix} % Options \DeclareBoolOption[false]{disabled} @@ -46,7 +46,7 @@ \handoutnumberintxt{\thehandoutnumber}% \fi% \ifhandout@printing% - \immediate\write\@handout {\string\handout@input{#1}}% + \immediate\write\@handout {\string\handout@input{#1}}% \fi% \fi% \input{\handout@dir/#1}% Add the handout @@ -64,9 +64,19 @@ \fi% \fi% } +\WithSuffix\newcommand\forhandout*[1]{% + \ifhandout@disabled\else% + \ifhandout@printing% + \immediate\write\@handout{\unexpanded{#1}}% + \fi% + \fi% +} % The command written in the .handout file \newcommand{\handout@input}[1]{% + \ifdefined\AtEveryHandout% + \AtEveryHandout% + \fi% \ifhandout@numbering% \stepcounter{handoutnumber}% \handoutnumber{\thehandoutnumber}% @@ -97,6 +107,7 @@ \makeatletter% \input\jobname.handout% \makeatother% + \ifdef{\afterhandout}{\afterhandout}{\handout@warning{No command defined to be run after handout}} \fi% \fi% } @@ -105,9 +116,11 @@ \newcommand{\before@handout}{% % New page \newpage% - % Reset counter + % Reset counters \setcounter{page}{1}% \setcounter{footnote}{0}% + \setcounter{table}{0}% + \setcounter{figure}{0}% \ifhandout@sectioning% \setcounter{section}{0}% \setcounter{subsection}{0}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/handout.tlpobj new/tlpkg/tlpobj/handout.tlpobj --- old/tlpkg/tlpobj/handout.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/handout.tlpobj 2017-04-22 02:08:26.000000000 +0200 @@ -1,6 +1,6 @@ name handout category Package -revision 36877 +revision 43962 shortdesc Create handout for auditors of a talk relocated 1 longdesc In some fields of scholarship, a beamer does not offer good @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/handout/handout.sty catalogue-ctan /macros/latex/contrib/handout -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-21 20:47:11 +0200 catalogue-license lppl1.3 catalogue-topics presentation -catalogue-version 1.2.1a +catalogue-version 1.6.0 ++++++ hands.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hands.tlpobj new/tlpkg/tlpobj/hands.tlpobj --- old/tlpkg/tlpobj/hands.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/hands.tlpobj 2017-04-14 17:42:36.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/fonts/source/public/hands/rvmirror.mf RELOC/fonts/tfm/public/hands/hands.tfm catalogue-ctan /fonts/hands -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 ++++++ hang.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hang/ChangeLog new/doc/latex/hang/ChangeLog --- old/doc/latex/hang/ChangeLog 2015-05-13 23:33:22.000000000 +0200 +++ new/doc/latex/hang/ChangeLog 2017-02-21 02:01:05.000000000 +0100 @@ -1,3 +1,7 @@ +2017-02-18: + * make the default indentation length dependent on the current font + * bump version to 2.1 + 2015-05-13: * control hanging indentation by \hangingindent length * control left margin by \hangingleftmargin and \labeledleftmargin lengths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hang/README new/doc/latex/hang/README --- old/doc/latex/hang/README 2015-05-13 23:33:22.000000000 +0200 +++ new/doc/latex/hang/README 2017-02-21 02:01:05.000000000 +0100 @@ -1,4 +1,4 @@ -The "hang" LaTeX package (version 2.0) +The "hang" LaTeX package (version 2.1) -------------------------------------- The "hang" package provides environments for hanging paragraphs and list items. Binary files old/doc/latex/hang/hang.pdf and new/doc/latex/hang/hang.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hang/hang.tex new/doc/latex/hang/hang.tex --- old/doc/latex/hang/hang.tex 2015-05-13 23:33:22.000000000 +0200 +++ new/doc/latex/hang/hang.tex 2017-02-21 02:01:05.000000000 +0100 @@ -16,7 +16,7 @@ \title{\textsf{hang} -- environments for hanging \\ paragraphs and list items} \author{Andreas Nolda} -\date{2015/05/13 (v.\,2.0)} +\date{2017/02/18 (v.\,2.1)} \maketitle \noindent The \textsf{hang} package provides environments for hanging paragraphs @@ -34,12 +34,11 @@ \end{hangingpar} \end{hangingexample} -\DescribeMacro{\hangingindent} In the following environments, the -indentation \meta{length} is controlled by the |\hangingindent| length, which -can be changed as follows: \begin{quote} +\DescribeMacro{\hangingindent} In the following environments, the indentation +\meta{length} defaults to |1em|. It is controlled by the |\hangingindent| +length, which can be changed as follows: \begin{quote} |\setlength{\hangingindent}{|\meta{length}|}| \end{quote} -By default, it is set to |1em|. \DescribeMacro{\hangingleftmargin} The left margin of the whole hanging paragraph or list item equals the |\hangingleftmargin| length, which defaults to Binary files old/doc/latex/hang/sample.pdf and new/doc/latex/hang/sample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hang/sample.tex new/doc/latex/hang/sample.tex --- old/doc/latex/hang/sample.tex 2015-05-13 23:33:22.000000000 +0200 +++ new/doc/latex/hang/sample.tex 2017-02-21 02:01:05.000000000 +0100 @@ -17,7 +17,7 @@ \begin{document} \title{Sample use of the \textsf{hang} package} \author{Andreas Nolda} -\date{2015/05/13} +\date{2017/02/18} \maketitle \section{Hanging paragraphs and list items} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hang.doc.tlpobj new/tlpkg/tlpobj/hang.doc.tlpobj --- old/tlpkg/tlpobj/hang.doc.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/hang.doc.tlpobj 2017-04-14 17:42:36.000000000 +0200 @@ -1,6 +1,6 @@ name hang.doc category Package -revision 37383 +revision 43280 shortdesc doc files of hang relocated 1 docfiles size=22 ++++++ hang.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hang/hang.sty new/tex/latex/hang/hang.sty --- old/tex/latex/hang/hang.sty 2015-05-13 23:33:22.000000000 +0200 +++ new/tex/latex/hang/hang.sty 2017-02-21 02:01:07.000000000 +0100 @@ -1,9 +1,9 @@ -\ProvidesPackage{hang}[2015/05/13 v2.0 Hanging paragraphs and list items] +\ProvidesPackage{hang}[2017/02/18 v2.1 Hanging paragraphs and list items] -% Copyright (C) 2015 Andreas Nolda +% Copyright (C) 2017 Andreas Nolda % Author: Andreas Nolda <andreas(a)nolda.org> -% Version: 2.0 +% Version: 2.1 % 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) @@ -15,12 +15,9 @@ \newlength{\hangingleftmargin} \newlength{\labeledleftmargin} -\setlength{\hangingindent}{1em} -\setlength{\hangingleftmargin}{\z@} -\setlength{\labeledleftmargin}{\z@} - \newenvironment{hangingpar}% - {\begin{list}{}% + {\ifnum\hangingindent=0\setlength{\hangingindent}{1em}\fi + \begin{list}{}% {\setlength{\leftmargin}{\hangingleftmargin}% \addtolength{\leftmargin}{\hangingindent}% \setlength{\itemindent}{-\hangingindent}% @@ -32,7 +29,8 @@ {\end{list}} \newenvironment{hanginglist}% - {\begin{list}{}% + {\ifnum\hangingindent=0\setlength{\hangingindent}{1em}\fi + \begin{list}{}% {\setlength{\leftmargin}{\hangingleftmargin}% \addtolength{\leftmargin}{\hangingindent}% \setlength{\itemindent}{-\hangingindent}% @@ -40,7 +38,8 @@ {\end{list}} \newenvironment{compacthang}% - {\begin{list}{}% + {\ifnum\hangingindent=0\setlength{\hangingindent}{1em}\fi + \begin{list}{}% {\setlength{\leftmargin}{\hangingleftmargin}% \addtolength{\leftmargin}{\hangingindent}% \setlength{\itemindent}{-\hangingindent}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hang.tlpobj new/tlpkg/tlpobj/hang.tlpobj --- old/tlpkg/tlpobj/hang.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/hang.tlpobj 2017-04-14 17:42:36.000000000 +0200 @@ -1,6 +1,6 @@ name hang category Package -revision 37383 +revision 43280 shortdesc Environments for hanging paragraphs and list items relocated 1 longdesc This package provides environments for hanging paragraphs and @@ -10,7 +10,7 @@ RELOC/tex/latex/hang/hang.sty catalogue-also hanging catalogue-ctan /macros/latex/contrib/hang -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-02-19 05:41:33 +0100 catalogue-license lppl1.3 catalogue-topics layout list -catalogue-version 2.0 +catalogue-version 2.1 ++++++ hanging.doc.tar.xz ++++++ ++++++ hanging.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hanging.tlpobj new/tlpkg/tlpobj/hanging.tlpobj --- old/tlpkg/tlpobj/hanging.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/hanging.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/hanging/hanging.sty catalogue-also hang catalogue-ctan /macros/latex/contrib/hanging -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.2b ++++++ hanoi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hanoi.tlpobj new/tlpkg/tlpobj/hanoi.tlpobj --- old/tlpkg/tlpobj/hanoi.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/hanoi.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/plain/hanoi/hanoi.tex catalogue-ctan /macros/plain/contrib/hanoi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics games catalogue-version 20120101 ++++++ happy4th.doc.tar.xz ++++++ ++++++ har2nat.doc.tar.xz ++++++ ++++++ har2nat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/har2nat.tlpobj new/tlpkg/tlpobj/har2nat.tlpobj --- old/tlpkg/tlpobj/har2nat.tlpobj 2016-04-14 19:06:38.000000000 +0200 +++ new/tlpkg/tlpobj/har2nat.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/har2nat/har2nat.sty catalogue-ctan /macros/latex/contrib/har2nat -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 catalogue-version 1.0 ++++++ hardwrap.doc.tar.xz ++++++ ++++++ hardwrap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hardwrap.tlpobj new/tlpkg/tlpobj/hardwrap.tlpobj --- old/tlpkg/tlpobj/hardwrap.tlpobj 2016-04-14 19:06:39.000000000 +0200 +++ new/tlpkg/tlpobj/hardwrap.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/hardwrap/hardwrap.sty catalogue-ctan /macros/latex/contrib/hardwrap -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 0.2 ++++++ harmony.doc.tar.xz ++++++ ++++++ harmony.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harmony.tlpobj new/tlpkg/tlpobj/harmony.tlpobj --- old/tlpkg/tlpobj/harmony.tlpobj 2016-04-14 19:06:39.000000000 +0200 +++ new/tlpkg/tlpobj/harmony.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=3 RELOC/tex/latex/harmony/harmony.sty catalogue-ctan /macros/latex/contrib/harmony -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics music ++++++ harnon-cv.doc.tar.xz ++++++ ++++++ harnon-cv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harnon-cv.tlpobj new/tlpkg/tlpobj/harnon-cv.tlpobj --- old/tlpkg/tlpobj/harnon-cv.tlpobj 2016-04-14 19:06:39.000000000 +0200 +++ new/tlpkg/tlpobj/harnon-cv.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/harnon-cv/harnon-cv.cls catalogue-ctan /macros/latex/contrib/harnon-cv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics cv class catalogue-version 1.0 ++++++ harpoon.doc.tar.xz ++++++ ++++++ harpoon.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harpoon.tlpobj new/tlpkg/tlpobj/harpoon.tlpobj --- old/tlpkg/tlpobj/harpoon.tlpobj 2016-04-14 19:06:39.000000000 +0200 +++ new/tlpkg/tlpobj/harpoon.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/harpoon/harpoon.sty catalogue-ctan /macros/latex/contrib/harpoon -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-symb catalogue-version 1.0 ++++++ harvard.doc.tar.xz ++++++ ++++++ harvard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harvard.tlpobj new/tlpkg/tlpobj/harvard.tlpobj --- old/tlpkg/tlpobj/harvard.tlpobj 2016-04-14 19:06:39.000000000 +0200 +++ new/tlpkg/tlpobj/harvard.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -29,7 +29,7 @@ RELOC/tex/latex/harvard/harvard.sty catalogue-also har2nat catalogue-ctan /macros/latex/contrib/harvard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty bibtex-supp catalogue-version 2.0.5 ++++++ harveyballs.doc.tar.xz ++++++ ++++++ harveyballs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harveyballs.tlpobj new/tlpkg/tlpobj/harveyballs.tlpobj --- old/tlpkg/tlpobj/harveyballs.tlpobj 2016-04-14 19:06:40.000000000 +0200 +++ new/tlpkg/tlpobj/harveyballs.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/harveyballs/harveyballs.sty catalogue-ctan /graphics/pgf/contrib/harveyballs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics graphics-symb pgf-tikz catalogue-version 1.1 ++++++ harvmac.doc.tar.xz ++++++ ++++++ harvmac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/harvmac.tlpobj new/tlpkg/tlpobj/harvmac.tlpobj --- old/tlpkg/tlpobj/harvmac.tlpobj 2016-04-14 19:06:40.000000000 +0200 +++ new/tlpkg/tlpobj/harvmac.tlpobj 2017-04-14 17:42:37.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=4 RELOC/tex/plain/harvmac/harvmac.tex catalogue-ctan /macros/plain/contrib/harvmac -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics plain-ext ++++++ hatching.doc.tar.xz ++++++ ++++++ hatching.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hatching.tlpobj new/tlpkg/tlpobj/hatching.tlpobj --- old/tlpkg/tlpobj/hatching.tlpobj 2016-04-14 19:06:40.000000000 +0200 +++ new/tlpkg/tlpobj/hatching.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/metapost/hatching/hatching.mp catalogue-ctan /graphics/metapost/contrib/macros/hatching -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-subpic catalogue-version 0.11 ++++++ hausarbeit-jura.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/README.md new/doc/latex/hausarbeit-jura/README.md --- old/doc/latex/hausarbeit-jura/README.md 2016-04-27 00:05:28.000000000 +0200 +++ new/doc/latex/hausarbeit-jura/README.md 2016-11-25 19:29:07.000000000 +0100 @@ -5,7 +5,7 @@ universities. (c) 2012-2016 Martin Sievers -Version: 1.4 +Version: 1.5 Maintainer: Martin Sievers Email: martin.sievers(a)schoenerpublizieren.de License: Released under the LaTeX Project Public License v1.3c or later @@ -29,7 +29,14 @@ ## Changelog +### 1.4 to 1.5 + +* Added ``\sectionbefore`` and ``\sectionafter`` to ``\section`` as well +* Added macros ``\spacebeforechapter``, ``\spaceafterchapter``, ``\spacebeforesection`` and ``\spaceaftersection`` +* Added option ``noautomatter`` to deactivate automatic usage of ``\frontmatter`` and ``\mainmatter`` + ### 1.3 to 1.4 + * Added macros to change paper size used in frontmatter and mainmatter (suggested by Adi Sander) * Added definition for ``\subsubsection`` * Modifed ``microtype`` options @@ -40,7 +47,6 @@ * Added option ``headlinetitlepageleft`` * Added package ``ellipsis`` - ### 1.1 to 1.2 * added option ``headline`` (thanks to Tobias Hirning) to add information to the header @@ -49,7 +55,6 @@ * rearranged package (not only) for GitHub * code cleaning and improvement - ### 1.0.1 to 1.1 * added a documentation Binary files old/doc/latex/hausarbeit-jura/hausarbeit-jura.pdf and new/doc/latex/hausarbeit-jura/hausarbeit-jura.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj new/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj --- old/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj 2016-04-27 03:17:32.000000000 +0200 +++ new/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -1,9 +1,9 @@ name hausarbeit-jura.doc category Package -revision 40774 +revision 42054 shortdesc doc files of hausarbeit-jura relocated 1 -docfiles size=84 +docfiles size=85 RELOC/doc/latex/hausarbeit-jura/README.md RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.bib RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.tex ++++++ hausarbeit-jura.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hausarbeit-jura/hausarbeit-jura.cls new/tex/latex/hausarbeit-jura/hausarbeit-jura.cls --- old/tex/latex/hausarbeit-jura/hausarbeit-jura.cls 2016-04-27 00:05:28.000000000 +0200 +++ new/tex/latex/hausarbeit-jura/hausarbeit-jura.cls 2016-11-25 19:33:51.000000000 +0100 @@ -15,7 +15,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{hausarbeit-jura} -[2016/04/25 v1.4 Eine Klasse für juristische Hausarbeiten (ao, ms)] +[2016/09/13 v1.5 Eine Klasse für juristische Hausarbeiten (ao, ms)] \RequirePackage{ifthen} \DeclareOption{american}{% \PassOptionsToPackage{american,ngerman}{babel} @@ -38,7 +38,8 @@ \DeclareOption{applemac}{\PassOptionsToPackage{applemac}{inputenc}} \newif\if@centerpagenumber \@centerpagenumberfalse -\DeclareOption{centerpagenumber}{\AtBeginDocument{\@classiclayoutfalse}}%\@centerpagenumbertrue} +\DeclareOption{centerpagenumber}{% + \AtBeginDocument{\@classiclayoutfalse}} \newif\if@texgyre \@texgyretrue \DeclareOption{texgyre}{\@texgyretrue} @@ -55,7 +56,10 @@ \newif\if@headlinetitlepageleft \@headlinetitlepageleftfalse \DeclareOption{headlinetitlepageleft}{\@headlinetitlepagelefttrue} -\ExecuteOptions{american,utf8} +\newif\if@automatter +\DeclareOption{noautomatter}{\@automatterfalse} +\DeclareOption{automatter}{\@automattertrue} +\ExecuteOptions{american,utf8,automatter} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{jurabook}} \ProcessOptions\relax @@ -221,16 +225,12 @@ \addtolength{\subfivesectiontocindent}{\subfoursectionnumwidth}% \setlength{\subsixsectiontocindent}{\subfivesectiontocindent}% \addtolength{\subsixsectiontocindent}{\subfivesectionnumwidth}% - \setlength{\subsevensectiontocindent}{\subsixsectiontocindent}% \addtolength{\subsevensectiontocindent}{\subsixsectionnumwidth}% - \setlength{\subeightsectiontocindent}{\subsevensectiontocindent}% \addtolength{\subeightsectiontocindent}{\subsevensectionnumwidth}% - \setlength{\paragraphtocindent}{\subeightsectiontocindent}% \addtolength{\paragraphtocindent}{\subeightsectionnumwidth}% - \setlength{\subparagraphtocindent}{\paragraphtocindent}% \addtolength{\subparagraphtocindent}{\jb@defaulttocindent@length}% } @@ -239,38 +239,42 @@ \renewcommand{\jb@chapter@style}{\LARGE\bfseries} \setlength{\jb@chapterafter@length}{20\p@} \setlength{\jb@chapterbefore@length}{15\p@} +\newcommand{\setspacebeforechapter}[1]{\setjbooklength{chapterbefore}{#1}} +\newcommand{\setspaceafterchapter}[1]{\setjbooklength{chapterafter}{#1}} %%% %%% Abschnitte anpassen \newlength{\sectionbefore} -\setlength{\sectionbefore}{-2ex\@plus -1ex \@minus -.2ex} +\setlength{\sectionbefore}{2ex} \newlength{\sectionafter} -\setlength{\sectionafter}{1ex \@plus .1ex} +\setlength{\sectionafter}{1ex} +\newcommand{\setspacebeforesection}[1]{\setlength{\sectionbefore}{#1}} +\newcommand{\setspaceaftersection}[1]{\setlength{\sectionafter}{#1}} \renewcommand\section{\@startsection% {section}% {1}% {\z@}% - {-2.5ex \@plus -1ex \@minus -.2ex}% - {1.7ex \(a)plus.15ex}% + {-1\sectionbefore}% + {\sectionafter}% {\normalfont\Large\bfseries}} \renewcommand\subsection{\@startsection% {subsection}% {2}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\large\bfseries}} \renewcommand{\subsubsection}{\@startsection% {subsubsection}% {3}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \renewcommand{\subthreesection}{\@startsection% {subthreesection}% {4}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsection\subthreesection @@ -278,7 +282,7 @@ {subfoursection}% {5}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsubsection\subfoursection @@ -286,7 +290,7 @@ {subfivesection}% {6}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsubsubsection\subfivesection @@ -294,7 +298,7 @@ {subsixsection}% {7}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsubsubsubsection\subsixsection @@ -302,7 +306,7 @@ {subsevensection}% {8}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsubsubsubsubsection\subsevensection @@ -310,7 +314,7 @@ {subeightsection}% {9}% {\z@}% - {\sectionbefore}% + {-1\sectionbefore}% {\sectionafter}% {\normalfont\normalsize\bfseries}} \let\subsubsubsubsubsubsubsubsection\subeightsection @@ -323,7 +327,9 @@ \fancyfootoffset[RO]{0cm}% \pagestyle{fancyplain}% \if@headline\fancyheadoffset[L]{0pt}\fi} -\AtBeginDocument{\frontmatter} +\if@automatter + \AtBeginDocument{\frontmatter}% +\fi% \let\@ORIGmainmatter\mainmatter \renewcommand\mainmatter{\@ORIGmainmatter% @@ -333,7 +339,9 @@ \fancyfootoffset[RO,RE]{0cm}% \if@headline\fancyheadoffset[L]{\marginparsep+\marginparwidth}\fi} \renewcommand{\chapter}{% - \ifnum\value{chapter}=0\mainmatter\fi% Automatisch auf Hauptteil umschalten + \if@automatter + \ifnum\value{chapter}=0\mainmatter\fi% Automatisch auf Hauptteil umschalten + \fi% \chapterlevel% \if@headline\else\jubo@thispagestyle@empty\fi% \global\@topnum\z@% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hausarbeit-jura.tlpobj new/tlpkg/tlpobj/hausarbeit-jura.tlpobj --- old/tlpkg/tlpobj/hausarbeit-jura.tlpobj 2016-04-27 03:17:32.000000000 +0200 +++ new/tlpkg/tlpobj/hausarbeit-jura.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -1,6 +1,6 @@ name hausarbeit-jura category Package -revision 40774 +revision 42054 shortdesc Class for writing "juristische Hausarbeiten" at German Universities relocated 1 longdesc The class was developed for use by students writing legal @@ -10,7 +10,7 @@ runfiles size=5 RELOC/tex/latex/hausarbeit-jura/hausarbeit-jura.cls catalogue-ctan /macros/latex/contrib/hausarbeit-jura -catalogue-date 2016-04-26 00:11:01 +0200 +catalogue-date 2016-09-13 19:51:20 +0200 catalogue-license lppl1.3 catalogue-topics legal essay class -catalogue-version 1.4 +catalogue-version 1.5 ++++++ havannah.doc.tar.xz ++++++ ++++++ havannah.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/havannah.tlpobj new/tlpkg/tlpobj/havannah.tlpobj --- old/tlpkg/tlpobj/havannah.tlpobj 2016-04-14 19:06:40.000000000 +0200 +++ new/tlpkg/tlpobj/havannah.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=3 RELOC/tex/latex/havannah/havannah.sty catalogue-ctan /macros/latex/contrib/havannah -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics games pgf-tikz ++++++ hc.doc.tar.xz ++++++ ++++++ hc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hc.tlpobj new/tlpkg/tlpobj/hc.tlpobj --- old/tlpkg/tlpobj/hc.tlpobj 2016-04-14 19:06:41.000000000 +0200 +++ new/tlpkg/tlpobj/hc.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -15,6 +15,6 @@ RELOC/tex/latex/hc/hcreport.cls RELOC/tex/latex/hc/hcslides.cls catalogue-ctan /macros/latex/contrib/hc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics class presentation letter ++++++ he-she.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/he-she/README new/doc/latex/he-she/README --- old/doc/latex/he-she/README 2013-03-05 01:32:05.000000000 +0100 +++ new/doc/latex/he-she/README 2016-11-25 19:29:07.000000000 +0100 @@ -8,7 +8,7 @@ flag to turn off xspace, and a silly option for replacing all pronouns with 'they/them/their'. -Copyright 2011,2013 by Alan Munn +Copyright 2011,2013, 2016 by Alan Munn This package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or @@ -23,4 +23,4 @@ This package consists of the file he-she.sty and documentation files he-she.tex and he-she.pdf -Version 1.1 2013/03/04 +Version 1.3 2016/06/06 Binary files old/doc/latex/he-she/he-she.pdf and new/doc/latex/he-she/he-she.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/he-she/he-she.tex new/doc/latex/he-she/he-she.tex --- old/doc/latex/he-she/he-she.tex 2013-03-05 01:32:05.000000000 +0100 +++ new/doc/latex/he-she/he-she.tex 2016-11-25 19:29:07.000000000 +0100 @@ -1,16 +1,18 @@ +% !TEX TS-program = pdflatexmk + \documentclass[11pt]{article} \title{\textbf{The \textsf{he-she} package}} \author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\Michigan State University\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}} -\date{Version 1.1\\March 4, 2013} +\date{Version 1.3\\June 6, 2016} \usepackage[T1]{fontenc} -\usepackage[margin=.7in]{geometry} +\usepackage[margin=1in,includefoot]{geometry} \usepackage{titling} \usepackage[utf8]{inputenc} \usepackage{array, booktabs, multicol, fancyhdr, xspace,tabularx} \usepackage{enumitem} \usepackage{fancyvrb,listings,url} \usepackage[sf,compact]{titlesec} -\usepackage[para]{he-she} +\usepackage[]{he-she} \usepackage{gb4e} \usepackage[colorlinks=true]{hyperref} \noautomath @@ -38,6 +40,8 @@ showstringspaces=false, breaklines=true, breakautoindent=true, + breakindent=1em, + xrightmargin=2.5em, captionpos=t language=TeX } @@ -83,7 +87,7 @@ One option that some seem to have adopted is to switch genders every time a generic pronoun is required so that the first instance of a generic would be continued with \emph{he} and the second by \emph{she}, and so on throughout a text. -It's debatable whether this is in fact a good strategy, and the present author in no way endorses it, but it was fun to write the resultant package. So, should you wish to adopt the strategy, and be in need of an automatic way to do it (which makes sense, since otherwise it would be hard to keep track of the switches) the present package is for you. +It's debatable whether this is in fact a good strategy, and I in no way endorse it, but it was fun to write the resultant package. So, should you wish to adopt the strategy, and be in need of an automatic way to do it (which makes sense, since otherwise it would be hard to keep track of the switches) the present package is for you. \section{Package Options} There are three package options, two serious, and one comic. \begin{center} @@ -100,32 +104,38 @@ \section{User commands} -The user commands are quite simple: for each pronoun case form (nominative, accusative, and genitive) there is a switching version and an anaphoric version. In the accusative, there is also a reflexive form.\footnote{In most normal use the reflexive form will only be used in its anaphoric form. I'll leave it as an exercise to the reader to figure out why; linguists in particular may have a use for the switching form, however.} Each of these has both an uppercase version and a lowercase version. The anaphoric forms can be of either gender, just to keep everyone happy. (But since the feminine accusative and genitive forms (\emph{her}) are identical, the feminine genitive macro is \pkg{\bs hir}.) There are also a couple of flags that may be of use.\bigskip +The user commands are quite simple: for each pronoun case form (nominative, accusative, and genitive determiner and genitive pronominal) there is a switching version and an anaphoric version. In the accusative, there is also a reflexive form.\footnote{In most normal use the reflexive form will only be used in its anaphoric form. I'll leave it as an exercise to the reader to figure out why; linguists in particular may have a use for the switching form, however.} Each of these has both an uppercase version and a lowercase version. The anaphoric forms can be of either gender, just to keep everyone happy. Since the feminine accusative and genitive determiner forms (\emph{her}) are identical, the feminine genitive determiner macro is |\hir|. And since the masculine genitive pronominal form is the same as the determiner form, the masculine genitive pronominal form is |\hiss|. There are also a couple of flags that may be of use.\bigskip -\begin{tabularx}{.8\textwidth}{>{\ttfamily}lX} +\noindent +\begin{tabularx}{.9\textwidth}{>{\ttfamily}l>{\ttfamily}lX} \toprule -\normalfont\textbf{Command} & \textbf{Description}\\ +\normalfont\textbf{Command} & \normalfont\textbf{Synonym} &\textbf{Description}\\ \midrule -{\bs heshe} & Outputs either \emph{he} or \emph{she} and switches gender.\\ -{\bs he} & Anaphoric \emph{he} or \emph{she} according to the current gender state.\\ -{\bs himher} & \emph{him} or \emph{her} switch.\\ -{\bs himherself} & \emph{himself} or \emph{herself} switch\\ -{\bs him} & \emph{him} or \emph{her} anaphoric.\\ -{\bs himself} & \emph{himself} or \emph{herself} anaphoric.\\ -{\bs hisher} & \emph{his} or \emph{her} switch.\\ -{\bs his} & \emph{his} or \emph{her} anaphoric.\\ -{\bs Heshe} & Uppercase version.\\ -{\bs Himher} & Uppercase version.\\ -{\bs Himherself} & Uppercase version.\\ -{\bs Hisher} & Uppercase version.\\ -{\bs He} & Uppercase version.\\ -{\bs Him} & Uppercase version.\\ -{\bs Himself} & Uppercase version.\\ -{\bs His} & Uppercase version.\\ -{\bs she,\bs her,\bs herself, \bs hir} & synonyms for the anaphoric pronouns.\\ -{\bs She,\bs Her, \bs Herself, \bs Hir} & uppercase synonyms for the anaphoric pronouns.\\ -{\bs xspacefalse} & turn off the use of \texttt{\bs xspace}.\\ -{\bs hetrue,\bs hefalse} & switches current gender state.\\ +{\bs heshe} & & Outputs either \emph{he} or \emph{she} and switches gender.\\ +{\bs he} & {\bs she} & Anaphoric \emph{he} or \emph{she} according to the current gender state.\\ +{\bs himher} & & \emph{him} or \emph{her} switch.\\ +{\bs him} & {\bs her} & \emph{him} or \emph{her} anaphoric.\\ +{\bs himherself} & & \emph{himself} or \emph{herself} switch\\ +{\bs himself} & {\bs herself} & \emph{himself} or \emph{herself} anaphoric.\\ +{\bs hisher} & & \emph{his} or \emph{her} switch.\\ +{\bs his} & {\bs hir} & \emph{his} or \emph{her} anaphoric.\\ +{\bs hishers} & & \emph{his} or \emph{hers} switch.\\ +{\bs hiss} & {\bs hers } & \emph{his} or \emph{hers} anaphoric.\\ +{\bs Heshe} & & Uppercase version.\\ +{\bs Himher} & & Uppercase version.\\ +{\bs Himherself} & & Uppercase version.\\ +{\bs Hisher} & & Uppercase version.\\ +{\bs Hishers} & & Uppercase version.\\ +{\bs He} & {\bs She} & Uppercase version.\\ +{\bs Him} & {\bs Her} & Uppercase version.\\ +{\bs Himself} & {\bs Herself} & Uppercase version.\\ +{\bs His} & {\bs Hir} & Uppercase version.\\ +{\bs Hiss} & {\bs Hers} & Uppercase version.\\ +%{\bs she,\bs her,\bs herself, \bs hers} & synonyms for the anaphoric pronouns.\\ +%{\bs She,\bs Her, \bs Herself, \bs Hers} & uppercase synonyms for the anaphoric pronouns.\\ +{\bs xspacefalse} & & turn off the use of \texttt{\bs xspace}.\\ +%{\bs hetrue,\bs hefalse} & & switches current gender state.\\ +{\bs setgender\{\}} & & takes one argument: Male/Masculine/M, Female/Feminine/F to set the current gender state.\\ \bottomrule \end{tabularx}\bigskip @@ -159,51 +169,63 @@ \end{xlist} \end{exe} -In the first example, the switching version is used throughout, yielding the gibberish of (\ref{switched}). In the second example the first instance of the pronoun uses the switching version (\pkg{\bs heshe}) (here assuming it has been already used once), but subsequent anaphoric references to the current gender are preserved using the anaphoric versions (\pkg{\bs he,\bs his} or \pkg{\bs his}). +In the first example, the switching version is used throughout, yielding the gibberish of (\ref{switched}). In the second example the first instance of the pronoun uses the switching version (|\heshe|) (here assuming it has been already used once), but subsequent anaphoric references to the current gender are preserved using the anaphoric versions (|\he,\him|, |\his| or |\hiss|). \subsection{Use of the \pkg{xspace} package} By default, the package uses the \pkg{xspace} package to insert a space automatically after the pronoun. The \pkg{xspace} package automatically checks for following punctuation and suppresses the space in these cases. However, it's not perfect, and some users might prefer not to have the space inserted automatically. They can do this by using the \pkg{[noxspace]} option. -If you are using the default settings, and encounter problems (for example, using a pronoun macro as the argument to another macro such as \pkg{\bs emph} or \pkg{\bs textbf}) will pose problems) you can temporarily suppress the insertion of the space using the boolean \pkg{\bs xspacefalse}. The examples below illustrate this. +If you are using the default settings, and encounter problems (for example, using a pronoun macro as the argument to another macro which ends in |\relax| will pose problems, as will punctuation that \pkg{xspace} doesn't know about) you can temporarily suppress the insertion of the space using the boolean |\xspacefalse|. The examples below illustrate this. +\newcommand*\mymacro[1]{#1\relax} \begin{exe} \ex\label{xspaces} \begin{xlist} \ex \begin{lstlisting} -\emph{\Heshe} will leave. +\newcommand*\mymacro[1]{#1\relax} +I will see \mymacro{\himher}. \end{lstlisting} -\ex \emph{\Heshe} will leave.\hfill(Extra space incorrectly inserted.) +\ex I will see \mymacro{\himher}.\hfill(Extra space incorrectly inserted.) \ex\begin{lstlisting} -\emph{\xspacefalse\Heshe} will leave. +\newcommand*\mymacro[1]{\xspacefalse#1\relax} +I will see \mymacro{\himher}. \end{lstlisting} -\ex \emph{\hetrue\xspacefalse\Heshe} will leave.\hfill(Extra space suppressed.) +\def\mymacro#1{\xspacefalse#1\relax} +\ex I will see \mymacro{\himher}.\hfill(Extra space suppressed.) \end{xlist} \end{exe} \subsection{Manually switching the gender state} -The booleans \pkg{\bs hetrue} and \pkg{\bs hefalse} can be used anywhere to manually change the current gender. The first use of a switching pronoun inserts a masculine pronoun and then changes the gender to feminine by setting \pkg{\bs hefalse}. This means that for an anaphoric pronoun, the form is the opposite gender to the current state of the boolean. This is best shown by some examples: +\sloppy For some purposes it might be useful to set the gender manually. For this there is the |\setgender{}| command. This command takes one argument which can be any version of |Male/Female/Masculine/Feminine/M/F|. Using the manual method might actually be practical in some cases. For example, you could set the state at the beginning of a chapter and then just use the anaphoric version of the pronouns for all generic pronouns throughout the chapter. This might be a less annoying strategy than switching pronouns constantly throughout a chapter. Another possible use for this method would be for form letters which have text which must be personalized for the gender of the addressee. + +Here are some examples. In (\ref{booleansa}) we see the gender set to F and then a switching version of the pronoun is used. This switches the gender to M. In (\ref{booleansb}), the gender is set to F and then a anaphoric pronoun is used, and its gender is also F.\footnote{This command replaces direct manipulation of the state-switching boolean which was present in older versions. Documents using these direct manipulations will still work, however.} + \begin{exe} -\ex\label{booleans} +\ex\label{booleansa} \begin{xlist} \ex \begin{lstlisting} -\Heshe will leave. +\setgender{F} \Heshe will leave. \end{lstlisting} -\ex \hefalse\Heshe will leave.\hfill(Boolean state: \pkg{\bs hetrue }) +\ex \setgender{F}\Heshe will leave.\hfill(Since gender is set to F, the switched pronoun is M) +\end{xlist} +\end{exe} +\begin{exe} +\ex\label{booleansb} +\begin{xlist} \ex\begin{lstlisting} -\hefalse \He will leave. +\setgender{F} \He will leave. \end{lstlisting} -\ex \hefalse \He will leave.\hfill(Because of \pkg{\bs hefalse} the anaphoric pronoun is masculine) +\ex \setgender{F} \He will leave.\hfill(Since gender is set to F the anaphoric pronoun is also F) \end{xlist} \end{exe} -Using the manual method might actually be practical in some cases. For example, you could set the state at the beginning of a chapter and then just use the anaphoric version of the pronouns for all generic pronouns throughout the chapter. This might be a less annoying strategy than switching pronouns constantly throughout a chapter. + \section{The \pkg{[para]} option} For some purposes it may be useful to have the genders switch every paragraph. In this case you may use the \pkg{[para]} option. With this option, every new paragraph resets the gender. In this case, as with the per chapter example just discussed, \emph{only} the anaphoric versions of the pronouns should be used in the running text. This option was added in response to another \href{http://tex.stackexchange.com/q/100108/2693}{Stack Exchange question}. \section{The \pkg{[they]} option} -When you get tired of the silliness of alternating genders, you can switch to +When you get tired of alternating genders, you can switch to this option, which will replace all of the relevant pronouns with the third -person plural pronoun form (\emph{they/them/their}). Note that for the nominative +person plural pronoun form (\emph{they/them/their/theirs}). Note that for the nominative this will cause your document to produce ungrammatical text, since there is no way to fix the subject/verb agreement. As a result, this is probably not intended to be a robust alternative! You have been warned! (And you will be if you use it too.) Here is a sample: \begin{exe} @@ -216,5 +238,6 @@ \end{xlist} \end{exe} \section{Bugs} -Feel free to report bugs if you find some. Given the low utility of the whole package, they may or may not be addressed. (Although if you really find the package useful, please let me know.) The same goes for feature requests. +Feel free to report bugs if you find some. I will try to address them as time permits. Also, if you really find the package useful, please let me know. The same goes for feature requests. + \end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/he-she.doc.tlpobj new/tlpkg/tlpobj/he-she.doc.tlpobj --- old/tlpkg/tlpobj/he-she.doc.tlpobj 2016-04-14 19:06:41.000000000 +0200 +++ new/tlpkg/tlpobj/he-she.doc.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -1,9 +1,9 @@ name he-she.doc category Package -revision 29290 +revision 41359 shortdesc doc files of he-she relocated 1 -docfiles size=54 +docfiles size=56 RELOC/doc/latex/he-she/README RELOC/doc/latex/he-she/he-she.pdf RELOC/doc/latex/he-she/he-she.tex ++++++ he-she.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/he-she/he-she.sty new/tex/latex/he-she/he-she.sty --- old/tex/latex/he-she/he-she.sty 2013-03-05 01:32:05.000000000 +0100 +++ new/tex/latex/he-she/he-she.sty 2016-11-25 19:33:51.000000000 +0100 @@ -8,7 +8,7 @@ % Includes an option to flag to turn off xspace, and a silly option for replacing % all pronouns with 'they/them/their'. % -% Copyright 2011 by Alan Munn +% Copyright 2011, 2013, 2016 by Alan Munn % % This package may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -36,9 +36,9 @@ % % Option they % -% When you get tired of the silliness of alternating genders, you can switch to +% When you get tired of of alternating genders, you can switch to % this option, which will replace all of the relevant pronouns with the third -% person plural pronoun form ('they/them/their'). Note that for the nominative +% person plural pronoun form ('they/them/their/theirs'). Note that for the nominative % this will cause your document to produce ungrammatical text, since there is % no way to fix the subject/verb agreement. % @@ -48,8 +48,16 @@ % Version history % Version 1.0 2011/02/13 Initial release. % Version 1.1 2013/03/04 Added [para] option and reflexive forms. +% Version 1.1b 2013/06/11 Fixed bug with [para] option (thanks to Enrico Gregorio) +% Version 1.2 2016/05/25 Added \hishers, \hers and \hiss commands +% (thanks to Mike Sabin for the feature request) +% Version 1.3 2016/06/06 Added a \setgender command to make choosing the gender more user friendly. +% Documentation rewritten to reflect this change. All internal macros have now been prefixed with HS@ +% User level access to the booleans is now through \setgender although the old booleans are emulated +% for backwards compatibility. +% (thanks to Sefarin James for the feature request) % -\ProvidesPackage{he-she}[2013/03/04 Semi-automatic pronoun switching with anaphora v1.1] +\ProvidesPackage{he-she}[2016/06/06 Semi-automatic pronoun switching with anaphora v1.3] \RequirePackage{xspace} \newif\ifxspace\xspacetrue \newif\ifHS@they\HS@theyfalse @@ -62,14 +70,48 @@ % \DeclareOption{para}{ \HS@paratrue - \PackageWarning{he-she}{*** WARNING: Use the `\CurrentOption` at your own risk. ***}} + \PackageWarning{he-she}{*** WARNING: Use the `\CurrentOption` at your own risk. With this option you should use *only* the anaphoric versions of the pronouns in your text. ***}} % \DeclareOption*{% \PackageWarning{he-she}{Unknown option `\CurrentOption`}% } \ProcessOptions % toggle for changing the gender -\newif\ifhe\hetrue +\newif\ifHS@he\HS@hetrue + +% macro to get first character of a token +\def\HS@getfirst#1{\HS@fstx#1\empty\empty} +\def\HS@fstx#1#2\empty{% + \edef\HS@fst{#1}} + +% macros for comparison +\def\HS@Masc{M} +\def\HS@masc{m} +\def\HS@Fem{F} +\def\HS@fem{f} + +% command to set gender (takes Male/M Female/F etc. or lowercase version of each) +% expands argument first to allow it to be a macro +\newcommand\setgender[1]{% +\edef\next{\noexpand\HS@setgender{#1}}\next} +\newcommand\HS@setgender[1]{% +\HS@getfirst{#1} +\ifx\HS@fst\HS@Masc \global\HS@hefalse + \else + \ifx\HS@fst\HS@masc \global\HS@hefalse + \else + \ifx\HS@fst\HS@Fem \global\HS@hetrue + \else + \ifx\HS@fst\HS@fem \global\HS@hetrue + \else + \global\HS@hetrue + \PackageWarning{he-she}{Invalid value for gender. Using Masculine} + \fi + \fi + \fi + \fi +} + % % \ifHS@para% @@ -86,15 +128,19 @@ \newcommand*{\Himher}{Them\ifxspace\xspace\fi} \newcommand*{\Himherself}{Themselves\ifxspace\xspace\fi} \newcommand*{\hisher}{their\ifxspace\xspace\fi} +\newcommand*{\hishers}{theirs\ifxspace\xspace\fi} \newcommand*{\Hisher}{Their\ifxspace\xspace\fi} +\newcommand*{\Hishers}{Theirs\ifxspace\xspace\fi} \newcommand*{\he}{they\ifxspace\xspace\fi} \newcommand*{\He}{They\ifxspace\xspace\fi} \newcommand*{\him}{them\ifxspace\xspace\fi} \newcommand*{\himself}{themselves\ifxspace\xspace\fi} \newcommand*{\Him}{Them\ifxspace\xspace\fi} -\newcommand*{\Him}{Themselves\ifxspace\xspace\fi} +\newcommand*{\Himself}{Themselves\ifxspace\xspace\fi} \newcommand*{\his}{their\ifxspace\xspace\fi} +\newcommand*{\hiss}{theirs\ifxspace\xspace\fi} \newcommand*{\His}{Their\ifxspace\xspace\fi} +\newcommand*{\Hiss}{Theirs\ifxspace\xspace\fi} % \else % @@ -102,21 +148,23 @@ % % Nominative lowercase switching form \heshe \newcommand*{\heshe}{% - \ifhe% + \leavevmode + \ifHS@he he% - \global\hefalse% - \else% + \global\HS@hefalse% + \else she% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi } % % Nominative lowercase anaphoric form \he \newcommand*\he{% -\ifhe% - she% - \else% + \leavevmode + \ifHS@he + she% + \else he% \fi \ifxspace\xspace\fi @@ -124,21 +172,23 @@ % % Accusative lowercase switching form \himher \newcommand*\himher{% - \ifhe% + \leavevmode + \ifHS@he him% - \global\hefalse% - \else% + \global\HS@hefalse% + \else her% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi }% % Lowercase switching reflexive form \himherself % \newcommand*\himherself{% -\ifhe% - herself% - \else% + \leavevmode + \ifHS@he + herself% + \else himself% \fi \ifxspace\xspace\fi @@ -146,9 +196,10 @@ % % Accusative lowercase anaphoric form \him \newcommand*\him{% -\ifhe% - her% - \else% + \leavevmode + \ifHS@he + her% + \else him% \fi \ifxspace\xspace\fi @@ -156,9 +207,10 @@ % Lowercase anaphoric reflexive form \himself % \newcommand*\himself{% -\ifhe% - herself% - \else% + \leavevmode + \ifHS@he + herself% + \else himself% \fi \ifxspace\xspace\fi @@ -166,21 +218,48 @@ % % Genitive lowercase switching form \hisher \newcommand*\hisher{% - \ifhe% + \leavevmode + \ifHS@he his% - \global\hefalse% - \else% + \global\HS@hefalse% + \else her% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi } % % Genitive lowercase anaphoric form \his \newcommand*\his{% -\ifhe% - her% - \else% + \leavevmode + \ifHS@he + her% + \else + his% + \fi + \ifxspace\xspace\fi +} +% +% Genitive null NP form ('The car is his/hers') +% Genitive lowercase switching form \hishers +\newcommand*\hishers{% + \leavevmode + \ifHS@he + his% + \global\HS@hefalse% + \else + hers% + \global\HS@hetrue% + \fi + \ifxspace\xspace\fi +} +% +% Genitive lowercase anaphoric form \hiss +\newcommand*\hiss{% + \leavevmode + \ifHS@he + hers% + \else his% \fi \ifxspace\xspace\fi @@ -190,21 +269,23 @@ % % Nominative uppercase switching form \Heshe \newcommand*{\Heshe}{% - \ifhe% + \leavevmode + \ifHS@he He% - \global\hefalse% - \else% + \global\HS@hefalse% + \else She% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi } % % Nominative uppercase anaphoric form \He \newcommand*\He{% -\ifhe% - She% - \else% + \leavevmode + \ifHS@he + She% + \else He% \fi \ifxspace\xspace\fi @@ -212,32 +293,35 @@ % % Accusative uppercase switching form \Himher \newcommand*\Himher{% - \ifhe% + \leavevmode + \ifHS@he Him% - \global\hefalse% - \else% + \global\HS@hefalse% + \else Her% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi }% % Uppercase switching reflexive form \Himherself % \newcommand*\Himherself{% -\ifhe% - Herself% - \else% - Himself% + \leavevmode + \ifHS@he + Herself% + \else + Himself% \fi \ifxspace\xspace\fi } % % Accusative uppercase anaphoric form \Him \newcommand*\Him{% -\ifhe% - Her% - \else% + \leavevmode + \ifHS@he + Her% + \else Him% \fi \ifxspace\xspace\fi @@ -246,9 +330,10 @@ % Uppercase anaphoric reflexive form \Himself % \newcommand*\Himself{% -\ifhe% - Herself% - \else% + \leavevmode + \ifHS@he + Herself% + \else Himself% \fi \ifxspace\xspace\fi @@ -256,26 +341,53 @@ % % Genitive uppercase switching form \Hisher \newcommand*\Hisher{% - \ifhe% + \leavevmode + \ifHS@he His% - \global\hefalse% - \else% + \global\HS@hefalse% + \else Her% - \global\hetrue% - \fi% + \global\HS@hetrue% + \fi \ifxspace\xspace\fi } % % Genitive uppercase anaphoric form \His \newcommand*\His{% -\ifhe% - Her% - \else% + \leavevmode + \ifHS@he + Her% + \else + His% + \fi + \ifxspace\xspace\fi +} +% Genitive null NP form ('The car is his/hers') +% Genitive uppercase switching form \Hishers +\newcommand*\Hishers{% + \leavevmode + \ifHS@he + His% + \global\HS@hefalse% + \else + Hers% + \global\HS@hetrue% + \fi + \ifxspace\xspace\fi +} +% +% Genitive uppercase anaphoric form \Hiss +\newcommand*\Hiss{% + \leavevmode + \ifHS@he + Hers% + \else His% \fi \ifxspace\xspace\fi } \fi +% Define synonyms \let\she\he \let\She\He \let\her\him @@ -284,4 +396,9 @@ \let\Herself\Himself \let\hir\his \let\Hir\His +\let\hers\hiss +\let\Hers\Hiss +% These for backward compatibility to previous versions +\newcommand*\hetrue{\setgender{F}} +\newcommand*\hefalse{\setgender{M}} \endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/he-she.tlpobj new/tlpkg/tlpobj/he-she.tlpobj --- old/tlpkg/tlpobj/he-she.tlpobj 2016-04-14 19:06:41.000000000 +0200 +++ new/tlpkg/tlpobj/he-she.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -1,6 +1,6 @@ name he-she category Package -revision 29290 +revision 41359 shortdesc Alternating pronouns to aid gender-neutral writing relocated 1 longdesc The package implements a version of semi-automatic pronoun @@ -8,11 +8,11 @@ longdesc prose. It has upper- and lowercase versions of switching longdesc pronouns for all case forms, plus anaphoric versions that longdesc reflect the current gender choice. -runfiles size=2 +runfiles size=3 RELOC/tex/latex/he-she/he-she.sty catalogue-also gender eemeir catalogue-ctan /macros/latex/contrib/he-she -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 -catalogue-topics linguistic typesetting -catalogue-version 1.1 +catalogue-topics typesetting +catalogue-version 1.3 ++++++ helvetic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/helvetic.tlpobj new/tlpkg/tlpobj/helvetic.tlpobj --- old/tlpkg/tlpobj/helvetic.tlpobj 2016-04-14 19:06:41.000000000 +0200 +++ new/tlpkg/tlpobj/helvetic.tlpobj 2017-04-14 17:42:38.000000000 +0200 @@ -281,6 +281,6 @@ RELOC/tex/latex/helvetic/ts1uhv.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 ++++++ hep.doc.tar.xz ++++++ ++++++ hep.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hep.tlpobj new/tlpkg/tlpobj/hep.tlpobj --- old/tlpkg/tlpobj/hep.tlpobj 2016-04-14 19:06:43.000000000 +0200 +++ new/tlpkg/tlpobj/hep.tlpobj 2017-04-14 17:42:39.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/hep/hep.sty catalogue-ctan /macros/latex/contrib/hep -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics catalogue-version 1.0 ++++++ hepnames.doc.tar.xz ++++++ ++++++ hepnames.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepnames.tlpobj new/tlpkg/tlpobj/hepnames.tlpobj --- old/tlpkg/tlpobj/hepnames.tlpobj 2016-04-14 19:06:44.000000000 +0200 +++ new/tlpkg/tlpobj/hepnames.tlpobj 2017-04-14 17:42:39.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/hepnames/hepnicenames.sty RELOC/tex/latex/hepnames/heppennames.sty catalogue-ctan /macros/latex/contrib/hepnames -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics catalogue-version 2.0 ++++++ hepparticles.doc.tar.xz ++++++ ++++++ hepparticles.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepparticles.tlpobj new/tlpkg/tlpobj/hepparticles.tlpobj --- old/tlpkg/tlpobj/hepparticles.tlpobj 2016-04-14 19:06:44.000000000 +0200 +++ new/tlpkg/tlpobj/hepparticles.tlpobj 2017-04-14 17:42:39.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/hepparticles/hepparticles.sty catalogue-also maybemath catalogue-ctan /macros/latex/contrib/hepparticles -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics catalogue-version 2.0 ++++++ hepthesis.doc.tar.xz ++++++ ++++++ hepthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepthesis.tlpobj new/tlpkg/tlpobj/hepthesis.tlpobj --- old/tlpkg/tlpobj/hepthesis.tlpobj 2016-04-14 19:06:45.000000000 +0200 +++ new/tlpkg/tlpobj/hepthesis.tlpobj 2017-04-14 17:42:39.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=7 RELOC/tex/latex/hepthesis/hepthesis.cls catalogue-ctan /macros/latex/contrib/hepthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics dissertation class catalogue-version 1.5.0 ++++++ hepunits.doc.tar.xz ++++++ ++++++ hepunits.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepunits.tlpobj new/tlpkg/tlpobj/hepunits.tlpobj --- old/tlpkg/tlpobj/hepunits.tlpobj 2016-04-14 19:06:45.000000000 +0200 +++ new/tlpkg/tlpobj/hepunits.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/hepunits/hepunits.sty catalogue-ctan /macros/latex/contrib/hepunits -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics catalogue-version 1.1.1 ++++++ here.doc.tar.xz ++++++ ++++++ here.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/here.tlpobj new/tlpkg/tlpobj/here.tlpobj --- old/tlpkg/tlpobj/here.tlpobj 2016-04-14 19:06:45.000000000 +0200 +++ new/tlpkg/tlpobj/here.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=1 RELOC/tex/latex/here/here.sty catalogue-ctan /macros/latex/contrib/here -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics float ++++++ heuristica.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/heuristica/README new/doc/fonts/heuristica/README --- old/doc/fonts/heuristica/README 2015-01-06 00:20:25.000000000 +0100 +++ new/doc/fonts/heuristica/README 2017-03-15 23:01:04.000000000 +0100 @@ -2,7 +2,10 @@ http://www.ctan.org/license/lppl1.3 for the details of that license. -Current version: 1.08 +Current version: 1.09 2017-03-14 + +Changes in version 1.09 +Added options to give the user complete control of all word-spacing parameters. Changes in version 1.08 Reversion to Panov's glyphs, version 1.0.2, so that this and future updates are easier to manage. Those wishing to use the other, newer features (e.g., small caps in all styles) should look to Erewhon, which forks from Heuristica 1.0.1. Binary files old/doc/fonts/heuristica/heuristica-doc.pdf and new/doc/fonts/heuristica/heuristica-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/heuristica/heuristica-doc.tex new/doc/fonts/heuristica/heuristica-doc.tex --- old/doc/fonts/heuristica/heuristica-doc.tex 2014-08-11 00:19:59.000000000 +0200 +++ new/doc/fonts/heuristica/heuristica-doc.tex 2017-03-15 23:01:04.000000000 +0100 @@ -6,7 +6,7 @@ \pdfmapfile{=heuristica.map} %SetFonts % heuristica+newtxmath -\usepackage[sups,osf,scaled=.92]{heuristica} +\usepackage[sups,osf,scaled=.92,space]{heuristica} \usepackage[T1]{fontenc} \usepackage{textcomp} \usepackage[varqu,varl]{zi4}% inconsolata @@ -33,8 +33,30 @@ \usepackage{zlmtt} % serifed typewriter font extending cmtt \end{verbatim} -As I find Utopia text rather cramped, I suggest applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package. - +As I find Utopia text rather cramped, I suggest applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package. Alternatively, as of version $1.09$, this package offers complete control over word-spacing by specifying the options described below. Heuristica word-spacing is governed by three quantities: +\begin{itemize} +\item +{\tt spacing} (default value {\tt .211em}), \verb|\fontdimen2| of the main text font. +\item +{\tt stretch} (default value {\tt 1.055em}), \verb|\fontdimen3| of the main text font. +\item +{\tt shrink} (default value {\tt .0703em}), \verb|\fontdimen4| of the main text font. +\end{itemize} +(Note the use of {\tt em} values rather than absolute values so that word spacing responds to scale changes.) You may modify these values individually or by setting a value for the option {\tt space} or by specifying {\tt looser} or {\tt loosest}. +\begin{itemize} +\item +Option {\tt spacing=.24em} would change the spacing from {\tt.211em} to {\tt.24em}. +\item +Option {\tt stretch=.14em} would change the stretch from {\tt.1055em} to {\tt.14em}. +\item +Option {\tt shrink=.1em} would change the shrink from {\tt.0703em} to {\tt.1em}. +\item +Option {\tt space=1.2} would multiply each word-spacing parameter by the factor {\tt1.2}. (The option {\tt space} with no value would result in a factor of {\tt 1.23}, leading to a spacing value of close to {\tt.26em}. This documentation uses option {\tt space} with no value specified.) +\item +Option {\tt looser} would change the three parameters to {\tt.25em, .125em,.1em} respectively. +\item +Option {\tt loosest} would change the three parameters to {\tt.28em, .125em,.13em} respectively. +\end{itemize} \textsc{Macros:} \begin{itemize} \item diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/heuristica.doc.tlpobj new/tlpkg/tlpobj/heuristica.doc.tlpobj --- old/tlpkg/tlpobj/heuristica.doc.tlpobj 2016-04-14 19:06:45.000000000 +0200 +++ new/tlpkg/tlpobj/heuristica.doc.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -1,9 +1,9 @@ name heuristica.doc category Package -revision 35964 +revision 43507 shortdesc doc files of heuristica relocated 1 -docfiles size=63 +docfiles size=69 RELOC/doc/fonts/heuristica/FontLog.txt RELOC/doc/fonts/heuristica/OFL-FAQ.txt RELOC/doc/fonts/heuristica/OFL.txt ++++++ heuristica.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-Inf.fd new/tex/latex/heuristica/LY1Heuristica-Inf.fd --- old/tex/latex/heuristica/LY1Heuristica-Inf.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/LY1Heuristica-Inf.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{LY1}{Heuristica-Inf}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{LY1}{Heuristica-Inf}{\Heuristica@sf} \DeclareFontShape{LY1}{Heuristica-Inf}{m}{it}{ <-> \Heuristica@@scale Heuristica-Italic-inf-ly1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-Sup.fd new/tex/latex/heuristica/LY1Heuristica-Sup.fd --- old/tex/latex/heuristica/LY1Heuristica-Sup.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/LY1Heuristica-Sup.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{LY1}{Heuristica-Sup}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{LY1}{Heuristica-Sup}{\Heuristica@sf} \DeclareFontShape{LY1}{Heuristica-Sup}{b}{it}{ <-> \Heuristica@@scale Heuristica-BoldItalic-sup-ly1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-TLF.fd new/tex/latex/heuristica/LY1Heuristica-TLF.fd --- old/tex/latex/heuristica/LY1Heuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/LY1Heuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{LY1}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{LY1}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{LY1}{Heuristica-TLF}{m}{sc}{ <-> \Heuristica@@scale Heuristica-Regular-tlf-sc-ly1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-TOsF.fd new/tex/latex/heuristica/LY1Heuristica-TOsF.fd --- old/tex/latex/heuristica/LY1Heuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/LY1Heuristica-TOsF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{LY1}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{LY1}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{LY1}{Heuristica-TOsF}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-tosf-ly1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-Inf.fd new/tex/latex/heuristica/T1Heuristica-Inf.fd --- old/tex/latex/heuristica/T1Heuristica-Inf.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T1Heuristica-Inf.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T1}{Heuristica-Inf}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T1}{Heuristica-Inf}{\Heuristica@sf} \DeclareFontShape{T1}{Heuristica-Inf}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-inf-t1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-Sup.fd new/tex/latex/heuristica/T1Heuristica-Sup.fd --- old/tex/latex/heuristica/T1Heuristica-Sup.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T1Heuristica-Sup.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T1}{Heuristica-Sup}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T1}{Heuristica-Sup}{\Heuristica@sf} \DeclareFontShape{T1}{Heuristica-Sup}{b}{it}{ <-> \Heuristica@@scale Heuristica-BoldItalic-sup-t1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-TLF.fd new/tex/latex/heuristica/T1Heuristica-TLF.fd --- old/tex/latex/heuristica/T1Heuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T1Heuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T1}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T1}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{T1}{Heuristica-TLF}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-tlf-t1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-TOsF.fd new/tex/latex/heuristica/T1Heuristica-TOsF.fd --- old/tex/latex/heuristica/T1Heuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T1Heuristica-TOsF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T1}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T1}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{T1}{Heuristica-TOsF}{b}{it}{ <-> \Heuristica@@scale Heuristica-BoldItalic-tosf-t1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-Inf.fd new/tex/latex/heuristica/T2AHeuristica-Inf.fd --- old/tex/latex/heuristica/T2AHeuristica-Inf.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2AHeuristica-Inf.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2A}{Heuristica-Inf}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2A}{Heuristica-Inf}{\Heuristica@sf} \DeclareFontShape{T2A}{Heuristica-Inf}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-inf-t2a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-Sup.fd new/tex/latex/heuristica/T2AHeuristica-Sup.fd --- old/tex/latex/heuristica/T2AHeuristica-Sup.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2AHeuristica-Sup.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2A}{Heuristica-Sup}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2A}{Heuristica-Sup}{\Heuristica@sf} \DeclareFontShape{T2A}{Heuristica-Sup}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-sup-t2a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-TLF.fd new/tex/latex/heuristica/T2AHeuristica-TLF.fd --- old/tex/latex/heuristica/T2AHeuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2AHeuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2A}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2A}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{T2A}{Heuristica-TLF}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-tlf-t2a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-TOsF.fd new/tex/latex/heuristica/T2AHeuristica-TOsF.fd --- old/tex/latex/heuristica/T2AHeuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2AHeuristica-TOsF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2A}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2A}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{T2A}{Heuristica-TOsF}{m}{sc}{ <-> \Heuristica@@scale Heuristica-Regular-tosf-sc-t2a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-Inf.fd new/tex/latex/heuristica/T2BHeuristica-Inf.fd --- old/tex/latex/heuristica/T2BHeuristica-Inf.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2BHeuristica-Inf.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2B}{Heuristica-Inf}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2B}{Heuristica-Inf}{\Heuristica@sf} \DeclareFontShape{T2B}{Heuristica-Inf}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-inf-t2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-Sup.fd new/tex/latex/heuristica/T2BHeuristica-Sup.fd --- old/tex/latex/heuristica/T2BHeuristica-Sup.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2BHeuristica-Sup.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2B}{Heuristica-Sup}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2B}{Heuristica-Sup}{\Heuristica@sf} \DeclareFontShape{T2B}{Heuristica-Sup}{m}{it}{ <-> \Heuristica@@scale Heuristica-Italic-sup-t2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-TLF.fd new/tex/latex/heuristica/T2BHeuristica-TLF.fd --- old/tex/latex/heuristica/T2BHeuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2BHeuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2B}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2B}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{T2B}{Heuristica-TLF}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-tlf-t2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-TOsF.fd new/tex/latex/heuristica/T2BHeuristica-TOsF.fd --- old/tex/latex/heuristica/T2BHeuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2BHeuristica-TOsF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2B}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2B}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{T2B}{Heuristica-TOsF}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-tosf-t2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-Inf.fd new/tex/latex/heuristica/T2CHeuristica-Inf.fd --- old/tex/latex/heuristica/T2CHeuristica-Inf.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2CHeuristica-Inf.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2C}{Heuristica-Inf}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2C}{Heuristica-Inf}{\Heuristica@sf} \DeclareFontShape{T2C}{Heuristica-Inf}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-inf-t2c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-Sup.fd new/tex/latex/heuristica/T2CHeuristica-Sup.fd --- old/tex/latex/heuristica/T2CHeuristica-Sup.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2CHeuristica-Sup.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2C}{Heuristica-Sup}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2C}{Heuristica-Sup}{\Heuristica@sf} \DeclareFontShape{T2C}{Heuristica-Sup}{b}{it}{ <-> \Heuristica@@scale Heuristica-BoldItalic-sup-t2c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-TLF.fd new/tex/latex/heuristica/T2CHeuristica-TLF.fd --- old/tex/latex/heuristica/T2CHeuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2CHeuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2C}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2C}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{T2C}{Heuristica-TLF}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-tlf-t2c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-TOsF.fd new/tex/latex/heuristica/T2CHeuristica-TOsF.fd --- old/tex/latex/heuristica/T2CHeuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/T2CHeuristica-TOsF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{T2C}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{T2C}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{T2C}{Heuristica-TOsF}{b}{n}{ <-> \Heuristica@@scale Heuristica-Bold-tosf-t2c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/TS1Heuristica-TLF.fd new/tex/latex/heuristica/TS1Heuristica-TLF.fd --- old/tex/latex/heuristica/TS1Heuristica-TLF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/TS1Heuristica-TLF.fd 2017-03-15 23:01:06.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{TS1}{Heuristica-TLF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{TS1}{Heuristica-TLF}{\Heuristica@sf} \DeclareFontShape{TS1}{Heuristica-TLF}{m}{n}{ <-> \Heuristica@@scale Heuristica-Regular-tlf-ts1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/TS1Heuristica-TOsF.fd new/tex/latex/heuristica/TS1Heuristica-TOsF.fd --- old/tex/latex/heuristica/TS1Heuristica-TOsF.fd 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/TS1Heuristica-TOsF.fd 2017-03-15 23:01:07.000000000 +0100 @@ -9,7 +9,8 @@ \edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}% \fi -\DeclareFontFamily{TS1}{Heuristica-TOsF}{} +\providecommand{\Heuristica@sf}{} +\DeclareFontFamily{TS1}{Heuristica-TOsF}{\Heuristica@sf} \DeclareFontShape{TS1}{Heuristica-TOsF}{b}{it}{ <-> \Heuristica@@scale Heuristica-BoldItalic-tosf-ts1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/heuristica.sty new/tex/latex/heuristica/heuristica.sty --- old/tex/latex/heuristica/heuristica.sty 2015-01-06 00:20:25.000000000 +0100 +++ new/tex/latex/heuristica/heuristica.sty 2017-03-15 23:01:07.000000000 +0100 @@ -1,8 +1,8 @@ %% heuristica.sty %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.08} -\def\filedate{2015/01/04} +\def\fileversion{1.09} +\def\filedate{2017/03/14} \ProvidesPackage{heuristica} [\filedate\space v\fileversion] @@ -10,41 +10,46 @@ \RequirePackage[T2A,T2B,T2C,LY1,T1]{fontenc} \RequirePackage{textcomp} +\RequirePackage{ifthen} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \RequirePackage{etoolbox} -\IfFileExists{fontaxes.sty}{ - \RequirePackage{fontaxes} - \fa@naming@exception{figures}{{superior}{proportional}}{Sup} - \fa@naming@exception{figures}{{superior}{tabular}}{Sup} - \def\sufigures{\@nomath\sufigures - \fontfigurestyle{superior}\selectfont} - \DeclareTextFontCommand{\textsu}{\sufigures} - \let\textsuperior\textsu - - \fa@naming@exception{figures}{{inferior}{proportional}}{Inf} - \fa@naming@exception{figures}{{inferior}{tabular}}{Inf} - \def\infigures{\@nomath\infigures - \fontfigurestyle{inferior}\selectfont} - \DeclareTextFontCommand{\textin}{\infigures} - \let\textinferior\textin -}{} + +\RequirePackage{fontaxes} +\fa@naming@exception{figures}{{superior}{proportional}}{Sup} +\fa@naming@exception{figures}{{superior}{tabular}}{Sup} +\def\sufigures{\@nomath\sufigures + \fontfigurestyle{superior}\selectfont} +\DeclareTextFontCommand{\textsu}{\sufigures} +\let\textsuperior\textsu + +\fa@naming@exception{figures}{{inferior}{proportional}}{Inf} +\fa@naming@exception{figures}{{inferior}{tabular}}{Inf} +\def\infigures{\@nomath\infigures + \fontfigurestyle{inferior}\selectfont} +\DeclareTextFontCommand{\textin}{\infigures} +\let\textinferior\textin + \providecommand*{\textfrac}[2]{% \textsu{#1}\kern.01em\textfractionsolidus\kern-.03em\textin{#2}} -\IfFileExists{xkeyval.sty}{ - \newcommand*{\Heuristica@scale}{1} - \RequirePackage{xkeyval} - \DeclareOptionX{scale}{\renewcommand*{\Heuristica@scale}{##1}} - \DeclareOptionX{scaled}{\renewcommand*{\Heuristica@scale}{##1}} - \DeclareOptionX{space}[1.2]{\DeclareRobustCommand{\zut@sf}{% - \fontdimen2\font=##1\fontdimen2\font}} -}{ - \let\DeclareOptionX\DeclareOption - \let\ExecuteOptionsX\ExecuteOptions - \let\ProcessOptionsX\ProcessOptions -} +\def\Heuristica(a)spc{.211em} +\def\Heuristica(a)stretch{.1055em} +\def\Heuristica(a)shrink{.0703em} +\def\Heuristica@spcf{} % a factor to multiply \fontdimen2 + +\newcommand*{\Heuristica@scale}{1} +\RequirePackage{xkeyval} +\DeclareOptionX{scale}{\renewcommand*{\Heuristica@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\Heuristica@scale}{#1}} +\DeclareOptionX{spacing}[.25em]{\gdef\Heuristica@spc{#1}} +\DeclareOptionX{stretch}[.125em]{\gdef\Heuristica@stretch{#1}} +\DeclareOptionX{shrink}[.1em]{\gdef\Heuristica@shrink{#1}} +\DeclareOptionX{space}[1.23]{\gdef\Heuristica@spcf{#1}} + \let\orig@footnote=\thefootnote \let\orig@makefnmark=\@makefnmark +\def\bfseries@rm{b} +\def\mdseries@rm{m} \newif\if@Heuristica@sups @@ -53,15 +58,25 @@ \DeclareOptionX{oldstyle}{\edef\Heuristica@figurestyle{OsF}} \DeclareOptionX{osf}{\edef\Heuristica@figurestyle{OsF}} \DeclareOptionX{tabular}{\edef\Heuristica@figurealign{T}} -\DeclareOptionX{bold}{\edef\bfseries@rm{b}} -\DeclareOptionX{regular}{\edef\mdseries@rm{m}} \DeclareOptionX{sups}{\@Heuristica@supstrue} -\ExecuteOptionsX{lining,tabular,bold,regular} +\DeclareOptionX{looser}{% +\gdef\Heuristica@spc{.25em}\gdef\Heuristica@stretch{.125em}\Heuristica@shrink{.1em}} +\DeclareOptionX{loosest}{% +\gdef\Heuristica@spc{.28em}\gdef\Heuristica@stretch{.125em}\gdef\Heuristica@shrink{.13em}} +\ExecuteOptionsX{lining,tabular} \ProcessOptionsX\relax \def\useosf{\edef\Heuristica@figurestyle{OsF}} \@onlypreamble\useosf +\ifthenelse{\equal{\Heuristica@spcf}{}}{% +\DeclareRobustCommand{\Heuristica@sf}{% + \fontdimen2\font=\Heuristica@spc + \fontdimen3\font=\Heuristica@stretch + \fontdimen4\font=\Heuristica@shrink}}{% +\DeclareRobustCommand{\Heuristica@sf}{% + \fontdimen2\font=\Heuristica@spcf\fontdimen2\font}} + \DeclareRobustCommand{\textlf}[1]{% {\fontfamily{Heuristica-TLF}\selectfont #1}% }% to get lf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/heuristica.tlpobj new/tlpkg/tlpobj/heuristica.tlpobj --- old/tlpkg/tlpobj/heuristica.tlpobj 2016-04-14 19:06:46.000000000 +0200 +++ new/tlpkg/tlpobj/heuristica.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -1,6 +1,6 @@ name heuristica category Package -revision 35964 +revision 43507 shortdesc Fonts extending Utopia, with LaTeX support files relocated 1 longdesc The fonts extend the utopia set with Cyrillic glyphs, @@ -239,7 +239,7 @@ RELOC/tex/latex/heuristica/heuristica.fontspec RELOC/tex/latex/heuristica/heuristica.sty catalogue-ctan /fonts/heuristica -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-15 06:01:43 +0100 catalogue-license ofl catalogue-topics font font-type1 font-otf font-cyrillic cyrillic -catalogue-version 1.08 +catalogue-version 1.09 ++++++ hexgame.doc.tar.xz ++++++ ++++++ hexgame.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hexgame.tlpobj new/tlpkg/tlpobj/hexgame.tlpobj --- old/tlpkg/tlpobj/hexgame.tlpobj 2016-04-14 19:06:47.000000000 +0200 +++ new/tlpkg/tlpobj/hexgame.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/hexgame/hexgame.sty catalogue-ctan /macros/latex/contrib/hexgame -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 ++++++ hf-tikz.doc.tar.xz ++++++ ++++++ hf-tikz.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hf-tikz.tlpobj new/tlpkg/tlpobj/hf-tikz.tlpobj --- old/tlpkg/tlpobj/hf-tikz.tlpobj 2016-04-14 19:06:48.000000000 +0200 +++ new/tlpkg/tlpobj/hf-tikz.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/hf-tikz/hf-tikz.sty catalogue-ctan /graphics/pgf/contrib/hf-tikz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics decoration maths presentation catalogue-version 0.3a ++++++ hfbright.doc.tar.xz ++++++ ++++++ hfbright.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hfbright.tlpobj new/tlpkg/tlpobj/hfbright.tlpobj --- old/tlpkg/tlpobj/hfbright.tlpobj 2016-04-14 19:06:48.000000000 +0200 +++ new/tlpkg/tlpobj/hfbright.tlpobj 2017-04-14 17:42:40.000000000 +0200 @@ -62,6 +62,6 @@ RELOC/fonts/type1/public/hfbright/hfsltl10.pfb RELOC/fonts/type1/public/hfbright/hftl10.pfb catalogue-ctan /fonts/ps-type1/hfbright -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-sans font-type1 ++++++ hfoldsty.doc.tar.xz ++++++ ++++++ hfoldsty.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hfoldsty.tlpobj new/tlpkg/tlpobj/hfoldsty.tlpobj --- old/tlpkg/tlpobj/hfoldsty.tlpobj 2016-04-14 19:06:49.000000000 +0200 +++ new/tlpkg/tlpobj/hfoldsty.tlpobj 2017-04-14 17:42:41.000000000 +0200 @@ -679,7 +679,7 @@ RELOC/tex/latex/hfoldsty/ts1hfott.fd RELOC/tex/latex/hfoldsty/ts1hfovtt.fd catalogue-ctan /fonts/hfoldsty -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-virtual font-supp catalogue-version 1.15 ++++++ hhtensor.doc.tar.xz ++++++ ++++++ hhtensor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hhtensor.tlpobj new/tlpkg/tlpobj/hhtensor.tlpobj --- old/tlpkg/tlpobj/hhtensor.tlpobj 2016-04-14 19:06:52.000000000 +0200 +++ new/tlpkg/tlpobj/hhtensor.tlpobj 2017-04-14 17:42:42.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/hhtensor/hhtensor.sty catalogue-ctan /macros/latex/contrib/hhtensor -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 0.61 ++++++ histogr.doc.tar.xz ++++++ ++++++ histogr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/histogr.tlpobj new/tlpkg/tlpobj/histogr.tlpobj --- old/tlpkg/tlpobj/histogr.tlpobj 2016-04-14 19:06:52.000000000 +0200 +++ new/tlpkg/tlpobj/histogr.tlpobj 2017-04-14 17:42:42.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/histogr/histogr.sty catalogue-ctan /macros/latex/contrib/histogr -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-plot catalogue-version 1.01 ++++++ historische-zeitschrift.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/historische-zeitschrift/CHANGES new/doc/latex/historische-zeitschrift/CHANGES --- old/doc/latex/historische-zeitschrift/CHANGES 2014-07-24 00:05:20.000000000 +0200 +++ new/doc/latex/historische-zeitschrift/CHANGES 2016-12-03 00:01:03.000000000 +0100 @@ -1,48 +1,50 @@ -historische-zeitschrift 2014/07/22 v1.1a -Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014 - - Version history - --------------- - -v1.1a [2014/07/22] - - This is a minor bugfix release. - - BUG FIX: The opening bracket in \ProvidesFile of - historische-zeitschrift.cbx was missing. - - README: Updated link to house style. - -v1.1 [2014/06/05] - - This is a bugfix release. - -v1.0 [2012/06/11] - - Compatible with biblatex 1.7. - - New option 'dashed' (analogue to the option provided by - the standard biblatex styles). - - @review is now supported (as an alias for @article). - -v0.9a [2010/10/18] - - Compatibility to biblatex 0.9e. - - New option 'postnote'. This option can take the values - 'inparen' and 'afterparen', where 'inparen' puts the - postnote in subsequent citations inside the parenthesis - holding the 'see note N' phrase. The default is - 'afterparen' (thus, the default behaviour has changed, - because the HZ style requires it. The style description - was wrong at this point, and I did not check properly in - the printed journal. Therefore, the biblatex style - 'historische-zeitschrift' was wrong in this particular - point. For compatibility reasons, and because it might be - useful, I turned the wrong behaviour into the option - 'postnote=inparen'). - - @reference and @inreference are now supported (as an - alias for @collection and @incollection, respectively, as - they do not require special treatment). - -v0.9 [2010/03/11] - - Compatibility to biblatex 0.9 - - The options 'doi', 'eprint' and 'url' are supported. The - defaults are 'doi=false', 'eprint=false' and 'url=true'. - - Added the file 'historische-zeitschrift.lbx' for the - handling of (German) language related issues. - -v0.8 [2008/10/20] - - Initial public release +historische-zeitschrift 2016/12/01 v1.2 +Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014-2016 + + Version history + --------------- +v1.2 [2016/12/01] + - Compatible with biblatex >3.3 (thanks to Herbert Voß) + +v1.1a [2014/07/22] + - This is a minor bugfix release. + - BUG FIX: The opening bracket in \ProvidesFile of + historische-zeitschrift.cbx was missing. + - README: Updated link to house style. + +v1.1 [2014/06/05] + - This is a bugfix release. + +v1.0 [2012/06/11] + - Compatible with biblatex 1.7. + - New option 'dashed' (analogue to the option provided by + the standard biblatex styles). + - @review is now supported (as an alias for @article). + +v0.9a [2010/10/18] + - Compatibility to biblatex 0.9e. + - New option 'postnote'. This option can take the values + 'inparen' and 'afterparen', where 'inparen' puts the + postnote in subsequent citations inside the parenthesis + holding the 'see note N' phrase. The default is + 'afterparen' (thus, the default behaviour has changed, + because the HZ style requires it. The style description + was wrong at this point, and I did not check properly in + the printed journal. Therefore, the biblatex style + 'historische-zeitschrift' was wrong in this particular + point. For compatibility reasons, and because it might be + useful, I turned the wrong behaviour into the option + 'postnote=inparen'). + - @reference and @inreference are now supported (as an + alias for @collection and @incollection, respectively, as + they do not require special treatment). + +v0.9 [2010/03/11] + - Compatibility to biblatex 0.9 + - The options 'doi', 'eprint' and 'url' are supported. The + defaults are 'doi=false', 'eprint=false' and 'url=true'. + - Added the file 'historische-zeitschrift.lbx' for the + handling of (German) language related issues. + +v0.8 [2008/10/20] + - Initial public release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/historische-zeitschrift/LIESMICH new/doc/latex/historische-zeitschrift/LIESMICH --- old/doc/latex/historische-zeitschrift/LIESMICH 2014-07-24 00:05:20.000000000 +0200 +++ new/doc/latex/historische-zeitschrift/LIESMICH 2016-12-03 00:01:03.000000000 +0100 @@ -1,107 +1,107 @@ -historische-zeitschrift 2014/07/22 v1.1a -Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014 - -************************************************************ - -Inhalt der Datei LIESMICH - 1. Kurzbeschreibung - 2. Installationshinweise - 3. Benutzung - 4. Versionsgeschichte - 5. Lizenz - 6. Dateien - - - 1. Kurzbeschreibung - ------------------- - - historische-zeitschrift ist ein Zitierstil für das - Paket biblatex von Philipp Lehman. Es bietet einen Stil - nach den Richtlinien der 'Historischen Zeitschrift'. Das - Schema ist ein Vollzitat für die erste Zitation und 'Autor, - Kurztitel (wie Anm. N), S' für alle folgenden Zitationen - (wobei S für die Seitenzahl steht). Für weitere Details des - Stils sehen Sie sich bitte die Richtlinien unter - http://194.97.159.218/verlag/historische-zeitschrift/hz-richtlinien.htm - an. - - Dieses Paket baut vollständig auf biblatex auf; achten Sie - auch auf die Mindestanforderungen von biblatex selbst. - Anregungen und Verbesserungsvorschläge sind jederzeit - willkommen. - - - 2. Installationshinweise - ------------------------ - - historische-zeitschrift ist in den Distributionen MiKTeX - und TeX Live enthalten und kann mit deren Paketmanagern - bequem installiert werden. Wenn Sie stattdessen eine - manuelle Installation durchführen, so gehen Sie wie folgt - vor: Entpacken Sie die zip-Datei in den $LOCALTEXMF-Ordner - ihres Systems. Aktualisieren Sie anschließend die 'filename - database' ihrer TeX-Distribution. Für weitere Informationen - schauen Sie bitte in die Dokumentation Ihrer Distribution. - - - 3. Benutzung - ------------ - - Der hier angebotene Zitierstil wird wie die Standard- - Stile beim Laden des Pakets biblatex eingebunden: - \usepackage[style=historische-zeitschrift]{biblatex} - Beachten Sie, dass der Stil für Zitate in Fußnoten gedacht - ist. Zitierkommandos außerhalb von Fußnoten führen immer zu - Vollzitaten! - - Die zusätzliche Option 'postnote=inparen' bietet die - Möglichkeit, die Seitenzahl bei Folgezitaten auch innerhalb - der Klammer auszugeben, also - Autor, Kurztitel (wie Anm. N, S) - Die Voreinstellung ist 'postnote=afterparen', also - Autor, Kurztitel (wie Anm. N), S - - Die Option 'dashed' - Analog zu den Standard-Stilen von biblatex wird die Option - 'dashed' zur Verfügung gestellt. Bei 'dashed=true' werden - wiederkehrende Autoren/Herausgeber in der Bibliographie - durch einen langen Strich ersetzt. Mit 'dashed=false' - wird diese Funktion ausgeschaltet, dann erscheinen immer - die Namen der Autoren/Herausgeber. Die Standardeinstellung - ist 'dashed=true'. - - - 4. Versionsgeschichte - --------------------- - - siehe Datei CHANGES - - - 5. Lizenz - --------- - - Dieses Werk darf nach den Bedingungen der LaTeX Project - Public Lizenz, entweder Version 1.3 oder (nach Ihrer Wahl) - jede spaetere Version, verteilt und/oder verändert werden. - Die neueste Version dieser Lizenz finden Sie unter - http://www.latex-project.org/lppl.txt. Version 1.3 (oder - eine neuere) ist Teil aller Verteilungen von LaTeX - Version 2005/12/01 oder spaeter. - - Dieses Werk hat den LPPL-Betreuungs-Status 'maintained' - (betreut). - - Der aktuelle Betreuer dieses Werkes ist Dominik Waßenhoven. - - - 6. Dateien - ---------- - - Dieses Werk (bzw. Paket) besteht aus folgenden Dateien: - - * LIESMICH % diese Datei, inkl. Lizenz - * README % diese Datei in englisch - * CHANGES % Versionsgeschichte (englisch) - * historische-zeitschrift.bbx % Bibliographiestil - * historische-zeitschrift.cbx % Zitierstil - * historische-zeitschrift.lbx % Sprachdatei +historische-zeitschrift 2016/12/01 v1.2 +Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014-2016 + +************************************************************ + +Inhalt der Datei LIESMICH + 1. Kurzbeschreibung + 2. Installationshinweise + 3. Benutzung + 4. Versionsgeschichte + 5. Lizenz + 6. Dateien + + + 1. Kurzbeschreibung + ------------------- + + historische-zeitschrift ist ein Zitierstil für das + Paket biblatex von Philipp Lehman. Es bietet einen Stil + nach den Richtlinien der 'Historischen Zeitschrift'. Das + Schema ist ein Vollzitat für die erste Zitation und 'Autor, + Kurztitel (wie Anm. N), S' für alle folgenden Zitationen + (wobei S für die Seitenzahl steht). Für weitere Details des + Stils sehen Sie sich bitte die Richtlinien unter + http://194.97.159.218/verlag/historische-zeitschrift/hz-richtlinien.htm + an. + + Dieses Paket baut vollständig auf biblatex auf; achten Sie + auch auf die Mindestanforderungen von biblatex selbst. + Anregungen und Verbesserungsvorschläge sind jederzeit + willkommen. + + + 2. Installationshinweise + ------------------------ + + historische-zeitschrift ist in den Distributionen MiKTeX + und TeX Live enthalten und kann mit deren Paketmanagern + bequem installiert werden. Wenn Sie stattdessen eine + manuelle Installation durchführen, so gehen Sie wie folgt + vor: Entpacken Sie die zip-Datei in den $LOCALTEXMF-Ordner + ihres Systems. Aktualisieren Sie anschließend die 'filename + database' ihrer TeX-Distribution. Für weitere Informationen + schauen Sie bitte in die Dokumentation Ihrer Distribution. + + + 3. Benutzung + ------------ + + Der hier angebotene Zitierstil wird wie die Standard- + Stile beim Laden des Pakets biblatex eingebunden: + \usepackage[style=historische-zeitschrift]{biblatex} + Beachten Sie, dass der Stil für Zitate in Fußnoten gedacht + ist. Zitierkommandos außerhalb von Fußnoten führen immer zu + Vollzitaten! + + Die zusätzliche Option 'postnote=inparen' bietet die + Möglichkeit, die Seitenzahl bei Folgezitaten auch innerhalb + der Klammer auszugeben, also + Autor, Kurztitel (wie Anm. N, S) + Die Voreinstellung ist 'postnote=afterparen', also + Autor, Kurztitel (wie Anm. N), S + + Die Option 'dashed' + Analog zu den Standard-Stilen von biblatex wird die Option + 'dashed' zur Verfügung gestellt. Bei 'dashed=true' werden + wiederkehrende Autoren/Herausgeber in der Bibliographie + durch einen langen Strich ersetzt. Mit 'dashed=false' + wird diese Funktion ausgeschaltet, dann erscheinen immer + die Namen der Autoren/Herausgeber. Die Standardeinstellung + ist 'dashed=true'. + + + 4. Versionsgeschichte + --------------------- + + siehe Datei CHANGES + + + 5. Lizenz + --------- + + Dieses Werk darf nach den Bedingungen der LaTeX Project + Public Lizenz, entweder Version 1.3 oder (nach Ihrer Wahl) + jede spaetere Version, verteilt und/oder verändert werden. + Die neueste Version dieser Lizenz finden Sie unter + http://www.latex-project.org/lppl.txt. Version 1.3 (oder + eine neuere) ist Teil aller Verteilungen von LaTeX + Version 2005/12/01 oder spaeter. + + Dieses Werk hat den LPPL-Betreuungs-Status 'maintained' + (betreut). + + Der aktuelle Betreuer dieses Werkes ist Dominik Waßenhoven. + + + 6. Dateien + ---------- + + Dieses Werk (bzw. Paket) besteht aus folgenden Dateien: + + * LIESMICH % diese Datei, inkl. Lizenz + * README % diese Datei in englisch + * CHANGES % Versionsgeschichte (englisch) + * historische-zeitschrift.bbx % Bibliographiestil + * historische-zeitschrift.cbx % Zitierstil + * historische-zeitschrift.lbx % Sprachdatei diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/historische-zeitschrift/README new/doc/latex/historische-zeitschrift/README --- old/doc/latex/historische-zeitschrift/README 2014-07-24 00:05:20.000000000 +0200 +++ new/doc/latex/historische-zeitschrift/README 2016-12-03 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -historische-zeitschrift 2014/07/22 v1.1a -Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014 +historische-zeitschrift 2016/12/01 v1.2 +Copyright (c) Dominik Waßenhoven <domwass(at)web.de>, 2014-2016 ************************************************************ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/historische-zeitschrift.doc.tlpobj new/tlpkg/tlpobj/historische-zeitschrift.doc.tlpobj --- old/tlpkg/tlpobj/historische-zeitschrift.doc.tlpobj 2016-04-14 19:06:52.000000000 +0200 +++ new/tlpkg/tlpobj/historische-zeitschrift.doc.tlpobj 2017-04-14 17:42:42.000000000 +0200 @@ -1,6 +1,6 @@ name historische-zeitschrift.doc category Package -revision 34703 +revision 42635 shortdesc doc files of historische-zeitschrift relocated 1 docfiles size=3 ++++++ historische-zeitschrift.tar.xz ++++++ ++++ 2399 lines of diff (skipped)

1 0

commit texlive-specs-j 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-j for openSUSE:Factory checked in at 2017-06-25 19:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-j (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-j" Sun Jun 25 19:22:01 2017 rev:26 rq:504800 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-j/texlive-specs-j.changes 2017-06-08 14:54:52.227890352 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-j.new/texlive-specs-j.changes 2017-06-25 19:26:18.608865101 +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: ---- fontspec_emph.dif gfsbodoni.doc.tar.xz gfsbodoni.tar.xz gfscomplutum.doc.tar.xz gfscomplutum.tar.xz gfsdidot.doc.tar.xz gfsdidot.tar.xz gfsneohellenic.doc.tar.xz gfsneohellenic.tar.xz gfsporson.doc.tar.xz gfsporson.tar.xz gfssolomos.doc.tar.xz gfssolomos.tar.xz ghab.doc.tar.xz ghab.tar.xz ghsystem.doc.tar.xz ghsystem.tar.xz gillcm.doc.tar.xz gillcm.tar.xz gillius.doc.tar.xz gillius.tar.xz gincltex.doc.tar.xz gincltex.tar.xz ginpenc.doc.tar.xz ginpenc.tar.xz gitinfo.doc.tar.xz gitinfo.tar.xz gitinfo2.doc.tar.xz gitinfo2.tar.xz gitlog.doc.tar.xz gitlog.tar.xz gloss-occitan.doc.tar.xz gloss-occitan.tar.xz gloss.doc.tar.xz gloss.tar.xz glossaries-danish.doc.tar.xz glossaries-danish.tar.xz glossaries-dutch.doc.tar.xz glossaries-dutch.tar.xz glossaries-english.doc.tar.xz glossaries-english.tar.xz glossaries-extra.doc.tar.xz glossaries-extra.tar.xz glossaries-french.doc.tar.xz glossaries-french.tar.xz glossaries-german.doc.tar.xz glossaries-german.tar.xz glossaries-irish.doc.tar.xz glossaries-irish.tar.xz glossaries-italian.doc.tar.xz glossaries-italian.tar.xz glossaries-magyar.doc.tar.xz glossaries-magyar.tar.xz glossaries-polish.doc.tar.xz glossaries-polish.tar.xz glossaries-portuges.doc.tar.xz glossaries-portuges.tar.xz glossaries.doc.tar.xz glossaries.tar.xz New: ---- fixltxhyph.doc.tar.xz fixltxhyph.tar.xz fixme.doc.tar.xz fixme.tar.xz fixmetodonotes.doc.tar.xz fixmetodonotes.tar.xz fixpdfmag.tar.xz fjodor.doc.tar.xz fjodor.tar.xz flabels.doc.tar.xz flabels.tar.xz flacards.doc.tar.xz flacards.tar.xz flagderiv.doc.tar.xz flagderiv.tar.xz flashcards.doc.tar.xz flashcards.tar.xz flashmovie.doc.tar.xz flashmovie.tar.xz flipbook.doc.tar.xz flipbook.tar.xz flippdf.doc.tar.xz flippdf.tar.xz float.doc.tar.xz float.tar.xz floatrow.doc.tar.xz floatrow.tar.xz flowchart.doc.tar.xz flowchart.tar.xz flowfram.doc.tar.xz flowfram.tar.xz fltpoint.doc.tar.xz fltpoint.tar.xz fmp.doc.tar.xz fmp.tar.xz fmtcount.doc.tar.xz fmtcount.tar.xz fn2end.doc.tar.xz fn2end.tar.xz fnbreak.doc.tar.xz fnbreak.tar.xz fncychap.doc.tar.xz fncychap.tar.xz fncylab.doc.tar.xz fncylab.tar.xz fnpara.doc.tar.xz fnpara.tar.xz fnpct.doc.tar.xz fnpct.tar.xz fnspe.doc.tar.xz fnspe.tar.xz fntproof.doc.tar.xz fntproof.tar.xz fnumprint.doc.tar.xz fnumprint.tar.xz foekfont.doc.tar.xz foekfont.tar.xz footmisx.doc.tar.xz footmisx.tar.xz forest-quickstart.doc.tar.xz formation-latex-ul.source.tar.xz frederika2016.doc.tar.xz frederika2016.tar.xz fvextra.doc.tar.xz fvextra.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-j.spec ++++++ ++++ 23671 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-j/texlive-specs-j.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-j.new/texlive-specs-j.spec ++++++ glossaries-portuges.doc.tar.xz -> flacards.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/COPYING new/doc/latex/flacards/COPYING --- old/doc/latex/flacards/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/COPYING 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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/flacards/README new/doc/latex/flacards/README --- old/doc/latex/flacards/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/README 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,23 @@ +flacards class + +V 0.1.1b +==================== + + +Class for typesetting flashcards. It will produce several user-defined +cards per page with front- and backside. You can put associated pieces +of information on each side like vocabularies. + + +Changelog: + +see changelog.txt + +User Manual: + +see flacards.pdf + +Licence: + +See COPYING for License. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/README.TEXLIVE new/doc/latex/flacards/README.TEXLIVE --- old/doc/latex/flacards/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/README.TEXLIVE 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,7 @@ +The following files have been removed in the TeX Live installation of +the current package, typically due to duplication, lack of space, or +missing source code. You can find these files on CTAN at + http://mirror.ctan.org/macros/latex/contrib/flacards +If questions or concerns, email tex-live(a)tug.org. + + flacards.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/changelog.txt new/doc/latex/flacards/changelog.txt --- old/doc/latex/flacards/changelog.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/changelog.txt 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,13 @@ + Changelog: + + 0.1.1b: + - bug fix: option backgrid showed word 'true' in output. + + 0.1.1: + - bug fix: front side content also printed on back side + - updated examples + - improved/advanced interface for card layout + + 0.1: + - file creation + Binary files old/doc/latex/flacards/flacards_ex.pdf and new/doc/latex/flacards/flacards_ex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/flacards_ex.tex new/doc/latex/flacards/flacards_ex.tex --- old/doc/latex/flacards/flacards_ex.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/flacards_ex.tex 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,53 @@ +% This file is part of flacards. +% +% Flacards 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. +% +% Flacards 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 Foobar; if not, write to the Free Software +% Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +% +% + + +\documentclass[a4paper,frontgrid]{flacards} +\usepackage{ngerman} + +\usepackage{color} + +\fboxsep=0pt + +\renewcommand{\fchead}{\colorbox{red}{\small\sffamily\bfseries\textcolor{white}{\parbox{\cardwidth}{\vskip3pt\centering Deutsch\vskip4pt}}}} +\renewcommand{\bchead}{\colorbox{blue}{\small\sffamily\bfseries\textcolor{white}{\parbox{\cardwidth}{\vskip3pt\centering English\vskip3pt}}}} + +\renewcommand{\frfoot}{\footnotesize\thecardno\hskip3pt\smallskip} % change layout for left foot on front +\renewcommand{\brfoot}{\footnotesize\thecardno\hskip3pt\smallskip} % change layout for left foot on front + +% You can define head and foot elements using \flhead, \fchead and \frhead for right, center and right head on frontside, +% \flfoot, \fcfoot, \flfoot for footline on frontside. Analogical use \blhead, \bchead, \brhead, \blfoot, \bcfoot and +% \frfoot for backside. + + + +%\renewcommand{\cardtextstyleb}{\flushright} +\begin{document} +\pagesetup{2}{4} % 3x8 cards +\renewcommand{\flfoot}{\hskip3pt\footnotesize Lektion 1\smallskip} % change layout for left foot on front +\card{gehen\\schlafen}{to go/to walk\\to sleep} +\card{hell, klar}{bright} +\card{mit\\ohne}{with\\without} +\card{Lernkarte}{flashcard} +\card{Wasser}{water} +\card{Saft}{juice} +\card{Fenster}{window} +\card{Linie}{line} +\card{und\\oder}{and\\or} +\card{Regen}{rain} +\end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/flacards_ex1.tex new/doc/latex/flacards/flacards_ex1.tex --- old/doc/latex/flacards/flacards_ex1.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/flacards_ex1.tex 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,14 @@ +\documentclass[frontgrid,backgrid]{flacards} + +\begin{document} +\card{gehen\\schlafen}{to go/to walk\\to sleep} +\card{hell, klar}{bright} +\card{mit\\ohne}{with\\without} +\card{Lernkarte}{flashcard} +\card{Wasser}{water} +\card{Saft}{juice} +\card{Fenster}{window} +\card{Linie}{line} +\card{und\\oder}{and\\or} +\card{Regen}{rain} +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flacards/flacards_ex2.tex new/doc/latex/flacards/flacards_ex2.tex --- old/doc/latex/flacards/flacards_ex2.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/flacards/flacards_ex2.tex 2016-11-25 19:28:54.000000000 +0100 @@ -0,0 +1,71 @@ +\documentclass[a4paper,frontgrid]{flacards} +\usepackage{color} + +% redefining center head on frontside +\renewcommand{\fchead}{% + \vskip-3pt\fboxsep=0pt% + \colorbox{red}{% + \small\sffamily\bfseries\textcolor{white}{% + \parbox{\cardwidth}{\vskip3pt\centering Deutsch\vskip4pt}% + }% + }% +} + +% redefining center head on backside +\renewcommand{\bchead}{% + \vskip-3pt\fboxsep=0pt% + \colorbox{blue}{% + \small\sffamily\bfseries\textcolor{white}{% + \parbox{\cardwidth}{\vskip3pt\centering Espa\~nol\vskip4pt} + }% + }% +} + +% redefining default text style for front side +\renewcommand{\cardtextstylef}{\bfseries} + + +% You can define head and foot elements using \flhead, \fchead +% and \frhead for right, center and right head on frontside, +% \flfoot, \fcfoot, \flfoot for footline on frontside. +% Analogical use \blhead, \bchead, \brhead, \blfoot, \bcfoot +% and \frfoot for backside. + +\begin{document} +% 2x4 cards per page +\pagesetup{2}{4} + +% change layout for left foot on front +\renewcommand{\flfoot}{\footnotesize Grammatik} + +\card{Conjugation (pret\'erito imperfecto, regular)} +{\begin{tabular}{l|ll} + & cocin{\bfseries ar} & viv{\bfseries ir}\\ +\noalign{\hrule height 1pt}%------------------------------------------ +yo & cocin{\bfseries aba} & viv{\bfseries \'ia}\\ +t\'u & cocin{\bfseries abas} & viv{\bfseries \'ias}\\ +usted, ella, \'el & cocin{\bfseries aba} & viv{\bfseries \'ia}\\ +nosotros/-as & cocin{\bfseries \'abamos} & viv{\bfseries \'iamos}\\ +vosotros/-as & cocin{\bfseries abais} & viv{\bfseries \'iais}\\ +ustedes, ellos/-as& cocin{\bfseries aban} & viv{\bfseries \'ian}\\ +\end{tabular} +} + +\card{Conjugation (pret\'erito imperfecto, irregular)} +{\begin{tabular}{l|lll} + & ser & ir & ver\\ +\noalign{\hrule height 1pt}%------------------------ +yo & era & iba & ve\'ia\\ +t\'u & eras & ibas & ve\'ias\\ +usted, ella, \'el & era & iba & ve\'ia\\ +nosotros/-as & \'eramos & \'ibamos & ve\'iamos\\ +vosotros/-as & erais & ibais & ve\'iais\\ +ustedes, ellos/-as& eran & iban & ve\'ian\\ +\end{tabular} +} + +\renewcommand{\flfoot}{\footnotesize Vokabeln} +\card{gehen}{ir} +\card{sein}{ser/estar} +\card{Land}{pais, {\em m}} +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/glossaries-portuges/README new/doc/latex/glossaries-portuges/README --- old/doc/latex/glossaries-portuges/README 2015-01-16 00:24:34.000000000 +0100 +++ new/doc/latex/glossaries-portuges/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -Portuguese Language Module for glossaries Package -version 1.1 2015-01-15 - -Status: unmaintained -If you want to volunteer to take over maintenance of this -language module use the contact form at www.dickimaw-books.com/contact.html - -To install: copy *.ldf and *.dict to - -TEXMF/tex/latex/glossaries-portuges/ - -where TEXMF is the texmf root directory. - -The glossaries package will automatically load this module if it is -required. - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 -for the details of that license. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/glossaries-portuges/glossaries-dictionary-Brazilian.dict new/doc/latex/glossaries-portuges/glossaries-dictionary-Brazilian.dict --- old/doc/latex/glossaries-portuges/glossaries-dictionary-Brazilian.dict 2015-01-16 00:24:34.000000000 +0100 +++ new/doc/latex/glossaries-portuges/glossaries-dictionary-Brazilian.dict 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -%% -%% This is file `glossaries-dictionary-Brazilian.dict', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries-portuges.dtx (with options: `glossaries-dictionary-Brazilian.dict,package') -%% -%% glossaries-portuges.dtx -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (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 `unmaintained'. -%% -%% The Current Maintainer of this work is unknown. -%% If you want to volunteer to take over as maintainer, please -%% send a message using the form at www.dickimaw-books.com/contact.html -%% -%% This work consists of the files glossaries-portuges.dtx and glossaries-portuges.ins and the derived files glossaries-portuges-noenc.ldf, glossaries-portuges-utf8.ldf, glossaries-portuges.ldf, glossaries-pt-BR.ldf, glossaries-dictionary-Brazilian.dict. -%% -%% \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 \~} -\ProvidesDictionary{glossaries-dictionary}{Brazilian} - -\providetranslation{Glossary}{Gloss\'ario} -\providetranslation{Acronyms}{Siglas} -\providetranslation{Notation (glossaries)}{Nota\c c\~ao} -\providetranslation{Description (glossaries)}{Descri\c c\~ao} -\providetranslation{Symbol (glossaries)}{S\'imbolo} -\providetranslation{Page List (glossaries)}{Lista de P\'aginas} -\providetranslation{Symbols (glossaries)}{S\'imbolos} -\providetranslation{Numbers (glossaries)}{N\'umeros} -\endinput -%% -%% End of file `glossaries-dictionary-Brazilian.dict'. Binary files old/doc/latex/glossaries-portuges/glossaries-portuges.pdf and new/doc/latex/glossaries-portuges/glossaries-portuges.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flacards.doc.tlpobj new/tlpkg/tlpobj/flacards.doc.tlpobj --- old/tlpkg/tlpobj/flacards.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/flacards.doc.tlpobj 2017-04-14 17:40:43.000000000 +0200 @@ -0,0 +1,14 @@ +name flacards.doc +category Package +revision 19440 +shortdesc doc files of flacards +relocated 1 +docfiles size=17 + RELOC/doc/latex/flacards/COPYING + RELOC/doc/latex/flacards/README + RELOC/doc/latex/flacards/README.TEXLIVE + RELOC/doc/latex/flacards/changelog.txt + RELOC/doc/latex/flacards/flacards_ex.pdf + RELOC/doc/latex/flacards/flacards_ex.tex + RELOC/doc/latex/flacards/flacards_ex1.tex + RELOC/doc/latex/flacards/flacards_ex2.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-portuges.doc.tlpobj new/tlpkg/tlpobj/glossaries-portuges.doc.tlpobj --- old/tlpkg/tlpobj/glossaries-portuges.doc.tlpobj 2016-04-14 19:05:01.000000000 +0200 +++ new/tlpkg/tlpobj/glossaries-portuges.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -name glossaries-portuges.doc -category Package -revision 36064 -shortdesc doc files of glossaries-portuges -relocated 1 -docfiles size=42 - RELOC/doc/latex/glossaries-portuges/README - RELOC/doc/latex/glossaries-portuges/glossaries-dictionary-Brazilian.dict - RELOC/doc/latex/glossaries-portuges/glossaries-portuges.pdf ++++++ glossaries-portuges.tar.xz -> flacards.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/flacards/flacards.cls new/tex/latex/flacards/flacards.cls --- old/tex/latex/flacards/flacards.cls 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/flacards/flacards.cls 2016-11-25 19:33:48.000000000 +0100 @@ -0,0 +1,183 @@ +% This file is part of flacards. +% +% Flacards 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. +% +% Flacards 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 Foobar; if not, write to the Free Software +% Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +% +% +% Klasse f�r Lernkarten +% class for flashcards +% +% Version 0.1 2005/11/16 +% Norbert Stuhrmann +% +% Changelog: +% +% 0.1.1: +% - bug fix: front side content also printed on back side +% - updated examples +% - improved/advanced interface for card layout +% +% 0.1: +% - file creation +% + +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{flacards}[2005/11/06 Klasse fuer Lernkarten/Class for flashcards] + + +\DeclareOption{frontgrid}{\def\fc@frontgrid{true}} +\DeclareOption{backgrid}{\def\fc@backgrid{true}} + +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} +\ProcessOptions +\LoadClass[twoside]{article} + +%TODO: margin managment +\RequirePackage[noheadfoot, margin=1cm, outer=1cm, inner=1cm]{geometry} + +\pagestyle{empty} + +% TODO: replace +\newcommand*{\fc@strippt}[1]{% + \strip@pt#1}% + +\newcounter{cardno}\setcounter{cardno}{0} +\newcount\cardperpage +\newdimen\cardwidth +\newdimen\cardheight + + +\newcommand{\fc@boxcontent}[2]{% +\parindent=0pt% +{\cardbox{#1}{#2}}% +} + +\newcommand{\cardbox}[2]{% +\vbox{% +\vskip\fboxsep% +\hbox{% +\hskip\fboxsep% +{\advance\cardheight by -2\fboxsep +\vbox to \cardheight {% +\hsize=\cardwidth\advance\hsize by -2\fboxsep% +{\cardinnerbox{#1}{#2}}}% +}\hskip\fboxsep}}% +} + +\newcommand{\cardinnerbox}[2]{% + \sloppy% + %\smash% + {% + \makebox[0pt][l]{\parbox[t]{\cardwidth}{\raggedright\csname #1lhead\endcsname}}\hfill% + \makebox[0pt][c]{\parbox[t]{\cardwidth}{\centering\csname #1chead\endcsname}}\hfill% + \makebox[0pt][r]{\parbox[t]{\cardwidth}{\raggedleft\csname #1rhead\endcsname}}% + }% + \vfill% + {\cardtext{#1}{#2}} + \vfill% + %\smash% + {% + \makebox[0pt][l]{\parbox[b]{\cardwidth}{\raggedright\csname #1lfoot\endcsname}}\hfill% + \makebox[0pt][c]{\parbox[b]{\cardwidth}{\centering\csname #1cfoot\endcsname}}\hfill% + \makebox[0pt][r]{\parbox[b]{\cardwidth}{\raggedleft\csname #1rfoot\endcsname}}% + }% +} + +\newcommand{\cardtext}[2]{% +\centering{\csname cardtextstyle#1\endcsname #2\\}% +} + +\newcommand{\cardtextstylef}{% +\itshape} + +\newcommand{\cardtextstyleb}{% +\itshape} + +%% front +\newsavebox\front +\setbox\front=\vbox{} +% layout +\newcommand{\flhead}{}\newcommand{\fchead}{}\newcommand{\frhead}{} +\newcommand{\flfoot}{}\newcommand{\fcfoot}{}\newcommand{\frfoot}{} + +%% back +\newsavebox\back +\setbox\back=\vbox{} +% layout +\newcommand{\blhead}{}\newcommand{\bchead}{}\newcommand{\brhead}{} +\newcommand{\blfoot}{}\newcommand{\bcfoot}{}\newcommand{\brfoot}{} + +\renewcommand{\frfoot}{\footnotesize \thecardno} +\renewcommand{\brfoot}{\footnotesize \thecardno} + +\newcommand{\pagesetup}[2]{% +\def\rowsperpage{#2}\relax% +\def\colsperpage{#1}\relax% +\cardwidth=\textwidth\relax% +\cardheight=\textheight\relax% +\divide\cardwidth by \colsperpage% +\divide\cardheight by \rowsperpage% +\cardperpage=\colsperpage\relax% +\multiply\cardperpage by \rowsperpage\relax% +} + +\newcommand{\card}[2]{% +\@tempcnta=-\thecardno\divide\@tempcnta by \cardperpage\multiply\@tempcnta by \cardperpage\advance\@tempcnta by \thecardno\relax% +\@tempcntb=\@tempcnta% +\count@=\@tempcnta\relax% +\divide\count@ by \colsperpage\relax% +\@tempcnta=\count@\relax% +\multiply\count@ by \colsperpage\relax% +\advance\@tempcntb by -\count@\relax% +\stepcounter{cardno}% +\unitlength=1pt% +\advance\@tempcnta by 1\relax% +\@tempdima=\cardheight\relax% +\@tempdimb=\cardwidth\relax% +\advance\@tempdima by \fboxrule\relax% +\advance\@tempdimb by \fboxrule\relax% +\multiply\@tempdima by \@tempcnta\relax% +\multiply\@tempdimb by \@tempcntb\relax% +\advance\@tempdima by -\baselineskip\relax% +\setbox\front=\vbox{\unvbox\front% +\noindent\begin{picture}(0,0)% +\put(\fc@strippt\@tempdimb,-\fc@strippt\@tempdima){% +\ifdefined\fc@frontgrid\framebox(\fc@strippt\cardwidth,\fc@strippt\cardheight)[t]{\fc@boxcontent{f}{#1}} +\else\makebox(\fc@strippt\cardwidth,\fc@strippt\cardheight)[t]{\fc@boxcontent{f}{#1}}% +\fi +}% +\end{picture}% +}% +\setbox\back=\vbox{\unvbox\back% +\noindent\begin{picture}(0,0)% +\multiply\@tempdimb by -1\relax% +\advance\@tempdimb by \textwidth\relax% +\advance\@tempdimb by -\cardwidth\relax% +\put(\fc@strippt\@tempdimb,-\fc@strippt\@tempdima){% +\ifdefined\fc@backgrid\framebox(\fc@strippt\cardwidth,\fc@strippt\cardheight)[t]{\fc@boxcontent{b}{#2}}% +\else\makebox(\fc@strippt\cardwidth,\fc@strippt\cardheight)[t]{\fc@boxcontent{b}{#2}}% +\fi% +}% +\end{picture}% +}% +\count@=\thecardno\divide\count@ by \cardperpage\multiply\count@ by \cardperpage\advance\count@ by -\thecardno\relax% +\ifnum \count@=0\relax% +\noindent\box\front\newpage\box\back\newpage% +\else\fi +} + +\AtEndDocument{\box\front\newpage\box\back} + +% Default layout +\pagesetup{3}{8} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/glossaries-portuges/glossaries-portuges-noenc.ldf new/tex/latex/glossaries-portuges/glossaries-portuges-noenc.ldf --- old/tex/latex/glossaries-portuges/glossaries-portuges-noenc.ldf 2015-01-16 00:24:34.000000000 +0100 +++ new/tex/latex/glossaries-portuges/glossaries-portuges-noenc.ldf 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -%% -%% This is file `glossaries-portuges-noenc.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries-portuges.dtx (with options: `glossaries-portuges-noenc.ldf,package') -%% -%% glossaries-portuges.dtx -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (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 `unmaintained'. -%% -%% The Current Maintainer of this work is unknown. -%% If you want to volunteer to take over as maintainer, please -%% send a message using the form at www.dickimaw-books.com/contact.html -%% -%% This work consists of the files glossaries-portuges.dtx and glossaries-portuges.ins and the derived files glossaries-portuges-noenc.ldf, glossaries-portuges-utf8.ldf, glossaries-portuges.ldf, glossaries-pt-BR.ldf, glossaries-dictionary-Brazilian.dict. -%% -%% \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 \~} -\@ifpackageloaded{polyglossia}% -{% - \newcommand*{\glossariescaptionsportuges}{% - \renewcommand*{\glossaryname}{\textportuges{Gloss\'ario}}% - \renewcommand*{\acronymname}{\textportuges{Siglas}}% - \renewcommand*{\entryname}{\textportuges{Nota\c c\~ao}}% - \renewcommand*{\descriptionname}{\textportuges{Descri\c c\~ao}}% - \renewcommand*{\symbolname}{\textportuges{S\'imbolo}}% - \renewcommand*{\pagelistname}{\textportuges{Lista de P\'aginas}}% - \renewcommand*{\glssymbolsgroupname}{\textportuges{S\'imbolos}}% - \renewcommand*{\glsnumbersgroupname}{\textportuges{N\'umeros}}% - }% -} -{% - \newcommand*{\glossariescaptionsportuges}{% - \renewcommand*{\glossaryname}{Gloss\'ario}% - \renewcommand*{\acronymname}{Siglas}% - \renewcommand*{\entryname}{Nota\c c\~ao}% - \renewcommand*{\descriptionname}{Descri\c c\~ao}% - \renewcommand*{\symbolname}{S\'imbolo}% - \renewcommand*{\pagelistname}{Lista de P\'aginas}% - \renewcommand*{\glssymbolsgroupname}{S\'imbolos}% - \renewcommand*{\glsnumbersgroupname}{N\'umeros}% - }% -} -\endinput -%% -%% End of file `glossaries-portuges-noenc.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/glossaries-portuges/glossaries-portuges-utf8.ldf new/tex/latex/glossaries-portuges/glossaries-portuges-utf8.ldf --- old/tex/latex/glossaries-portuges/glossaries-portuges-utf8.ldf 2015-01-16 00:24:34.000000000 +0100 +++ new/tex/latex/glossaries-portuges/glossaries-portuges-utf8.ldf 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -%% -%% This is file `glossaries-portuges-utf8.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries-portuges.dtx (with options: `glossaries-portuges-utf8.ldf,package') -%% -%% glossaries-portuges.dtx -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (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 `unmaintained'. -%% -%% The Current Maintainer of this work is unknown. -%% If you want to volunteer to take over as maintainer, please -%% send a message using the form at www.dickimaw-books.com/contact.html -%% -%% This work consists of the files glossaries-portuges.dtx and glossaries-portuges.ins and the derived files glossaries-portuges-noenc.ldf, glossaries-portuges-utf8.ldf, glossaries-portuges.ldf, glossaries-pt-BR.ldf, glossaries-dictionary-Brazilian.dict. -%% -%% \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 \~} -\@ifpackageloaded{polyglossia}% -{% - \newcommand*{\glossariescaptionsportuges}{% - \renewcommand*{\glossaryname}{\textportuges{Glossário}}% - \renewcommand*{\acronymname}{\textportuges{Siglas}}% - \renewcommand*{\entryname}{\textportuges{Notação}}% - \renewcommand*{\descriptionname}{\textportuges{Descrição}}% - \renewcommand*{\symbolname}{\textportuges{Símbolo}}% - \renewcommand*{\pagelistname}{\textportuges{Lista de Páginas}}% - \renewcommand*{\glssymbolsgroupname}{\textportuges{Símbolos}}% - \renewcommand*{\glsnumbersgroupname}{\textportuges{Números}}% - }% -} -{% - \newcommand*{\glossariescaptionsportuges}{% - \renewcommand*{\glossaryname}{Glossário}% - \renewcommand*{\acronymname}{Siglas}% - \renewcommand*{\entryname}{Notação}% - \renewcommand*{\descriptionname}{Descrição}% - \renewcommand*{\symbolname}{Símbolo}% - \renewcommand*{\pagelistname}{Lista de Páginas}% - \renewcommand*{\glssymbolsgroupname}{Símbolos}% - \renewcommand*{\glsnumbersgroupname}{Números}% - }% -} -\endinput -%% -%% End of file `glossaries-portuges-utf8.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/glossaries-portuges/glossaries-portuges.ldf new/tex/latex/glossaries-portuges/glossaries-portuges.ldf --- old/tex/latex/glossaries-portuges/glossaries-portuges.ldf 2015-01-16 00:24:34.000000000 +0100 +++ new/tex/latex/glossaries-portuges/glossaries-portuges.ldf 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -%% -%% This is file `glossaries-portuges.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries-portuges.dtx (with options: `glossaries-portuges.ldf,package') -%% -%% glossaries-portuges.dtx -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (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 `unmaintained'. -%% -%% The Current Maintainer of this work is unknown. -%% If you want to volunteer to take over as maintainer, please -%% send a message using the form at www.dickimaw-books.com/contact.html -%% -%% This work consists of the files glossaries-portuges.dtx and glossaries-portuges.ins and the derived files glossaries-portuges-noenc.ldf, glossaries-portuges-utf8.ldf, glossaries-portuges.ldf, glossaries-pt-BR.ldf, glossaries-dictionary-Brazilian.dict. -%% -%% \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 \~} -\ProvidesGlossariesLang{portuges}[2014/11/23 v1.0] - -\glsifusedtranslatordict{Portuguese}% -{% - \addglossarytocaptions{\CurrentTrackedLanguage}% - \addglossarytocaptions{\CurrentTrackedDialect}% -} -{% - \ifdefstring{\inputencodingname}{utf8} - {\input{glossaries-portuges-utf8.ldf}}% - {% - \ifdef{\XeTeXinputencoding}% XeTeX defaults to UTF-8 - {\input{glossaries-portuges-utf8.ldf}}% - {\input{glossaries-portuges-noenc.ldf}} - } - \ifcsdef{captions\CurrentTrackedDialect} - {% - \csappto{captions\CurrentTrackedDialect}% - {% - \glossariescaptionsportuges - }% - }% - {% - \ifcsdef{captions\CurrentTrackedLanguage} - { - \csappto{captions\CurrentTrackedLanguage}% - {% - \glossariescaptionsportuges - }% - }% - {% - }% - }% - \glossariescaptionsportuges -} -\renewcommand*{\glspluralsuffix}{s} -\renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} -\renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} -\endinput -%% -%% End of file `glossaries-portuges.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/glossaries-portuges/glossaries-pt-BR.ldf new/tex/latex/glossaries-portuges/glossaries-pt-BR.ldf --- old/tex/latex/glossaries-portuges/glossaries-pt-BR.ldf 2015-01-16 00:24:34.000000000 +0100 +++ new/tex/latex/glossaries-portuges/glossaries-pt-BR.ldf 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -%% -%% This is file `glossaries-pt-BR.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% glossaries-portuges.dtx (with options: `glossaries-pt-BR.ldf,package') -%% -%% glossaries-portuges.dtx -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (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 `unmaintained'. -%% -%% The Current Maintainer of this work is unknown. -%% If you want to volunteer to take over as maintainer, please -%% send a message using the form at www.dickimaw-books.com/contact.html -%% -%% This work consists of the files glossaries-portuges.dtx and glossaries-portuges.ins and the derived files glossaries-portuges-noenc.ldf, glossaries-portuges-utf8.ldf, glossaries-portuges.ldf, glossaries-pt-BR.ldf, glossaries-dictionary-Brazilian.dict. -%% -%% \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 \~} -\ProvidesGlossariesLang{pt-BR}[2014/11/23 v1.0] - -\glsifusedtranslatordict{Brazilian} -{% - \addglossarytocaptions{\CurrentTrackedLanguage}% - \addglossarytocaptions{\CurrentTrackedDialect}% -} -{% - \ifdefstring{\inputencodingname}{utf8} - {\input{glossaries-portuges-utf8.ldf}}% - {% - \ifdef{\XeTeXinputencoding}% XeTeX defaults to UTF-8 - {\input{glossaries-portuges-utf8.ldf}}% - {\input{glossaries-portuges-noenc.ldf}} - } - \ifcsdef{captions\CurrentTrackedDialect} - {% - \csappto{captions\CurrentTrackedDialect}% - {% - \glossariescaptionsportuges - }% - }% - {% - \ifcsdef{captions\CurrentTrackedLanguage} - { - \csappto{captions\CurrentTrackedLanguage}% - {% - \glossariescaptionsportuges - }% - }% - {% - }% - }% - \glossariescaptionsportuges -} -\renewcommand*{\glspluralsuffix}{s} -\renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix} -\renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}} -\endinput -%% -%% End of file `glossaries-pt-BR.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flacards.tlpobj new/tlpkg/tlpobj/flacards.tlpobj --- old/tlpkg/tlpobj/flacards.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/flacards.tlpobj 2017-04-14 17:40:43.000000000 +0200 @@ -0,0 +1,16 @@ +name flacards +category Package +revision 19440 +shortdesc Generate flashcards for printing +relocated 1 +longdesc The flacards class provides an easy interface to produce +longdesc flashcards. It will print several cards per page, on both sides +longdesc of the paper. +runfiles size=2 + RELOC/tex/latex/flacards/flacards.cls +catalogue-also flashcard flashcards +catalogue-ctan /macros/latex/contrib/flacards +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license gpl +catalogue-topics card-flash class +catalogue-version 0.1.1b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-portuges.tlpobj new/tlpkg/tlpobj/glossaries-portuges.tlpobj --- old/tlpkg/tlpobj/glossaries-portuges.tlpobj 2016-04-14 19:05:01.000000000 +0200 +++ new/tlpkg/tlpobj/glossaries-portuges.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -name glossaries-portuges -category Package -revision 36064 -shortdesc Portuges language module for glossaries package -relocated 1 -longdesc Portuges language module for glossaries package. -runfiles size=4 - RELOC/tex/latex/glossaries-portuges/glossaries-portuges-noenc.ldf - RELOC/tex/latex/glossaries-portuges/glossaries-portuges-utf8.ldf - RELOC/tex/latex/glossaries-portuges/glossaries-portuges.ldf - RELOC/tex/latex/glossaries-portuges/glossaries-pt-BR.ldf -catalogue-ctan /macros/latex/contrib/glossaries-portuges -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl1.3 -catalogue-topics glossary -catalogue-version 1.1 ++++++ gfsneohellenic.doc.tar.xz -> fn2end.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/OFL-FAQ.txt new/doc/fonts/gfsneohellenic/OFL-FAQ.txt --- old/doc/fonts/gfsneohellenic/OFL-FAQ.txt 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,225 +0,0 @@ -OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL) -Version 1.1 - 26 February 2007 -(See http://scripts.sil.org/OFL for updates) - - -1 ABOUT USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL - -1.1 Can I use the fonts in any publication, even embedded in the file? -Yes. You may use them like most other fonts, but unlike some fonts you may include an embedded subset of the fonts in your document. Such use does not require you to include this license or other files (listed in OFL condition 2), nor does it require any type of acknowledgement within the publication. Some mention of the font name within the publication information (such as in a colophon) is usually appreciated. If you wish to include the complete font as a separate file, you should distribute the full font package, including all existing acknowledgements, and comply with the OFL conditions. Of course, referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL. - -1.2 Can I make web pages using these fonts? -Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. - -1.3 Can I make the fonts available to others from my web site? -Yes, as long as you meet the conditions of the license (do not sell by itself, include the necessary files, rename Modified Versions, do not abuse the Author(s)' name(s) and do not sublicense). - -1.4 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions? -Yes! Fonts licensed under the OFL can be freely aggregated with software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are much more useful aggregated to than merged with existing software, possible incompatibility with existing software licenses is not a problem. You can also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distro CD/DVDs and online repositories. - -1.5 I want to distribute the fonts with my program. Does this mean my program also has to be free and open source software? -No. Only the portions based on the font software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well. - -1.6 Can I include the fonts on a CD of freeware or commercial fonts? -Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself. - -1.7 Can I sell a software package that includes these fonts? -Yes, you can do this with both the Original Version and a Modified Version. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, edutainment software, etc. - -1.8 Why won't the OFL let me sell the fonts alone? -The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honor and respect their contribution! - -1.9 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions? -Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgment section. Please consider using the Original Versions of the fonts whenever possible. - -1.10 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement? -The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a gray area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not. - - -2 ABOUT MODIFYING OFL LICENSED FONTS - -2.1 Can I change the fonts? Are there any limitations to what things I can and cannot change? -You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could add additional information into it that covers your contribution. - -2.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine? -Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license. - -2.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font? -Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package. - -2.4 Can I pay someone to enhance the fonts for my use and distribution? -Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefitted from the contributions of others. - -2.5 I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use? -No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefitted from the contributions of others. - -2.6 Do I have to make any derivative fonts (including source files, build scripts, documentation, etc.) publicly available? -No, but please do share your improvements with others. You may find that you receive more than what you gave in return. - -2.7 Why can't I use the Reserved Font Name(s) in my derivative font names? I'd like people to know where the design came from. -The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Name(s) ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. Keep in mind that the Copyright Holder(s) can allow a specific trusted partner to use Reserved Font Name(s) through a separate written agreement. - -2.8 What do you mean by "primary name as presented to the user"? Are you referring to the font menu name? -Yes, the requirement to change the visible name used to differentiate the font from others applies to the font menu name and other mechanisms to specify a font in a document. It would be fine, for example, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement; see section 2.7). Users who install derivatives ("Modified Versions") on their systems should not see any of the original names ("Reserved Font Names") in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake a font for another and so expect features only another derivative or the Original Version can actually offer. Ultimately, creating name conflicts will cause many problems for the users as well as for the designer of both the Original and Modified versions, so please think ahead and find a good name for your own derivative. Font substitution systems like fontconfig, or application-level font fallback configuration within OpenOffice.org or Scribus, will also get very confused if the name of the font they are configured to substitute to actually refers to another physical font on the user's hard drive. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. The substitution mechanism itself is outside the scope of the license. Users can always manually change a font reference in a document or set up some kind of substitution at a higher level but at the lower level the fonts themselves have to respect the Reserved Font Name(s) requirement to prevent ambiguity. If a substitution is currently active the user should be aware of it. - -2.9 Am I not allowed to use any part of the Reserved Font Names? -You may not use the words of the font names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute. - -2.10 So what should I, as an author, identify as Reserved Font Names? -Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". - -2.11 Do I, as an author, have to identify any Reserved Font Names? -No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified versions. You may, however, give certain trusted parties the right to use any of your Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion. - -2.12 Are any names (such as the main font name) reserved by default? -No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s). - -2.13 What is this FONTLOG thing exactly? -It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge the authors and other contributors. Please use it! See below for details on how changes should be noted. - -2.14 Am I required to update the FONTLOG? -No, but users, designers and other developers might get very frustrated at you if you don't! People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. - - -3 ABOUT THE FONTLOG - -The FONTLOG can take a variety of formats, but should include these four sections: - -3.1 FONTLOG for <FontFamilyName> -This file provides detailed information on the <FontFamilyName> font software. This information should be distributed along with the <FontFamilyName> fonts and any derivative works. - -3.2 Basic Font Information -(Here is where you would describe the purpose and brief specifications for the font project, and where users can find more detailed documentation. It can also include references to how changes can be contributed back to the Original Version. You may also wish to include a short guide to the design, or a reference to such a document.) - -3.3 ChangeLog -(This should list both major and minor changes, most recent first. Here are some examples:) - -7 February 2007 (Pat Johnson) <NewFontFamilyName> Version 1.3 -- Added Greek and Cyrillic glyphs -- Released as "<NewFontFamilyName>" - -7 March 2006 (Fred Foobar) <NewFontFamilyName> Version 1.2 -- Tweaked contextual behaviours -- Released as "<NewFontFamilyName>" - -1 Feb 2005 (Jane Doe) <NewFontFamilyName> Version 1.1 -- Improved build script performance and verbosity -- Extended the smart code documentation -- Corrected minor typos in the documentation -- Fixed position of combining inverted breve below (U+032F) -- Added OpenType/Graphite smart code for Armenian -- Added Armenian glyphs (U+0531 -> U+0587) -- Released as "<NewFontFamilyName>" - -1 Jan 2005 (Joe Smith) <FontFamilyName> Version 1.0 -- Initial release of font "<FontFamilyName>" - -3.4 Acknowledgements -(Here is where contributors can be acknowledged. - -If you make modifications be sure to add your name (N), email (E), web-address (W) and description (D). This list is sorted by last name in alphabetical order.) - -N: Jane Doe -E: jane(a)university.edu -W: http://art.university.edu/projects/fonts -D: Contributor - Armenian glyphs and code - -N: Fred Foobar -E: fred(a)foobar.org -W: http://foobar.org -D: Contributor - misc Graphite fixes - -N: Pat Johnson -E: pat(a)fontstudio.org -W: http://pat.fontstudio.org -D: Designer - Greek & Cyrillic glyphs based on Roman design - -N: Tom Parker -E: tom(a)company.com -W: http://www.company.com/tom/projects/fonts -D: Engineer - original smart font code - -N: Joe Smith -E: joe(a)fontstudio.org -W: http://joe.fontstudio.org -D: Designer - original Roman glyphs - -(Original authors can also include information here about their organization.) - - -4 ABOUT MAKING CONTRIBUTIONS - -4.1 Why should I contribute my changes back to the original authors? -It would benefit many people if you contributed back to what you've received. Providing your contributions and improvements to the fonts and other components (data files, source code, build scripts, documentation, etc.) could be a tremendous help and would encourage others to contribute as well and 'give back', which means you will have an opportunity to benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute. - -4.2 I've made some very nice improvements to the font, will you consider adopting them and putting them into future Original Versions? -Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes (the use of smart source revision control systems like subversion, svk or bzr is a good idea). Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. - -4.3 How can I financially support the development of OFL fonts? -It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version. - - -5 ABOUT THE LICENSE - -5.1 I see that this is version 1.1 of the license. Will there be later changes? -Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL. - -5.2 Can I use the SIL Open Font License for my own fonts? -Yes! We heartily encourage anyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. Some additional information about using the OFL is included at the end of this FAQ. - -5.3 Does this license restrict the rights of the Copyright Holder(s)? -No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this. - -5.4 Is the OFL a contract or a license? -The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license. - -5.5 How about translating the license and the FAQ into other languages? -SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and this FAQ better in their own language. Making the license very clear and readable is a key goal of the OFL. - -If you are an experienced translator, you are very welcome to help by translating the OFL and its FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems. - -We give permission to publish unofficial translations into other languages provided that they comply with the following guidelines: - -- put the following disclaimer in both English and the target language stating clearly that the translation is unofficial: - -"This is an unofficial translation of the SIL Open Font License into $language. It was not published by SIL International, and does not legally state the distribution terms for fonts that use the OFL. A release under the OFL is only valid when using the original English text. - -However, we recognize that this unofficial translation will help users and designers not familiar with English to understand the SIL OFL better and make it easier to use and release font families under this collaborative font design model. We encourage designers who consider releasing their creation under the OFL to read the FAQ in their own language if it is available. - -Please go to http://scripts.sil.org/OFL for the official version of the license and the accompanying FAQ." - -- keep your unofficial translation current and update it at our request if needed, for example if there is any ambiguity which could lead to confusion. - -If you start such a unofficial translation effort of the OFL and its accompanying FAQ please let us know, thank you. - - -6 ABOUT SIL INTERNATIONAL - -6.1 Who is SIL International and what does it do? -SIL International is a worldwide faith-based education and development organization (NGO) that studies, documents, and assists in developing the world's lesser-known languages through literacy, linguistics, translation, and other academic disciplines. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment. - -6.2 What does this have to do with font licensing? -The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack) so SIL developed the SIL Open Font License with the help of the FLOSS community. - -6.3 How can I contact SIL? -Our main web site is: http://www.sil.org/ -Our site about complex scripts is: http://scripts.sil.org/ -Information about this license (including contact email information) is at: http://scripts.sil.org/OFL - - -7 ABOUT USING THE OFL FOR YOUR ORIGINAL FONTS - -If you want to release your fonts under the OFL, you only need to do the following: - -7.1 Put your copyright and reserved font names information in the beginning of the main OFL file. -7.2 Put your copyright and the OFL references in your various font files (such as in the copyright, license and description fields) and in your other components (build scripts, glyph databases, documentation, rendering samples, etc). -7.3 Write an initial FONTLOG for your font and include it in the release package. -7.4 Include the OFL in your release package. -7.5 We also highly recommend you include the relevant practical documentation on the license by putting the OFL-FAQ in your package. -7.6 If you wish, you can use the OFL Graphics on your web page. - - - -That's all. If you have any more questions please get in touch with us. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/OFL.txt new/doc/fonts/gfsneohellenic/OFL.txt --- old/doc/fonts/gfsneohellenic/OFL.txt 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/OFL.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -Copyright (c) 2007, Greek Font Society (www.greekfontsociety.org | gfs(a)greekfontsociety.org), -with Reserved Font Name 'GFS Neohellenic'. - - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/README new/doc/fonts/gfsneohellenic/README --- old/doc/fonts/gfsneohellenic/README 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ - --------- GFS NeoHellenic for LaTeX ------------- - - -A. Tsolomitis - -Laboratory of Digital Typography -and Mathematical Software -University of the Aegean -Department of Mathematics -83200 Karlovassi, Samos -Greece. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/README.TEXLIVE new/doc/fonts/gfsneohellenic/README.TEXLIVE --- old/doc/fonts/gfsneohellenic/README.TEXLIVE 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -The following files have been removed in the TeX Live installation of -the current package, typically due to duplication, lack of space, or -missing source code. You can find these files on CTAN at - http://mirror.ctan.org/fonts/greek/gfs/gfsneohellenic -If questions or concerns, email tex-live(a)tug.org. - - GFSNeohellenic-Guide-for-LaTeX.pdf - NeohellenicSpecimen.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/VERSION new/doc/fonts/gfsneohellenic/VERSION --- old/doc/fonts/gfsneohellenic/VERSION 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GFSNeoHellenic for LaTeX. Version 1.01, 12 May 2006 Binary files old/doc/latex/fn2end/fn2end.pdf and new/doc/latex/fn2end/fn2end.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fn2end/fn2end.tex new/doc/latex/fn2end/fn2end.tex --- old/doc/latex/fn2end/fn2end.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/fn2end/fn2end.tex 2016-11-25 19:28:55.000000000 +0100 @@ -0,0 +1,91 @@ +\documentclass{article} +\newcommand{\cs}[1]{\mbox{\tt\bs#1}}% for control sequences +\newcommand{\bs}{\char '134 } % A backslash character for \tt font +\newcommand{\file}[1]{\mbox{\tt #1}} + +\title{The {\tt fn2end.sty} style} +\author{KC Border} +\date{May 31, 1995} + +\begin{document} +\maketitle + +The \file{fn2end.sty} package converts footnotes into +end notes, where a lot of publishers want them. It +does so by redefining the action of the \cs{footnote} +command. Instead of putting footnotes at the bottom +of the page, the notes are written to a file with +extension \file{end}, whence they may be retrieved +when desired. To handle footnotes on the title page +flexibly, \cs{footnote} is not redefined until the +\cs{makeendnotes} command is issued. Place the +command \cs{theendnotes} where you want the notes +to appear: after the last footnote, usually right +before the bibliography. The \cs{theendotes} command +merely \cs{inputs} the \file{end} file, it does {\em +not} create a new section or a new page. If you do +create a notes section with the \cs{section} command, +you should follow it with an \cs{indent} command. +Otherwise, the first note will be the only note that +does not start with an indented paragraph. + +There are now user renewable commands. The length +\cs{noteskip} is the space between the note number +and the start of the note text. By default it is 1 +em. Change its value with the \cs{setlength} command. +You can use \cs{renewcommand} to change +\cs{notenumberformat}, which formats the note number. +By default it is defined as +\begin{verbatim} + \newcommand{\notenumberformat}[1]{$#1$} +\end{verbatim} +If you want the end note numbers to appear as +superscripts with periods, you could +\begin{verbatim} + \renewcommand{\notenumberformat}[1]{${}^{#1.}$} +\end{verbatim} + +Successive \cs{makeendnotes} commands overwrite the +notes file. This is a feature, not a bug. For +example: +\begin{verbatim} + \makeendnotes + + \chapter{One} + blah + \section*{Notes}\indent + \theendnotes + + \makeendnotes + + \chapter{Two} + blah + \section*{Notes}\indent + \theendnotes +\end{verbatim} +etc, can be used to put notes at the end of each +chapter. (This is perverse because it makes the +notes nearly impossible to find, but some publishers +like it.) + +Additionally, \cs{restorefootnotes} restores the +normal behavior of footnotes, so that if you really +wanted to, you could have a title page for each +chapter with acknowledgment footnotes on the bottom, +and thereafter have end notes for the rest of the +material in the chapter. + + +{\em Bug}: Since \verb#\# is catcoded to 12 for +verbatim copying, if your footnote's text contains +an unequal number of \verb#\{#'s and \verb#\}#'s, +for instance, if you have a \verb#\left\{# balanced +by a \verb#\right.#, then \TeX\ believes you have +unmatched braces and does not figure out where the +argument of the \cs{footnote} command ends. (Believe +it or not, this happened to me the first time I +tried to use the style.) +{\em Workaround}: Use \verb#\lbrace# and \verb#\rbrace# +in your footnotes instead of \verb#\{# and \verb#\}#. + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fn2end.doc.tlpobj new/tlpkg/tlpobj/fn2end.doc.tlpobj --- old/tlpkg/tlpobj/fn2end.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/fn2end.doc.tlpobj 2017-04-14 17:40:47.000000000 +0200 @@ -0,0 +1,8 @@ +name fn2end.doc +category Package +revision 15878 +shortdesc doc files of fn2end +relocated 1 +docfiles size=8 + RELOC/doc/latex/fn2end/fn2end.pdf + RELOC/doc/latex/fn2end/fn2end.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj --- old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 2016-04-14 19:04:38.000000000 +0200 +++ new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -name gfsneohellenic.doc -category Package -revision 31979 -shortdesc doc files of gfsneohellenic -relocated 1 -docfiles size=11 - RELOC/doc/fonts/gfsneohellenic/OFL-FAQ.txt - RELOC/doc/fonts/gfsneohellenic/OFL.txt - RELOC/doc/fonts/gfsneohellenic/README - RELOC/doc/fonts/gfsneohellenic/README.TEXLIVE - RELOC/doc/fonts/gfsneohellenic/VERSION ++++++ gfsneohellenic.doc.tar.xz -> fn2end.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/OFL-FAQ.txt new/doc/fonts/gfsneohellenic/OFL-FAQ.txt --- old/doc/fonts/gfsneohellenic/OFL-FAQ.txt 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,225 +0,0 @@ -OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL) -Version 1.1 - 26 February 2007 -(See http://scripts.sil.org/OFL for updates) - - -1 ABOUT USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL - -1.1 Can I use the fonts in any publication, even embedded in the file? -Yes. You may use them like most other fonts, but unlike some fonts you may include an embedded subset of the fonts in your document. Such use does not require you to include this license or other files (listed in OFL condition 2), nor does it require any type of acknowledgement within the publication. Some mention of the font name within the publication information (such as in a colophon) is usually appreciated. If you wish to include the complete font as a separate file, you should distribute the full font package, including all existing acknowledgements, and comply with the OFL conditions. Of course, referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL. - -1.2 Can I make web pages using these fonts? -Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. - -1.3 Can I make the fonts available to others from my web site? -Yes, as long as you meet the conditions of the license (do not sell by itself, include the necessary files, rename Modified Versions, do not abuse the Author(s)' name(s) and do not sublicense). - -1.4 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions? -Yes! Fonts licensed under the OFL can be freely aggregated with software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are much more useful aggregated to than merged with existing software, possible incompatibility with existing software licenses is not a problem. You can also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distro CD/DVDs and online repositories. - -1.5 I want to distribute the fonts with my program. Does this mean my program also has to be free and open source software? -No. Only the portions based on the font software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well. - -1.6 Can I include the fonts on a CD of freeware or commercial fonts? -Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself. - -1.7 Can I sell a software package that includes these fonts? -Yes, you can do this with both the Original Version and a Modified Version. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, edutainment software, etc. - -1.8 Why won't the OFL let me sell the fonts alone? -The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honor and respect their contribution! - -1.9 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions? -Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgment section. Please consider using the Original Versions of the fonts whenever possible. - -1.10 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement? -The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a gray area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not. - - -2 ABOUT MODIFYING OFL LICENSED FONTS - -2.1 Can I change the fonts? Are there any limitations to what things I can and cannot change? -You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could add additional information into it that covers your contribution. - -2.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine? -Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license. - -2.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font? -Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package. - -2.4 Can I pay someone to enhance the fonts for my use and distribution? -Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefitted from the contributions of others. - -2.5 I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use? -No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefitted from the contributions of others. - -2.6 Do I have to make any derivative fonts (including source files, build scripts, documentation, etc.) publicly available? -No, but please do share your improvements with others. You may find that you receive more than what you gave in return. - -2.7 Why can't I use the Reserved Font Name(s) in my derivative font names? I'd like people to know where the design came from. -The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Name(s) ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. Keep in mind that the Copyright Holder(s) can allow a specific trusted partner to use Reserved Font Name(s) through a separate written agreement. - -2.8 What do you mean by "primary name as presented to the user"? Are you referring to the font menu name? -Yes, the requirement to change the visible name used to differentiate the font from others applies to the font menu name and other mechanisms to specify a font in a document. It would be fine, for example, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement; see section 2.7). Users who install derivatives ("Modified Versions") on their systems should not see any of the original names ("Reserved Font Names") in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake a font for another and so expect features only another derivative or the Original Version can actually offer. Ultimately, creating name conflicts will cause many problems for the users as well as for the designer of both the Original and Modified versions, so please think ahead and find a good name for your own derivative. Font substitution systems like fontconfig, or application-level font fallback configuration within OpenOffice.org or Scribus, will also get very confused if the name of the font they are configured to substitute to actually refers to another physical font on the user's hard drive. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. The substitution mechanism itself is outside the scope of the license. Users can always manually change a font reference in a document or set up some kind of substitution at a higher level but at the lower level the fonts themselves have to respect the Reserved Font Name(s) requirement to prevent ambiguity. If a substitution is currently active the user should be aware of it. - -2.9 Am I not allowed to use any part of the Reserved Font Names? -You may not use the words of the font names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute. - -2.10 So what should I, as an author, identify as Reserved Font Names? -Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". - -2.11 Do I, as an author, have to identify any Reserved Font Names? -No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified versions. You may, however, give certain trusted parties the right to use any of your Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion. - -2.12 Are any names (such as the main font name) reserved by default? -No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s). - -2.13 What is this FONTLOG thing exactly? -It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge the authors and other contributors. Please use it! See below for details on how changes should be noted. - -2.14 Am I required to update the FONTLOG? -No, but users, designers and other developers might get very frustrated at you if you don't! People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. - - -3 ABOUT THE FONTLOG - -The FONTLOG can take a variety of formats, but should include these four sections: - -3.1 FONTLOG for <FontFamilyName> -This file provides detailed information on the <FontFamilyName> font software. This information should be distributed along with the <FontFamilyName> fonts and any derivative works. - -3.2 Basic Font Information -(Here is where you would describe the purpose and brief specifications for the font project, and where users can find more detailed documentation. It can also include references to how changes can be contributed back to the Original Version. You may also wish to include a short guide to the design, or a reference to such a document.) - -3.3 ChangeLog -(This should list both major and minor changes, most recent first. Here are some examples:) - -7 February 2007 (Pat Johnson) <NewFontFamilyName> Version 1.3 -- Added Greek and Cyrillic glyphs -- Released as "<NewFontFamilyName>" - -7 March 2006 (Fred Foobar) <NewFontFamilyName> Version 1.2 -- Tweaked contextual behaviours -- Released as "<NewFontFamilyName>" - -1 Feb 2005 (Jane Doe) <NewFontFamilyName> Version 1.1 -- Improved build script performance and verbosity -- Extended the smart code documentation -- Corrected minor typos in the documentation -- Fixed position of combining inverted breve below (U+032F) -- Added OpenType/Graphite smart code for Armenian -- Added Armenian glyphs (U+0531 -> U+0587) -- Released as "<NewFontFamilyName>" - -1 Jan 2005 (Joe Smith) <FontFamilyName> Version 1.0 -- Initial release of font "<FontFamilyName>" - -3.4 Acknowledgements -(Here is where contributors can be acknowledged. - -If you make modifications be sure to add your name (N), email (E), web-address (W) and description (D). This list is sorted by last name in alphabetical order.) - -N: Jane Doe -E: jane(a)university.edu -W: http://art.university.edu/projects/fonts -D: Contributor - Armenian glyphs and code - -N: Fred Foobar -E: fred(a)foobar.org -W: http://foobar.org -D: Contributor - misc Graphite fixes - -N: Pat Johnson -E: pat(a)fontstudio.org -W: http://pat.fontstudio.org -D: Designer - Greek & Cyrillic glyphs based on Roman design - -N: Tom Parker -E: tom(a)company.com -W: http://www.company.com/tom/projects/fonts -D: Engineer - original smart font code - -N: Joe Smith -E: joe(a)fontstudio.org -W: http://joe.fontstudio.org -D: Designer - original Roman glyphs - -(Original authors can also include information here about their organization.) - - -4 ABOUT MAKING CONTRIBUTIONS - -4.1 Why should I contribute my changes back to the original authors? -It would benefit many people if you contributed back to what you've received. Providing your contributions and improvements to the fonts and other components (data files, source code, build scripts, documentation, etc.) could be a tremendous help and would encourage others to contribute as well and 'give back', which means you will have an opportunity to benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute. - -4.2 I've made some very nice improvements to the font, will you consider adopting them and putting them into future Original Versions? -Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes (the use of smart source revision control systems like subversion, svk or bzr is a good idea). Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. - -4.3 How can I financially support the development of OFL fonts? -It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version. - - -5 ABOUT THE LICENSE - -5.1 I see that this is version 1.1 of the license. Will there be later changes? -Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL. - -5.2 Can I use the SIL Open Font License for my own fonts? -Yes! We heartily encourage anyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. Some additional information about using the OFL is included at the end of this FAQ. - -5.3 Does this license restrict the rights of the Copyright Holder(s)? -No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this. - -5.4 Is the OFL a contract or a license? -The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license. - -5.5 How about translating the license and the FAQ into other languages? -SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and this FAQ better in their own language. Making the license very clear and readable is a key goal of the OFL. - -If you are an experienced translator, you are very welcome to help by translating the OFL and its FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems. - -We give permission to publish unofficial translations into other languages provided that they comply with the following guidelines: - -- put the following disclaimer in both English and the target language stating clearly that the translation is unofficial: - -"This is an unofficial translation of the SIL Open Font License into $language. It was not published by SIL International, and does not legally state the distribution terms for fonts that use the OFL. A release under the OFL is only valid when using the original English text. - -However, we recognize that this unofficial translation will help users and designers not familiar with English to understand the SIL OFL better and make it easier to use and release font families under this collaborative font design model. We encourage designers who consider releasing their creation under the OFL to read the FAQ in their own language if it is available. - -Please go to http://scripts.sil.org/OFL for the official version of the license and the accompanying FAQ." - -- keep your unofficial translation current and update it at our request if needed, for example if there is any ambiguity which could lead to confusion. - -If you start such a unofficial translation effort of the OFL and its accompanying FAQ please let us know, thank you. - - -6 ABOUT SIL INTERNATIONAL - -6.1 Who is SIL International and what does it do? -SIL International is a worldwide faith-based education and development organization (NGO) that studies, documents, and assists in developing the world's lesser-known languages through literacy, linguistics, translation, and other academic disciplines. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment. - -6.2 What does this have to do with font licensing? -The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack) so SIL developed the SIL Open Font License with the help of the FLOSS community. - -6.3 How can I contact SIL? -Our main web site is: http://www.sil.org/ -Our site about complex scripts is: http://scripts.sil.org/ -Information about this license (including contact email information) is at: http://scripts.sil.org/OFL - - -7 ABOUT USING THE OFL FOR YOUR ORIGINAL FONTS - -If you want to release your fonts under the OFL, you only need to do the following: - -7.1 Put your copyright and reserved font names information in the beginning of the main OFL file. -7.2 Put your copyright and the OFL references in your various font files (such as in the copyright, license and description fields) and in your other components (build scripts, glyph databases, documentation, rendering samples, etc). -7.3 Write an initial FONTLOG for your font and include it in the release package. -7.4 Include the OFL in your release package. -7.5 We also highly recommend you include the relevant practical documentation on the license by putting the OFL-FAQ in your package. -7.6 If you wish, you can use the OFL Graphics on your web page. - - - -That's all. If you have any more questions please get in touch with us. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/OFL.txt new/doc/fonts/gfsneohellenic/OFL.txt --- old/doc/fonts/gfsneohellenic/OFL.txt 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/OFL.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -Copyright (c) 2007, Greek Font Society (www.greekfontsociety.org | gfs(a)greekfontsociety.org), -with Reserved Font Name 'GFS Neohellenic'. - - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/README new/doc/fonts/gfsneohellenic/README --- old/doc/fonts/gfsneohellenic/README 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ - --------- GFS NeoHellenic for LaTeX ------------- - - -A. Tsolomitis - -Laboratory of Digital Typography -and Mathematical Software -University of the Aegean -Department of Mathematics -83200 Karlovassi, Samos -Greece. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/README.TEXLIVE new/doc/fonts/gfsneohellenic/README.TEXLIVE --- old/doc/fonts/gfsneohellenic/README.TEXLIVE 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -The following files have been removed in the TeX Live installation of -the current package, typically due to duplication, lack of space, or -missing source code. You can find these files on CTAN at - http://mirror.ctan.org/fonts/greek/gfs/gfsneohellenic -If questions or concerns, email tex-live(a)tug.org. - - GFSNeohellenic-Guide-for-LaTeX.pdf - NeohellenicSpecimen.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenic/VERSION new/doc/fonts/gfsneohellenic/VERSION --- old/doc/fonts/gfsneohellenic/VERSION 2013-10-24 00:35:37.000000000 +0200 +++ new/doc/fonts/gfsneohellenic/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GFSNeoHellenic for LaTeX. Version 1.01, 12 May 2006 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fn2end/fn2end.sty new/tex/latex/fn2end/fn2end.sty --- old/tex/latex/fn2end/fn2end.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/fn2end/fn2end.sty 2016-11-25 19:33:48.000000000 +0100 @@ -0,0 +1,80 @@ +% fn2end.sty Convert footnotes into end notes. +% LaTeXable documentation at end (after \endinput) +% LaTeX 2.09 users, should comment out this line: +\ProvidesPackage{fn2end}[1995/05/31 Convert footnotes into end notes.] + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This file may be freely copied, and distributed. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% Author: +% Kim C. Border, +% Division of the Humanities and Social Sciences, +% Caltech, Pasadena, CA 91125 USA +% e-mail: kcb(a)hss.caltech.edu + +% I gratefully acknowledge the help of J. E. Burke +% <jeburke(a)jhuvms.hcf.jhu.edu> at Johns Hopkins, who fixed +% the handling of long footnotes. +% The main idea is from Knuth's \answer macro in the TeXbook. + +% version 1.1, May 31, 1995 +% Changed \endnoteshere to \theendnotes, since you +% shouldn't use commands that begin with \end +% Also added user renewable parameters + +% Based on my old endnotes.sty, version 3 +% (Sep 4, 1990, rev. Jul 28, 1994), which was never posted. +% It appears to work with both LaTeX2e and LaTeX2.09 + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% User redefinable parameters +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newlength{\noteskip} +\setlength{\noteskip}{1em} +\newcommand{\notenumberformat}[1]{$#1$} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Save the original definition of \@footnotetext +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\let\original@footnotetext\@footnotetext + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Define \makeendnotes to open a new file +% for the endnotes and to redefine \@footnotetext +% (\newlinechar courtesy of J E Burke) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcommand{\makeendnotes}{\newwrite\n@tefile + \immediate\openout\n(a)tefile=\jobname.end + \immediate\write\n@tefile{\relax} + \long\gdef\@footnotetext{\immediate\write\n@tefile{} + \begingroup\newlinechar=`\^^M + \catcode`\^^M=12\@setupcopy\@copynote}} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% The verbatim copying definitions +% based on the TeXbook's \answer macro +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcommand{\@setupcopy}{\@sanitize} +\newcommand{\@copynote}{} +\long\gdef\@copynote#1{% + \immediate\write\n@tefile{\notenumberformat{\@thefnmark}% + \hskip\noteskip}% + \immediate\write\n@tefile{#1}\endgroup} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Define \theendnotes to retrieve them +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcommand{\theendnotes}{\immediate\closeout\n@tefile + \input\jobname.end\relax} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Define \restorefootnotes +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcommand{\restorefootnotes}{\long\gdef\@footnotetext{\original@footnotetext}} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fn2end.tlpobj new/tlpkg/tlpobj/fn2end.tlpobj --- old/tlpkg/tlpobj/fn2end.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/fn2end.tlpobj 2017-04-14 17:40:47.000000000 +0200 @@ -0,0 +1,15 @@ +name fn2end +category Package +revision 15878 +shortdesc Convert footnotes to endnotes +relocated 1 +longdesc Defines macros \makeendnotes, which converts \footnote to +longdesc produce endnotes; and \theendnotes which prints them out. +runfiles size=1 + RELOC/tex/latex/fn2end/fn2end.sty +catalogue-also endnotes +catalogue-ctan /macros/latex/contrib/fn2end +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license pd +catalogue-topics footnote endnote +catalogue-version 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj --- old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 2016-04-14 19:04:38.000000000 +0200 +++ new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -name gfsneohellenic.doc -category Package -revision 31979 -shortdesc doc files of gfsneohellenic -relocated 1 -docfiles size=11 - RELOC/doc/fonts/gfsneohellenic/OFL-FAQ.txt - RELOC/doc/fonts/gfsneohellenic/OFL.txt - RELOC/doc/fonts/gfsneohellenic/README - RELOC/doc/fonts/gfsneohellenic/README.TEXLIVE - RELOC/doc/fonts/gfsneohellenic/VERSION ++++++ foilhtml.doc.tar.xz ++++++ ++++++ foilhtml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/foilhtml.tlpobj new/tlpkg/tlpobj/foilhtml.tlpobj --- old/tlpkg/tlpobj/foilhtml.tlpobj 2016-04-14 19:02:54.000000000 +0200 +++ new/tlpkg/tlpobj/foilhtml.tlpobj 2017-04-14 17:40:48.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/foilhtml/foilhtml.cfg RELOC/tex/latex/foilhtml/foilhtml.sty catalogue-ctan /macros/latex/contrib/foilhtml -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation catalogue-version 1.2 ++++++ fonetika.doc.tar.xz ++++++ ++++++ fonetika.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonetika.tlpobj new/tlpkg/tlpobj/fonetika.tlpobj --- old/tlpkg/tlpobj/fonetika.tlpobj 2016-04-14 19:02:54.000000000 +0200 +++ new/tlpkg/tlpobj/fonetika.tlpobj 2017-04-14 17:40:48.000000000 +0200 @@ -30,6 +30,6 @@ RELOC/tex/latex/fonetika/fonetika.sty RELOC/tex/latex/fonetika/t1fonetika.fd catalogue-ctan /fonts/fonetika -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-sans phonetic ++++++ font-change-xetex.doc.tar.xz ++++++ ++++++ font-change-xetex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/font-change-xetex.tlpobj new/tlpkg/tlpobj/font-change-xetex.tlpobj --- old/tlpkg/tlpobj/font-change-xetex.tlpobj 2016-04-14 19:02:57.000000000 +0200 +++ new/tlpkg/tlpobj/font-change-xetex.tlpobj 2017-04-14 17:40:49.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=13 RELOC/tex/xetex/font-change-xetex/font-change-xetex.tex catalogue-ctan /macros/xetex/plain/font-change-xetex -catalogue-date 2016-04-08 08:44:09 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics font-supp plain-ext xetex catalogue-version 2016.1 ++++++ font-change.doc.tar.xz ++++++ ++++++ font-change.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/font-change.tlpobj new/tlpkg/tlpobj/font-change.tlpobj --- old/tlpkg/tlpobj/font-change.tlpobj 2016-04-14 19:02:56.000000000 +0200 +++ new/tlpkg/tlpobj/font-change.tlpobj 2017-04-14 17:40:49.000000000 +0200 @@ -61,7 +61,7 @@ RELOC/tex/plain/font-change/font_times.tex RELOC/tex/plain/font-change/font_utopia.tex catalogue-ctan /macros/plain/contrib/font-change -catalogue-date 2015-09-02 22:32:21 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics font-supp plain-ext catalogue-version 2015.2 ++++++ fontawesome.doc.tar.xz ++++++ Binary files old/doc/fonts/fontawesome/fontawesome.pdf and new/doc/fonts/fontawesome/fontawesome.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontawesome/fontawesome.tex new/doc/fonts/fontawesome/fontawesome.tex --- old/doc/fonts/fontawesome/fontawesome.tex 2016-05-16 22:31:26.000000000 +0200 +++ new/doc/fonts/fontawesome/fontawesome.tex 2016-11-25 19:27:28.000000000 +0100 @@ -7,8 +7,8 @@ \documentclass{ltxdoc} %\GetFileInfo{\jobname.sty} -\def\fileversion{4.6.3.1} -\def\filedate{May 15, 2016} +\def\fileversion{4.6.3.2} +\def\filedate{May 22, 2016} \usepackage{lmodern} \usepackage[numbered]{hypdoc} \usepackage{hologo} @@ -49,6 +49,9 @@ %\let\PrintDescribeEnv\@gobble \let\PrintMacroName\@gobble %\let\PrintEnvName\@gobble +\begin{macro}{\fa500Px} +\changes{v4.6.3.2}{2016/05/22}{Removed direct command.} +\end{macro} \begin{macro}{\faHourglass} \changes{v4.6.3.1}{2016/05/15}{Fixed definition.} \end{macro} @@ -116,8 +119,9 @@ \section{Usage} \DescribeMacro{\faicon} -Once the \textsf{\jobname} package loaded, icons can be accessed through the general \cs{faicon}, which takes as mandatory argument the \meta{name} of the desired icon, or through a direct command specific to each icon. The full list of icon designs, names and direct commands are showcased next. +Once the \textsf{\jobname} package loaded, icons can be accessed through the general \cs{faicon}, which takes as mandatory argument the \meta{name} of the desired icon, or through a direct command specific to each icon. The full list of icon designs, names and direct commands are showcased in section \ref{section:icons}. +\section{List of icons\label{section:icons}} \newenvironment{showcase}% {% % \begin{longtable}{ccp{3cm}p{3.5cm}p{1cm}}% debug: shows icons with both generic and specific commands @@ -144,11 +148,11 @@ \ifthenelse{\equal{#1}{alias}}{% \textcolor{black!50}{(alias)}}{}% }} - -\section{List of icons} %\subsection{Web application icons\label{section:web_application}} +%\subsection{Transportation icons\label{section:transportation}} +%\subsection{...} \begin{showcase} - \showcaseicon{500px}{fa500Px}{} + \showcaseicon{500px}{faicon\{500px\}}{} \showcaseicon{adjust}{faAdjust}{} \showcaseicon{adn}{faAdn}{} \showcaseicon{align-center}{faAlignCenter}{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontawesome.doc.tlpobj new/tlpkg/tlpobj/fontawesome.doc.tlpobj --- old/tlpkg/tlpobj/fontawesome.doc.tlpobj 2016-05-17 03:19:27.000000000 +0200 +++ new/tlpkg/tlpobj/fontawesome.doc.tlpobj 2017-04-14 17:40:49.000000000 +0200 @@ -1,9 +1,9 @@ name fontawesome.doc category Package -revision 41195 +revision 41412 shortdesc doc files of fontawesome relocated 1 -docfiles size=67 +docfiles size=68 RELOC/doc/fonts/fontawesome/README.md RELOC/doc/fonts/fontawesome/fontawesome.pdf RELOC/doc/fonts/fontawesome/fontawesome.tex ++++++ fontawesome.tar.xz ++++++ Binary files old/fonts/opentype/public/fontawesome/FontAwesome.otf and new/fonts/opentype/public/fontawesome/FontAwesome.otf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontawesome/fontawesomesymbols-generic.tex new/tex/latex/fontawesome/fontawesomesymbols-generic.tex --- old/tex/latex/fontawesome/fontawesomesymbols-generic.tex 2016-05-16 22:31:26.000000000 +0200 +++ new/tex/latex/fontawesome/fontawesomesymbols-generic.tex 2016-11-25 19:33:49.000000000 +0100 @@ -633,99 +633,99 @@ \def\faGooglePlusOfficial{\faicon{google-plus-official}} \def\faFontAwesome{\faicon{font-awesome}} % aliases -\def\faSendO{\faicon{send-o}}\expandafter\def\csname faicon@send-o\endcsname{\faicon{paper-plane-o}} -\def\faStarHalfEmpty{\faicon{star-half-empty}}\expandafter\def\csname faicon@star-half-empty\endcsname{\faicon{star-half-o}} -\def\faGroup{\faicon{group}}\expandafter\def\csname faicon@group\endcsname{\faicon{users}} -\def\faGooglePlusCircle{\faicon{google-plus-circle}}\expandafter\def\csname faicon@google-plus-circle\endcsname{\faicon{google-plus-official}} -\def\faMailForward{\faicon{mail-forward}}\expandafter\def\csname faicon@mail-forward\endcsname{\faicon{share}} -\def\faMobilePhone{\faicon{mobile-phone}}\expandafter\def\csname faicon@mobile-phone\endcsname{\faicon{mobile}} -\def\faImage{\faicon{image}}\expandafter\def\csname faicon@image\endcsname{\faicon{picture-o}} -\def\faYcSquare{\faicon{yc-square}}\expandafter\def\csname faicon@yc-square\endcsname{\faicon{hacker-news}} -\def\faInstitution{\faicon{institution}}\expandafter\def\csname faicon@institution\endcsname{\faicon{university}} +\def\faCny{\faicon{cny}}\expandafter\def\csname faicon@cny\endcsname{\faicon{jpy}} +\def\faYCombinatorSquare{\faicon{y-combinator-square}}\expandafter\def\csname faicon@y-combinator-square\endcsname{\faicon{hacker-news}} +\def\faCab{\faicon{cab}}\expandafter\def\csname faicon@cab\endcsname{\faicon{taxi}} +\def\faToggleUp{\faicon{toggle-up}}\expandafter\def\csname faicon@toggle-up\endcsname{\faicon{caret-square-o-up}} +\def\faLifeBuoy{\faicon{life-buoy}}\expandafter\def\csname faicon@life-buoy\endcsname{\faicon{life-ring}} \def\faFileZipO{\faicon{file-zip-o}}\expandafter\def\csname faicon@file-zip-o\endcsname{\faicon{file-archive-o}} -\def\faBank{\faicon{bank}}\expandafter\def\csname faicon@bank\endcsname{\faicon{university}} +\def\faBitcoin{\faicon{bitcoin}}\expandafter\def\csname faicon@bitcoin\endcsname{\faicon{btc}} \def\faAutomobile{\faicon{automobile}}\expandafter\def\csname faicon@automobile\endcsname{\faicon{car}} -\def\faSortUp{\faicon{sort-up}}\expandafter\def\csname faicon@sort-up\endcsname{\faicon{sort-asc}} +\def\faPaste{\faicon{paste}}\expandafter\def\csname faicon@paste\endcsname{\faicon{clipboard}} \def\faResistance{\faicon{resistance}}\expandafter\def\csname faicon@resistance\endcsname{\faicon{rebel}} -\def\faYen{\faicon{yen}}\expandafter\def\csname faicon@yen\endcsname{\faicon{jpy}} -\def\faGear{\faicon{gear}}\expandafter\def\csname faicon@gear\endcsname{\faicon{cog}} -\def\faLegal{\faicon{legal}}\expandafter\def\csname faicon@legal\endcsname{\faicon{gavel}} -\def\faLifeSaver{\faicon{life-saver}}\expandafter\def\csname faicon@life-saver\endcsname{\faicon{life-ring}} -\def\faSheqel{\faicon{sheqel}}\expandafter\def\csname faicon@sheqel\endcsname{\faicon{ils}} -\def\faYc{\faicon{yc}}\expandafter\def\csname faicon@yc\endcsname{\faicon{y-combinator}} -\def\faEuro{\faicon{euro}}\expandafter\def\csname faicon@euro\endcsname{\faicon{eur}} -\def\faHourglass3{\faicon{hourglass-3}}\expandafter\def\csname faicon@hourglass-3\endcsname{\faicon{hourglass-end}} -\def\faWechat{\faicon{wechat}}\expandafter\def\csname faicon@wechat\endcsname{\faicon{weixin}} +\def\faCopy{\faicon{copy}}\expandafter\def\csname faicon@copy\endcsname{\faicon{files-o}} +\def\faIntersex{\faicon{intersex}}\expandafter\def\csname faicon@intersex\endcsname{\faicon{transgender}} \def\faHardOfHearing{\faicon{hard-of-hearing}}\expandafter\def\csname faicon@hard-of-hearing\endcsname{\faicon{deaf}} -\def\faRupee{\faicon{rupee}}\expandafter\def\csname faicon@rupee\endcsname{\faicon{inr}} -\def\faDeafness{\faicon{deafness}}\expandafter\def\csname faicon@deafness\endcsname{\faicon{deaf}} -\def\faRa{\faicon{ra}}\expandafter\def\csname faicon@ra\endcsname{\faicon{rebel}} -\def\faCab{\faicon{cab}}\expandafter\def\csname faicon@cab\endcsname{\faicon{taxi}} -\def\faPhoto{\faicon{photo}}\expandafter\def\csname faicon@photo\endcsname{\faicon{picture-o}} \def\faMailReply{\faicon{mail-reply}}\expandafter\def\csname faicon@mail-reply\endcsname{\faicon{reply}} -\def\faHourglass1{\faicon{hourglass-1}}\expandafter\def\csname faicon@hourglass-1\endcsname{\faicon{hourglass-start}} -\def\faDashboard{\faicon{dashboard}}\expandafter\def\csname faicon@dashboard\endcsname{\faicon{tachometer}} -\def\faHandGrabO{\faicon{hand-grab-o}}\expandafter\def\csname faicon@hand-grab-o\endcsname{\faicon{hand-rock-o}} -\def\faCut{\faicon{cut}}\expandafter\def\csname faicon@cut\endcsname{\faicon{scissors}} -\def\faRemove{\faicon{remove}}\expandafter\def\csname faicon@remove\endcsname{\faicon{times}} -\def\faSoccerBallO{\faicon{soccer-ball-o}}\expandafter\def\csname faicon@soccer-ball-o\endcsname{\faicon{futbol-o}} -\def\faFa{\faicon{fa}}\expandafter\def\csname faicon@fa\endcsname{\faicon{font-awesome}} +\def\faSortDown{\faicon{sort-down}}\expandafter\def\csname faicon@sort-down\endcsname{\faicon{sort-desc}} +\def\faGe{\faicon{ge}}\expandafter\def\csname faicon@ge\endcsname{\faicon{empire}} \def\faBattery2{\faicon{battery-2}}\expandafter\def\csname faicon@battery-2\endcsname{\faicon{battery-half}} -\def\faDollar{\faicon{dollar}}\expandafter\def\csname faicon@dollar\endcsname{\faicon{usd}} +\def\faHandStopO{\faicon{hand-stop-o}}\expandafter\def\csname faicon@hand-stop-o\endcsname{\faicon{hand-paper-o}} +\def\faGroup{\faicon{group}}\expandafter\def\csname faicon@group\endcsname{\faicon{users}} +\def\faRotateRight{\faicon{rotate-right}}\expandafter\def\csname faicon@rotate-right\endcsname{\faicon{repeat}} +\def\faWon{\faicon{won}}\expandafter\def\csname faicon@won\endcsname{\faicon{krw}} +\def\faFa{\faicon{fa}}\expandafter\def\csname faicon@fa\endcsname{\faicon{font-awesome}} +\def\faHourglass3{\faicon{hourglass-3}}\expandafter\def\csname faicon@hourglass-3\endcsname{\faicon{hourglass-end}} +\def\faStarHalfEmpty{\faicon{star-half-empty}}\expandafter\def\csname faicon@star-half-empty\endcsname{\faicon{star-half-o}} +\def\faCut{\faicon{cut}}\expandafter\def\csname faicon@cut\endcsname{\faicon{scissors}} +\def\faToggleDown{\faicon{toggle-down}}\expandafter\def\csname faicon@toggle-down\endcsname{\faicon{caret-square-o-down}} +\def\faGooglePlusCircle{\faicon{google-plus-circle}}\expandafter\def\csname faicon@google-plus-circle\endcsname{\faicon{google-plus-official}} +\def\faSheqel{\faicon{sheqel}}\expandafter\def\csname faicon@sheqel\endcsname{\faicon{ils}} +\def\faDashboard{\faicon{dashboard}}\expandafter\def\csname faicon@dashboard\endcsname{\faicon{tachometer}} +\def\faSend{\faicon{send}}\expandafter\def\csname faicon@send\endcsname{\faicon{paper-plane}} +\def\faYc{\faicon{yc}}\expandafter\def\csname faicon@yc\endcsname{\faicon{y-combinator}} +\def\faToggleLeft{\faicon{toggle-left}}\expandafter\def\csname faicon@toggle-left\endcsname{\faicon{caret-square-o-left}} +\def\faWarning{\faicon{warning}}\expandafter\def\csname faicon@warning\endcsname{\faicon{exclamation-triangle}} +\def\faImage{\faicon{image}}\expandafter\def\csname faicon@image\endcsname{\faicon{picture-o}} +\def\faInstitution{\faicon{institution}}\expandafter\def\csname faicon@institution\endcsname{\faicon{university}} +\def\faFileMovieO{\faicon{file-movie-o}}\expandafter\def\csname faicon@file-movie-o\endcsname{\faicon{file-video-o}} +\def\faPhoto{\faicon{photo}}\expandafter\def\csname faicon@photo\endcsname{\faicon{picture-o}} +\def\faFileSoundO{\faicon{file-sound-o}}\expandafter\def\csname faicon@file-sound-o\endcsname{\faicon{file-audio-o}} \def\faMortarBoard{\faicon{mortar-board}}\expandafter\def\csname faicon@mortar-board\endcsname{\faicon{graduation-cap}} +\def\faGittip{\faicon{gittip}}\expandafter\def\csname faicon@gittip\endcsname{\faicon{gratipay}} \def\faHourglass2{\faicon{hourglass-2}}\expandafter\def\csname faicon@hourglass-2\endcsname{\faicon{hourglass-half}} -\def\faBattery3{\faicon{battery-3}}\expandafter\def\csname faicon@battery-3\endcsname{\faicon{battery-three-quarters}} -\def\faToggleDown{\faicon{toggle-down}}\expandafter\def\csname faicon@toggle-down\endcsname{\faicon{caret-square-o-down}} -\def\faBattery0{\faicon{battery-0}}\expandafter\def\csname faicon@battery-0\endcsname{\faicon{battery-empty}} -\def\faBitcoin{\faicon{bitcoin}}\expandafter\def\csname faicon@bitcoin\endcsname{\faicon{btc}} +\def\faSupport{\faicon{support}}\expandafter\def\csname faicon@support\endcsname{\faicon{life-ring}} +\def\faEdit{\faicon{edit}}\expandafter\def\csname faicon@edit\endcsname{\faicon{pencil-square-o}} +\def\faHotel{\faicon{hotel}}\expandafter\def\csname faicon@hotel\endcsname{\faicon{bed}} +\def\faSoccerBallO{\faicon{soccer-ball-o}}\expandafter\def\csname faicon@soccer-ball-o\endcsname{\faicon{futbol-o}} +\def\faFilePictureO{\faicon{file-picture-o}}\expandafter\def\csname faicon@file-picture-o\endcsname{\faicon{file-image-o}} +\def\faClose{\faicon{close}}\expandafter\def\csname faicon@close\endcsname{\faicon{times}} +\def\faYcSquare{\faicon{yc-square}}\expandafter\def\csname faicon@yc-square\endcsname{\faicon{hacker-news}} +\def\faShekel{\faicon{shekel}}\expandafter\def\csname faicon@shekel\endcsname{\faicon{ils}} +\def\faDollar{\faicon{dollar}}\expandafter\def\csname faicon@dollar\endcsname{\faicon{usd}} \def\faUnsorted{\faicon{unsorted}}\expandafter\def\csname faicon@unsorted\endcsname{\faicon{sort}} -\def\faSend{\faicon{send}}\expandafter\def\csname faicon@send\endcsname{\faicon{paper-plane}} -\def\faLifeBuoy{\faicon{life-buoy}}\expandafter\def\csname faicon@life-buoy\endcsname{\faicon{life-ring}} -\def\faRouble{\faicon{rouble}}\expandafter\def\csname faicon@rouble\endcsname{\faicon{rub}} -\def\faDedent{\faicon{dedent}}\expandafter\def\csname faicon@dedent\endcsname{\faicon{outdent}} \def\faReorder{\faicon{reorder}}\expandafter\def\csname faicon@reorder\endcsname{\faicon{bars}} -\def\faSave{\faicon{save}}\expandafter\def\csname faicon@save\endcsname{\faicon{floppy-o}} -\def\faBarChartO{\faicon{bar-chart-o}}\expandafter\def\csname faicon@bar-chart-o\endcsname{\faicon{bar-chart}} -\def\faFilePhotoO{\faicon{file-photo-o}}\expandafter\def\csname faicon@file-photo-o\endcsname{\faicon{file-image-o}} -\def\faCopy{\faicon{copy}}\expandafter\def\csname faicon@copy\endcsname{\faicon{files-o}} -\def\faSortDown{\faicon{sort-down}}\expandafter\def\csname faicon@sort-down\endcsname{\faicon{sort-desc}} -\def\faClose{\faicon{close}}\expandafter\def\csname faicon@close\endcsname{\faicon{times}} +\def\faBattery3{\faicon{battery-3}}\expandafter\def\csname faicon@battery-3\endcsname{\faicon{battery-three-quarters}} +\def\faRupee{\faicon{rupee}}\expandafter\def\csname faicon@rupee\endcsname{\faicon{inr}} +\def\faRouble{\faicon{rouble}}\expandafter\def\csname faicon@rouble\endcsname{\faicon{rub}} +\def\faHourglass1{\faicon{hourglass-1}}\expandafter\def\csname faicon@hourglass-1\endcsname{\faicon{hourglass-start}} +\def\faAslInterpreting{\faicon{asl-interpreting}}\expandafter\def\csname faicon@asl-interpreting\endcsname{\faicon{american-sign-language-interpreting}} \def\faTv{\faicon{tv}}\expandafter\def\csname faicon@tv\endcsname{\faicon{television}} +\def\faSave{\faicon{save}}\expandafter\def\csname faicon@save\endcsname{\faicon{floppy-o}} \def\faToggleRight{\faicon{toggle-right}}\expandafter\def\csname faicon@toggle-right\endcsname{\faicon{caret-square-o-right}} +\def\faDedent{\faicon{dedent}}\expandafter\def\csname faicon@dedent\endcsname{\faicon{outdent}} +\def\faGear{\faicon{gear}}\expandafter\def\csname faicon@gear\endcsname{\faicon{cog}} +\def\faLegal{\faicon{legal}}\expandafter\def\csname faicon@legal\endcsname{\faicon{gavel}} +\def\faWechat{\faicon{wechat}}\expandafter\def\csname faicon@wechat\endcsname{\faicon{weixin}} +\def\faFacebookF{\faicon{facebook-f}}\expandafter\def\csname faicon@facebook-f\endcsname{\faicon{facebook}} +\def\faFeed{\faicon{feed}}\expandafter\def\csname faicon@feed\endcsname{\faicon{rss}} +\def\faBank{\faicon{bank}}\expandafter\def\csname faicon@bank\endcsname{\faicon{university}} +\def\faTurkishLira{\faicon{turkish-lira}}\expandafter\def\csname faicon@turkish-lira\endcsname{\faicon{try}} \def\faUnlink{\faicon{unlink}}\expandafter\def\csname faicon@unlink\endcsname{\faicon{chain-broken}} -\def\faWon{\faicon{won}}\expandafter\def\csname faicon@won\endcsname{\faicon{krw}} -\def\faWarning{\faicon{warning}}\expandafter\def\csname faicon@warning\endcsname{\faicon{exclamation-triangle}} -\def\faRotateLeft{\faicon{rotate-left}}\expandafter\def\csname faicon@rotate-left\endcsname{\faicon{undo}} -\def\faMailReplyAll{\faicon{mail-reply-all}}\expandafter\def\csname faicon@mail-reply-all\endcsname{\faicon{reply-all}} -\def\faFileSoundO{\faicon{file-sound-o}}\expandafter\def\csname faicon@file-sound-o\endcsname{\faicon{file-audio-o}} -\def\faFilePictureO{\faicon{file-picture-o}}\expandafter\def\csname faicon@file-picture-o\endcsname{\faicon{file-image-o}} -\def\faBattery4{\faicon{battery-4}}\expandafter\def\csname faicon@battery-4\endcsname{\faicon{battery-full}} -\def\faNavicon{\faicon{navicon}}\expandafter\def\csname faicon@navicon\endcsname{\faicon{bars}} -\def\faPaste{\faicon{paste}}\expandafter\def\csname faicon@paste\endcsname{\faicon{clipboard}} -\def\faAslInterpreting{\faicon{asl-interpreting}}\expandafter\def\csname faicon@asl-interpreting\endcsname{\faicon{american-sign-language-interpreting}} -\def\faSupport{\faicon{support}}\expandafter\def\csname faicon@support\endcsname{\faicon{life-ring}} +\def\faChain{\faicon{chain}}\expandafter\def\csname faicon@chain\endcsname{\faicon{link}} +\def\faGears{\faicon{gears}}\expandafter\def\csname faicon@gears\endcsname{\faicon{cogs}} \def\faRmb{\faicon{rmb}}\expandafter\def\csname faicon@rmb\endcsname{\faicon{jpy}} +\def\faBattery1{\faicon{battery-1}}\expandafter\def\csname faicon@battery-1\endcsname{\faicon{battery-quarter}} +\def\faLifeBouy{\faicon{life-bouy}}\expandafter\def\csname faicon@life-bouy\endcsname{\faicon{life-ring}} +\def\faYen{\faicon{yen}}\expandafter\def\csname faicon@yen\endcsname{\faicon{jpy}} +\def\faBattery4{\faicon{battery-4}}\expandafter\def\csname faicon@battery-4\endcsname{\faicon{battery-full}} +\def\faBattery0{\faicon{battery-0}}\expandafter\def\csname faicon@battery-0\endcsname{\faicon{battery-empty}} +\def\faHandGrabO{\faicon{hand-grab-o}}\expandafter\def\csname faicon@hand-grab-o\endcsname{\faicon{hand-rock-o}} +\def\faMailReplyAll{\faicon{mail-reply-all}}\expandafter\def\csname faicon@mail-reply-all\endcsname{\faicon{reply-all}} +\def\faMobilePhone{\faicon{mobile-phone}}\expandafter\def\csname faicon@mobile-phone\endcsname{\faicon{mobile}} +\def\faRotateLeft{\faicon{rotate-left}}\expandafter\def\csname faicon@rotate-left\endcsname{\faicon{undo}} +\def\faEuro{\faicon{euro}}\expandafter\def\csname faicon@euro\endcsname{\faicon{eur}} \def\faRuble{\faicon{ruble}}\expandafter\def\csname faicon@ruble\endcsname{\faicon{rub}} -\def\faChain{\faicon{chain}}\expandafter\def\csname faicon@chain\endcsname{\faicon{link}} -\def\faToggleLeft{\faicon{toggle-left}}\expandafter\def\csname faicon@toggle-left\endcsname{\faicon{caret-square-o-left}} +\def\faRa{\faicon{ra}}\expandafter\def\csname faicon@ra\endcsname{\faicon{rebel}} \def\faStarHalfFull{\faicon{star-half-full}}\expandafter\def\csname faicon@star-half-full\endcsname{\faicon{star-half-o}} -\def\faGittip{\faicon{gittip}}\expandafter\def\csname faicon@gittip\endcsname{\faicon{gratipay}} -\def\faFacebookF{\faicon{facebook-f}}\expandafter\def\csname faicon@facebook-f\endcsname{\faicon{facebook}} +\def\faSortUp{\faicon{sort-up}}\expandafter\def\csname faicon@sort-up\endcsname{\faicon{sort-asc}} +\def\faMailForward{\faicon{mail-forward}}\expandafter\def\csname faicon@mail-forward\endcsname{\faicon{share}} \def\faSigning{\faicon{signing}}\expandafter\def\csname faicon@signing\endcsname{\faicon{sign-language}} \def\faFlash{\faicon{flash}}\expandafter\def\csname faicon@flash\endcsname{\faicon{bolt}} -\def\faTurkishLira{\faicon{turkish-lira}}\expandafter\def\csname faicon@turkish-lira\endcsname{\faicon{try}} -\def\faHotel{\faicon{hotel}}\expandafter\def\csname faicon@hotel\endcsname{\faicon{bed}} -\def\faFileMovieO{\faicon{file-movie-o}}\expandafter\def\csname faicon@file-movie-o\endcsname{\faicon{file-video-o}} -\def\faBattery1{\faicon{battery-1}}\expandafter\def\csname faicon@battery-1\endcsname{\faicon{battery-quarter}} -\def\faGears{\faicon{gears}}\expandafter\def\csname faicon@gears\endcsname{\faicon{cogs}} -\def\faHandStopO{\faicon{hand-stop-o}}\expandafter\def\csname faicon@hand-stop-o\endcsname{\faicon{hand-paper-o}} -\def\faIntersex{\faicon{intersex}}\expandafter\def\csname faicon@intersex\endcsname{\faicon{transgender}} -\def\faRotateRight{\faicon{rotate-right}}\expandafter\def\csname faicon@rotate-right\endcsname{\faicon{repeat}} -\def\faGe{\faicon{ge}}\expandafter\def\csname faicon@ge\endcsname{\faicon{empire}} -\def\faEdit{\faicon{edit}}\expandafter\def\csname faicon@edit\endcsname{\faicon{pencil-square-o}} -\def\faFeed{\faicon{feed}}\expandafter\def\csname faicon@feed\endcsname{\faicon{rss}} -\def\faToggleUp{\faicon{toggle-up}}\expandafter\def\csname faicon@toggle-up\endcsname{\faicon{caret-square-o-up}} -\def\faYCombinatorSquare{\faicon{y-combinator-square}}\expandafter\def\csname faicon@y-combinator-square\endcsname{\faicon{hacker-news}} -\def\faShekel{\faicon{shekel}}\expandafter\def\csname faicon@shekel\endcsname{\faicon{ils}} -\def\faCny{\faicon{cny}}\expandafter\def\csname faicon@cny\endcsname{\faicon{jpy}} -\def\faLifeBouy{\faicon{life-bouy}}\expandafter\def\csname faicon@life-bouy\endcsname{\faicon{life-ring}} +\def\faLifeSaver{\faicon{life-saver}}\expandafter\def\csname faicon@life-saver\endcsname{\faicon{life-ring}} +\def\faFilePhotoO{\faicon{file-photo-o}}\expandafter\def\csname faicon@file-photo-o\endcsname{\faicon{file-image-o}} +\def\faDeafness{\faicon{deafness}}\expandafter\def\csname faicon@deafness\endcsname{\faicon{deaf}} +\def\faBarChartO{\faicon{bar-chart-o}}\expandafter\def\csname faicon@bar-chart-o\endcsname{\faicon{bar-chart}} +\def\faSendO{\faicon{send-o}}\expandafter\def\csname faicon@send-o\endcsname{\faicon{paper-plane-o}} +\def\faNavicon{\faicon{navicon}}\expandafter\def\csname faicon@navicon\endcsname{\faicon{bars}} +\def\faRemove{\faicon{remove}}\expandafter\def\csname faicon@remove\endcsname{\faicon{times}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontawesome/ufontawesomeone.fd new/tex/latex/fontawesome/ufontawesomeone.fd --- old/tex/latex/fontawesome/ufontawesomeone.fd 2016-05-16 22:31:26.000000000 +0200 +++ new/tex/latex/fontawesome/ufontawesomeone.fd 2016-11-25 19:33:49.000000000 +0100 @@ -5,7 +5,7 @@ % conditions of the LaTeX Project Public License version 1.3c, % available at http://www.latex-project.org/lppl/. -\ProvidesFile{ufontawesomeone.fd}[2016/05/15 Font definitions for U/fontawesomeone.] +\ProvidesFile{ufontawesomeone.fd}[2016/05/22 Font definitions for U/fontawesomeone.] \DeclareFontFamily{U}{fontawesomeone}{} \DeclareFontShape{U}{fontawesomeone}{m}{n}{<-> FontAwesome--fontawesomeone}{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontawesome/ufontawesomethree.fd new/tex/latex/fontawesome/ufontawesomethree.fd --- old/tex/latex/fontawesome/ufontawesomethree.fd 2016-05-16 22:31:26.000000000 +0200 +++ new/tex/latex/fontawesome/ufontawesomethree.fd 2016-11-25 19:33:49.000000000 +0100 @@ -5,7 +5,7 @@ % conditions of the LaTeX Project Public License version 1.3c, % available at http://www.latex-project.org/lppl/. -\ProvidesFile{ufontawesomethree.fd}[2016/05/15 Font definitions for U/fontawesomethree.] +\ProvidesFile{ufontawesomethree.fd}[2016/05/22 Font definitions for U/fontawesomethree.] \DeclareFontFamily{U}{fontawesomethree}{} \DeclareFontShape{U}{fontawesomethree}{m}{n}{<-> FontAwesome--fontawesomethree}{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontawesome/ufontawesometwo.fd new/tex/latex/fontawesome/ufontawesometwo.fd --- old/tex/latex/fontawesome/ufontawesometwo.fd 2016-05-16 22:31:26.000000000 +0200 +++ new/tex/latex/fontawesome/ufontawesometwo.fd 2016-11-25 19:33:49.000000000 +0100 @@ -5,7 +5,7 @@ % conditions of the LaTeX Project Public License version 1.3c, % available at http://www.latex-project.org/lppl/. -\ProvidesFile{ufontawesometwo.fd}[2016/05/15 Font definitions for U/fontawesometwo.] +\ProvidesFile{ufontawesometwo.fd}[2016/05/22 Font definitions for U/fontawesometwo.] \DeclareFontFamily{U}{fontawesometwo}{} \DeclareFontShape{U}{fontawesometwo}{m}{n}{<-> FontAwesome--fontawesometwo}{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontawesome.tlpobj new/tlpkg/tlpobj/fontawesome.tlpobj --- old/tlpkg/tlpobj/fontawesome.tlpobj 2016-05-17 03:19:28.000000000 +0200 +++ new/tlpkg/tlpobj/fontawesome.tlpobj 2017-04-14 17:40:50.000000000 +0200 @@ -1,6 +1,6 @@ name fontawesome category Package -revision 41195 +revision 41412 shortdesc Font containing web-related icons relocated 1 longdesc The package offers access to the large number of web-related @@ -25,7 +25,7 @@ RELOC/tex/latex/fontawesome/ufontawesomethree.fd RELOC/tex/latex/fontawesome/ufontawesometwo.fd catalogue-ctan /fonts/fontawesome -catalogue-date 2016-05-16 09:31:14 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-supp-symbol font-symbol font-otf font-type1 -catalogue-version 4.6.3.1 +catalogue-version 4.6.3.2 ++++++ fontaxes.doc.tar.xz ++++++ ++++++ fontaxes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontaxes.tlpobj new/tlpkg/tlpobj/fontaxes.tlpobj --- old/tlpkg/tlpobj/fontaxes.tlpobj 2016-04-14 19:02:58.000000000 +0200 +++ new/tlpkg/tlpobj/fontaxes.tlpobj 2017-04-14 17:40:50.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=4 RELOC/tex/latex/fontaxes/fontaxes.sty catalogue-ctan /macros/latex/contrib/fontaxes -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 catalogue-version 1.0d ++++++ fontbook.doc.tar.xz ++++++ ++++++ fontbook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontbook.tlpobj new/tlpkg/tlpobj/fontbook.tlpobj --- old/tlpkg/tlpobj/fontbook.tlpobj 2016-04-14 19:02:59.000000000 +0200 +++ new/tlpkg/tlpobj/fontbook.tlpobj 2017-04-14 17:40:50.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/xelatex/fontbook/fontbook.sty catalogue-ctan /macros/xetex/latex/fontbook -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.2 ++++++ fontch.doc.tar.xz ++++++ ++++++ fontch.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontch.tlpobj new/tlpkg/tlpobj/fontch.tlpobj --- old/tlpkg/tlpobj/fontch.tlpobj 2016-04-14 19:02:59.000000000 +0200 +++ new/tlpkg/tlpobj/fontch.tlpobj 2017-04-14 17:40:50.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/plain/fontch/fontch_doc.tex catalogue-also font-selection ofs plnfss catalogue-ctan /macros/plain/contrib/fontch -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-sel plain-ext catalogue-version 2.2 ++++++ fontinst.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/fontinst.man1.pdf and new/texmf-dist/doc/man/man1/fontinst.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.doc.tlpobj new/tlpkg/tlpobj/fontinst.doc.tlpobj --- old/tlpkg/tlpobj/fontinst.doc.tlpobj 2016-04-27 03:17:25.000000000 +0200 +++ new/tlpkg/tlpobj/fontinst.doc.tlpobj 2017-05-04 02:07:02.000000000 +0200 @@ -1,8 +1,8 @@ name fontinst.doc category Package -revision 40768 +revision 44166 shortdesc doc files of fontinst -docfiles size=463 +docfiles size=460 texmf-dist/doc/fonts/fontinst/README texmf-dist/doc/fonts/fontinst/encspecs/encspecs.tex texmf-dist/doc/fonts/fontinst/encspecs/omxdraft.etx ++++++ fontinst.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.tlpobj new/tlpkg/tlpobj/fontinst.tlpobj --- old/tlpkg/tlpobj/fontinst.tlpobj 2016-04-27 03:17:26.000000000 +0200 +++ new/tlpkg/tlpobj/fontinst.tlpobj 2017-05-04 02:07:03.000000000 +0200 @@ -1,6 +1,6 @@ name fontinst category Package -revision 40768 +revision 44166 shortdesc Help with installing fonts for TeX and LaTeX longdesc TeX macros for converting Adobe Font Metric files to TeX metric longdesc and virtual font format. Fontinst helps mainly with the number @@ -88,7 +88,7 @@ texmf-dist/tex/fontinst/smblmtx/unsetnum.mtx texmf-dist/tex/latex/fontinst/fontdoc.sty catalogue-ctan /fonts/utilities/fontinst -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-cvt catalogue-version 1.933 ++++++ fontmfizz.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontmfizz/LICENSE new/doc/fonts/fontmfizz/LICENSE --- old/doc/fonts/fontmfizz/LICENSE 2014-12-24 01:14:55.000000000 +0100 +++ new/doc/fonts/fontmfizz/LICENSE 2017-03-20 00:01:05.000000000 +0100 @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Kevin Dungs +Copyright (c) 2014-2017 Kevin Dungs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontmfizz/README new/doc/fonts/fontmfizz/README --- old/doc/fonts/fontmfizz/README 2014-12-24 01:14:55.000000000 +0100 +++ new/doc/fonts/fontmfizz/README 2017-03-20 00:01:05.000000000 +0100 @@ -1,5 +1,5 @@ fontmfizz -- Vector Icons for Technology and Software Geeks -Version: 2014/12/23 +Version: 2017/03/19 Font Mfizz provides scalable vector icons representing programming languages, operating systems, software engineering, and technology. Binary files old/doc/fonts/fontmfizz/fontmfizz.pdf and new/doc/fonts/fontmfizz/fontmfizz.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontmfizz/fontmfizz.tex new/doc/fonts/fontmfizz/fontmfizz.tex --- old/doc/fonts/fontmfizz/fontmfizz.tex 2014-12-24 01:14:55.000000000 +0100 +++ new/doc/fonts/fontmfizz/fontmfizz.tex 2017-03-20 00:01:05.000000000 +0100 @@ -3,97 +3,143 @@ \usepackage{fontmfizz} \begin{document} -\thispagestyle{empty} -\mfMicroscope{} \quad mfMicroscope \\ -\mfCplusplus{} \quad mfCplusplus \\ -\mfWireless{} \quad mfWireless \\ -\mfFireAlt{} \quad mfFireAlt \\ -\mfMobileDevice{} \quad mfMobileDevice \\ -\mfObjc{} \quad mfObjc \\ -\mfRedhat{} \quad mfRedhat \\ -\mfFreebsd{} \quad mfFreebsd \\ -\mfHeroku{} \quad mfHeroku \\ -\mfPython{} \quad mfPython \\ -\mfJava{} \quad mfJava \\ -\mfSatellite{} \quad mfSatellite \\ -\mfDebian{} \quad mfDebian \\ -\mfGrails{} \quad mfGrails \\ -\mfC{} \quad mfC \\ -\mfPostgres{} \quad mfPostgres \\ -\mfDatabaseAltTwo{} \quad mfDatabaseAltTwo \\ -\mfRaspberrypi{} \quad mfRaspberrypi \\ -\mfNginx{} \quad mfNginx \\ -\mfRubyOnRails{} \quad mfRubyOnRails \\ -\mfRedis{} \quad mfRedis \\ -\mfScala{} \quad mfScala \\ -\mfGnome{} \quad mfGnome \\ -\mfPerl{} \quad mfPerl \\ -\mfMysql{} \quad mfMysql \\ -\mfFedora{} \quad mfFedora \\ -\mfGhost{} \quad mfGhost \\ -\mfGoogle{} \quad mfGoogle \\ -\mfNetbsd{} \quad mfNetbsd \\ -\mfAws{} \quad mfAws \\ -\mfBomb{} \quad mfBomb \\ -\mfLooking{} \quad mfLooking \\ -\mfRuby{} \quad mfRuby \\ -\mfMysqlAlt{} \quad mfMysqlAlt \\ -\mfPlayframeworkAlt{} \quad mfPlayframeworkAlt \\ -\mfOsx{} \quad mfOsx \\ -\mfDatabase{} \quad mfDatabase \\ -\mfDatabaseAlt{} \quad mfDatabaseAlt \\ -\mfShell{} \quad mfShell \\ -\mfScript{} \quad mfScript \\ -\mfAntenna{} \quad mfAntenna \\ -\mfCoffeeBean{} \quad mfCoffeeBean \\ -\mfScalaAlt{} \quad mfScalaAlt \\ -\mfPlatter{} \quad mfPlatter \\ -\mfJavaDuke{} \quad mfJavaDuke \\ -\mfIphone{} \quad mfIphone \\ -\mfScriptAlt{} \quad mfScriptAlt \\ -\mfGoogleAlt{} \quad mfGoogleAlt \\ -\mfHaskell{} \quad mfHaskell \\ -\mfMariadb{} \quad mfMariadb \\ -\mfPhoneRetro{} \quad mfPhoneRetro \\ -\mfPhoneAlt{} \quad mfPhoneAlt \\ -\mfCsharp{} \quad mfCsharp \\ -\mfPhp{} \quad mfPhp \\ -\mfPostgresAlt{} \quad mfPostgresAlt \\ -\mfHtml{} \quad mfHtml \\ -\mfMfizz{} \quad mfMfizz \\ -\mfApache{} \quad mfApache \\ -\mfHadoop{} \quad mfHadoop \\ -\mfRubyOnRailsAlt{} \quad mfRubyOnRailsAlt \\ -\mfMobilePhoneBroadcast{} \quad mfMobilePhoneBroadcast \\ -\mfCss{} \quad mfCss \\ -\mfPlayframework{} \quad mfPlayframework \\ -\mfClojure{} \quad mfClojure \\ -\mfMobilePhoneAlt{} \quad mfMobilePhoneAlt \\ -\mfSuse{} \quad mfSuse \\ -\mfJavaBold{} \quad mfJavaBold \\ -\mfNginxAlt{} \quad mfNginxAlt \\ -\mfNginxAltTwo{} \quad mfNginxAltTwo \\ -\mfLinuxMint{} \quad mfLinuxMint \\ -\mfDreamhost{} \quad mfDreamhost \\ -\mfBlackberry{} \quad mfBlackberry \\ -\mfJavascript{} \quad mfJavascript \\ -\mfUbuntu{} \quad mfUbuntu \\ -\mfPhpAlt{} \quad mfPhpAlt \\ -\mfCentos{} \quad mfCentos \\ -\mfNodejs{} \quad mfNodejs \\ -\mfSplatter{} \quad mfSplatter \\ -\mfThreeDprint{} \quad mfThreeDprint \\ -\mfLineGraph{} \quad mfLineGraph \\ -\mfCassandra{} \quad mfCassandra \\ -\mfSolaris{} \quad mfSolaris \\ -\mfJetty{} \quad mfJetty \\ -\mfTomcat{} \quad mfTomcat \\ -\mfOracle{} \quad mfOracle \\ -\mfOracleAlt{} \quad mfOracleAlt \\ -\mfMssql{} \quad mfMssql \\ -\mfGoogleDevelopers{} \quad mfGoogleDevelopers \\ -\mfGoogleCode{} \quad mfGoogleCode \\ -\mfKde{} \quad mfKde \\ -\mfGrailsAlt{} \quad mfGrailsAlt \\ +\section*{fontmfizz} +\mfThreedprint \quad \char`\\mfThreedprint \\ +\mfAlpinelinux \quad \char`\\mfAlpinelinux \\ +\mfAngular \quad \char`\\mfAngular \\ +\mfAngularAlt \quad \char`\\mfAngularAlt \\ +\mfAntenna \quad \char`\\mfAntenna \\ +\mfApache \quad \char`\\mfApache \\ +\mfArchlinux \quad \char`\\mfArchlinux \\ +\mfAws \quad \char`\\mfAws \\ +\mfAzure \quad \char`\\mfAzure \\ +\mfBackbone \quad \char`\\mfBackbone \\ +\mfBlackberry \quad \char`\\mfBlackberry \\ +\mfBomb \quad \char`\\mfBomb \\ +\mfBootstrap \quad \char`\\mfBootstrap \\ +\mfC \quad \char`\\mfC \\ +\mfCassandra \quad \char`\\mfCassandra \\ +\mfCentos \quad \char`\\mfCentos \\ +\mfClojure \quad \char`\\mfClojure \\ +\mfCodeigniter \quad \char`\\mfCodeigniter \\ +\mfCodepen \quad \char`\\mfCodepen \\ +\mfCoffeeBean \quad \char`\\mfCoffeeBean \\ +\mfCplusplus \quad \char`\\mfCplusplus \\ +\mfCsharp \quad \char`\\mfCsharp \\ +\mfCss \quad \char`\\mfCss \\ +\mfCssthree \quad \char`\\mfCssthree \\ +\mfCssthreeAlt \quad \char`\\mfCssthreeAlt \\ +\mfDthree \quad \char`\\mfDthree \\ +\mfDatabase \quad \char`\\mfDatabase \\ +\mfDatabaseAlt \quad \char`\\mfDatabaseAlt \\ +\mfDatabaseAlttwo \quad \char`\\mfDatabaseAlttwo \\ +\mfDebian \quad \char`\\mfDebian \\ +\mfDocker \quad \char`\\mfDocker \\ +\mfDreamhost \quad \char`\\mfDreamhost \\ +\mfElixir \quad \char`\\mfElixir \\ +\mfElm \quad \char`\\mfElm \\ +\mfErlang \quad \char`\\mfErlang \\ +\mfExherbo \quad \char`\\mfExherbo \\ +\mfFedora \quad \char`\\mfFedora \\ +\mfFireAlt \quad \char`\\mfFireAlt \\ +\mfFreebsd \quad \char`\\mfFreebsd \\ +\mfFreecodecamp \quad \char`\\mfFreecodecamp \\ +\mfGentoo \quad \char`\\mfGentoo \\ +\mfGhost \quad \char`\\mfGhost \\ +\mfGit \quad \char`\\mfGit \\ +\mfGnome \quad \char`\\mfGnome \\ +\mfGo \quad \char`\\mfGo \\ +\mfGoAlt \quad \char`\\mfGoAlt \\ +\mfGoogle \quad \char`\\mfGoogle \\ +\mfGoogleAlt \quad \char`\\mfGoogleAlt \\ +\mfGoogleCode \quad \char`\\mfGoogleCode \\ +\mfGoogleDevelopers \quad \char`\\mfGoogleDevelopers \\ +\mfGradle \quad \char`\\mfGradle \\ +\mfGrails \quad \char`\\mfGrails \\ +\mfGrailsAlt \quad \char`\\mfGrailsAlt \\ +\mfGrunt \quad \char`\\mfGrunt \\ +\mfGulp \quad \char`\\mfGulp \\ +\mfGulpAlt \quad \char`\\mfGulpAlt \\ +\mfHadoop \quad \char`\\mfHadoop \\ +\mfHaskell \quad \char`\\mfHaskell \\ +\mfHeroku \quad \char`\\mfHeroku \\ +\mfHtml \quad \char`\\mfHtml \\ +\mfHtmlfive \quad \char`\\mfHtmlfive \\ +\mfHtmlfiveAlt \quad \char`\\mfHtmlfiveAlt \\ +\mfIphone \quad \char`\\mfIphone \\ +\mfJava \quad \char`\\mfJava \\ +\mfJavaBold \quad \char`\\mfJavaBold \\ +\mfJavaDuke \quad \char`\\mfJavaDuke \\ +\mfJavascript \quad \char`\\mfJavascript \\ +\mfJavascriptAlt \quad \char`\\mfJavascriptAlt \\ +\mfJetty \quad \char`\\mfJetty \\ +\mfJquery \quad \char`\\mfJquery \\ +\mfKde \quad \char`\\mfKde \\ +\mfLaravel \quad \char`\\mfLaravel \\ +\mfLineGraph \quad \char`\\mfLineGraph \\ +\mfLinuxMint \quad \char`\\mfLinuxMint \\ +\mfLooking \quad \char`\\mfLooking \\ +\mfMagento \quad \char`\\mfMagento \\ +\mfMariadb \quad \char`\\mfMariadb \\ +\mfMaven \quad \char`\\mfMaven \\ +\mfMicroscope \quad \char`\\mfMicroscope \\ +\mfMobileDevice \quad \char`\\mfMobileDevice \\ +\mfMobilePhoneAlt \quad \char`\\mfMobilePhoneAlt \\ +\mfMobilePhoneBroadcast \quad \char`\\mfMobilePhoneBroadcast \\ +\mfMongodb \quad \char`\\mfMongodb \\ +\mfMssql \quad \char`\\mfMssql \\ +\mfMysql \quad \char`\\mfMysql \\ +\mfMysqlAlt \quad \char`\\mfMysqlAlt \\ +\mfNetbsd \quad \char`\\mfNetbsd \\ +\mfNginx \quad \char`\\mfNginx \\ +\mfNginxAlt \quad \char`\\mfNginxAlt \\ +\mfNginxAlttwo \quad \char`\\mfNginxAlttwo \\ +\mfNodejs \quad \char`\\mfNodejs \\ +\mfNpm \quad \char`\\mfNpm \\ +\mfObjc \quad \char`\\mfObjc \\ +\mfOpenshift \quad \char`\\mfOpenshift \\ +\mfOracle \quad \char`\\mfOracle \\ +\mfOracleAlt \quad \char`\\mfOracleAlt \\ +\mfOsx \quad \char`\\mfOsx \\ +\mfPerl \quad \char`\\mfPerl \\ +\mfPhoneAlt \quad \char`\\mfPhoneAlt \\ +\mfPhoneGap \quad \char`\\mfPhoneGap \\ +\mfPhoneRetro \quad \char`\\mfPhoneRetro \\ +\mfPhp \quad \char`\\mfPhp \\ +\mfPhpAlt \quad \char`\\mfPhpAlt \\ +\mfPlayframework \quad \char`\\mfPlayframework \\ +\mfPlayframeworkAlt \quad \char`\\mfPlayframeworkAlt \\ +\mfPlone \quad \char`\\mfPlone \\ +\mfPostgres \quad \char`\\mfPostgres \\ +\mfPostgresAlt \quad \char`\\mfPostgresAlt \\ +\mfPython \quad \char`\\mfPython \\ +\mfRaspberrypi \quad \char`\\mfRaspberrypi \\ +\mfReactjs \quad \char`\\mfReactjs \\ +\mfRedhat \quad \char`\\mfRedhat \\ +\mfRedis \quad \char`\\mfRedis \\ +\mfRuby \quad \char`\\mfRuby \\ +\mfRubyOnRails \quad \char`\\mfRubyOnRails \\ +\mfRubyOnRailsAlt \quad \char`\\mfRubyOnRailsAlt \\ +\mfRust \quad \char`\\mfRust \\ +\mfSass \quad \char`\\mfSass \\ +\mfSatellite \quad \char`\\mfSatellite \\ +\mfScala \quad \char`\\mfScala \\ +\mfScalaAlt \quad \char`\\mfScalaAlt \\ +\mfScript \quad \char`\\mfScript \\ +\mfScriptAlt \quad \char`\\mfScriptAlt \\ +\mfShell \quad \char`\\mfShell \\ +\mfSitefinity \quad \char`\\mfSitefinity \\ +\mfSolaris \quad \char`\\mfSolaris \\ +\mfSplatter \quad \char`\\mfSplatter \\ +\mfSpring \quad \char`\\mfSpring \\ +\mfSuse \quad \char`\\mfSuse \\ +\mfSvg \quad \char`\\mfSvg \\ +\mfSymfony \quad \char`\\mfSymfony \\ +\mfTomcat \quad \char`\\mfTomcat \\ +\mfUbuntu \quad \char`\\mfUbuntu \\ +\mfUnity \quad \char`\\mfUnity \\ +\mfWireless \quad \char`\\mfWireless \\ +\mfWordpress \quad \char`\\mfWordpress \\ +\mfXeleven \quad \char`\\mfXeleven \\ -\end{document} +\end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontmfizz.doc.tlpobj new/tlpkg/tlpobj/fontmfizz.doc.tlpobj --- old/tlpkg/tlpobj/fontmfizz.doc.tlpobj 2016-04-14 19:03:03.000000000 +0200 +++ new/tlpkg/tlpobj/fontmfizz.doc.tlpobj 2017-04-14 17:40:52.000000000 +0200 @@ -1,9 +1,9 @@ name fontmfizz.doc category Package -revision 35892 +revision 43546 shortdesc doc files of fontmfizz relocated 1 -docfiles size=13 +docfiles size=17 RELOC/doc/fonts/fontmfizz/LICENSE RELOC/doc/fonts/fontmfizz/README RELOC/doc/fonts/fontmfizz/fontmfizz.pdf ++++++ fontmfizz.tar.xz ++++++ Binary files old/fonts/truetype/public/fontmfizz/font-mfizz.ttf and new/fonts/truetype/public/fontmfizz/font-mfizz.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontmfizz/fontmfizz.sty new/tex/latex/fontmfizz/fontmfizz.sty --- old/tex/latex/fontmfizz/fontmfizz.sty 2014-12-24 01:14:55.000000000 +0100 +++ new/tex/latex/fontmfizz/fontmfizz.sty 2017-03-20 00:01:08.000000000 +0100 @@ -9,7 +9,7 @@ % http://opensource.org/licenses/MIT. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fontmfizz}[2014/12/23] +\ProvidesPackage{fontmfizz}[2017/03/19] \usepackage{fontspec} @@ -17,96 +17,142 @@ \newcommand*{\mficon}[1]{% {FA\csname mficon@#1\endcsname}} -\expandafter\def\csname mficon@microscope\endcsname {\symbol{"F100}} \def\mfMicroscope {{\MF\csname mficon@microscope\endcsname}} -\expandafter\def\csname mficon@cplusplus\endcsname {\symbol{"F101}} \def\mfCplusplus {{\MF\csname mficon@cplusplus\endcsname}} -\expandafter\def\csname mficon@wireless\endcsname {\symbol{"F102}} \def\mfWireless {{\MF\csname mficon@wireless\endcsname}} -\expandafter\def\csname mficon@fire-alt\endcsname {\symbol{"F103}} \def\mfFireAlt {{\MF\csname mficon@fire-alt\endcsname}} -\expandafter\def\csname mficon@mobile-device\endcsname {\symbol{"F104}} \def\mfMobileDevice {{\MF\csname mficon@mobile-device\endcsname}} -\expandafter\def\csname mficon@objc\endcsname {\symbol{"F105}} \def\mfObjc {{\MF\csname mficon@objc\endcsname}} -\expandafter\def\csname mficon@redhat\endcsname {\symbol{"F106}} \def\mfRedhat {{\MF\csname mficon@redhat\endcsname}} -\expandafter\def\csname mficon@freebsd\endcsname {\symbol{"F107}} \def\mfFreebsd {{\MF\csname mficon@freebsd\endcsname}} -\expandafter\def\csname mficon@heroku\endcsname {\symbol{"F108}} \def\mfHeroku {{\MF\csname mficon@heroku\endcsname}} -\expandafter\def\csname mficon@python\endcsname {\symbol{"F109}} \def\mfPython {{\MF\csname mficon@python\endcsname}} -\expandafter\def\csname mficon@java\endcsname {\symbol{"F10A}} \def\mfJava {{\MF\csname mficon@java\endcsname}} -\expandafter\def\csname mficon@satellite\endcsname {\symbol{"F10B}} \def\mfSatellite {{\MF\csname mficon@satellite\endcsname}} -\expandafter\def\csname mficon@debian\endcsname {\symbol{"F10C}} \def\mfDebian {{\MF\csname mficon@debian\endcsname}} -\expandafter\def\csname mficon@grails\endcsname {\symbol{"F10D}} \def\mfGrails {{\MF\csname mficon@grails\endcsname}} -\expandafter\def\csname mficon@c\endcsname {\symbol{"F10E}} \def\mfC {{\MF\csname mficon@c\endcsname}} -\expandafter\def\csname mficon@postgres\endcsname {\symbol{"F10F}} \def\mfPostgres {{\MF\csname mficon@postgres\endcsname}} -\expandafter\def\csname mficon@database-alt2\endcsname {\symbol{"F110}} \def\mfDatabaseAltTwo {{\MF\csname mficon@database-alt2\endcsname}} -\expandafter\def\csname mficon@raspberrypi\endcsname {\symbol{"F111}} \def\mfRaspberrypi {{\MF\csname mficon@raspberrypi\endcsname}} -\expandafter\def\csname mficon@nginx\endcsname {\symbol{"F112}} \def\mfNginx {{\MF\csname mficon@nginx\endcsname}} -\expandafter\def\csname mficon@ruby-on-rails\endcsname {\symbol{"F113}} \def\mfRubyOnRails {{\MF\csname mficon@ruby-on-rails\endcsname}} -\expandafter\def\csname mficon@redis\endcsname {\symbol{"F114}} \def\mfRedis {{\MF\csname mficon@redis\endcsname}} -\expandafter\def\csname mficon@scala\endcsname {\symbol{"F115}} \def\mfScala {{\MF\csname mficon@scala\endcsname}} -\expandafter\def\csname mficon@gnome\endcsname {\symbol{"F116}} \def\mfGnome {{\MF\csname mficon@gnome\endcsname}} -\expandafter\def\csname mficon@perl\endcsname {\symbol{"F117}} \def\mfPerl {{\MF\csname mficon@perl\endcsname}} -\expandafter\def\csname mficon@mysql\endcsname {\symbol{"F118}} \def\mfMysql {{\MF\csname mficon@mysql\endcsname}} -\expandafter\def\csname mficon@fedora\endcsname {\symbol{"F119}} \def\mfFedora {{\MF\csname mficon@fedora\endcsname}} -\expandafter\def\csname mficon@ghost\endcsname {\symbol{"F11A}} \def\mfGhost {{\MF\csname mficon@ghost\endcsname}} -\expandafter\def\csname mficon@google\endcsname {\symbol{"F11B}} \def\mfGoogle {{\MF\csname mficon@google\endcsname}} -\expandafter\def\csname mficon@netbsd\endcsname {\symbol{"F11C}} \def\mfNetbsd {{\MF\csname mficon@netbsd\endcsname}} -\expandafter\def\csname mficon@aws\endcsname {\symbol{"F11D}} \def\mfAws {{\MF\csname mficon@aws\endcsname}} -\expandafter\def\csname mficon@bomb\endcsname {\symbol{"F11E}} \def\mfBomb {{\MF\csname mficon@bomb\endcsname}} -\expandafter\def\csname mficon@looking\endcsname {\symbol{"F11F}} \def\mfLooking {{\MF\csname mficon@looking\endcsname}} -\expandafter\def\csname mficon@ruby\endcsname {\symbol{"F120}} \def\mfRuby {{\MF\csname mficon@ruby\endcsname}} -\expandafter\def\csname mficon@mysql-alt\endcsname {\symbol{"F121}} \def\mfMysqlAlt {{\MF\csname mficon@mysql-alt\endcsname}} -\expandafter\def\csname mficon@playframework-alt\endcsname {\symbol{"F122}} \def\mfPlayframeworkAlt {{\MF\csname mficon@playframework-alt\endcsname}} -\expandafter\def\csname mficon@osx\endcsname {\symbol{"F123}} \def\mfOsx {{\MF\csname mficon@osx\endcsname}} -\expandafter\def\csname mficon@database\endcsname {\symbol{"F124}} \def\mfDatabase {{\MF\csname mficon@database\endcsname}} -\expandafter\def\csname mficon@database-alt\endcsname {\symbol{"F125}} \def\mfDatabaseAlt {{\MF\csname mficon@database-alt\endcsname}} -\expandafter\def\csname mficon@shell\endcsname {\symbol{"F126}} \def\mfShell {{\MF\csname mficon@shell\endcsname}} -\expandafter\def\csname mficon@script\endcsname {\symbol{"F127}} \def\mfScript {{\MF\csname mficon@script\endcsname}} -\expandafter\def\csname mficon@antenna\endcsname {\symbol{"F128}} \def\mfAntenna {{\MF\csname mficon@antenna\endcsname}} -\expandafter\def\csname mficon@coffee-bean\endcsname {\symbol{"F129}} \def\mfCoffeeBean {{\MF\csname mficon@coffee-bean\endcsname}} -\expandafter\def\csname mficon@scala-alt\endcsname {\symbol{"F12A}} \def\mfScalaAlt {{\MF\csname mficon@scala-alt\endcsname}} -\expandafter\def\csname mficon@platter\endcsname {\symbol{"F12B}} \def\mfPlatter {{\MF\csname mficon@platter\endcsname}} -\expandafter\def\csname mficon@java-duke\endcsname {\symbol{"F12C}} \def\mfJavaDuke {{\MF\csname mficon@java-duke\endcsname}} -\expandafter\def\csname mficon@iphone\endcsname {\symbol{"F12D}} \def\mfIphone {{\MF\csname mficon@iphone\endcsname}} -\expandafter\def\csname mficon@script-alt\endcsname {\symbol{"F12E}} \def\mfScriptAlt {{\MF\csname mficon@script-alt\endcsname}} -\expandafter\def\csname mficon@google-alt\endcsname {\symbol{"F12F}} \def\mfGoogleAlt {{\MF\csname mficon@google-alt\endcsname}} -\expandafter\def\csname mficon@haskell\endcsname {\symbol{"F130}} \def\mfHaskell {{\MF\csname mficon@haskell\endcsname}} -\expandafter\def\csname mficon@mariadb\endcsname {\symbol{"F131}} \def\mfMariadb {{\MF\csname mficon@mariadb\endcsname}} -\expandafter\def\csname mficon@phone-retro\endcsname {\symbol{"F132}} \def\mfPhoneRetro {{\MF\csname mficon@phone-retro\endcsname}} -\expandafter\def\csname mficon@phone-alt\endcsname {\symbol{"F133}} \def\mfPhoneAlt {{\MF\csname mficon@phone-alt\endcsname}} -\expandafter\def\csname mficon@csharp\endcsname {\symbol{"F134}} \def\mfCsharp {{\MF\csname mficon@csharp\endcsname}} -\expandafter\def\csname mficon@php\endcsname {\symbol{"F135}} \def\mfPhp {{\MF\csname mficon@php\endcsname}} -\expandafter\def\csname mficon@postgres-alt\endcsname {\symbol{"F136}} \def\mfPostgresAlt {{\MF\csname mficon@postgres-alt\endcsname}} -\expandafter\def\csname mficon@html\endcsname {\symbol{"F137}} \def\mfHtml {{\MF\csname mficon@html\endcsname}} -\expandafter\def\csname mficon@mfizz\endcsname {\symbol{"F138}} \def\mfMfizz {{\MF\csname mficon@mfizz\endcsname}} -\expandafter\def\csname mficon@apache\endcsname {\symbol{"F139}} \def\mfApache {{\MF\csname mficon@apache\endcsname}} -\expandafter\def\csname mficon@hadoop\endcsname {\symbol{"F13A}} \def\mfHadoop {{\MF\csname mficon@hadoop\endcsname}} -\expandafter\def\csname mficon@ruby-on-rails-alt\endcsname {\symbol{"F13B}} \def\mfRubyOnRailsAlt {{\MF\csname mficon@ruby-on-rails-alt\endcsname}} -\expandafter\def\csname mficon@mobile-phone-broadcast\endcsname {\symbol{"F13C}} \def\mfMobilePhoneBroadcast {{\MF\csname mficon@mobile-phone-broadcast\endcsname}} -\expandafter\def\csname mficon@css\endcsname {\symbol{"F13D}} \def\mfCss {{\MF\csname mficon@css\endcsname}} -\expandafter\def\csname mficon@playframework\endcsname {\symbol{"F13E}} \def\mfPlayframework {{\MF\csname mficon@playframework\endcsname}} -\expandafter\def\csname mficon@clojure\endcsname {\symbol{"F13F}} \def\mfClojure {{\MF\csname mficon@clojure\endcsname}} -\expandafter\def\csname mficon@mobile-phone-alt\endcsname {\symbol{"F140}} \def\mfMobilePhoneAlt {{\MF\csname mficon@mobile-phone-alt\endcsname}} -\expandafter\def\csname mficon@suse\endcsname {\symbol{"F141}} \def\mfSuse {{\MF\csname mficon@suse\endcsname}} -\expandafter\def\csname mficon@java-bold\endcsname {\symbol{"F142}} \def\mfJavaBold {{\MF\csname mficon@java-bold\endcsname}} -\expandafter\def\csname mficon@nginx-alt\endcsname {\symbol{"F143}} \def\mfNginxAlt {{\MF\csname mficon@nginx-alt\endcsname}} -\expandafter\def\csname mficon@nginx-alt2\endcsname {\symbol{"F144}} \def\mfNginxAltTwo {{\MF\csname mficon@nginx-alt2\endcsname}} -\expandafter\def\csname mficon@linux-mint\endcsname {\symbol{"F145}} \def\mfLinuxMint {{\MF\csname mficon@linux-mint\endcsname}} -\expandafter\def\csname mficon@dreamhost\endcsname {\symbol{"F146}} \def\mfDreamhost {{\MF\csname mficon@dreamhost\endcsname}} -\expandafter\def\csname mficon@blackberry\endcsname {\symbol{"F147}} \def\mfBlackberry {{\MF\csname mficon@blackberry\endcsname}} -\expandafter\def\csname mficon@javascript\endcsname {\symbol{"F148}} \def\mfJavascript {{\MF\csname mficon@javascript\endcsname}} -\expandafter\def\csname mficon@ubuntu\endcsname {\symbol{"F149}} \def\mfUbuntu {{\MF\csname mficon@ubuntu\endcsname}} -\expandafter\def\csname mficon@php-alt\endcsname {\symbol{"F14A}} \def\mfPhpAlt {{\MF\csname mficon@php-alt\endcsname}} -\expandafter\def\csname mficon@centos\endcsname {\symbol{"F14B}} \def\mfCentos {{\MF\csname mficon@centos\endcsname}} -\expandafter\def\csname mficon@nodejs\endcsname {\symbol{"F14C}} \def\mfNodejs {{\MF\csname mficon@nodejs\endcsname}} -\expandafter\def\csname mficon@splatter\endcsname {\symbol{"F14D}} \def\mfSplatter {{\MF\csname mficon@splatter\endcsname}} -\expandafter\def\csname mficon@3dprint\endcsname {\symbol{"F14E}} \def\mfThreeDprint {{\MF\csname mficon@3dprint\endcsname}} -\expandafter\def\csname mficon@line-graph\endcsname {\symbol{"F14F}} \def\mfLineGraph {{\MF\csname mficon@line-graph\endcsname}} -\expandafter\def\csname mficon@cassandra\endcsname {\symbol{"F150}} \def\mfCassandra {{\MF\csname mficon@cassandra\endcsname}} -\expandafter\def\csname mficon@solaris\endcsname {\symbol{"F151}} \def\mfSolaris {{\MF\csname mficon@solaris\endcsname}} -\expandafter\def\csname mficon@jetty\endcsname {\symbol{"F152}} \def\mfJetty {{\MF\csname mficon@jetty\endcsname}} -\expandafter\def\csname mficon@tomcat\endcsname {\symbol{"F153}} \def\mfTomcat {{\MF\csname mficon@tomcat\endcsname}} -\expandafter\def\csname mficon@oracle\endcsname {\symbol{"F154}} \def\mfOracle {{\MF\csname mficon@oracle\endcsname}} -\expandafter\def\csname mficon@oracle-alt\endcsname {\symbol{"F155}} \def\mfOracleAlt {{\MF\csname mficon@oracle-alt\endcsname}} -\expandafter\def\csname mficon@mssql\endcsname {\symbol{"F156}} \def\mfMssql {{\MF\csname mficon@mssql\endcsname}} -\expandafter\def\csname mficon@google-developers\endcsname {\symbol{"F157}} \def\mfGoogleDevelopers {{\MF\csname mficon@google-developers\endcsname}} -\expandafter\def\csname mficon@google-code\endcsname {\symbol{"F158}} \def\mfGoogleCode {{\MF\csname mficon@google-code\endcsname}} -\expandafter\def\csname mficon@kde\endcsname {\symbol{"F159}} \def\mfKde {{\MF\csname mficon@kde\endcsname}} -\expandafter\def\csname mficon@grails-alt\endcsname {\symbol{"F15A}} \def\mfGrailsAlt {{\MF\csname mficon@grails-alt\endcsname}} +\expandafter\def\csname mficon@mfThreedprint\endcsname {\symbol{"F100}} \def\mfThreedprint {{\MF\csname mficon@mfThreedprint\endcsname}} +\expandafter\def\csname mficon@mfAlpinelinux\endcsname {\symbol{"F101}} \def\mfAlpinelinux {{\MF\csname mficon@mfAlpinelinux\endcsname}} +\expandafter\def\csname mficon@mfAngular\endcsname {\symbol{"F102}} \def\mfAngular {{\MF\csname mficon@mfAngular\endcsname}} +\expandafter\def\csname mficon@mfAngularAlt\endcsname {\symbol{"F103}} \def\mfAngularAlt {{\MF\csname mficon@mfAngularAlt\endcsname}} +\expandafter\def\csname mficon@mfAntenna\endcsname {\symbol{"F104}} \def\mfAntenna {{\MF\csname mficon@mfAntenna\endcsname}} +\expandafter\def\csname mficon@mfApache\endcsname {\symbol{"F105}} \def\mfApache {{\MF\csname mficon@mfApache\endcsname}} +\expandafter\def\csname mficon@mfArchlinux\endcsname {\symbol{"F106}} \def\mfArchlinux {{\MF\csname mficon@mfArchlinux\endcsname}} +\expandafter\def\csname mficon@mfAws\endcsname {\symbol{"F107}} \def\mfAws {{\MF\csname mficon@mfAws\endcsname}} +\expandafter\def\csname mficon@mfAzure\endcsname {\symbol{"F108}} \def\mfAzure {{\MF\csname mficon@mfAzure\endcsname}} +\expandafter\def\csname mficon@mfBackbone\endcsname {\symbol{"F109}} \def\mfBackbone {{\MF\csname mficon@mfBackbone\endcsname}} +\expandafter\def\csname mficon@mfBlackberry\endcsname {\symbol{"F10A}} \def\mfBlackberry {{\MF\csname mficon@mfBlackberry\endcsname}} +\expandafter\def\csname mficon@mfBomb\endcsname {\symbol{"F10B}} \def\mfBomb {{\MF\csname mficon@mfBomb\endcsname}} +\expandafter\def\csname mficon@mfBootstrap\endcsname {\symbol{"F10C}} \def\mfBootstrap {{\MF\csname mficon@mfBootstrap\endcsname}} +\expandafter\def\csname mficon@mfC\endcsname {\symbol{"F10D}} \def\mfC {{\MF\csname mficon@mfC\endcsname}} +\expandafter\def\csname mficon@mfCassandra\endcsname {\symbol{"F10E}} \def\mfCassandra {{\MF\csname mficon@mfCassandra\endcsname}} +\expandafter\def\csname mficon@mfCentos\endcsname {\symbol{"F10F}} \def\mfCentos {{\MF\csname mficon@mfCentos\endcsname}} +\expandafter\def\csname mficon@mfClojure\endcsname {\symbol{"F110}} \def\mfClojure {{\MF\csname mficon@mfClojure\endcsname}} +\expandafter\def\csname mficon@mfCodeigniter\endcsname {\symbol{"F111}} \def\mfCodeigniter {{\MF\csname mficon@mfCodeigniter\endcsname}} +\expandafter\def\csname mficon@mfCodepen\endcsname {\symbol{"F112}} \def\mfCodepen {{\MF\csname mficon@mfCodepen\endcsname}} +\expandafter\def\csname mficon@mfCoffeeBean\endcsname {\symbol{"F113}} \def\mfCoffeeBean {{\MF\csname mficon@mfCoffeeBean\endcsname}} +\expandafter\def\csname mficon@mfCplusplus\endcsname {\symbol{"F114}} \def\mfCplusplus {{\MF\csname mficon@mfCplusplus\endcsname}} +\expandafter\def\csname mficon@mfCsharp\endcsname {\symbol{"F115}} \def\mfCsharp {{\MF\csname mficon@mfCsharp\endcsname}} +\expandafter\def\csname mficon@mfCss\endcsname {\symbol{"F116}} \def\mfCss {{\MF\csname mficon@mfCss\endcsname}} +\expandafter\def\csname mficon@mfCssthree\endcsname {\symbol{"F117}} \def\mfCssthree {{\MF\csname mficon@mfCssthree\endcsname}} +\expandafter\def\csname mficon@mfCssthreeAlt\endcsname {\symbol{"F118}} \def\mfCssthreeAlt {{\MF\csname mficon@mfCssthreeAlt\endcsname}} +\expandafter\def\csname mficon@mfDthree\endcsname {\symbol{"F119}} \def\mfDthree {{\MF\csname mficon@mfDthree\endcsname}} +\expandafter\def\csname mficon@mfDatabase\endcsname {\symbol{"F11A}} \def\mfDatabase {{\MF\csname mficon@mfDatabase\endcsname}} +\expandafter\def\csname mficon@mfDatabaseAlt\endcsname {\symbol{"F11B}} \def\mfDatabaseAlt {{\MF\csname mficon@mfDatabaseAlt\endcsname}} +\expandafter\def\csname mficon@mfDatabaseAlttwo\endcsname {\symbol{"F11C}} \def\mfDatabaseAlttwo {{\MF\csname mficon@mfDatabaseAlttwo\endcsname}} +\expandafter\def\csname mficon@mfDebian\endcsname {\symbol{"F11D}} \def\mfDebian {{\MF\csname mficon@mfDebian\endcsname}} +\expandafter\def\csname mficon@mfDocker\endcsname {\symbol{"F11E}} \def\mfDocker {{\MF\csname mficon@mfDocker\endcsname}} +\expandafter\def\csname mficon@mfDreamhost\endcsname {\symbol{"F11F}} \def\mfDreamhost {{\MF\csname mficon@mfDreamhost\endcsname}} +\expandafter\def\csname mficon@mfElixir\endcsname {\symbol{"F120}} \def\mfElixir {{\MF\csname mficon@mfElixir\endcsname}} +\expandafter\def\csname mficon@mfElm\endcsname {\symbol{"F121}} \def\mfElm {{\MF\csname mficon@mfElm\endcsname}} +\expandafter\def\csname mficon@mfErlang\endcsname {\symbol{"F122}} \def\mfErlang {{\MF\csname mficon@mfErlang\endcsname}} +\expandafter\def\csname mficon@mfExherbo\endcsname {\symbol{"F123}} \def\mfExherbo {{\MF\csname mficon@mfExherbo\endcsname}} +\expandafter\def\csname mficon@mfFedora\endcsname {\symbol{"F124}} \def\mfFedora {{\MF\csname mficon@mfFedora\endcsname}} +\expandafter\def\csname mficon@mfFireAlt\endcsname {\symbol{"F125}} \def\mfFireAlt {{\MF\csname mficon@mfFireAlt\endcsname}} +\expandafter\def\csname mficon@mfFreebsd\endcsname {\symbol{"F126}} \def\mfFreebsd {{\MF\csname mficon@mfFreebsd\endcsname}} +\expandafter\def\csname mficon@mfFreecodecamp\endcsname {\symbol{"F127}} \def\mfFreecodecamp {{\MF\csname mficon@mfFreecodecamp\endcsname}} +\expandafter\def\csname mficon@mfGentoo\endcsname {\symbol{"F128}} \def\mfGentoo {{\MF\csname mficon@mfGentoo\endcsname}} +\expandafter\def\csname mficon@mfGhost\endcsname {\symbol{"F129}} \def\mfGhost {{\MF\csname mficon@mfGhost\endcsname}} +\expandafter\def\csname mficon@mfGit\endcsname {\symbol{"F12A}} \def\mfGit {{\MF\csname mficon@mfGit\endcsname}} +\expandafter\def\csname mficon@mfGnome\endcsname {\symbol{"F12B}} \def\mfGnome {{\MF\csname mficon@mfGnome\endcsname}} +\expandafter\def\csname mficon@mfGo\endcsname {\symbol{"F12C}} \def\mfGo {{\MF\csname mficon@mfGo\endcsname}} +\expandafter\def\csname mficon@mfGoAlt\endcsname {\symbol{"F12D}} \def\mfGoAlt {{\MF\csname mficon@mfGoAlt\endcsname}} +\expandafter\def\csname mficon@mfGoogle\endcsname {\symbol{"F12E}} \def\mfGoogle {{\MF\csname mficon@mfGoogle\endcsname}} +\expandafter\def\csname mficon@mfGoogleAlt\endcsname {\symbol{"F12F}} \def\mfGoogleAlt {{\MF\csname mficon@mfGoogleAlt\endcsname}} +\expandafter\def\csname mficon@mfGoogleCode\endcsname {\symbol{"F130}} \def\mfGoogleCode {{\MF\csname mficon@mfGoogleCode\endcsname}} +\expandafter\def\csname mficon@mfGoogleDevelopers\endcsname {\symbol{"F131}} \def\mfGoogleDevelopers {{\MF\csname mficon@mfGoogleDevelopers\endcsname}} +\expandafter\def\csname mficon@mfGradle\endcsname {\symbol{"F132}} \def\mfGradle {{\MF\csname mficon@mfGradle\endcsname}} +\expandafter\def\csname mficon@mfGrails\endcsname {\symbol{"F133}} \def\mfGrails {{\MF\csname mficon@mfGrails\endcsname}} +\expandafter\def\csname mficon@mfGrailsAlt\endcsname {\symbol{"F134}} \def\mfGrailsAlt {{\MF\csname mficon@mfGrailsAlt\endcsname}} +\expandafter\def\csname mficon@mfGrunt\endcsname {\symbol{"F135}} \def\mfGrunt {{\MF\csname mficon@mfGrunt\endcsname}} +\expandafter\def\csname mficon@mfGulp\endcsname {\symbol{"F136}} \def\mfGulp {{\MF\csname mficon@mfGulp\endcsname}} +\expandafter\def\csname mficon@mfGulpAlt\endcsname {\symbol{"F137}} \def\mfGulpAlt {{\MF\csname mficon@mfGulpAlt\endcsname}} +\expandafter\def\csname mficon@mfHadoop\endcsname {\symbol{"F138}} \def\mfHadoop {{\MF\csname mficon@mfHadoop\endcsname}} +\expandafter\def\csname mficon@mfHaskell\endcsname {\symbol{"F139}} \def\mfHaskell {{\MF\csname mficon@mfHaskell\endcsname}} +\expandafter\def\csname mficon@mfHeroku\endcsname {\symbol{"F13A}} \def\mfHeroku {{\MF\csname mficon@mfHeroku\endcsname}} +\expandafter\def\csname mficon@mfHtml\endcsname {\symbol{"F13B}} \def\mfHtml {{\MF\csname mficon@mfHtml\endcsname}} +\expandafter\def\csname mficon@mfHtmlfive\endcsname {\symbol{"F13C}} \def\mfHtmlfive {{\MF\csname mficon@mfHtmlfive\endcsname}} +\expandafter\def\csname mficon@mfHtmlfiveAlt\endcsname {\symbol{"F13D}} \def\mfHtmlfiveAlt {{\MF\csname mficon@mfHtmlfiveAlt\endcsname}} +\expandafter\def\csname mficon@mfIphone\endcsname {\symbol{"F13E}} \def\mfIphone {{\MF\csname mficon@mfIphone\endcsname}} +\expandafter\def\csname mficon@mfJava\endcsname {\symbol{"F13F}} \def\mfJava {{\MF\csname mficon@mfJava\endcsname}} +\expandafter\def\csname mficon@mfJavaBold\endcsname {\symbol{"F140}} \def\mfJavaBold {{\MF\csname mficon@mfJavaBold\endcsname}} +\expandafter\def\csname mficon@mfJavaDuke\endcsname {\symbol{"F141}} \def\mfJavaDuke {{\MF\csname mficon@mfJavaDuke\endcsname}} +\expandafter\def\csname mficon@mfJavascript\endcsname {\symbol{"F142}} \def\mfJavascript {{\MF\csname mficon@mfJavascript\endcsname}} +\expandafter\def\csname mficon@mfJavascriptAlt\endcsname {\symbol{"F143}} \def\mfJavascriptAlt {{\MF\csname mficon@mfJavascriptAlt\endcsname}} +\expandafter\def\csname mficon@mfJetty\endcsname {\symbol{"F144}} \def\mfJetty {{\MF\csname mficon@mfJetty\endcsname}} +\expandafter\def\csname mficon@mfJquery\endcsname {\symbol{"F145}} \def\mfJquery {{\MF\csname mficon@mfJquery\endcsname}} +\expandafter\def\csname mficon@mfKde\endcsname {\symbol{"F146}} \def\mfKde {{\MF\csname mficon@mfKde\endcsname}} +\expandafter\def\csname mficon@mfLaravel\endcsname {\symbol{"F147}} \def\mfLaravel {{\MF\csname mficon@mfLaravel\endcsname}} +\expandafter\def\csname mficon@mfLineGraph\endcsname {\symbol{"F148}} \def\mfLineGraph {{\MF\csname mficon@mfLineGraph\endcsname}} +\expandafter\def\csname mficon@mfLinuxMint\endcsname {\symbol{"F149}} \def\mfLinuxMint {{\MF\csname mficon@mfLinuxMint\endcsname}} +\expandafter\def\csname mficon@mfLooking\endcsname {\symbol{"F14A}} \def\mfLooking {{\MF\csname mficon@mfLooking\endcsname}} +\expandafter\def\csname mficon@mfMagento\endcsname {\symbol{"F14B}} \def\mfMagento {{\MF\csname mficon@mfMagento\endcsname}} +\expandafter\def\csname mficon@mfMariadb\endcsname {\symbol{"F14C}} \def\mfMariadb {{\MF\csname mficon@mfMariadb\endcsname}} +\expandafter\def\csname mficon@mfMaven\endcsname {\symbol{"F14D}} \def\mfMaven {{\MF\csname mficon@mfMaven\endcsname}} +\expandafter\def\csname mficon@mfMicroscope\endcsname {\symbol{"F14E}} \def\mfMicroscope {{\MF\csname mficon@mfMicroscope\endcsname}} +\expandafter\def\csname mficon@mfMobileDevice\endcsname {\symbol{"F14F}} \def\mfMobileDevice {{\MF\csname mficon@mfMobileDevice\endcsname}} +\expandafter\def\csname mficon@mfMobilePhoneAlt\endcsname {\symbol{"F150}} \def\mfMobilePhoneAlt {{\MF\csname mficon@mfMobilePhoneAlt\endcsname}} +\expandafter\def\csname mficon@mfMobilePhoneBroadcast\endcsname {\symbol{"F151}} \def\mfMobilePhoneBroadcast {{\MF\csname mficon@mfMobilePhoneBroadcast\endcsname}} +\expandafter\def\csname mficon@mfMongodb\endcsname {\symbol{"F152}} \def\mfMongodb {{\MF\csname mficon@mfMongodb\endcsname}} +\expandafter\def\csname mficon@mfMssql\endcsname {\symbol{"F153}} \def\mfMssql {{\MF\csname mficon@mfMssql\endcsname}} +\expandafter\def\csname mficon@mfMysql\endcsname {\symbol{"F154}} \def\mfMysql {{\MF\csname mficon@mfMysql\endcsname}} +\expandafter\def\csname mficon@mfMysqlAlt\endcsname {\symbol{"F155}} \def\mfMysqlAlt {{\MF\csname mficon@mfMysqlAlt\endcsname}} +\expandafter\def\csname mficon@mfNetbsd\endcsname {\symbol{"F156}} \def\mfNetbsd {{\MF\csname mficon@mfNetbsd\endcsname}} +\expandafter\def\csname mficon@mfNginx\endcsname {\symbol{"F157}} \def\mfNginx {{\MF\csname mficon@mfNginx\endcsname}} +\expandafter\def\csname mficon@mfNginxAlt\endcsname {\symbol{"F158}} \def\mfNginxAlt {{\MF\csname mficon@mfNginxAlt\endcsname}} +\expandafter\def\csname mficon@mfNginxAlttwo\endcsname {\symbol{"F159}} \def\mfNginxAlttwo {{\MF\csname mficon@mfNginxAlttwo\endcsname}} +\expandafter\def\csname mficon@mfNodejs\endcsname {\symbol{"F15A}} \def\mfNodejs {{\MF\csname mficon@mfNodejs\endcsname}} +\expandafter\def\csname mficon@mfNpm\endcsname {\symbol{"F15B}} \def\mfNpm {{\MF\csname mficon@mfNpm\endcsname}} +\expandafter\def\csname mficon@mfObjc\endcsname {\symbol{"F15C}} \def\mfObjc {{\MF\csname mficon@mfObjc\endcsname}} +\expandafter\def\csname mficon@mfOpenshift\endcsname {\symbol{"F15D}} \def\mfOpenshift {{\MF\csname mficon@mfOpenshift\endcsname}} +\expandafter\def\csname mficon@mfOracle\endcsname {\symbol{"F15E}} \def\mfOracle {{\MF\csname mficon@mfOracle\endcsname}} +\expandafter\def\csname mficon@mfOracleAlt\endcsname {\symbol{"F15F}} \def\mfOracleAlt {{\MF\csname mficon@mfOracleAlt\endcsname}} +\expandafter\def\csname mficon@mfOsx\endcsname {\symbol{"F160}} \def\mfOsx {{\MF\csname mficon@mfOsx\endcsname}} +\expandafter\def\csname mficon@mfPerl\endcsname {\symbol{"F161}} \def\mfPerl {{\MF\csname mficon@mfPerl\endcsname}} +\expandafter\def\csname mficon@mfPhoneAlt\endcsname {\symbol{"F162}} \def\mfPhoneAlt {{\MF\csname mficon@mfPhoneAlt\endcsname}} +\expandafter\def\csname mficon@mfPhoneGap\endcsname {\symbol{"F163}} \def\mfPhoneGap {{\MF\csname mficon@mfPhoneGap\endcsname}} +\expandafter\def\csname mficon@mfPhoneRetro\endcsname {\symbol{"F164}} \def\mfPhoneRetro {{\MF\csname mficon@mfPhoneRetro\endcsname}} +\expandafter\def\csname mficon@mfPhp\endcsname {\symbol{"F165}} \def\mfPhp {{\MF\csname mficon@mfPhp\endcsname}} +\expandafter\def\csname mficon@mfPhpAlt\endcsname {\symbol{"F166}} \def\mfPhpAlt {{\MF\csname mficon@mfPhpAlt\endcsname}} +\expandafter\def\csname mficon@mfPlayframework\endcsname {\symbol{"F167}} \def\mfPlayframework {{\MF\csname mficon@mfPlayframework\endcsname}} +\expandafter\def\csname mficon@mfPlayframeworkAlt\endcsname {\symbol{"F168}} \def\mfPlayframeworkAlt {{\MF\csname mficon@mfPlayframeworkAlt\endcsname}} +\expandafter\def\csname mficon@mfPlone\endcsname {\symbol{"F169}} \def\mfPlone {{\MF\csname mficon@mfPlone\endcsname}} +\expandafter\def\csname mficon@mfPostgres\endcsname {\symbol{"F16A}} \def\mfPostgres {{\MF\csname mficon@mfPostgres\endcsname}} +\expandafter\def\csname mficon@mfPostgresAlt\endcsname {\symbol{"F16B}} \def\mfPostgresAlt {{\MF\csname mficon@mfPostgresAlt\endcsname}} +\expandafter\def\csname mficon@mfPython\endcsname {\symbol{"F16C}} \def\mfPython {{\MF\csname mficon@mfPython\endcsname}} +\expandafter\def\csname mficon@mfRaspberrypi\endcsname {\symbol{"F16D}} \def\mfRaspberrypi {{\MF\csname mficon@mfRaspberrypi\endcsname}} +\expandafter\def\csname mficon@mfReactjs\endcsname {\symbol{"F16E}} \def\mfReactjs {{\MF\csname mficon@mfReactjs\endcsname}} +\expandafter\def\csname mficon@mfRedhat\endcsname {\symbol{"F16F}} \def\mfRedhat {{\MF\csname mficon@mfRedhat\endcsname}} +\expandafter\def\csname mficon@mfRedis\endcsname {\symbol{"F170}} \def\mfRedis {{\MF\csname mficon@mfRedis\endcsname}} +\expandafter\def\csname mficon@mfRuby\endcsname {\symbol{"F171}} \def\mfRuby {{\MF\csname mficon@mfRuby\endcsname}} +\expandafter\def\csname mficon@mfRubyOnRails\endcsname {\symbol{"F172}} \def\mfRubyOnRails {{\MF\csname mficon@mfRubyOnRails\endcsname}} +\expandafter\def\csname mficon@mfRubyOnRailsAlt\endcsname {\symbol{"F173}} \def\mfRubyOnRailsAlt {{\MF\csname mficon@mfRubyOnRailsAlt\endcsname}} +\expandafter\def\csname mficon@mfRust\endcsname {\symbol{"F174}} \def\mfRust {{\MF\csname mficon@mfRust\endcsname}} +\expandafter\def\csname mficon@mfSass\endcsname {\symbol{"F175}} \def\mfSass {{\MF\csname mficon@mfSass\endcsname}} +\expandafter\def\csname mficon@mfSatellite\endcsname {\symbol{"F176}} \def\mfSatellite {{\MF\csname mficon@mfSatellite\endcsname}} +\expandafter\def\csname mficon@mfScala\endcsname {\symbol{"F177}} \def\mfScala {{\MF\csname mficon@mfScala\endcsname}} +\expandafter\def\csname mficon@mfScalaAlt\endcsname {\symbol{"F178}} \def\mfScalaAlt {{\MF\csname mficon@mfScalaAlt\endcsname}} +\expandafter\def\csname mficon@mfScript\endcsname {\symbol{"F179}} \def\mfScript {{\MF\csname mficon@mfScript\endcsname}} +\expandafter\def\csname mficon@mfScriptAlt\endcsname {\symbol{"F17A}} \def\mfScriptAlt {{\MF\csname mficon@mfScriptAlt\endcsname}} +\expandafter\def\csname mficon@mfShell\endcsname {\symbol{"F17B}} \def\mfShell {{\MF\csname mficon@mfShell\endcsname}} +\expandafter\def\csname mficon@mfSitefinity\endcsname {\symbol{"F17C}} \def\mfSitefinity {{\MF\csname mficon@mfSitefinity\endcsname}} +\expandafter\def\csname mficon@mfSolaris\endcsname {\symbol{"F17D}} \def\mfSolaris {{\MF\csname mficon@mfSolaris\endcsname}} +\expandafter\def\csname mficon@mfSplatter\endcsname {\symbol{"F17E}} \def\mfSplatter {{\MF\csname mficon@mfSplatter\endcsname}} +\expandafter\def\csname mficon@mfSpring\endcsname {\symbol{"F17F}} \def\mfSpring {{\MF\csname mficon@mfSpring\endcsname}} +\expandafter\def\csname mficon@mfSuse\endcsname {\symbol{"F180}} \def\mfSuse {{\MF\csname mficon@mfSuse\endcsname}} +\expandafter\def\csname mficon@mfSvg\endcsname {\symbol{"F181}} \def\mfSvg {{\MF\csname mficon@mfSvg\endcsname}} +\expandafter\def\csname mficon@mfSymfony\endcsname {\symbol{"F182}} \def\mfSymfony {{\MF\csname mficon@mfSymfony\endcsname}} +\expandafter\def\csname mficon@mfTomcat\endcsname {\symbol{"F183}} \def\mfTomcat {{\MF\csname mficon@mfTomcat\endcsname}} +\expandafter\def\csname mficon@mfUbuntu\endcsname {\symbol{"F184}} \def\mfUbuntu {{\MF\csname mficon@mfUbuntu\endcsname}} +\expandafter\def\csname mficon@mfUnity\endcsname {\symbol{"F185}} \def\mfUnity {{\MF\csname mficon@mfUnity\endcsname}} +\expandafter\def\csname mficon@mfWireless\endcsname {\symbol{"F186}} \def\mfWireless {{\MF\csname mficon@mfWireless\endcsname}} +\expandafter\def\csname mficon@mfWordpress\endcsname {\symbol{"F187}} \def\mfWordpress {{\MF\csname mficon@mfWordpress\endcsname}} +\expandafter\def\csname mficon@mfXeleven\endcsname {\symbol{"F188}} \def\mfXeleven {{\MF\csname mficon@mfXeleven\endcsname}} -\endinput +\endinput \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontmfizz.tlpobj new/tlpkg/tlpobj/fontmfizz.tlpobj --- old/tlpkg/tlpobj/fontmfizz.tlpobj 2016-04-14 19:03:03.000000000 +0200 +++ new/tlpkg/tlpobj/fontmfizz.tlpobj 2017-04-14 17:40:52.000000000 +0200 @@ -1,6 +1,6 @@ name fontmfizz category Package -revision 35892 +revision 43546 shortdesc Font Mfizz icons for use in LaTeX relocated 1 longdesc The MFizz font provides scalable vector icons representing @@ -8,11 +8,11 @@ longdesc and technology. It can be seen as an extension to FontAwesome. longdesc This package requires the fontspec package and either the longdesc Xe(La)TeX or Lua(La)TeX engine to load the included ttf font. -runfiles size=15 +runfiles size=21 RELOC/fonts/truetype/public/fontmfizz/font-mfizz.ttf RELOC/tex/latex/fontmfizz/fontmfizz.sty catalogue-also fontawesome catalogue-ctan /fonts/fontmfizz -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2017-03-19 08:53:30 +0100 +catalogue-license mit catalogue-topics font font-supp-symbol font-symbol font-ttf ++++++ fontname.doc.tar.xz ++++++ ++++++ fontname.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontname.tlpobj new/tlpkg/tlpobj/fontname.tlpobj --- old/tlpkg/tlpobj/fontname.tlpobj 2016-04-14 19:03:06.000000000 +0200 +++ new/tlpkg/tlpobj/fontname.tlpobj 2017-04-14 17:40:53.000000000 +0200 @@ -31,6 +31,6 @@ RELOC/fonts/map/fontname/width.map RELOC/fonts/map/fontname/yandy.map catalogue-ctan /info/fontname -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-04 04:57:17 +0100 catalogue-license gpl catalogue-topics font-doc ++++++ fontools.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/afm2afm.1 new/texmf-dist/doc/man/man1/afm2afm.1 --- old/texmf-dist/doc/man/man1/afm2afm.1 2015-05-13 23:32:57.000000000 +0200 +++ new/texmf-dist/doc/man/man1/afm2afm.1 2017-03-22 23:01:04.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. @@ -54,20 +54,16 @@ .\" Avoid warning from groff about undefined register 'F'. .de IX .. -.nr rF 0 -.if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.if !\nF .nr F 0 +.if \nF>0 \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ -. nr % 0 -. nr F 2 -. \} +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 . \} .\} -.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. Binary files old/texmf-dist/doc/man/man1/afm2afm.man1.pdf and new/texmf-dist/doc/man/man1/afm2afm.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/autoinst.1 new/texmf-dist/doc/man/man1/autoinst.1 --- old/texmf-dist/doc/man/man1/autoinst.1 2015-11-24 00:04:05.000000000 +0100 +++ new/texmf-dist/doc/man/man1/autoinst.1 2017-03-22 23:01:04.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. @@ -54,20 +54,16 @@ .\" Avoid warning from groff about undefined register 'F'. .de IX .. -.nr rF 0 -.if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.if !\nF .nr F 0 +.if \nF>0 \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ -. nr % 0 -. nr F 2 -. \} +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 . \} .\} -.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -133,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "AUTOINST 1" -.TH AUTOINST 1 "2015-11-22" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2017-03-21" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -273,7 +269,7 @@ .IX Item "lining, oldstyle, tabular, proportional" Choose which figure style to use. The defaults are \*(L"oldstyle\*(R" and \*(L"proportional\*(R" (if available). -.ie n .IP """scale=\f(CI<number>\f(CW""" 4 +.ie n .IP """scale=\fI<number>\fP""" 4 .el .IP "\f(CWscale=\f(CI<number>\f(CW\fR" 4 .IX Item "scale=<number>" Scale the font by a factor of \fI<number>\fR. @@ -628,7 +624,7 @@ Please include all (if any) error messages as well. .SH "COPYRIGHT" .IX Header "COPYRIGHT" -Copyright (C) 2005\-2015 Marc Penninga. +Copyright (C) 2005\-2017 Marc Penninga. .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify @@ -646,6 +642,9 @@ .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) +.IP "\fI2017\-03\-21\fR" 12 +.IX Item "2017-03-21" +Updated the \fIfontools_ot1.enc\fR encoding file to include the Lslash and lslash glyphs (thanks to Bob Tennent). .IP "\fI2015\-11\-22\fR" 12 .IX Item "2015-11-22" Bugfix: Latex doesn't like command names with dashes in it. @@ -658,7 +657,7 @@ .IP "\fI2014\-01\-21\fR" 12 .IX Item "2014-01-21" \&\*(L"Oblique\*(R" or \*(L"slanted\*(R" fonts are now mapped to \s-1NFSS\s0 code \*(L"sl\*(R" instead -of \*(L"it\*(R"; added \*(L"ssub\*(R" rules to the <fd> files to substitute slanted fonts +of \*(L"it\*(R"; added \*(L"ssub\*(R" rules to the \fIfd\fR files to substitute slanted fonts for italic ones if the latter are missing. Fixed a few bugs. .IP "\fI2014\-01\-03\fR" 12 .IX Item "2014-01-03" Binary files old/texmf-dist/doc/man/man1/autoinst.man1.pdf and new/texmf-dist/doc/man/man1/autoinst.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ot2kpx.1 new/texmf-dist/doc/man/man1/ot2kpx.1 --- old/texmf-dist/doc/man/man1/ot2kpx.1 2015-05-13 23:32:57.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ot2kpx.1 2017-03-22 23:01:04.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32) .\" .\" Standard preamble: .\" ======================================================================== @@ -46,7 +46,7 @@ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" -.\" If the F register is turned on, we'll generate index entries on stderr for +.\" If the F register is >0, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. @@ -54,20 +54,16 @@ .\" Avoid warning from groff about undefined register 'F'. .de IX .. -.nr rF 0 -.if \n(.g .if rF .nr rF 1 -.if (\n(rF:(\n(.g==0)) \{ -. if \nF \{ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.if !\nF .nr F 0 +.if \nF>0 \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -. if !\nF==2 \{ -. nr % 0 -. nr F 2 -. \} +. if !\nF==2 \{\ +. nr % 0 +. nr F 2 . \} .\} -.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. Binary files old/texmf-dist/doc/man/man1/ot2kpx.man1.pdf and new/texmf-dist/doc/man/man1/ot2kpx.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/fontools/README new/texmf-dist/doc/support/fontools/README --- old/texmf-dist/doc/support/fontools/README 2015-11-24 00:04:05.000000000 +0100 +++ new/texmf-dist/doc/support/fontools/README 2017-03-22 23:01:04.000000000 +0100 @@ -60,9 +60,9 @@ LICENSE & COPYRIGHT ------------------- -This software is copyright (C) 2005-2015 Marc Penninga. It is released under +This software is copyright (C) 2005-2017 Marc Penninga. It is released under the terms of the GNU General Public Licence; see the file GPLv2.txt for the license conditions. - Marc Penninga, 2015/11/22 + Marc Penninga, 2017/03/21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontools.doc.tlpobj new/tlpkg/tlpobj/fontools.doc.tlpobj --- old/tlpkg/tlpobj/fontools.doc.tlpobj 2016-04-14 19:03:08.000000000 +0200 +++ new/tlpkg/tlpobj/fontools.doc.tlpobj 2017-04-14 17:40:54.000000000 +0200 @@ -1,8 +1,8 @@ name fontools.doc category Package -revision 38924 +revision 43573 shortdesc doc files of fontools -docfiles size=30 +docfiles size=34 texmf-dist/doc/man/man1/afm2afm.1 texmf-dist/doc/man/man1/afm2afm.man1.pdf texmf-dist/doc/man/man1/autoinst.1 ++++++ fontools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/enc/dvips/fontools/fontools_ot1.enc new/texmf-dist/fonts/enc/dvips/fontools/fontools_ot1.enc --- old/texmf-dist/fonts/enc/dvips/fontools/fontools_ot1.enc 2009-04-11 02:17:48.000000000 +0200 +++ new/texmf-dist/fonts/enc/dvips/fontools/fontools_ot1.enc 2017-03-22 23:01:04.000000000 +0100 @@ -32,13 +32,13 @@ /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 + /.notdef /.notdef /Lslash /.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 + /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef %B0 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/fontools/autoinst new/texmf-dist/scripts/fontools/autoinst --- old/texmf-dist/scripts/fontools/autoinst 2015-11-24 00:04:05.000000000 +0100 +++ new/texmf-dist/scripts/fontools/autoinst 2017-03-22 23:01:04.000000000 +0100 @@ -4,7 +4,7 @@ ---------------------------------------------------------------------------- - Copyright (C) 2005-2015 Marc Penninga. + Copyright (C) 2005-2017 Marc Penninga. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -2129,7 +2129,7 @@ =head1 COPYRIGHT -Copyright (C) 2005-2015 Marc Penninga. +Copyright (C) 2005-2017 Marc Penninga. =head1 LICENSE @@ -2157,6 +2157,10 @@ =over 12 +=item I<2017-03-21> + +Updated the F<fontools_ot1.enc> encoding file to include the Lslash and lslash glyphs (thanks to Bob Tennent). + =item I<2015-11-22> Bugfix: Latex doesn't like command names with dashes in it. @@ -2172,7 +2176,7 @@ =item I<2014-01-21> "Oblique" or "slanted" fonts are now mapped to NFSS code "sl" instead -of "it"; added "ssub" rules to the <fd> files to substitute slanted fonts +of "it"; added "ssub" rules to the F<fd> files to substitute slanted fonts for italic ones if the latter are missing. Fixed a few bugs. =item I<2014-01-03> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontools.tlpobj new/tlpkg/tlpobj/fontools.tlpobj --- old/tlpkg/tlpobj/fontools.tlpobj 2016-04-14 19:03:08.000000000 +0200 +++ new/tlpkg/tlpobj/fontools.tlpobj 2017-04-14 17:40:54.000000000 +0200 @@ -1,6 +1,6 @@ name fontools category Package -revision 38924 +revision 43573 shortdesc Tools to simplify using fonts (especially TT/OTF ones) longdesc This package provides a few tools to ease using fonts longdesc (especially TrueType/OpenType ones) with LaTeX and fontinst: @@ -19,6 +19,6 @@ texmf-dist/scripts/fontools/autoinst texmf-dist/scripts/fontools/ot2kpx catalogue-ctan /fonts/utilities/fontools -catalogue-date 2015-11-22 21:31:30 +0100 +catalogue-date 2017-03-21 22:35:34 +0100 catalogue-license gpl2 catalogue-topics font-devel ++++++ fonts-churchslavonic.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fonts-churchslavonic/README new/doc/fonts/fonts-churchslavonic/README --- old/doc/fonts/fonts-churchslavonic/README 2016-05-16 00:15:28.000000000 +0200 +++ new/doc/fonts/fonts-churchslavonic/README 2017-02-03 00:01:04.000000000 +0100 @@ -7,6 +7,13 @@ All fonts use Unicode character encoding and are intended for Unicode TeX engines only. +Changelog +--------- + +v1.1 2017.01.31 - metrics and other bugs fixed in Monomakhus +v1.1 2016.11.04 - more fonts added +v1.0 2016.05.10 - first draft release + Installation: ------------- Binary files old/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.pdf and new/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.tex new/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.tex --- old/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.tex 2016-05-16 00:15:28.000000000 +0200 +++ new/doc/fonts/fonts-churchslavonic/fonts-churchslavonic.tex 2017-02-03 00:01:04.000000000 +0100 @@ -20,21 +20,26 @@ ]{hyperref} \usepackage{polyglossia} \setmainlanguage[variant=american]{english} -\setotherlanguages{russian,churchslavonic} +\setotherlanguages{russian,churchslavonic,romanian} +\usepackage{churchslavonic} +\usepackage{lettrine} %% KEYBOARD DRIVER VERSION AND RELEASE DATES -\def\filedate{April 26, 2016} -\def\fileversion{version 1.0} +\def\filedate{November 4, 2016} +\def\fileversion{version 1.1} %% fontspec declarations: \setmainfont[Ligatures = TeX]{Linux Libertine O} \setsansfont{DejaVu Sans} \setmonofont[Scale=MatchLowercase]{DejaVu Sans Mono} +\newfontfamily\churchslavonicfont[Script=Cyrillic,Ligatures=TeX,Scale=1.33333333,HyphenChar="005F]{PonomarUnicode.otf} \newfontfamily{\slv}[Scale=MatchLowercase]{Ponomar Unicode} \newfontfamily{\ust}[Scale=MatchLowercase]{Menaion Unicode} +\newfontfamily{\ind}{Indiction Unicode} \linespread{1.05} -\lineskiplimit=-1em +%\lineskip=0pt +\lineskiplimit=0em \frenchspacing \EnableCrossrefs \CodelineIndex @@ -42,7 +47,15 @@ % COMMENT THE NEXT LINE TO INCLUDE THE CODE \AtBeginDocument{\OnlyDescription} -% FOR DRAWING KEY CAPS +\makeatletter +\def\ps@cuNum{% +\def\@oddfoot{\footnotesize\hfil\cuNum{\value{page}}\hfil\hbox to 0pt{\hss\usebox\NextWordBox}}%}% +\let\@evenfoot\@oddfoot +}% +\def\cu(a)lettrine{\lettrine[lines=3,findent=0pt,nindent=0pt,lraise=-0.4]} +\def\cuLettrine{\cu@tokenizeletter\cu@lettrine} +\renewcommand{\LettrineFontHook}{\ind \cuKinovarColor} +\makeatother \begin{document} \title{Church Slavonic Fonts} @@ -380,7 +393,7 @@ \subsubsection{Language-based Features} -Language-based features such as the \texttt{loca} (localized forms) feature +Language-based features such as the \texttt{locl} (localized forms) feature provide access to language-specific alternate glyph forms, such as the alternate forms of the Cyrillic Letter I used in Ukrainian and Belorussian: @@ -538,9 +551,7 @@ \subsection{Synodal Church Slavonic} \begin{churchslavonic} -{\slv \large Бл҃же́нъ мꙋ́жъ, и҆́же не и҆́де на совѣ́тъ нечести́выхъ, и҆ на пꙋтѝ грѣ́шныхъ не ста̀, и҆ на сѣда́лищи гꙋби́телей не сѣ́де: но въ зако́нѣ гдⷭ҇ни во́лѧ є҆гѡ̀, и҆ въ зако́нѣ є҆гѡ̀ поꙋчи́тсѧ де́нь и҆ но́щь. И҆ бꙋ́детъ ꙗ҆́кѡ дре́во насажде́ное при и҆схо́дищихъ во́дъ, є҆́же пло́дъ сво́й да́стъ во вре́мѧ своѐ, и҆ ли́стъ є҆гѡ̀ не ѿпаде́тъ: и҆ всѧ̑, є҆ли̑ка а҆́ще твори́тъ, ᲂу҆спѣ́етъ. Не та́кѡ нечести́вїи, не та́кѡ: но ꙗ҆́кѡ пра́хъ, є҆го́же возмета́етъ вѣ́тръ ѿ лица̀ землѝ. Сегѡ̀ ра́ди не воскре́снꙋтъ нечести́вїи на сꙋ́дъ, нижѐ грѣ̑шницы въ совѣ́тъ првⷣныхъ. Ꙗ҆́кѡ вѣ́сть гдⷭ҇ь пꙋ́ть првⷣныхъ, и҆ пꙋ́ть нечести́выхъ поги́бнетъ. -} \end{churchslavonic} \subsection{Kievan Church Slavonic} @@ -548,9 +559,7 @@ Kievan Church Slavonic uses a number of variant glyph forms, such as U+1C81 Long-Legged De ({\slv ᲁ}) and U+A641 Variant Ze ({\slv ꙁ}): \begin{churchslavonic} -{\slv \large Бл҃же́нъ мꙋ́жъ, и҆́же не и҆́ᲁе на совѣ́тъ нечести́выхъ, и҆ на пꙋтѝ грѣ́шныхъ не ста̀, и҆ на сѣᲁа́лищи гꙋби́телей не сѣ́ᲁе: но въ зако́нѣ гᲁⷭ҇ни во́лѧ є҆гѡ̀, и҆ въ зако́нѣ є҆гѡ̀ поꙋчи́тсѧ де́нь и҆ но́щь. И҆ бꙋ́ᲁетъ ꙗ҆́кѡ дре́во насажᲁе́ное при и҆схо́ᲁищихъ во́ᲁъ, є҆́же плоᲁъ сво́й да́стъ во вре́мѧ своѐ, и҆ ли́стъ є҆гѡ̀ не ѿпаᲁе́тъ: и҆ всѧ̑, є҆ли̑ка а҆́ще твори́тъ, ᲂу҆спѣ́етъ. Не та́кѡ нечести́вїи, не та́кѡ: но ꙗ҆́кѡ пра́хъ, є҆го́же воꙁмета́етъ вѣ́тръ ѿ лица̀ землѝ. Сегѡ̀ ра́ᲁи не воскре́снꙋтъ нечести́вїи на сꙋ́ᲁъ, нижѐ грѣ̑шницы въ совѣ́тъ првⷣныхъ. Ꙗ҆́кѡ вѣ́сть гᲁⷭ҇ь пꙋ́ть првⷣныхъ, и҆ пꙋ́ть нечести́выхъ поги́бнетъ. -} \end{churchslavonic} \subsection{Other Languages} @@ -561,38 +570,29 @@ \noindent Here is an example of the Lord's Prayer in Romanian (Moldovan) Cyrillic: \\ \begin{churchslavonic} -{\slv \large -Та́тъль но́стрꙋ ка́реле є҆́щй ꙟ҆ Че́рюрй: ᲃ︀фн҃цѣ́скъсе Нꙋ́меле тъ́ꙋ: ві́е ꙟ҆пъръці́ѧ та̀: фі́е во́ѧ та̀, прекꙋ́мь ꙟ҆ Че́рю̆ шѝ пре пъмѫ́нть. Пѫ́йнѣ но́астръ чѣ̀ ᲁепꙋ́рꙋрѣ ᲁъ́не но́аѡ а҆́стъꙁй. Шѝ не ꙗ҆́ртъ но́аѡ греша́леле но́астре, прекꙋ́мь шѝ но́й є҆ртъ́мь греши́цилѡрь но́щри. Ши́ нꙋ́не ᲁꙋ́че пре но́й ꙟ҆ и҆спи́тъ. Чѝ не и҆ꙁбъвѣ́ще ᲁе че́ль ръ́ꙋ. -} \\ +Та́тъль но́стрꙋ ка́реле є҆́щй ꙟ҆ Че́рюрй: ᲃ︀фн҃цѣ́скъсе Нꙋ́меле тъ́ꙋ: ві́е ꙟ҆пъръці́ѧ та̀: фі́е во́ѧ та̀, прекꙋ́мь ꙟ҆ Че́рю̆ шѝ пре пъмѫ́нть. Пѫ́йнѣ но́астръ чѣ̀ ᲁепꙋ́рꙋрѣ ᲁъ́не но́аѡ а҆́стъꙁй. Шѝ не ꙗ҆́ртъ но́аѡ греша́леле но́астре, прекꙋ́мь шѝ но́й є҆ртъ́мь греши́цилѡрь но́щри. Ши́ нꙋ́не ᲁꙋ́че пре но́й ꙟ҆ и҆спи́тъ. Чѝ не и҆ꙁбъвѣ́ще ᲁе че́ль ръ́ꙋ. \\ \end{churchslavonic} \noindent And here is an example of the Lord's Prayer in Aleut Cyrillic: \\ \begin{churchslavonic} -{\slv \large -Тꙋмани́нъ А́даԟъ! А҆́манъ акꙋ́х̑тхинъ и́нинъ кꙋ́ҥинъ, А́са́нъ амчꙋг̑а́сѧ́да́г̑та, Аҥали́нъ а҆ԟа́г̑та, Анꙋхтана́тхинъ малга́г̑танъ и́нимъ кꙋ́ганъ ка́юхъ та́намъ кꙋ́ганъ. Ԟалга́дамъ анꙋхтана̀ ҥи̑нъ аԟача́ ꙋ̆а҆ѧ́мъ: ка́юхъ тꙋма́нинъ а́д̑ꙋнъ ҥи̑нъ игни́да, а҆ма́кꙋнъ тꙋ́манъ ка́юхъ малгалиги́нъ ҥи̑нъ ад̑ꙋг̑и́нанъ игнида́кꙋнъ: ка́юхъ тꙋ́манъ сꙋглатачх̑и́г̑анах̑тхинъ, та́г̑а ад̑алю́дамъ илѧ́нъ тꙋ́манъ аг̑г̑ича. -} \\ +Тꙋмани́нъ А́даԟъ! А҆́манъ акꙋ́х̑тхинъ и́нинъ кꙋ́ҥинъ, А́са́нъ амчꙋг̑а́сѧ́да́г̑та, Аҥали́нъ а҆ԟа́г̑та, Анꙋхтана́тхинъ малга́г̑танъ и́нимъ кꙋ́ганъ ка́юхъ та́намъ кꙋ́ганъ. Ԟалга́дамъ анꙋхтана̀ ҥи̑нъ аԟача́ ꙋ̆а҆ѧ́мъ: ка́юхъ тꙋма́нинъ а́д̑ꙋнъ ҥи̑нъ игни́да, а҆ма́кꙋнъ тꙋ́манъ ка́юхъ малгалиги́нъ ҥи̑нъ ад̑ꙋг̑и́нанъ игнида́кꙋнъ: ка́юхъ тꙋ́манъ сꙋглатачх̑и́г̑анах̑тхинъ, та́г̑а ад̑алю́дамъ илѧ́нъ тꙋ́манъ аг̑г̑ича. \\ \end{churchslavonic} \noindent And here is an example of the Lord's Prayer in Yakut (Sakha): \\ \begin{churchslavonic} -{\slv \large -Халланнаръ юрдюлѧригѧрь баръ агабытъ бисенѧ ! Свѧтейдѧннинь а̄тыҥъ эенѧ ; кѧллинь царстваҥъ эенѧ ; сирь юрдюгѧрь кёҥюлюҥь эенѧ , халланъ юрдюгѧрь курдукъ боллунъ ; бюгюҥю кюннѧги асыръ аспытынъ бисенинь кулу бисеха бюгюнь ; бисиги да естѧрбитинь халларъ бисеха , хайтахъ бисиги да халларабытъ беэбить естѧхтѧрбитигѧрь ; килѧримѧ да бисигини альԫархайга ; хата быса бисигини албынтанъ . -} \\ +Халланнаръ юрдюлѧригѧрь баръ агабытъ бисенѧ ! Свѧтейдѧннинь а̄тыҥъ эенѧ ; кѧллинь царстваҥъ эенѧ ; сирь юрдюгѧрь кёҥюлюҥь эенѧ , халланъ юрдюгѧрь курдукъ боллунъ ; бюгюҥю кюннѧги асыръ аспытынъ бисенинь кулу бисеха бюгюнь ; бисиги да естѧрбитинь халларъ бисеха , хайтахъ бисиги да халларабытъ беэбить естѧхтѧрбитигѧрь ; килѧримѧ да бисигини альԫархайга ; хата быса бисигини албынтанъ . \\ \end{churchslavonic} \noindent Here is an example using the Typicon symbols from Nikita Syrnikov's book {\slv Клю́чъ къ церко́вномꙋ ᲂу҆ста́вꙋ}: \begin{churchslavonic} -{\slv \large і\textcolor{red}{і}꙼̇ ⧟̇҃ іѡа́ннꙋ і̲꙼ на лиⷮ бл҃жеⷩ҇, па́влꙋ пѣⷭ҇ г҃. а і҆оа́ннꙋ ѕ҃. и᷷͏҃і і\textcolor{red}{і}꙼̇ ⧟̲̇҃ кири́лꙋ і̲꙼ коⷣ и҆ и҆́коⷭ҇ о҆́бщїй и҆ коⷣ а҆фана́сїю. д҃ 🤉 іі̲ и҆си́дорꙋ ⹇ гео́ргїю кири́лѣ ⹉ - -} \end{churchslavonic} \subsection{Font Features} @@ -1113,8 +1113,6 @@ \newfontfamily{\simple}[StylisticSet=1]{Pomorsky Unicode} \newfontfamily{\salt}[Alternate=0]{Pomorsky Unicode} \newfontfamily{\salta}[Alternate=1]{Pomorsky Unicode} -\newfontfamily{\saltb}[Alternate=2]{Pomorsky Unicode} -\newfontfamily{\saltc}[Alternate=3]{Pomorsky Unicode} The base form, the ``simple'' form, and any stylistic alternatives of a character are demonstrated in Table~\ref{pomor}. @@ -1130,9 +1128,9 @@ {\glyphfont И}{\simple И} & {\glyphfont Й}{\simple Й} & {\glyphfont І}{\simple І} & {\glyphfont Ї}{\simple Ї} \\ - {\glyphfont К}{\simple К}{\salt К} & {\glyphfont Л}{\simple Л} & {\glyphfont М}{\simple М} & {\glyphfont Н}{\simple Н} \\ + {\glyphfont К}{\simple К}{\salt К}{\salta К} & {\glyphfont Л}{\simple Л} & {\glyphfont М}{\simple М} & {\glyphfont Н}{\simple Н} \\ - {\glyphfont О}{\simple О} & {\glyphfont Ѻ}{\simple Ѻ} & {\glyphfont П}{\simple П} & {\glyphfont Р}{\simple Р}{\salt Р} \\ + {\glyphfont О}{\simple О} & {\glyphfont Ѻ}{\simple Ѻ} & {\glyphfont П}{\simple П} & {\glyphfont Р}{\simple Р}{\salt Р}{\salta Р} \\ {\glyphfont С}{\simple С} & {\glyphfont Т}{\simple Т} & {\glyphfont ОУ}{\simple ОУ} & {\glyphfont Ꙋ}{\simple Ꙋ} \\ @@ -1157,10 +1155,112 @@ {\fontsize{48pt}{2em} \simple ЧИ́НЪ ВЕЧЕ́РНИ.} \\ {\fontsize{48pt}{2em} \glyphfont СѶНѠ́ДИКЪ.} \\ {\fontsize{48pt}{2em} \simple СѶНѠ́ДИКЪ.} \\ -{\fontsize{48pt}{2em} \simple\salt СѶНѠ́ДИКЪ.} \\ \end{tabular} \end{center} +\section{Monomakh Unicode} + +Monomakh Unicode is based on the Monomachus font designed by +Alexey Kryukov. It has been modified with permission. +Monomakh Unicode is a Cyrillic font implemented in a mixed ustav/poluustav +style and intended to cover needs of researches dealing with Slavic +history and philology. It includes all historical Cyrillic characters +currently defined in Unicode font also includes a set of Latin letters designed to be +stylistically compatible with the Cyrillic part. This may be useful for +typesetting bilingual editions in Church Slavonic and languages +written in the Latin script, especially those that use many diacritical marks, +as in the Romanian example below. + +\newfontfamily{\glyphfont} + [Renderer=Graphite, RawFeature= + {Localized Forms for Romanian=Required Localized Forms}] +{Monomakh Unicode TT} + +\subsection{Sample Bilingual Text} + +\begin{tabular}{p{2.25in}p{0.02in}p{2.25in}} +\begin{churchslavonic} +{\glyphfont Бл҃же́нъ мꙋ́жъ, и҆́же не и҆́де на совѣ́тъ нечести́выхъ, и҆ на пꙋтѝ грѣ́шныхъ не ста̀, и҆ на сѣда́лищи гꙋби́телей не сѣ́де: но въ зако́нѣ гдⷭ҇ни во́лѧ є҆гѡ̀, и҆ въ зако́нѣ є҆гѡ̀ поꙋчи́тсѧ де́нь и҆ но́щь. И҆ бꙋ́детъ ꙗ҆́кѡ дре́во насажде́ное при и҆схо́дищихъ во́дъ, є҆́же пло́дъ сво́й да́стъ во вре́мѧ своѐ.} +\end{churchslavonic} +& & +\begin{romanian} +{\glyphfont Fericit bărbatul, care n-a umblat în sfatul necredincioșilor și în calea păcătoșilor nu a stat și pe scaunul hulitorilor n-a șezut; ci în legea Domnului e voia lui și la legea Lui va cugeta ziua și noaptea. și va fi ca un pom răsădit lângă izvoarele apelor, care rodul său va da la vremea sa.} +\end{romanian} +\end{tabular} + +\subsection{OpenType and SIL Graphite features} + +The Monomakh font offers a number of optional OpenType features that may be turned on or off by the user, coupled with analagous features in SIL Graphite. These are: + +\begin{itemize} +\item Stylistic Set 6 (\emph{ss06}) displays U+0456 Cyrillic Small Letter Ukrainian / Belorussian I with one dot above and Stylistic Set 7 (\emph{ss07}) displays the same character with two dots above. By default, U+0456 is displayed with no dots. The Graphite analog is provided by the feature Cyrillic Decimal I (\emph{deci}), which takes values 0 (default), 1 or 2, for the number of dots on U+0456. +\item Stylistic Set 8 (\emph{ss08}) displays the characters U+0417 Cyrillic Capital Letter Ze and U+0437 Cyrillic Small Letter Ze as a ``sharp zemlya'', i.e., like the characters U+A640 Cyrillic Capital Letter Zemlya and U+A641 Cyrillic Small Letter Zemlya, respectively. In Graphite the same functionality is provided by the feature Cyrillic Zemlya (\emph{zeml}), which takes values \emph{Round} (0) and \emph{Sharp} (1). Generally, this change should be handled at the codepoint level, so the use of this feature is discouraged. +\item Stylistic Set 9 (\emph{ss09}) displays the characters U+0427 Cyrillic Capital Letter Che and U+0447 Cyrillic Small Letter Che in their archaic form, with the descender in the middle (e.g., {\fontspec{Monomakh Unicode}[StylisticSet=9] ч} instead of {\glyphfont ч}). The same functionality is provided by the Graphite feature Cyrillic Cherv (\emph{chrv}), which takes values \emph{Modern (Single Sided)} (0) and \emph{Old (Double Sided)} (1). +\item Stylistic Set 10 (\emph{ss10}) displays the characters U+0429 Cyrillic Capital Letter Shcha and U+0449 Cyrillic Small Letter Shcha in their modern form, with the descender on the right (e.g., {\fontspec{Monomakh Unicode}[StylisticSet=10] щ} instead of {\glyphfont щ}). The same functionality is provided by the Graphite feature Cyrillic Shcha (\emph{shch}), which takes values \emph{Modern (Descender Right)} (0) and \emph{Old (Descender Centered)} (1). +\item Stylistic Set 11 (\emph{ss11}) displays the characters U+044B Cyrillic Small Letter Yeru and U+A651 Cyrillic Small Letter Yeru with Back Yer with the two glyphs connected (e.g., {\fontspec{Monomakh Unicode}[StylisticSet=11] ы} instead of {\glyphfont ы}). The same functionality is provided by the Graphite feature Cyrillic Yery (\emph{yery}), which takes on values \emph{Without a Connecting Line} (0) and \emph{With a Connecting Line} (1). +\item Stylistic Set 13 (\emph{ss13}) displays the character U+0463 Cyrillic Small Letter Yat with the left stem extended to the baseline (e.g., as {\fontspec{Monomakh Unicode}[StylisticSet=13] ѣ}). The same functionality is provided by the Graphite feature Cyrillic Yat (\emph{cyat}), which takes values \emph{With a Back Beak} (0) and \emph{With an Additional Vertical Stem} (1). Please note that this is not the same as U+A653 Cyrillic Small Letter Iotified Yat. +\item The same functionality of these Stylistic Sets is provided in OpenType also by the Stylistic Alternatives (\emph{salt}) feature. +\item Previous versions of the font provided Stylistic Set 1 (\emph{ss01}), duplicated as Graphite feature Localized Forms for Romanian (\emph{rold}), which displayed U+015E Latin Capital Letter S with Cedilla, U+0162 Latin Capital Letter T with Cedilla, and their lowercase analogs, as U+0218 Latin Capital Letter S with Comma Below, U+021A Latin Capital Letter T with Comma Below, and their lowercase analogs. However, since the use of U+015E, U+0162 and their lowercase analogs for the encoding of Romanian text is considered erroneous, this feature is deprecated. Users are strongly encouraged to convert their text at the codepoint level to use the correct characters for Romanian orthography. However, for the sake of compatibility with text that has been erroneously encoded, this feature is still available. +\item Stylistic Set 15 (\emph{ss15}), which provides combining Cyrillic letters with an automatic \emph{pokrytie} where warranted by Synodal orthography is also deprecated and may be removed. Users should explicitly encode the \emph{pokrytie} as U+0487 Combining Cyrillic Pokrytie. See \href{http://www.unicode.org/notes/tn41/} +{UTN 41: Church Slavonic Typography in Unicode} for more information. +\end{itemize} + +Two additional features are available in SIL Graphite only: +\begin{itemize} +\item The Graphite feature Convert Arabic Digits to Church Slavonic (\emph{cnum}), when turned on, will automatically display Western Digits (``Arabic numerals'') as Cyrillic numerals. This is helpful, for example, for page numbering in software that does not support Cyrillic numerals. +\item The Graphite feature Convert HIP-6B Keystrokes to Church Slavonic Characters (\emph{hipb}), when turned on, will display text encoded in the legacy HIP codepage as Church Slavonic. The use of this feature is discouraged and users are encouraged instead to convert HIP-encoded text to Unicode. +\end{itemize} + +\section{Indiction Unicode} + +The Indiction Unicode font reproduces the decorative style of drop caps +used in Synodal Slavonic editions since the late 1800's. + +The original Indyction font was developed by Vladislav V. Dorosh and was +distributed as Indyction UCS as part of CSLTeX, licensed under the \LaTeX{} Project Public License. +The font was reencoded for Unicode and edited by Aleksandr Andreev, and is now +distributed as Indiction Unicode under the SIL Open Font License. +It is intended for use with +\emph{bukvitsi} (drop caps) in modern Church Slavonic editions. +The character shapes are demonstrated in Table~\ref{indict}. + +\begin{table}[htbp] +\centering +\caption{Character shapes provided by Indiction Unicode \label{indict}} +{\fontsize{38pt}{1.5em} +\begin{tabular}{cccc} + {\ind А} & {\ind Б} & {\ind В} & {\ind Г} \\ + + {\ind Е} & {\ind Ж} & {\ind Ѕ} & {\ind З} \\ + + {\ind И} & {\ind І} & {\ind К} & {\ind Л} \\ + + {\ind М} & {\ind Н} & {\ind О} & {\ind Ѻ} \\ + + {\ind П} & {\ind Р} & {\ind С} & {\ind Т} \\ + + {\ind Ꙋ} & {\ind Ф} & {\ind Х} & {\ind Ѡ} \\ + + {\ind Ѽ} & {\ind Ꙍ} & {\ind Ѿ} & {\ind Ц} \\ + + {\ind Ч} & {\ind Ш} & {\ind Щ} & {\ind Ъ} \\ + + {\ind Ы} & {\ind Ь} & {\ind Ѣ} & {\ind Ю} \\ + + {\ind Ꙗ} & {\ind Ѧ} & {\ind Ѯ} & {\ind Ѱ} \\ + + {\ind Ѳ} & {\ind Ѵ} & {\ind Ѷ} \\ +\end{tabular} +} +\end{table} + +\subsection{Sample Texts} +\vspace{-1em} +\begin{churchslavonic} +\cuLettrine Бл҃же́нъ мꙋ́жъ, и҆́же не и҆́де на совѣ́тъ нечести́выхъ, и҆ на пꙋтѝ грѣ́шныхъ не ста̀, и҆ на сѣда́лищи гꙋби́телей не сѣ́де: но въ зако́нѣ гдⷭ҇ни во́лѧ є҆гѡ̀, и҆ въ зако́нѣ є҆гѡ̀ поꙋчи́тсѧ де́нь и҆ но́щь. И҆ бꙋ́детъ ꙗ҆́кѡ дре́во насажде́ное при и҆схо́дищихъ во́дъ, є҆́же пло́дъ сво́й да́стъ во вре́мѧ своѐ, и҆ ли́стъ є҆гѡ̀ не ѿпаде́тъ: и҆ всѧ̑, є҆ли̑ка а҆́ще твори́тъ, ᲂу҆спѣ́етъ. +\par +\end{churchslavonic} + \section{Known Issues} Here are some known issues: @@ -1202,7 +1302,8 @@ \item Michael Ivanovich for help in designing the characters for Sakha (Yakut), partially taken from his Sakha UCS font. -\item Alexey Kryukov, who answered various questions about FontForge +\item Alexey Kryukov, who answered various questions about FontForge, +allowed his Monomachus font to be modified and repackaged, and whose extensive documentation for the \href{https://github.com/akryukov/oldstand/}{Old Standard} font was consulted and partially reused. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-churchslavonic.doc.tlpobj new/tlpkg/tlpobj/fonts-churchslavonic.doc.tlpobj --- old/tlpkg/tlpobj/fonts-churchslavonic.doc.tlpobj 2016-05-16 00:51:51.000000000 +0200 +++ new/tlpkg/tlpobj/fonts-churchslavonic.doc.tlpobj 2017-04-14 17:40:55.000000000 +0200 @@ -1,9 +1,9 @@ name fonts-churchslavonic.doc category Package -revision 41166 +revision 43121 shortdesc doc files of fonts-churchslavonic relocated 1 -docfiles size=96 +docfiles size=153 RELOC/doc/fonts/fonts-churchslavonic/GPL.txt RELOC/doc/fonts/fonts-churchslavonic/LICENSE RELOC/doc/fonts/fonts-churchslavonic/OFL.txt ++++++ fonts-churchslavonic.tar.xz ++++++ Binary files old/fonts/opentype/public/fonts-churchslavonic/FedorovskUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/FedorovskUnicode.otf differ Binary files old/fonts/opentype/public/fonts-churchslavonic/IndictionUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/IndictionUnicode.otf differ Binary files old/fonts/opentype/public/fonts-churchslavonic/MenaionUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/MenaionUnicode.otf differ Binary files old/fonts/opentype/public/fonts-churchslavonic/MonomakhUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/MonomakhUnicode.otf differ Binary files old/fonts/opentype/public/fonts-churchslavonic/PomorskyUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/PomorskyUnicode.otf differ Binary files old/fonts/opentype/public/fonts-churchslavonic/PonomarUnicode.otf and new/fonts/opentype/public/fonts-churchslavonic/PonomarUnicode.otf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/FedorovskUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/FedorovskUnicode.ttf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/IndictionUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/IndictionUnicode.ttf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/MenaionUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/MenaionUnicode.ttf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/MonomakhUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/MonomakhUnicode.ttf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/PomorskyUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/PomorskyUnicode.ttf differ Binary files old/fonts/truetype/public/fonts-churchslavonic/PonomarUnicode.ttf and new/fonts/truetype/public/fonts-churchslavonic/PonomarUnicode.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-churchslavonic.tlpobj new/tlpkg/tlpobj/fonts-churchslavonic.tlpobj --- old/tlpkg/tlpobj/fonts-churchslavonic.tlpobj 2016-05-16 00:51:51.000000000 +0200 +++ new/tlpkg/tlpobj/fonts-churchslavonic.tlpobj 2017-04-14 17:40:55.000000000 +0200 @@ -1,22 +1,26 @@ name fonts-churchslavonic category Package -revision 41166 +revision 43121 shortdesc Fonts for typesetting in Church Slavonic language relocated 1 longdesc The package provides Unicode-encoded OpenType fonts for Church longdesc Slavonic. -runfiles size=574 +runfiles size=1049 RELOC/fonts/opentype/public/fonts-churchslavonic/FedorovskUnicode.otf + RELOC/fonts/opentype/public/fonts-churchslavonic/IndictionUnicode.otf RELOC/fonts/opentype/public/fonts-churchslavonic/MenaionUnicode.otf + RELOC/fonts/opentype/public/fonts-churchslavonic/MonomakhUnicode.otf RELOC/fonts/opentype/public/fonts-churchslavonic/PomorskyUnicode.otf RELOC/fonts/opentype/public/fonts-churchslavonic/PonomarUnicode.otf RELOC/fonts/truetype/public/fonts-churchslavonic/FedorovskUnicode.ttf + RELOC/fonts/truetype/public/fonts-churchslavonic/IndictionUnicode.ttf RELOC/fonts/truetype/public/fonts-churchslavonic/MenaionUnicode.ttf + RELOC/fonts/truetype/public/fonts-churchslavonic/MonomakhUnicode.ttf RELOC/fonts/truetype/public/fonts-churchslavonic/PomorskyUnicode.ttf RELOC/fonts/truetype/public/fonts-churchslavonic/PonomarUnicode.ttf catalogue-also churchslavonic catalogue-ctan /fonts/fonts-churchslavonic -catalogue-date 2016-05-15 08:37:25 +0200 +catalogue-date 2017-02-02 05:44:19 +0100 catalogue-license ofl -catalogue-topics font font-otf -catalogue-version 1.0 +catalogue-topics font font-otf churchslavonic +catalogue-version 1.1 ++++++ fonts-tlwg.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj --- old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2016-04-14 19:03:37.000000000 +0200 +++ new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2017-04-14 17:41:08.000000000 +0200 @@ -1,6 +1,6 @@ name fonts-tlwg.doc category Package -revision 34560 +revision 41366 shortdesc doc files of fonts-tlwg relocated 1 docfiles size=6 ++++++ fonts-tlwg.tar.xz ++++++ ++++ 6795 lines of diff (skipped) ++++++ fontspec.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontspec/README.md new/doc/latex/fontspec/README.md --- old/doc/latex/fontspec/README.md 2016-02-02 00:06:16.000000000 +0100 +++ new/doc/latex/fontspec/README.md 2017-04-01 01:22:58.000000000 +0200 @@ -1,5 +1,5 @@ -THE FONTSPEC PACKAGE v2.5a -========================== +The FONTSPEC package +==================== The fontspec package provides an automatic and unified interface for loading fonts in LaTeX. XeTeX and LuaTeX (the latter through the `luaotfload` package) @@ -35,39 +35,89 @@ Summary of user commands ------------------------ -Font families may be selected individually with the command +To define commands for selecting fonts efficiently through a document: - \fontspec{}[] - -Commands for selecting fonts efficiently through a document are created with - - \newfontfamily\myfamily{}[] - \newfontface\myfont{}[] + \newfontfamily\{}[] + \newfontface \{}[] -Default document fonts are selected with +To select the default document fonts: \setmainfont{}[] \setsansfont{}[] \setmonofont{}[] -Features to be used for every subsequently defined font are specified with +To define an ad hoc font family individually: + + \fontspec{}[] + +To specify features to be used for every subsequently defined font: \defaultfontfeatures{<default font options>} \defaultfontfeatures+{<add to default font options>} - \defaultfontfeatures[]{<default font options for "font name">} - \defaultfontfeatures+[]{<add to default font options for "font name">} -Features may be added to the font currently in use with +To specify features to be used for specific fonts: + + \defaultfontfeatures[]{<default font options>} + \defaultfontfeatures+[]{<add to defaults>} + +To add features to the font family currently in use: \addfontfeatures{} - \addfontfeature{<...>} does the same thing Change history -------------- -- v2.5a (2016/02/01) "bugs fixed" +- v2.6a (2017/03/31) + + * Fix crashing bug with `..Reset` and `ResetAll` keys. + * Fix crashing bug with `\newfontface`. + +- v2.6 (2017/02/12) + + * Change the new behaviour of `\emph` (and `\emfontdeclare`) to act only on the NFSS font shape; using the series as well was too fragile. + * Add `\strong` as the "weight" analogy to `\emph`. This will need some extra syntactic sugar from `fontspec` before it becomes truly useful. + * Add `Numbers=Tabular` alias for `Numbers=Monospaced`. + * Fix occasional bug with "chained" keyval choices such as `Numbers={Lining,Proportional}` in which only the first choice would be recognised. + * Fix interaction with `RawFeature` and "proper" `fontspec` features. + * Fix regression in which `C:\...` file paths in Windows couldn't be used. + * Fix regression in XeTeX in which `Ligatures=TeX` overrode `Mapping=..` regardless of where the former was declared in the feature list. + * Fix bug (sorry!) in `\newopentypefeature`. + * Improve monospace font in documentation. + + * N.B. There is currently a known issue with TTC fonts and LuaTeX; currently they cannot be loaded through the `fontspec` interface, but this issue should soon be addressed by the `luaotfload` package. + +- v2.5d (2017/01/24) "oops" + + * Add `\fontspec_if_small_caps:TF` + * Fix bug in `\emph` (!!) + +- v2.5c (2017/01/20) "Christmas 2016 release" + + * `TU` font encoding now default, with encoding files provided by the kernel. + * Experimental interface added for customising encodings. + * Add feature `Ornament=`*n* corresponding to OpenType feature `+ornm=`*n*. + * Add feature `FontIndex=`*n* to support TrueType Collection (TTC) files. + * Nested `\emph` is now much smarter and will cleverly nest even if manual font changes are made. + * Tries to resolve situations when font features clash. + E.g., `Numbers={Uppercase,Lowercase}` will define only `+onum` rather than the previous behaviour of `+lnum;+onum` to let the engine sort things out. Coverage may still be preliminary. + * Add API function `\fontspec_if_current_feature:nTF` for querying selected features based on their OpenType tag. + * Add user function `\IfFontFeatureActiveTF` for querying selected features based on their `fontspec` specification. + * All "tag-based" OpenType features are now provided in `Feat`/`FeatOff`/`FeatReset` forms to disable and reset them. + * `ResetAll` provided for all "tag-based" OpenType feature keys. (E.g., `Ligatures=ResetAll`.) + * Big table of OpenType feature tags to help cross-reference which fontspec feature (if any) corresponds to which OpenType feature. + * Bug fixed for `Script` selection. + +- v2.5b (2016/05/14) "More bugs" (somehow never released) + + * Fixed bug with garbage text printed in certain "verbatim" situations under LuaTeX. + * Improve interaction between optical sizes and small caps. + * Remove documentation for `FeatureFile`, since this is no longer supported under LuaLaTeX + (there are other methods to perform the same thing, but no "easy" user interface that `fontspec` can provide at this stage). + * Fix regression causing an error message if `fontspec` loaded before `\documentclass'. + +- v2.5a (2016/02/01) "Bugs fixed" * Rather embarrassing bug fix! (`unicode-math` was broken.) * Remember to add the `fontspec.cfg` file to the distribution. @@ -77,7 +127,8 @@ - v2.5 (2016/01/30) "TL2016 release" - * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode. If this causes problems, load fontspec with the `[euenc]` option to revert to the old behaviour. + * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode. + * Activate with package option `[tuenc]'; once it becomes the default (later this year), `[euenc]` option will revert to the old behaviour. * New command `\emfontdeclare` for defining font shapes when arbitrarily nesting the `\emph` command. * Allow slanted small caps and better internal methods for "combining" font shapes; this fixes a few bugs. * Incorporate "new" font script tags for Indic fonts. E.g., when selecting `Script=Bengali`, fontspec will first query the font for the `bng2` OpenType script, and if not found select `beng`. Binary files old/doc/latex/fontspec/fontspec.pdf and new/doc/latex/fontspec/fontspec.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontspec.doc.tlpobj new/tlpkg/tlpobj/fontspec.doc.tlpobj --- old/tlpkg/tlpobj/fontspec.doc.tlpobj 2016-05-20 03:15:55.000000000 +0200 +++ new/tlpkg/tlpobj/fontspec.doc.tlpobj 2017-04-14 17:41:10.000000000 +0200 @@ -1,9 +1,9 @@ name fontspec.doc category Package -revision 41262 +revision 43661 shortdesc doc files of fontspec relocated 1 -docfiles size=203 +docfiles size=241 RELOC/doc/latex/fontspec/README.md RELOC/doc/latex/fontspec/fontspec-example.tex RELOC/doc/latex/fontspec/fontspec.pdf ++++++ fontspec.tar.xz ++++++ ++++ 8913 lines of diff (skipped) ++++++ fonttable.doc.tar.xz ++++++ ++++++ fonttable.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonttable.tlpobj new/tlpkg/tlpobj/fonttable.tlpobj --- old/tlpkg/tlpobj/fonttable.tlpobj 2016-04-14 19:03:43.000000000 +0200 +++ new/tlpkg/tlpobj/fonttable.tlpobj 2017-04-14 17:41:10.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=4 RELOC/tex/latex/fonttable/fonttable.sty catalogue-ctan /macros/latex/contrib/fonttable -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 1.6b ++++++ fontware.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pltotf.1 new/texmf-dist/doc/man/man1/pltotf.1 --- old/texmf-dist/doc/man/man1/pltotf.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pltotf.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH PLTOTF 1 "16 June 2015" "Web2C 2016" +.TH PLTOTF 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/pltotf.man1.pdf and new/texmf-dist/doc/man/man1/pltotf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tftopl.1 new/texmf-dist/doc/man/man1/tftopl.1 --- old/texmf-dist/doc/man/man1/tftopl.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/tftopl.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TFTOPL 1 "16 June 2015" "Web2C 2016" +.TH TFTOPL 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/tftopl.man1.pdf and new/texmf-dist/doc/man/man1/tftopl.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vftovp.1 new/texmf-dist/doc/man/man1/vftovp.1 --- old/texmf-dist/doc/man/man1/vftovp.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/vftovp.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH VFTOVP 1 "16 June 2015" "Web2C 2016" +.TH VFTOVP 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/vftovp.man1.pdf and new/texmf-dist/doc/man/man1/vftovp.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vptovf.1 new/texmf-dist/doc/man/man1/vptovf.1 --- old/texmf-dist/doc/man/man1/vptovf.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/vptovf.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH VPTOVF 1 "16 June 2015" "Web2C 2016" +.TH VPTOVF 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/vptovf.man1.pdf and new/texmf-dist/doc/man/man1/vptovf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontware.doc.tlpobj new/tlpkg/tlpobj/fontware.doc.tlpobj --- old/tlpkg/tlpobj/fontware.doc.tlpobj 2016-04-27 03:17:27.000000000 +0200 +++ new/tlpkg/tlpobj/fontware.doc.tlpobj 2017-05-04 02:07:03.000000000 +0200 @@ -1,8 +1,8 @@ name fontware.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of fontware -docfiles size=27 +docfiles size=12 texmf-dist/doc/man/man1/pltotf.1 texmf-dist/doc/man/man1/pltotf.man1.pdf texmf-dist/doc/man/man1/tftopl.1 ++++++ fontwrap.doc.tar.xz ++++++ ++++++ fontwrap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontwrap.tlpobj new/tlpkg/tlpobj/fontwrap.tlpobj --- old/tlpkg/tlpobj/fontwrap.tlpobj 2016-04-14 19:03:50.000000000 +0200 +++ new/tlpkg/tlpobj/fontwrap.tlpobj 2017-04-14 17:41:13.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=18 RELOC/tex/xelatex/fontwrap/fontwrap.sty catalogue-ctan /macros/xetex/latex/fontwrap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-10-08 11:40:26 +0200 catalogue-license gpl -catalogue-topics font-sel font-supp +catalogue-topics font-sel font-supp unicode ++++++ footbib.doc.tar.xz ++++++ ++++++ footbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footbib.tlpobj new/tlpkg/tlpobj/footbib.tlpobj --- old/tlpkg/tlpobj/footbib.tlpobj 2016-04-14 19:03:50.000000000 +0200 +++ new/tlpkg/tlpobj/footbib.tlpobj 2017-04-14 17:41:13.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/footbib/footbib.sty catalogue-also jurabib catalogue-ctan /macros/latex/contrib/footbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cite-foot catalogue-version 2.0.7 ++++++ footmisc.doc.tar.xz ++++++ ++++++ footmisc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footmisc.tlpobj new/tlpkg/tlpobj/footmisc.tlpobj --- old/tlpkg/tlpobj/footmisc.tlpobj 2016-04-14 19:03:50.000000000 +0200 +++ new/tlpkg/tlpobj/footmisc.tlpobj 2017-04-14 17:41:13.000000000 +0200 @@ -20,9 +20,9 @@ longdesc footnpag and by the rather more general-purpose perpage runfiles size=7 RELOC/tex/latex/footmisc/footmisc.sty -catalogue-also endnotes ftnright +catalogue-also endnotes ftnright footmisx catalogue-ctan /macros/latex/contrib/footmisc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-12-02 18:45:34 +0100 catalogue-license lppl1.3 catalogue-topics footnote catalogue-version 5.5b ++++++ footnotebackref.doc.tar.xz ++++++ ++++++ footnotebackref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnotebackref.tlpobj new/tlpkg/tlpobj/footnotebackref.tlpobj --- old/tlpkg/tlpobj/footnotebackref.tlpobj 2016-04-14 19:03:50.000000000 +0200 +++ new/tlpkg/tlpobj/footnotebackref.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/footnotebackref/footnotebackref.sty catalogue-ctan /macros/latex/contrib/footnotebackref -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics footnote hyper catalogue-version 1.0 ++++++ footnotehyper.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/footnotehyper/README.md new/doc/latex/footnotehyper/README.md --- old/doc/latex/footnotehyper/README.md 2016-05-03 02:02:02.000000000 +0200 +++ new/doc/latex/footnotehyper/README.md 2017-03-08 00:01:04.000000000 +0100 @@ -1,43 +1,35 @@  - Source: footnotehyper.dtx (v0.9e 2016/04/30) + Source: footnotehyper.dtx (v1.0 2017/03/07) Author: Jean-Francois Burnol Info: hyperref aware footnote.sty - License: LPPL 1.3c or later - Copyright (C) 2016 Jean-Francois Burnol <jfbu at free dot fr>. + License: LPPL 1.3c + Copyright (C) 2016-2017 Jean-Francois Burnol <jfbu at free dot fr>. ABSTRACT ======== -The `footnote` package by Mark Wooding dates back to 1997 and has -not been made `hyperref` compatible. The aim of the present -package is to do that. Its state is what I found sufficiently -well-working on a current LaTeX document of mine. - -For those who don't know: the `footnote` package allows via -`\savenotes` to gather footnotes and later release them via -`\spewnotes` (one can also use a `savenotes` environment.) -Thus footnotes emitted from tabulars or minipages -are not separated from the general document stream of footnotes, -and are printed with the others at bottom of page. This works also -for environments like `framed` (1) from the eponymous package and -avoids the `\footnotemark/\footnotetext` approach, which anyhow is -not immediately `hyperref` compatible. The `footnote` package has -a facility to patch any user-chosen environment to do the -`\savenotes/\spewnotes` automatically. - -This package provides no facility for handling footnotes from floating -environments. - -Some issues from `footnote.sty` made it incompatible with the -`color` and `xcolor` packages; this is corrected by `footnotehyper`. The -compatibility with `babel-frenchb` is improved, too. - -The loading of `hyperref` (either before or after) is mandatory -but left to the user. - -(1): in case of multi-page content, the footnotes are delivered in -the last page. +The `footnote` package by Mark Wooding (`1997/01/28` `1.13`) +allows to gather footnotes (`\begin{savenotes}`) and later insert +them (after `\end{savenotes}`) at the bottom of the page, even +if the intervening material consists of tabulars, minipages or +framed contents for example. One can also use the +`\savenotes/\spewnotes` syntax. + +Also, `footnote.sty` provides a `footnote` environment which +allows to insert verbatim material. + +Earlier releases of the present `footnotehyper` package added +patches for `hyperref` compatibility and some bugfixes, addressing +in particular the incompatibility with `color/xcolor`, and with +`babel-frenchb`, and also fixing the `footnote` environment with +optional argument `[NUM]`. Since `v0.99` all macros are defined +internally and the `footnote` package is not loaded at all. + +The same user interface is kept. Since `v1.0` it is possible to +use `footnotehyper` also in absence of `hyperref` or when the latter is +loaded with its `hyperfootnotes=false` option. The order of loading of +`footnotehyper` and `hyperref` is inconsequential. INSTALLATION ============ Binary files old/doc/latex/footnotehyper/footnotehyper.pdf and new/doc/latex/footnotehyper/footnotehyper.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/footnotehyper/footnotehyper.tex new/doc/latex/footnotehyper/footnotehyper.tex --- old/doc/latex/footnotehyper/footnotehyper.tex 2016-05-03 02:02:02.000000000 +0200 +++ new/doc/latex/footnotehyper/footnotehyper.tex 2017-03-08 00:01:04.000000000 +0100 @@ -1,13 +1,13 @@ %% %% Package: footnotehyper -%% Version: 0.9e (2016/04/30) +%% Version: 1.0 (2017/03/07) %% License: LPPL 1.3c -%% Copyright (C) 2016 Jean-Francois Burnol <jfbu at free dot fr>. +%% Copyright (C) 2016-2017 Jean-Francois Burnol <jfbu at free dot fr>. %% \def\pkgname {footnotehyper} -\def\pkgdate {2016/04/30} -\def\docdate {2016/04/30} -\def\pkgversion {v0.9e} +\def\pkgdate {2017/03/07} +\def\docdate {2017/03/07} +\def\pkgversion {v1.0} \def\pkgdescription {hyperref aware footnote.sty (JFB)} %% %% run latex twice on this file footnotehyper.tex then dvipdfmx on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnotehyper.doc.tlpobj new/tlpkg/tlpobj/footnotehyper.doc.tlpobj --- old/tlpkg/tlpobj/footnotehyper.doc.tlpobj 2016-05-03 03:17:19.000000000 +0200 +++ new/tlpkg/tlpobj/footnotehyper.doc.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -1,9 +1,9 @@ name footnotehyper.doc category Package -revision 40852 +revision 43424 shortdesc doc files of footnotehyper relocated 1 -docfiles size=14 +docfiles size=16 RELOC/doc/latex/footnotehyper/README.md RELOC/doc/latex/footnotehyper/footnotehyper.pdf RELOC/doc/latex/footnotehyper/footnotehyper.tex ++++++ footnotehyper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/footnotehyper/footnotehyper.sty new/tex/latex/footnotehyper/footnotehyper.sty --- old/tex/latex/footnotehyper/footnotehyper.sty 2016-05-03 02:02:02.000000000 +0200 +++ new/tex/latex/footnotehyper/footnotehyper.sty 2017-03-08 00:01:05.000000000 +0100 @@ -23,140 +23,233 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{footnotehyper}% - [2016/04/30 v0.9e hyperref aware footnote.sty (JFB)] + [2017/03/07 v1.0 hyperref aware footnote.sty (JFB)] %% %% Package: footnotehyper -%% Version: 0.9e (2016/04/30) +%% Version: 1.0 (2017/03/07) %% License: LPPL 1.3c -%% Copyright (C) 2016 Jean-Francois Burnol <jfbu at free dot fr>. +%% Copyright (C) 2016-2017 Jean-Francois Burnol <jfbu at free dot fr>. %% -\DeclareOption*{\PackageWarning{footnotehyper}{Option `\CurrentOption' is unknown}}% +\DeclareOption*% + {\PackageWarning{footnotehyper}{Option `\CurrentOption' is unknown}}% \ProcessOptions\relax -\@ifpackageloaded{footnote} - {\PackageWarning{footnotehyper}{Please next time do not load footnote,^^J - but leave that to me, that is much safer.}} - {\let\FNH@@makefntext\@makefntext\let\@makefntext\@firstofone - \RequirePackage{footnote} - \let\@makefntext\FNH@@makefntext - }% -\let\FNH@fn@footnote \footnote -\let\FNH@fn@footnotetext\footnotetext -\let\footnote \fn@latex@@footnote -\let\footnotetext\fn@latex@@footnotetext +\newbox\FNH@notes +\newdimen\FNH@width +\let\FNH@colwidth\columnwidth +\newif\ifFNH@savingnotes \AtBeginDocument {% - \let\fn@latex@@footnote \footnote - \let\fn@latex@@footnotetext\footnotetext - \let\footnote \FNH@fn@footnote - \let\footnotetext\FNH@fn@footnotetext -}% -\AtBeginDocument{\@ifpackageloaded{hyperref} - {\ifHy@hyperfootnotes - \let\fn@fntext \FNH@fn@fntext - \let\spewnotes \FNH@spewnotes - \let\endsavenotes\spewnotes - \let\fn@endfntext\FNH@fn@endfntext - \else - \FNH@inactive - \fi }\FNH@inactive - \let\endfootnote\fn@endfntext - \let\endfootnotetext\endfootnote -}% -\def\FNH@fixendfntext\@finalstrut\strutbox\fn@postfntext - {\@finalstrut\strutbox\fn@postfntext\fn@endnote}% -\def\FNH@inactive {% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\fn@endfntext - \expandafter\expandafter\expandafter - {\expandafter\FNH@fixendfntext\fn@endfntext}% - \PackageInfo{footnotehyper}{hyperref package not loaded,^^J - or hyperfootnotes=false option; I did not activate myself and only^^J - patched footnote.sty for color/xcolor/babel-frenchb compatibility}}% -\def\FNH@fn@fntext {\ifx\ifmeasuring@\undefined\expandafter\@secondoftwo - \else\expandafter\@firstofone\fi - {\ifmeasuring@\expandafter\@gobbletwo\fi}% - \FNH@fn@fntext@i }% -\long\def\FNH@fn@fntext@i #1{\global\setbox\fn@notes\vbox - {\unvbox\fn@notes - \fn@startnote - \@makefntext - {\rule\z@\footnotesep\ignorespaces - \ifHy@nesting\expandafter\ltx@firstoftwo - \else\expandafter\ltx@secondoftwo - \fi - {\expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}}% - {\Hy@raisedlink - {\expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}% - {\relax}}% - \let\@currentHref\Hy@footnote@currentHref - \let\@currentlabelname\@empty - #1}% - \@finalstrut\strutbox }% - \fn@endnote }% -}% -\def\FNH@spewnotes {\endgroup - \if@savingnotes\else\ifvoid\fn@notes\else - \begingroup\let\@makefntext\@empty - \let\@finalstrut\@gobble - \let\rule\@gobbletwo - \H@@footnotetext{\unvbox\fn@notes}% - \endgroup\fi\fi -}% -\def\fn@endnote {\color@endgroup}% -\def\FNH@fn@endfntext{% - \@finalstrut\strutbox - \fn@postfntext - \fn@endnote - \egroup - \begingroup - \let\@makefntext\@empty - \let\@finalstrut\@gobble - \let\rule\@gobbletwo - \H@@footnotetext - {\ifHy@nesting\expandafter\ltx@firstoftwo + \let\FNH@latex@footnote \footnote + \let\FNH@latex@footnotetext\footnotetext + \let\FNH@H@@footnotetext \@footnotetext + \newenvironment{savenotes} + {\FNH@savenotes\ignorespaces}{\FNH@spewnotes\ignorespacesafterend}% + \let\spewnotes \FNH@spewnotes + \let\footnote \FNH@footnote + \let\footnotetext \FNH@footnotetext + \let\endfootnote \FNH@endfntext + \let\endfootnotetext\FNH@endfntext + \@ifpackageloaded{hyperref} + {\ifHy@hyperfootnotes + \let\FNH@H@@footnotetext\H@@footnotetext + \else + \let\FNH@hyper@fntext\FNH@nohyp@fntext + \fi}% + {\let\FNH@hyper@fntext\FNH@nohyp@fntext}% +}% +\def\FNH@hyper@fntext{\FNH@fntext\FNH@hyper@fntext@i}% +\def\FNH@nohyp@fntext{\FNH@fntext\FNH@nohyp@fntext@i}% +\def\FNH@fntext #1{\ifx\ifmeasuring@\@undefined + \expandafter\@secondoftwo\else\expandafter\@firstofone\fi + {\ifmeasuring@\expandafter\@gobbletwo\fi}#1% +}% +\long\def\FNH@hyper@fntext@i#1{% + \global\setbox\FNH@notes\vbox + {\unvbox\FNH@notes + \FNH@startnote + \@makefntext + {\rule\z@\footnotesep\ignorespaces + \ifHy@nesting\expandafter\ltx@firstoftwo \else\expandafter\ltx@secondoftwo - \fi - {\expandafter\hyper@@anchor - \expandafter{\Hy@footnote@currentHref}{\unvbox\z@}}% - {\Hy@raisedlink - {\expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}% - {\relax}}% - \let\@currentHref\Hy@footnote@currentHref - \let\@currentlabelname\@empty - \unvbox\z@}% + \fi + {\expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}}% + {\Hy@raisedlink + {\expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}% + {\relax}}% + \let\@currentHref\Hy@footnote@currentHref + \let\@currentlabelname\@empty + #1}% + \@finalstrut\strutbox + }% + \FNH@endnote + }% +}% +\long\def\FNH@nohyp@fntext@i#1{% + \global\setbox\FNH@notes\vbox + {\unvbox\FNH@notes + \FNH@startnote + \@makefntext{\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \FNH@endnote + }% +}% +\def\FNH@startnote{% + \hsize\FNH@colwidth + \interlinepenalty\interfootnotelinepenalty + \reset@font\footnotesize + \floatingpenalty\@MM% Is this right??? + \@parboxrestore + \protected@edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}% + \color@begingroup +}% +\def\FNH@endnote{\color@endgroup}% +\def\FNH@savenotes{% + \begingroup + \ifFNH@savingnotes\else + \FNH@savingnotestrue + \let\@footnotetext \FNH@hyper@fntext + \let\@mpfootnotetext \FNH@hyper@fntext + \let\H@@mpfootnotetext\FNH@nohyp@fntext % fool hyperref's \@xfootnotetext + \FNH@width\columnwidth + \let\FNH@colwidth\FNH@width + \global\setbox\FNH@notes\box\voidb@x + \let\FNH@thempfn\thempfn + \let\FNH@mpfn\@mpfn + \ifx\@minipagerestore\relax\let\@minipagerestore\@empty\fi + \expandafter\def\expandafter\@minipagerestore\expandafter{% + \@minipagerestore + \let\thempfn\FNH@thempfn + \let\@mpfn\FNH@mpfn }% + \fi +}% +\def\FNH@spewnotes {% + \endgroup + \ifFNH@savingnotes\else + \ifvoid\FNH@notes\else + \begingroup + \let\@makefntext\@empty + \let\@finalstrut\@gobble + \let\rule\@gobbletwo + \FNH@H@@footnotetext{\unvbox\FNH@notes}% \endgroup + \fi + \fi }% -\ifx\FNH@@makefntext\undefined\expandafter\@gobble - \else\expandafter\AtBeginDocument\fi -{% - \ifx\@makefntextFB\undefined - \expandafter\@gobble\else\expandafter\@firstofone\fi - {\ifFBFrenchFootnotes \let\FNH@@makefntext\@makefntextFB \else - \let\FNH@@makefntext\@makefntextORI\fi}% - \expandafter\FNH@check@a\FNH@@makefntext{1.2!3?4,}\FNH@@@1.2!3?4,\FNH@@@\relax -}% -\long\def\FNH@check@a #11.2!3?4,#2\FNH@@@#3% -{% - \ifx\relax#3\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi - \FNH@bad@footnote@env - {\def\fn@prefntext{#1}\def\fn@postfntext{#2}\FNH@check@b}% +\def\FNH@footnote@envname {footnote}% +\def\FNH@footnotetext@envname{footnotetext}% +\def\FNH@footnote{% + \ifx\@currenvir\FNH@footnote@envname + \expandafter\FNH@footnoteenv + \else + \expandafter\FNH@latex@footnote + \fi +}% +\def\FNH@footnoteenv{% + \@ifnextchar[% + \FNH@footnoteenv@i %] + {\stepcounter\@mpfn + \protected@xdef\@thefnmark{\thempfn}% + \@footnotemark + \def\FNH@endfntext@fntext{\@footnotetext}% + \FNH@startfntext}% }% -\def\FNH@check@b #1\relax -{% +\def\FNH@footnoteenv@i[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \@footnotemark + \def\FNH@endfntext@fntext{\@footnotetext}% + \FNH@startfntext +}% +\def\FNH@footnotetext{% + \ifx\@currenvir\FNH@footnotetext@envname + \expandafter\FNH@footnotetextenv + \else + \expandafter\FNH@latex@footnotetext + \fi +}% +\def\FNH@footnotetextenv{% + \@ifnextchar[% + \FNH@footnotetextenv@i %] + {\protected@xdef\@thefnmark{\thempfn}% + \def\FNH@endfntext@fntext{\@footnotetext}% + \FNH@startfntext}% +}% +\def\FNH@footnotetextenv@i[#1]{% + \begingroup + \csname c@\@mpfn\endcsname #1\relax + \unrestored@protected@xdef\@thefnmark{\thempfn}% + \endgroup + \ifFNH@savingnotes + \def\FNH@endfntext@fntext{\FNH@nohyp@fntext}% + \else + \def\FNH@endfntext@fntext{\FNH@H@@footnotetext}% + \fi + \FNH@startfntext +}% +\def\FNH@startfntext{% + \setbox\z@\vbox\bgroup + \FNH@startnote + \FNH@prefntext + \rule\z@\footnotesep\ignorespaces +}% +\def\FNH@endfntext {% + \@finalstrut\strutbox + \FNH@postfntext + \FNH@endnote + \egroup + \begingroup + \let\@makefntext\@empty\let\@finalstrut\@gobble\let\rule\@gobbletwo + \FNH@endfntext@fntext {\unvbox\z@}% + \endgroup +}% +\AtBeginDocument{\let\FNH@@makefntext\@makefntext + \ifx\@makefntextFB\undefined + \expandafter\@gobble\else\expandafter\@firstofone\fi + {\ifFBFrenchFootnotes \let\FNH@@makefntext\@makefntextFB \else + \let\FNH@@makefntext\@makefntextORI\fi}% + \expandafter\FNH@check@a\FNH@@makefntext{1.2!3?4,}% + \FNH@@@1.2!3?4,\FNH@@@\relax +}% +\long\def\FNH@check@a #11.2!3?4,#2\FNH@@@#3{% + \ifx\relax#3\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + \FNH@bad@makefntext@alert + {\def\FNH@prefntext{#1}\def\FNH@postfntext{#2}\FNH@check@b}% +}% +\def\FNH@check@b #1\relax{% \expandafter\expandafter\expandafter\FNH@check@c - \expandafter\meaning\expandafter\fn@prefntext - \meaning\fn@postfntext1.2!3?4,\FNH@check@c\relax + \expandafter\meaning\expandafter\FNH@prefntext + \meaning\FNH@postfntext1.2!3?4,\FNH@check@c\relax }% -\def\FNH@check@c #11.2!3?4,#2#3\relax - {\ifx\FNH@check@c#2\expandafter\@gobble\fi\FNH@bad@footnote@env}% -\def\FNH@bad@footnote@env -{% - \PackageWarning{footnotehyper}% - {The footnote environment from package footnote^^J% - will be dysfunctional, sorry (not my fault...). You may try to mail - me^^Jthe preamble and/or only the next lines:}% +\def\FNH@check@c #11.2!3?4,#2#3\relax{% + \ifx\FNH@check@c#2\expandafter\@gobble\fi\FNH@bad@makefntext@alert +}% +\def\FNH@bad@makefntext@alert{% + \PackageWarningNoLine{footnotehyper}% + {^^J The footnote environment will not be fully functional, sorry.^^J + You may try to email the author with the following information:}% \typeout{\meaning\@makefntext}% - \let\fn@prefntext\@empty\let\fn@postfntext\@empty + \let\FNH@prefntext\@empty\let\FNH@postfntext\@empty +}% +\def\makesavenoteenv{\@ifnextchar[\FNH@msne@ii\FNH@msne@i}%] +\def\FNH@msne@i #1{% + \expandafter\let\csname FNH$#1\expandafter\endcsname %$ + \csname #1\endcsname + \expandafter\let\csname endFNH$#1\expandafter\endcsname %$ + \csname end#1\endcsname + \FNH@msne@ii[#1]{FNH$#1}%$ +}% +\def\FNH@msne@ii[#1]#2{% + \expandafter\edef\csname#1\endcsname{% + \noexpand\savenotes + \expandafter\noexpand\csname#2\endcsname + }% + \expandafter\edef\csname end#1\endcsname{% + \expandafter\noexpand\csname end#2\endcsname + \noexpand\expandafter + \noexpand\spewnotes + \noexpand\if@endpe\noexpand\@endpetrue\noexpand\fi + }% }% \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnotehyper.tlpobj new/tlpkg/tlpobj/footnotehyper.tlpobj --- old/tlpkg/tlpobj/footnotehyper.tlpobj 2016-05-03 03:17:19.000000000 +0200 +++ new/tlpkg/tlpobj/footnotehyper.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -1,6 +1,6 @@ name footnotehyper category Package -revision 40852 +revision 43424 shortdesc hyperref aware footnote.sty relocated 1 longdesc The footnote package by Mark Wooding dates back to 1997 and has @@ -10,7 +10,7 @@ RELOC/tex/latex/footnotehyper/footnotehyper.sty catalogue-also footnote catalogue-ctan /macros/latex/contrib/footnotehyper -catalogue-date 2016-04-30 20:49:18 +0200 +catalogue-date 2017-03-07 20:20:57 +0100 catalogue-license lppl1.3 catalogue-topics footnote macro-supp -catalogue-version 0.9e +catalogue-version 1.0 ++++++ footnoterange.doc.tar.xz ++++++ ++++++ footnoterange.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnoterange.tlpobj new/tlpkg/tlpobj/footnoterange.tlpobj --- old/tlpkg/tlpobj/footnoterange.tlpobj 2016-04-14 19:03:51.000000000 +0200 +++ new/tlpkg/tlpobj/footnoterange.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/footnoterange/footnoterange.sty catalogue-also footmisc catalogue-ctan /macros/latex/contrib/footnoterange -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics footnote label-ref catalogue-version 1.0a ++++++ footnpag.doc.tar.xz ++++++ ++++++ footnpag.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnpag.tlpobj new/tlpkg/tlpobj/footnpag.tlpobj --- old/tlpkg/tlpobj/footnpag.tlpobj 2016-04-14 19:03:51.000000000 +0200 +++ new/tlpkg/tlpobj/footnpag.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/latex/footnpag/footnpag.sty catalogue-also footmisc catalogue-ctan /macros/latex/contrib/footnpag -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics footnote ++++++ forarray.doc.tar.xz ++++++ ++++++ forarray.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forarray.tlpobj new/tlpkg/tlpobj/forarray.tlpobj --- old/tlpkg/tlpobj/forarray.tlpobj 2016-04-14 19:03:52.000000000 +0200 +++ new/tlpkg/tlpobj/forarray.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=5 RELOC/tex/latex/forarray/forarray.sty catalogue-ctan /macros/latex/contrib/forarray -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.01 ++++++ foreign.doc.tar.xz ++++++ ++++++ foreign.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/foreign.tlpobj new/tlpkg/tlpobj/foreign.tlpobj --- old/tlpkg/tlpobj/foreign.tlpobj 2016-04-14 19:03:52.000000000 +0200 +++ new/tlpkg/tlpobj/foreign.tlpobj 2017-04-14 17:41:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/foreign/foreign.sty catalogue-ctan /macros/latex/contrib/foreign -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting catalogue-version 2.7 ++++++ forest.doc.tar.xz ++++++ ++++ 4065 lines of diff (skipped) ++++++ forest.tar.xz ++++++ ++++ 5127 lines of diff (skipped) ++++++ forloop.doc.tar.xz ++++++ ++++++ forloop.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forloop.tlpobj new/tlpkg/tlpobj/forloop.tlpobj --- old/tlpkg/tlpobj/forloop.tlpobj 2016-04-14 19:03:54.000000000 +0200 +++ new/tlpkg/tlpobj/forloop.tlpobj 2017-04-14 17:41:15.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/forloop/forloop.sty catalogue-ctan /macros/latex/contrib/forloop -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics macro-iterate macro-supp catalogue-version 3.0 ++++++ formation-latex-ul.doc.tar.xz ++++++ ++++ 1766 lines of diff (skipped) ++++++ formlett.doc.tar.xz ++++++ ++++++ formlett.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/formlett.tlpobj new/tlpkg/tlpobj/formlett.tlpobj --- old/tlpkg/tlpobj/formlett.tlpobj 2016-04-14 19:03:56.000000000 +0200 +++ new/tlpkg/tlpobj/formlett.tlpobj 2017-04-14 17:41:17.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/generic/formlett/formlett.sty catalogue-also akletter dinbrief envlab catalogue-ctan /macros/generic/formlett -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics letter catalogue-version 2.3 ++++++ formular.doc.tar.xz ++++++ ++++++ formular.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/formular.tlpobj new/tlpkg/tlpobj/formular.tlpobj --- old/tlpkg/tlpobj/formular.tlpobj 2016-04-14 19:03:56.000000000 +0200 +++ new/tlpkg/tlpobj/formular.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/formular/formular.sty catalogue-ctan /macros/latex/contrib/formular -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics form-fillin catalogue-version 1.0a ++++++ fouridx.doc.tar.xz ++++++ ++++++ fouridx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fouridx.tlpobj new/tlpkg/tlpobj/fouridx.tlpobj --- old/tlpkg/tlpobj/fouridx.tlpobj 2016-04-14 19:03:56.000000000 +0200 +++ new/tlpkg/tlpobj/fouridx.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/fouridx/fouridx.sty catalogue-ctan /macros/latex/contrib/fouridx -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 2.00 ++++++ fourier.doc.tar.xz ++++++ ++++++ fourier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fourier.tlpobj new/tlpkg/tlpobj/fourier.tlpobj --- old/tlpkg/tlpobj/fourier.tlpobj 2016-04-14 19:03:57.000000000 +0200 +++ new/tlpkg/tlpobj/fourier.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -228,7 +228,7 @@ RELOC/tex/latex/fourier/ufuts.fd catalogue-also utopia catalogue-ctan /fonts/fourier-GUT -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-maths font-type1 catalogue-version 1.3 ++++++ fouriernc.doc.tar.xz ++++++ ++++++ fouriernc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fouriernc.tlpobj new/tlpkg/tlpobj/fouriernc.tlpobj --- old/tlpkg/tlpobj/fouriernc.tlpobj 2016-04-14 19:03:58.000000000 +0200 +++ new/tlpkg/tlpobj/fouriernc.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -30,6 +30,6 @@ RELOC/tex/latex/fouriernc/t1fnc.fd RELOC/tex/latex/fouriernc/ts1fnc.fd catalogue-ctan /fonts/fouriernc -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-maths font-virtual ++++++ fp.doc.tar.xz ++++++ ++++++ fp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fp.tlpobj new/tlpkg/tlpobj/fp.tlpobj --- old/tlpkg/tlpobj/fp.tlpobj 2016-04-14 19:03:58.000000000 +0200 +++ new/tlpkg/tlpobj/fp.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -22,6 +22,6 @@ RELOC/tex/plain/fp/fp.tex catalogue-also fltpoint catalogue-ctan /macros/latex/contrib/fp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics arithmetic calculation ++++++ fpl.doc.tar.xz ++++++ ++++++ fpl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fpl.tlpobj new/tlpkg/tlpobj/fpl.tlpobj --- old/tlpkg/tlpobj/fpl.tlpobj 2016-04-14 19:03:58.000000000 +0200 +++ new/tlpkg/tlpobj/fpl.tlpobj 2017-04-14 17:41:18.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/fonts/type1/public/fpl/fplrij8a.pfb RELOC/fonts/type1/public/fpl/fplrij8a.pfm catalogue-ctan /fonts/fpl -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 catalogue-version 1.002 ++++++ fragmaster.doc.tar.xz ++++++ ++++++ fragmaster.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fragmaster.tlpobj new/tlpkg/tlpobj/fragmaster.tlpobj --- old/tlpkg/tlpobj/fragmaster.tlpobj 2016-04-14 19:03:59.000000000 +0200 +++ new/tlpkg/tlpobj/fragmaster.tlpobj 2017-04-14 17:41:19.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 texmf-dist/scripts/fragmaster/fragmaster.pl catalogue-ctan /support/fragmaster -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-prep catalogue-version 1.6 ++++++ fragments.doc.tar.xz ++++++ ++++++ fragments.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fragments.tlpobj new/tlpkg/tlpobj/fragments.tlpobj --- old/tlpkg/tlpobj/fragments.tlpobj 2016-04-14 19:03:59.000000000 +0200 +++ new/tlpkg/tlpobj/fragments.tlpobj 2017-04-14 17:41:19.000000000 +0200 @@ -15,6 +15,6 @@ RELOC/tex/latex/fragments/removefr.tex RELOC/tex/latex/fragments/subscript.sty catalogue-ctan /macros/latex/contrib/fragments -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license collection catalogue-topics collection ++++++ frame.doc.tar.xz ++++++ ++++++ frame.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frame.tlpobj new/tlpkg/tlpobj/frame.tlpobj --- old/tlpkg/tlpobj/frame.tlpobj 2016-04-14 19:04:00.000000000 +0200 +++ new/tlpkg/tlpobj/frame.tlpobj 2017-04-14 17:41:19.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/frame/frame.tex catalogue-also boxit catalogue-ctan /macros/generic/frame -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing decoration catalogue-version 1.0 ++++++ framed.doc.tar.xz ++++++ ++++++ framed.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/framed.tlpobj new/tlpkg/tlpobj/framed.tlpobj --- old/tlpkg/tlpobj/framed.tlpobj 2016-04-14 19:04:00.000000000 +0200 +++ new/tlpkg/tlpobj/framed.tlpobj 2017-04-14 17:41:19.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/framed/framed.sty catalogue-also mdframed catalogue-ctan /macros/latex/contrib/framed -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics boxing box-breaking decoration catalogue-version 0.96 ++++++ francais-bst.doc.tar.xz ++++++ ++++++ francais-bst.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/francais-bst.tlpobj new/tlpkg/tlpobj/francais-bst.tlpobj --- old/tlpkg/tlpobj/francais-bst.tlpobj 2016-04-14 19:04:00.000000000 +0200 +++ new/tlpkg/tlpobj/francais-bst.tlpobj 2017-04-14 17:41:19.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/bibtex/bst/francais-bst/francaissc.bst RELOC/tex/latex/francais-bst/francaisbst.tex catalogue-ctan /biblio/bibtex/contrib/francais-bst -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 french catalogue-version 1.1 ++++++ frankenstein.doc.tar.xz ++++++ ++++++ frankenstein.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frankenstein.tlpobj new/tlpkg/tlpobj/frankenstein.tlpobj --- old/tlpkg/tlpobj/frankenstein.tlpobj 2016-04-14 19:04:02.000000000 +0200 +++ new/tlpkg/tlpobj/frankenstein.tlpobj 2017-04-14 17:41:20.000000000 +0200 @@ -42,6 +42,6 @@ RELOC/tex/latex/frankenstein/titles.sty catalogue-also frankenstein-unsupported catalogue-ctan /macros/latex/contrib/frankenstein -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license collection catalogue-topics collection ++++++ frcursive.doc.tar.xz ++++++ ++++++ frcursive.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frcursive.tlpobj new/tlpkg/tlpobj/frcursive.tlpobj --- old/tlpkg/tlpobj/frcursive.tlpobj 2016-04-14 19:04:03.000000000 +0200 +++ new/tlpkg/tlpobj/frcursive.tlpobj 2017-04-14 17:41:20.000000000 +0200 @@ -82,6 +82,6 @@ RELOC/tex/latex/frcursive/ot1frc.fd RELOC/tex/latex/frcursive/t1frc.fd catalogue-ctan /fonts/frcursive -catalogue-date 2015-12-16 06:40:03 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics font font-calligraphic font-mf font-type1 ++++++ frege.doc.tar.xz ++++++ ++++++ frege.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frege.tlpobj new/tlpkg/tlpobj/frege.tlpobj --- old/tlpkg/tlpobj/frege.tlpobj 2016-04-14 19:04:05.000000000 +0200 +++ new/tlpkg/tlpobj/frege.tlpobj 2017-04-14 17:41:21.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/frege/frege.sty catalogue-also bguq begriff grundgesetze catalogue-ctan /macros/latex/contrib/frege -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths logic catalogue-version 1.3 ++++++ frletter.doc.tar.xz ++++++ ++++++ frletter.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frletter.tlpobj new/tlpkg/tlpobj/frletter.tlpobj --- old/tlpkg/tlpobj/frletter.tlpobj 2016-04-14 19:04:05.000000000 +0200 +++ new/tlpkg/tlpobj/frletter.tlpobj 2017-04-14 17:41:21.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/latex/frletter/frletter.cls catalogue-ctan /macros/latex/contrib/frletter -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics letter class ++++++ frontespizio.doc.tar.xz ++++++ ++++++ frontespizio.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frontespizio.tlpobj new/tlpkg/tlpobj/frontespizio.tlpobj --- old/tlpkg/tlpobj/frontespizio.tlpobj 2016-04-14 19:04:05.000000000 +0200 +++ new/tlpkg/tlpobj/frontespizio.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/frontespizio/frontespizio.sty catalogue-also toptesi catalogue-ctan /macros/latex/contrib/frontespizio -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation typesetting catalogue-version 1.4a ++++++ ftcap.doc.tar.xz ++++++ ++++++ ftcap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ftcap.tlpobj new/tlpkg/tlpobj/ftcap.tlpobj --- old/tlpkg/tlpobj/ftcap.tlpobj 2016-04-14 19:04:06.000000000 +0200 +++ new/tlpkg/tlpobj/ftcap.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/ftcap/ftcap.sty catalogue-ctan /macros/latex/contrib/ftcap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics caption table catalogue-version 1.4 ++++++ ftnxtra.doc.tar.xz ++++++ ++++++ ftnxtra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ftnxtra.tlpobj new/tlpkg/tlpobj/ftnxtra.tlpobj --- old/tlpkg/tlpobj/ftnxtra.tlpobj 2016-04-14 19:04:06.000000000 +0200 +++ new/tlpkg/tlpobj/ftnxtra.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/ftnxtra/ftnxtra.sty catalogue-also footnote footmisc catalogue-ctan /macros/latex/contrib/ftnxtra -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics footnote catalogue-version 0.1 ++++++ fullblck.doc.tar.xz ++++++ ++++++ fullblck.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fullblck.tlpobj new/tlpkg/tlpobj/fullblck.tlpobj --- old/tlpkg/tlpobj/fullblck.tlpobj 2016-04-14 19:04:06.000000000 +0200 +++ new/tlpkg/tlpobj/fullblck.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/fullblck/fullblck.sty catalogue-ctan /macros/latex/contrib/fullblck -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.03 ++++++ fullminipage.doc.tar.xz ++++++ ++++++ fullminipage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fullminipage.tlpobj new/tlpkg/tlpobj/fullminipage.tlpobj --- old/tlpkg/tlpobj/fullminipage.tlpobj 2016-04-14 19:04:06.000000000 +0200 +++ new/tlpkg/tlpobj/fullminipage.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/fullminipage/fullminipage.sty catalogue-ctan /macros/latex/contrib/fullminipage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics layout catalogue-version 0.1.1 ++++++ fullwidth.doc.tar.xz ++++++ ++++++ fullwidth.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fullwidth.tlpobj new/tlpkg/tlpobj/fullwidth.tlpobj --- old/tlpkg/tlpobj/fullwidth.tlpobj 2016-04-14 19:04:06.000000000 +0200 +++ new/tlpkg/tlpobj/fullwidth.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=4 RELOC/tex/latex/fullwidth/fullwidth.sty catalogue-ctan /macros/latex/contrib/fullwidth -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 0.1 ++++++ functan.doc.tar.xz ++++++ ++++++ functan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/functan.tlpobj new/tlpkg/tlpobj/functan.tlpobj --- old/tlpkg/tlpobj/functan.tlpobj 2016-04-14 19:04:07.000000000 +0200 +++ new/tlpkg/tlpobj/functan.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=3 RELOC/tex/latex/functan/functan.sty catalogue-ctan /macros/latex/contrib/functan -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths ++++++ fundus-calligra.doc.tar.xz ++++++ ++++++ fundus-calligra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fundus-calligra.tlpobj new/tlpkg/tlpobj/fundus-calligra.tlpobj --- old/tlpkg/tlpobj/fundus-calligra.tlpobj 2016-04-14 19:04:07.000000000 +0200 +++ new/tlpkg/tlpobj/fundus-calligra.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/fundus-calligra/calligra.sty catalogue-ctan /macros/latex/contrib/fundus/calligra -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-supp catalogue-version 1.2 ++++++ fundus-cyr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fundus-cyr.tlpobj new/tlpkg/tlpobj/fundus-cyr.tlpobj --- old/tlpkg/tlpobj/fundus-cyr.tlpobj 2016-04-14 19:04:07.000000000 +0200 +++ new/tlpkg/tlpobj/fundus-cyr.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/latex/fundus-cyr/cyr.sty catalogue-ctan /macros/latex/contrib/fundus/cyr/cyr.sty -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp ++++++ fundus-sueterlin.doc.tar.xz ++++++ ++++++ fundus-sueterlin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fundus-sueterlin.tlpobj new/tlpkg/tlpobj/fundus-sueterlin.tlpobj --- old/tlpkg/tlpobj/fundus-sueterlin.tlpobj 2016-04-14 19:04:07.000000000 +0200 +++ new/tlpkg/tlpobj/fundus-sueterlin.tlpobj 2017-04-14 17:41:22.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/fundus-sueterlin/suetterl.sty catalogue-ctan /macros/latex/contrib/fundus/suetterl -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp catalogue-version 1.2 ++++++ fwlw.doc.tar.xz ++++++ ++++++ fwlw.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fwlw.tlpobj new/tlpkg/tlpobj/fwlw.tlpobj --- old/tlpkg/tlpobj/fwlw.tlpobj 2016-04-14 19:04:07.000000000 +0200 +++ new/tlpkg/tlpobj/fwlw.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=2 RELOC/tex/latex/fwlw/fwlw.sty catalogue-ctan /macros/latex/contrib/fwlw -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics page-hf ++++++ g-brief.doc.tar.xz ++++++ ++++++ g-brief.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/g-brief.tlpobj new/tlpkg/tlpobj/g-brief.tlpobj --- old/tlpkg/tlpobj/g-brief.tlpobj 2016-04-14 19:04:08.000000000 +0200 +++ new/tlpkg/tlpobj/g-brief.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/g-brief/g-brief2.sty catalogue-also akletter dinbrief envlab catalogue-ctan /macros/latex/contrib/g-brief -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter german catalogue-version 4.0.2 ++++++ gaceta.doc.tar.xz ++++++ ++++++ gaceta.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gaceta.tlpobj new/tlpkg/tlpobj/gaceta.tlpobj --- old/tlpkg/tlpobj/gaceta.tlpobj 2016-04-14 19:04:08.000000000 +0200 +++ new/tlpkg/tlpobj/gaceta.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=16 RELOC/tex/latex/gaceta/gaceta.cls catalogue-ctan /macros/latex/contrib/gaceta -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub class catalogue-version 1.06 ++++++ galois.doc.tar.xz ++++++ ++++++ galois.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/galois.tlpobj new/tlpkg/tlpobj/galois.tlpobj --- old/tlpkg/tlpobj/galois.tlpobj 2016-04-14 19:04:08.000000000 +0200 +++ new/tlpkg/tlpobj/galois.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/galois/galois.sty catalogue-ctan /macros/latex/contrib/galois -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 1.5 ++++++ gamebook.doc.tar.xz ++++++ ++++++ gamebook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gamebook.tlpobj new/tlpkg/tlpobj/gamebook.tlpobj --- old/tlpkg/tlpobj/gamebook.tlpobj 2016-04-14 19:04:08.000000000 +0200 +++ new/tlpkg/tlpobj/gamebook.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/gamebook/gamebook.sty catalogue-ctan /macros/latex/contrib/gamebook -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.0 ++++++ garrigues.doc.tar.xz ++++++ ++++++ garrigues.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/garrigues.tlpobj new/tlpkg/tlpobj/garrigues.tlpobj --- old/tlpkg/tlpobj/garrigues.tlpobj 2016-04-14 19:04:08.000000000 +0200 +++ new/tlpkg/tlpobj/garrigues.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=9 RELOC/metapost/garrigues/garrigues.mp catalogue-ctan /graphics/metapost/contrib/macros/garrigues -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics calculation ++++++ garuda-c90.tar.xz ++++++ ++++++ gastex.doc.tar.xz ++++++ ++++++ gastex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gastex.tlpobj new/tlpkg/tlpobj/gastex.tlpobj --- old/tlpkg/tlpobj/gastex.tlpobj 2016-04-14 19:04:09.000000000 +0200 +++ new/tlpkg/tlpobj/gastex.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/gastex/gastex.sty catalogue-also pstricks catalogue-ctan /graphics/gastex -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex catalogue-version 2.8 ++++++ gatech-thesis.doc.tar.xz ++++++ ++++++ gatech-thesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gatech-thesis.tlpobj new/tlpkg/tlpobj/gatech-thesis.tlpobj --- old/tlpkg/tlpobj/gatech-thesis.tlpobj 2016-04-14 19:04:09.000000000 +0200 +++ new/tlpkg/tlpobj/gatech-thesis.tlpobj 2017-04-14 17:41:23.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/gatech-thesis/gatech-thesis-patch.sty RELOC/tex/latex/gatech-thesis/gatech-thesis.cls catalogue-ctan /macros/latex/contrib/gatech-thesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics class dissertation catalogue-version 1.8 ++++++ gates.doc.tar.xz ++++++ ++++++ gates.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gates.tlpobj new/tlpkg/tlpobj/gates.tlpobj --- old/tlpkg/tlpobj/gates.tlpobj 2016-04-14 19:04:09.000000000 +0200 +++ new/tlpkg/tlpobj/gates.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/generic/gates/gates.tex RELOC/tex/generic/gates/t-gates.tex catalogue-ctan /macros/generic/gates -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 0.2 ++++++ gauss.doc.tar.xz ++++++ ++++++ gauss.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gauss.tlpobj new/tlpkg/tlpobj/gauss.tlpobj --- old/tlpkg/tlpobj/gauss.tlpobj 2016-04-14 19:04:09.000000000 +0200 +++ new/tlpkg/tlpobj/gauss.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=16 RELOC/tex/latex/gauss/gauss.sty catalogue-ctan /macros/latex/contrib/gauss -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths ++++++ gb4e.doc.tar.xz ++++++ ++++++ gb4e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gb4e.tlpobj new/tlpkg/tlpobj/gb4e.tlpobj --- old/tlpkg/tlpobj/gb4e.tlpobj 2016-04-14 19:04:10.000000000 +0200 +++ new/tlpkg/tlpobj/gb4e.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/gb4e/cgloss4e.sty RELOC/tex/latex/gb4e/gb4e.sty catalogue-ctan /macros/latex/contrib/gb4e -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics linguistic ++++++ gcard.doc.tar.xz ++++++ ++++++ gcard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gcard.tlpobj new/tlpkg/tlpobj/gcard.tlpobj --- old/tlpkg/tlpobj/gcard.tlpobj 2016-04-14 19:04:10.000000000 +0200 +++ new/tlpkg/tlpobj/gcard.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=1 RELOC/tex/latex/gcard/gcard.sty catalogue-ctan /macros/latex/contrib/gcard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter graphics-use ++++++ gchords.doc.tar.xz ++++++ ++++++ gchords.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gchords.tlpobj new/tlpkg/tlpobj/gchords.tlpobj --- old/tlpkg/tlpobj/gchords.tlpobj 2016-04-14 19:04:10.000000000 +0200 +++ new/tlpkg/tlpobj/gchords.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/gchords/gchords.sty catalogue-ctan /graphics/gchords -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics music catalogue-version 1.20 ++++++ gcite.doc.tar.xz ++++++ ++++++ gcite.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gcite.tlpobj new/tlpkg/tlpobj/gcite.tlpobj --- old/tlpkg/tlpobj/gcite.tlpobj 2016-04-14 19:04:10.000000000 +0200 +++ new/tlpkg/tlpobj/gcite.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/gcite/gcite.sty catalogue-ctan /macros/latex/exptl/gcite -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex german catalogue-version 1.0.1 ++++++ gender.doc.tar.xz ++++++ ++++++ gender.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gender.tlpobj new/tlpkg/tlpobj/gender.tlpobj --- old/tlpkg/tlpobj/gender.tlpobj 2016-04-14 19:04:11.000000000 +0200 +++ new/tlpkg/tlpobj/gender.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/gender/gender.sty catalogue-also he-she eemeir catalogue-ctan /macros/latex/contrib/gender -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics linguistic typesetting catalogue-version 1.0 ++++++ gene-logic.doc.tar.xz ++++++ ++++++ gene-logic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gene-logic.tlpobj new/tlpkg/tlpobj/gene-logic.tlpobj --- old/tlpkg/tlpobj/gene-logic.tlpobj 2016-04-14 19:04:11.000000000 +0200 +++ new/tlpkg/tlpobj/gene-logic.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/gene-logic/gn-logic14.sty catalogue-ctan /macros/latex/contrib/gene/logic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-17 13:14:32 +0200 catalogue-license other-free catalogue-topics maths catalogue-version 1.4 ++++++ genealogy.doc.tar.xz ++++++ ++++++ genealogy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/genealogy.tlpobj new/tlpkg/tlpobj/genealogy.tlpobj --- old/tlpkg/tlpobj/genealogy.tlpobj 2016-04-14 19:04:11.000000000 +0200 +++ new/tlpkg/tlpobj/genealogy.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/fonts/source/public/genealogy/drgen10.mf RELOC/fonts/tfm/public/genealogy/drgen10.tfm catalogue-ctan /fonts/genealogy -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-02-19 14:06:21 +0100 catalogue-license lppl -catalogue-topics font font-symbol font-specialist font-mf +catalogue-topics genealogy font font-symbol font-specialist font-mf ++++++ genealogytree.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/genealogytree/README new/doc/latex/genealogytree/README --- old/doc/latex/genealogytree/README 2015-09-21 23:58:45.000000000 +0200 +++ new/doc/latex/genealogytree/README 2017-01-30 00:01:03.000000000 +0100 @@ -1,7 +1,7 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the Binary files old/doc/latex/genealogytree/genealogytree-example-1.pdf and new/doc/latex/genealogytree/genealogytree-example-1.pdf differ Binary files old/doc/latex/genealogytree/genealogytree-example-2.pdf and new/doc/latex/genealogytree/genealogytree-example-2.pdf differ Binary files old/doc/latex/genealogytree/genealogytree-example-3.pdf and new/doc/latex/genealogytree/genealogytree-example-3.pdf differ Binary files old/doc/latex/genealogytree/genealogytree-languages.pdf and new/doc/latex/genealogytree/genealogytree-languages.pdf differ Binary files old/doc/latex/genealogytree/genealogytree.doc.sources.zip and new/doc/latex/genealogytree/genealogytree.doc.sources.zip differ Binary files old/doc/latex/genealogytree/genealogytree.pdf and new/doc/latex/genealogytree/genealogytree.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/genealogytree.doc.tlpobj new/tlpkg/tlpobj/genealogytree.doc.tlpobj --- old/tlpkg/tlpobj/genealogytree.doc.tlpobj 2016-04-14 19:04:11.000000000 +0200 +++ new/tlpkg/tlpobj/genealogytree.doc.tlpobj 2017-04-14 17:41:24.000000000 +0200 @@ -1,12 +1,13 @@ name genealogytree.doc category Package -revision 38426 +revision 43086 shortdesc doc files of genealogytree relocated 1 -docfiles size=1400 +docfiles size=1527 RELOC/doc/latex/genealogytree/README RELOC/doc/latex/genealogytree/genealogytree-example-1.pdf RELOC/doc/latex/genealogytree/genealogytree-example-2.pdf RELOC/doc/latex/genealogytree/genealogytree-example-3.pdf + RELOC/doc/latex/genealogytree/genealogytree-languages.pdf RELOC/doc/latex/genealogytree/genealogytree.doc.sources.zip RELOC/doc/latex/genealogytree/genealogytree.pdf ++++++ genealogytree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/genealogytree.sty new/tex/latex/genealogytree/genealogytree.sty --- old/tex/latex/genealogytree/genealogytree.sty 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/genealogytree.sty 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% genealogytree.sty: genealogy trees (graphs) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,10 +18,11 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{genealogytree}[2015/09/21 version 1.00 genealogy trees] -\def\gtr(a)version{1.00} +\ProvidesPackage{genealogytree}[2017/01/29 version 1.10 genealogy trees] +\def\gtr(a)version{1.10} + +\RequirePackage{tcolorbox}[2016/11/18] -\RequirePackage{tcolorbox}[2015/08/12] \tcbuselibrary{skins,fitting,external} \usetikzlibrary{arrows.meta} \usetikzlibrary{fit} @@ -79,19 +80,35 @@ \providecommand{\gtrpkgprefix}{} -\def\gtr@load@library#1#2{% - \pgfkeysifdefined{/gtr/libload/#1}{}{% - \pgfkeyssetvalue{/gtr/libload/#1}{}% +\def\gtr@load@library@#1#2#3{% + \pgfkeysifdefined{/gtr/libload/#2}{}{% + \pgfkeyssetvalue{/gtr/libload/#2}{}% \@pushfilename% - \xdef\@currname{#2}% + \xdef\@currname{#3}% \makeatletter% - \def\gtr@library@version{-}% - \input\gtrpkgprefix#2\relax% - \gtr@check@library@version% + #1% \@popfilename% }% } +\def\gtr@load@library{\gtr@load@library@{% + \def\gtr@library@version{-}% + \input\gtrpkgprefix\@currname\relax% + \gtr@check@library@version% +}} + +\def\gtr@load@external@library{\gtr@load@library@{% + \typeout{External library (genealogytree): '\@currname'} + \input\@currname\relax% +}} + +\gtrset{library/.unknown/.code={% + \IfFileExists{gtrlib.\pgfkeyscurrentname.code.tex}% + {\begingroup\edef\x{\endgroup\noexpand\gtr@load@external@library% + {\pgfkeyscurrentname}{gtrlib.\pgfkeyscurrentname.code.tex}}\x}% + {\gtr@error{The library '\pgfkeyscurrentname' is unknown}{Perhaps you misspelled it.}}% +}} + \def\gtr@add@library#1#2{% \gtrset{library/#1/.code={\gtr@load@library{#1}{#2}}}% \DeclareOption{#1}{\appto\gtr@optionlist{,#1}}% @@ -109,7 +126,9 @@ \gtr@add@library{core.options}{gtrcore.options.code.tex} \gtr@add@library{core.symbols}{gtrcore.symbols.code.tex} +\gtr@add@library{lang.danish}{gtrlang.danish.code.tex} \gtr@add@library{lang.english}{gtrlang.english.code.tex} +\gtr@add@library{lang.french}{gtrlang.french.code.tex} \gtr@add@library{lang.german}{gtrlang.german.code.tex} \gtr@add@library{debug}{gtrlib.debug.code.tex} @@ -131,4 +150,3 @@ } \begingroup\edef\x{\endgroup\noexpand\gtruselibrary{\gtr@optionlist}}\x - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.contour.code.tex new/tex/latex/genealogytree/gtrcore.contour.code.tex --- old/tex/latex/genealogytree/gtrcore.contour.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.contour.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.contour.code.tex: Contours %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Contour diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.drawing.code.tex new/tex/latex/genealogytree/gtrcore.drawing.code.tex --- old/tex/latex/genealogytree/gtrcore.drawing.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.drawing.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.drawing.code.tex: Drawing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,13 +17,14 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Drawing %%%%%%%%%%%%%%%%%%%%%%% \tikzset{genealogytree edges scope/.style={}} +\tikzset{genealogytree extra edges scope/.style={}} \def\gtr@reset@before@parser{% \global\def\gtrkv@after@parser{}% @@ -32,8 +33,8 @@ \def\gtr@parse@afterfamily@hook{}% \def\gtr@parse@beginfamily@hook{}% \def\gtr@parse@endfamily@hook{}% - \def\gtr@kv@idprefix{}% - \def\gtr@kv@idsuffix{}% + \def\gtrkv@idprefix{}% + \def\gtrkv@idsuffix{}% \undef\gtr@parse@afternode@hook@content% \undef\gtr@parse@afterfamily@hook@content% \undef\gtr@parse@beginfamily@hook@content% @@ -90,10 +91,18 @@ } \def\gtr@create@node@person#1{% + \ifcsdef{gtr@per@#1@tikz}{% + \letcs\gtr@temp@tikz{gtr@per@#1@tikz}% + \tikzset{gtr@node@opt/.code={\pgfkeysalsofrom{\gtr@temp@tikz}}}% + }{% + \tikzset{gtr@node@opt/.code={}}% + }% \letcs\gtr@temp{gtr@per@#1@box}% \node[minimum width=\dimexpr\wd\gtr@temp\relax, minimum height=\dimexpr\ht\gtr@temp+\dp\gtr@temp\relax, - alias={\csuse{gtr@per@#1@id}}] (p@#1) + alias={\csuse{gtr@per@#1@id}}, + gtr@node@opt% + ] (p@#1) at (\csuse{gtr@per@#1@x},\csuse{gtr@per@#1@y}){}; } @@ -390,7 +399,7 @@ %%%%%%%%%%%%%%%%%% \def\gtr@draw@family@extra(#1#2#3){% - \begingroup% + \begin{scope}[genealogytree extra edges scope]% \csundef{gtr@fam@\gtr@currentfamily @par}% \def\do##1{% \gtr@getPerNumForId{##1}% @@ -417,7 +426,7 @@ \tikzset{gtr@link/.style={/gtr/edge/gtr@edge@foreground}}%, \csuse{gtr@edge@\gtrkv@edgemode @\gtr@timeflow}% \fi% - \endgroup% + \end{scope}% } \def\gtr@draw@family#1{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.node.code.tex new/tex/latex/genealogytree/gtrcore.node.code.tex --- old/tex/latex/genealogytree/gtrcore.node.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.node.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.node.code.tex: Node Boxes %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%% % Processors % @@ -201,6 +201,7 @@ \gtr@db@new@store{name} \gtr@db@new@store{shortname} \gtr@db@new@store{comment} +\gtr@db@new@store{profession} \gtr@db@new@store{sex} \gtr@db@new@store{uuid} \gtr@db@new@store{kekule} @@ -354,6 +355,7 @@ }{\gtrlistseparatorfinal} \newenvironment{gtreventlist}{}{} +\newenvironment{gtrinfolist}{}{} \gtrset{% database format/.is choice, @@ -362,6 +364,8 @@ {\par\hangindent=#1\hangafter=1}{\par}{\par}}, list separators hang/.default=\tcbfitdim, list separators={\par}{\par}{\par}{\par}, + info separators/.code n args={4}{\renewenvironment{gtrinfolist}{\begin{gtrprintlist}{#1}{#2}{#3}{#4}}{\end{gtrprintlist}}}, + info separators={\par}{. }{.}{}, } \newcommand{\gtrDeclareDatabaseFormat}[3]{% @@ -376,6 +380,13 @@ \def\gtr@list@event#1{\gtrifeventdefined{#1}{\gtrlistseparator\hspace{0pt}\gtrPrintEvent{#1}}{}} +\def\gtr@print@infolist{% + \begin{gtrinfolist}% + \gtrifprofessiondefined{\gtrlistseparator\gtrPrintProfession}{}% + \gtrifcommentdefined{\gtrlistseparator\gtrPrintComment}{}% + \end{gtrinfolist}% +} + \gtrDeclareDatabaseFormat{full}{}{% \gtrPrintName% \begin{gtreventlist}% @@ -387,7 +398,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \def\gtr@ifmarriagedefined#1#2{% @@ -413,7 +424,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{full marriage below}{}{% @@ -424,7 +435,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% \gtr@ifmarriagedefined{% \tcbline\begin{gtreventlist}% \gtr@list@event{engagement}% @@ -442,7 +453,7 @@ \gtr@list@event{death}% \gtr@list@event{burial}% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \def\gtr@list@event@birth{% @@ -472,7 +483,7 @@ \gtr@list@event@marriage% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{medium marriage above}{}{% @@ -482,7 +493,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{medium marriage below}{}{% @@ -491,7 +502,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% \gtr@ifmarriagedefined{\tcbline\begin{gtreventlist}\gtr@list@event@marriage\end{gtreventlist}}{}% } @@ -501,7 +512,7 @@ \gtr@list@event@birth% \gtr@list@event@death% \end{gtreventlist}% - \gtrifcommentdefined{\gtrPrintComment}{}% + \gtr@print@infolist% } \gtrDeclareDatabaseFormat{short}{}{% @@ -575,12 +586,16 @@ %%%%%%%%%%%%%%%%%%%%%% -% Comment and Places % +% Comment, Profession and Places % \def\gtrifcommentdefined#1#2{% \ifdefvoid{\gtrDBcomment}{#2}{#1}% } +\def\gtrifprofessiondefined#1#2{% + \ifdefvoid{\gtrDBprofession}{#2}{#1}% +} + \def\gtrifplacedefined#1#2#3{% \ifcsvoid{gtrDB#1place}{#3}{#2}% } @@ -674,21 +689,18 @@ } \def\gtr@cs@monthlong#1{% - \letcs\gtr@temp{#1}% - \pgfkeysvalueof{/gtr/month long/\gtr@temp}% + \pgfkeysvalueof{/gtr/month long/\csuse{#1}}% } -\def\gtr@cs@monthshort#1{% - {\letcs\gtr@temp{#1}% +\def\gtr@cs@monthshort#1{{% \def\dot{}% - \pgfkeysvalueof{/gtr/month short/\gtr@temp}}% -} + \pgfkeysvalueof{/gtr/month short/\csuse{#1}}% +}} -\def\gtr@cs@monthshortdot#1{% - {\letcs\gtr@temp{#1}% +\def\gtr@cs@monthshortdot#1{{% \def\dot{.}% - \pgfkeysvalueof{/gtr/month short/\gtr@temp}}% -} + \pgfkeysvalueof{/gtr/month short/\csuse{#1}}% +}} \def\gtrifdatedefined#1#2#3{% \ifcsdef{gtrDB#1year}{#2}{% @@ -699,7 +711,7 @@ \def\gtr@dateformat@factory#1#2{% \csdef{gtrPrintDateCore@#1}##1{#2}% - \gtrset{date format/{#1}/.code={\letcs{\gtrPrintDateCore}{gtrPrintDateCore@#1}}}% + \gtrset{date format/{#1}/.code={\letcs\gtrPrintDateCore{gtrPrintDateCore@#1}}}% } \gtr@dateformat@factory{dd.mm.yyyy}{% @@ -729,7 +741,7 @@ \gtr@dateformat@factory{d.month yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}.~}{}% - \gtr@cs@monthlong{#1month} % + \gtr@cs@monthlong{#1month}\ % }{}% \csuse{#1year}% } @@ -750,6 +762,22 @@ \csuse{#1year}% } +\gtr@dateformat@factory{dd mon.yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}~}{}% + \gtr@cs@monthshortdot{#1month}\ % + }{}% + \csuse{#1year}% +} + +\gtr@dateformat@factory{d mon.yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% + \gtr@cs@monthshortdot{#1month}\ % + }{}% + \csuse{#1year}% +} + \gtr@dateformat@factory{dd/mm/yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\csuse{#1day}/}{}% @@ -758,6 +786,14 @@ \csuse{#1year}% } +\gtr@dateformat@factory{dd/mm yyyy}{% + \ifcsdef{#1month}{% + \ifcsdef{#1day}{\csuse{#1day}/}{}% + \csuse{#1month}\ % + }{}% + \csuse{#1year}% +} + \gtr@dateformat@factory{d/m/yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}/}{}% @@ -825,23 +861,23 @@ \gtr@dateformat@factory{d month yyyy}{% \ifcsdef{#1month}{% \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% - \gtr@cs@monthlong{#1month} % + \gtr@cs@monthlong{#1month}\ % }{}% \csuse{#1year}% } \gtr@dateformat@factory{dd mon yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\csuse{#1day} }{}% - \gtr@cs@monthshort{#1month} % + \ifcsdef{#1day}{\csuse{#1day}~}{}% + \gtr@cs@monthshort{#1month}\ % }{}% \csuse{#1year}% } \gtr@dateformat@factory{d mon yyyy}{% \ifcsdef{#1month}{% - \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day} }{}% - \gtr@cs@monthshort{#1month} % + \ifcsdef{#1day}{\gtr@cs@strip@zero{#1day}~}{}% + \gtr@cs@monthshort{#1month}\ % }{}% \csuse{#1year}% } @@ -1022,6 +1058,14 @@ }{}% } +\gtr@dateformat@factory{yyyymondd}{% + \csuse{#1year}% + \ifcsdef{#1month}{% + \gtr@cs@monthshort{#1month}% + \ifcsdef{#1day}{\csuse{#1day}}{}% + }{}% +} + \gtr@dateformat@factory{yyyymmdd}{% \csuse{#1year}% \ifcsdef{#1month}{% @@ -1081,7 +1125,7 @@ \gtr@dateformat@factory{month d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthlong{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1089,7 +1133,7 @@ \gtr@dateformat@factory{mon.d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthshortdot{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1097,7 +1141,7 @@ \gtr@dateformat@factory{mon d yyyy}{% \ifcsdef{#1month}{% \gtr@cs@monthshort{#1month}% - \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{}, % + \ifcsdef{#1day}{~\gtr@cs@strip@zero{#1day}}{},\ % }{}% \csuse{#1year}% } @@ -1172,11 +1216,14 @@ } \gtrset{% + date format/typical/.code={\letcs\gtrPrintDateCore{gtrPrintDateCore@\gtr@typical@date@format}}, + set@typical@date@format/.code={\edef\gtr@typical@date@format{#1}\gtrset{date format=typical}}, calendar text for/.style args={#1 is #2#3}{calendar/#1/.code={\def\gtr@db@cal@pre{#2}\def\gtr@db@cal@app{#3}}}, calendar/.unknown/.code={\def\gtr@db@cal@pre{}\def\gtr@db@cal@app{ (\pgfkeyscurrentname)}}, date code/.code={\def\gtrPrintDateCore##1{#1}}, event code/.code={\def\gtrPrintEvent##1{#1}}, comment code/.code={\def\gtrPrintComment{#1}}, + profession code/.code={\def\gtrPrintProfession{#1}}, date format/.is choice, calendar print/.is choice, calendar print/all/.code={\let\gtr@print@date@single@calendar\gtr@print@date@single@calendar@all}, @@ -1196,10 +1243,11 @@ } \gtrset{% - date format=d.M.yyyy, + set@typical@date@format=d.M.yyyy, date range separator, calendar print=all but AD, event text={}{~}{ }{}, event format=prefix date place, comment code={\hspace{0pt}{\itshape\gtrDBcomment}}, + profession code={\hspace{0pt}{\itshape\gtrDBprofession}}, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.options.code.tex new/tex/latex/genealogytree/gtrcore.options.code.tex --- old/tex/latex/genealogytree/gtrcore.options.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.options.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.options.code.tex: Options %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% General handling @@ -187,10 +187,11 @@ \newif\ifgtr@ignore \gtrset{% - id prefix/.store in=\gtr@kv@idprefix, - id suffix/.store in=\gtr@kv@idsuffix, - id/.code={\xdef\gtr@gkv@id{\expandonce\gtr@kv@idprefix\unexpanded{#1}\expandonce\gtr@kv@idsuffix}}, + id prefix/.store in=\gtrkv@idprefix, + id suffix/.store in=\gtrkv@idsuffix, + id/.code={\xdef\gtr@gkv@id{\expandonce\gtrkv@idprefix\unexpanded{#1}\expandonce\gtrkv@idsuffix}}, distance/.gstore in=\gtr@gkv@distance, + tikz/.gstore in=\gtr@gkv@tikz, pivot@@value/.gstore in=\gtr@gkv@pivot, pivot@none/.style={pivot@@value=0}, pivot@child/.style={pivot@@value=1}, @@ -256,15 +257,15 @@ timeflow/left/.style={time@flow=left}, timeflow/right/.style={time@flow=right}, % - level distance/.store in=\gtrkv@level@distance, - level size/.store in=\gtrkv@level@size, - node size from/.code args={#1 to #2}{\def\gtrkv@node@minsize{#1}\def\gtrkv@node@maxsize{#2}}, - node size/.code={\def\gtrkv@node@minsize{#1}\def\gtrkv@node@maxsize{#1}},% - child distance in parent graph/.store in=\gtrkv@dist@sibling@par,% - child distance in child graph/.store in=\gtrkv@dist@sibling@chi,% - parent distance in parent graph/.store in=\gtrkv@dist@parent@par,% - parent distance in child graph/.store in=\gtrkv@dist@parent@chi,% - further distance/.store in=\gtrkv@dist@further,% + level distance/.dimstore in=\gtr@@kv@@gtr@level@distance, + level size/.dimstore in=\gtr@@kv@@gtr@level@size, + node size from/.code args={#1 to #2}{\dimdef\gtr@@kv@@gtr@node@minsize{#1}\dimdef\gtr@@kv@@gtr@node@maxsize{#2}}, + node size/.code={\dimdef\gtr@@kv@@gtr@node@minsize{#1}\dimdef\gtr@@kv@@gtr@node@maxsize{#1}},% + child distance in parent graph/.dimstore in=\gtr@@kv@@gtr@dist@sibling@par,% + child distance in child graph/.dimstore in=\gtr@@kv@@gtr@dist@sibling@chi,% + parent distance in parent graph/.dimstore in=\gtr@@kv@@gtr@dist@parent@par,% + parent distance in child graph/.dimstore in=\gtr@@kv@@gtr@dist@parent@chi,% + further distance/.dimstore in=\gtr@@kv@@gtr@dist@further,% % child distance/.style={child distance in parent graph=#1,child distance in child graph=#1},% parent distance/.style={parent distance in parent graph=#1,parent distance in child graph=#1},% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.parser.code.tex new/tex/latex/genealogytree/gtrcore.parser.code.tex --- old/tex/latex/genealogytree/gtrcore.parser.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.parser.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.parser.code.tex: Parser %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %% (local) stack implementation \def\gtrnewstack#1{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.processing.code.tex new/tex/latex/genealogytree/gtrcore.processing.code.tex --- old/tex/latex/genealogytree/gtrcore.processing.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.processing.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.processing.code.tex: Processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,36 +17,49 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Processing - common %%%%%%%%%%%%%%%%%%%%%%% - -\def\gtr@proc@level@save@settings{% - \dimdef\gtr@rv@level@distance{\gtrkv@level@distance}% - \dimdef\gtr@rv@level@size{\gtrkv@level@size}% - \dimdef\gtr@rv@node@minsize{\gtrkv@node@minsize}% - \dimdef\gtr@rv@node@maxsize{\gtrkv@node@maxsize}% - \dimdef\gtr@rv@dist@sibling@par{\gtrkv@dist@sibling@par}% - \dimdef\gtr@rv@dist@sibling@chi{\gtrkv@dist@sibling@chi}% - \dimdef\gtr@rv@dist@parent@par{\gtrkv@dist@parent@par}% - \dimdef\gtr@rv@dist@parent@chi{\gtrkv@dist@parent@chi}% - \dimdef\gtr@rv@dist@further{\gtrkv@dist@further}% +% register a macro to localizable for levels +% #1: variable +% #2: key setting +% #3: global save +\def\gtr@proc@register@level@local@core#1#2#3{% + \appto\gtr@proc@level@save@settings{\let#3#2}% + \appto\gtr@proc@level@load@settings{\let#2#3}% + \appto\gtr@proc@level@globalize@settings{\global\let#1#2}% +} + +% register a macro to be localizable for levels +% #1: variable +% key setting: gtr@@kv@@#1 +% global save: gtr@@save@@#1 +\def\gtr@proc@register@level@local#1{% + \begingroup\edef\x{\endgroup\noexpand\gtr@proc@register@level@local@core{% + \noexpand#1% + }{% + \csname gtr@@kv@@\expandafter\@gobble\string#1\endcsname% + }{% + \csname gtr@@save@@\expandafter\@gobble\string#1\endcsname% + }}\x% } +\gtr@proc@register@level@local{\gtr@level@distance} +\gtr@proc@register@level@local{\gtr@level@size} +\gtr@proc@register@level@local{\gtr@node@minsize} +\gtr@proc@register@level@local{\gtr@node@maxsize} +\gtr@proc@register@level@local{\gtr@dist@sibling@par} +\gtr@proc@register@level@local{\gtr@dist@sibling@chi} +\gtr@proc@register@level@local{\gtr@dist@parent@par} +\gtr@proc@register@level@local{\gtr@dist@parent@chi} +\gtr@proc@register@level@local{\gtr@dist@further} + \def\gtr@proc@level@opt{% \begingroup% - \let\gtrkv@level@distance\gtr@rv@level@distance% - \let\gtrkv@level@size\gtr@rv@level@size% - \let\gtrkv@node@minsize\gtr@rv@node@minsize% - \let\gtrkv@node@maxsize\gtr@rv@node@maxsize% - \let\gtrkv@dist@sibling@par\gtr@rv@dist@sibling@par% - \let\gtrkv@dist@sibling@chi\gtr@rv@dist@sibling@chi% - \let\gtrkv@dist@parent@par\gtr@rv@dist@parent@par% - \let\gtrkv@dist@parent@chi\gtr@rv@dist@parent@chi% - \let\gtrkv@dist@further\gtr@rv@dist@further% + \gtr@proc@level@load@settings% % \global\let\gtr@gkv@opt@family@level\@empty% \global\let\gtr@gkv@opt@subtree@level\@empty% @@ -70,15 +83,7 @@ \global\let\gtr@gkv@opt@ignore@level\@empty% \fi% % - \global\let\gtr@level@distance\gtrkv@level@distance% - \global\let\gtr@level@size\gtrkv@level@size% - \global\let\gtr@node@minsize\gtrkv@node@minsize% - \global\let\gtr@node@maxsize\gtrkv@node@maxsize% - \global\let\gtr@dist@sibling@par\gtrkv@dist@sibling@par% - \global\let\gtr@dist@sibling@chi\gtrkv@dist@sibling@chi% - \global\let\gtr@dist@parent@par\gtrkv@dist@parent@par% - \global\let\gtr@dist@parent@chi\gtrkv@dist@parent@chi% - \global\let\gtr@dist@further\gtrkv@dist@further% + \gtr@proc@level@globalize@settings% % \endgroup% % @@ -90,7 +95,7 @@ \global\gtr@ignorefalse% \begingroup% \gtrset{id=,pivot shift=0pt, - family/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}}, + family/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}\gtrset{##1}}, subtree/.code={\gtrkeysgappto\gtr@gkv@opt@subtree{##1}}, node/.code={\gtrkeysgappto\gtr@gkv@opt@family{##1}},% sic! }% @@ -500,7 +505,7 @@ \begingroup% \begin{pgfinterruptpicture}% \global\gtr@ignorefalse% - \gtrset{id=,distance=-1sp,pivot=none, + \gtrset{id=,distance=-1sp,pivot=none,tikz=, code={% \gtr@cs@keysalsofrom{gtr@fam@\gtr@currentfamily @opt@subtree}% \csuse{gtr@linked@family@options@\gtrnodetype}% @@ -527,6 +532,9 @@ \else\csedef{gtr@per@\gtr@currentperson @pivo@chi}{}% \csedef{gtr@per@\gtr@currentperson @pivo@par}{}% \fi% + \ifx\gtr@gkv@tikz\@empty\else% + \csedef{gtr@per@\gtr@currentperson @tikz}{\gtr@gkv@tikz}% + \fi% % \gtr@set@level@position{\gtr@currentperson}% \fi% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrcore.symbols.code.tex new/tex/latex/genealogytree/gtrcore.symbols.code.tex --- old/tex/latex/genealogytree/gtrcore.symbols.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrcore.symbols.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrcore.symbols.code.tex: Symbols %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} %%%%%%%%%%%%%%%%%%%%%%% %% Symbols diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlang.danish.code.tex new/tex/latex/genealogytree/gtrlang.danish.code.tex --- old/tex/latex/genealogytree/gtrlang.danish.code.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/genealogytree/gtrlang.danish.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -0,0 +1,86 @@ +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) +%% gtrlang.danish.code.tex: Danish language +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Translation by Mikkel Eide Eriksen <mikkel dot eriksen at gmail dot 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 `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\gtr@set@library@version{1.10} + +\gtrset{language(a)/danish/.code={% + \gtrset{symlang/.cd, + Born=f\protect\o{}dt, + Bornoutofwedlock=f\protect\o{}dt uden for \protect\ae{}gteskab, + Stillborn=d\protect\o{}df\protect\o{}dt, + Diedonbirthday=d\protect\o{}d p\protect\aa{} f\protect\o{}dselsdagen, + Baptized=d\protect\o{}bt, + Engaged=forlovet, + Married=gift, + Divorced=skilt, + Partnership=ugift partnerskab, + Died=d\protect\o{}d, + Killed=faldet, + Buried=begravet, + Funeralurn=kremeret, + Female=kvinde, + Male=mand, + Neuter=ukendt k\protect\o{}n + }% + \gtrset{% + month long/.cd, + 01/.initial=januar, + 02/.initial=februar, + 03/.initial=marts, + 04/.initial=april, + 05/.initial=maj, + 06/.initial=juni, + 07/.initial=juli, + 08/.initial=august, + 09/.initial=september, + 10/.initial=oktober, + 11/.initial=november, + 12/.initial=december, + }% + \gtrset{% + month short/.cd, + 01/.initial=jan\protect\dot, + 02/.initial=feb\protect\dot, + 03/.initial=mar\protect\dot, + 04/.initial=apr\protect\dot, + 05/.initial=maj, + 06/.initial=jun\protect\dot, + 07/.initial=jul\protect\dot, + 08/.initial=aug\protect\dot, + 09/.initial=sep\protect\dot, + 10/.initial=okt\protect\dot, + 11/.initial=nov\protect\dot, + 12/.initial=dec\protect\dot, + }% + \gtrset{% + set@typical@date@format=d.month yyyy, + calendar text for=AD is {}{ e.~Kr.}, + calendar text for=BC is {}{ f.~Kr.}, + calendar text for=GR is {}{\protect\textsuperscript{greg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, + calendar text for=caAD is {ca.~}{ e.~Kr.}, + calendar text for=caBC is {ca.~}{ f.~Kr.}, + calendar text for=ca is {ca.~}{}, + date range full={}{ til }{}, + date range before={f\protect\o{}r }{}, + date range after={efter }{}, + place text={i }{}, + }% +}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlang.english.code.tex new/tex/latex/genealogytree/gtrlang.english.code.tex --- old/tex/latex/genealogytree/gtrlang.english.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrlang.english.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlang.english.code.tex: English language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} \gtrset{language(a)/english/.code={% \gtrset{symlang/.cd, @@ -69,6 +69,7 @@ 12/.initial=Dec\protect\dot, }% \gtrset{% + set@typical@date@format=month d yyyy, calendar text for=AD is {AD }{}, calendar text for=BC is {}{ BC}, calendar text for=GR is {}{\protect\textsuperscript{greg.}}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlang.french.code.tex new/tex/latex/genealogytree/gtrlang.french.code.tex --- old/tex/latex/genealogytree/gtrlang.french.code.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/genealogytree/gtrlang.french.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -0,0 +1,86 @@ +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) +%% gtrlang.french.code.tex: French language +%% +%% ------------------------------------------------------------------------------------------- +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Translation by Denis Bitouze <denis dot bitouze at univ-littoral fr> +%% ------------------------------------------------------------------------------------------- +%% +%% 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 `author-maintained'. +%% +%% This work consists of all files listed in README +%% +\gtr@set@library@version{1.10} + +\gtrset{language(a)/french/.code={% + \gtrset{symlang/.cd, + Born=n\'e\textperiodcentered e, + Bornoutofwedlock=n\'e\textperiodcentered e hors mariage, + Stillborn=mort-n\'e\textperiodcentered e, + Diedonbirthday=d\'ec\'ed\'e\textperiodcentered e le jour de sa naissance, + Baptized=baptis\'e\textperiodcentered e, + Engaged=fianc\'es, + Married=mari\'es, + Divorced=divorc\'es, + Partnership=en union libre, + Died=d\'ec\'ed\'e\textperiodcentered e, + Killed=mort\textperiodcentered e au combat, + Buried=enterr\'e\textperiodcentered e, + Funeralurn=incin\'er\'e\textperiodcentered e, + Female=femme, + Male=homme, + Neuter=neutre + }% + \gtrset{% + month long/.cd, + 01/.initial=janvier, + 02/.initial=f\'evrier, + 03/.initial=mars, + 04/.initial=avril, + 05/.initial=mai, + 06/.initial=juin, + 07/.initial=juillet, + 08/.initial=ao\^ut, + 09/.initial=septembre, + 10/.initial=octobre, + 11/.initial=novembre, + 12/.initial=d\'ecembre, + }% + \gtrset{% + month short/.cd, + 01/.initial=janv\protect\dot, + 02/.initial=f\'evr\protect\dot, + 03/.initial=mars, + 04/.initial=avr\protect\dot, + 05/.initial=mai, + 06/.initial=juin, + 07/.initial=juil\protect\dot, + 08/.initial=ao\^ut, + 09/.initial=sept\protect\dot, + 10/.initial=oct\protect\dot, + 11/.initial=nov\protect\dot, + 12/.initial=d\'ec\protect\dot, + }% + \gtrset{% + set@typical@date@format=d month yyyy, + calendar text for=AD is {apr.~J.-C. }{}, + calendar text for=BC is {}{ av.~J.-C.}, + calendar text for=GR is {}{\protect\textsuperscript{gr\'eg.}}, + calendar text for=JU is {}{\protect\textsuperscript{jul.}}, + calendar text for=caAD is {v.~apr.~J.-C. }{}, + calendar text for=caBC is {v.~}{ av.~J.-C.}, + calendar text for=ca is {v.~}{}, + date range full={}{ \`a }{}, + date range before={avant }{}, + date range after={apr\`es }{}, + place text={\`a }{}, + }% +}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlang.german.code.tex new/tex/latex/genealogytree/gtrlang.german.code.tex --- old/tex/latex/genealogytree/gtrlang.german.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrlang.german.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlang.german.code.tex: German language %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} \gtrset{language(a)/german/.code={% \gtrset{symlang/.cd, @@ -29,7 +29,7 @@ Engaged=verlobt, Married=verheiratet, Divorced=geschieden, - Partnership=au\protect\ss{}ereheliche Verbindung, + Partnership=au\protect\ss{}erehelich verbunden, Died=gestorben, Killed=gefallen, Buried=begraben, @@ -69,6 +69,7 @@ 12/.initial=Dez\protect\dot, }% \gtrset{% + set@typical@date@format=d.month yyyy, calendar text for=AD is {}{ n.~Chr.}, calendar text for=BC is {}{ v.~Chr.}, calendar text for=GR is {}{\protect\textsuperscript{greg.}}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlib.debug.code.tex new/tex/latex/genealogytree/gtrlib.debug.code.tex --- old/tex/latex/genealogytree/gtrlib.debug.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrlib.debug.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlib.debug.code.tex: Debugger %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2014-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} \RequirePackage{array,tabularx} \tcbuselibrary{breakable} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/genealogytree/gtrlib.templates.code.tex new/tex/latex/genealogytree/gtrlib.templates.code.tex --- old/tex/latex/genealogytree/gtrlib.templates.code.tex 2015-09-21 23:58:45.000000000 +0200 +++ new/tex/latex/genealogytree/gtrlib.templates.code.tex 2017-01-30 00:01:06.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package genealogytree - version 1.00 (2015/09/21) +%% The LaTeX package genealogytree - version 1.10 (2017/01/29) %% gtrlib.templates.code.tex: Templates %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2013-2015 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2013-2017 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ %% %% This work consists of all files listed in README %% -\gtr@set@library@version{1.00} +\gtr@set@library@version{1.10} % Templates @@ -218,7 +218,7 @@ pref code=\textbf{##1}, database@malefemale, list separators={\tcbline\hangindent=\tcbfitdim\hangafter=1}% - {\par\hangindent=\tcbfitdim\hangafter=1}{\par}{\gtrifcommentdefined{\tcbline}{}}, + {\par\hangindent=\tcbfitdim\hangafter=1}{\par}{\gtrifcommentdefined{\tcbline}{\gtrifprofessiondefined{\tcbline}{}}}, box clear, box={enhanced,boxrule=0.3mm, top=1mm,bottom=1mm,left=1mm,right=1mm,middle=0.7mm,boxsep=0pt, @@ -260,7 +260,7 @@ before upper={\parskip 0.15\tcbfitdim plus 0pt minus 0pt}, \gtrDBsex, if image defined={% - code={\tcbdimto\gtr@im@width{0.77778\dimexpr\gtrkv@level@size-0.3mm\relax}},% + code={\tcbdimto\gtr@im@width{0.77778\dimexpr\gtr@level@size-0.3mm\relax}},% left=\gtr@im@width+1mm, underlay={\begin{tcbclipinterior}% \path[fill overzoom image=\gtrDBimage] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/genealogytree.tlpobj new/tlpkg/tlpobj/genealogytree.tlpobj --- old/tlpkg/tlpobj/genealogytree.tlpobj 2016-04-14 19:04:14.000000000 +0200 +++ new/tlpkg/tlpobj/genealogytree.tlpobj 2017-04-14 17:41:26.000000000 +0200 @@ -1,6 +1,6 @@ name genealogytree category Package -revision 38426 +revision 43086 shortdesc Pedigree and genealogical tree diagrams relocated 1 longdesc Pedigree and genealogical tree diagrams are proven tools to @@ -13,7 +13,7 @@ longdesc of special graphs for the description of family-like longdesc structures). The package uses an autolayout algorithm which can longdesc be customized, e.g., to prioritize certain paths. -runfiles size=47 +runfiles size=49 RELOC/tex/latex/genealogytree/genealogytree.sty RELOC/tex/latex/genealogytree/gtrcore.contour.code.tex RELOC/tex/latex/genealogytree/gtrcore.drawing.code.tex @@ -22,13 +22,15 @@ RELOC/tex/latex/genealogytree/gtrcore.parser.code.tex RELOC/tex/latex/genealogytree/gtrcore.processing.code.tex RELOC/tex/latex/genealogytree/gtrcore.symbols.code.tex + RELOC/tex/latex/genealogytree/gtrlang.danish.code.tex RELOC/tex/latex/genealogytree/gtrlang.english.code.tex + RELOC/tex/latex/genealogytree/gtrlang.french.code.tex RELOC/tex/latex/genealogytree/gtrlang.german.code.tex RELOC/tex/latex/genealogytree/gtrlib.debug.code.tex RELOC/tex/latex/genealogytree/gtrlib.templates.code.tex catalogue-also pst-pdgr catalogue-ctan /macros/latex/contrib/genealogytree -catalogue-date 2015-09-21 13:07:53 +0200 +catalogue-date 2017-02-19 14:06:21 +0100 catalogue-license lppl1.3 -catalogue-topics pgf-tikz humanities -catalogue-version 1.00 +catalogue-topics genealogy pgf-tikz humanities +catalogue-version 1.10 ++++++ genmisc.tar.xz ++++++ ++++++ genmpage.doc.tar.xz ++++++ ++++++ genmpage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/genmpage.tlpobj new/tlpkg/tlpobj/genmpage.tlpobj --- old/tlpkg/tlpobj/genmpage.tlpobj 2016-04-14 19:04:15.000000000 +0200 +++ new/tlpkg/tlpobj/genmpage.tlpobj 2017-04-14 17:41:26.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/genmpage/genmpage.sty catalogue-ctan /macros/latex/contrib/genmpage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout boxing catalogue-version 0.3.1 ++++++ gentium-tug.doc.tar.xz ++++++ ++++++ gentium-tug.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gentium-tug.tlpobj new/tlpkg/tlpobj/gentium-tug.tlpobj --- old/tlpkg/tlpobj/gentium-tug.tlpobj 2016-04-14 19:04:16.000000000 +0200 +++ new/tlpkg/tlpobj/gentium-tug.tlpobj 2017-04-14 17:41:27.000000000 +0200 @@ -158,7 +158,7 @@ RELOC/tex/latex/gentium-tug/ts1gentium.fd RELOC/tex/latex/gentium-tug/x2gentium.fd catalogue-ctan /fonts/gentium-tug -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-multilingual font-type1 font-ttf catalogue-version 1.1 ++++++ gentle.doc.tar.xz ++++++ ++++++ geometry-de.doc.tar.xz ++++++ ++++++ geometry.doc.tar.xz ++++++ ++++++ geometry.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/geometry.tlpobj new/tlpkg/tlpobj/geometry.tlpobj --- old/tlpkg/tlpobj/geometry.tlpobj 2016-04-14 19:04:28.000000000 +0200 +++ new/tlpkg/tlpobj/geometry.tlpobj 2017-04-14 17:41:31.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/geometry/geometry.sty catalogue-also vmargin typearea catalogue-ctan /macros/latex/contrib/geometry -catalogue-date 2015-08-12 15:23:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics geometry catalogue-version 5.6 ++++++ german.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/german.doc.tlpobj new/tlpkg/tlpobj/german.doc.tlpobj --- old/tlpkg/tlpobj/german.doc.tlpobj 2016-04-14 19:04:28.000000000 +0200 +++ new/tlpkg/tlpobj/german.doc.tlpobj 2017-04-14 17:41:31.000000000 +0200 @@ -1,6 +1,6 @@ name german.doc category Package -revision 30567 +revision 42428 shortdesc doc files of german relocated 1 docfiles size=72 ++++++ german.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/german.tlpobj new/tlpkg/tlpobj/german.tlpobj --- old/tlpkg/tlpobj/german.tlpobj 2016-04-14 19:04:29.000000000 +0200 +++ new/tlpkg/tlpobj/german.tlpobj 2017-04-14 17:41:31.000000000 +0200 @@ -1,6 +1,6 @@ name german category Package -revision 30567 +revision 42428 shortdesc Support for German typography relocated 1 longdesc Supports the old German orthography (alte deutsche @@ -9,7 +9,7 @@ RELOC/tex/generic/german/german.sty RELOC/tex/generic/german/ngerman.sty catalogue-ctan /language/german -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics german catalogue-version 2.5e ++++++ germbib.doc.tar.xz ++++++ ++++++ germbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/germbib.tlpobj new/tlpkg/tlpobj/germbib.tlpobj --- old/tlpkg/tlpobj/germbib.tlpobj 2016-04-14 19:04:29.000000000 +0200 +++ new/tlpkg/tlpobj/germbib.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/latex/germbib/bibgerm.sty RELOC/tex/latex/germbib/mynormal.sty catalogue-ctan /biblio/bibtex/contrib/germbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics bibtex-sty german ++++++ germkorr.doc.tar.xz ++++++ ++++++ germkorr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/germkorr.tlpobj new/tlpkg/tlpobj/germkorr.tlpobj --- old/tlpkg/tlpobj/germkorr.tlpobj 2016-04-14 19:04:29.000000000 +0200 +++ new/tlpkg/tlpobj/germkorr.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/germkorr/germkorr.sty catalogue-also german catalogue-ctan /macros/latex/contrib/germkorr -catalogue-date 2015-08-03 06:21:39 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics quote-marks german catalogue-version 1.0 ++++++ geschichtsfrkl.doc.tar.xz ++++++ Binary files old/doc/latex/geschichtsfrkl/geschichtsfrkl.pdf and new/doc/latex/geschichtsfrkl/geschichtsfrkl.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/geschichtsfrkl.doc.tlpobj new/tlpkg/tlpobj/geschichtsfrkl.doc.tlpobj --- old/tlpkg/tlpobj/geschichtsfrkl.doc.tlpobj 2016-06-07 17:33:56.000000000 +0200 +++ new/tlpkg/tlpobj/geschichtsfrkl.doc.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -1,8 +1,8 @@ name geschichtsfrkl.doc category Package -revision 41302 +revision 42121 shortdesc doc files of geschichtsfrkl relocated 1 -docfiles size=160 +docfiles size=161 RELOC/doc/latex/geschichtsfrkl/README RELOC/doc/latex/geschichtsfrkl/geschichtsfrkl.pdf ++++++ geschichtsfrkl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx new/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx --- old/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx 2016-06-07 01:02:26.000000000 +0200 +++ new/tex/latex/geschichtsfrkl/geschichtsfrkl.bbx 2016-11-25 19:33:49.000000000 +0100 @@ -99,9 +99,9 @@ \DeclareNameFormat{author}{% \nameparts{#1}% {\autorenschriftart% - \ifempty{\namepartprefix}{}{\namepartprefix\addspace}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% \namepartfamily}% - \ifempty{\namepartgiven}{}{\addcomma\space% + \ifdefvoid{\namepartgiven}{}{\addcomma\space% \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}}% \isdot% \ifthenelse{\value{listcount}<\value{liststop}}% @@ -109,9 +109,9 @@ }% \DeclareNameFormat{editor}{% \nameparts{#1}% - \ifempty{\namepartgiven}{}{% + \ifdefvoid{\namepartgiven}{}{% \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}\addspace}% - \ifempty{\namepartprefix}{}{\namepartprefix\addspace}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% \namepartfamily% \ifnumcomp{\value{listcount}}{<}{\value{liststop}-1}% {\addcomma\addspace}% @@ -120,9 +120,9 @@ }% \DeclareNameFormat{hrsg}{% \nameparts{#1} - \ifempty{\namepartprefix}{}{\namepartprefix\addspace}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% \namepartfamily% - \ifempty{\namepartgiven}{}{\addcomma\space% + \ifdefvoid{\namepartgiven}{}{\addcomma\space% \ifbool{bbx:nurinit}{\namepartgiveni}{\namepartgiven}}% \ifthenelse{\value{listcount}<\value{liststop}}% {\addnbspace\slash\addspace}{}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx new/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx --- old/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx 2016-06-07 01:02:26.000000000 +0200 +++ new/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx 2016-11-25 19:33:49.000000000 +0100 @@ -81,10 +81,10 @@ \DeclareNameFormat{cite:author}{% \nameparts{#1}% {\citeautorenschriftart% - \ifempty{\namepartprefix}{}{\namepartprefix\addspace}% + \ifdefvoid{\namepartprefix}{}{\namepartprefix\addspace}% \namepartfamily}% \ifbool{cbx:mitvn}{% - \ifempty{\namepartgiven}{}{\addcomma\space% + \ifdefvoid{\namepartgiven}{}{\addcomma\space% \ifbool{cbx:nurinit}{\namepartgiveni}{\namepartgiven}}}{% \ifbool{cbx:nurinit}{\addcomma\addspace\namepartgiveni}{}% }% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/geschichtsfrkl.tlpobj new/tlpkg/tlpobj/geschichtsfrkl.tlpobj --- old/tlpkg/tlpobj/geschichtsfrkl.tlpobj 2016-06-07 17:33:56.000000000 +0200 +++ new/tlpkg/tlpobj/geschichtsfrkl.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -1,6 +1,6 @@ name geschichtsfrkl category Package -revision 41302 +revision 42121 shortdesc BibLaTeX style for historians relocated 1 longdesc The package provides a BibLaTeX style, (mostly) meeting the @@ -11,7 +11,7 @@ RELOC/tex/latex/geschichtsfrkl/geschichtsfrkl.cbx RELOC/tex/latex/geschichtsfrkl/geschichtsfrkldoc.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/geschichtsfrkl -catalogue-date 2016-06-06 06:36:10 +0200 +catalogue-date 2016-09-21 12:39:48 +0200 catalogue-license lppl catalogue-topics humanities biblatex catalogue-version 1.4 ++++++ getfiledate.doc.tar.xz ++++++ ++++++ getfiledate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/getfiledate.tlpobj new/tlpkg/tlpobj/getfiledate.tlpobj --- old/tlpkg/tlpobj/getfiledate.tlpobj 2016-04-14 19:04:30.000000000 +0200 +++ new/tlpkg/tlpobj/getfiledate.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/getfiledate/getfiledate.sty catalogue-ctan /macros/latex/contrib/getfiledate -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics file-mgmt catalogue-version 1.2 ++++++ getitems.doc.tar.xz ++++++ ++++++ getitems.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/getitems.tlpobj new/tlpkg/tlpobj/getitems.tlpobj --- old/tlpkg/tlpobj/getitems.tlpobj 2016-04-14 19:04:30.000000000 +0200 +++ new/tlpkg/tlpobj/getitems.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/getitems/getitems.sty catalogue-ctan /macros/latex/contrib/getitems -catalogue-date 2016-01-15 10:58:58 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics text-manip macro-supp catalogue-version 1.0 ++++++ getmap.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/README new/texmf-dist/doc/latex/getmap/README --- old/texmf-dist/doc/latex/getmap/README 2014-10-12 00:25:53.000000000 +0200 +++ new/texmf-dist/doc/latex/getmap/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -The goal of this package is the simplest possible provision of -map images (OpenStreetMap, Google Maps and Google Street View -are supported). In the simplest case, the specification of an -address is sufficient. The package loads the map using the -\write18 feature, which you must activate to use this package. -The image will be downloaded by an external Lua script. You can -use this script also from the command line. - -License: LPPL - -Changes in v1.8: - -- added support for long routes by the gps2gps mode (getmapdl.lua) - - Long routes might be defined by several thousands of way points. - Encoding these into a encoded polyline would hugely exceed the - URL length limit of 2048 bytes. The gps2gps mode allows you to - reduce the number of gps coordinates based on a given bound. - -- added multi route support for gps2epl mode - -- updated documentation - - INSTALL -=========== - -First of all, install the package with the package manager of -your TeX distribution, if possible! A getmap package is -available for TeXLive2014+ and MiKTeX! - -Manual installation: - -download getmap.dtx and makefile (Linux) or install.bat (Windows) - -* Linux - - simply run make to extract the files and to create the - documentation. Run sudo make install to copy the files - into $TEXMFLOCAL - - Moreover, there are the following usefull make targets: - - uninstall deletes the package in $TEXMFOCAL - package only extracts the files - clean cleans all aux files - cleanall cleans all files except the downloaded files - -* Windows - - In MiKTeX scripts like getmapdl.lua must be registered. - This can not be done manually! Please use the package - manager to install getmap. - - For TeXLive simply run install.bat! It assumes that you - use a standard installation of TeXLive2014. Otherwise you - must adjust the variables in the first lines of install.bat! - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/README.md new/texmf-dist/doc/latex/getmap/README.md --- old/texmf-dist/doc/latex/getmap/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/latex/getmap/README.md 2016-11-25 19:29:01.000000000 +0100 @@ -0,0 +1,19 @@ +# README # + +The goal of this package is the simplest possible provision of +map images (OpenStreetMap, Google Maps and Google Street View +are supported). In the simplest case, it is is sufficient to +specify an address.. The package loads the map using the +\write18 feature, which you must activate to use this package. +The image will be downloaded by an external Lua script. You +can use this script also from the command line. + +License: LPPL + +Changes in v1.9: + +* compatibility fix for luatex v0.85+ + +* Bugfix: restore some option defaults to guarantee correct + download URLs after changing mode in \getmap + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/getmap-example.tex new/texmf-dist/doc/latex/getmap/getmap-example.tex --- old/texmf-dist/doc/latex/getmap/getmap-example.tex 2014-07-25 23:03:41.000000000 +0200 +++ new/texmf-dist/doc/latex/getmap/getmap-example.tex 2016-11-25 19:29:01.000000000 +0100 @@ -6,7 +6,7 @@ %% %% getmap.dtx (with options: `examplefile') %% -%% Copyright (C) 2014 by: +%% Copyright (C) 2014,2016 by: %% Josef Kleber %% <josef.kleber(a)gmx.de> %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/getmap.dtx new/texmf-dist/doc/latex/getmap/getmap.dtx --- old/texmf-dist/doc/latex/getmap/getmap.dtx 2014-10-12 00:25:53.000000000 +0200 +++ new/texmf-dist/doc/latex/getmap/getmap.dtx 2016-11-25 19:29:01.000000000 +0100 @@ -4,63 +4,24 @@ \iffalse %</internal> %<*readme> +# README # + The goal of this package is the simplest possible provision of map images (OpenStreetMap, Google Maps and Google Street View -are supported). In the simplest case, the specification of an -address is sufficient. The package loads the map using the +are supported). In the simplest case, it is is sufficient to +specify an address.. The package loads the map using the \write18 feature, which you must activate to use this package. -The image will be downloaded by an external Lua script. You can -use this script also from the command line. +The image will be downloaded by an external Lua script. You +can use this script also from the command line. License: LPPL -Changes in v1.8: - -- added support for long routes by the gps2gps mode (getmapdl.lua) - - Long routes might be defined by several thousands of way points. - Encoding these into a encoded polyline would hugely exceed the - URL length limit of 2048 bytes. The gps2gps mode allows you to - reduce the number of gps coordinates based on a given bound. - -- added multi route support for gps2epl mode - -- updated documentation - - - INSTALL -=========== - -First of all, install the package with the package manager of -your TeX distribution, if possible! A getmap package is -available for TeXLive2014+ and MiKTeX! - -Manual installation: - -download getmap.dtx and makefile (Linux) or install.bat (Windows) +Changes in v1.9: -* Linux +* compatibility fix for luatex v0.85+ - simply run make to extract the files and to create the - documentation. Run sudo make install to copy the files - into $TEXMFLOCAL - - Moreover, there are the following usefull make targets: - - uninstall deletes the package in $TEXMFOCAL - package only extracts the files - clean cleans all aux files - cleanall cleans all files except the downloaded files - -* Windows - - In MiKTeX scripts like getmapdl.lua must be registered. - This can not be done manually! Please use the package - manager to install getmap. - - For TeXLive simply run install.bat! It assumes that you - use a standard installation of TeXLive2014. Otherwise you - must adjust the variables in the first lines of install.bat! +* Bugfix: restore some option defaults to guarantee correct + download URLs after changing mode in \getmap %</readme> %<*bibfile> @@ -147,7 +108,13 @@ title = {{MucBer: München Stachus -> Berlin Brandenburger Tor}}, year = {2014}, } - + +@misc{bib:texsx, + author = {Kleber, Josef}, + note = {\href{https://stackoverflow.com/questions/34653500/google-maps-implicit-positioning-of-the-map-broken}{https://stackoverflow.com/questions/34653500/google-maps-implicit-positioning-of-the-map-broken}}, + title = {{Google Maps 'Implicit Positioning of the Map' broken?}}, + year = {2016}, + } %</bibfile> %<*luafile> #!/usr/bin/env texlua @@ -1084,7 +1051,7 @@ \askforoverwritefalse \preamble -Copyright (C) 2014 by: +Copyright (C) 2014,2016 by: Josef Kleber <josef.kleber(a)gmx.de> @@ -1126,7 +1093,7 @@ \nopreamble\nopostamble \usedir{doc/latex/getmap} \generate{ - \file{README.txt}{\from{\jobname.dtx}{readme}} + \file{README.md}{\from{\jobname.dtx}{readme}} } \generate{ \file{manifest.txt}{\from{\jobname.dtx}{manifest}} @@ -1160,6 +1127,7 @@ \usepackage{listings} \usepackage{filecontents} \usepackage{nicefrac} +\usepackage{tcolorbox} \usepackage[numbered]{hypdoc} \usepackage{marginnote}% \usepackage[automark,nouppercase]{scrpage2} @@ -1167,6 +1135,7 @@ \usetocstyle{classic} \usepackage[overwrite=false]{getmap} \usepackage{attachfile} +\usepackage{metalogo} \usepackage{tikz} % turn off idiotic tikz error in doc generation \makeatletter @@ -1330,6 +1299,8 @@ {\if@restonecol\onecolumn\else\clearpage\fi} \setlength\parindent{0pt}% \newcommand*\myref[1]{[see: \ref{#1} on page \pageref{#1}]} +\tcbuselibrary{hooks} +\newtcolorbox{gmbox}{colback=yellow,colframe=red!75!black,fonttitle=\bfseries,colbacktitle=red!85!black,title=Note,halign=left,box align=center} \makeatother \begin{document} \DocInput{\jobname.dtx} @@ -1344,7 +1315,7 @@ %emph={},emphstyle=\color{Tomato}, %emph={[2]width,xsize,ysize,zoom,scale,mode,file,type,heading,pitch,fov,markers,visible,path,pathfile},emphstyle={[2]\color{OliveDrab}}, %morekeywords={getmap,includegraphics}} -%\DoNotIndex{\,,\begingroup,\endgroup,\csname,\def,\else,\endcsname,\equal,\expandafter, +%\DoNotIndex{\,,\begingroup,\endgroup,\csname,\def,\else,\endcsname,\equal,\expandafter,\write, %\fi,\gdef,\ifnum,\ifthenelse,\immediate,\MessageBreak,\NeedsTeXFormat,\newcommand,\newif, %\PackageInfo,\PackageError,\ProcessOptionsX,\ProvidesPackage,\relax,\RequirePackage, %\space,\errmessage,\ExecuteOptionsX,} @@ -1355,7 +1326,7 @@ % \author{Josef Kleber} % \Fileversion{\fileversion} % \date{\filedate} -% \Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/getmap/}{\texttt{https://bitbucket.org/kleberj/getmap/}}} +% \Refline{\href{mailto:getmap@jklatex.de}{\texttt{getmap@jklatex.de}}\\\href{http://getmap.jklatex.de/}{\texttt{http://getmap.jklatex.de/}}} % \maketitle % \stepcounter{page} % \tableofcontents @@ -1379,8 +1350,8 @@ % \begin{abstract} % The goal of this package is the simplest possible provision of % map images (OpenStreetMap, Google Maps and Google Street View -% are supported). In the simplest case, the specification of an -% address is sufficient. The package loads the map using the +% are supported). In the simplest case, it is is sufficient +% to specify an address. The package loads the map using the % \cmd\write18 feature, which you must activate to use this package. % The image will be downloaded by an external Lua script. You can % use this script also from the command line. @@ -1401,6 +1372,8 @@ % \subsection{General options} % \subsubsection[\texttt{mode}]{\texttt{mode (\underline{osm}\textbar{}gm\textbar{}gsv})} % This option sets the mode, that is the source of the images. OpenStreetMap, Google Maps or Google Street View! +% Please note that -- if used as local option (mixed modes) -- the default values of the \texttt{scale}, \texttt{zoom}, \texttt{type} and \texttt{color} +% options for the respective mode are reset to guarantee correct download URLs! % \subsubsection[\texttt{inputencoding}]{\texttt{inputencoding}} % This option specifies the input encoding of your file. % The download script requires the strings encoded in utf8. @@ -1416,7 +1389,7 @@ % In the case of \texttt{true}, the image will be downloaded anyway! % BTW, \texttt{overwrite} is equivalent to \texttt{overwrite=true}. % \subsubsection[\texttt{file}]{\texttt{file (\underline{getmap})}} -% This \marginpar{\footnotesize\fbox{\parbox{3cm}{\raggedright{}changed default value to \texttt{getmap} in version 1.2!}}} +% This \marginpar{\begin{gmbox}changed default value to \texttt{getmap} in version 1.2!\end{gmbox}} % option allows you to specify the name of the image (without extension). % \subsection{\texttt{osm} mode} % \subsubsection[\texttt{key}]{\texttt{key (\underline{Fmjtd\textbar{}luur20u22d,75=o5-9aylh6}})} @@ -1436,7 +1409,7 @@ % This option overwrites a possibly given scale. % \subsubsection[\texttt{xsize}]{\texttt{xsize (\underline{600})}} % This option specifies the width of the map in pixels. -% If \marginpar{\footnotesize\fbox{\parbox{3cm}{\raggedright{}changed default value to \texttt{600} in version 1.2!}}} +% If \marginpar{\begin{gmbox}changed default value to \texttt{600} in version 1.2!\end{gmbox}} % you only want to slightly increase or decrease the map extract, % you should adjust the size of the map. You still have full control over the size of % the map in the document with the options of \cmd\includegraphics. (max: 3840) @@ -1492,9 +1465,9 @@ % \texttt{\&markers=size:mid\textbar{}color:blue\textbar{}label:S\textbar{}loc1\textbar{}loc2\textbar{}...} % % \getmap[file=bmus1, mode=gm, -% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin% +% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% % &markers=label:P|color:green|Pergamonmuseum, Berlin% -% &markers=label:N|color:blue|Neues Museum, Berlin}% +% &markers=label:N|color:blue|52.520063,13.397525}% % ]{} % \begin{center}\includegraphics[width=10cm]{bmus1}\end{center} % \iffalse @@ -1503,15 +1476,20 @@ \begin{lstlisting} \getmap[ file=bmus1, mode=gm, -markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin% +markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% &markers=label:P|color:green|Pergamonmuseum, Berlin% - &markers=label:N|color:blue|Neues Museum, Berlin}% + &markers=label:N|color:blue|52.520063,13.397525}% ]{} \includegraphics[width=10cm]{bmus1} \end{lstlisting} % \iffalse %</example> % \fi +% Earlier versions of this document used POIs for all museums. +% After an update from Google Maps, the quality of the geo codings deteriorated, at least in this example from Berlin. +% Using addresses or geographical coordinates usually solves this problem. +% See \cite{bib:texsx} for more information. +% % The parameters size, color and label are optional! % \begin{description} % \item[size] tiny, \underline{mid}, small @@ -1523,9 +1501,9 @@ % With this option you can specify a list of locations (separated by a pipe), which must be on the map! % % \getmap[file=bmus2, mode=gm, -% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin +% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398 % &markers=label:P|color:green|Pergamonmuseum, Berlin -% &markers=label:N|color:blue|Neues Museum, Berlin}, +% &markers=label:N|color:blue|52.520063,13.397525}, % visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{} % \begin{center}\includegraphics[width=10cm]{bmus2}\end{center} % \iffalse @@ -1534,9 +1512,9 @@ \begin{lstlisting} \getmap[ file=bmus2, mode=gm -markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin% +markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% &markers=label:P|color:green|Pergamonmuseum, Berlin% - &markers=label:N|color:blue|Neues Museum, Berlin},% + &markers=label:N|color:blue|52.520063,13.397525},% visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{} \includegraphics[width=10cm]{bmus2} \end{lstlisting} @@ -1553,11 +1531,11 @@ % \fi \begin{lstlisting} \getmap[file=bmus3, mode=gm, language=de, -markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin% +markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% &markers=label:P|color:green|Pergamonmuseum, Berlin% - &markers=label:N|color:blue|Neues Museum, Berlin},% -path={&path=weight:5|color:orange|Bode Museum, Berlin|% - Pergamonmuseum, Berlin|Neues Museum, Berlin|% + &markers=label:N|color:blue|52.520063,13.397525},% +path={&path=weight:5|color:orange|52.521847,13.394398|% + Pergamonmuseum, Berlin|52.520063,13.397525|% James-Simon-Park,Berlin|52.522649,13.402523% &path=weight:5|color:purple|James-Simon-Park, Berlin|% Weinmeisterstraße 6, Berlin}]{} @@ -1568,11 +1546,11 @@ % \fi % % \getmap[file=bmus3, mode=gm, language=de, -% markers={&markers=size:mid|label:B|color:green|Bode Museum, Berlin% +% markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% % &markers=label:P|color:green|Pergamonmuseum, Berlin% -% &markers=label:N|color:blue|Neues Museum, Berlin},% -% path={&path=weight:5|color:orange|Bode Museum, Berlin|% -% Pergamonmuseum, Berlin|Neues Museum, Berlin|% +% &markers=label:N|color:blue|52.520063,13.397525},% +% path={&path=weight:5|color:orange|52.521847,13.394398|% +% Pergamonmuseum, Berlin|52.520063,13.397525|% % James-Simon-Park,Berlin|52.522649,13.402523% % &path=weight:5|color:purple|James-Simon-Park, Berlin|% % Weinmeisterstraße 6, Berlin}]{} @@ -1581,13 +1559,6 @@ % You can also use \texttt{fillcolor} to mark areas! In paths, you % can also specify RGB32 colors, in which the last byte defines opacity, % e.g. 55 (33\%). -% -% \getmap[file=cpny, mode=gm, zoom=13, -% path={&path=weight:2|color:orange|fillcolor:0xff641A55| -% 40.764302, -73.973004|40.768044, -73.981903|% -% 40.800642, -73.958193|40.796887, -73.949226|% -% 40.764302, -73.973004}]{Central Park, New York} -% \begin{center}\includegraphics[width=10cm]{cpny}\end{center} % \iffalse %<*example> % \fi @@ -1603,6 +1574,13 @@ %</example> % \fi % +% \getmap[file=cpny, mode=gm, zoom=13, +% path={&path=weight:2|color:orange|fillcolor:0xff641A55| +% 40.764302, -73.973004|40.768044, -73.981903|% +% 40.800642, -73.958193|40.796887, -73.949226|% +% 40.764302, -73.973004}]{Central Park, New York} +% \begin{center}\includegraphics[width=10cm]{cpny}\end{center} +% % With small enough spaces between way points you can also defines routes! % \subsubsection{\texttt{pathfile}} % This option specifies the file holding the path specification. It will be loaded by the \texttt{Lua} script. @@ -1727,17 +1705,17 @@ %</example> % \fi % -% and from the platform: +% View from Olympic Tower Munich (Olympic Stadium and Park): % -% \getmap[file=parisgsvp,mode=gsv,heading=30,pitch=-25,fov=60]{Tour Eiffel, Paris} -% \begin{center}\includegraphics[width=8cm]{parisgsvp}\end{center} +% \getmap[file=mucoly,mode=gsv,heading=260,pitch=-40,fov=90]{Olympiaturm} +% \begin{center}\includegraphics[width=8cm]{mucoly}\end{center} % \iffalse %<*example> % \fi \begin{lstlisting} - \getmap[file=parisgsvp,mode=gsv,heading=30,pitch=-25,fov=60]% - {Tour Eiffel, Paris} - \includegraphics[width=8cm]{parisgsvp} + \getmap[file=mucoly,mode=gsv,heading=260,pitch=-40,fov=90]% + {Olympiaturm} + \includegraphics[width=8cm]{mucoly} \end{lstlisting} % \iffalse %</example> @@ -2112,7 +2090,7 @@ % First, we provide the \LaTeX\ package \package{getmap}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2014/10/07 v1.8 getmap.sty - Josef Kleber (C) 2014]% +\ProvidesPackage{getmap}[2016/06/18 v1.9 getmap.sty - Josef Kleber (C) 2014,2016]% % \end{macrocode} % We need a few packages! % \begin{macrocode} @@ -2120,6 +2098,10 @@ \RequirePackage{stringenc}% \RequirePackage{ifthen}% % \end{macrocode} +% Newer versions of \LuaTeX\ v0.85+ no longer supports \cmd\write18! Therefore, we use \package{shellesc} instead. +% \begin{macrocode} +\RequirePackage{shellesc}% +% \end{macrocode} % We provide a macro \cmd\GM@JK@define@key, which defines package options with global scope% % and options for \cmd\getmap\ with local scope. It takes four arguments \marg{prefix},% % \marg{package},\marg{option} and \marg{default}. @@ -2255,60 +2237,61 @@ }% % % \end{macrocode} -% We define a macro that is executed as \cmd\write18\ call. First, we test if% +% We define a macro that is executed as \cmd\ShellEscape\ call. First, we test if% % \cmd\write18\ is enabled and issue a package error if not! Otherwise we execute% -% \cmd\write18\ depending on the mode% +% \cmd\ShellEscape\ depending on the mode% +% \changes{v1.9}{2016/06/16}{\LuaTeX\ v0.85+ fix: use \texttt{shellesc}'s \texttt{\textbackslash ShellEscape} instead of \texttt{\textbackslash write18}} % \begin{macrocode} \newcommand*\GM@JK@shellescape% {% \ifGM@JK@writexviii\relax% \ifthenelse{\equal{\GM@JK@mode}{osm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space osm% - \space-k\space "\GM@JK@key@string"% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space "\GM@JK@zoom"% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \space-i\space \GM@JK@imagetype% - \space-c\space "\GM@JK@color"% - \space-n\space \GM@JK@number% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space osm% + \space-k\space "\GM@JK@key@string"% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space "\GM@JK@zoom"% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \space-i\space \GM@JK@imagetype% + \space-c\space "\GM@JK@color"% + \space-n\space \GM@JK@number% + \space-o\space \GM@JK@file}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gm% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space \GM@JK@zoom% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \space-i\space \GM@JK@imagetype% - \space-c\space "\GM@JK@color"% - \space-n\space \GM@JK@number% - \space-L\space "\GM@JK@language"% - \space-M\space "\GM@JK@markers@string"% - \space-C\space "\GM@JK@location@string"% - \space-P\space "\GM@JK@path@string"% - \space-p\space "\GM@JK@pathfile"% - \space-V\space "\GM@JK@visible@string"% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gm% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space \GM@JK@zoom% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \space-i\space \GM@JK@imagetype% + \space-c\space "\GM@JK@color"% + \space-n\space \GM@JK@number% + \space-L\space "\GM@JK@language"% + \space-M\space "\GM@JK@markers@string"% + \space-C\space "\GM@JK@location@string"% + \space-P\space "\GM@JK@path@string"% + \space-p\space "\GM@JK@pathfile"% + \space-V\space "\GM@JK@visible@string"% + \space-o\space \GM@JK@file}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gsv}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gsv% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-H\space \GM@JK@heading% - \space-F\space \GM@JK@fov% - \space-T\space \GM@JK@pitch% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gsv% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-H\space \GM@JK@heading% + \space-F\space \GM@JK@fov% + \space-T\space \GM@JK@pitch% + \space-o\space \GM@JK@file}% }% {% \PackageError{getmap}{invalid mode}{invalid mode! Use osm, gm or gsv!}% @@ -2332,8 +2315,9 @@ {% % \end{macrocode} % \changes{v1.1}{2014/06/23}{Bugfix: problem in URL when using \cmd\usepackage[utf8]\{inputenc\}} +% \changes{v1.9}{2016/06/18}{Bugfix: restore mode defaults for \texttt{scale}, \texttt{zoom}, \texttt{type} and \texttt{color} options to guarantee correct download URLs} % We start a group to keep the setting of options local. -% Then we test, if we are in \texttt{gm} mode to reset some defaults! +% Then we test the mode to reset some defaults! % Finally, we set the local options again to override defaults if necessary! % \begin{macrocode} \begingroup% @@ -2346,6 +2330,14 @@ \def\GM@JK@color{blue}% }% {}% + \ifthenelse{\equal{\GM@JK@mode}{osm}}% + {% + \def\GM@JK@scale{3385}% + \def\GM@JK@zoom{}% + \def\GM@JK@type{map}% + \def\GM@JK@color{yellow_1}% + }% + {}% \setkeys{getmap}{#1}% % \end{macrocode} % In \texttt{gsv} mode, we have an implicit \texttt{imagetype=jpg}. Binary files old/texmf-dist/doc/latex/getmap/getmap.pdf and new/texmf-dist/doc/latex/getmap/getmap.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/install.bat new/texmf-dist/doc/latex/getmap/install.bat --- old/texmf-dist/doc/latex/getmap/install.bat 2014-08-19 00:31:15.000000000 +0200 +++ new/texmf-dist/doc/latex/getmap/install.bat 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -@echo off -rem Adjust these pathes for your installation. -rem Usually, you just need to change the base directory part! -set texmfpath=C:\texlive\texmf-local -set bindir=C:\texlive\2014\bin\win32\ -set pckname=getmap -echo. -echo. -echo Installing %pckname% into %texmfpath% -echo. -echo Creating %pckname%.pdf -pdflatex -shell-escape %pckname%.dtx >nul -bibtex %pckname% >nul -makeindex -q -s gind.ist %pckname% >nul -makeindex -q -s gglo.ist %pckname%.glo -o %pckname%.gls >nul -pdflatex %pckname%.dtx >nul -bibtex %pckname% >nul -makeindex -q -s gind.ist %pckname% >nul -makeindex -q -s gglo.ist %pckname%.glo -o %pckname%.gls >nul -pdflatex %pckname%.dtx >nul -ren README.txt README >nul -echo Copying files to %texmfpath% -md %texmfpath%\scripts\%pckname% >nul -copy getmapdl.lua %texmfpath%\scripts\%pckname%\ >nul -md %texmfpath%\tex\latex\%pckname% >nul -copy *.sty %texmfpath%\tex\latex\%pckname% >nul -copy *.cfg %texmfpath%\tex\latex\%pckname% >nul -md %texmfpath%\doc\latex\%pckname% >nul -copy README %texmfpath%\doc\latex\%pckname% >nul -copy *.txt %texmfpath%\doc\latex\%pckname% >nul -copy *.tex %texmfpath%\doc\latex\%pckname% >nul -copy *.dtx %texmfpath%\doc\latex\%pckname% >nul -copy *.pdf %texmfpath%\doc\latex\%pckname% >nul -echo Running texhash -texhash >nul -del *.aux -del *.bib -del *.blg -del *.bbl -del *.gls -del *.glo -del *.hd -del *.idx -del *.ilg -del *.ind -del *.ins -del *.log -del *.out -del *.tex -del *.sty -del *.cfg -del *.toc -del *.txt -del *.png -del *.jpg -del *.epl -del getmapdl.lua -del README -del getmap.pdf -echo Create getmapdl.exe -pushd %bindir% -copy runscript.exe getmapdl.exe >nul -popd -echo. -echo Done -echo. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/getmap/makefile new/texmf-dist/doc/latex/getmap/makefile --- old/texmf-dist/doc/latex/getmap/makefile 2014-10-12 00:25:53.000000000 +0200 +++ new/texmf-dist/doc/latex/getmap/makefile 2016-11-25 19:29:01.000000000 +0100 @@ -23,7 +23,7 @@ package: pdftex $(PKGNAME).dtx - mv README.txt README + dos2unix ./copyCTAN install: doc mkdir -p ${TEXMF}/doc/latex/${PKGNAME} @@ -55,6 +55,7 @@ cp getmapdl.lua ./../dev/scripts/getmap/getmapdl.lua cp getmap.sty ./../dev/tex/latex/getmap/getmap.sty cp getmap.cfg ./../dev/tex/latex/getmap/getmap.cfg + cp README.md ./../README.md ctan: ./copyCTAN @@ -62,10 +63,10 @@ clean: $(RM) *.aux *.fdb_latexmk *.fls *.ind *.idx *.ilg *.glo *.gls \ *.log *.lol *.m *.out *.tmp *.toc *.sh *.hd \ - *.bbl *.blg *.ins *.txt *.bib *.epl + *.bbl *.blg *.ins *.bib *.epl cleanall: clean - $(RM) getmapdl.lua *.sty *.png *.jpg\ - *.cfg *.tex README getmap.pdf + $(RM) getmapdl.lua *.sty *.png *.jpg manifest.txt \ + *.cfg *.tex README.md getmap.pdf .PHONY: all doc package install uninstall styles git ctan clean cleanall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/getmap.doc.tlpobj new/tlpkg/tlpobj/getmap.doc.tlpobj --- old/tlpkg/tlpobj/getmap.doc.tlpobj 2016-04-14 19:04:30.000000000 +0200 +++ new/tlpkg/tlpobj/getmap.doc.tlpobj 2017-04-14 17:41:32.000000000 +0200 @@ -1,12 +1,11 @@ name getmap.doc category Package -revision 35355 +revision 41503 shortdesc doc files of getmap -docfiles size=581 - texmf-dist/doc/latex/getmap/README +docfiles size=579 + texmf-dist/doc/latex/getmap/README.md texmf-dist/doc/latex/getmap/getmap-example.tex texmf-dist/doc/latex/getmap/getmap.dtx texmf-dist/doc/latex/getmap/getmap.pdf - texmf-dist/doc/latex/getmap/install.bat texmf-dist/doc/latex/getmap/makefile texmf-dist/doc/latex/getmap/manifest.txt ++++++ getmap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/getmap/getmap.cfg new/texmf-dist/tex/latex/getmap/getmap.cfg --- old/texmf-dist/tex/latex/getmap/getmap.cfg 2014-07-17 00:37:21.000000000 +0200 +++ new/texmf-dist/tex/latex/getmap/getmap.cfg 2016-11-25 19:33:49.000000000 +0100 @@ -6,7 +6,7 @@ %% %% getmap.dtx (with options: `cfgfile') %% -%% Copyright (C) 2014 by: +%% Copyright (C) 2014,2016 by: %% Josef Kleber %% <josef.kleber(a)gmx.de> %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/getmap/getmap.sty new/texmf-dist/tex/latex/getmap/getmap.sty --- old/texmf-dist/tex/latex/getmap/getmap.sty 2014-10-12 00:25:53.000000000 +0200 +++ new/texmf-dist/tex/latex/getmap/getmap.sty 2016-11-25 19:33:49.000000000 +0100 @@ -6,7 +6,7 @@ %% %% getmap.dtx (with options: `package') %% -%% Copyright (C) 2014 by: +%% Copyright (C) 2014,2016 by: %% Josef Kleber %% <josef.kleber(a)gmx.de> %% @@ -27,10 +27,11 @@ %% This work consists of all files listed in manifest.txt. %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2014/10/07 v1.8 getmap.sty - Josef Kleber (C) 2014]% +\ProvidesPackage{getmap}[2016/06/18 v1.9 getmap.sty - Josef Kleber (C) 2014,2016]% \RequirePackage{xkeyval}% \RequirePackage{stringenc}% \RequirePackage{ifthen}% +\RequirePackage{shellesc}% \newcommand*\GM@JK@define@key[4]% {% \expandafter\gdef\csname#1@#3\endcsname{#4}% @@ -123,51 +124,51 @@ \ifGM@JK@writexviii\relax% \ifthenelse{\equal{\GM@JK@mode}{osm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space osm% - \space-k\space "\GM@JK@key@string"% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space "\GM@JK@zoom"% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \space-i\space \GM@JK@imagetype% - \space-c\space "\GM@JK@color"% - \space-n\space \GM@JK@number% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space osm% + \space-k\space "\GM@JK@key@string"% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space "\GM@JK@zoom"% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \space-i\space \GM@JK@imagetype% + \space-c\space "\GM@JK@color"% + \space-n\space \GM@JK@number% + \space-o\space \GM@JK@file}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gm}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gm% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-z\space \GM@JK@zoom% - \space-s\space \GM@JK@scale% - \space-t\space \GM@JK@type% - \space-i\space \GM@JK@imagetype% - \space-c\space "\GM@JK@color"% - \space-n\space \GM@JK@number% - \space-L\space "\GM@JK@language"% - \space-M\space "\GM@JK@markers@string"% - \space-C\space "\GM@JK@location@string"% - \space-P\space "\GM@JK@path@string"% - \space-p\space "\GM@JK@pathfile"% - \space-V\space "\GM@JK@visible@string"% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gm% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-z\space \GM@JK@zoom% + \space-s\space \GM@JK@scale% + \space-t\space \GM@JK@type% + \space-i\space \GM@JK@imagetype% + \space-c\space "\GM@JK@color"% + \space-n\space \GM@JK@number% + \space-L\space "\GM@JK@language"% + \space-M\space "\GM@JK@markers@string"% + \space-C\space "\GM@JK@location@string"% + \space-P\space "\GM@JK@path@string"% + \space-p\space "\GM@JK@pathfile"% + \space-V\space "\GM@JK@visible@string"% + \space-o\space \GM@JK@file}% }% {% \ifthenelse{\equal{\GM@JK@mode}{gsv}}% {% - \immediate\write18{getmapdl \space-l\space "\GM@JK@location@string"% - \space-m\space gsv% - \space-x\space \GM@JK@xsize% - \space-y\space \GM@JK@ysize% - \space-H\space \GM@JK@heading% - \space-F\space \GM@JK@fov% - \space-T\space \GM@JK@pitch% - \space-o\space \GM@JK@file}% + \ShellEscape{getmapdl \space-l\space "\GM@JK@location@string"% + \space-m\space gsv% + \space-x\space \GM@JK@xsize% + \space-y\space \GM@JK@ysize% + \space-H\space \GM@JK@heading% + \space-F\space \GM@JK@fov% + \space-T\space \GM@JK@pitch% + \space-o\space \GM@JK@file}% }% {% \PackageError{getmap}{invalid mode}{invalid mode! Use osm, gm or gsv!}% @@ -193,6 +194,14 @@ \def\GM@JK@color{blue}% }% {}% + \ifthenelse{\equal{\GM@JK@mode}{osm}}% + {% + \def\GM@JK@scale{3385}% + \def\GM@JK@zoom{}% + \def\GM@JK@type{map}% + \def\GM@JK@color{yellow_1}% + }% + {}% \setkeys{getmap}{#1}% \ifthenelse{\equal{\GM@JK@mode}{gsv}}% {\def\GM@JK@imagetype{jpg}}{}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/getmap.tlpobj new/tlpkg/tlpobj/getmap.tlpobj --- old/tlpkg/tlpobj/getmap.tlpobj 2016-04-14 19:04:32.000000000 +0200 +++ new/tlpkg/tlpobj/getmap.tlpobj 2017-04-14 17:41:33.000000000 +0200 @@ -1,6 +1,6 @@ name getmap category Package -revision 35355 +revision 41503 shortdesc Download OpenStreetMap maps for use in documents longdesc The package provides a simple interface to OpenStreetMap, and longdesc to Google Maps "map images". In the simplest case, it is @@ -16,7 +16,7 @@ texmf-dist/tex/latex/getmap/getmap.cfg texmf-dist/tex/latex/getmap/getmap.sty catalogue-ctan /macros/latex/contrib/getmap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-20 19:27:05 +0200 catalogue-license lppl catalogue-topics cartography -catalogue-version 1.8 +catalogue-version 1.9 ++++++ getoptk.doc.tar.xz ++++++ ++++++ getoptk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/getoptk.tlpobj new/tlpkg/tlpobj/getoptk.tlpobj --- old/tlpkg/tlpobj/getoptk.tlpobj 2016-04-14 19:04:32.000000000 +0200 +++ new/tlpkg/tlpobj/getoptk.tlpobj 2017-04-14 17:41:33.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/plain/getoptk/getoptk.tex RELOC/tex/plain/getoptk/guide.tex catalogue-ctan /macros/plain/contrib/getoptk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics macro-def catalogue-version 1.0 ++++++ gfnotation.doc.tar.xz ++++++ ++++++ gfnotation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfnotation.tlpobj new/tlpkg/tlpobj/gfnotation.tlpobj --- old/tlpkg/tlpobj/gfnotation.tlpobj 2016-04-14 19:04:32.000000000 +0200 +++ new/tlpkg/tlpobj/gfnotation.tlpobj 2017-04-14 17:41:33.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=22 RELOC/tex/plain/gfnotation/GFnotation.tex catalogue-ctan /macros/plain/contrib/gfnotation -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics logic maths catalogue-version 2.9 ++++++ gfsartemisia.doc.tar.xz ++++++ ++++++ gfsartemisia.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsartemisia.tlpobj new/tlpkg/tlpobj/gfsartemisia.tlpobj --- old/tlpkg/tlpobj/gfsartemisia.tlpobj 2016-04-14 19:04:33.000000000 +0200 +++ new/tlpkg/tlpobj/gfsartemisia.tlpobj 2017-04-14 17:41:33.000000000 +0200 @@ -128,7 +128,7 @@ RELOC/tex/latex/gfsartemisia/uartemisiaeulernums.fd RELOC/tex/latex/gfsartemisia/uartemisianums.fd catalogue-ctan /fonts/greek/gfs/gfsartemisia -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-type1 font-otf font-greek catalogue-version 1.0 ++++++ gfsbaskerville.doc.tar.xz ++++++ ++++++ gfsbaskerville.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsbaskerville.tlpobj new/tlpkg/tlpobj/gfsbaskerville.tlpobj --- old/tlpkg/tlpobj/gfsbaskerville.tlpobj 2016-04-14 19:04:34.000000000 +0200 +++ new/tlpkg/tlpobj/gfsbaskerville.tlpobj 2017-04-14 17:41:34.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/latex/gfsbaskerville/gfsbaskerville.sty RELOC/tex/latex/gfsbaskerville/lgrgfsbaskerville.fd catalogue-ctan /fonts/greek/gfs/gfsbaskerville -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-type1 font-otf font-greek catalogue-version 1.0

1 0

commit texlive-specs-i 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-i for openSUSE:Factory checked in at 2017-06-25 19:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-i (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-i.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-i" Sun Jun 25 19:21:55 2017 rev:26 rq:504799 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.changes 2017-06-08 14:54:46.300726889 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-i.new/texlive-specs-i.changes 2017-06-25 19:25:51.464699757 +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: ---- fixltxhyph.doc.tar.xz fixltxhyph.tar.xz fixme.doc.tar.xz fixme.tar.xz fixmetodonotes.doc.tar.xz fixmetodonotes.tar.xz fixpdfmag.tar.xz fjodor.doc.tar.xz fjodor.tar.xz flabels.doc.tar.xz flabels.tar.xz flacards.doc.tar.xz flacards.tar.xz flagderiv.doc.tar.xz flagderiv.tar.xz flashcards.doc.tar.xz flashcards.tar.xz flashmovie.doc.tar.xz flashmovie.tar.xz flipbook.doc.tar.xz flipbook.tar.xz flippdf.doc.tar.xz flippdf.tar.xz float.doc.tar.xz float.tar.xz floatrow.doc.tar.xz floatrow.tar.xz flowchart.doc.tar.xz flowchart.tar.xz flowfram.doc.tar.xz flowfram.tar.xz fltpoint.doc.tar.xz fltpoint.tar.xz fmp.doc.tar.xz fmp.tar.xz fmtcount.doc.tar.xz fmtcount.tar.xz fn2end.doc.tar.xz fn2end.tar.xz fnbreak.doc.tar.xz fnbreak.tar.xz fncychap.doc.tar.xz fncychap.tar.xz fncylab.doc.tar.xz fncylab.tar.xz fnpara.doc.tar.xz fnpara.tar.xz fnpct.doc.tar.xz fnpct.tar.xz fntproof.doc.tar.xz fntproof.tar.xz fnumprint.doc.tar.xz fnumprint.tar.xz foekfont.doc.tar.xz foekfont.tar.xz New: ---- eqnarray.doc.tar.xz eqnarray.tar.xz eqparbox.doc.tar.xz eqparbox.tar.xz erdc.doc.tar.xz erdc.tar.xz erewhon.doc.tar.xz erewhon.tar.xz errata.doc.tar.xz errata.tar.xz es-tex-faq.doc.tar.xz esami.doc.tar.xz esami.tar.xz esdiff.doc.tar.xz esdiff.tar.xz esint-type1.doc.tar.xz esint-type1.tar.xz esint.doc.tar.xz esint.tar.xz esk.doc.tar.xz esk.tar.xz eskd.doc.tar.xz eskd.tar.xz eskdx.doc.tar.xz eskdx.tar.xz eso-pic.doc.tar.xz eso-pic.tar.xz esrelation.doc.tar.xz esrelation.tar.xz esstix.doc.tar.xz esstix.tar.xz estcpmm.doc.tar.xz estcpmm.tar.xz esvect.doc.tar.xz esvect.tar.xz etaremune.doc.tar.xz etaremune.tar.xz etdipa.doc.tar.xz etex-pkg.doc.tar.xz etex-pkg.tar.xz etex.doc.tar.xz etex.tar.xz etextools.doc.tar.xz etextools.tar.xz ethiop-t1.doc.tar.xz ethiop-t1.tar.xz ethiop.doc.tar.xz ethiop.tar.xz etoc.doc.tar.xz etoc.tar.xz etoolbox-de.doc.tar.xz etoolbox.doc.tar.xz etoolbox.tar.xz euenc.doc.tar.xz euenc.tar.xz eulerpx.doc.tar.xz eulerpx.tar.xz fgruler.doc.tar.xz fgruler.tar.xz filecontentsdef.doc.tar.xz filecontentsdef.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-i.spec ++++++ ++++ 35672 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-i.new/texlive-specs-i.spec ++++++ fjodor.doc.tar.xz -> erdc.doc.tar.xz ++++++ ++++ 4596 lines of diff (skipped) ++++++ fjodor.doc.tar.xz -> erdc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/README new/doc/latex/fjodor/README --- old/doc/latex/fjodor/README 2010-09-09 20:21:23.000000000 +0200 +++ new/doc/latex/fjodor/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ - -This is the README file - -This package provide nice layout and typeout for a -small books. - -This package is publisher under GNU GENERAL PUBLIC LICENCE. -You can redistribute it and/or modify it under the terms -og he GNU General Public Licence as published by the -Free Software Foundation; either version 2 od the Licence, -or (at your options) any later version. -See www.gnu.org for details. - -Zoran T. Filipovic -Jurija Gagarina 263/6 -11070 Novi Beograd -Srbija -zoran dot filipovic at yahoo dot com Binary files old/doc/latex/fjodor/dostojevski.pdf and new/doc/latex/fjodor/dostojevski.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/dostojevski.tex new/doc/latex/fjodor/dostojevski.tex --- old/doc/latex/fjodor/dostojevski.tex 2010-09-09 20:21:23.000000000 +0200 +++ new/doc/latex/fjodor/dostojevski.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,576 +0,0 @@ - -\documentclass[a4paper,final,showtrims,twoside,openright,10pt]{memoir} -\usepackage[T1]{fontenc} -\usepackage[cp1250]{inputenc} -\usepackage{textcomp} -\usepackage{lmodern} -%mlargecrownvopaper, -\usepackage{soul} -\usepackage{calc} -\usepackage{quotmark} -\usepackage{ellipsis} -\usepackage{pifont} -\usepackage{eqell} - -\usepackage[serbian]{babel} -\usepackage[wilson]{srbook-mem} -\usepackage[fjodor]{fjodor} - -\chapterstyle{wilsondob} - -%\usepackage[colorlinks,linkcolor=red,citecolor=black, - %urlcolor=magenta,bookmarks,bookmarksopen,raiselinks]{hyperref} - -%\hypersetup{pdftitle={Pripovetke (Malisan kod Hrista na Bozicnoj jelki, Seljak Marej, Krotka)}, - % pdfauthor={Fjodor Mihailovich Dostojevski}, - % pdfsubject={Book}, - % pdfkeywords={Hrist, Bozic, jelka, malisan, Marej}, - % pdfpagelayout={TwoPageRight}, - % baseurl=zoran.filipovic(a)yahoo.com - %pdfstartview={Fit} - % } - - -\usepackage{leading} -\begin{document} -%\leading{12pt} -\hyphenation{stva-rno} - -\frenchspacing - -\book{MALIAN KOD HRISTA NA BOIÆOJ JELKI} -%\pdfbookmark{}{}{} - -\chapter[Jedan]{} - -%\pagestyle{plain} -%\makeevenhead{plain}{\thepage}{\scriptsize{F.~M.~DOSTOJEVSKI}}{} -%\makeoddhead{plain}{}{\scriptsize{MALIAN KOD HRISTA NA BOIÆOJ JELKI}}{\thepage} -%\makeevenfoot{plain}{}{}{} -%\makeoddfoot{plain}{}{}{} -%\aliaspagestyle{chapter}{empty} - -Deca su èudan svet --- oni se priviðaju i sanjaju. Uoèi kiæenja jelke i na samo -veèe uoèi Boiæa, stalno sam sretao na ulici, jednog maliana koji nije imao -vie od est--sedam godina. Po stranom mrazu bio je odeven gotovo kao leti, -samo mu je grlo bilo umotano nekim starim alom --- znaèi, neko ga je ipak -spremao i slao. On je iao >>sa ispruenom rukom<<; to je tehnièki termin --- -koji znaèi prositi milostinju. Taj izraz su izmislili sami maliani. A takvih -kao on ima mnogo. Motaju se po vaem putu i plaèno govore neke nauèene reèi. -Ovaj, meðutim, nije kukao, veæ je govorio nekako naivo i nevièno gledajuæi -mi sa poverenjem u oèi --- a to znaèi tek je poèinjao da se bavi prosjaèenjem. -Na moje pitanje rekao mi je da mu sestra lei bolesna i bez posla; moda je -istina, ali ja sam kasnije doznao da ovih maliana ima bezbroj: alju ih da -prose i po najstranijoj hladnoæi i, ako nita ne sakupe, sigurno ih èekaju -batine. - -Kad nakupi neto kopejki, malian se pomodrelih i skoèanjenih ruku vraæa u -neki æumez, gde pijanèi banda neradnika, od onih koji >>poèinju trajk u -fabrici u subotu i ne vraæaju se na posao pre srede uveèe<<. Tamo, u æumezima -podruma, s njima pijanèe njihove gladne i istuèene ene, tamo pite njihova -gladna mala deca. Votka, prljavtina i razvrat, ali glavno je votka. - -Maliana sa isproenim kopejkama odmah alju u krèmu, i on donosi jo piæa. -Radi zabave i njemu ponekad naliju u usta èokanj votke i kikoæu se kad on, -gubeæi dah, pada na pod, gotovo bez svesti, - -\begin{verse} ->>i u usta mi je votku odvratnu \\ -nemilosrdno sipao \dots{} << -\end{verse} - -Kad poodraste, to pre mogu gurnu ga nekud u fabriku, ali sve to zaradi, i -dalje je duan donositi neradnicima, a oni opet to propiju. Ali i pre no to -stupe u fabriku, oav deca postaju pravi prestupnici. Ona skitaju po gradu i -znaju u podrumima takva mesta kroz koja se moe proæi i gde se moe neprimetno -prenoæiti. Jedan od njih je spavao nekoliko noæi uzastopno u korpi kod nekog -vratara koji ga nije primetio. - -Oni, naravno, postaju i sitni lopovi. Kraða postaje strast èak kod osmogodinje -dece, koja ponekad nisu svesna svojih prestupa. Na kraju podnose sve --- glad, -hladnoæu, batine --- samo radi slobode, i bee od svojih neradnika da skitaju -po svojoj volji. Ponekad to divlje stvorenje nita ne shvata, ni gde ivi, ni -koje je narodnosti, ima li boga, postoji li car; prièaju o njima èak takve stvari, -da èovek ne veruje svojim uima, a, meðutim, to su èinjenice. - -\chapter[Dva]{} - -Ali ja sam romansijer i èini mi se da sam jednu >>prièu<< sam izmislio. Zato -piem >>èini mi se<<, kada sigurno znam da sam je izmislio, ali meni izgleda da se -to negde i nekada desilo i da se desilo upravo uoèi Boiæa u \em nekom \em ogromnom -gradu i po stranoj hladnoæi. Prièinjava mi se da je iveo u podrumu malian, ali -jo sasvim mali, kome je jedno est godina ili jo manje. Taj malian se probudio -jednog jutra u vlanom i hladnom suterenu. Bio je odeven u nekakav kaputiæ i -drhtao je. Dah mu je izletao kao bela para, i, sedeæi u kutu na nekom sanduku, -iz dosade je hotimièno putao tu paru iz usta i zabavljao se gledajuæi kako -izlazi. - -Bio je veoma gladan. Nekoliko puta od zore prilazio je drvenom leaju, gde je -na prostirci i sa nekakvim zaveljajem pod glavom leala bolesna njegova majka. - -Kako se ona ovde nala? - -Mora da je doputovala sa svojim malianom iz drugog grada i razbolela se -iznenada. Vlasnicu prenoæita su jo pre dva dana ovdeli u policiju. Stanari -su se razili uoèi praznika --- a jedini koji je ostao, leao je veæ dan -i noæ mrtav pijan --- i nije mogao doèekati praznik! - -U dugom uglu sobe jeèala je neka osamdesetogodinja starica koja je nekada -i negde ivela kao dadilja, a sada je umirala samotna, jauèuæi i gunðajuæi -malianu, tako da se veæ poèeo bojati da priðe njenoj postelji u uglu. - -Vode da se napije naao je negde u hodniku, ali korice hleba nigde nije -naao, i veæ je deseti put prilazio da probudi svoju mamu. Strano mu je, -najzad, bilo u mraku: odavno je veæ pao mrak, a lampu nisu upalili. - -Opipao je mamino lice i zaèudio se to se ona uopte ne mièe i to je -hladna kao zid. - ->>Mnogo je ovde hladno<<, pomislio je, postojao malo, i nesvesno zaboravivi -svoju ruku na ramenu pokojnice. Zatim je dunuo u svoje prstiæe da ih ogreje i, -odjednom, napipavi na leaju svoju staru kapu, pa polako, pipajuæi po mraku, -izaao iz suterena. On bi i ranije poao, ali se stalno bojao nekog velikog -psa koji je, gore, na stepenicama, ceo dan zavijao pred susednim vratima. -Ali psa sada nije bilo, i malian je odjednom izaao na ulicu. - -Gospode Boe, kakav grad! Nikada tako neto nije video. Tamo, odakle -je doao, noæu je crna pomraèina --- jedan fenjer na celu ulicu. Prozori -niskih, drvenih kuæica zatvaraju se kapcima; na ulici, èim se smrkne, -nigde nikoga --- svi se zatvaraju po kuæama, i samo zavijaju èitavi -èopori pasa, stotine i hiljade ih zavijaju i laju svu noæ. - -Ali je zato tamo bilo tako toplo, i davali su mu da jede, a ovde --- ah, -Gospode, da mu je sad da jede\ece I kakva je ovde vreva i tutnjava, kakva -svetlost, i ljudi, i koèije, i zima, i mraz! - -Ledena para dizala se od premorenih konja, iz njihovih zadihanih vrelih -njuki; kroz sipkav sneg odzvanjaju o kamenje potkovice, i svi se tako -guraju, i, boe \dots{} tako mu je se jelo, makar neki komadiæ hleba, i -tako mu je odjednom hladno za prstiæe. Pored njega je proao èuvar reda, -ali se okrenuo da ne vidi maliana. - -Evo opet jedna ulica --- oh, kako je iroka! Ovde æe me sigurno pregaziti! -I kako svi vièu, trèe i jure koèijama, a svetlosti, koliko svetlosti! - -A ta je ovo? Uh, kakvo veliko staklo, a iza stakla soba, a u sobi neko -drvo do tavanice. To je jelka, a na jelki koliko sveæica, koliko zlatnih -hartijica i jabuka, a svuda oko nje lutkice i mali konjiæi; po sobi trèe -deca, lepo odevena, èista, smeju se i igraju se, i neto jedu i piju. - -Eno, ona devojèica poèela je da se igra sa deèakom --- kako je lepa -devojèica! Evo, i muzika se èuje kroz prozor. - -Malian gleda, èudi se, veæ se i smeje, ali sad ga bole prstiæi i na -noicama, a na ruèicama su mu veæ sasvim pomodreli, veæ ne mogu da se -savijaju, i bole ga kad mièe s njima. I odjednom malian oseti da ga mnogo -bole prstiæi, zaplaka se i potrèa dalje \dots{} i, evo, ponovo je video -kroz drugo staklo sobu, i tamo je drveæe, a na stolovima razni kolaèi: -od badema, crveni, uti, i sede tamo èetiri bogate gospoðe, pa ko -doðe, one mu daju kolaèa, a vrata se otvaraju svaki èas, sa ulice ulazi -mnogo gospode. - -Malian se prikrade brzo, otvori vrata i uðe \dots{} Uh, kako su poèeli da vièu -na njega i da mau rukama! Jedna gospoða brzo mu je prila i tutnula -u ruku kopejku, pa mu je otvorila vrata --- na ulicu! Kako se uplaio! -A kopejka mu je odmah ispala i zveèeæi otkotrljala se po stepenicama: -nije mogao da savije svoje pomodrele prstiæe i da pridri kopejku. - -Istrèao je malian na ulicu i poao bre i bre, a kuda --- ni sam nije -znao \dots{} Opet bi se zaplakao, ali se bojao, i trèao je, trèao i hukao u -ruèice. Obuzimala ga je tuga, jer se najednom osetio tako usamljen, -i bilo mu je uasno \dots{} odjednom \dots{} o, boe! ta je ovo opet? Stoji -masa ljudi i divi se --- iza stakla prozorskog bile su tri lutke, male, -odevene u crvene i zelene haljinice, kao da su ive! Neki starèiæ sedi, -i kao da svira u violinu, jo druga dva takoðe stoje tu, sviraju u male -violinice, i po taktu mau glavama, jedan u drugoga gledaju, a usne im se -mièu, govore, stvarno govore --- samo se zbog stakla nita ne èuje. - -\par\fancybreak{\ding{71}\quad \ding{71}\quad \ding{71}}\par - -Malian je u prvi mah pomislio da su oni ivi, a kad se dosetio da su to -lutke --- iznenada se nasmejao. Nikad nije video takve lutke, i nije -znao ni da postoje! I hteo bi da zaplaèe, ali su mu te lutkice tako -smene. - -Odjednom mu se uèini da ga je neko otpozadi zgrabio za kaputiæ: veliki i -zao deèak stajao je pored njega, i iznenada ga je udario po glavi, zbacio -mu kapu, i udario ga nogom ispod kolena. Malian se prevrnuo na zemlju; -tada ljudi povikae, on pretrnu od straha, skoèi i poèe beati, beati, i -odjednom je utrèao --- ni sam nezna gde --- ispod neke kapije, u tuðe -dvorite --- i èuènuo iza naslaganih drva: >>Ovde me neæe naèi, a i mrak je.<< - -Èuènuo je i zgurio se, a nikako nije mogao da odahne od straha, i odjednom, -sasvim iznenada, bilo mu je tako prijatno: ruèice i noice su najednom -prestale da ga bole i bilo mu je tako toplo, kao na peæi\ece Trgao se i sav -uzdrhtao: ah, on je to ovde bio zaspao! Kako je dobro tu spavati! - ->>Posedeæu ovde, pa æu opet poæi da pogledam one lutke<<, pomislio je malian -i osmehnuo se kada se setio lutaka, >>stvarno kao da su ive!<< \dots{} I -odjednom mu se prièulo da je nad njim njegova mama zapevala pesmicu. >>Mama, -ja spavam, ah, kako je ovde lepo spavati!<< - ---- Hajdemo k meni, maliane, da kitimo jelku --- proaputao je nad njim -odjednom neko tihim glasom. - -Pomislio je da je i to govorila njegova mama, ali ne, nije ona; ko ga je to zvao -on nije video, ali neko se sagnuo prema njemu, zagrlio ga u tami, a on mu je -pruio ruku i\,\dots{}i odjednom\,\dots{}o, kakva svetlost! O, kakva jelka! Kao -da i nije jelka --- on jo takvog drveta video nije! Gde je on to sad: sve blista, -sve se sija, a svuda oko njega lutke --- ali ne, to su sve deèaci i devojèice, samo -tako sjajni, svi se oni viju oko njega, lete, svi ga ljube, uzimaju ga, nose sa sobom, -i on sam leti, i vidi: gleda ga njegova mama, i smeje mu se radosno. - ---- Mama! Mama! Ah, kako je lepo ovde, mama! --- dovikuje joj malian, i opet -se ljubi da decom, i eli da im to pre isprièa o onim lutkicama iza stakla. ---- Ko ste vi, deèaci? Ko ste vi, devojèice? --- pita ih on, smeeæi se i -ljubeæi ih. - ---- Ovo je Hristova jelka --- odgovaraju mu oni. --- Kod Hrista je uvek na ovaj -dan jelka za malu decu koja tamo dole nemaju svoje jelke \dots{} - -I doznao je da su svi ovi deèaci i devojèice bili isto takva deca kao i -on --- ali jedni su se posmrzavali jo u svojim kotaricama, u kojima -su ih ostavili na stepenitima pred vratima petrogradskih èinovnika druga -su se uguila kod èuhonki\footnote[1]{Pogrdan naziv za Fince.} dojkinja --- koje -je iznajmio dom za siroèad; treæa su umrla na sasuenim grudima svojih majki -(za vreme samarske gladne godine), èetvrta su se poguila od smrada u vagonima -treæe klase --- i svi su oni sada ovde, sva su ona kao anðeli, sva su kod Hrista, -i On je lièno meðu njima, i prua im ruke, i blagosilja njih i njihove majke -grenice \dots{} - -A majke ove dece stoje tu, sa strane, i plaèu svaka poznaje svog deèaka ili -devojèicu, a oni doleæu i ljube ih, utiru im suze svojim ruèicama i mole -ih da ne plaèu, jer je njima ovde tako lepo \dots{} - -A vratari su ujutru nali dole iza sloenih drva mali le zalutalog -i smrznutog deèaka\,\dots{}Pronali su i njegovu majku\,\dots{}Ona je -jo pre njega umrla --- sreli su se kod Gospoda na nebu. - -A zato sam izmislio ovakvu prièu, koja ne ide u obièni dnevnik, i to -pièev? A obeæao sam prièe preteno o stvarnim dogaðajima! Ali u tome -i jeste stvar to se meni stalno èini da se sve ovo stvarno moglo -desiti --- naime, ono to se odigralo u podrumu i iza sloenih drva; -a ono o jelci Hristovoj --- to ne znam ta da vam kaem, da li se moglo -desiti ili nije. Ali ja sam zato romansijer da izmiljam. - -\book{SELJAK MAREJ} -%\pdfbookmark{}{}{} - -\pagestyle{plain} -\makeevenhead{plain}{\thepage}{\scriptsize{F.~M.~DOSTOJEVSKI}}{} -\makeoddhead{plain}{}{\scriptsize{SELJAK MAREJ}}{\thepage} -\makeevenfoot{plain}{}{}{} -\makeoddfoot{plain}{}{}{} -\aliaspagestyle{chapter}{empty} - -\thispagestyle{empty} -\vspace*{4\onelineskip} -\begin{flushright} -\begin{minipage}{8.5cm} ->>U ruskom \v{c}oveku iz naroda treba umeti odvojiti njegovu lepotu od -primitivizma koji mu je svojstven. Zbog uslova gotovo cele ruske istorije, na -narod se toliko predavao razvratu i toliko su ga razvraæivali, sablanjavali i -stalno muèili da je èudno kako je preiveo i saèuvao ljudski lik, a pogotovo -to je oèuvao lepotu ljudsku. Ali on je saèuvao lepotu ljudskog lika. Ko je -pravi prijatelj naroda, kome je bar jednom kucalo srce zbog narodnih patnji, -shvatiæe i opravdaæe sve neprohodno blato u koje je utonuo na narod i umeæe -da pronaðe u tom blatu brilijante. Ponavljam: ne sudite o ruskom narodu po onim -gadostima koje on tako èesto èini, veæ po onimm velikim i svetlim idealima za -kojima on i u svojoj gadosti stalno èezne i uzdie \dots{} A ideali su njegovi -moæni i svetli, oni su ga i spasli u vekovima muèenja; oni su oduvek srasli -sa njegovom duom o zauvek mu darivali dobrodunost i potenje, iskrenost i -iroki, sveobuhvani um, i sve to u najprivlaènijem i harmoniènom jedinstvu.<< -\end{minipage} -\end{flushright} - -Ali mislim da je veoma dosadno èitati sve ove professions de foi, zato æu -da isprièam jednu prièu, zapravo i ne prièu, veæ jedan dalek spomen, koji -zbog neèeg veoma elim da isprièam upravo ovde i sada, na kraju mojeg -traktata o narodu. - -Bio je drugi dan uskrsa. Vazduh je bio topao, nebo plavo, sunce visoko, ->>toplo<<, jarko, ali u mojoj dui je bilo veoma mraèno. Lutao sam iza robijakih -kazamata, gledao i prebrojavao kolje jakog tamnièkig palisada, ali nisam ni hteo -da ih brojim, iako mi je to veæ bila navika. Veæ drugi dan se u tamnici slavi -praznik. Robijae ne izvode na rad, pijanih je bilo mnogo, èule su se psovke, -a svaðe izbijale svaki èas i na sve strane. - -Rune, odvratne pesme, kockarske grupe koje su igrale karata ispod tamnièkih -kreveta, nekoliko robijaa koje su drugovi po svojoj odluci isprebijali -na mrtvo ime zbog naroèitih skandala, lealo je na drvenim leajima, -pokriveno kousima, dok se ne osveste i ne povrate u ivot veæ nekoliko puta -su potezali noeve iz kanija --- sve me je to za ova dva dana praznika tako -iskidalo da sam bio prosto bolestan. Jer ja nikada nisam mogao bez gaðenja -da podnosim pijanu narodnu terevenku, a pogotovu ovde, na ovom mestu. - -Ovih dana èak ni stareine nisu zavirivale u tamnicu, nisu vrili pretrese, -nisu traili piæe, shvatajuæi da, ipak, treba dati èak i ovim odbaèenim -ljudima da se malo provedu, makar jedanput u godini, jer bi inaèe bilo gore. - -Najzad, u mom srcu planu gnev. Sreo sam Poljaka M--ckog, politièkog -osuðenika. Pogledao me je smrknuto, oèi mu sevnue, a usne zadrhtae. - -Je hais ces brigands!\footnote[1]{Mrzim ove razbojnike!} --- rekao je poluglasno i -kripeæi zubima, kad je prolazio pored mene. - -Vratio sam se u kazamat, mada sam pre èetvrt sata izleteo otud kao lud, kada -je est snanih seljaka slono navalilo na pijanog Tatarina Gazina da ga umire, -i poèelo da ga tuèe. Tukli su ga strano. Kamilu bi èovek mogao takvim batinama -ubiti; ali oni su znali da je ovog herkula teko ubiti, zato su ga bezobzirno -tukli. - -Kada sam se vratio, ugledao sam na kraju sobe, na drvenim leajima u uglu, -veæ onesveæenog Gazina, gotovo bez ikakvih znakova ivota. Leao je pokriven -kouhom, i svi su ga zaobilazili æutke, mada su se pouzdano nadali da æe -se do ujutru osvestiti, >>ali, ko zna, posle ovakvih batina moe èovek i da -umre<<. Provukao sam se do svog mesta prema prozoru sa gvozdenom reetkom, -legao na leða, zabacio ruke pod glavu i zamurio. Voleo sam tako da leim: jer -onog ko spava ne diraju, a pored toga mogu da sanjarim i mislim. Ali sada mi se -nije sanjarilo: srce mi je kucalo nemirno, a u uima su mi odjekivale reèi -M--ckog: >>Mrzim te razbojnike!<< - -Uostalom, to da opisujem utiske; ja i sada ponekad sanjam noæu to vreme, i -nemam teih snova. Moda æe èitaoci i to primetiti da ja do danas gotovo -nijednom nisam javno govorio o svom ivotu na robiji; a \em Zapise iz mrvog -doma \em napisao sam pre petnaest godina, kao izmiljeno lice --- zloèinac -koji je ubio svoju enu. Uzgred da dodam pojedinost da od tada o meni mnogi -misle, èak to jo i danas tvrde, da sam ja bio osuðen na robiju zato to -sam ubio svoju enu. - -Malo--pomalo sam se stvarno zaneo i neprimetno utonuo u uspomene. Za sve èetiri -godine moje robije neprestano sam se seæao svoje prolosti, i èini mi se preko -uspomena ponovo proiveo sav svoj raniji ivot. Uspomene su same iskrsavale, -retko sam ih hotimièno izazivao. To je obièno poèinjalo od neke sitnice, -ponekad beznaèajne, a zatim bi, malo--pomalo, izraslo u kompletnu sliku, -u snaan i celovit utisak. - -Analizao sam te utiske, dodavao nove crte onome to sam veæ odavno proiveo, i, -to je najvanije, popravljao sam ga, neprestano popravljao --- u tome je i bila -sva moja zabava. - -Ovoga puta sam se neoèekivano setio jednog gotovo beznaèajnog trenutka -iz mog ranog detinjstva, kad mi je bilo svega devet godina --- trenutka -koji sam, izgleda, bio potpuno zaboravio, ali ja sam tada naroèito -voleo uspomene iz svog najranijeg detinjstva. - -Setio sam se avgusta u naem selu: dan suv i vedar, ali malo sveiji -i vetrovit; leto je bilo na izmaku, i trebalo je uskoro putovati u Moskvu, i -opet se dosaðivati cele zime na èasovima francuskog jezika, zato mi je -tako teko i bilo da napustim selo. Izaao sam u polje iza gumana, spustio -se u jarugu i popeo do Loska --- tako smo mi zvali gusti èestar, sa -one strane jaruge, pored same ume. - -I tako sam zaao dublje u bunje i odjednom èujem kako nedaleko, na tridesetak -koraka, na poljani, ore inokosan seljak. Znao sam da ore uzbrdo i da konj ide -teko, zato do mene s vremena na vreme dopiru njegovi povici >>De, de!<< - -Ja poznajem gotovo sve nae seljake, ali ne znam ko je ovaj to sada ore, a i -svejedno mi je: sav sam se udubio u svoj posao i zauzet sam: lomim sebi leskov -prut da njime ibam abe. Leskovo pruæe je tako lepo i tako neizdrivo --- ni -blizu kao brezovo. Zanimaju me i bube i guteri, ja ih kupim --- ima ih vrlo -arenih i lepih; volim i male, hitre crveno--ute guterice sa crnim pegicama, -a zmija se bojim. Uostalom, na zmije nailazim mnogo reðe nego ona gutere. - -Peèurki ovde ima malo; po njih treba iæi u brezovu umicu, i ja sam spreman -da odem tamo. Nita u ivotu nisam tako voleo kao umu, sa njenim peèurkama -ijagodama, sa njenim bubicama i ptièicama, jeiæima i vevericama, sa njenim -vlanim mirisom istrulelog liæa, koji sam tako voleo. - -Èak i sada, kada ovo piem, tako sam osetio miris nae seoske brezove umice: -ti utisci ostaju èoveku za ceo vek \dots - -Odjednom, usred duboke tiine, jasno i razgovetno èuo sam uzvik: >>Eno vuka, -juri!<< Vrisnuo sam i van sebe od straha, plaèuæi na sav glas, istrèao na -poljanu, pravo na seljaka koji je orao. - -To je bio na seljak, Marej. Ne znam postoji li takvo ime, ali njega su svi -zvali Marej. To je bio seljak od pedesetak godina, jedar, povisok, jako -prosede tamnosmeðe guste brade. Ja sam ga poznavao, ali pre toga skoro nikad -nisam imao prilike da razgovaram sa njim. On je zausavio svoju kobilicu, -kad je èuo moj vrisak, i kad sam se, trèeæi, grèevito uhvatio jednom rukom -za ralo, a drugom za njegov rukav, video je koliko sam se uplaio. - ---- Eno, vuk juri! --- viknuo sam, jedva diuæi. - -On die glavu i nehotice pogleda oko sebe, skoro verujuæi mojim reèima za -trenutak. - ---- Gde je vuk? - ---- Viknuo je\,\dots{} neko je malopre viknuo: >>Eno juri vuk<<\,\dots{} -protepao sam. - ---- ta je tebi, dete, kakav vuk, uèinilo ti se! Otkud ovde vuk! --- mrmljao -je, umirujuæi me. - -A ja sam sav drhtao i jo grèevitije sam se uhvatio za njegov gunj, i mora da -sam bio veoma bled. On me je gledao sa brinim osmehom, oèevidno uznemiren i -uplaen zbog mene. - ---- Gle, kako se uplaio, ah, ah! --- mahao je glavom. --- Ne boj se, rode -moj! Gle ti njega! - -Pruio je ruku i odjednom me pomilovao po obrazu. - ---- De, ne boj se, bog s tobom, prekrsti se. - -Ali ja se nisam prekrstio. Kutovi mojih usana su podrhtavali, i to ga je, -izgleda, naroèito dirnulo. Pruio je polako svoj krupni prst, sa crnim noktom, -pranjav od zemlje, i neno dotakao moje uzdrhtale usne. - ---- Gle ti njega! --- osmehnuo mi se nekim materinskim i dugim osmehom. ---- O, boe, ta ti je dete, ah, ah! - -Shvatio sam, najzad, da vuka nema, i da mi se uzvik >>Eno vuk juri<< --- samo -prièuo. Uzvik je, istina, bio sasvim jasan i razgovetan, ali meni se i ranije -jednom ili dva puta prièinjavalo da èujem tavke povike (i ne samo o vucima), i -ja sam to znao. (Kasnije, kada sam odrastao, te halucinacije su nestale.) - ---- Pa da ja idem --- rekao sam, gledajuæi ga upitno i bojaljivo. - ---- Idi, slobodno idi, a ja æu da gledam za tobom. Ne dam ja tebe vuku! --- dodao -je i jo uvek mi se materinski smeio --- hajde, bog te èuvao, idi slobodno --- i -on me prekrsti rukom, a zatim se i sam prekrsti. - -Poao sam, osvræuæi se nazad skoro svakih deset koraka, a Marej je, neprestano -stajao sa svojom kobilicom i gledao za mnom dok sam ja iao, i svaki put mi -je mahao kad sam se osvrtao. Priznajem, malko me je bilo stid pred njim to -sam se onako uplaio, ali sam iao, pribojavajuæi se jo uvek vuka, dok se nisam -popeo na padinu jaruge, do prve suare za snoplje. Tek tu me je strah sasvim -proao, i odjednom odnekud ispade i pojuri prema meni na domaæi pas Vuèiæ. - -Pored Vuèiæa sam se veæ sasvim ohrabrio i poslednji put osvrnuo prema Mareju. -Lice mu sad veæ nisam mogao da vidim jasno, ali sam oseæao da mi se on jo -uvek onako umiljato smei i mae mi glavom. Mahnuo sam mu rukom, mahnu i on -meni i krenu svoju kobilicu. - ---- De, de! --- zaèu se njegov udaljeni povik, i kobilica opet povuèe svoje ralo. - -\par\fancybreak{\ding{71}\quad \ding{71}\quad \ding{71}}\par - -Svega sam se toga odjednom setio, ne znam zato, ali sa èudnom preciznoæu -do najmanje pojedinosti. Odjednom sam se prenuo i seo u krevetu i, seæam se, -jo sam oseæao na svom licu blagi osmeh uspomena. Jo nekoliko trenutaka -sam se priseæao. - -Kada sam tada od Mareja doao kuæi, nikome nisam prièao o svom doivljaju. -A zar je to i bio neki doivljaj? Pa i Mareja sam vrlo brzo zaboravio. -Kad sam ga kasnije ponekad sretao, nikad nisam èak poèinjao razgovor s njim, -ne samo o vuku, nego ni o èemu drugom, i eto, odjednom, tek sada u Sibiru, -posle dvadeset godina, setio sam se celog susreta tako jasno, do poslednje -sitnice. Znaèi, ostao mi je u dui, neprimetno, samo po sebi, bez moje -volje, i odjednom iskrsnuo u seæanju kad je trebalo. - -Setio sam se onog nenog, materinskog osmeha jadnog seljaka\,--\,kmeta; kako me -je prekrstio i mahao mi glavom: >>Gle, kako se uplailo dete!<< I naroèito -onog njegovog debelog prsta, pranjavog od zemlje, kojim se mirno i sa -bojaljivom nenoæu doticao mojih uzdrhtalih usana. - -Naravno, svako bi ohrabrio uplaeno dete, ali u ovom susretu bez svedoka -desilo se neto sasvim drugo --- da sam mu bio roðeni sin, ne bi me mogao -pogledati sa iskrenijom ljubavlju koja je zraèila iz njegovih oèiju --- a -ko ga je primoravao na to? - -On je bio na kmet--seljak --- a ja ipak sin njegovog gospodara. Niko ne -bi doznao kako me je neno prigrlio, niti bi mu za to rekao hvala. Moda -je on uopte voleo decu? Ima takvih seljaka. - -Na susret je bio bez svedoka, na pustoj njivi, i samo je, valjda, bog -odozgo video kakvim dubokim i ozarenim, èoveènim oseæanjem i kakvom -suptilnom, gotovo enskom nenoæu moe da bude ispunjeno srce ponekog -grubog, do animalnosti zaostalog ruskog seljaka--kmeta, koji tada nije -ni sanjao o svojoj slobodi.\footnote[2]{Ruski seljaci su dobili slobodu -i deo zemlje spahijske 1861. god. manifestom cara Aleksandra II. (\textit{nap. prev.)}} -Nije li na to mislio, i to podrazumevao Konstantin Aksakov, koji je govorio -o visokom obrazovanju naeg naroda\que - -I tako, kad sam siao sa drvenog robijakog leaja i osvrnuo se oko -sebe, seæam se, odjednom sam osetio da mogu gledati na ove nesreænike -oko mene sasvim drugim oèima i da je odjednom, kao nekim èudom, sasvim -nestalo svake mrnje i gneva u srcu mom. - -Poao sam, zagledajuæi se u lica koja sam sretao. Taj seljak obrijane -glave, vekovima sramoæen, sa igovima na licu i pijan, koji se derao -pevajuæi svoju pijanu promuklu pesmu --- to je moda onaj isti Marej: -jer ja mu ne mogu zaviriti u duu- - -Sreo sam te iste veèeri jo jednom i Poljaka M--ckog. Jadnik! On nije -mogao imati uspomena ni o kakvim Marejima, ni nekog drugog pogleda na -ljude, osim svoga: >>Je hais ces brigands<<! - -Ali ti Poljaci su tada prepatili mnogo vie muka nego mi! - -\book{KROTKA} -%\pdfbookmark{}{}{} - -\pagestyle{plain} -\makeevenhead{plain}{}{}{} -\makeoddhead{plain}{}{}{} -\makeevenfoot{plain}{}{}{} -\makeoddfoot{plain}{}{}{} -\part{} - -\chapter*{Od autora} - -\small -Molim sve moje èitaoce da mi oproste to umesto Dnevnika, u obiènom njegovom -obliku pruam samo pripovetku. Ali sam skoro mesec dana bio zauzet samo ovom -pripovetkom. U svakom sluèaju, molim èitaoce da mi ne zamere. - -Sada o samoj prièi. Nazvao sam je >>fanastiènom<<, premda je sam smatram vrlo -realnom. Ali i fantastiènog tu zbilja ima, i to u samom obliku prièe, to -smatram da treba najpre da objasnim. - -Stvar je u tome to ovo nije ni prièa ni zapis. Zamislite mua èija ena, -samoubica, lei sada na stolu, jer se pre nekoliko èasova bacila sa -prozora. Zbunjen, on jo nije stigao da pribere svoje misli. Ide po sobama -i trudi se da d\^{a} smisla onome to se dogodilo, >>da sakupi svoje misli -u taèku<<. Osim toga, on je okoreli hipohondar, od onih to razgovaraju -sami sa sobom. Evo ga i sad gde razgovara sa samim sobom, preprièava stvar, -ulazi u njenu sutinu. Bez obzira na prividno logièan red reèi, on protivureèi -sebi nekoliko puta, i u logici i u oseæanjima. I opravdava se i okrivljuje u -isti mah, i uputa se u sporedna objanjanja: tu je i grubost misli i srca, -i duboko oseæanje. Malo -- pomalo, on zbilja ulazi u sutinu stvari i skuplja ->>misli u taèku<<. Niz probuðenih seæanja neodoljivo ga, najzad, pribliuje -istini: istina neodoljivo uzdie njegov um i srce. Pri kraju se ton prièe -neto menja, te biva nesreðen kao u poèetku. Istina se sasvim jasno i odreðeno -otkriva nesreæniku, bar njemu. - -To je tema. Prirodno, razvoj prièe se produuje nekoliko èasova, s prekidima -i umetanjem, i u obliku raznolikom: mu èas razgovara sa samim sobom, èas -kao da se obraæa nekom nevidljivom sluaocu, nekom sudiji. U stvari, -to uvek tako i biva. Kada bi to stenograf mogao èuti i sve redom zapisati, -bilo bi malo neuglaðenije i neobraðenije nego to sam ja naveo, ali, kako se -meni èini, psiholoki red moda bi osao sasvim isti. Eto ta pretpostavka -da stenograf sve zapie (posle èega bih ja obradio pozadinu) i jeste ono -to ja u ovoj prièi nazivam fantastiènim. Slièno ovom veæ se dogaðalo -u umetnosti Viktor Igo je, na primer, u svom remek--delu \em Poslednji dan -na smrt osuðenoga \em upotrebio skoro isti takav naèin, iako ne pomoæu -stenografa; on je sebi dozvolio jo veæu neverovatnost, pretpostavio je -da osuðeni na smrt moe (i ima kad) da vodi dnevnik ne samo poslednjeg -svog dana nego, èak, i poslednjeg èasa i, bukvalno, poslednjeg trenutka. -Ali da nije bilo te fantazije, ne bi bilo ni samog dela --- najrealistiènijeg -i najistinitijeg dela od svih koje je napisao. - -\pagestyle{plain} -\makeevenhead{plain}{\thepage}{\scriptsize{F.~M.~DOSTOJEVSKI}}{} -\makeoddhead{plain}{}{\scriptsize{KROTKA}}{\thepage} -\makeevenfoot{plain}{}{}{} -\makeoddfoot{plain}{}{}{} -\aliaspagestyle{chapter}{empty} - -\setcounter{chapter}{0} -\chapter{Ko sam bio ja, a ko ona} - -\normalsize -Dok je ona ovde --- jo je sve dobro: prilazim i gledam je svaki èas; ali kad je -sutra odnesu --- ta æu ja sam! Sada je u gostinskog sobi, na stolu sastavljenom -od dva mala, a sanduk æe doneti sutra, beli sa belim brokatom \dots{} uostalom, -nisam to hteo \dots{} Stalno etam i hoæu to da shvatim. Veæ je, evo, est -èasova kako pokuavam da sve to shvatim i nikako ne mogu da saberem misli u -taèku. Stvar je u tome to jednako etam, etam, etam \dots{} Bilo je ovako. -Isprièaæu sve redom. (Red!) Gospodo, ja nisam nikakav literat, vi to i sami -vidite, ali neka, isprièaæu kako ja razumem. U tome i jeste sav moj uas, to -sve razumem! - -\end{document} Binary files old/doc/latex/fjodor/fjodor.pdf and new/doc/latex/fjodor/fjodor.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/fjodor.tex new/doc/latex/fjodor/fjodor.tex --- old/doc/latex/fjodor/fjodor.tex 2010-10-27 01:31:49.000000000 +0200 +++ new/doc/latex/fjodor/fjodor.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ - -\documentclass[a4paper,12pt]{article} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -\usepackage{lmodern} - -\title{The \textsf{fjodor} package\protect\footnote{This package -is dedicated of the glory work of russian writers Fjodor Mihajlovi\v{c} Dostojevski.}} -\author{Zoran T. Filipovi\'{c} \\ - Jurija Gagarina 263/6 \\ - 11070 Novi Beograd, Srbija} - -\usepackage[english,serbian]{babel} -\def\dateserbian{% - \def\today{\number\day .~\ifcase\month\or - januar\or februar\or mart\or april\or maj\or - jun\or jul\or avgust\or septembar\or oktobar\or - novembar\or decembar\fi \space \number\year.}} - -\begin{document} -\frenchspacing -\maketitle -\selectlanguage{english} -\begin{abstract} -This package produce a very nice layout and typeout for a small books. Working -under a \verb|memoir| documentclass. Package contains several options and name -of options is same name of writers of this books. -\end{abstract} - -\section{Put it!} - -If you want to yous this package just put it the following line in your preambula: -\verb|\usepackage[options]{fjodor}| and push your machine. - -\subsection{Options} - -This package contains several options which is describle this. - -\begin{description} -\item[fjodor] which i dadicated in Fjodor Mihailovi\v{c} Dostojevski produce layout in \verb|\pagemlargecrownvo| typeout in 9.5$\times$15.5\,cm whith 1.5\,cm spine margins -and 2.5\,cm upper margins. Usefull for 10pt font size. -\item[katajev] which i dadicated in Pavel Valentinovi\v{c} Katajev produce layout in -17.5$\times$11.7\,cm, typeout in 9.1$\times$14.3\,cm whidth 1.3\,cm spine and upper margin. -Total number of text lines is 34. -\item[hese] which i dadicated to Hermann Hesse produce layout in 19.8$\times$14\,cm -typeout in 9.8$\times$14.3\,cm whidth 1.75\,cm spine margin and 2.1\,cm upper margin. -Total number of text lines is 34. -\item[puskin] which i dadicated to Pu\v{s}kin produce layout in 19.8$\times$14\,cm -typeout in 9.9$\times$15.2\,cm whidth 2\,cm spine margin and 2.5\,cm uper margin. -\item[ernest] which i dadicated to Ernest Hemingway produce layout in 19$\times$12\,cm -typeout in 9$\times$14.5\,cm whidth 1.3\,cm spine margin and 1.7\,cm upper margin. -Total number of text lines is 35. -\item[viktor] which i dadicated to Viktor Jorofejev produce layout in 19$\times$12\,cm -typeout in 9.4$\times$15.04\,cm whidth 1\,cm spine margin and 1.4\,cm upper margin. -Total number of text lines is 36. -\item[remark] which i dadicated to Erich Maria Remarque produce layout in 19.5$\times$13.5\,cm -typeout in 9.9$\times$15.4\,cm whidth 1.3\,cm spine margin and 1.5\,cm upper margin. -Total number of text lines is 37. -\item[tehnicar] which i dadicated to small technical book, which was printing on Mechanical Faculity of Belgrade, produce layout in 20$\times$14\,cm -typeout in 10$\times$16\,cm whidth 1.5\,cm spine margin and 1.7\,cm upper margin. -Total number of text lines is 46. Usefull for small tehnical book in 9pt font size. -\item[ulro] which i dadicated in \v{C}eslav Milo\v{s}, book ZEMLJA ULRO, -produce layout in 20$\times$14\,cm typeout in 9.8$\times$15.2\,cm whidth 2\,cm spine -margin and 2\,cm upper margin. Total number of text lines is 37. Usefull for book in 10pt -font size. -\item[aristotel] which i dadicated to greek philosophist Aristotel, book FIZIKA, -produce layout in 20.8$\times$13.7\,cm typeout in 8.1$\times$16.7\,cm whidth 2.7\,cm spine -margin and 2\,cm upper margin. Total number of text lines is 40. Usefull for book in 10pt -font size. -\item[jaeger] which i dadicated to Charles Jaeger, book Th\'{e}orie G\'{e}n\'{e}rale du Coup -De B\'{e}lier, produce layout in 24.1$\times$15.6\,cm typeout in 10.4$\times$16.9\,cm -whidth 2.3\,cm spine margin and 3\,cm upper margin. Total number of text lines is 41 for 10pt -font size. -\item[tesla] which i dadicated to Nikola Tesla, book Colorado Springs Notes 1899---1900, -produce layout in 27.7$\times$20.5\,cm typeout in 13.5$\times$21\,cm whidth 2.6\,cm spine -margin and 2.6\,cm upper margin. Total number of text lines is 41 for 11pt font size. -\end{description} - -\end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/srbook-mem.sty new/doc/latex/fjodor/srbook-mem.sty --- old/doc/latex/fjodor/srbook-mem.sty 2010-09-09 20:21:23.000000000 +0200 +++ new/doc/latex/fjodor/srbook-mem.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ - -\ProvidesPackage{srbook-mem} - -\def\bookname{Knjiga} -\renewcommand*{\thebook}{\ifcase\value{book}\or Prva\or Druga\or - Tre\'{c}a\or \v{C}evrta\or Peta\or \v{S}esta\or Sedma\or Osma\or - Deveta\or Deseta -\fi\space} - -\renewcommand*{\thepart}{\ifcase\value{part}\or Prvi\or Drugi\or - Tre\'{c}i\or \v{C}evrti\or Peti\or \v{S}esti\or Sedmi\or Osmi\or - Deveti\or Deseti\or Jedanaesti\or Dvanaesti\or Trinaesti\or - \v{C}etrnaesti\or Petnaesti\or \v{S}esnaesti\or Sedamnaesti\or - Osamnaesti\or Devetnaesti\or Dvadeseti -\fi\space} - -\renewcommand*{\thechapter}{\ifcase\value{chapter}\or Prva\or Druga\or - Tre\'{c}a\or \v{C}evrta\or Peta\or \v{S}esta\or Sedma\or Osma\or - Deveta\or Deseta\or Jedanaesta\or Dvanaesta\or Trinaesta\or - \v{C}etrnaesta\or Petnaesta\or \v{S}esnaesta\or Sedamnaesta\or - Osamnaesta\or Devetnaesta\or Dvadeseta\or Dvadesetprva\or - Dvadesetdruga\or Dvadesettre\'{c}a\or Dvadeset\v{c}etvrta\or - Dvadesetpeta\or Dvadeset\v{s}esta\or Dvadesetsedma\or Dvadesetosma\or - Dvadesetdeveta\or Trideseta\or Tridesetprva\or Tridesetdruga\or - Tridesettre\'{c}a\or Trideset\v{c}etvrta\or Tridesetpeta\or - Trideset\v{s}esta\or Tridesetsedma\or Tridesetosma\or - Tridesetdeveta\or \v{C}etrdeseta -\fi\space} - -\DeclareOption{wilson}{ -\renewcommand*{\thechapter}{\ifcase\value{chapter}\or Jedan\\\or Dva\\\or - Tri\\\or \v{C}etiri\\\or Pet\\\or \v{S}est\\\or Sedam\\\or Osam\\\or - Devet\\\or Deset\\\or Jedanaest\\\or Dvanaest\\\or Trinaest\\\or - \v{C}etrnaest\\\or Petnaest\\\or \v{S}esnaest\\\or Sedamnaest\\\or - Osamnaest\\\or Devetnaest\\\or Dvadeset\\\or Dvadesetjedan\\\or - Dvadesetdva\\\or Dvadesettri\\\or Dvadeset\v{c}etiri\\\or - Dvadesetpet\\\or Dvadeset\v{s}est\\\or Dvadesetsedam\\\or Dvadesetosam\\\or - Dvadesetdevet\\\or Trideset\\\or Tridesetjedan\\\or Tridesetdva\\\or - Tridesettri\\\or Trideset\v{c}etiri\\\or Tridesetpet\\\or - Trideset\v{s}est\\\or Tridesetsedam\\\or Tridesetosam\\\or - Tridesetdevet\\\or \v{C}etrdeset -\fi\space} -} -%\ProcessOptions\relax -\DeclareOption{light}{\renewcommand*{\booknamefont}{\normalfont\huge} -\renewcommand*{\thebook}{\normalfont \ifcase\value{book}\or Prva\or - Druga\or Tre\'{c}a\or \v{C}evrta\or Peta\or \v{S}esta\or Sedma\or - Osma\or Deveta\or Deseta -\fi\space} -} -%\ProcessOptions\relax -\DeclareOption{light}{\renewcommand*{\partnamefont}{\normalfont\huge} -\renewcommand{\thepart}{\normalfont \ifcase\value{part}\or - Prvi\or Drugi\or Tre\'{c}i\or \v{C}evrti\or Peti\or \v{S}esti\or - Sedmi\or Osmi\or Deveti\or Deseti\or Jedanaesti\or Dvanaesti\or - Trinaesti\or \v{C}etrnaesti\or Petnaesti\or \v{S}esnaesti\or - Sedamnaesti\or Osamnaesti\or Devetnaesti\or Dvadeseti -\fi\space} -} -%\ProcessOptions\relax -\DeclareOption{light}{\renewcommand*{\chapnamefont}{\normalfont\LARGE} -\renewcommand{\thechapter}{\normalfont\LARGE \ifcase\value{chapter}\or Prva\or Druga\or - Tre\'{c}a\or \v{C}evrta\or Peta\or \v{S}esta\or Sedma\or Osma\or - Deveta\or Deseta\or Jedanaesta\or Dvanaesta\or Trinaesta\or - \v{C}etrnaesta\or Petnaesta\or \v{S}esnaesta\or Sedamnaesta\or - Osamnaesta\or Devetnaesta\or Dvadeseta\or Dvadesetprva\or - Dvadesetdruga\or Dvadesettre\'{c}a\or Dvadeset\v{c}etvrta\or - Dvadesetpeta\or Dvadeset\v{s}esta\or Dvadesetsedma\or Dvadesetosma\or - Dvadesetdeveta\or Trideseta\or Tridesetprva\or Tridesetdruga\or - Tridesettre\'{c}a\or Trideset\v{c}etvrta\or Tridesetpeta\or - Trideset\v{s}esta\or Tridesetsedma\or Tridesetosma\or - Tridesetdeveta\or \v{C}etrdeseta -\fi\space} -} -\ProcessOptions\relax - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erdc/erdc.cls new/tex/latex/erdc/erdc.cls --- old/tex/latex/erdc/erdc.cls 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/erdc/erdc.cls 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,577 @@ +%% +%% This is file `erdc.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% erdc.dtx (with options: `class') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from erdc.cls. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file erdc.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%% \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 \~} +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{erdc} +[2009/07/22 v1.1 Typesetting Technical Information Reports of +the Engineer Research and Development Center (ERDC), +US Army Corps of Engineers] +\long\def\erdc@size@warning#1{% + \ClassWarning{erdc}{Size-changing option #1 will not be + honored}}% +\DeclareOption{8pt}{\erdc@size@warning{\CurrentOption}}% +\DeclareOption{9pt}{\erdc@size@warning{\CurrentOption}}% +\DeclareOption{10pt}{\erdc@size@warning{\CurrentOption}}% +\DeclareOption{11pt}{\erdc@size@warning{\CurrentOption}}% +\DeclareOption{12pt}{\erdc@size@warning{\CurrentOption}}% +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}} +\ProcessOptions\relax +\LoadClass[12pt,twoside]{report} +\RequirePackage{graphicx,color,caption,longtable} +\RequirePackage{dcolumn} +\RequirePackage{natbib} +\renewcommand{\bibfont}{\fontsize{10pt}{12pt}\selectfont} +\setlength{\bibhang}{0.5in} +\setlength{\bibsep}{12pt} +\RequirePackage{amsmath} +\RequirePackage[originalcommands]{ragged2e} +\setlength\RaggedRightParindent{\parindent} +\RaggedRight +\renewcommand\normalsize{% + \@setfontsize\normalsize\@xiipt{16}% + \abovedisplayskip 16\p@ \@plus3\p@ \@minus7\p@ + \abovedisplayshortskip \z@ \@plus3\p@ + \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@ + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI} +\normalsize +\usepackage{mathgifg} +\usepackage{courier} +\def\@laboratoryfont{% + \sffamily\bfseries\fontsize{22pt}{25pt}\selectfont} +\def\@reportnumfont{% + \sffamily\bfseries\fontsize{18pt}{22pt}\selectfont} +\def\@programfont{% + \sffamily\fontseries{k}\itshape\normalsize\selectfont} +\def\@titlefont{% + \sffamily\fontseries{h}\fontsize{20pt}{25pt}\selectfont} +\def\@distributionfont{% + \sffamily\fontseries{k}\fontsize{9pt}{11pt}\selectfont} +\def\@eqtagfont{\sffamily\bfseries\footnotesize} +\RequirePackage[letterpaper, top=1in, bottom=0.7in, + left=1.5in, right=1.5in]{geometry} +\setlength{\parindent}{0pt} +\setlength{\parskip}{\baselineskip} +\setlength\labelwidth{1em} +\setlength\leftmargini\z@ +\addtolength\leftmargini\labelwidth +\addtolength\leftmargini\labelsep +\def\itemize{% + \ifnum \@itemdepth >\thr@@\@toodeep\else + \advance\@itemdepth\@ne + \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% + \expandafter + \list + \csname\@itemitem\endcsname + {\def\makelabel##1{##1}}% + \fi} +\def\enumerate{% + \ifnum \@enumdepth >\thr@@\@toodeep\else + \advance\@enumdepth\@ne + \edef\@enumctr{enum\romannumeral\the\@enumdepth}% + \expandafter + \list + \csname label\@enumctr\endcsname + {\usecounter\@enumctr\def\makelabel##1{##1}}% + \fi} +\widowpenalty=10000 +\clubpenalty=10000 +\raggedbottom +\RequirePackage{fancyhdr} +\renewcommand{\headrulewidth}{0.5pt} +\renewcommand{\footrulewidth}{0pt} +\fancyhfoffset{35pt} +\pagestyle{fancy} +\lhead{\textsf{\textbf{\footnotesize\@reportnum}}} +\rhead{\textsf{\textbf{\footnotesize\thepage}}} +\chead{} +\lfoot{} +\cfoot{} +\rfoot{} +\newif\if@frontmatter +\@frontmatterfalse +\newif\if@appendix +\@appendixfalse +\def\frontmatter{% + \pagenumbering{roman}% + \@frontmattertrue + \@appendixfalse} +\def\mainmatter{% + \cleardoublepage + \pagenumbering{arabic}% + \@frontmatterfalse + \@appendixfalse} +\def\appendix{% + \clearpage + \@frontmatterfalse + \@appendixtrue + \@addtoreset{table}{chapter}% + \@addtoreset{equation}{chapter}% + \@addtoreset{figure}{chapter}% + \setcounter{chapter}{0}% + \setcounter{section}{0}% + \gdef\@chapapp{\appendixname}% + \gdef\thechapter{\@Alph\c@chapter}% + \gdef\thefigure{\@Alph\c@chapter\@arabic\c@figure}% + \gdef\thetable{\@Alph\c@chapter\@arabic\c@table}% + \gdef\theequation{\@Alph\c@chapter\@arabic\c@equation}} +\def\laboratory#1{\gdef\@laboratory{#1}} +\laboratory{Engineer Research and\\Development Center} +\def\reportnum#1{\gdef\@reportnum{#1}} +\reportnum{ERDC TR-01-01} +\def\program#1{\gdef\@program{#1}} +\program{} +\newcommand{\subtitle}[1]{\gdef\@subtitle{#1}} +\def\@subtitle{} +\newcommand{\xandlist}[4]{\@andlista{{#1}{#2}{#3}}#4\and\and} +\def\@andlista#1#2\and#3\and{\@andlistc{#2}\@ifnotempty{#3}{% + \@andlistb#1{#3}}} +\def\@andlistb#1#2#3#4#5\and{% + \@ifempty{#5}{% + \@andlistc{#2#4}% + }{% + \@andlistc{#1#4}\@andlistb{#1}{#3}{#3}{#5}% + }} +\let\@andlistc\@iden +\newcommand{\nxandlist}[4]{% + \def\@andlistc##1{\toks@\@xp{\the\toks@##1}}% + \toks@{\toks@\@emptytoks \@andlista{{#1}{#2}{#3}}}% + \the\@xp\toks@#4\and\and + \edef#4{\the\toks@}% + \let\@andlistc\@iden} +\def\@@and{and} +\newcommand{\andify}{% + \nxandlist{\unskip, }{\unskip{} \@@and~}{\unskip, \@@and~}} +\def\and{\unskip{ }\@@and{ }\ignorespaces} +\let\@xp\expandafter\relax +\let\@nx=\noexpand +\def\@oparg#1[#2]{\@ifnextchar[{#1}{#1[#2]}} +\long\def\@ifempty#1{\@xifempty#1@@..\@nil} +\long\def\@xifempty#1#2@#3#4#5\@nil{% + \ifx#3#4\@xp\@firstoftwo\else\@xp\@secondoftwo\fi} +\long\def\@ifnotempty#1{\@ifempty{#1}{}} +\def\setboxz@h{\setbox\z@\hbox} +\def\@addpunct#1{% + \relax\ifhmode + \ifnum\spacefactor>\@m \else#1\fi + \fi} +\newtoks\@emptytoks +\def\authors{} +\def\addresses{} +\def\author#1{% + \ifx\@empty\authors\gdef\authors{#1}\else + \g@addto@macro{\authors}{\and#1}\fi + \ifx\@empty\@addresses\gdef\addresses{\author{#1}}\else + \g@addto@macro{\addresses}{\par\author{#1}}\fi} +\def\affiliation#1{% + \ifx\@empty\@addresses\gdef\addresses{#1\par}\else + \g@addto@macro{\addresses}{#1\par\vspace{\baselineskip}}\fi} +\def\today{\ifcase\month\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December\fi + \space \number\year} +\newcommand{\coverart}[2][]{% + \def\@tempa{#1}% + \ifx\@empty\@tempa + \gdef\@coverart{\includegraphics[width=435\p@]{#2}}\else + \gdef\@coverart{\includegraphics[#1]{#2}}\fi} +\def\@coverart{}% +\def\reporttype#1{\gdef\@reporttype{#1}} +\reporttype{} +\def\distribution#1{\gdef\@distribution{#1}} +\distribution{Approved for public release; distribution is unlimited.} +\def\preparedfor#1{\gdef\@preparedfor{#1}} +\preparedfor{U.S. Army Corps of Engineers\\ Washington, DC 20314-1000} +\def\contractnum#1{\gdef\@contractnum{#1}} +\contractnum{} +\def\monitoredby#1{\gdef\@monitoredby{#1}} +\monitoredby{} +\def\additionalinfo#1{\gdef\@additionalinfo{#1}} +\additionalinfo{} +\newbox\abstractbox +\renewenvironment{abstract}{% + \global\setbox\abstractbox=\vtop \bgroup + \normalfont + \list{}{\labelwidth\z@ + \leftmargin\z@ \rightmargin\leftmargin + \listparindent\z@ \itemindent\z@ + \parsep16\p@ \topsep\z@ + \let\fullwidthdisplay\relax + }% + \item[\hskip\labelsep\bfseries Abstract:]% +}{% + \endlist\egroup} +\long\def\disclaimer#1{\long\gdef\@disclaimer{#1}} +\disclaimer{The contents of this report are not to be used for +advertising, publication, or promotional purposes. Citation of trade +names does not constitute an official endorsement or approval of the +use of such commercial products. All product names and trademarks +cited are the property of their respective owners. The findings of +this report are not to be construed as an official Department of the +Army position unless so designated by other authorized documents. + +\textbf{DESTROY THIS REPORT WHEN NO LONGER NEEDED. DO NOT RETURN IT +TO THE ORIGINATOR.}} +\newenvironment{@coverlist}{\begin{list}{}{% + \leftmargin40\p@\rightmargin-85\p@% + \topsep\z@\partopsep\z@\labelwidth\z@\labelsep\z@}\item{}}{% + \end{list}} +\newenvironment{@titlelist}{\begin{list}{}{% + \leftmargin-20\p@\rightmargin100\p@% + \topsep\z@\partopsep\z@\labelwidth\z@\labelsep\z@}\item{}}{% + \end{list}} +\newif\if@titleblock +\newenvironment{@titleblock}{% + \list{}{\labelwidth80\p@\labelsep10\p@ \leftmargin70\p@ + \rightmargin-150\p@ + \let\makelabel\@titleblocklabel}}{\endlist} +\newcommand*{\@titleblocklabel}[1]{\hfill\small#1} +\def\maketitle{% + \thispagestyle{empty}% + \enlargethispage{0.34in}% + \vspace*{-0.95in} + \makebox[0cm][r]{% + \raisebox{-720\p@}[\z@][\z@]{% + \rotatebox{90}{\makebox[\z@][l]{% + \colorbox{red}{\color{white}\parbox{720\p@}{% + \rule{0\p@}{85\p@}% + \hspace{28\p@}\raisebox{40\p@}{% + \parbox[c]{350\p@}{\@laboratoryfont\@laboratory}% + \hspace{10\p@}% + \parbox[c]{300\p@}{\hfill\@reportnumfont\@reportnum}}}}}}}% + \hspace*{-14\p@}}% + \makebox[0cm][r]{\raisebox{-720\p@}[\z@][\z@]{\rule{8\p@}{726\p@}% + \hspace{-26.75\p@}}}% + \begin{@coverlist}% + \sffamily\fontseries{k}\selectfont% + \hfill\parbox{145\p@}{ + \includegraphics[width=65\p@]{red_corps_castle2}\\ + {\bfseries + US Army Corps\\ + of Engineers\raisebox{-1\p@}{\scriptsize\textregistered}}\\ + Engineering Research and\\ + Development Center}\par + \vspace{0.5cm}% + {\@programfont\@program\par}% + \vspace{0.3cm}% + {\raggedright\@titlefont\@title\par + \vspace{0.3cm}% + \normalsize\bfseries\@subtitle\par}% + \vspace{0.3cm}% + \begin{minipage}[t]{300\p@}\raggedright + \nxandlist{\unskip, }{\unskip{} \@@and~}{\unskip{} \@@and~}\authors + \authors\end{minipage}% + \begin{minipage}[t]{135\p@}\flushright\@date\end{minipage}\par + \vspace{0.3cm}% + \@coverart + \end{@coverlist}% + \vfill + \begin{@coverlist}% + \@distributionfont\@distribution + \end{@coverlist}% + \newpage\thispagestyle{empty}\hbox{}\newpage + \thispagestyle{empty}% + \setcounter{page}{1}% + \vspace*{-1.5in}% + \vspace*{-\topmargin}% + \begin{@titlelist}% + \sffamily\fontseries{k}\selectfont + \begin{minipage}[t]{275\p@}% + \bfseries\@program + \end{minipage}% + \begin{minipage}[t]{175\p@}% + \bfseries\flushright\@reportnum\\\@date + \end{minipage}\rule[-0.5in]{\z(a)}{0.625in}\par + \begin{minipage}{\textwidth} + \vspace*{1cm}% + {\@titlefont\raggedright\@title\par} + \vspace*{3\p@}% + \bfseries\@subtitle\par + \end{minipage}\rule[-0.7in]{\z@}{1in}\par + \def\author##1{% + \def\@tempa{##1}% + \nxandlist{\unskip, }{\unskip{} \@@and~}{\unskip{} \@@and~}\@tempa + {\upshape\normalsize\@tempa}\par\vspace{6\p@}}% + \begin{minipage}{\textwidth} + \textit{\footnotesize\addresses}\par + \end{minipage}\rule[-2.7in]{\z(a)}{3.7in}\par + \begin{minipage}{\textwidth} + \@reporttype\par\vspace*{3\p@}% + {\@distributionfont\@distribution\par}% + \end{minipage} + \end{@titlelist}% + \vfill + \begin{@titlelist}% + \sffamily\normalsize\fontseries{k}\selectfont + \ifx\@additionalinfo\@empty\else\@additionalinfo\par\fi + \@titleblockfalse + \ifx\@empty\@preparedfor\relax\else\@titleblocktrue\fi + \ifx\@empty\@contractnum\relax\else\@titleblocktrue\fi + \ifx\@empty\@monitoredby\relax\else\@titleblocktrue\fi + \if@titleblock + \begin{@titleblock}% + \ifx\@empty\@preparedfor\else + \item[Prepared for]\@preparedfor + \fi + \ifx\@empty\@contractnum\else + \item[Under]\@contractnum + \fi + \ifx\@empty\@monitoredby\else + \item[Monitored by]\@monitoredby + \fi + \end{@titleblock} + \fi + \end{@titlelist}% + \clearpage + \ifvoid\abstractbox + \else + \box\abstractbox + \prevdepth\z@ + \fi + \vfill + \bgroup + \setlength{\fboxsep}{5\p@}% + \makebox[\textwidth]{\fbox{\parbox{6.5in}{% + \fontsize{8.5\p@}{9.5\p@}\selectfont + \parskip\baselineskip + \textbf{Disclaimer:} \@disclaimer}}}% + \egroup + \clearpage} +\def\cl@chapter{} +\@addtoreset{section}{chapter}% +\@addtoreset{subsection}{chapter}% +\@addtoreset{subsection}{section}% +\renewcommand\chapter{% + \clearpage + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} +\def\@chapter[#1]#2{% + \if@frontmatter + \addcontentsline{toc}{chapter}{#1}% + \@makechapterhead{#2}% + \else + \refstepcounter{chapter}% + \typeout{\(a)chapapp\space\thechapter.}% + \if@appendix + \addcontentsline{toc}{chapter}% + {\@chapapp\space\thechapter: #1}% + \@makechapterhead{\@chapapp\space\thechapter: #2}% + \else + \addcontentsline{toc}{chapter}% + {\protect\numberline{\thechapter}#1}% + \@makechapterhead{\makebox[35\p@]{\thechapter\hfill}#2}% + \fi + \fi + \@afterheading} +\def\@schapter#1{% + \if@appendix + \addcontentsline{toc}{chapter}{\@chapapp: #1}% + \@makeschapterhead{\@chapapp: #1}% + \else + \addcontentsline{toc}{chapter}{#1}% + \@makeschapterhead{#1}% + \fi + \@afterheading} +\def\@makechapterhead#1{% + \vspace*{5\p@}% + {\hskip-35\p@% + \parindent\z@\raggedright + \interlinepenalty\@M + \@titlefont #1\par\nobreak + \vspace*{10\p@}% + }} +\def\@makeschapterhead#1{% + \vspace*{5\p@}% + {% + \parindent\z@\raggedright + \interlinepenalty\@M + \leftskip-35\p@\@titlefont #1\par\nobreak + \vspace*{10\p@}% + }} +\renewcommand \theequation {\@arabic\c@equation} +\setcounter{tocdepth}{2} +\renewcommand\section{% + \addpenalty\@secpenalty\nobreak + \secdef\@section\@ssection} +\def\@section[#1]#2{% + \ifnum1>\c@secnumdepth + \addcontentsline{toc}{section}{#1}% + \else + \refstepcounter{section}% + \addcontentsline{toc}{section}{\protect\numberline{\thesection}#1}% + \fi + {\hskip-35\p@\raggedright\interlinepenalty\@M + \large\sffamily\bfseries + \ifnum1>\c@secnumdepth\else\makebox[35\p@]{\thesection\hfill}\fi#2\nobreak\par} + \@afterheading + \nobreak\par} +\def\@ssection#1{ + \addcontentsline{toc}{section}{#1}% + {\raggedright\interlinepenalty\@M + \large\sffamily\bfseries\leftskip-35\p@#1\nobreak\par} + \@afterheading + \nobreak\par} +\renewcommand\subsection{\par + \addpenalty\@secpenalty\nobreak + \secdef\@subsection\@ssubsection} +\def\@subsection[#1]#2{% + \ifnum2>\c@secnumdepth + \addcontentsline{toc}{subsection}{\itshape#1}% + \else + \refstepcounter{subsection}% + \addcontentsline{toc}{subsection}{\itshape\fontsize{9}{12}\selectfont + \protect\numberline{\thesubsection}% + #1}% + \fi + {\noindent\raggedright\interlinepenalty\@M + \normalsize\sffamily\bfseries + \ifnum2>\c@secnumdepth\else\thesubsection\hspace{1em}\fi#2}\nobreak\par} +\def\@ssubsection#1{% + \addcontentsline{toc}{subsection}{\itshape\fontsize{9}{12}\selectfont#1}% + {\noindent\raggedright\interlinepenalty\@M + \normalsize\sffamily\bfseries#1}\nobreak\par} +\def\specialchapter#1{% + \clearpage + \global\@topnum\z@ + \@afterindentfalse + \@makeschapterhead{#1}\par + \@afterheading} +\def\(a)dotsep{0.5} +\renewcommand\l@chapter[2]{% + \def\numberline##1{\makebox[1.9em]{##1\hfill}}% + \addpenalty{-\@highpenalty}% + \vskip5\p@ + \bgroup + \parindent\z@\rightskip\@pnumwidth + \parfillskip-\@pnumwidth + \leavevmode\bfseries + \leftskip1.9em% + \hskip-\leftskip + #1\nobreak\leaders\hbox{$\m@th\mkern\@dotsep + mu\hbox{.}\mkern\@dotsep + mu$}\hfill\nobreak{\hfil\,#2}\par + \vskip5\p@ + \penalty\@highpenalty + \egroup} +\def\@dottedtocline#1#2#3#4#5{% + \bgroup + \def\numberline##1{\makebox[#3]{##1\hfill}}% + \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 + {\hfil \normalcolor \,#5}% + \par}% + \fi + \egroup} +\def\@dottedtoclineLF#1#2#3#4#5{% + \bgroup + \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 #2\relax + \advance\leftskip \@tempdima \null\nobreak\hskip -\@tempdima + #4\nobreak + \leaders\hbox{$\m@th + \mkern \@dotsep mu\hbox{.}\mkern \@dotsep + mu$}\hfill + \nobreak + {\hfil \normalcolor \,#5}% + \par}% + \fi + \egroup} +\renewcommand*\l@section{\@dottedtocline{1}{2em}{2.5em}} +\renewcommand*\l@subsection{\@dottedtocline{2}{4.7em}{3em}} +\renewcommand*\l@figure{\@dottedtoclineLF{1}{0em}{2.3em}} +\let\l@table\l@figure +\renewcommand\contentsname{Table of Contents} +\renewcommand\tableofcontents{% + \specialchapter{\contentsname}% + \def\numberline##1{\hb@xt@\@pnumwidth{##1\hfill}}% + {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright + \@starttoc{toc}}} +\renewcommand\listoffigures{% + \chapter{\listfigurename}% + \def\numberline##1{Figure ##1. }% + {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright + \@starttoc{lof}}} +\renewcommand\listoftables{% + \chapter{\listtablename}% + \def\numberline##1{Table ##1. }% + {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright + \@starttoc{lot}}} +\def\listfiguretablename{Figures and Tables} +\newcommand\listoffiguresandtables{% + \chapter{\listfiguretablename} + {\sffamily\bfseries\normalsize Figures\par}% + \vspace*{10pt}% + \def\numberline##1{Figure ##1. }% + {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright + \@starttoc{lof}}% + {\sffamily\bfseries\normalsize Tables\par}% + \vspace*{10pt}% + \def\numberline##1{Table ##1. }% + {\parskip2.5\p@\footnotesize\sffamily\fontseries{k}\selectfont\raggedright + \@starttoc{lot}}} +\renewcommand\bibname{References} +\setlength{\@fptop}{0pt}% +\renewcommand \thefigure {\@arabic\c@figure} +\renewcommand \thetable {\@arabic\c@table} +\captionsetup{justification=centering,font={footnotesize,sf,bf}, +labelsep=period,aboveskip=3pt} +\captionsetup[table]{position=top} +\def\arraystretch{1.3} +\let\maketag@@@@\maketag@@@ +\def\maketag@@@#1{\hbox{\m@th\@eqtagfont#1}} +\renewcommand{\eqref}[1]{\textup{\tagform@@{\ref{#1}}}} +\def\tagform@@#1{\maketag@@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +\endinput +%% +%% End of file `erdc.cls'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erdc.tlpobj new/tlpkg/tlpobj/erdc.tlpobj --- old/tlpkg/tlpobj/erdc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/erdc.tlpobj 2017-04-14 17:39:26.000000000 +0200 @@ -0,0 +1,17 @@ +name erdc +category Package +revision 15878 +shortdesc Style for Reports by US Army Corps of Engineers +relocated 1 +longdesc A class for typesetting Technical Information Reports of the +longdesc Engineer Research and Development Center, US Army Corps of +longdesc Engineers. The class was commissioned and paid for by US Army +longdesc Corps of Engineers, Engineer Research and Development Center, +longdesc 3909 Halls Ferry Road, Vicksburg, MS 39180-6199. +runfiles size=5 + RELOC/tex/latex/erdc/erdc.cls +catalogue-ctan /macros/latex/contrib/erdc +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics report-like class +catalogue-version 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fjodor.doc.tlpobj new/tlpkg/tlpobj/fjodor.doc.tlpobj --- old/tlpkg/tlpobj/fjodor.doc.tlpobj 2016-04-14 19:02:41.000000000 +0200 +++ new/tlpkg/tlpobj/fjodor.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -name fjodor.doc -category Package -revision 20220 -shortdesc doc files of fjodor -relocated 1 -docfiles size=125 - RELOC/doc/latex/fjodor/README - RELOC/doc/latex/fjodor/dostojevski.pdf - RELOC/doc/latex/fjodor/dostojevski.tex - RELOC/doc/latex/fjodor/fjodor.pdf - RELOC/doc/latex/fjodor/fjodor.tex - RELOC/doc/latex/fjodor/srbook-mem.sty ++++++ flashmovie.doc.tar.xz -> esdiff.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/esdiff/README new/doc/latex/esdiff/README --- old/doc/latex/esdiff/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/esdiff/README 2016-11-25 19:28:46.000000000 +0100 @@ -0,0 +1,6 @@ +The package esdiff makes writing derivatives very easy. +It allows to write derivatives, partial derivatives, multiple +Some typographic options are available.derivatives. + +This package is released under the LPPL, version 1 or later. +It consists of README, esdiff.dtx, esdiff.ins, and their derived files. Binary files old/doc/latex/esdiff/esdiff.pdf and new/doc/latex/esdiff/esdiff.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/README new/doc/latex/flashmovie/README --- old/doc/latex/flashmovie/README 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -Basically it uses the fact that the Adobe Reader 9 contains -an embedded Adobe Flash player which can be invoked with the -"rich media annotation" feature which is described in -"Adobe Supplement to the ISO 32000 BaseVersion: 1.7 -ExtensionLevel: 3". - -advantages: - - You can directly embed videos into the pdf (external window is optimal - and not necessary). - - You can play back videos without worrying about platform dependencies. - -disadvantages: - - You can only play back embedded videos with Adobe Reader 9 and upwards. - -For further infos see the file "flashmovie.sty". \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/flv-player-license/MPL-1.1 new/doc/latex/flashmovie/flv-player-license/MPL-1.1 --- old/doc/latex/flashmovie/flv-player-license/MPL-1.1 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/flv-player-license/MPL-1.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/flv-player-license/license.txt new/doc/latex/flashmovie/flv-player-license/license.txt --- old/doc/latex/flashmovie/flv-player-license/license.txt 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/flv-player-license/license.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -Version: MPL 1.1 - -The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -License for the specific language governing rights and limitations -under the License. - -The Original Code is flvplayer (http://code.google.com/p/flvplayer/). - -The Initial Developer of the Original Code is neolao (neolao(a)gmail.com). Binary files old/doc/latex/flashmovie/test-beamer-0.pdf and new/doc/latex/flashmovie/test-beamer-0.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-beamer-0.tex new/doc/latex/flashmovie/test-beamer-0.tex --- old/doc/latex/flashmovie/test-beamer-0.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-beamer-0.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -\RequirePackage{flashmovie} -% it is neccessay to use "\RequirePackage{flashmovie}" because beamer -% also uses "\pdfminorversion". see flashmovie.sty for an explanation. - -%--------------------------------------------- -% pure-flash-example -%--------------------------------------------- - -\documentclass[10pt]{beamer} - -\usepackage[english]{babel} -\usepackage{hyperref} - -\usetheme{Warsaw} % Warsaw,Hannover,boxes -\usecolortheme{rose} % orchid,lily,dolphin,beetle,crane -\usefonttheme{professionalfonts} % professionalfonts,serif -\useinnertheme{rounded} % rounded -\useoutertheme{shadow} % shadow,sidebar,split - -%--------------------------------------------- - -\setbeamersize{text margin left=0.3cm} % small margins -\setbeamersize{text margin right=0.3cm} - -%--------------------------------------------- -% for writing a document is is convenient to switch movies off. to do this, -% use "blank=1" as an option. in order to use the videos, use "blank=0". -% -% to make thinks easy, use "blank=\myblank" as an option and define -% \myblank as suitable. - -\def\myblank{0} -%\def\myblank{1} - -%--------------------------------------------- - -\title[flashmovie.sty]{flashmovie.sty} -\author[\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}]{\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}} - -\date[2010]{} - -%--------------------------------------------- - -\begin{document} - -\frame{ - -\titlepage - -\begin{block}{\alert{Warning}} -It is recommended to use the latest available version of the Adobe Reader -to view PDF files generated with flashmovie.sty. -% Otherwise your Adobe Reader may die a sudden painfull death... -\end{block} - -} % end frame - -%--------------------------------------------- - -\begin{frame} - -\frametitle{Basics} - -\begin{minipage}[t]{6.1cm} -\vspace{0cm} -\flashmovie[width=6cm,height=5cm]{saturn5.swf} -\end{minipage} -\begin{minipage}[t]{5.7cm} -\vspace{0cm} -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. -\vspace{0.5cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. - -\end{minipage} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Explanation} - -The source code used for the video on the previous page is: - -\begin{verbatim} -\flashmovie[width=6cm,height=5cm]{saturn5.swf} -\end{verbatim} - -This means that the movie is really a flash animation and is not -rendered by a player. So no controls are available. - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Issues with the flv-player} - -\begin{itemize} - -\item Sadly the flv-player does not work reliably with the latex package -beamer. If you try it, the acrobat reader often crashes while trying -to change the page. I have no idea what is the cause of this problem. - -\item The only reliable way to use beamer seems to be directly embedding the videos as - flash animations or to use the JW player. - -\end{itemize} - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Advanced use} - -Rich media annotations are not restricted to videos. -You can use flash animations, too. -Here for example is a clock written in action script: - -\flashmovie[width=8cm,height=5cm,blank=\myblank]{clock.swf} - -\begin{verbatim} - \flashmovie[width=8cm,height=5cm]{clock.swf} -\end{verbatim} - -\end{frame} - -%--------------------------------------------- - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-beamer-1.tex new/doc/latex/flashmovie/test-beamer-1.tex --- old/doc/latex/flashmovie/test-beamer-1.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-beamer-1.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -\RequirePackage{flashmovie} -% it is neccessay to use "\RequirePackage{flashmovie}" because beamer -% also uses "\pdfminorversion". see flashmovie.sty for an explanation. - -%--------------------------------------------- -% jw-player-example -%--------------------------------------------- - -\documentclass[10pt]{beamer} - -\usepackage[english]{babel} -\usepackage{hyperref} - -\usetheme{Warsaw} % Warsaw,Hannover,boxes -\usecolortheme{rose} % orchid,lily,dolphin,beetle,crane -\usefonttheme{professionalfonts} % professionalfonts,serif -\useinnertheme{rounded} % rounded -\useoutertheme{shadow} % shadow,sidebar,split - -%--------------------------------------------- - -\setbeamersize{text margin left=0.3cm} % small margins -\setbeamersize{text margin right=0.3cm} - -%--------------------------------------------- -% for writing a document is is convenient to switch movies off. to do this, -% use "blank=1" as an option. in order to use the videos, use "blank=0". -% -% to make thinks easy, use "blank=\myblank" as an option and define -% \myblank as suitable. - -\def\myblank{0} -%\def\myblank{1} - -%\def\mymovie{saturn5} -\def\mymovie{flagmoon} % if the noise of saturn5 annoyes to much - -%--------------------------------------------- - -\title[flashmovie.sty]{flashmovie.sty} -\author[\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}]{\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}} - -\date[2010]{} - -%--------------------------------------------- - -\begin{document} - -\frame{ - -\titlepage - -\begin{block}{\alert{Warning}} -It is recommended to use the latest available version of the Adobe Reader -to view PDF files generated with flashmovie.sty. -% Otherwise your Adobe Reader may die a sudden painfull death... -\end{block} - -} % end frame - -%--------------------------------------------- - -\begin{frame} - -\frametitle{Basics} - -\begin{minipage}[t]{6.1cm} -\vspace{0cm} -\flashmovie[width=6cm,height=5cm,engine=jw-player,auto=1,blank=\myblank]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{5.7cm} -\vspace{0cm} -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. -\vspace{0.5cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. - -\end{minipage} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/\mymovie.avi}{\mymovie.avi} ). - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{\href{http://www.longtailvideo.com/players/jw-flv-player}{JW Player}} - -The source code used for the video on the previous page is: - -\begin{verbatim} -\flashmovie[width=6cm,height=5cm, - engine=jw-player,auto=1]{movie.mp4} -\end{verbatim} - -This means that the movie is rendered with the -\href{http://www.longtailvideo.com/players/jw-flv-player}{``JW Player''} -from longtail video (\href{http://www.longtailvideo.com}{www.longtailvideo.com}). - -\vspace{0.5cm} - -This is an open source flash player released under a -\href{http://creativecommons.org/licenses/by-nc-sa/3.0/}{non-commercial license}, -which means its free for non-commercial use. - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Issues with the flv-player} - -\begin{itemize} - -\item Sadly the \href{http://flv-player.net}{flv-player} does not work -reliably with the latex package beamer. If you try it, the acrobat reader -often crashes while trying to change the page. I have no idea -what is the cause of this problem. - -\item The only reliable way to use beamer seems to be directly embedding the videos as - flash animations or to use the JW player. - -\end{itemize} - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Options for the \href{http://www.longtailvideo.com/players/jw-flv-player}{JW Player}} - -\begin{minipage}[t]{4.1cm} -\vspace{0cm} -\flashmovie[width=4cm,height=3cm,engine=jw-player,auto=0,controlbar=0,blank=\myblank]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{7cm} -\vspace{0cm} -In this example the video is not started before the user clicks on it. The controlbar is disabled, too. -\begin{verbatim} -\flashmovie[width=4cm,height=3cm, - engine=jw-player,auto=0, - controlbar=0]{movie.mp4} -\end{verbatim} -\end{minipage} - -\begin{minipage}[t]{4.1cm} -\vspace{0cm} -\flashmovie[width=4cm,height=3cm,engine=jw-player,auto=0,image=saturn.jpg,blank=\myblank,loop=1]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{7cm} -\vspace{0cm} -Here additionally an image is displayed before the movie starts. The movie also loops. -\begin{verbatim} -\flashmovie[width=4cm,height=3cm, - engine=jw-player,auto=0, - image=saturn.jpg,loop=1] - {movie.mp4} -\end{verbatim} -\end{minipage} - -\end{frame} - -%--------------------------------------------- - -\end{document} Binary files old/doc/latex/flashmovie/test-flv.pdf and new/doc/latex/flashmovie/test-flv.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-flv.tex new/doc/latex/flashmovie/test-flv.tex --- old/doc/latex/flashmovie/test-flv.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-flv.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -\documentclass[10pt]{article} - -\usepackage[utf8]{inputenc} -\usepackage[english]{babel} -\usepackage{hyperref} -\usepackage{color} - -\usepackage{flashmovie} - -\begin{document} - -{\Huge flashvideo.sty}\\\\ - -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -\flashmovie[width=10cm,height=10cm,engine=flv-player,auto=1]{saturn5.mp4} - -%\vspace{1cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. - -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. -% Otherwise your Adobe Reader may die a sudden painfull death... - -\vspace{0.5cm} - -\textcolor{red}{ - It is recommended to use the latest available version of the Adobe Reader - to view PDF files generated with flashmovie.sty. -} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\newpage - -The source code used for the video on the previous page is: - -\begin{verbatim} - \flashmovie[width=10cm,height=10cm,engine=flv-player,auto=1]{saturn5.mp4} -\end{verbatim} - -This means that the movie is rendered with the \href{http://flv-player.net}{``flv-player''} -whose developer is neolao. This player is distributed under the -\href{http://www.mozilla.org/MPL/}{MPL version 1.1}. -It is included in this package and is the recommended way to use ``flashmovie.sty'' -besides directly embedding ``.swf'' files. - -\vspace{1cm} - -{\Huge Examples}\\\\ - -\flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0]{saturn5.mp4} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0]{saturn5.mp4} -\end{verbatim} -In this example the video is not started before the user clicks on it. - -\vspace{1cm} - -\flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0,image=saturn.jpg]{saturn5.mp4} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0,image=saturn.jpg]{saturn5.mp4} -\end{verbatim} -Here additionally an image is displayed before the movie starts. - -\newpage - -Rich media annotations are not restricted to videos. -Here for example is a clock written in action script: - -\flashmovie[width=8cm,height=5cm]{clock.swf} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm]{clock.swf} -\end{verbatim} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test.tex new/doc/latex/flashmovie/test.tex --- old/doc/latex/flashmovie/test.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -\documentclass[10pt]{article} - -\usepackage[utf8]{inputenc} -\usepackage[english]{babel} -\usepackage{hyperref} - -\usepackage{flashmovie} - -\begin{document} - -{\Huge flashvideo.sty}\\\\ - -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -\flashmovie[width=10cm,height=10cm]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=pure-swf]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=blank]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=flv-player]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=flv-player,blank=0]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=flv-player,blank=1]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=acropro]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=jw-player]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=osplayer]{saturn5.mp4} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/esdiff.doc.tlpobj new/tlpkg/tlpobj/esdiff.doc.tlpobj --- old/tlpkg/tlpobj/esdiff.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/esdiff.doc.tlpobj 2017-04-14 17:39:31.000000000 +0200 @@ -0,0 +1,8 @@ +name esdiff.doc +category Package +revision 21385 +shortdesc doc files of esdiff +relocated 1 +docfiles size=25 + RELOC/doc/latex/esdiff/README + RELOC/doc/latex/esdiff/esdiff.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flashmovie.doc.tlpobj new/tlpkg/tlpobj/flashmovie.doc.tlpobj --- old/tlpkg/tlpobj/flashmovie.doc.tlpobj 2016-04-14 19:02:42.000000000 +0200 +++ new/tlpkg/tlpobj/flashmovie.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -name flashmovie.doc -category Package -revision 25768 -shortdesc doc files of flashmovie -relocated 1 -docfiles size=345 - RELOC/doc/latex/flashmovie/README - RELOC/doc/latex/flashmovie/flv-player-license/MPL-1.1 - RELOC/doc/latex/flashmovie/flv-player-license/license.txt - RELOC/doc/latex/flashmovie/test-beamer-0.pdf - RELOC/doc/latex/flashmovie/test-beamer-0.tex - RELOC/doc/latex/flashmovie/test-beamer-1.tex - RELOC/doc/latex/flashmovie/test-flv.pdf - RELOC/doc/latex/flashmovie/test-flv.tex - RELOC/doc/latex/flashmovie/test.tex ++++++ flashmovie.doc.tar.xz -> esdiff.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/README new/doc/latex/flashmovie/README --- old/doc/latex/flashmovie/README 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -Basically it uses the fact that the Adobe Reader 9 contains -an embedded Adobe Flash player which can be invoked with the -"rich media annotation" feature which is described in -"Adobe Supplement to the ISO 32000 BaseVersion: 1.7 -ExtensionLevel: 3". - -advantages: - - You can directly embed videos into the pdf (external window is optimal - and not necessary). - - You can play back videos without worrying about platform dependencies. - -disadvantages: - - You can only play back embedded videos with Adobe Reader 9 and upwards. - -For further infos see the file "flashmovie.sty". \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/flv-player-license/MPL-1.1 new/doc/latex/flashmovie/flv-player-license/MPL-1.1 --- old/doc/latex/flashmovie/flv-player-license/MPL-1.1 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/flv-player-license/MPL-1.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,470 +0,0 @@ - MOZILLA PUBLIC LICENSE - Version 1.1 - - --------------- - -1. Definitions. - - 1.0.1. "Commercial Use" means distribution or otherwise making the - Covered Code available to a third party. - - 1.1. "Contributor" means each entity that creates or contributes to - the creation of Modifications. - - 1.2. "Contributor Version" means the combination of the Original - Code, prior Modifications used by a Contributor, and the Modifications - made by that particular Contributor. - - 1.3. "Covered Code" means the Original Code or Modifications or the - combination of the Original Code and Modifications, in each case - including portions thereof. - - 1.4. "Electronic Distribution Mechanism" means a mechanism generally - accepted in the software development community for the electronic - transfer of data. - - 1.5. "Executable" means Covered Code in any form other than Source - Code. - - 1.6. "Initial Developer" means the individual or entity identified - as the Initial Developer in the Source Code notice required by Exhibit - A. - - 1.7. "Larger Work" means a work which combines Covered Code or - portions thereof with code not governed by the terms of this License. - - 1.8. "License" means this document. - - 1.8.1. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - - 1.9. "Modifications" means any addition to or deletion from the - substance or structure of either the Original Code or any previous - Modifications. When Covered Code is released as a series of files, a - Modification is: - A. Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - - B. Any new file that contains any part of the Original Code or - previous Modifications. - - 1.10. "Original Code" means Source Code of computer software code - which is described in the Source Code notice required by Exhibit A as - Original Code, and which, at the time of its release under this - License is not already Covered Code governed by this License. - - 1.10.1. "Patent Claims" means any patent claim(s), now owned or - hereafter acquired, including without limitation, method, process, - and apparatus claims, in any patent Licensable by grantor. - - 1.11. "Source Code" means the preferred form of the Covered Code for - making modifications to it, including all modules it contains, plus - any associated interface definition files, scripts used to control - compilation and installation of an Executable, or source code - differential comparisons against either the Original Code or another - well known, available Covered Code of the Contributor's choice. The - Source Code can be in a compressed or archival form, provided the - appropriate decompression or de-archiving software is widely available - for no charge. - - 1.12. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, this - License or a future version of this License issued under Section 6.1. - For legal entities, "You" includes any entity which controls, is - controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, - to cause the direction or management of such entity, whether by - contract or otherwise, or (b) ownership of more than fifty percent - (50%) of the outstanding shares or beneficial ownership of such - entity. - -2. Source Code License. - - 2.1. The Initial Developer Grant. - The Initial Developer hereby grants You a world-wide, royalty-free, - non-exclusive license, subject to third party intellectual property - claims: - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Code (or portions thereof) with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patents Claims infringed by the making, using or - selling of Original Code, to make, have made, use, practice, - sell, and offer for sale, and/or otherwise dispose of the - Original Code (or portions thereof). - - (c) the licenses granted in this Section 2.1(a) and (b) are - effective on the date Initial Developer first distributes - Original Code under the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: 1) for code that You delete from the Original Code; 2) - separate from the Original Code; or 3) for infringements caused - by: i) the modification of the Original Code or ii) the - combination of the Original Code with other software or devices. - - 2.2. Contributor Grant. - Subject to third party intellectual property claims, each Contributor - hereby grants You a world-wide, royalty-free, non-exclusive license - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor, to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications - created by such Contributor (or portions thereof) either on an - unmodified basis, with other Modifications, as Covered Code - and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone - and/or in combination with its Contributor Version (or portions - of such combination), to make, use, sell, offer for sale, have - made, and/or otherwise dispose of: 1) Modifications made by that - Contributor (or portions thereof); and 2) the combination of - Modifications made by that Contributor with its Contributor - Version (or portions of such combination). - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first makes Commercial Use of - the Covered Code. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: 1) for any code that Contributor has deleted from the - Contributor Version; 2) separate from the Contributor Version; - 3) for infringements caused by: i) third party modifications of - Contributor Version or ii) the combination of Modifications made - by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims - infringed by Covered Code in the absence of Modifications made by - that Contributor. - -3. Distribution Obligations. - - 3.1. Application of License. - The Modifications which You create or to which You contribute are - governed by the terms of this License, including without limitation - Section 2.2. The Source Code version of Covered Code may be - distributed only under the terms of this License or a future version - of this License released under Section 6.1, and You must include a - copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code - version that alters or restricts the applicable version of this - License or the recipients' rights hereunder. However, You may include - an additional document offering the additional rights described in - Section 3.5. - - 3.2. Availability of Source Code. - Any Modification which You create or to which You contribute must be - made available in Source Code form under the terms of this License - either on the same media as an Executable version or via an accepted - Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic - Distribution Mechanism, must remain available for at least twelve (12) - months after the date it initially became available, or at least six - (6) months after a subsequent version of that particular Modification - has been made available to such recipients. You are responsible for - ensuring that the Source Code version remains available even if the - Electronic Distribution Mechanism is maintained by a third party. - - 3.3. Description of Modifications. - You must cause all Covered Code to which You contribute to contain a - file documenting the changes You made to create that Covered Code and - the date of any change. You must include a prominent statement that - the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the - Initial Developer in (a) the Source Code, and (b) in any notice in an - Executable version or related documentation in which You describe the - origin or ownership of the Covered Code. - - 3.4. Intellectual Property Matters - (a) Third Party Claims. - If Contributor has knowledge that a license under a third party's - intellectual property rights is required to exercise the rights - granted by such Contributor under Sections 2.1 or 2.2, - Contributor must include a text file with the Source Code - distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will - know whom to contact. If Contributor obtains such knowledge after - the Modification is made available as described in Section 3.2, - Contributor shall promptly modify the LEGAL file in all copies - Contributor makes available thereafter and shall take other steps - (such as notifying appropriate mailing lists or newsgroups) - reasonably calculated to inform those who received the Covered - Code that new knowledge has been obtained. - - (b) Contributor APIs. - If Contributor's Modifications include an application programming - interface and Contributor has knowledge of patent licenses which - are reasonably necessary to implement that API, Contributor must - also include this information in the LEGAL file. - - (c) Representations. - Contributor represents that, except as disclosed pursuant to - Section 3.4(a) above, Contributor believes that Contributor's - Modifications are Contributor's original creation(s) and/or - Contributor has sufficient rights to grant the rights conveyed by - this License. - - 3.5. Required Notices. - You must duplicate the notice in Exhibit A in each file of the Source - Code. If it is not possible to put such notice in a particular Source - Code file due to its structure, then You must include such notice in a - location (such as a relevant directory) where a user would be likely - to look for such a notice. If You created one or more Modification(s) - You may add your name as a Contributor to the notice described in - Exhibit A. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership - rights relating to Covered Code. You may choose to offer, and to - charge a fee for, warranty, support, indemnity or liability - obligations to one or more recipients of Covered Code. However, You - may do so only on Your own behalf, and not on behalf of the Initial - Developer or any Contributor. You must make it absolutely clear than - any such warranty, support, indemnity or liability obligation is - offered by You alone, and You hereby agree to indemnify the Initial - Developer and every Contributor for any liability incurred by the - Initial Developer or such Contributor as a result of warranty, - support, indemnity or liability terms You offer. - - 3.6. Distribution of Executable Versions. - You may distribute Covered Code in Executable form only if the - requirements of Section 3.1-3.5 have been met for that Covered Code, - and if You include a notice stating that the Source Code version of - the Covered Code is available under the terms of this License, - including a description of how and where You have fulfilled the - obligations of Section 3.2. The notice must be conspicuously included - in any notice in an Executable version, related documentation or - collateral in which You describe recipients' rights relating to the - Covered Code. You may distribute the Executable version of Covered - Code or ownership rights under a license of Your choice, which may - contain terms different from this License, provided that You are in - compliance with the terms of this License and that the license for the - Executable version does not attempt to limit or alter the recipient's - rights in the Source Code version from the rights set forth in this - License. If You distribute the Executable version under a different - license You must make it absolutely clear that any terms which differ - from this License are offered by You alone, not by the Initial - Developer or any Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred by - the Initial Developer or such Contributor as a result of any such - terms You offer. - - 3.7. Larger Works. - You may create a Larger Work by combining Covered Code with other code - not governed by the terms of this License and distribute the Larger - Work as a single product. In such a case, You must make sure the - requirements of this License are fulfilled for the Covered Code. - -4. Inability to Comply Due to Statute or Regulation. - - If it is impossible for You to comply with any of the terms of this - License with respect to some or all of the Covered Code due to - statute, judicial order, or regulation then You must: (a) comply with - the terms of this License to the maximum extent possible; and (b) - describe the limitations and the code they affect. Such description - must be included in the LEGAL file described in Section 3.4 and must - be included with all distributions of the Source Code. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Application of this License. - - This License applies to code to which the Initial Developer has - attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. - - 6.1. New Versions. - Netscape Communications Corporation ("Netscape") may publish revised - and/or new versions of the License from time to time. Each version - will be given a distinguishing version number. - - 6.2. Effect of New Versions. - Once Covered Code has been published under a particular version of the - License, You may always continue to use it under the terms of that - version. You may also choose to use such Covered Code under the terms - of any subsequent version of the License published by Netscape. No one - other than Netscape has the right to modify the terms applicable to - Covered Code created under this License. - - 6.3. Derivative Works. - If You create or use a modified version of this License (which you may - only do in order to apply it to code which is not already Covered Code - governed by this License), You must (a) rename Your license so that - the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", - "MPL", "NPL" or any confusingly similar phrase do not appear in your - license (except to note that your license differs from this License) - and (b) otherwise make it clear that Your version of the license - contains terms which differ from the Mozilla Public License and - Netscape Public License. (Filling in the name of the Initial - Developer, Original Code or Contributor in the notice described in - Exhibit A shall not of themselves be deemed to be modifications of - this License.) - -7. DISCLAIMER OF WARRANTY. - - COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF - DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. - THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE - IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE - COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF - ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -8. TERMINATION. - - 8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure - such breach within 30 days of becoming aware of the breach. All - sublicenses to the Covered Code which are properly granted shall - survive any termination of this License. Provisions which, by their - nature, must remain in effect beyond the termination of this License - shall survive. - - 8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declatory judgment actions) against Initial Developer - or a Contributor (the Initial Developer or Contributor against whom - You file such action is referred to as "Participant") alleging that: - - (a) such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such - Participant to You under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate prospectively, - unless if within 60 days after receipt of notice You either: (i) - agree in writing to pay Participant a mutually agreeable reasonable - royalty for Your past and future use of Modifications made by such - Participant, or (ii) withdraw Your litigation claim with respect to - the Contributor Version against such Participant. If within 60 days - of notice, a reasonable royalty and payment arrangement are not - mutually agreed upon in writing by the parties or the litigation claim - is not withdrawn, the rights granted by Participant to You under - Sections 2.1 and/or 2.2 automatically terminate at the expiration of - the 60 day notice period specified above. - - (b) any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then - any rights granted to You by such Participant under Sections 2.1(b) - and 2.2(b) are revoked effective as of the date You first made, used, - sold, distributed, or had made, Modifications made by that - Participant. - - 8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or - indirectly infringes any patent where such claim is resolved (such as - by license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be taken - into account in determining the amount or value of any payment or - license. - - 8.4. In the event of termination under Sections 8.1 or 8.2 above, - all end user license agreements (excluding distributors and resellers) - which have been validly granted by You or any distributor hereunder - prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL - DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, - OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR - ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY - CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, - WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER - COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN - INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF - LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY - RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW - PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE - EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO - THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. - - The Covered Code is a "commercial item," as that term is defined in - 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" and "commercial computer software documentation," as such - terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 - C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), - all U.S. Government End Users acquire Covered Code with only those - rights set forth herein. - -11. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - California law provisions (except to the extent applicable law, if - any, provides otherwise), excluding its conflict-of-law provisions. - With respect to disputes in which at least one party is a citizen of, - or an entity chartered or registered to do business in the United - States of America, any litigation relating to this License shall be - subject to the jurisdiction of the Federal Courts of the Northern - District of California, with venue lying in Santa Clara County, - California, with the losing party responsible for costs, including - without limitation, court costs and reasonable attorneys' fees and - expenses. The application of the United Nations Convention on - Contracts for the International Sale of Goods is expressly excluded. - Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this - License. - -12. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - -13. MULTIPLE-LICENSED CODE. - - Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial - Developer permits you to utilize portions of the Covered Code under - Your choice of the NPL or the alternative licenses, if any, specified - by the Initial Developer in the file described in Exhibit A. - -EXHIBIT A -Mozilla Public License. - - ``The contents of this file are subject to the Mozilla Public License - Version 1.1 (the "License"); you may not use this file except in - compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - License for the specific language governing rights and limitations - under the License. - - The Original Code is ______________________________________. - - The Initial Developer of the Original Code is ________________________. - Portions created by ______________________ are Copyright (C) ______ - _______________________. All Rights Reserved. - - Contributor(s): ______________________________________. - - Alternatively, the contents of this file may be used under the terms - of the _____ license (the "[___] License"), in which case the - provisions of [______] License are applicable instead of those - above. If you wish to allow use of your version of this file only - under the terms of the [____] License and not to allow others to use - your version of this file under the MPL, indicate your decision by - deleting the provisions above and replace them with the notice and - other provisions required by the [___] License. If you do not delete - the provisions above, a recipient may use your version of this file - under either the MPL or the [___] License." - - [NOTE: The text of this Exhibit A may differ slightly from the text of - the notices in the Source Code files of the Original Code. You should - use the text of this Exhibit A rather than the text found in the - Original Code Source Code for Your Modifications.] - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/flv-player-license/license.txt new/doc/latex/flashmovie/flv-player-license/license.txt --- old/doc/latex/flashmovie/flv-player-license/license.txt 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/flv-player-license/license.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -Version: MPL 1.1 - -The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in -compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -License for the specific language governing rights and limitations -under the License. - -The Original Code is flvplayer (http://code.google.com/p/flvplayer/). - -The Initial Developer of the Original Code is neolao (neolao(a)gmail.com). Binary files old/doc/latex/flashmovie/test-beamer-0.pdf and new/doc/latex/flashmovie/test-beamer-0.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-beamer-0.tex new/doc/latex/flashmovie/test-beamer-0.tex --- old/doc/latex/flashmovie/test-beamer-0.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-beamer-0.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -\RequirePackage{flashmovie} -% it is neccessay to use "\RequirePackage{flashmovie}" because beamer -% also uses "\pdfminorversion". see flashmovie.sty for an explanation. - -%--------------------------------------------- -% pure-flash-example -%--------------------------------------------- - -\documentclass[10pt]{beamer} - -\usepackage[english]{babel} -\usepackage{hyperref} - -\usetheme{Warsaw} % Warsaw,Hannover,boxes -\usecolortheme{rose} % orchid,lily,dolphin,beetle,crane -\usefonttheme{professionalfonts} % professionalfonts,serif -\useinnertheme{rounded} % rounded -\useoutertheme{shadow} % shadow,sidebar,split - -%--------------------------------------------- - -\setbeamersize{text margin left=0.3cm} % small margins -\setbeamersize{text margin right=0.3cm} - -%--------------------------------------------- -% for writing a document is is convenient to switch movies off. to do this, -% use "blank=1" as an option. in order to use the videos, use "blank=0". -% -% to make thinks easy, use "blank=\myblank" as an option and define -% \myblank as suitable. - -\def\myblank{0} -%\def\myblank{1} - -%--------------------------------------------- - -\title[flashmovie.sty]{flashmovie.sty} -\author[\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}]{\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}} - -\date[2010]{} - -%--------------------------------------------- - -\begin{document} - -\frame{ - -\titlepage - -\begin{block}{\alert{Warning}} -It is recommended to use the latest available version of the Adobe Reader -to view PDF files generated with flashmovie.sty. -% Otherwise your Adobe Reader may die a sudden painfull death... -\end{block} - -} % end frame - -%--------------------------------------------- - -\begin{frame} - -\frametitle{Basics} - -\begin{minipage}[t]{6.1cm} -\vspace{0cm} -\flashmovie[width=6cm,height=5cm]{saturn5.swf} -\end{minipage} -\begin{minipage}[t]{5.7cm} -\vspace{0cm} -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. -\vspace{0.5cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. - -\end{minipage} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Explanation} - -The source code used for the video on the previous page is: - -\begin{verbatim} -\flashmovie[width=6cm,height=5cm]{saturn5.swf} -\end{verbatim} - -This means that the movie is really a flash animation and is not -rendered by a player. So no controls are available. - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Issues with the flv-player} - -\begin{itemize} - -\item Sadly the flv-player does not work reliably with the latex package -beamer. If you try it, the acrobat reader often crashes while trying -to change the page. I have no idea what is the cause of this problem. - -\item The only reliable way to use beamer seems to be directly embedding the videos as - flash animations or to use the JW player. - -\end{itemize} - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Advanced use} - -Rich media annotations are not restricted to videos. -You can use flash animations, too. -Here for example is a clock written in action script: - -\flashmovie[width=8cm,height=5cm,blank=\myblank]{clock.swf} - -\begin{verbatim} - \flashmovie[width=8cm,height=5cm]{clock.swf} -\end{verbatim} - -\end{frame} - -%--------------------------------------------- - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-beamer-1.tex new/doc/latex/flashmovie/test-beamer-1.tex --- old/doc/latex/flashmovie/test-beamer-1.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-beamer-1.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,177 +0,0 @@ -\RequirePackage{flashmovie} -% it is neccessay to use "\RequirePackage{flashmovie}" because beamer -% also uses "\pdfminorversion". see flashmovie.sty for an explanation. - -%--------------------------------------------- -% jw-player-example -%--------------------------------------------- - -\documentclass[10pt]{beamer} - -\usepackage[english]{babel} -\usepackage{hyperref} - -\usetheme{Warsaw} % Warsaw,Hannover,boxes -\usecolortheme{rose} % orchid,lily,dolphin,beetle,crane -\usefonttheme{professionalfonts} % professionalfonts,serif -\useinnertheme{rounded} % rounded -\useoutertheme{shadow} % shadow,sidebar,split - -%--------------------------------------------- - -\setbeamersize{text margin left=0.3cm} % small margins -\setbeamersize{text margin right=0.3cm} - -%--------------------------------------------- -% for writing a document is is convenient to switch movies off. to do this, -% use "blank=1" as an option. in order to use the videos, use "blank=0". -% -% to make thinks easy, use "blank=\myblank" as an option and define -% \myblank as suitable. - -\def\myblank{0} -%\def\myblank{1} - -%\def\mymovie{saturn5} -\def\mymovie{flagmoon} % if the noise of saturn5 annoyes to much - -%--------------------------------------------- - -\title[flashmovie.sty]{flashmovie.sty} -\author[\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}]{\href{mailto:thartmann15@googlemail.com}{Timo Hartmann}} - -\date[2010]{} - -%--------------------------------------------- - -\begin{document} - -\frame{ - -\titlepage - -\begin{block}{\alert{Warning}} -It is recommended to use the latest available version of the Adobe Reader -to view PDF files generated with flashmovie.sty. -% Otherwise your Adobe Reader may die a sudden painfull death... -\end{block} - -} % end frame - -%--------------------------------------------- - -\begin{frame} - -\frametitle{Basics} - -\begin{minipage}[t]{6.1cm} -\vspace{0cm} -\flashmovie[width=6cm,height=5cm,engine=jw-player,auto=1,blank=\myblank]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{5.7cm} -\vspace{0cm} -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. -\vspace{0.5cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. - -\end{minipage} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/\mymovie.avi}{\mymovie.avi} ). - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{\href{http://www.longtailvideo.com/players/jw-flv-player}{JW Player}} - -The source code used for the video on the previous page is: - -\begin{verbatim} -\flashmovie[width=6cm,height=5cm, - engine=jw-player,auto=1]{movie.mp4} -\end{verbatim} - -This means that the movie is rendered with the -\href{http://www.longtailvideo.com/players/jw-flv-player}{``JW Player''} -from longtail video (\href{http://www.longtailvideo.com}{www.longtailvideo.com}). - -\vspace{0.5cm} - -This is an open source flash player released under a -\href{http://creativecommons.org/licenses/by-nc-sa/3.0/}{non-commercial license}, -which means its free for non-commercial use. - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Issues with the flv-player} - -\begin{itemize} - -\item Sadly the \href{http://flv-player.net}{flv-player} does not work -reliably with the latex package beamer. If you try it, the acrobat reader -often crashes while trying to change the page. I have no idea -what is the cause of this problem. - -\item The only reliable way to use beamer seems to be directly embedding the videos as - flash animations or to use the JW player. - -\end{itemize} - -\end{frame} - -%--------------------------------------------- - -\begin{frame}[fragile] - -\frametitle{Options for the \href{http://www.longtailvideo.com/players/jw-flv-player}{JW Player}} - -\begin{minipage}[t]{4.1cm} -\vspace{0cm} -\flashmovie[width=4cm,height=3cm,engine=jw-player,auto=0,controlbar=0,blank=\myblank]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{7cm} -\vspace{0cm} -In this example the video is not started before the user clicks on it. The controlbar is disabled, too. -\begin{verbatim} -\flashmovie[width=4cm,height=3cm, - engine=jw-player,auto=0, - controlbar=0]{movie.mp4} -\end{verbatim} -\end{minipage} - -\begin{minipage}[t]{4.1cm} -\vspace{0cm} -\flashmovie[width=4cm,height=3cm,engine=jw-player,auto=0,image=saturn.jpg,blank=\myblank,loop=1]{\mymovie.mp4} -\end{minipage} -\begin{minipage}[t]{7cm} -\vspace{0cm} -Here additionally an image is displayed before the movie starts. The movie also loops. -\begin{verbatim} -\flashmovie[width=4cm,height=3cm, - engine=jw-player,auto=0, - image=saturn.jpg,loop=1] - {movie.mp4} -\end{verbatim} -\end{minipage} - -\end{frame} - -%--------------------------------------------- - -\end{document} Binary files old/doc/latex/flashmovie/test-flv.pdf and new/doc/latex/flashmovie/test-flv.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test-flv.tex new/doc/latex/flashmovie/test-flv.tex --- old/doc/latex/flashmovie/test-flv.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test-flv.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -\documentclass[10pt]{article} - -\usepackage[utf8]{inputenc} -\usepackage[english]{babel} -\usepackage{hyperref} -\usepackage{color} - -\usepackage{flashmovie} - -\begin{document} - -{\Huge flashvideo.sty}\\\\ - -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -\flashmovie[width=10cm,height=10cm,engine=flv-player,auto=1]{saturn5.mp4} - -%\vspace{1cm} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. - -\vspace{0.5cm} - -This means that you can only use flashmovie.sty in combination -with Adobe Reader 9 and upwards. -% Otherwise your Adobe Reader may die a sudden painfull death... - -\vspace{0.5cm} - -\textcolor{red}{ - It is recommended to use the latest available version of the Adobe Reader - to view PDF files generated with flashmovie.sty. -} - -\vspace{0.5cm} - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\newpage - -The source code used for the video on the previous page is: - -\begin{verbatim} - \flashmovie[width=10cm,height=10cm,engine=flv-player,auto=1]{saturn5.mp4} -\end{verbatim} - -This means that the movie is rendered with the \href{http://flv-player.net}{``flv-player''} -whose developer is neolao. This player is distributed under the -\href{http://www.mozilla.org/MPL/}{MPL version 1.1}. -It is included in this package and is the recommended way to use ``flashmovie.sty'' -besides directly embedding ``.swf'' files. - -\vspace{1cm} - -{\Huge Examples}\\\\ - -\flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0]{saturn5.mp4} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0]{saturn5.mp4} -\end{verbatim} -In this example the video is not started before the user clicks on it. - -\vspace{1cm} - -\flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0,image=saturn.jpg]{saturn5.mp4} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm,engine=flv-player,auto=0,image=saturn.jpg]{saturn5.mp4} -\end{verbatim} -Here additionally an image is displayed before the movie starts. - -\newpage - -Rich media annotations are not restricted to videos. -Here for example is a clock written in action script: - -\flashmovie[width=8cm,height=5cm]{clock.swf} -\begin{verbatim} - \flashmovie[width=8cm,height=5cm]{clock.swf} -\end{verbatim} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flashmovie/test.tex new/doc/latex/flashmovie/test.tex --- old/doc/latex/flashmovie/test.tex 2012-03-29 01:01:27.000000000 +0200 +++ new/doc/latex/flashmovie/test.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -\documentclass[10pt]{article} - -\usepackage[utf8]{inputenc} -\usepackage[english]{babel} -\usepackage{hyperref} - -\usepackage{flashmovie} - -\begin{document} - -{\Huge flashvideo.sty}\\\\ - -This package allows direct embedding of flash movies into PDF files. It is -designed for use with pdflatex. - -\flashmovie[width=10cm,height=10cm]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=pure-swf]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=blank]{saturn5.swf} -%\flashmovie[width=10cm,height=10cm,engine=flv-player]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=flv-player,blank=0]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=flv-player,blank=1]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=acropro]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=jw-player]{saturn5.mp4} -%\flashmovie[width=10cm,height=10cm,engine=osplayer]{saturn5.mp4} - -Basically it uses the fact that the Adobe Reader 9 contains an embedded Adobe Flash -player which can be invoked with the ``rich media annotation'' feature which is described -in ``Adobe Supplement to the ISO 32000 BaseVersion: 1.7 ExtensionLevel: 3''. - -P.S.: This sample video is courtesy of the NASA ( \href{http://heasarc.gsfc.nasa.gov/Videos/historical/saturn5.avi}{saturn5.avi} ). - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/esdiff/esdiff.sty new/tex/latex/esdiff/esdiff.sty --- old/tex/latex/esdiff/esdiff.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/esdiff/esdiff.sty 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,152 @@ +%% +%% This is file `esdiff.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% esdiff.dtx (with options: `package') +%% +%% Package for the notation of derivatives. +%% Eddie Saudrais, 08/09/1999. +%% Version 1.1 +%% +%% If you found any bug, please contact me at +%% eddie.saudrais(a)wanadoo.fr. +%% Maybe there is a new version at +%% http://perso.wanadoo.fr/eddie.saudrais/latex/latex.html +%% +%% Run LaTeX on esdiff.ins to generate esdiff.sty +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{esdiff} +\newcommand*{\ES@taille}[1]{\displaystyle{#1}} +\newcommand*{\ES@difint}{\mkern 0mu} +\newcommand*{\ES@derpint}{\mkern 0mu} +\newcommand*{\ES@croisint}{\mkern 0mu} +\newcommand*{\ES@dop}{\mathrm{d}} +\DeclareOption{display}{\renewcommand*{\ES@taille}[1]{\displaystyle{#1}}} +\DeclareOption{text}{\renewcommand*{\ES@taille}[1]{\textstyle{#1}}} +\DeclareOption{roman}{\renewcommand*{\ES@dop}{\ensuremath{\mathrm{d}}}} +\DeclareOption{italic}{\renewcommand*{\ES@dop}{\ensuremath{d}}} +\DeclareOption{thin}{\renewcommand*{\ES@difint}{\ensuremath{\,}}} +\DeclareOption{med}{\renewcommand*{\ES@difint}{\ensuremath{\;}}} +\DeclareOption{big}{\renewcommand*{\ES@difint}{\ensuremath{\:}}} +\DeclareOption{thinp}{\renewcommand*{\ES@derpint}{\ensuremath{\,}}} +\DeclareOption{medp}{\renewcommand*{\ES@derpint}{\ensuremath{\;}}} +\DeclareOption{bigp}{\renewcommand*{\ES@derpint}{\ensuremath{\:}}} +\DeclareOption{thinc}{\renewcommand*{\ES@croisint}{\ensuremath{\,}}} +\DeclareOption{medc}{\renewcommand*{\ES@croisint}{\ensuremath{\;}}} +\DeclareOption{bigc}{\renewcommand*{\ES@croisint}{\ensuremath{\:}}} +\ProcessOptions\relax +\newcommand*{\diff}{} +\def\diff{\@ifstar{\ES@diffstar}{\ES@diffnostar}} +\def\ES@diffstar{\@ifnextchar[{\ES@diffstar@i}{\ES@diffstar@ii}} +\def\ES@diffstar@i[#1]#2#3#4{% +\mathchoice{% +\left(\frac{\ES@dop^{#1}\ES@difint#2}% +{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}% +{\ES@taille{\left(\frac{\ES@dop^{#1}\ES@difint#2}% +{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}% +{\scriptstyle{\left(\frac{\ES@dop^{#1}\ES@difint#2}% +{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}% +{\scriptstyle{\left(\frac{\ES@dop^{#1}\ES@difint#2}% +{\ES@dop\ES@difint#3^{#1}}\right)_{\mkern-7mu#4}}}} +\def\ES@diffstar@ii#1#2#3{% +\mathchoice{\left(\frac{\ES@dop\ES@difint#1}% +{\ES@dop\ES@difint#2}\right)_{\mkern-7mu#3}}% +{\ES@taille{\left(\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}% +\right)_{\mkern-7mu#3}}}{\scriptstyle{\left(% +\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}\right)% +_{\mkern-7mu#3}}}% +{\scriptstyle{\left(\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}\right)% +_{\mkern-7mu#3}}}} +\def\ES@diffnostar{\@ifnextchar[{\ES@diffnostar@i}{\ES@diffnostar@ii}} +\def\ES@diffnostar@i[#1]#2#3{\mathchoice{\frac{\ES@dop^{#1}\ES@difint#2}% +{\ES@dop\ES@difint#3^{#1}}}% +{\ES@taille{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}% +{\scriptstyle{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}% +{\scriptstyle{\frac{\ES@dop^{#1}\ES@difint#2}{\ES@dop\ES@difint#3^{#1}}}}} +\def\ES@diffnostar@ii#1#2{\mathchoice% +{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}% +{\ES@taille{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}% +{\scriptstyle{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}% +{\scriptstyle{\frac{\ES@dop\ES@difint#1}{\ES@dop\ES@difint#2}}}} +\newcommand*{\diffp}{} +\def\diffp{\@ifstar{\ES@diffpstar}{\ES@diffpnostar}} +\def\ES@diffpstar{\@ifnextchar[{\ES@diffpstar@i}{\ES@diffpstar@ii}} +\def\ES@diffpstar@i[#1]#2#3#4{% +\mathchoice{\left(\frac{\partial^{#1}% +\ES@derpint#2}{\partial\ER@derpint#3^{#1}}\right)_{\mkern-7mu#4}}% +{\ES@taille{\left(\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}% +\right)_{\mkern-7mu#4}}}% +{\scriptstyle{\left(\frac{\partial^{#1}\ES@derpint#2}% +{\partial\ES@derpint#3^{#1}}% +\right)_{\mkern-7mu#4}}}% +{\scriptstyle{\left(\frac{\partial^{#1}\ES@derpint#2}% +{\partial\ES@derpint#3^{#1}}% +\right)_{\mkern-7mu#4}}}} +\def\ES@diffpstar@ii#1#2#3{\mathchoice{\left({\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}\right)_{\mkern-7mu#3}}% + {\ES@taille{\left({\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}\right)_{\mkern-7mu#3}}}% + {\scriptstyle{\left({\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}\right)_{\mkern-7mu#3}}}% + {\scriptstyle{\left({\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}\right)_{\mkern-7mu#3}}}} +\def\ES@diffpnostar{\@ifnextchar[{\ES@diffpnostar@i}{\ES@diffpnostar@ii}} +\def\ES@diffpnostar@i[#1]#2#3{% +\mathchoice{\frac{\partial^{#1}\ES@derpint#2}% +{\partial\ES@derpint#3^{#1}}}% +{\ES@taille{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}% +{\scriptstyle{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}% +{\scriptstyle{\frac{\partial^{#1}\ES@derpint#2}{\partial\ES@derpint#3^{#1}}}}} +\def\ES@diffpnostar@ii#1#2{\mathchoice{\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}% + {\ES@taille{\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}}% + {\scriptstyle{\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}}% + {\scriptstyle{\begingroup + \toks0={}\count0=0 + \ES@degree #2\ES@degree + \frac{\partial\ifnum\count0>1^{\the\count0 }\fi\ES@derpint#1}% + {\the\toks0}% + \endgroup}}} +\def\ES@degree #1{\ifx #1\ES@degree \expandafter\ES@stopd + \else \expandafter\ES@addd \fi #1^1$#1\ES@addd} +\def\ES@stopd #1\ES@addd{} +\def\ES@addd #1^#2#3$#4\ES@addd{\advance\count0 #2 + \toks0=\expandafter{\the\toks0% + {\partial\ES@derpint #4}% + \ES@croisint}\ES@degree} +\endinput +%% +%% End of file `esdiff.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/esdiff.tlpobj new/tlpkg/tlpobj/esdiff.tlpobj --- old/tlpkg/tlpobj/esdiff.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/esdiff.tlpobj 2017-04-14 17:39:31.000000000 +0200 @@ -0,0 +1,17 @@ +name esdiff +category Package +revision 21385 +shortdesc Simplify typesetting of derivatives +relocated 1 +longdesc The package makes writing derivatives very easy. It offers +longdesc macros for derivatives, partial derivatives and multiple +longdesc derivatives, and allows specification of the point at which the +longdesc value is calculated. Some typographic alternatives may be +longdesc selected by package options +runfiles size=2 + RELOC/tex/latex/esdiff/esdiff.sty +catalogue-ctan /macros/latex/contrib/esdiff +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1 +catalogue-topics maths +catalogue-version 1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flashmovie.doc.tlpobj new/tlpkg/tlpobj/flashmovie.doc.tlpobj --- old/tlpkg/tlpobj/flashmovie.doc.tlpobj 2016-04-14 19:02:42.000000000 +0200 +++ new/tlpkg/tlpobj/flashmovie.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -name flashmovie.doc -category Package -revision 25768 -shortdesc doc files of flashmovie -relocated 1 -docfiles size=345 - RELOC/doc/latex/flashmovie/README - RELOC/doc/latex/flashmovie/flv-player-license/MPL-1.1 - RELOC/doc/latex/flashmovie/flv-player-license/license.txt - RELOC/doc/latex/flashmovie/test-beamer-0.pdf - RELOC/doc/latex/flashmovie/test-beamer-0.tex - RELOC/doc/latex/flashmovie/test-beamer-1.tex - RELOC/doc/latex/flashmovie/test-flv.pdf - RELOC/doc/latex/flashmovie/test-flv.tex - RELOC/doc/latex/flashmovie/test.tex ++++++ fixmetodonotes.doc.tar.xz -> etoc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/README.md new/doc/latex/etoc/README.md --- old/doc/latex/etoc/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/etoc/README.md 2016-11-25 19:28:48.000000000 +0100 @@ -0,0 +1,205 @@ + + + Source: etoc.dtx (v1.08i-2016/09/29) + Author: Jean-Francois Burnol + Author: Christine Roemer et al. (German tranlation) + Info: Completely customisable TOCs + License: LPPL 1.3c + Copyright (C) 2012-2016 Jean-Francois Burnol. + Copyright (C) 2014-2016 Christine Roemer and collaborators for + the translation into German of the documentation. + <jfbu at free dot fr> <Christine_Roemer at t-online dot de> + +ABSTRACT +======== + +The etoc package gives to the user complete control on how the entries +of the table of contents should be constituted from the *name*, +*number*, and *page number* of each sectioning unit. This goes via the +definition of *line styles* for each sectioning level used in the +document. The package provides its own custom line styles. Simpler +ones are given as examples in the documentation. The simplest usage +will be to take advantage of the layout facilities of packages dealing +with list environments. + +Regarding the *global toc display*, etoc provides pre-defined styles +based on a multi-column format, with, optionally, a ruled title or +framed contents. + +The `\tableofcontents` command may be used arbitrarily many times and +it has a variant `\localtableofcontents` which prints tables of +contents 'local' to the current surrounding document unit. An +extension of the `\label/\ref` syntax allows to reproduce (with +another layout) a local table of contents defined somewhere else in +the document. + +Via *depth tags*, one gets an even finer control for each table of +contents of which sectioning units it should, or not, display. + +The formatting inherited (and possibly customized by other packages) +from the document class will be used when in compatibility mode. + +The assignment of levels to the sectioning units can be changed at any +time, and etoc can thus be used in a quite general manner to create +custom ''lists of'', additionally to the tables of contents related to +the document sectioning units. No auxiliary file is used additionally +to the standard `.toc` file. + +INSTALLATION +============ + +The simplest is to download + +> <http://mirrors.ctan.org/install/macros/latex/contrib/etoc.tds.zip> + +and then run `unzip etoc.tds.zip -d <DEST>` where `<DEST>` is a +TDS-compliant repertory. + +Else, to extract the package (.sty) and driver (.tex) files from etoc.dtx: + +- if etoc.ins is present: etex etoc.ins +- without etoc.ins: etex etoc.dtx + +It is also possible to run latex or pdflatex directly on etoc.dtx. + +To produce etoc.pdf one can run pdflatex (thrice) directly on etoc.dtx or on +the file etoc.tex which was extracted from previous step. + +Options can be set in etoc.tex: + +- scrdoc class options (paper size, font size, ...) +- with or without source code, +- with dvipdfmx or with latex+dvips or pdflatex. + +Since release 1.08h pdflatex is the default in etoc.tex (prior it +was latex+dvipdfmx as it produces smaller PDFs) in order to allow +inclusion via the use of package `attachfile` of about 25 code +samples as file attachment annotations. + +Installation: + + etoc.sty -> TDS:tex/latex/etoc/etoc.sty + etoc.dtx -> TDS:source/latex/etoc/etoc.dtx + etoc.pdf -> TDS:doc/latex/etoc/etoc.pdf + etoc-DE.pdf -> TDS:doc/latex/etoc/etoc-DE.pdf + README.md -> TDS:doc/latex/etoc/README.md + +The other files may be discarded. + +LICENSE +======= + +This Work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, in its +version 1.3c. This version of this license is in + +> <http://www.latex-project.org/lppl/lppl-1-3c.txt> + +and 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. + +The Authors of this Work are: + +- Jean-Francois Burnol `<jfbu at free dot fr>` for the source code + and English documentation, and +- Christine Roemer `<Christine_Roemer at t-online dot de>` and + collaborators for the translation into German of the documentation. + +This Work consists of the main source file etoc.dtx and the +derived files etoc.sty, etoc.ins, etoc.tex, etoc-DE.tex, +etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi. + +RECENT CHANGES +============== + +v1.08i \[2016/09/29\] +--------------------- + +This fixes an issue dating back to `1.08e-2015/04/17`: under +`\etocchecksemptiness` regime, some circumstances (such as adding to +an already compiled document a `\localtableofcontents` before the +main `\tableofcontents`) created an "`Undefined control sequence` +`\Etoc@localtop`" error. Thanks to Denis BitouzÃ© for reporting the +problem. + +On this occasion, `\etocdoesnotcheckemptiness` has been +added to unset the flag. + +A rather more exotic issue was fixed: the emptiness check for +local tocs could get confused if the `tocdepth` counter was varying +in some specific ways from inside the `toc` file. + +After adding to a document a `\localtableofcontents`, two LaTeX +passes are needed for etoc to get a chance to print the +correct local contents. Formerly, etoc issued a Warning on +the first pass; it now also induces LaTeX into +announcing "There were undefined references", as this is nearer +to the end of the log file and console output. + +v1.08h \[2016/09/25\] +--------------------- + +New functioning of `\etocsetnexttocdepth`: the tocdepth counter is +modified only at the time of the table of contents, not before. This +fixes an issue which arose when `\etocsetnexttocdepth` was used +multiple times with no intervening table of contents. Thanks to +Denis BitouzÃ© for reporting the problem. + +The PDF documentation includes about 25 LaTeX code snippets also +as file attachment annotations, additionally to their verbatim +typesetting. The ordering of the documentation contents has been +slightly re-organized. + +A previous documentation-only update on 2016/09/09 added a new +section with the (approximate) translation into etoc lingua of the +book class toc style, for easy customizability. + +v1.08g \[2015/08/29\] +--------------------- + +Downgraded to a mere info message the etoc-issued warning +(relative to `\settocdepth/\maxtocdepth`) under class `memoir`. + +v1.08f \[2015/04/28\] +--------------------- + +Minor changes to the documentation. `\etocsetlevel` more economical. + +v1.08e \[2015/04/17\] +--------------------- + +The command `\etocchecksemptiness` tells etoc to not print, from +that point on, the headings of the local tables of contents if +they have empty contents. This is mainly for class authors who +might want to have their `\section` or `\chapter` automatically do +a `\localtableofcontents`. Could prove also useful for batch +conversions of documents. Thanks to Paul Gaborit who asked for +such a feature. + +The command `\etocnotocifnotoc` extends this behaviour to global +TOCs: indeed why should documents with no sectioning units take +this as an excuse not to use package etoc ? + +The command `\etocifwasempty{yes}{no}` can be used for +suitable extra action. + +A `\tableofcontents\ref{foo}` now expects foo to be a label to a +_local_ TOC. The use with foo a label to a _global_ TOC is not +supported anymore as it had no utility and made the code more +complex. + +The syntax `\localtableofcontents\ref{foo}` is now accepted as a +synonym to the earlier syntax `\tableofcontents\ref{foo}`. + +v1.08d \[2015/04/09\] +--------------------- + +Translation into German of the additions made to the documentation +for the 1.08x series of releases. + +Thanks to Christine RÃ¶mer! + Binary files old/doc/latex/etoc/etoc-DE.pdf and new/doc/latex/etoc/etoc-DE.pdf differ Binary files old/doc/latex/etoc/etoc.pdf and new/doc/latex/etoc/etoc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fixmetodonotes/LICENSE new/doc/latex/fixmetodonotes/LICENSE --- old/doc/latex/fixmetodonotes/LICENSE 2012-07-15 01:06:29.000000000 +0200 +++ new/doc/latex/fixmetodonotes/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fixmetodonotes/README new/doc/latex/fixmetodonotes/README --- old/doc/latex/fixmetodonotes/README 2013-04-30 01:29:37.000000000 +0200 +++ new/doc/latex/fixmetodonotes/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -fixmetodonotes -============== - -A LaTeX package to highlight and manage FIXME and TODO annotations. - - -Usage ------ - -In the preamble add - - \usepackage{fixmetodonotes} - -In the document write notes using - - I believe that in the \FIXME{"next year" or "future"?} the revolution - will not be televised. - -or - - \TODO{add a playful picture} - -To show a list of pending notes, together with links to their pages, use - - \listofnotes - -The list of notes will be shown like a table of content or a list of figures. - - -### Creating new kinds of notes - -By default, `fixmetodonotes` provides three kinds of notes: `FIXME`, `TODO` and -`CITE`. - -It is possible to add declare new kinds of notes using the `\defnote` -command. Notes can be declared as _margin_ or _inline_ notes. It is also -possible to specify new ways to mark the text. - -To define a new kind of note called `REMOVE` that displays a margin note -and crosses out the text, use - - \defnote{REMOVE}{margin}{\sout} - -Similarly, to define a red highlight marker `STYLE` use - - \defnote{STYLE}{inline}{\NOTES@colorline{red}} - - -### Automatic "DRAFT" watermark - -`fixmetodonotes` will add a "DRAFT" watermark to any page that has at least -one notes. - -When all the notes are removed from a page, the watermark will not be produced -at all. This means that it is possible to leave `fixmetodonotes` enabled even -in final versions of the documents. - -Use the `nowatermark` option to disable all watermarks. - - -Installation ------------- - -The released archives can be installed using the standard LaTeX mechanism. - - latex fixmetodonotes.ins - -This will generate a `fixmetodonotes.sty` file that can be moved to a -directory searched by TeX. - -You can also install `fixmetodonotes` in your home directory using the -git repository. - - export TEXMFHOME=~/.texmf - mkdir -p ~/.texmf/tex/latex/ - cd ~/.texmf/tex/latex/ - git clone git://github.com/gioele/fixmetodonotes.git - - -Contact -------- - -The homepage of `fixmetodonotes` is <https://github.com/gioele/fixmetodonotes>. -You can send any issue or comment to <https://github.com/gioele/fixmetodonotes/issues>. - - -Authors -------- - -* Gioele Barabucci <http://svario.it/gioele> (initial author) - - -License -------- - -This is free software released into the public domain (CC0 license). - -See the `LICENSE` file or <http://creativecommons.org/publicdomain/zero/1.0/> -for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoc.doc.tlpobj new/tlpkg/tlpobj/etoc.doc.tlpobj --- old/tlpkg/tlpobj/etoc.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/etoc.doc.tlpobj 2017-04-14 17:39:37.000000000 +0200 @@ -0,0 +1,9 @@ +name etoc.doc +category Package +revision 42182 +shortdesc doc files of etoc +relocated 1 +docfiles size=293 + RELOC/doc/latex/etoc/README.md + RELOC/doc/latex/etoc/etoc-DE.pdf + RELOC/doc/latex/etoc/etoc.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixmetodonotes.doc.tlpobj new/tlpkg/tlpobj/fixmetodonotes.doc.tlpobj --- old/tlpkg/tlpobj/fixmetodonotes.doc.tlpobj 2016-04-14 19:02:40.000000000 +0200 +++ new/tlpkg/tlpobj/fixmetodonotes.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name fixmetodonotes.doc -category Package -revision 30168 -shortdesc doc files of fixmetodonotes -relocated 1 -docfiles size=3 - RELOC/doc/latex/fixmetodonotes/LICENSE - RELOC/doc/latex/fixmetodonotes/README ++++++ fixmetodonotes.doc.tar.xz -> etoc.tar.xz ++++++ ++++ 1614 lines of diff (skipped) ++++++ fmtcount.doc.tar.xz -> euenc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/euenc/README new/doc/latex/euenc/README --- old/doc/latex/euenc/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/euenc/README 2016-11-25 19:28:48.000000000 +0100 @@ -0,0 +1,88 @@ +_______________________ +THE EUx ENCODINGS v0.1h + +This package is a step towards offering a LaTeX font encoding +based on unicode. An example file "test-euxlm.ltx" is distributed +with the package. + +This package is mainly used underneath the fontspec package; +unless you wish to manually perform font installation and loading, +you will generally not need to use euenc directly. + +The euenc package provides the EU1 encoding for unicode fonts +in XeTeX, and the EU2 encoding for unicode fonts in LuaTeX. + +No macro support is offered under XeTeX, for which Ross Moore's +xunicode package should be used to provide LaTeX support for +access to unicode symbols and accents. + +For LuaTeX, we have taken a subset of xunicode and incorporated +it into the EU2 encoding, so no extra packages need to be loaded. + +Please see the documentation euenc.pdf for further information. + +This package is developed at <http://github.com/wspr/euenc>. + + +Installation +------------ + +Here are the recommended installation methods (preferred first). + +1. If you are using TeX Live 2008 or later, use 'tlmgr install euenc'. +Alternatively, try your (TeX or Linux) distribution's package management system. + +2. a. Download euenc.tds.zip from CTAN. + b. Unzip it at the root of one or your TDS trees. + c. You may need to update some filename database after, see your TeX +distribution's manual for details. + +3. a. Grab the sources from CTAN or github. + b. Run 'make install TEXMFROOT=/path/to/texmf'. + c. See 2c. + +4. Try to figure it out by looking at the Makefile and comments in the sources. +Note that the generation of the files need a shell and doesn't work under +cygwin. + + +Manifest +-------- + +Source files: + euenc.dtx single file source & doc for the package + +Derived files: + euenc.pdf documentation + euxunicode.sty xunicode for LuaTeX, automatically loaded by EU2 + test-euxlm.ltx LaTeX example document + convert-lmfd.sh Shell script to generate the eu*.fd files + sed-eu2lmr.sed Sed script to generate the eu2*.fr files + sed-eu1lmr.sed Sed script to generate the eu1*.fr files + eu1lmdh.fd Latin Modern font description file + eu1lmr.fd . + eu1lmss.fd . + eu1lmssq.fd . + eu1lmtt.fd . + eu1lmvtt.fd . + eu2lmdh.fd . + eu2lmr.fd . + eu2lmss.fd . + eu2lmssq.fd . + eu2lmtt.fd . + eu2lmvtt.fd . + + +License +------- + +Copyright 2006-2010 Will Robertson <wspr81(a)gmail.com> +Copyright 2009-2010 Elie Roux <elie.roux(a)telecom-bretagne.eu> +Copyright 2009-2010 Khaled Hosny <khaledhosny(a)eglug.org> + +Distributable 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 + +This work is "maintained" (as per LPPL maintenance status) +by Will Robertson. Binary files old/doc/latex/euenc/euenc.pdf and new/doc/latex/euenc/euenc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/euenc/test-euxlm.ltx new/doc/latex/euenc/test-euxlm.ltx --- old/doc/latex/euenc/test-euxlm.ltx 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/euenc/test-euxlm.ltx 2016-11-25 19:28:48.000000000 +0100 @@ -0,0 +1,143 @@ +%% +%% This is file `test-euxlm.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% euenc.dtx (with options: `lmtest') +%% +%% _____________________________________ +%% The EUENC bundle +%% Will Robertson, Elie Roux, Khaled Hosny +%% +%% License information appended. +%% +\documentclass[12pt]{article} +\usepackage[margin=2.5cm]{geometry} +\newenvironment{vrb} + {\begin{tabular}{@{}p{7cm}l@{}}} + {\end{tabular}} + +\usepackage{fancyvrb} +\DefineShortVerb{\|} + +\usepackage{slantsc} +\usepackage{ifluatex} +\usepackage{ifxetex} +\ifxetex + \def\EU{EU1} +\else + \ifluatex + \usepackage{luaotfload} + \def\EU{EU2} + \else + \def\EU{T1} + \fi +\fi +\usepackage[\EU]{fontenc} +\usepackage{lmodern} +\begin{document} + +\title{Testing the Latin Modern \texttt{\EU} encoding} +\author{Will Robertson} +\maketitle +\thispagestyle{empty} +\pagestyle{empty} + +\section*{Roman} + +\fontfamily{lmr}\selectfont +\begin{vrb} +|\rmdefault| & {\selectfont Latin Modern Roman} \\ +| \itshape| & {\itshape Latin Modern Roman Italic} \\ +| \slshape| & {\slshape Latin Modern Roman Oblique} \\ +| \scshape| & {\scshape Latin Modern Roman Small Caps} \\ +| \slshape| & {\scshape\slshape Latin Modern Roman Oblique Small Caps} \\ +| \bfseries| & {\bfseries Latin Modern Roman Bold Extended} \\ +| \itshape| & {\bfseries\itshape Latin Modern Roman Bold Italic Extended} \\ +| \slshape| & {\bfseries\slshape Latin Modern Roman Bold Oblique Extended} \\ +| \fontseries{b}| & {\fontseries{b}\selectfont Latin Modern Roman Bold} \\ +| \fontseries{b}\slshape| & {\fontseries{b}\slshape Latin Modern Roman Bold Oblique} \\ +\end{vrb} + +\section*{Dunhill} + +\fontfamily{lmdh}\selectfont +\begin{vrb} +|\fontfamily{lmdh}\selectfont| & {Latin Modern Dunhill} \\ +| \slshape| & {\slshape Latin Modern Dunhill Oblique} \\ +\end{vrb} + +\section*{Sans} + +\fontfamily{lmss}\selectfont +\begin{vrb} +|\sffamily| & {\selectfont Latin Modern Sans} \\ +| \slshape| & {\slshape Latin Modern Sans Oblique} \\ +| \bfseries| & {\bfseries Latin Modern Sans Bold} \\ +| \slshape| & {\bfseries\slshape Latin Modern Sans Bold Oblique} \\ +| \fontseries{sbc}\selectfont| & {\fontseries{sbc}\selectfont Latin Modern Sans Demi Condensed} \\ +| \slshape| & {\fontseries{sbc}\selectfont\slshape Latin Modern Sans Demi Condensed Oblique} \\ +\end{vrb} + +\section*{Sans Quotation} + +\fontfamily{lmssq}\selectfont +\begin{vrb} +|\renewcommand\sfdefault{lmssq}| \\ +|\sffamily | & {\selectfont Latin Modern Sans Extended} \\ +| \slshape | & {\slshape Latin Modern Sans Extended Oblique} \\ +| \bfseries | & {\bfseries Latin Modern Sans Bold Extended} \\ +| \slshape | & {\bfseries\slshape Latin Modern Sans Bold Extended Oblique} \\ +\end{vrb} + +\section*{Typewriter} + +\fontfamily{lmtt}\selectfont +\begin{vrb} +|\ttfamily | & {\selectfont Latin Modern Typewriter} \\ +| \itshape | & {\itshape Latin Modern Typewriter Italic} \\ +| \slshape | & {\slshape Latin Modern Typewriter Oblique} \\ +| \scshape | & {\scshape Latin Modern Typewriter Small Caps} \\ +| \scshape\slshape | & {\scshape\slshape Latin Modern Typewriter Oblique Small Caps} \\ +| \bfseries | & {\bfseries Latin Modern Typewriter Dark} \\ +| \slshape | & {\bfseries\slshape Latin Modern Typewriter Dark Oblique} \\ +| \fontseries{b}\selectfont | & {\fontfamily{lmtt}\fontseries{b}\selectfont Latin Modern Typewriter Dark} \\ +| \fontseries{b}\slshape | & {\fontfamily{lmtt}\fontseries{b}\slshape Latin Modern Typewriter Dark Oblique} \\ +| \fontseries{l}\selectfont | & {\fontfamily{lmtt}\fontseries{l}\selectfont Latin Modern Typewriter Light} \\ +| \fontseries{l}\slshape | & {\fontfamily{lmtt}\fontseries{l}\slshape Latin Modern Typewriter Light Oblique} \\ +| \fontseries{lc}\selectfont | & {\fontfamily{lmtt}\fontseries{lc}\selectfont Latin Modern Typewriter Light Condensed} \\ +| \fontseries{lc}\slshape | & {\fontfamily{lmtt}\fontseries{lc}\slshape Latin Modern Typewriter Light Condensed Oblique} \\ +\end{vrb} + +\section*{Variable-width Typewriter} + +\fontfamily{lmvtt}\selectfont +\def\fixedspacing{\fontdimen3\font0pt\fontdimen4\font0pt} +\begin{vrb} +|\renewcommand\ttdefault{lmvtt}| \\ +|\ttfamily | & {\selectfont \fixedspacing Latin Modern Typewriter Proportional} \\ +| \slshape | & {\slshape \fixedspacing Latin Modern Typewriter Proportional Oblique} \\ +| \fontseries{l}\selectfont | & {\fontseries{l}\selectfont \fixedspacing Latin Modern Typewriter Proportional Light} \\ +| \fontseries{l}\slshape | & \mbox{\fontseries{l}\slshape \fixedspacing Latin Modern Typewriter Proportional Light Oblique} \\ +| \fontseries{b}\selectfont | & {\fontseries{b}\selectfont \fixedspacing Latin Modern Typewriter Proportional Dark} \\ +| \fontseries{b}\slshape | & \mbox{\fontseries{b}\slshape \fixedspacing Latin Modern Typewriter Proportional Dark Oblique} \\ +\end{vrb} + +\end{document} +%% +%% Copyright 2006-2010 Will Robertson <wspr81(a)gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux(a)telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny(a)eglug.org> +%% +%% Distributable 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 +%% +%% This work is "maintained" (as per LPPL maintenance status) +%% by Will Robertson. +%% +%% This work consists of the file euenc.dtx and various derived files. +%% +%% +%% End of file `test-euxlm.ltx'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/CHANGES new/doc/latex/fmtcount/CHANGES --- old/doc/latex/fmtcount/CHANGES 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -fmtcount package versions: - -Version 3.01: - - * Make fmtord option language dependant - - * Support language as a documentclass option - - * Some improvements in code documentation and testing - - * Use xkeyval instead of keyval for option processing, so as to avoid - trouble with option de-bracketting - - * Solve issue #15: protect \' for accent in French ordinal - - * Make 1er/1re, 2e the default for French abbreviated ordinals, and - make abbreviated ordinals the default --- as opposed to - non-abbreviated like 2\`eme. - - * Solve issue #16: (use of superscript font for ordinals when - available and xelatex is used) - -Version 3.00: - -Version 2.04: - - * Renamed \@modulo to \@FCmodulo to avoid conflict with other - packages. - - * Fixed "eins" bug in fc-german.def - - * Fixed bug in \@@unitstringportuges - - * Added fc-portuguese.def - -Version 2.03: - - * Renamed \@fc@loadifbabelldf to \@fc@loadifbabelorpolyglossialdf - and added check for polyglossia language. - - * Fixed multilingual issues where provided languages weren't - detected. - - * Removed spurious spaces. - -Version 2.02: - - * Improved check for multilingual options - - * Fixed \FCloadlang so that catcode for @ set to `letter' before - reading .def file. - - * Moved loading of fcprefix from fc-french.def to fmtcount.sty - -Version 2.01: - - * Fixed copyright text in fmtcount.ins - -Version 2.0: - - * fcprefix.sty, fcnumparser.sty added by Vincent BelaÃ¯che - - * fmtcount.sty now loads etoolbox - - * Minor corrections to fc-spanish.def (corrections provided by - Fernando Maldonado MillÃ¡n) - - * Minor corrections to fc-german.def (corrections provided by - Dominik WaÃenhoven) - - * Fixed bug in OrdinalstringMgerman etc - -Version 1.31: - - * fixed unwanted space in \decimalnum - - * fixed bug that ignores spaces after commands like - \ordinalnum. - - * added Italian support (translations provided by Edoardo Pasca) - -Version 1.3: - - * no longer loads xspace package (was causing extraneous - spaces when the optional argument to \ordinalstring etc - was omitted.) - * Made some long commands short. - * Changes licence text in fmtcount.ins to conform with LPPL. - -Version 1.2: fmtcount now loads xspace package, and uses \xspace -after \numberstring etc. - -Version 1.1: Added German support. Added check for USenglish -and UKenglish babel settings. - -Version 1.09: Added upper case variants \ORDINALstring etc -(\MakeUppercase{\ordinalstring{<counter>}} doesn't work because -of the way \MakeUppercase expands its argument). - -Added commands to store textual representations \storeordinalstring etc - -Version 1.08: fixed Portugues spelling mistakes (tr\`es -> tr\^es -centa -> cento) - -Version 1.07: fixed bug that causes fc-english.def to be loaded twice - -Version 1.06: fixed language-related bug - -Version 1.05: fixed bug in \padzeroes - -Version 1.04: provided \FCordinal to avoid clashes with the memoir class. - -Version 1.03: Minor bug fixes (concerning fmtcount.cfg and the effect of \padzeroes). - -Version 1.02: Added multilingual support - -Version 1.01: Added support for LaTeX2HTML - -Version 1.0: separated counter related code from -datetime. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/README new/doc/latex/fmtcount/README --- old/doc/latex/fmtcount/README 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -LaTeX Package : fmtcount v3.01 - -Last Modified : 2015-05-05 - -Author : Nicola Talbot and Vincent BelaÃ¯che - -Files : fmtcount.dtx - documented source file - fmtcount.ins - installation script - fmtcount.perl - latex2html style file - fc-samp.tex \ - fc-lang.tex - sample files - fc-frlargenum.tex / - -The package fmtcount.sty provides commands -that display the value of a LaTeX counter in a variety -of formats (ordinal, text, hexadecimal, decimal, -octal, binary etc). This package was originally provided -with the datetime package, but is now distributed separately. - -See the documentation for more details. - -To extract the code from the documented source file do: - -latex fmtcount.ins - -This will create the files: fmtcount.sty (the LaTeX package), -and fc-*.def (the language definition files used by -fmtcount.sty). - -Move the .sty and .def files to somewhere LaTeX will find it -(e.g. texmf/tex/latex/fmtcount/) and remember to update the TeX -database. - -Copy the fmtcount.perl file to somewhere where LaTeX2HTML will -find it (e.g. latex2html/styles/). - -To extract the documentation do: - -latex fmtcount.dtx -makeindex -s gglo.ist -t fmtcount.glg -o fmtcount.gls fmtcount.glo -latex fmtcount.dtx -latex fmtcount.dtx - -Place the resulting file (fmtcount.dvi) into the documentation -directory (e.g. texmf/doc/latex/fmtcount/). - -Read the file CHANGES for version changes. - -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. - -http://www.dickimaw-books.com/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-frlargenum.tex new/doc/latex/fmtcount/fc-frlargenum.tex --- old/doc/latex/fmtcount/fc-frlargenum.tex 2014-06-19 22:23:47.000000000 +0200 +++ new/doc/latex/fmtcount/fc-frlargenum.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ - % This file is public domain - -\documentclass{article} -\usepackage[french]{babel} -\usepackage{fmtcount} -\usepackage{array} -\usepackage{amsmath} -\usepackage{xcolor} -\usepackage[T1]{fontenc} -\newcommand*\formatterundertest[1]{} -\makeatletter -\newcommand*{\printrow}[2]{% - \def\@tempa{#1}% - \ifx\@tempa\@empty\else - \texttt{\textbackslash fmtsetoptions\{french=\{#1\}\}}\newline - \fmtcountsetoptions{french={#1}}% - \fi - \begin{tabular}{@{}>{\raggedleft\arraybackslash}p{\dimexpr0.3\linewidth-\tabcolsep}>{\raggedright\arraybackslash}p{\dimexpr0.7\linewidth-\tabcolsep}@{}}% - #2&$\rangle$\formatterundertest{#2}$\langle$\\\hline - \end{tabular}\newline - \def\@tempb{% - \ifx\@tempa\space - \expandafter\@gobble - \fi - }% - \futurelet\@tempa\@tempb -} -\def\fc@frenchoptions@submillion@dos{$\bullet$\-$\bullet$} -\def\fc@frenchoptions@supermillion@dos{$\star$\-$\star$} - -\makeatother -\newcommand*\test{\noindent -\printrow{all plural}{1} -\printrow{}{2} -\printrow{}{3} -\printrow{}{4} -\printrow{}{5} -\printrow{}{6} -\printrow{}{7} -\printrow{}{8} -\printrow{}{9} -\printrow{}{10} -\printrow{}{11} -\printrow{}{12} -\printrow{}{13} -\printrow{}{14} -\printrow{}{15} -\printrow{}{16} -\printrow{}{17} -\printrow{}{18} -\printrow{}{19} -\printrow{}{20} -\printrow{}{21} -\printrow{}{22} -\printrow{}{29} -\printrow{scale=long}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=short}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=recursive}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=long}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=short}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=recursive}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000} -\printrow{}{156 404 724 555 428 769 499 217 321 941} -\printrow{}{4 171 764 135 702 262 349 567 001 574 584} -\printrow{}{97 415 427 916 562 250 398 973 107 371 704} -\printrow{}{80} -\printrow{}{81} -\printrow{}{21} -\printrow{}{31} -\printrow{}{200} -\printrow{}{201} -\printrow{}{200 000} -\printrow{}{200 000 000} -\printrow{}{201 000 000} -\printrow{}{80 000} -\printrow{}{80 000 000} -\printrow{}{81 000} -\printrow{}{81 000 000} -\printrow{all plural,mil plural=multiple}{1000} -\printrow{}{2000} -\printrow{}{1001} -\printrow{}{2001} -\printrow{}{1900} -\printrow{}{2012} -\printrow{}{900} -\printrow{all plural,mil plural=multiple,mil plural mark=s}{2000} -} - -\begin{document} - -\section{\textbackslash numberstringnum\{\#1\}} -\def\formatterundertest#1{\numberstringnum{#1}} -\test - -\section{\textbackslash numberstringnum\{\#1\}[f]} -\def\formatterundertest#1{\numberstringnum{#1}[f]} -\test - -\section{\textbackslash ordinalstringnum\{\#1\}} -\def\formatterundertest#1{\ordinalstringnum{#1}} -\test - -\section{\textbackslash ordinalstringnum\{\#1\}[f]} -\def\formatterundertest#1{\ordinalstringnum{#1}[f]} -\test - -\section{\textbackslash Numberstringnum\{\#1\}} -\def\formatterundertest#1{\Numberstringnum{#1}} -\test - -\section{\textbackslash Numberstringnum\{\#1\}[f]} -\def\formatterundertest#1{\Numberstringnum{#1}[f]} -\test - -\section{\textbackslash Ordinalstringnum\{\#1\}} -\def\formatterundertest#1{\Ordinalstringnum{#1}} -\test - -\section{\textbackslash Ordinalstringnum\{\#1\}[f]} -\def\formatterundertest#1{\Ordinalstringnum{#1}[f]} -\test - - - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-lang.tex new/doc/latex/fmtcount/fc-lang.tex --- old/doc/latex/fmtcount/fc-lang.tex 2014-06-19 22:23:47.000000000 +0200 +++ new/doc/latex/fmtcount/fc-lang.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,356 +0,0 @@ - % This file is public domain - - % This is an interactive script. Run it through \LaTeX - % and enter appropriate responses. (This won't work with - % LaTeX2HTML) - -\documentclass[a4paper]{article} - -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} - -\usepackage{etoolbox} - -\usepackage[french,english,spanish,portuges,ngerman,italian]{babel} -\usepackage{fmtcount} - -\newcounter{startval} -\newcounter{endval} -\newcounter{stepsize} -\newcounter{N} -\newcount\myctr -\newcount\langid - -\newcommand*{\deflangopt}[2][\relax]{% - \csdef{setlang#2}{\langid=#2#1}% -} -\newcommand*{\uselangopt}[1]{\csuse{setlang#1}} -\deflangopt{1} -\deflangopt{2} -\deflangopt{3} -\deflangopt[\fmtcountsetoptions{french}]{4} -\deflangopt[\fmtcountsetoptions{french=swiss}]{5} -\deflangopt[\fmtcountsetoptions{french=belgian}]{6} -\deflangopt{7} -\deflangopt{8} - -\newcommand*{\defformat}[1]{% - \csdef{setformat#1}{\numformat=#1\relax}% -} -\newcommand*{\useformat}[1]{\csuse{setformat#1}} - -\newcommand*{\setformat}{\numformat=1\relax} - -\defformat{1} -\defformat{2} -\defformat{3} -\defformat{4} -\defformat{5} -\defformat{6} - -\newcommand*{\defgender}[2]{% - \csdef{setgender#1}{\myctr=#2\relax}% -} -\newcommand*{\usegender}[1]{\csuse{setgender#1}} - -\defgender{}{1} -\defgender{m}{1} -\defgender{f}{2} -\defgender{n}{3} - -\begin{document} - -\section{Displaying the value of a counter} - -\typeout{This is an interactive script, testing the fmtcount package.} - -\langid=-1 - -\loop - \typeout{Which language?^^J} - \typeout{[1] English} - \typeout{[2] Portuguese} - \typeout{[3] Spanish} - \typeout{[4] French} - \typeout{[5] French (Swiss)} - \typeout{[6] French (Belgium)} - \typeout{[7] German} - \typeout{[8] Italian} - - \typein[\response]{} - - \ifcsundef{setlang\response}% - {% - \typeout{Invalid response '\response', please select a number from 1 to 8}% - \langid=-1\relax - }% - {\uselangopt{\response}} - -\ifnum\langid=-1 -\repeat - -\ifcase\langid -\or \selectlanguage{english} -Current language: English. -\or \selectlanguage{portuges} -Current language: Portuguese. -\or \selectlanguage{spanish} -Current language: Spanish. -\or \selectlanguage{french} -Current language: French. -\or \selectlanguage{french} -Current language: French (Swiss). -\or \selectlanguage{french} -Current language: French (Belgium). -\or \selectlanguage{ngerman} -Current language: German. -\or \selectlanguage{italian} -Current language: Italian. -\fi - -\def\startval{-1} - -\loop - \typein[\startval]{Start value? (Integer from 0 to 99999) [Default 1]} - \ifdefempty{\startval}{\def\startval{1}}{} - \ifnum\startval<0\def\startval{-1}\fi - \ifnum\startval>99999\def\startval{-1}\fi - -\ifnum\startval=-1 -\repeat - -\def\endval{-1} - -\loop - \typein[\endval]{End value? (Integer from 0 to 99999) [Default 1000]} - \ifdefempty{\endval}{\def\endval{1000}}{} - \ifnum\endval<0\def\endval{-1}\fi - \ifnum\endval>99999\def\endval{-1}\fi -\ifnum\endval=-1 -\repeat - -\def\stepsize{0} - -\loop - \typein[\stepsize]{Step size? (Non zero integer) [Default 1]} - \ifdefempty{\stepsize}{\def\stepsize{1}}{} -\ifnum\stepsize=0 -\repeat - -\typeout{From {\startval} to {\endval} step {\stepsize}} - -\ifnum\startval<\endval\relax - \ifnum\stepsize<0\relax - \PackageError{fc-lang}{Infinite loop not permitted!}{} - \def\endval{\startval} - \fi -\fi - -\ifnum\startval>\endval\relax - \ifnum\stepsize>0\relax - \PackageError{fc-lang}{Infinite loop not permitted!}{} - \def\endval{\startval} - \fi -\fi - -\newcount\numformat - -\numformat=-1 -\loop - \typeout{Which format?^^J} - \typeout{[1] ordinalstring} - \typeout{[2] Ordinalstring} - \typeout{[3] ORDINALstring} - \typeout{[4] numberstring} - \typeout{[5] Numberstring} - \typeout{[6] NUMBERstring} - - \typein[\response]{Default: 1} - - \ifcsundef{setformat\response}% - {% - \numformat=-1\relax - \typeout{Invalid response '\response', please select a number from 1 to 6}% - }% - {% - \useformat\response - } - -\ifnum\numformat=-1 -\repeat - -\ifcase\numformat -\or\def\stringtype{ordinalstring} -\or\def\stringtype{Ordinalstring} -\or\def\stringtype{ORDINALstring} -\or\def\stringtype{numberstring} -\or\def\stringtype{Numberstring} -\or\def\stringtype{NUMBERstring} -\fi - -\ifnum\langid>3\relax - \ifnum\langid<7\relax - \myctr=-1\relax - \loop - \typeout{Ordinal type?^^J} - \typeout{[1] eme} - \typeout{[2] e} - \typein[\response]{Default: 1} - \ifdefempty{\response}% - {% - \def\response{1}% default - \myctr=1\relax - }% - {% - \ifdefstring{\response}{1}% - {% - \fmtcountsetoptions{abbrv=false}\myctr=1\relax - }% - {% - \ifdefstring{\response}{2}% - {% - \fmtcountsetoptions{abbrv}\myctr=2\relax - }% - {% - \myctr=-1\relax - \typeout{Invalid response '\response', please select a -number from 1 to 2}% - }% - }% - }% - \ifnum\myctr=-1 - \repeat - \fi -\fi - -\myctr=-1 -\loop - \typeout{Ordinal format?^^J} - \typeout{[1] raised} - \typeout{[2] level} - \typein[\response]{Default: 1} - \ifdefempty{\response}{\def\response{1}}{}% - - \ifdefstring{\response}{1} - {% - \fmtcountsetoptions{fmtord=raise}\myctr=1\relax - }% - {% - \ifdefstring{\response}{2} - {% - \fmtcountsetoptions{fmtord=level}\myctr=2\relax - }% - {% - \myctr=-1\relax - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - }% - } - -\ifnum\myctr=-1 -\repeat - -\ifnum\langid=1\relax - \myctr=1\relax -\else - - \ifboolexpr - { - test {\ifnumequal{\langid}{7}} - and - test {\ifnumgreater{\numformat}{3}} - }% - {% - \loop - \ifnum\langid=7\relax - \typein[\response]{Gender? (m, f or n) [Default: m]} - \ifcsundef{setgender\response}% - {% - \typeout{Invalid response '\response', please select a - number from 1 to 3}% - \myctr=-1\relax - }% - {\usegender\response} - \else - \typein[\response]{Gender? (m or f) [Default: m]} - \ifcsundef{setgender\response}% - {% - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - \myctr=-1\relax - }% - {% - \ifdefstring{\response}{3} - {% - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - \myctr=-1\relax - } - {% - \usegender\response - } - } - \fi - \ifnum\myctr=-1 - \repeat - }% - {% - } - -\fi - -\ifcase\myctr -\or \def\gender{m} -\or \def\gender{f} -\or \def\gender{n} -\fi - -\ifnum\langid=7 -\ifnum\startval>99 -\myctr=-1 -\loop -\typeout{einhundert/eintausend or hundert/tausend?^^J} -\typeout{[1] einhundert/eintausend} -\typeout{[2] hundert/tausend} -\typein[\response]{Default: 1} -\ifthenelse{\equal{\response}{}}{\def\response{1}}{}%default -\ifthenelse{\equal{\response}{1}}{% -\renewcommand{\einhundert}{einhundert} -\renewcommand{\eintausend}{eintausend} -\myctr=1}{% -\ifthenelse{\equal{\response}{2}}{% -\renewcommand{\einhundert}{hundert} -\renewcommand{\eintausend}{tausend} -\myctr=2}{% -\myctr=-1}} -\ifnum\myctr=-1 -\repeat -\fi -\fi - -\setcounter{startval}{\startval} -\setcounter{endval}{\endval} -\setcounter{stepsize}{\stepsize} - -\stepcounter{endval} -\begin{ttfamily} -\noindent -\makebox[0.25in][c]{N} -\makebox[0.5in][c]{ordinal}\quad -\stringtype -\par -\myctr=\value{startval} -\loop -\noindent -\setcounter{N}{\myctr} -\makebox[0.25in][r]{\arabic{N}} -\makebox[0.5in][r]{\ordinal{N}[\gender]}\quad -\csname\stringtype\endcsname{N}[\gender]. -\par -\advance\myctr by \value{stepsize}\relax -\ifnum\myctr<\value{endval} -\repeat - -\end{ttfamily} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-samp.tex new/doc/latex/fmtcount/fc-samp.tex --- old/doc/latex/fmtcount/fc-samp.tex 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/fc-samp.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ - % This file is public domain -\documentclass[a4paper]{article} - -\usepackage{fmtcount} -% FCloadlang -\newcounter{N} - -\padzeroes[5] - -\newcommand{\printrow}[1]{% - \newline - \setcounter{N}{#1} - \makebox[0.75in][r]{\decimal{N}\quad} - \makebox[0.75in][r]{\hexadecimal{N}\quad} - \makebox[0.75in][r]{\ordinal{N}\quad} - \makebox[2in][l]{\numberstring{N}} -} - -\renewcommand{\thesection}{\ordinal{section}} - -\begin{document} - -\section{Displaying the value of a counter} -\label{ex} - -\begin{ttfamily} -\noindent -\makebox[0.75in][c]{decimal} -\makebox[0.75in][c]{hexadecimal} -\makebox[0.75in][c]{ordinal} -numberstring -\printrow{0} -\printrow{1} -\printrow{2} -\printrow{3} -\printrow{4} -\printrow{5} -\printrow{6} -\printrow{7} -\printrow{8} -\printrow{9} -\printrow{10} -\printrow{11} -\printrow{12} -\printrow{13} -\printrow{14} -\printrow{15} -\printrow{16} -\printrow{17} -\printrow{18} -\printrow{19} -\printrow{20} -\printrow{21} -\printrow{22} -\printrow{23} -\printrow{24} -\printrow{25} -\printrow{30} -\printrow{40} -\printrow{50} -\printrow{60} -\printrow{70} -\printrow{71} -\printrow{75} -\printrow{80} -\printrow{81} -\printrow{85} -\printrow{90} -\printrow{91} -\printrow{95} -\printrow{100} -\printrow{101} -\printrow{110} -\printrow{125} -\printrow{150} -\printrow{170} -\printrow{180} -\printrow{190} -\printrow{200} -\printrow{250} -\printrow{300} -\printrow{400} -\printrow{500} -\printrow{600} -\printrow{700} -\printrow{800} -\printrow{900} -\printrow{1000} -\printrow{99999} -\end{ttfamily} - -\section{Cross-Referencing} - -Referencing a label: \ref{ex}. - -Passing numbers explicitly: -\ordinalnum{10}, -\Numberstringnum{10}, -\NUMBERstringnum{10}, -\Ordinalstringnum{10}, -\ORDINALstringnum{10}. - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-typeout-languages.tex new/doc/latex/fmtcount/fc-typeout-languages.tex --- old/doc/latex/fmtcount/fc-typeout-languages.tex 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/fc-typeout-languages.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -\documentclass{article} -\usepackage{fmtcount} -\usepackage{lipsum} -\newwrite\styfiles -\openout\styfiles=fc-styfiles.txt -\begin{document} -\immediate\write\styfiles{STYFILES=\string\^^J} -\makeatletter -{% - \def\@tempb#1{% - \immediate\write\styfiles{fc-#1.def\string\^^J}% - }% - \fc@iterate@on@languages\@tempb -} -\makeatother -\immediate\write\styfiles{fmtcount.sty fcnumparser.sty fcprefix.sty} -\closeout\styfiles -\lipsum -\clearpage -\end{document} Binary files old/doc/latex/fmtcount/fmtcount.pdf and new/doc/latex/fmtcount/fmtcount.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euenc.doc.tlpobj new/tlpkg/tlpobj/euenc.doc.tlpobj --- old/tlpkg/tlpobj/euenc.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/euenc.doc.tlpobj 2017-04-14 17:39:37.000000000 +0200 @@ -0,0 +1,9 @@ +name euenc.doc +category Package +revision 19795 +shortdesc doc files of euenc +relocated 1 +docfiles size=38 + RELOC/doc/latex/euenc/README + RELOC/doc/latex/euenc/euenc.pdf + RELOC/doc/latex/euenc/test-euxlm.ltx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fmtcount.doc.tlpobj new/tlpkg/tlpobj/fmtcount.doc.tlpobj --- old/tlpkg/tlpobj/fmtcount.doc.tlpobj 2016-04-14 19:02:50.000000000 +0200 +++ new/tlpkg/tlpobj/fmtcount.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -name fmtcount.doc -category Package -revision 37298 -shortdesc doc files of fmtcount -relocated 1 -docfiles size=139 - RELOC/doc/latex/fmtcount/CHANGES - RELOC/doc/latex/fmtcount/README - RELOC/doc/latex/fmtcount/fc-frlargenum.tex - RELOC/doc/latex/fmtcount/fc-lang.tex - RELOC/doc/latex/fmtcount/fc-samp.tex - RELOC/doc/latex/fmtcount/fc-typeout-languages.tex - RELOC/doc/latex/fmtcount/fmtcount.pdf ++++++ fmtcount.doc.tar.xz -> euenc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/CHANGES new/doc/latex/fmtcount/CHANGES --- old/doc/latex/fmtcount/CHANGES 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -fmtcount package versions: - -Version 3.01: - - * Make fmtord option language dependant - - * Support language as a documentclass option - - * Some improvements in code documentation and testing - - * Use xkeyval instead of keyval for option processing, so as to avoid - trouble with option de-bracketting - - * Solve issue #15: protect \' for accent in French ordinal - - * Make 1er/1re, 2e the default for French abbreviated ordinals, and - make abbreviated ordinals the default --- as opposed to - non-abbreviated like 2\`eme. - - * Solve issue #16: (use of superscript font for ordinals when - available and xelatex is used) - -Version 3.00: - -Version 2.04: - - * Renamed \@modulo to \@FCmodulo to avoid conflict with other - packages. - - * Fixed "eins" bug in fc-german.def - - * Fixed bug in \@@unitstringportuges - - * Added fc-portuguese.def - -Version 2.03: - - * Renamed \@fc@loadifbabelldf to \@fc@loadifbabelorpolyglossialdf - and added check for polyglossia language. - - * Fixed multilingual issues where provided languages weren't - detected. - - * Removed spurious spaces. - -Version 2.02: - - * Improved check for multilingual options - - * Fixed \FCloadlang so that catcode for @ set to `letter' before - reading .def file. - - * Moved loading of fcprefix from fc-french.def to fmtcount.sty - -Version 2.01: - - * Fixed copyright text in fmtcount.ins - -Version 2.0: - - * fcprefix.sty, fcnumparser.sty added by Vincent BelaÃ¯che - - * fmtcount.sty now loads etoolbox - - * Minor corrections to fc-spanish.def (corrections provided by - Fernando Maldonado MillÃ¡n) - - * Minor corrections to fc-german.def (corrections provided by - Dominik WaÃenhoven) - - * Fixed bug in OrdinalstringMgerman etc - -Version 1.31: - - * fixed unwanted space in \decimalnum - - * fixed bug that ignores spaces after commands like - \ordinalnum. - - * added Italian support (translations provided by Edoardo Pasca) - -Version 1.3: - - * no longer loads xspace package (was causing extraneous - spaces when the optional argument to \ordinalstring etc - was omitted.) - * Made some long commands short. - * Changes licence text in fmtcount.ins to conform with LPPL. - -Version 1.2: fmtcount now loads xspace package, and uses \xspace -after \numberstring etc. - -Version 1.1: Added German support. Added check for USenglish -and UKenglish babel settings. - -Version 1.09: Added upper case variants \ORDINALstring etc -(\MakeUppercase{\ordinalstring{<counter>}} doesn't work because -of the way \MakeUppercase expands its argument). - -Added commands to store textual representations \storeordinalstring etc - -Version 1.08: fixed Portugues spelling mistakes (tr\`es -> tr\^es -centa -> cento) - -Version 1.07: fixed bug that causes fc-english.def to be loaded twice - -Version 1.06: fixed language-related bug - -Version 1.05: fixed bug in \padzeroes - -Version 1.04: provided \FCordinal to avoid clashes with the memoir class. - -Version 1.03: Minor bug fixes (concerning fmtcount.cfg and the effect of \padzeroes). - -Version 1.02: Added multilingual support - -Version 1.01: Added support for LaTeX2HTML - -Version 1.0: separated counter related code from -datetime. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/README new/doc/latex/fmtcount/README --- old/doc/latex/fmtcount/README 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -LaTeX Package : fmtcount v3.01 - -Last Modified : 2015-05-05 - -Author : Nicola Talbot and Vincent BelaÃ¯che - -Files : fmtcount.dtx - documented source file - fmtcount.ins - installation script - fmtcount.perl - latex2html style file - fc-samp.tex \ - fc-lang.tex - sample files - fc-frlargenum.tex / - -The package fmtcount.sty provides commands -that display the value of a LaTeX counter in a variety -of formats (ordinal, text, hexadecimal, decimal, -octal, binary etc). This package was originally provided -with the datetime package, but is now distributed separately. - -See the documentation for more details. - -To extract the code from the documented source file do: - -latex fmtcount.ins - -This will create the files: fmtcount.sty (the LaTeX package), -and fc-*.def (the language definition files used by -fmtcount.sty). - -Move the .sty and .def files to somewhere LaTeX will find it -(e.g. texmf/tex/latex/fmtcount/) and remember to update the TeX -database. - -Copy the fmtcount.perl file to somewhere where LaTeX2HTML will -find it (e.g. latex2html/styles/). - -To extract the documentation do: - -latex fmtcount.dtx -makeindex -s gglo.ist -t fmtcount.glg -o fmtcount.gls fmtcount.glo -latex fmtcount.dtx -latex fmtcount.dtx - -Place the resulting file (fmtcount.dvi) into the documentation -directory (e.g. texmf/doc/latex/fmtcount/). - -Read the file CHANGES for version changes. - -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. - -http://www.dickimaw-books.com/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-frlargenum.tex new/doc/latex/fmtcount/fc-frlargenum.tex --- old/doc/latex/fmtcount/fc-frlargenum.tex 2014-06-19 22:23:47.000000000 +0200 +++ new/doc/latex/fmtcount/fc-frlargenum.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ - % This file is public domain - -\documentclass{article} -\usepackage[french]{babel} -\usepackage{fmtcount} -\usepackage{array} -\usepackage{amsmath} -\usepackage{xcolor} -\usepackage[T1]{fontenc} -\newcommand*\formatterundertest[1]{} -\makeatletter -\newcommand*{\printrow}[2]{% - \def\@tempa{#1}% - \ifx\@tempa\@empty\else - \texttt{\textbackslash fmtsetoptions\{french=\{#1\}\}}\newline - \fmtcountsetoptions{french={#1}}% - \fi - \begin{tabular}{@{}>{\raggedleft\arraybackslash}p{\dimexpr0.3\linewidth-\tabcolsep}>{\raggedright\arraybackslash}p{\dimexpr0.7\linewidth-\tabcolsep}@{}}% - #2&$\rangle$\formatterundertest{#2}$\langle$\\\hline - \end{tabular}\newline - \def\@tempb{% - \ifx\@tempa\space - \expandafter\@gobble - \fi - }% - \futurelet\@tempa\@tempb -} -\def\fc@frenchoptions@submillion@dos{$\bullet$\-$\bullet$} -\def\fc@frenchoptions@supermillion@dos{$\star$\-$\star$} - -\makeatother -\newcommand*\test{\noindent -\printrow{all plural}{1} -\printrow{}{2} -\printrow{}{3} -\printrow{}{4} -\printrow{}{5} -\printrow{}{6} -\printrow{}{7} -\printrow{}{8} -\printrow{}{9} -\printrow{}{10} -\printrow{}{11} -\printrow{}{12} -\printrow{}{13} -\printrow{}{14} -\printrow{}{15} -\printrow{}{16} -\printrow{}{17} -\printrow{}{18} -\printrow{}{19} -\printrow{}{20} -\printrow{}{21} -\printrow{}{22} -\printrow{}{29} -\printrow{scale=long}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=short}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=recursive}{1 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{1 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=long}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=short}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{scale=recursive}{2 000 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000 000} -\printrow{}{2 000 000 000 000 000 000 000 000 000 000} -\printrow{}{156 404 724 555 428 769 499 217 321 941} -\printrow{}{4 171 764 135 702 262 349 567 001 574 584} -\printrow{}{97 415 427 916 562 250 398 973 107 371 704} -\printrow{}{80} -\printrow{}{81} -\printrow{}{21} -\printrow{}{31} -\printrow{}{200} -\printrow{}{201} -\printrow{}{200 000} -\printrow{}{200 000 000} -\printrow{}{201 000 000} -\printrow{}{80 000} -\printrow{}{80 000 000} -\printrow{}{81 000} -\printrow{}{81 000 000} -\printrow{all plural,mil plural=multiple}{1000} -\printrow{}{2000} -\printrow{}{1001} -\printrow{}{2001} -\printrow{}{1900} -\printrow{}{2012} -\printrow{}{900} -\printrow{all plural,mil plural=multiple,mil plural mark=s}{2000} -} - -\begin{document} - -\section{\textbackslash numberstringnum\{\#1\}} -\def\formatterundertest#1{\numberstringnum{#1}} -\test - -\section{\textbackslash numberstringnum\{\#1\}[f]} -\def\formatterundertest#1{\numberstringnum{#1}[f]} -\test - -\section{\textbackslash ordinalstringnum\{\#1\}} -\def\formatterundertest#1{\ordinalstringnum{#1}} -\test - -\section{\textbackslash ordinalstringnum\{\#1\}[f]} -\def\formatterundertest#1{\ordinalstringnum{#1}[f]} -\test - -\section{\textbackslash Numberstringnum\{\#1\}} -\def\formatterundertest#1{\Numberstringnum{#1}} -\test - -\section{\textbackslash Numberstringnum\{\#1\}[f]} -\def\formatterundertest#1{\Numberstringnum{#1}[f]} -\test - -\section{\textbackslash Ordinalstringnum\{\#1\}} -\def\formatterundertest#1{\Ordinalstringnum{#1}} -\test - -\section{\textbackslash Ordinalstringnum\{\#1\}[f]} -\def\formatterundertest#1{\Ordinalstringnum{#1}[f]} -\test - - - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-lang.tex new/doc/latex/fmtcount/fc-lang.tex --- old/doc/latex/fmtcount/fc-lang.tex 2014-06-19 22:23:47.000000000 +0200 +++ new/doc/latex/fmtcount/fc-lang.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,356 +0,0 @@ - % This file is public domain - - % This is an interactive script. Run it through \LaTeX - % and enter appropriate responses. (This won't work with - % LaTeX2HTML) - -\documentclass[a4paper]{article} - -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} - -\usepackage{etoolbox} - -\usepackage[french,english,spanish,portuges,ngerman,italian]{babel} -\usepackage{fmtcount} - -\newcounter{startval} -\newcounter{endval} -\newcounter{stepsize} -\newcounter{N} -\newcount\myctr -\newcount\langid - -\newcommand*{\deflangopt}[2][\relax]{% - \csdef{setlang#2}{\langid=#2#1}% -} -\newcommand*{\uselangopt}[1]{\csuse{setlang#1}} -\deflangopt{1} -\deflangopt{2} -\deflangopt{3} -\deflangopt[\fmtcountsetoptions{french}]{4} -\deflangopt[\fmtcountsetoptions{french=swiss}]{5} -\deflangopt[\fmtcountsetoptions{french=belgian}]{6} -\deflangopt{7} -\deflangopt{8} - -\newcommand*{\defformat}[1]{% - \csdef{setformat#1}{\numformat=#1\relax}% -} -\newcommand*{\useformat}[1]{\csuse{setformat#1}} - -\newcommand*{\setformat}{\numformat=1\relax} - -\defformat{1} -\defformat{2} -\defformat{3} -\defformat{4} -\defformat{5} -\defformat{6} - -\newcommand*{\defgender}[2]{% - \csdef{setgender#1}{\myctr=#2\relax}% -} -\newcommand*{\usegender}[1]{\csuse{setgender#1}} - -\defgender{}{1} -\defgender{m}{1} -\defgender{f}{2} -\defgender{n}{3} - -\begin{document} - -\section{Displaying the value of a counter} - -\typeout{This is an interactive script, testing the fmtcount package.} - -\langid=-1 - -\loop - \typeout{Which language?^^J} - \typeout{[1] English} - \typeout{[2] Portuguese} - \typeout{[3] Spanish} - \typeout{[4] French} - \typeout{[5] French (Swiss)} - \typeout{[6] French (Belgium)} - \typeout{[7] German} - \typeout{[8] Italian} - - \typein[\response]{} - - \ifcsundef{setlang\response}% - {% - \typeout{Invalid response '\response', please select a number from 1 to 8}% - \langid=-1\relax - }% - {\uselangopt{\response}} - -\ifnum\langid=-1 -\repeat - -\ifcase\langid -\or \selectlanguage{english} -Current language: English. -\or \selectlanguage{portuges} -Current language: Portuguese. -\or \selectlanguage{spanish} -Current language: Spanish. -\or \selectlanguage{french} -Current language: French. -\or \selectlanguage{french} -Current language: French (Swiss). -\or \selectlanguage{french} -Current language: French (Belgium). -\or \selectlanguage{ngerman} -Current language: German. -\or \selectlanguage{italian} -Current language: Italian. -\fi - -\def\startval{-1} - -\loop - \typein[\startval]{Start value? (Integer from 0 to 99999) [Default 1]} - \ifdefempty{\startval}{\def\startval{1}}{} - \ifnum\startval<0\def\startval{-1}\fi - \ifnum\startval>99999\def\startval{-1}\fi - -\ifnum\startval=-1 -\repeat - -\def\endval{-1} - -\loop - \typein[\endval]{End value? (Integer from 0 to 99999) [Default 1000]} - \ifdefempty{\endval}{\def\endval{1000}}{} - \ifnum\endval<0\def\endval{-1}\fi - \ifnum\endval>99999\def\endval{-1}\fi -\ifnum\endval=-1 -\repeat - -\def\stepsize{0} - -\loop - \typein[\stepsize]{Step size? (Non zero integer) [Default 1]} - \ifdefempty{\stepsize}{\def\stepsize{1}}{} -\ifnum\stepsize=0 -\repeat - -\typeout{From {\startval} to {\endval} step {\stepsize}} - -\ifnum\startval<\endval\relax - \ifnum\stepsize<0\relax - \PackageError{fc-lang}{Infinite loop not permitted!}{} - \def\endval{\startval} - \fi -\fi - -\ifnum\startval>\endval\relax - \ifnum\stepsize>0\relax - \PackageError{fc-lang}{Infinite loop not permitted!}{} - \def\endval{\startval} - \fi -\fi - -\newcount\numformat - -\numformat=-1 -\loop - \typeout{Which format?^^J} - \typeout{[1] ordinalstring} - \typeout{[2] Ordinalstring} - \typeout{[3] ORDINALstring} - \typeout{[4] numberstring} - \typeout{[5] Numberstring} - \typeout{[6] NUMBERstring} - - \typein[\response]{Default: 1} - - \ifcsundef{setformat\response}% - {% - \numformat=-1\relax - \typeout{Invalid response '\response', please select a number from 1 to 6}% - }% - {% - \useformat\response - } - -\ifnum\numformat=-1 -\repeat - -\ifcase\numformat -\or\def\stringtype{ordinalstring} -\or\def\stringtype{Ordinalstring} -\or\def\stringtype{ORDINALstring} -\or\def\stringtype{numberstring} -\or\def\stringtype{Numberstring} -\or\def\stringtype{NUMBERstring} -\fi - -\ifnum\langid>3\relax - \ifnum\langid<7\relax - \myctr=-1\relax - \loop - \typeout{Ordinal type?^^J} - \typeout{[1] eme} - \typeout{[2] e} - \typein[\response]{Default: 1} - \ifdefempty{\response}% - {% - \def\response{1}% default - \myctr=1\relax - }% - {% - \ifdefstring{\response}{1}% - {% - \fmtcountsetoptions{abbrv=false}\myctr=1\relax - }% - {% - \ifdefstring{\response}{2}% - {% - \fmtcountsetoptions{abbrv}\myctr=2\relax - }% - {% - \myctr=-1\relax - \typeout{Invalid response '\response', please select a -number from 1 to 2}% - }% - }% - }% - \ifnum\myctr=-1 - \repeat - \fi -\fi - -\myctr=-1 -\loop - \typeout{Ordinal format?^^J} - \typeout{[1] raised} - \typeout{[2] level} - \typein[\response]{Default: 1} - \ifdefempty{\response}{\def\response{1}}{}% - - \ifdefstring{\response}{1} - {% - \fmtcountsetoptions{fmtord=raise}\myctr=1\relax - }% - {% - \ifdefstring{\response}{2} - {% - \fmtcountsetoptions{fmtord=level}\myctr=2\relax - }% - {% - \myctr=-1\relax - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - }% - } - -\ifnum\myctr=-1 -\repeat - -\ifnum\langid=1\relax - \myctr=1\relax -\else - - \ifboolexpr - { - test {\ifnumequal{\langid}{7}} - and - test {\ifnumgreater{\numformat}{3}} - }% - {% - \loop - \ifnum\langid=7\relax - \typein[\response]{Gender? (m, f or n) [Default: m]} - \ifcsundef{setgender\response}% - {% - \typeout{Invalid response '\response', please select a - number from 1 to 3}% - \myctr=-1\relax - }% - {\usegender\response} - \else - \typein[\response]{Gender? (m or f) [Default: m]} - \ifcsundef{setgender\response}% - {% - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - \myctr=-1\relax - }% - {% - \ifdefstring{\response}{3} - {% - \typeout{Invalid response '\response', please select a - number from 1 to 2}% - \myctr=-1\relax - } - {% - \usegender\response - } - } - \fi - \ifnum\myctr=-1 - \repeat - }% - {% - } - -\fi - -\ifcase\myctr -\or \def\gender{m} -\or \def\gender{f} -\or \def\gender{n} -\fi - -\ifnum\langid=7 -\ifnum\startval>99 -\myctr=-1 -\loop -\typeout{einhundert/eintausend or hundert/tausend?^^J} -\typeout{[1] einhundert/eintausend} -\typeout{[2] hundert/tausend} -\typein[\response]{Default: 1} -\ifthenelse{\equal{\response}{}}{\def\response{1}}{}%default -\ifthenelse{\equal{\response}{1}}{% -\renewcommand{\einhundert}{einhundert} -\renewcommand{\eintausend}{eintausend} -\myctr=1}{% -\ifthenelse{\equal{\response}{2}}{% -\renewcommand{\einhundert}{hundert} -\renewcommand{\eintausend}{tausend} -\myctr=2}{% -\myctr=-1}} -\ifnum\myctr=-1 -\repeat -\fi -\fi - -\setcounter{startval}{\startval} -\setcounter{endval}{\endval} -\setcounter{stepsize}{\stepsize} - -\stepcounter{endval} -\begin{ttfamily} -\noindent -\makebox[0.25in][c]{N} -\makebox[0.5in][c]{ordinal}\quad -\stringtype -\par -\myctr=\value{startval} -\loop -\noindent -\setcounter{N}{\myctr} -\makebox[0.25in][r]{\arabic{N}} -\makebox[0.5in][r]{\ordinal{N}[\gender]}\quad -\csname\stringtype\endcsname{N}[\gender]. -\par -\advance\myctr by \value{stepsize}\relax -\ifnum\myctr<\value{endval} -\repeat - -\end{ttfamily} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-samp.tex new/doc/latex/fmtcount/fc-samp.tex --- old/doc/latex/fmtcount/fc-samp.tex 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/fc-samp.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ - % This file is public domain -\documentclass[a4paper]{article} - -\usepackage{fmtcount} -% FCloadlang -\newcounter{N} - -\padzeroes[5] - -\newcommand{\printrow}[1]{% - \newline - \setcounter{N}{#1} - \makebox[0.75in][r]{\decimal{N}\quad} - \makebox[0.75in][r]{\hexadecimal{N}\quad} - \makebox[0.75in][r]{\ordinal{N}\quad} - \makebox[2in][l]{\numberstring{N}} -} - -\renewcommand{\thesection}{\ordinal{section}} - -\begin{document} - -\section{Displaying the value of a counter} -\label{ex} - -\begin{ttfamily} -\noindent -\makebox[0.75in][c]{decimal} -\makebox[0.75in][c]{hexadecimal} -\makebox[0.75in][c]{ordinal} -numberstring -\printrow{0} -\printrow{1} -\printrow{2} -\printrow{3} -\printrow{4} -\printrow{5} -\printrow{6} -\printrow{7} -\printrow{8} -\printrow{9} -\printrow{10} -\printrow{11} -\printrow{12} -\printrow{13} -\printrow{14} -\printrow{15} -\printrow{16} -\printrow{17} -\printrow{18} -\printrow{19} -\printrow{20} -\printrow{21} -\printrow{22} -\printrow{23} -\printrow{24} -\printrow{25} -\printrow{30} -\printrow{40} -\printrow{50} -\printrow{60} -\printrow{70} -\printrow{71} -\printrow{75} -\printrow{80} -\printrow{81} -\printrow{85} -\printrow{90} -\printrow{91} -\printrow{95} -\printrow{100} -\printrow{101} -\printrow{110} -\printrow{125} -\printrow{150} -\printrow{170} -\printrow{180} -\printrow{190} -\printrow{200} -\printrow{250} -\printrow{300} -\printrow{400} -\printrow{500} -\printrow{600} -\printrow{700} -\printrow{800} -\printrow{900} -\printrow{1000} -\printrow{99999} -\end{ttfamily} - -\section{Cross-Referencing} - -Referencing a label: \ref{ex}. - -Passing numbers explicitly: -\ordinalnum{10}, -\Numberstringnum{10}, -\NUMBERstringnum{10}, -\Ordinalstringnum{10}, -\ORDINALstringnum{10}. - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-typeout-languages.tex new/doc/latex/fmtcount/fc-typeout-languages.tex --- old/doc/latex/fmtcount/fc-typeout-languages.tex 2015-05-10 00:19:10.000000000 +0200 +++ new/doc/latex/fmtcount/fc-typeout-languages.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -\documentclass{article} -\usepackage{fmtcount} -\usepackage{lipsum} -\newwrite\styfiles -\openout\styfiles=fc-styfiles.txt -\begin{document} -\immediate\write\styfiles{STYFILES=\string\^^J} -\makeatletter -{% - \def\@tempb#1{% - \immediate\write\styfiles{fc-#1.def\string\^^J}% - }% - \fc@iterate@on@languages\@tempb -} -\makeatother -\immediate\write\styfiles{fmtcount.sty fcnumparser.sty fcprefix.sty} -\closeout\styfiles -\lipsum -\clearpage -\end{document} Binary files old/doc/latex/fmtcount/fmtcount.pdf and new/doc/latex/fmtcount/fmtcount.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1enc.def new/tex/latex/euenc/eu1enc.def --- old/tex/latex/euenc/eu1enc.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1enc.def 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,36 @@ +%% +%% This is file `eu1enc.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% euenc.dtx (with options: `eu1') +%% +%% _____________________________________ +%% The EUENC bundle +%% Will Robertson, Elie Roux, Khaled Hosny +%% +%% License information appended. +%% +\ProvidesFile{eu1enc.def} + [2010/05/27 v0.1h Experimental Unicode font encodings] +\DeclareFontEncoding{EU1}{}{} +\DeclareErrorFont{EU1}{lmr}{m}{n}{10} +\DeclareFontSubstitution{EU1}{lmr}{m}{n} +\g@addto@macro\nfss@catcodes{\@makeother:} +%% +%% Copyright 2006-2010 Will Robertson <wspr81(a)gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux(a)telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny(a)eglug.org> +%% +%% Distributable 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 +%% +%% This work is "maintained" (as per LPPL maintenance status) +%% by Will Robertson. +%% +%% This work consists of the file euenc.dtx and various derived files. +%% +%% +%% End of file `eu1enc.def'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmdh.fd new/tex/latex/euenc/eu1lmdh.fd --- old/tex/latex/euenc/eu1lmdh.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmdh.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,10 @@ + +\ProvidesFile{eu1lmdh.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmdh}{} +\DeclareFontShape{EU1}{lmdh}{m}{n} + {<-> "[lmromandunh10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmdh}{m}{it} + {<->sub*lmdh/m/sl}{} +\DeclareFontShape{EU1}{lmdh}{m}{sl} + {<-> "[lmromandunh10-oblique]:mapping=tex-text"}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmr.fd new/tex/latex/euenc/eu1lmr.fd --- old/tex/latex/euenc/eu1lmr.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmr.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,43 @@ + +\ProvidesFile{eu1lmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmr}{} +\DeclareFontShape{EU1}{lmr}{m}{n}% + {<-5.5> "[lmroman5-regular]:mapping=tex-text" <5.5-6.5> "[lmroman6-regular]:mapping=tex-text" + <6.5-7.5> "[lmroman7-regular]:mapping=tex-text" <7.5-8.5> "[lmroman8-regular]:mapping=tex-text" + <8.5-9.5> "[lmroman9-regular]:mapping=tex-text" <9.5-11> "[lmroman10-regular]:mapping=tex-text" + <11-15> "[lmroman12-regular]:mapping=tex-text" + <15-> "[lmroman17-regular]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmr}{m}{sl}% + {<-8.5> "[lmromanslant8-regular]:mapping=tex-text" <8.5-9.5> "[lmromanslant9-regular]:mapping=tex-text" + <9.5-11> "[lmromanslant10-regular]:mapping=tex-text" <11-15> "[lmromanslant12-regular]:mapping=tex-text" + <15-> "[lmromanslant17-regular]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmr}{m}{it}% + {<-7.5> "[lmroman7-italic]:mapping=tex-text" + <7.5-8.5> "[lmroman8-italic]:mapping=tex-text" <8.5-9.5> "[lmroman9-italic]:mapping=tex-text" + <9.5-11> "[lmroman10-italic]:mapping=tex-text" <11-> "[lmroman12-italic]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmr}{m}{sc}% + {<-> "[lmromancaps10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{m}{ui}% + {<-> ec-lmu10}{} +\DeclareFontShape{EU1}{lmr}{m}{scsl}% + {<-> "[lmromancaps10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{b}{n} + {<-> "[lmromandemi10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{b}{sl} + {<-> "[lmromandemi10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{bx}{n} + {<-5.5> "[lmroman5-bold]:mapping=tex-text" <5.5-6.5> "[lmroman6-bold]:mapping=tex-text" + <6.5-7.5> "[lmroman7-bold]:mapping=tex-text" <7.5-8.5> "[lmroman8-bold]:mapping=tex-text" + <8.5-9.5> "[lmroman9-bold]:mapping=tex-text" <9.5-11> "[lmroman10-bold]:mapping=tex-text" + <11-> "[lmroman12-bold]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmr}{bx}{it} + {<-> "[lmroman10-bolditalic]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{bx}{sl} + {<-> "[lmromanslant10-bold]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmr}{b}{it} + {<->sub * lmr/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmss.fd new/tex/latex/euenc/eu1lmss.fd --- old/tex/latex/euenc/eu1lmss.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmss.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,36 @@ + +\ProvidesFile{eu1lmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmss}{} +\DeclareFontShape{EU1}{lmss}{m}{n} + {<-8.5> "[lmsans8-regular]:mapping=tex-text" + <8.5-9.5> "[lmsans9-regular]:mapping=tex-text" <9.5-11> "[lmsans10-regular]:mapping=tex-text" + <11-15.5> "[lmsans12-regular]:mapping=tex-text" <15.5-> "[lmsans17-regular]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmss}{m}{it} + {<->ssub*lmss/m/sl}{} +\DeclareFontShape{EU1}{lmss}{m}{sl} + {<-8.5> "[lmsans8-oblique]:mapping=tex-text" + <8.5-9.5> "[lmsans9-oblique]:mapping=tex-text" <9.5-11> "[lmsans10-oblique]:mapping=tex-text" + <11-15.5> "[lmsans12-oblique]:mapping=tex-text" <15.5-> "[lmsans17-oblique]:mapping=tex-text" + }{} +\DeclareFontShape{EU1}{lmss}{m}{sc} + {<->sub*lmr/m/sc}{} +\DeclareFontShape{EU1}{lmss}{b}{n} + {<->ssub * lmss/bx/n}{} +\DeclareFontShape{EU1}{lmss}{b}{sl} + {<->ssub * lmss/bx/sl}{} +\DeclareFontShape{EU1}{lmss}{b}{it} + {<->ssub * lmss/bx/it}{} +\DeclareFontShape{EU1}{lmss}{sbc}{n} + {<-> "[lmsansdemicond10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmss}{sbc}{sl} + {<-> "[lmsansdemicond10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmss}{sbc}{it} + {<->ssub*lmss/sbc/sl}{} +\DeclareFontShape{EU1}{lmss}{bx}{n} + {<-> "[lmsans10-bold]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmss}{bx}{sl} + {<-> "[lmsans10-boldoblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmss}{bx}{it} + {<->ssub*lmss/bx/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmssq.fd new/tex/latex/euenc/eu1lmssq.fd --- old/tex/latex/euenc/eu1lmssq.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmssq.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,22 @@ + +\ProvidesFile{eu1lmssq.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmssq}{} +\DeclareFontShape{EU1}{lmssq}{m}{n} + {<-> "[lmsansquot8-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmssq}{m}{sl} + {<-> "[lmsansquot8-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmssq}{bx}{n} + {<-> "[lmsansquot8-bold]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmssq}{bx}{sl} + {<-> "[lmsansquot8-boldoblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmssq}{m}{it} + {<->ssub*lmssq/m/sl}{} +\DeclareFontShape{EU1}{lmssq}{bx}{it} + {<->ssub*lmssq/bx/sl}{} +\DeclareFontShape{EU1}{lmssq}{b}{n} + {<->ssub * lmssq/bx/n}{} +\DeclareFontShape{EU1}{lmssq}{b}{sl} + {<->ssub * lmssq/bx/sl}{} +\DeclareFontShape{EU1}{lmssq}{b}{it} + {<->ssub * lmssq/bx/it}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmtt.fd new/tex/latex/euenc/eu1lmtt.fd --- old/tex/latex/euenc/eu1lmtt.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmtt.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,68 @@ + +\ProvidesFile{eu1lmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmtt}{\hyphenchar \font\m@ne} + +\ifx\lmtt@use@light@as@normal\@empty +\DeclareFontShape{EU1}{lmtt}{sb}{n} + {<-8.5> "[lmmono8-regular]" <8.5-9.5> "[lmmono9-regular]" + <9.5-11> "[lmmono10-regular]" <11-> "[lmmono12-regular]" + }{} +\DeclareFontShape{EU1}{lmtt}{sb}{it} + {<-> "[lmmono10-italic]"}{} +\DeclareFontShape{EU1}{lmtt}{sb}{sl} + {<-> "[lmmonoslant10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{sb}{sc} + {<-> "[lmmonocaps10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{sb}{scsl} + {<-> "[lmmonocaps10-oblique]"}{} +\DeclareFontShape{EU1}{lmtt}{m}{n} + {<-> "[lmmonolt10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{m}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{EU1}{lmtt}{m}{sl} + {<-> "[lmmonolt10-oblique]"}{} +\DeclareFontShape{EU1}{lmtt}{c}{n} + {<-> "[lmmonoltcond10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{c}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{EU1}{lmtt}{c}{sl} + {<-> "[lmmonoltcond10-oblique]"}{} +\else +\DeclareFontShape{EU1}{lmtt}{m}{n} + {<-8.5> "[lmmono8-regular]" <8.5-9.5> "[lmmono9-regular]" + <9.5-11> "[lmmono10-regular]" <11-> "[lmmono12-regular]" + }{} +\DeclareFontShape{EU1}{lmtt}{m}{it} + {<-> "[lmmono10-italic]"}{} +\DeclareFontShape{EU1}{lmtt}{m}{sl} + {<-> "[lmmonoslant10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{m}{sc} + {<-> "[lmmonocaps10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{m}{scsl} + {<-> "[lmmonocaps10-oblique]"}{} +\DeclareFontShape{EU1}{lmtt}{l}{n} + {<-> "[lmmonolt10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{l}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{EU1}{lmtt}{l}{sl} + {<-> "[lmmonolt10-oblique]"}{} +\DeclareFontShape{EU1}{lmtt}{lc}{n} + {<-> "[lmmonoltcond10-regular]"}{} +\DeclareFontShape{EU1}{lmtt}{lc}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{EU1}{lmtt}{lc}{sl} + {<-> "[lmmonoltcond10-oblique]"}{} +\fi +\DeclareFontShape{EU1}{lmtt}{b}{n} + {<-> "[lmmonolt10-bold]"}{} +\DeclareFontShape{EU1}{lmtt}{b}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{EU1}{lmtt}{b}{sl} +{<-> "[lmmonolt10-boldoblique]"}{} +\DeclareFontShape{EU1}{lmtt}{bx}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{EU1}{lmtt}{bx}{n} + {<->ssub*lmtt/b/n}{} +\DeclareFontShape{EU1}{lmtt}{bx}{sl} + {<->ssub*lmtt/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu1lmvtt.fd new/tex/latex/euenc/eu1lmvtt.fd --- old/tex/latex/euenc/eu1lmvtt.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu1lmvtt.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,45 @@ + +\ProvidesFile{eu1lmvtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU1}{lmvtt}{} + +\ifx\lmtt@use@light@as@normal\@empty +\DeclareFontShape{EU1}{lmvtt}{sb}{n} + {<-> "[lmmonoprop10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{sb}{sl} + {<-> "[lmmonoprop10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{sb}{it} + {<->sub*lmvtt/m/sl}{} +\DeclareFontShape{EU1}{lmvtt}{m}{n} + {<-> "[lmmonoproplt10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{m}{sl} + {<-> "[lmmonoproplt10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{m}{it} + {<->sub*lmvtt/l/sl}{} + +\else +\DeclareFontShape{EU1}{lmvtt}{m}{n} + {<-> "[lmmonoprop10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{m}{sl} + {<-> "[lmmonoprop10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{m}{it} + {<->sub*lmvtt/m/sl}{} +\DeclareFontShape{EU1}{lmvtt}{l}{n} + {<-> "[lmmonoproplt10-regular]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{l}{sl} + {<-> "[lmmonoproplt10-oblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{l}{it} + {<->sub*lmvtt/l/sl}{} +\fi +\DeclareFontShape{EU1}{lmvtt}{b}{n} + {<-> "[lmmonoproplt10-bold]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{b}{sl} + {<-> "[lmmonoproplt10-boldoblique]:mapping=tex-text"}{} +\DeclareFontShape{EU1}{lmvtt}{b}{it} + {<->sub*lmvtt/b/sl}{} +\DeclareFontShape{EU1}{lmvtt}{bx}{n} + {<->ssub*lmvtt/b/n}{} +\DeclareFontShape{EU1}{lmvtt}{bx}{sl} + {<->ssub*lmvtt/b/sl}{} +\DeclareFontShape{EU1}{lmvtt}{bx}{it} + {<->sub*lmvtt/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2enc.def new/tex/latex/euenc/eu2enc.def --- old/tex/latex/euenc/eu2enc.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2enc.def 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,36 @@ +%% +%% This is file `eu2enc.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% euenc.dtx (with options: `eu2') +%% +%% _____________________________________ +%% The EUENC bundle +%% Will Robertson, Elie Roux, Khaled Hosny +%% +%% License information appended. +%% +\ProvidesFile{eu2enc.def} + [2010/05/27 v0.1h Experimental Unicode font encodings] +\DeclareFontEncoding{EU2}{}{} +\DeclareErrorFont{EU2}{lmr}{m}{n}{10} +\DeclareFontSubstitution{EU2}{lmr}{m}{n} +\g@addto@macro\nfss@catcodes{\@makeother:} +%% +%% Copyright 2006-2010 Will Robertson <wspr81(a)gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux(a)telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny(a)eglug.org> +%% +%% Distributable 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 +%% +%% This work is "maintained" (as per LPPL maintenance status) +%% by Will Robertson. +%% +%% This work consists of the file euenc.dtx and various derived files. +%% +%% +%% End of file `eu2enc.def'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmdh.fd new/tex/latex/euenc/eu2lmdh.fd --- old/tex/latex/euenc/eu2lmdh.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmdh.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,10 @@ + +\ProvidesFile{eu2lmdh.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmdh}{} +\DeclareFontShape{EU2}{lmdh}{m}{n} + {<-> file:lmromandunh10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmdh}{m}{it} + {<->sub*lmdh/m/sl}{} +\DeclareFontShape{EU2}{lmdh}{m}{sl} + {<-> file:lmromandunh10-oblique:script=latn;+trep;+tlig;}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmr.fd new/tex/latex/euenc/eu2lmr.fd --- old/tex/latex/euenc/eu2lmr.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmr.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,43 @@ + +\ProvidesFile{eu2lmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmr}{} +\DeclareFontShape{EU2}{lmr}{m}{n}% + {<-5.5> file:lmroman5-regular:script=latn;+trep;+tlig; <5.5-6.5> file:lmroman6-regular:script=latn;+trep;+tlig; + <6.5-7.5> file:lmroman7-regular:script=latn;+trep;+tlig; <7.5-8.5> file:lmroman8-regular:script=latn;+trep;+tlig; + <8.5-9.5> file:lmroman9-regular:script=latn;+trep;+tlig; <9.5-11> file:lmroman10-regular:script=latn;+trep;+tlig; + <11-15> file:lmroman12-regular:script=latn;+trep;+tlig; + <15-> file:lmroman17-regular:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmr}{m}{sl}% + {<-8.5> file:lmromanslant8-regular:script=latn;+trep;+tlig; <8.5-9.5> file:lmromanslant9-regular:script=latn;+trep;+tlig; + <9.5-11> file:lmromanslant10-regular:script=latn;+trep;+tlig; <11-15> file:lmromanslant12-regular:script=latn;+trep;+tlig; + <15-> file:lmromanslant17-regular:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmr}{m}{it}% + {<-7.5> file:lmroman7-italic:script=latn;+trep;+tlig; + <7.5-8.5> file:lmroman8-italic:script=latn;+trep;+tlig; <8.5-9.5> file:lmroman9-italic:script=latn;+trep;+tlig; + <9.5-11> file:lmroman10-italic:script=latn;+trep;+tlig; <11-> file:lmroman12-italic:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmr}{m}{sc}% + {<-> file:lmromancaps10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{m}{ui}% + {<-> ec-lmu10}{} +\DeclareFontShape{EU2}{lmr}{m}{scsl}% + {<-> file:lmromancaps10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{b}{n} + {<-> file:lmromandemi10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{b}{sl} + {<-> file:lmromandemi10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{bx}{n} + {<-5.5> file:lmroman5-bold:script=latn;+trep;+tlig; <5.5-6.5> file:lmroman6-bold:script=latn;+trep;+tlig; + <6.5-7.5> file:lmroman7-bold:script=latn;+trep;+tlig; <7.5-8.5> file:lmroman8-bold:script=latn;+trep;+tlig; + <8.5-9.5> file:lmroman9-bold:script=latn;+trep;+tlig; <9.5-11> file:lmroman10-bold:script=latn;+trep;+tlig; + <11-> file:lmroman12-bold:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmr}{bx}{it} + {<-> file:lmroman10-bolditalic:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{bx}{sl} + {<-> file:lmromanslant10-bold:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmr}{b}{it} + {<->sub * lmr/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmss.fd new/tex/latex/euenc/eu2lmss.fd --- old/tex/latex/euenc/eu2lmss.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmss.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,36 @@ + +\ProvidesFile{eu2lmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmss}{} +\DeclareFontShape{EU2}{lmss}{m}{n} + {<-8.5> file:lmsans8-regular:script=latn;+trep;+tlig; + <8.5-9.5> file:lmsans9-regular:script=latn;+trep;+tlig; <9.5-11> file:lmsans10-regular:script=latn;+trep;+tlig; + <11-15.5> file:lmsans12-regular:script=latn;+trep;+tlig; <15.5-> file:lmsans17-regular:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmss}{m}{it} + {<->ssub*lmss/m/sl}{} +\DeclareFontShape{EU2}{lmss}{m}{sl} + {<-8.5> file:lmsans8-oblique:script=latn;+trep;+tlig; + <8.5-9.5> file:lmsans9-oblique:script=latn;+trep;+tlig; <9.5-11> file:lmsans10-oblique:script=latn;+trep;+tlig; + <11-15.5> file:lmsans12-oblique:script=latn;+trep;+tlig; <15.5-> file:lmsans17-oblique:script=latn;+trep;+tlig; + }{} +\DeclareFontShape{EU2}{lmss}{m}{sc} + {<->sub*lmr/m/sc}{} +\DeclareFontShape{EU2}{lmss}{b}{n} + {<->ssub * lmss/bx/n}{} +\DeclareFontShape{EU2}{lmss}{b}{sl} + {<->ssub * lmss/bx/sl}{} +\DeclareFontShape{EU2}{lmss}{b}{it} + {<->ssub * lmss/bx/it}{} +\DeclareFontShape{EU2}{lmss}{sbc}{n} + {<-> file:lmsansdemicond10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmss}{sbc}{sl} + {<-> file:lmsansdemicond10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmss}{sbc}{it} + {<->ssub*lmss/sbc/sl}{} +\DeclareFontShape{EU2}{lmss}{bx}{n} + {<-> file:lmsans10-bold:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmss}{bx}{sl} + {<-> file:lmsans10-boldoblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmss}{bx}{it} + {<->ssub*lmss/bx/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmssq.fd new/tex/latex/euenc/eu2lmssq.fd --- old/tex/latex/euenc/eu2lmssq.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmssq.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,22 @@ + +\ProvidesFile{eu2lmssq.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmssq}{} +\DeclareFontShape{EU2}{lmssq}{m}{n} + {<-> file:lmsansquot8-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmssq}{m}{sl} + {<-> file:lmsansquot8-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmssq}{bx}{n} + {<-> file:lmsansquot8-bold:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmssq}{bx}{sl} + {<-> file:lmsansquot8-boldoblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmssq}{m}{it} + {<->ssub*lmssq/m/sl}{} +\DeclareFontShape{EU2}{lmssq}{bx}{it} + {<->ssub*lmssq/bx/sl}{} +\DeclareFontShape{EU2}{lmssq}{b}{n} + {<->ssub * lmssq/bx/n}{} +\DeclareFontShape{EU2}{lmssq}{b}{sl} + {<->ssub * lmssq/bx/sl}{} +\DeclareFontShape{EU2}{lmssq}{b}{it} + {<->ssub * lmssq/bx/it}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmtt.fd new/tex/latex/euenc/eu2lmtt.fd --- old/tex/latex/euenc/eu2lmtt.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmtt.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,68 @@ + +\ProvidesFile{eu2lmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmtt}{\hyphenchar \font\m@ne} + +\ifx\lmtt@use@light@as@normal\@empty +\DeclareFontShape{EU2}{lmtt}{sb}{n} + {<-8.5> file:lmmono8-regular:script=latn <8.5-9.5> file:lmmono9-regular:script=latn + <9.5-11> file:lmmono10-regular:script=latn <11-> file:lmmono12-regular:script=latn + }{} +\DeclareFontShape{EU2}{lmtt}{sb}{it} + {<-> file:lmmono10-italic:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{sb}{sl} + {<-> file:lmmonoslant10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{sb}{sc} + {<-> file:lmmonocaps10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{sb}{scsl} + {<-> file:lmmonocaps10-oblique:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{m}{n} + {<-> file:lmmonolt10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{m}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{EU2}{lmtt}{m}{sl} + {<-> file:lmmonolt10-oblique:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{c}{n} + {<-> file:lmmonoltcond10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{c}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{EU2}{lmtt}{c}{sl} + {<-> file:lmmonoltcond10-oblique:script=latn}{} +\else +\DeclareFontShape{EU2}{lmtt}{m}{n} + {<-8.5> file:lmmono8-regular:script=latn <8.5-9.5> file:lmmono9-regular:script=latn + <9.5-11> file:lmmono10-regular:script=latn <11-> file:lmmono12-regular:script=latn + }{} +\DeclareFontShape{EU2}{lmtt}{m}{it} + {<-> file:lmmono10-italic:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{m}{sl} + {<-> file:lmmonoslant10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{m}{sc} + {<-> file:lmmonocaps10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{m}{scsl} + {<-> file:lmmonocaps10-oblique:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{l}{n} + {<-> file:lmmonolt10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{l}{it} + {<->sub*lmtt/l/sl}{} +\DeclareFontShape{EU2}{lmtt}{l}{sl} + {<-> file:lmmonolt10-oblique:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{lc}{n} + {<-> file:lmmonoltcond10-regular:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{lc}{it} + {<->sub*lmtt/lc/sl}{} +\DeclareFontShape{EU2}{lmtt}{lc}{sl} + {<-> file:lmmonoltcond10-oblique:script=latn}{} +\fi +\DeclareFontShape{EU2}{lmtt}{b}{n} + {<-> file:lmmonolt10-bold:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{b}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{EU2}{lmtt}{b}{sl} +{<-> file:lmmonolt10-boldoblique:script=latn}{} +\DeclareFontShape{EU2}{lmtt}{bx}{it} + {<->sub*lmtt/b/sl}{} +\DeclareFontShape{EU2}{lmtt}{bx}{n} + {<->ssub*lmtt/b/n}{} +\DeclareFontShape{EU2}{lmtt}{bx}{sl} + {<->ssub*lmtt/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/euenc/eu2lmvtt.fd new/tex/latex/euenc/eu2lmvtt.fd --- old/tex/latex/euenc/eu2lmvtt.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/euenc/eu2lmvtt.fd 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,45 @@ + +\ProvidesFile{eu2lmvtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern] +\DeclareFontFamily{EU2}{lmvtt}{} + +\ifx\lmtt@use@light@as@normal\@empty +\DeclareFontShape{EU2}{lmvtt}{sb}{n} + {<-> file:lmmonoprop10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{sb}{sl} + {<-> file:lmmonoprop10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{sb}{it} + {<->sub*lmvtt/m/sl}{} +\DeclareFontShape{EU2}{lmvtt}{m}{n} + {<-> file:lmmonoproplt10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{m}{sl} + {<-> file:lmmonoproplt10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{m}{it} + {<->sub*lmvtt/l/sl}{} + +\else +\DeclareFontShape{EU2}{lmvtt}{m}{n} + {<-> file:lmmonoprop10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{m}{sl} + {<-> file:lmmonoprop10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{m}{it} + {<->sub*lmvtt/m/sl}{} +\DeclareFontShape{EU2}{lmvtt}{l}{n} + {<-> file:lmmonoproplt10-regular:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{l}{sl} + {<-> file:lmmonoproplt10-oblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{l}{it} + {<->sub*lmvtt/l/sl}{} +\fi +\DeclareFontShape{EU2}{lmvtt}{b}{n} + {<-> file:lmmonoproplt10-bold:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{b}{sl} + {<-> file:lmmonoproplt10-boldoblique:script=latn;+trep;+tlig;}{} +\DeclareFontShape{EU2}{lmvtt}{b}{it} + {<->sub*lmvtt/b/sl}{} +\DeclareFontShape{EU2}{lmvtt}{bx}{n} + {<->ssub*lmvtt/b/n}{} +\DeclareFontShape{EU2}{lmvtt}{bx}{sl} + {<->ssub*lmvtt/b/sl}{} +\DeclareFontShape{EU2}{lmvtt}{bx}{it} + {<->sub*lmvtt/b/sl}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euenc.tlpobj new/tlpkg/tlpobj/euenc.tlpobj --- old/tlpkg/tlpobj/euenc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/euenc.tlpobj 2017-04-14 17:39:37.000000000 +0200 @@ -0,0 +1,36 @@ +name euenc +category Package +revision 19795 +shortdesc Unicode font encoding definitions for XeTeX +relocated 1 +longdesc Font encoding definitions for unicode fonts loaded by LaTeX in +longdesc XeTeX or LuaTeX. The package provides two encodings: EU1, +longdesc designed for use with XeTeX, which the fontspec uses for +longdesc unicode fonts which require no macro-level processing for +longdesc accents, and EU2, which provides the same facilities for use +longdesc with LuaTeX. Neither encoding places any restriction on the +longdesc glyphs provided by a font; use of EU2 causes the package +longdesc euxunicode to be loaded (the package is part of this +longdesc distribution). The package includes font definition files for +longdesc use with the Latin Modern OpenType fonts. +runfiles size=14 + RELOC/tex/latex/euenc/eu1enc.def + RELOC/tex/latex/euenc/eu1lmdh.fd + RELOC/tex/latex/euenc/eu1lmr.fd + RELOC/tex/latex/euenc/eu1lmss.fd + RELOC/tex/latex/euenc/eu1lmssq.fd + RELOC/tex/latex/euenc/eu1lmtt.fd + RELOC/tex/latex/euenc/eu1lmvtt.fd + RELOC/tex/latex/euenc/eu2enc.def + RELOC/tex/latex/euenc/eu2lmdh.fd + RELOC/tex/latex/euenc/eu2lmr.fd + RELOC/tex/latex/euenc/eu2lmss.fd + RELOC/tex/latex/euenc/eu2lmssq.fd + RELOC/tex/latex/euenc/eu2lmtt.fd + RELOC/tex/latex/euenc/eu2lmvtt.fd +catalogue-also xunicode +catalogue-ctan /macros/latex/contrib/euenc +catalogue-date 2016-10-08 11:33:19 +0200 +catalogue-license lppl1.3 +catalogue-topics font-supp unicode +catalogue-version 0.1h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fmtcount.doc.tlpobj new/tlpkg/tlpobj/fmtcount.doc.tlpobj --- old/tlpkg/tlpobj/fmtcount.doc.tlpobj 2016-04-14 19:02:50.000000000 +0200 +++ new/tlpkg/tlpobj/fmtcount.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -name fmtcount.doc -category Package -revision 37298 -shortdesc doc files of fmtcount -relocated 1 -docfiles size=139 - RELOC/doc/latex/fmtcount/CHANGES - RELOC/doc/latex/fmtcount/README - RELOC/doc/latex/fmtcount/fc-frlargenum.tex - RELOC/doc/latex/fmtcount/fc-lang.tex - RELOC/doc/latex/fmtcount/fc-samp.tex - RELOC/doc/latex/fmtcount/fc-typeout-languages.tex - RELOC/doc/latex/fmtcount/fmtcount.pdf ++++++ eukdate.doc.tar.xz ++++++ ++++++ eukdate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eukdate.tlpobj new/tlpkg/tlpobj/eukdate.tlpobj --- old/tlpkg/tlpobj/eukdate.tlpobj 2016-04-14 19:00:23.000000000 +0200 +++ new/tlpkg/tlpobj/eukdate.tlpobj 2017-04-14 17:39:37.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/eukdate/eukdate.sty catalogue-also dayofweek weekday catalogue-ctan /macros/latex/contrib/eukdate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics date-time catalogue-version 1.04 ++++++ euler.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euler.doc.tlpobj new/tlpkg/tlpobj/euler.doc.tlpobj --- old/tlpkg/tlpobj/euler.doc.tlpobj 2016-04-14 19:00:23.000000000 +0200 +++ new/tlpkg/tlpobj/euler.doc.tlpobj 2017-04-14 17:39:37.000000000 +0200 @@ -1,6 +1,6 @@ name euler.doc category Package -revision 17261 +revision 42428 shortdesc doc files of euler relocated 1 docfiles size=63 ++++++ euler.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euler.tlpobj new/tlpkg/tlpobj/euler.tlpobj --- old/tlpkg/tlpobj/euler.tlpobj 2016-04-14 19:00:23.000000000 +0200 +++ new/tlpkg/tlpobj/euler.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -1,6 +1,6 @@ name euler category Package -revision 17261 +revision 42428 shortdesc Use AMS Euler fonts for math relocated 1 longdesc Provides a setup for using the AMS Euler family of fonts for @@ -14,7 +14,7 @@ RELOC/tex/latex/euler/euler.sty catalogue-also beton eulervm catalogue-ctan /macros/latex/contrib/euler -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-maths catalogue-version 2.5 ++++++ eulervm.doc.tar.xz ++++++ ++++++ eulervm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eulervm.tlpobj new/tlpkg/tlpobj/eulervm.tlpobj --- old/tlpkg/tlpobj/eulervm.tlpobj 2016-04-14 19:00:23.000000000 +0200 +++ new/tlpkg/tlpobj/eulervm.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -48,7 +48,7 @@ RELOC/tex/latex/eulervm/uzeur.fd RELOC/tex/latex/eulervm/uzeus.fd catalogue-ctan /fonts/eulervm -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-virtual font-maths catalogue-version 4.0 ++++++ euro-ce.doc.tar.xz ++++++ ++++++ euro-ce.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euro-ce.tlpobj new/tlpkg/tlpobj/euro-ce.tlpobj --- old/tlpkg/tlpobj/euro-ce.tlpobj 2016-04-14 19:00:24.000000000 +0200 +++ new/tlpkg/tlpobj/euro-ce.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -31,7 +31,7 @@ RELOC/fonts/tfm/public/euro-ce/eurosl.tfm RELOC/fonts/tfm/public/euro-ce/eurosp.tfm catalogue-ctan /fonts/euro-ce -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics font font-specialist font-mf catalogue-version 3.0b ++++++ euro.doc.tar.xz ++++++ ++++++ euro.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euro.tlpobj new/tlpkg/tlpobj/euro.tlpobj --- old/tlpkg/tlpobj/euro.tlpobj 2016-04-14 19:00:24.000000000 +0200 +++ new/tlpkg/tlpobj/euro.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/euro/euro.sty catalogue-ctan /macros/latex/contrib/euro -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics calculation catalogue-version 1.1 ++++++ europasscv.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/europasscv/CHANGELOG.md new/doc/latex/europasscv/CHANGELOG.md --- old/doc/latex/europasscv/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/europasscv/CHANGELOG.md 2017-01-24 00:01:04.000000000 +0100 @@ -0,0 +1,62 @@ +<a name="2017-01-22"></a> + +# Version 2017-01-22 + +* add support for newer engines: XeLaTeX and LuaLaTeX +* add def files for Swedish and Greek +* new command \ecvfont +* insert \newline at beginning of `ecvitemize` if needed +* fix nesting of ecvitemize + + +<a name="2016-10-12"></a> + +# Version 2016-10-12 + +* add table for self-assessment of digital competences +* add commands for mobile and work phone +* add Czech and Polish definition files +* photo position now defaults to left + + +<a name="2016-08-16"></a> + +# Version 2016-08-16 + +* add option to put photo to the left +* add multiple email addresses and websites in the personal information section +* fix underfull and overfull hbox warnings + + +<a name="2015-05-15"></a> + +# Version 2016-05-15 + +* new command `\ecvlanguagecertificate` +* new command `\ecvhighlightcell` +* add Slovenian and French definition files + + +<a name="2015-04-26"></a> + +# Version 2016-04-26 + +* add language definition files for Portuguese and Spanish + + +<a name="2015-03-10"></a> + +# Version 2015-03-10 + +* add definitions for German (hopefully more languages to come soon) +* update documentation +* fix alignment in personal information +* fix spacing of an `\ecvitem` following an `\ecvsection` +* fix file name conflicts + + +<a name="2015-03-05"></a> + +# Version 2015-03-05 + +* Initial release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/europasscv/README new/doc/latex/europasscv/README --- old/doc/latex/europasscv/README 2016-05-16 22:35:41.000000000 +0200 +++ new/doc/latex/europasscv/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -This class is an unofficial LaTeX implementation of the Europass CV, the -standard model for curriculum vitae as recommended by the European Commission. - -The Europass CV replaces the European CV, launched in 2002. In 2013 a major -revision of the Europass CV came out, featuring a neater, more compact and -somewhat fancier layout. This class is an implementation of the 2013 version of -that layout. - -The Europass CV defines both the content and the layout of a curriculum vitae. -The europasscv class provides support for the latter, and for the former as far -as personal information and spoken languages are concerned. This class tries to -be as close as possible to the standard model without sacrificing flexibility. - -This maÂteÂrial is subÂject to the LaTeX Project Public LiÂcense Version 1.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/europasscv/README.md new/doc/latex/europasscv/README.md --- old/doc/latex/europasscv/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/europasscv/README.md 2017-01-24 00:01:04.000000000 +0100 @@ -0,0 +1,35 @@ +# europasscv +Unofficial class for the new version of the Europass curriculum vitae + +This class is an unofficial LaTeX implementation of the Europass CV, the +standard model for curriculum vitae as recommended by the European Commission. + +The Europass CV replaces the European CV, launched in 2002. In 2013 a major +revision of the Europass CV came out, featuring a neater, more compact and +somewhat fancier layout. This class is an implementation of the 2013 version of +that layout. + +The Europass CV defines both the content and the layout of a curriculum vitae. +The `europasscv` class provides support for the latter, and for the former as +far as personal information, spoken languages and digital competences are +concerned. This class tries to be as close as possible to the standard model +without sacrificing flexibility. + +## License +This maÂteÂrial is subÂject to the LaTeX Project Public LiÂcense Version 1.3. + +## Download +Please install the `europasscv` package through the package manager of your TeX +distribution or download it from [CTAN](https://www.ctan.org/pkg/europasscv). + +## How to use +Please refer to the +[documentation](http://mirrors.ctan.org/macros/latex/contrib/europasscv/europasscv.pdf) +for instructions on how to use the class. + +## Development +Source packages and trees available on +[github](https://github.com/gmazzamuto/europasscv) come with a `Makefile` that +is needed to convert svg images into pdfs. Please run `make` to build pdf icons, +examples and documentation. You need to have `inkscape` installed on your system +in order to convert the icons. Binary files old/doc/latex/europasscv/europasscv.pdf and new/doc/latex/europasscv/europasscv.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/europasscv/europasscv.tex new/doc/latex/europasscv/europasscv.tex --- old/doc/latex/europasscv/europasscv.tex 2016-05-16 22:35:41.000000000 +0200 +++ new/doc/latex/europasscv/europasscv.tex 2017-01-24 00:01:04.000000000 +0100 @@ -2,6 +2,9 @@ \usepackage[T1]{fontenc} \usepackage{lmodern} \usepackage{tikz} +\usepackage{tabu} +\usepackage{metalogo} + \ifpdf \hypersetup{ colorlinks = true @@ -10,12 +13,12 @@ % \usepackage{showframe} -\author{\small Giacomo Mazzamuto\\ - \href{mailto:gmazzamuto+ctan@gmail.com}{\texttt{gmazzamuto+ctan@gmail.com}}\\} -\title{\small Documentation of the \LaTeX\ class\\ - \Large \textbf{\texttt{europasscv.cls}}\\ - \small{\href{https://github.com/gmazzamuto/europasscv}{\texttt{https://github.com/gmazzamuto/europasscv}}}\\ - \small \vspace{0.2cm} Version 2016-05-15 +\author{Giacomo Mazzamuto\\ + {\href{mailto:gmazzamuto+ctan@gmail.com}{\texttt{gmazzamuto+ctan@gmail.com}}}\\} +\title{ Documentation of the \LaTeX\ class\\ + \Large{\textbf{\texttt{europasscv.cls}}}\\ + \normalsize{\href{https://github.com/gmazzamuto/europasscv}{\texttt{https://github.com/gmazzamuto/europasscv}}}\\ + \vspace{0.2cm} Version 2017-01-22 } \newcommand{\bs}{\textbackslash} @@ -23,25 +26,21 @@ \begin{document} \maketitle - +\clearpage \begin{abstract} -This paper describes how to use europasscv.cls, a \LaTeX\ document class for typesetting a curriculum vitae according to the Europass initiative of the European Commission. This is an unofficial implementation of that format, implementing the major style updates that came out in 2013. +This paper describes how to use europasscv.cls, a \LaTeX\ document class for typesetting a curriculum vitae according to the Europass initiative of the European Commission. This is an unofficial implementation of that format, featuring the major style updates that came out in 2013. \end{abstract} \tableofcontents -\clearpage - \section{Introduction} -This class is an unofficial \LaTeX\ implementation of the the \emph{Europass~CV\/}, the standard model for curriculum vitae as recommended by the European Commission. The Europass~CV replaces the European CV, launched in~2002. In 2013 a major revision of the Europass~CV came out, featuring a neater, more compact and somewhat fancier layout. This class is an implementation of the 2013 version of that layout and is based on the \textsf{europecv}\footnote{\url{http://ctan.org/pkg/europecv}} class which is an implementation of the previous layout. - -The Europass~CV defines both the content and the layout of a curriculum vitae. The \textsf{europasscv} class provides support for the latter, and for the former as far as personal information and spoken languages are concerned. If you want to know how the content of a Europass~CV is structured, refer to the documentation provided by the Europass website\footnote{\url{https://europass.cedefop.europa.eu/en/documents/curriculum-vitae/templates-instructions}.}. +This class is an unofficial \LaTeX\ implementation of the the \emph{Europass~CV\/}, the standard model for curriculum vitae as recommended by the European Commission. The Europass~CV replaces the European CV, launched in~2002. In 2013 a major revision of the Europass~CV came out, featuring a neater, more compact and somewhat fancier layout. This class is an implementation of the 2013 version of that layout and is based on the \textsf{europecv}\footnote{\url{http://ctan.org/pkg/europecv}} class (which is an implementation of the previous layout). -This class tries to be as close as possible to the standard model without sacrificing flexibility. Although it is primarily intended for users of the European Union, the class can be used for any kind of curriculum vitae (possibly with the options \texttt{notitle} and \texttt{nologo}, see below), or even for other kinds of documents. +The Europass~CV defines both the content and the layout of a curriculum vitae. The \textsf{europasscv} class provides support for the latter, and for the former as far as personal information, spoken languages and digital competences are concerned. If you want to know how the content of a Europass~CV is structured, refer to the documentation provided by the Europass website\footnote{\url{https://europass.cedefop.europa.eu/en/documents/curriculum-vitae/templates-instructions}.}. -The main differences compared to the official model are the use of Helvetica (which should be in any standard \LaTeX\ distribution) instead of Arial, and the use of vector images instead of low-resolution bitmaps. +This class tries to be as close as possible to the standard model without sacrificing flexibility. Although it is primarily intended for users in the European Union, the class can be used for any kind of curriculum vitae (possibly with the options \texttt{notitle} and \texttt{nologo}, see below), or even for other kinds of documents. \section{Tutorial} Let's start with a minimal (empty) curriculum vitae: @@ -57,12 +56,16 @@ For a complete list of usable class options see section \ref{sec:classOptions}. +% \enlargethispage{2\baselineskip} + \subsection{Personal information} \ecvname{Name Surname} -\ecvtelephone[(+555) 340 123]{(+555) 555 555} +\ecvtelephone{(+555) 555 555\newline} +\ecvworkphone{(+555) 123 456} +\ecvmobile{(+555) 340 123} \hypersetup{urlcolor=black} -\ecvemail{myemailaddress(a)gmail.com} -\ecvhomepage{www.myhomepage.com} +\ecvemail{smith(a)kotmail.com another(a)email.com} +\ecvhomepage{www.myhomepage.com www.another.com} \ecvaddress{rue Wiertz, B-1047 Brussels} \ecvim{AOL Messenger}{betty.smith} \ecvim{Google Talk}{bsmith} @@ -72,7 +75,7 @@ \hspace*{-6cm} \ecvLeftColumnWidth{90mm} \ecvColSep{10pt} -\begin{minipage}{20cm} +\begin{minipage}{21cm} \begin{europasscv} \ecvpersonalinfo \end{europasscv} @@ -84,9 +87,11 @@ \begin{verbatim} \ecvname{Name Surname} \ecvaddress{rue Wiertz, B-1047 Brussels} -\ecvtelephone[(+555) 340 123]{(+555) 555 555} -\ecvemail{myemailaddress(a)gmail.com} -\ecvhomepage{www.myhomepage.com} +\ecvtelephone{(+555) 555 555} +\ecvmobile{(+555) 340 123} +\ecvworkphone{(+555) 123 456} +\ecvemail{smith(a)kotmail.com another(a)email.com} +\ecvhomepage{www.myhomepage.com www.another.com} \ecvim{AOL Messenger}{betty.smith} \ecvim{Google Talk}{bsmith} \ecvdateofbirth{1 January 1970} @@ -99,7 +104,11 @@ \end{description} A photo can be added with the command: \begin{description} -\item[\texttt{\bs ecvpicture[\textit{width}]\{\textit{filename}\}}] +\item[\texttt{\bs ecvpicture[\textit{options}]\{\textit{filename}\}}] +\end{description} +The provided options are passed to \texttt{\bs includegraphics}. By default, the photo is placed to the left. To place it to the right, add the following command: +\begin{description} +\item[\texttt{\bs ecvpictureright}] \end{description} \hypersetup{urlcolor=magenta} @@ -127,9 +136,13 @@ \begin{ecvitemize} \item this is a list item \item this is a list item + \begin{ecvitemize} + \item this is a list item + \item this is a list item + \end{ecvitemize} \end{ecvitemize} } - \ecvblueitem{blue left text}{ecvblueitem} + \ecvblueitem[-5pt]{blue left text}{ecvblueitem} \ecvtitlelevel{apr 2012 -- apr 2014}{ecvtitlelevel}{ISCED 6} \ecvitem{ecvitem}{Item description} \ecvitem{ecvitem}{\ecvhighlightcell{highlighted cell}} @@ -149,7 +162,6 @@ \begin{description} \item[\texttt{\bs ecvhighlight\{\textit{some text}\}}] \end{description} - To hihghlight the background of a cell, use this command instead: \begin{description} \item[\texttt{\bs ecvhighlightcell\{\textit{some text}\}}] @@ -198,6 +210,37 @@ \end{europasscv} \end{minipage} +\subsection{Digital competences} + +This one is another self-assessment grid which allows to present digital competences. +It is divided into five categories. +For each of these, there are three competence levels available. +To create a self-assessment grid, a single command will suffice. +Additionally, convenient string definitions are provided to describe each level. +In the following, an example code snippet and the resulting CV entry is presented: + +\begin{verbatim} +\ecvdigitalcompetence + {\ecvBasic} + {\ecvIndependent} + {\ecvProficient} + {\ecvIndependent} + {\ecvBasic} +\end{verbatim} + +\vspace{0.5cm} +\hspace*{-6.5cm} +\begin{minipage}{21cm} + \begin{europasscv} + \ecvdigitalcompetence + {\ecvBasic} + {\ecvIndependent} + {\ecvProficient} + {\ecvIndependent} + {\ecvBasic} + \end{europasscv} +\end{minipage} + \section{Advanced usage} \subsection{Class options} @@ -222,10 +265,20 @@ % The use of \textsf{babel} is mandatory for Greek (see the Greek language option above). The following language options are currently supported: -\texttt{english}, \texttt{french}, \texttt{german}, \texttt{italian}, \texttt{portuguese}, \texttt{slovenian}, \texttt{spanish}. +\texttt{english}, \texttt{czech}, \texttt{french}, \texttt{german}, \texttt{greek}\footnote{Requires \XeLaTeX or \LuaLaTeX.}, \texttt{italian}, \texttt{polish}, \texttt{portuguese}, \texttt{slovenian}, \texttt{spanish}. If you need a different language, you must create a new \texttt{.def} file and add the corresponding \texttt{\textbackslash DeclareOption} in the class file. Please contribute your \texttt{.def} files so that they can be included in future updates. The \texttt{.def} files in the \texttt{europecv}\footnote{\url{http://ctan.org/pkg/europecv}} package are a good starting point. +\subsubsection{Fonts} +When using \LaTeX, the default font is \texttt{phv} or Helvetica. To override, use the \texttt{\bs ecvfont} command: +\begin{verbatim} + \ecvfont{lmr} +\end{verbatim} +When using \XeLaTeX\ or \LuaLaTeX, the default font is TeX Gyre Heros. To override, use: +\begin{verbatim} + \setmainfont{TeX Gyre Pagella} +\end{verbatim} + \subsubsection{Debugging} If you are editing the class file you may find the \texttt{debug} option useful: if this option is specified, debug messages are printed on the terminal, the boxes making up the structure of the CV are highlighted with background colors, and the package \texttt{showframe} is loaded. @@ -261,11 +314,16 @@ \end{verbatim} There is also a convenience command \texttt{\bs ecvhighlight\{ Some text \}} which typesets text in \texttt{ecvhighlightcolor}. +\subsection{Deprecated commands} +Using \texttt{\textbackslash ecvtelephone[\textit{mobile number}]\{\textit{number}\}} with the optional argument is deprecated. Please use \texttt{\textbackslash ecvmobile\{\textit{number}\}} and \texttt{\textbackslash ecvtelephone\{\textit{number}\}} instead. + \section{Copyright and license} -Europass and the Europass logo are copyright of the European Union.\footnote{See \url{http://europass.cedefop.europa.eu} for more information.} The \texttt{europasscv} class is released under The \LaTeX\ Project Public License version 1.3.\footnote{ \url{http://ctan.org/license/lppl1.3}.} +Europass and the Europass logo are copyright of the European Union.\footnote{See \url{http://europass.cedefop.europa.eu} for more information.} The \texttt{europasscv} class is released under The \LaTeX\ Project Public License version 1.3.\footnote{\url{http://ctan.org/license/lppl1.3}.} \section{Acknowledgements} Special thanks to \LaTeX\ enthusiast Francesco Biccari whom I had the pleasure to meet at LENS in Sesto Fiorentino and who provided useful comments and suggestions. -The following people contributed language definition files: Peter Fink (German); Nuno Vieira (Portuguese), Henry Ajquejay, Gast\'{o}n Simone and Pablo Rodriguez (Spanish); Ale\v s Zadravec (Slovenian). +The following people contributed language definition files: Peter Fink (German); Nuno Vieira (Portuguese), Henry Ajquejay, Gast\'{o}n Simone and Pablo Rodriguez (Spanish); Ale\v s Zadravec (Slovenian); Jan Koprnick\'{y} (Czech); Lennart Jern (Swedish). + +The following people contributed code changes: Stanley Foerster. \end{document} Binary files old/doc/latex/europasscv/example/europasscv_en.pdf and new/doc/latex/europasscv/example/europasscv_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/europasscv/example/europasscv_en.tex new/doc/latex/europasscv/example/europasscv_en.tex --- old/doc/latex/europasscv/example/europasscv_en.tex 2016-05-16 22:35:41.000000000 +0200 +++ new/doc/latex/europasscv/example/europasscv_en.tex 2017-01-24 00:01:04.000000000 +0100 @@ -3,12 +3,15 @@ % !TEX spellcheck = en_GB \documentclass[english,a4paper]{europasscv} +\usepackage[english]{babel} \ecvname{Betty Smith} \ecvaddress{32 Reading rd, Birmingham B26 3QJ United Kingdom} -\ecvtelephone[+44 7123456789]{+44 20123456789} -\ecvemail{smith(a)kotmail.com} -\ecvhomepage{www.myhomepage.com} +\ecvmobile{+44 555 123 555} +\ecvtelephone{+44 127 6689} +\ecvworkphone{+44 999 888 777} +\ecvemail{smith(a)kotmail.com another(a)email.com} +\ecvhomepage{www.myhomepage.com www.another-homepage.com} \ecvim{AOL Messenger}{betty.smith} \ecvim{Google Talk}{bsmith} @@ -17,6 +20,7 @@ \ecvgender{Female} % \ecvpicture[width=3.8cm]{picture.jpg} +% \ecvpictureright \begin{document} \begin{europasscv} @@ -49,7 +53,7 @@ \ecvsection{Education and training} - \ecvtitlelevel{1997--2001}{PhD - Thesis Title: 'Young People in the Construction of the Virtual Universityâ, Empirical research on e-learning}{ISCED 6} + \ecvtitlelevel{1997--2001}{PhD - Thesis Title: 'Young People in the Construction of the Virtual Universityâ, Empirical research on e-learning}{ISCED~6} \ecvitem{}{Brunel University, London United Kingdom} \ecvtitle{1993--1997}{Bachelor of Science in Sociology and Psychology} @@ -64,7 +68,7 @@ \end{ecvitemize} } -% \pagebreak + \pagebreak \ecvsection{Personal skills} \ecvmothertongue{English} @@ -88,6 +92,8 @@ \item during my PhD I organised a seminar series on research methods \end{ecvitemize} } + + \ecvdigitalcompetence{\ecvBasic}{\ecvIndependent}{\ecvProficient}{\ecvIndependent}{\ecvBasic} \ecvblueitem{Computer skills}{ \begin{ecvitemize} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/europasscv.doc.tlpobj new/tlpkg/tlpobj/europasscv.doc.tlpobj --- old/tlpkg/tlpobj/europasscv.doc.tlpobj 2016-05-17 03:19:26.000000000 +0200 +++ new/tlpkg/tlpobj/europasscv.doc.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -1,10 +1,11 @@ name europasscv.doc category Package -revision 41201 +revision 43033 shortdesc doc files of europasscv relocated 1 -docfiles size=98 - RELOC/doc/latex/europasscv/README +docfiles size=110 + RELOC/doc/latex/europasscv/CHANGELOG.md + RELOC/doc/latex/europasscv/README.md RELOC/doc/latex/europasscv/europasscv.pdf RELOC/doc/latex/europasscv/europasscv.tex RELOC/doc/latex/europasscv/example/europasscv_en.pdf ++++++ europasscv.tar.xz ++++++ Binary files old/tex/latex/europasscv/address_europass_icon.pdf and new/tex/latex/europasscv/address_europass_icon.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv.cls new/tex/latex/europasscv/europasscv.cls --- old/tex/latex/europasscv/europasscv.cls 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv.cls 2017-01-24 00:01:05.000000000 +0100 @@ -8,12 +8,7 @@ % See http://www.latex-project.org/lppl.txt % for the details of that license \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{europasscv}[2016/05/15 Europass curriculum vitae class, 2013 version] - -% CV models and instructions: -% http://europass.cedefop.eu.int/htm/index.htm -% Recommendations: -% http://europa.eu.int/scadplus/leg/en/cha/c11057.htm +\ProvidesClass{europasscv}[2017/01/22 The new Europass curriculum vitae class] \newcommand\ecv@utf[1]{#1} @@ -175,8 +170,11 @@ } \DeclareOption{greek}{% \AtEndOfPackage{% - \InputIfFileExists{europasscv_gr.def}{}{% - \ClassWarningNoLine{europasscv}{Greek definition file 'europasscv_gr.def' not found}}% + \InputIfFileExists{europasscv_el.def}{}{% + \ClassWarningNoLine{europasscv}{Greek definition file 'europasscv_el.def' not found}}% + \ifPDFTeX + \PackageError{europasscv}{Please run XeLaTeX or LuaLaTeX for greek language support}{} + \fi }% } \DeclareOption{galician}{% @@ -192,49 +190,6 @@ }% } -% Input encodings -\DeclareOption{ascii}{\AtEndOfClass{\inputencoding{ascii}}} -\DeclareOption{latin1}{\AtEndOfClass{\inputencoding{latin1}}} -\DeclareOption{latin2}{\AtEndOfClass{\inputencoding{latin2}}} -\DeclareOption{latin3}{\AtEndOfClass{\inputencoding{latin3}}} -\DeclareOption{latin4}{\AtEndOfClass{\inputencoding{latin4}}} -\DeclareOption{latin5}{\AtEndOfClass{\inputencoding{latin5}}} -\DeclareOption{latin9}{\AtEndOfClass{\inputencoding{latin9}}} -\DeclareOption{latin10}{\AtEndOfClass{\inputencoding{latin10}}} -\DeclareOption{decmulti}{\AtEndOfClass{\inputencoding{decmulti}}} -\DeclareOption{cp850}{\AtEndOfClass{\inputencoding{cp850}}} -\DeclareOption{cp852}{\AtEndOfClass{\inputencoding{cp852}}} -\DeclareOption{cp858}{\AtEndOfClass{\inputencoding{cp858}}} -\DeclareOption{cp437}{\AtEndOfClass{\inputencoding{cp437}}} -\DeclareOption{cp437de}{\AtEndOfClass{\inputencoding{cp437de}}} -\DeclareOption{cp865}{\AtEndOfClass{\inputencoding{cp865}}} -\DeclareOption{applemac}{\AtEndOfClass{\inputencoding{applemac}}} -\DeclareOption{next}{\AtEndOfClass{\inputencoding{next}}} -\DeclareOption{cp1250}{\AtEndOfClass{\inputencoding{cp1250}}} -\DeclareOption{cp1252}{\AtEndOfClass{\inputencoding{cp1252}}} -\DeclareOption{cp1257}{\AtEndOfClass{\inputencoding{cp1257}}} -\DeclareOption{ansinew}{\AtEndOfClass{\inputencoding{ansinew}}} -\DeclareOption{utf8}{\AtEndOfClass{\inputencoding{utf8x}}} -\DeclareOption{utf8x}{\AtEndOfClass{\inputencoding{utf8x}}} -\DeclareOption{koi8-r}{\AtEndOfClass{\inputencoding{koi8-r}}} -\DeclareOption{koi8-ru}{\AtEndOfClass{\inputencoding{koi8-ru}}} -\DeclareOption{koi8-u}{\AtEndOfClass{\inputencoding{koi8-u}}} -\DeclareOption{cp1251}{\AtEndOfClass{\inputencoding{cp1251}}} -\DeclareOption{cp855}{\AtEndOfClass{\inputencoding{cp855}}} -\DeclareOption{cp866}{\AtEndOfClass{\inputencoding{cp866}}} -\DeclareOption{maccyr}{\AtEndOfClass{\inputencoding{maccyr}}} -\DeclareOption{macukr}{\AtEndOfClass{\inputencoding{macukr}}} - -% Set font -\DeclareOption{helvetica}{% - \renewcommand{\rmdefault}{phv} - \renewcommand{\sfdefault}{phv} -} -\DeclareOption{arial}{% - \renewcommand{\rmdefault}{ma1} % (this font is NOT installed by default!) - \renewcommand{\sfdefault}{ma1} -} - \DeclareOption{narrow}{ \def\ecv@narrow{} } @@ -251,7 +206,7 @@ \def\ecv@currvitaekey{} \newcommand{\ecvcurrvitae}{\ifx\@empty\ecv@currvitaekey Curriculum vitae \else \ecv@currvitaekey \fi} -\newcommand{\ecvcoloredtitle}{\fontfamily{phv}\fontseries{m}\selectfont \textcolor{ecvhighlightcolor}{\ecvcurrvitae}} +\newcommand{\ecvcoloredtitle}{\selectecvfont \textcolor{ecvhighlightcolor}{\ecvcurrvitae}} % Europass logo \newif\if@ecvlogo\@ecvlogotrue @@ -284,13 +239,18 @@ \ProcessOptions\relax \LoadClass{article} -\RequirePackage[utf8]{inputenc} +\RequirePackage{iftex} +\ifPDFTeX + \RequirePackage[utf8]{inputenc} + \RequirePackage[T1]{fontenc} +\else + \usepackage{fontspec} +\fi \RequirePackage{array} \RequirePackage{fancyhdr} % For page numbering \RequirePackage{xcolor} \RequirePackage{url} \RequirePackage{soul} -\RequirePackage{tabu} \RequirePackage{setspace} \RequirePackage{geometry} \RequirePackage{textcomp} % For copyright symbol @@ -299,9 +259,20 @@ \RequirePackage{colortbl} \RequirePackage{graphicx} \if@ecvdebug \RequirePackage{showframe} \fi -\RequirePackage[T1]{fontenc} +\newcommand{\selectecvfont}{\ifPDFTeX\fontfamily{\ecv@font}\selectfont\fi} +\newcommand*{\ecvfont}[1]{\def\ecv@font{#1}} +\ifPDFTeX + \ecvfont{phv} +\else + \ifx\@empty\ecv@narrow + \setmainfont{TeX Gyre Heros Cn} + \else + \setmainfont{TeX Gyre Heros} + \fi +\fi + \def\ecv@totpages{} \newcommand*{\ecvpage}[1]{\def\ecv@page{#1}} \ecvpage{\ecv@pagekey~\thepage\ecv@totpages} @@ -312,7 +283,7 @@ % Right Footnote to be shown on every page \newcommand\ecvfootnote[1]{\def\ecv@cfoot{#1}} -\ecvfootnote{\textcopyright~\ecv@europeanunionkey, 2002-\the\year\ | http://europass.cedefop.europa.eu } +\ecvfootnote{\textcopyright~\ecv@europeanunionkey, 2002 -- \the\year\ | http://europass.cedefop.europa.eu } \AtBeginDocument{% @@ -322,19 +293,19 @@ \ecvColSep{10pt} % Set layout - +\newlength{\difflength} \if@ecvnodocument\else \newgeometry{body={18.5cm,24cm}, vratio={4:3}} \fancyfoot{} \fancyfoot[L]{\begin{minipage}{\ecv@leftcolwidth} \begin{flushleft} -\footnotesize\textcolor{ecvhighlightcolor}{\fontfamily{phv}\fontseries{m}\selectfont\ecv@lfoot}\end{flushleft} -\end{minipage}\hspace*{\ecv@colsep}\footnotesize\textcolor{ecvhighlightcolor}{\fontfamily{phv}\fontseries{m}\selectfont\ecv@cfoot} +\footnotesize\textcolor{ecvhighlightcolor}{\selectecvfont\ecv@lfoot}\end{flushleft} +\end{minipage}\hspace*{\ecv@colsep}\footnotesize\textcolor{ecvhighlightcolor}{\selectecvfont\ecv@cfoot} } \fancyfoot[R]{\begin{minipage}{\ecv@rightcolwidth} \begin{flushright} -\footnotesize\textcolor{ecvhighlightcolor}{\fontfamily{phv}\fontseries{m}\selectfont\ecv@page}\end{flushright} +\footnotesize\textcolor{ecvhighlightcolor}{\selectecvfont\ecv@page}\end{flushright} \end{minipage}} \fancypagestyle{ecvfancy}{ @@ -343,29 +314,29 @@ \fancyhead{} \fancyhead[R]{ -\raggedleft \fontfamily{phv}\fontseries{m}\selectfont \textcolor{ecvhighlightcolor}{\ecv@name} +\raggedleft \selectecvfont \textcolor{ecvhighlightcolor}{\ecv@name} } \fancyhead[L]{ -\noindent -\begin{minipage}{0.5\textwidth} -\noindent\makebox[\ecv@leftcolwidth][l]{\noindent\raisebox{-0.68\height}[0pt][0pt]{\if@ecvlogo\includegraphics[width=0.6\ecv@logowidth]{europasslogo2013.pdf}\fi}} -\hspace*{\ecv@leftcolwidth}\hspace*{\ecv@colsep}\noindent -\raisebox{\dp\strutbox}{\ecvcoloredtitle} -\end{minipage} -} + \setlength{\difflength}{\ecv@leftcolwidth} + \addtolength{\difflength}{-0.6\ecv@logowidth} + \noindent + \begin{minipage}{0.5\textwidth} + \noindent\makebox[\ecv@leftcolwidth][l]{\noindent\raisebox{-6.5pt}[0pt][0pt]{\if@ecvlogo\includegraphics[width=0.6\ecv@logowidth]{europasslogo2013.pdf}\else \hspace{\ecv@logowidth}\fi}\hspace{\difflength}\hspace{\ecv@colsep}\ecvcoloredtitle} + \end{minipage} + } } \fancypagestyle{first}{ \fancyhead[R]{} \fancyhead[L]{ -\noindent -\begin{minipage}{0.5\textwidth} -\noindent\makebox[\ecv@leftcolwidth][l]{\noindent\raisebox{-0.52\height}[0pt][0pt]{\if@ecvlogo\includegraphics[width=\ecv@logowidth]{europasslogo2013.pdf}\fi}} -\hspace*{\ecv@leftcolwidth}\hspace*{\ecv@colsep}\noindent -\raisebox{\dp\strutbox}{\ecvcoloredtitle} -\end{minipage} -} + \setlength{\difflength}{\ecv@leftcolwidth} + \addtolength{\difflength}{-\ecv@logowidth} + \noindent + \begin{minipage}{0.5\textwidth} + \noindent\makebox[\ecv@leftcolwidth][l]{\noindent\raisebox{-10.5pt}[0pt][0pt]{\if@ecvlogo\includegraphics[width=\ecv@logowidth]{europasslogo2013.pdf}\else \hspace{\ecv@logowidth}\fi}\hspace{\difflength}\hspace{\ecv@colsep}\ecvcoloredtitle} + \end{minipage} + } } \thispagestyle{first} @@ -374,17 +345,27 @@ \fi % End \if@ecvnodocument } % End \AtBeginDocument -% Thanks to Roman Bertle for suggesting the following: \renewcommand{\labelitemi}{\normalfont\bfseries \textendash} -\renewcommand{\labelitemii}{\textasteriskcentered} -\renewcommand{\labelitemiii}{\textperiodcentered} +\renewcommand{\labelitemii}{\textbullet} +\renewcommand{\labelitemiii}{\normalfont\bfseries \textendash} +\renewcommand{\labelitemiv}{\textbullet} \newcommand*{\ecvfirstname}[1]{\def\ecv@firstname{#1}} % Deprecated \newcommand*{\ecvlastname}[1]{\def\ecv@lastname{#1}} % Deprecated \newcommand*{\ecvname}[1]{\def\ecv@name{#1}} % Replaces the above \newcommand*{\ecvfootername}[1]{\def\ecv@footername{#1}} \newcommand*{\ecvaddress}[1]{\def\ecv@address{#1}} -\newcommand*{\ecvtelephone}[2][]{\def\ecv@telephone{#2}\def\ecv@mobile{#1}} +\newcommand*{\ecvtelephone}[2][]{ + \def\ecv@telephone{#2} + \ifx&#1&% + % #1 is empty + \else + % #1 is nonempty + \def\ecv@mobile{#1} + \fi +} +\newcommand*{\ecvmobile}[1]{\def\ecv@mobile{#1}} +\newcommand*{\ecvworkphone}[1]{\def\ecv@workphone{#1}} \newcommand*{\ecvfax}[1]{\def\ecv@fax{#1}} \newcommand*{\ecvemail}[1]{\def\ecv@email{#1}} \newcommand*{\ecvhomepage}[1]{\def\ecv@homepage{#1}} @@ -396,6 +377,10 @@ \newcommand*{\ecvdateofbirth}[1]{\def\ecv@birth{#1}\@ecvpiextrafieldstrue} \newcommand*{\ecvgender}[1]{\def\ecv@gender{#1}\@ecvpiextrafieldstrue} % Personal picture +\newif\if@ecvpictureright\@ecvpicturerightfalse +\newif\if@ecvpictureleft\@ecvpicturelefttrue +\newcommand*{\ecvpictureleft}{\@ecvpicturerightfalse \@ecvpicturelefttrue} +\newcommand*{\ecvpictureright}{\@ecvpicturerighttrue \@ecvpictureleftfalse} \newcommand*{\ecvdrawpicture}{} \newcommand*{\ecvbeforepicture}[1]{\def\ecv@beforepic{#1}} \newcommand*{\ecvafterpicture}[1]{\def\ecv@afterpic{#1}} @@ -419,6 +404,8 @@ \ecvfootername{\ecv@name} \ecvaddress{} \ecvtelephone{} +\ecvmobile{} +\ecvworkphone{} \ecvfax{} \ecvemail{} \ecvhomepage{} @@ -428,64 +415,125 @@ \ecvpicture{} +% see http://tex.stackexchange.com/a/12811 +\def\processlinks#1{% + \begingroup + \edef\@tempa{#1\space}% + \expandafter\endgroup + \expandafter\readwords\@tempa\relax +} +\def\readwords#1 #2\relax{% + \convertstring{#1}% #1 = substr, #2 = rest of string + \begingroup + \ifx\relax#2\relax % is #2 empty? + \def\next{\endgroup}% your own end-macro if required + \else + \quad + \def\next{\endgroup\readwords#2\relax}% + \fi + \next +} + +\newif\if@processlinks@converttoemail +\def\convertstring#1{\if@processlinks@converttoemail \toemail{#1} \else \tourl{#1} \fi} +\def\tourl#1{\setul{.5pt}{.4pt}\href{#1}{\ul{\mbox{#1}}}} +\def\toemail#1{\setul{.5pt}{.4pt}\href{mailto:#1}{\ul{\mbox{#1}}}} + \newif\if@ecvpineedspipe\@ecvpineedspipefalse +\newif\if@ecvphoneispresent\@ecvphoneispresentfalse \providecommand{\ecvpersonalinfo}[1][0pt]{% -\ecvitem[#1]{\ecvsectionstyle{\ecv@infosectionkey}}{ -\begin{doublespacing} -\begin{tabular}[t]{@{}p{\if@ecvpicture 0.7\ecv@rightcolwidth \else \ecv@rightcolwidth\fi}@{}p{\if@ecvpicture 0.3\ecv@rightcolwidth \else 0pt\fi}@{}} -\raggedright -{\ecvLargenormalstyle{\ecv@name}} \newline -\ifx\@empty\ecv@address\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{address_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@address} \newline -\fi -\ifx\@empty\ecv@mobile - \ifx\@empty\ecv@telephone\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{telephone_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@telephone} \newline - \fi -\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mobile_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@mobile} \quad \ifx\@empty\ecv@telephone\else \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{telephone_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@telephone\ \newline}\fi -\fi -\ifx\@empty\ecv@fax\else - \ecv@faxkey \ecv@fax -\fi -\ifx\@empty\ecv@email\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mail_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \setul{.5pt}{.4pt}\href{mailto:\ecv@email}{\ul{\mbox{\ecv@email}}}} \newline -\fi -\ifx\@empty\ecv@homepage\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{website_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \setul{.5pt}{.4pt}\href{\ecv@homepage}{\ul{\mbox{\ecv@homepage}}}} \newline -\fi -\ifx\@empty\ecv@im\else - \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{im_europass_icon.pdf}} \hspace{0.2mm}{\fontseries{m}\selectfont \ecv@im} \newline -\fi - \ifx\@empty\ecv@gender\else - \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi - \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@genderkey} \ecv@gender \@ecvpineedspipetrue - \fi - \ifx\@empty\ecv@birth\else - \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi - \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi\ecv@birthkey} \ecv@birth \@ecvpineedspipetrue - \fi - \if@ecvpicture - \ifx\@empty\ecv@nationality\else - \ifx\@empty\ecv@gender\else + \ecvitem[#1]{ % left column + \ecvsectionstyle{\ecv@infosectionkey} + \if@ecvpicture + \if@ecvpictureleft + \raisebox{-\height}{\ecvdrawpicture} + \fi + \fi + } + { % right column + \begin{doublespacing} + \begin{tabular}[t]{@{}p{\if@ecvpicture \if@ecvpictureleft \ecv@rightcolwidth \else 0.7\ecv@rightcolwidth \fi \else \ecv@rightcolwidth\fi}@{}p{\if@ecvpictureright 0.3\ecv@rightcolwidth \else 0pt\fi}@{}} + \if@ecvdebug\cellcolor{green!25}\fi + \raggedright + {\ecvLargenormalstyle{\ecv@name}} \newline + \ifx\@empty\ecv@address\else + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{address_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@address} \newline + \fi + \ifx\@empty\ecv@mobile + \else\@ecvphoneispresenttrue + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mobile_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@mobile} \quad + \fi + \ifx\@empty\ecv@telephone + \else\@ecvphoneispresenttrue + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{telephone_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@telephone} \quad + \fi + \ifx\@empty\ecv@workphone + \else + \@ecvphoneispresenttrue + \ifx\@empty\ecv@mobile + \else + \ifx\@empty\ecv@telephone + \else + \if@ecvpicture + \if@ecvpictureright + \newline + \fi + \fi + \fi + \fi + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{work_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \ecv@workphone} + \fi + \if@ecvphoneispresent + \newline + \fi + \ifx\@empty\ecv@fax\else + \ecv@faxkey \ecv@fax + \fi + \ifx\@empty\ecv@email\else + \@processlinks@converttoemailtrue + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{mail_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@email}} \newline + \@processlinks@converttoemailfalse + \fi + \ifx\@empty\ecv@homepage\else + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{website_europass_icon.pdf}}\hspace{0.2mm} {\fontseries{m}\selectfont \processlinks{\ecv@homepage}} \newline + \fi + \ifx\@empty\ecv@im\else + \raisebox{-2\lineskip}{\includegraphics[width=0.4cm]{im_europass_icon.pdf}} \hspace{0.2mm}{\fontseries{m}\selectfont \ecv@im} \newline + \fi + \ifx\@empty\ecv@gender\else + \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi + \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@genderkey} \ecv@gender \@ecvpineedspipetrue + \fi + \ifx\@empty\ecv@birth\else + \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi + \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi\ecv@birthkey} \ecv@birth \@ecvpineedspipetrue + \fi + \if@ecvpictureright + \if@ecvpicture + \ifx\@empty\ecv@nationality\else + \ifx\@empty\ecv@gender\else \ifx\@empty\ecv@birth\else - \linebreak - \@ecvpineedspipefalse + \linebreak + \@ecvpineedspipefalse \fi + \fi \fi + \fi + \fi + \ifx\@empty\ecv@nationality\else + \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi + \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@nationalitykey}~\ecv@nationality \@ecvpineedspipetrue + \fi + & + \if@ecvpictureright + \if@ecvdebug\cellcolor{red!25}\fi + \Large \vspace{-\baselineskip} + \raisebox{-\height}{\ecvdrawpicture} \fi - \fi - \ifx\@empty\ecv@nationality\else - \if@ecvpineedspipe\else \hspace*{-0.5ex}\fi - \fontseries{m}\selectfont \ecvhighlight{~\if@ecvpineedspipe | \fi \ecv@nationalitykey}~\ecv@nationality \@ecvpineedspipetrue - \fi -& -\Large \vspace{-\baselineskip} -\raisebox{-\height}{\ecvdrawpicture} -\end{tabular} -\end{doublespacing} -} -\ecvspace{\ecv@afterpic} + \end{tabular} + \end{doublespacing} + } + \ecvspace{\ecv@afterpic} } % Spoken language information @@ -557,7 +605,6 @@ } \newcommand*\ecvlanguage[7][0pt]{\ecvlangrow[#1]{#2}{#3}{#4}{#5}{#6}{#7}{\ecv@langinnerborderwidth}} -% \newcommand*\ecvlanguagecertificate[1]{\ecvitem[-0.7mm]{ciao}{\centering \raisebox{-1mm}{#1} \cellcolor{green!25} \hrule height \ecv@langouterborderwidth }} \newcommand*\ecvlastlanguage[7][0pt]{\ecvlangrow[#1]{#2}{#3}{#4}{#5}{#6}{#7}{\ecv@langouterborderwidth}} \newcommand*{\ecvlanguagefooter}[1][0pt]{ @@ -569,16 +616,8 @@ \renewcommand{\arraystretch}{0} } -% See the Common European Framework of Reference for Languages: -% http://www.coe.int/T/E/Cultural_Co-operation/education/Languages/Language_P… -\newcommand*\ecvCEF[2]{% -% \setlength\tabcolsep{1mm} - -% \begin{tabular}{@{}>{}m{.2\ecv@langparwidth}@{\hspace{1mm}}>{\centering}m{.74\ecv@langparwidth}@{}} -% #1 & \small{#2}\tabularnewline -% \end{tabular} -} - +% commands from the old europecv class +\newcommand*\ecvCEF[2]{} \newcommand*\ecvAOne{A1} \newcommand*\ecvATwo{A2} \newcommand*\ecvBOne{B1} @@ -586,6 +625,39 @@ \newcommand*\ecvCOne{C1} \newcommand*\ecvCTwo{C2} + +% Digital competences +\def\ecv(a)dccol{0.2} +\newcommand*\ecvdigitalcompetence[5]{% + %header + \setlength{\arrayrulewidth}{\ecv@langouterborderwidth} + \ecvblueitem{\ecv@digitalcompetenceskey}{ + \renewcommand{\arraystretch}{1.5} + \setlength{\ecv@langtablewidth}{\ecv@rightcolwidth} + \addtolength{\ecv@langtablewidth}{-4\arrayrulewidth} + \arrayrulecolor{ecvtablebordercolor} + \begin{tabular}[t]{m{\ecv@dccol\ecv@langtablewidth}|m{\ecv@dccol\ecv@langtablewidth}|m{\ecv@dccol\ecv@langtablewidth}|m{\ecv@dccol\ecv@langtablewidth}|m{\ecv@dccol\ecv@langtablewidth}} + \firsthline + \multicolumn{5}{c}{\ecvsectionstyle{\ecv@assesskey}} \tabularnewline + \hline + \centering \ecvbluestyle{\ecv@informationprocessingkey}& \centering \ecvbluestyle{\ecv@communicationkey} &\centering \ecvbluestyle{\ecv@contentcreationkey}& \centering \ecvbluestyle{\ecv@safetykey}& \centering \ecvbluestyle{\ecv@problensolvingkey} \tabularnewline + \hline + \centering{#1} &\centering{#2} &\centering{#3} &\centering{#4} &\centering{#5} \tabularnewline + \hline + \end{tabular} + } + + %footer + \nopagebreak[4] + \ecvitem[0.5\dp\strutbox]{}{\footnotesize \setulcolor{ecvlanglinkcolor}\setul{.5pt}{.4pt}\href{\ecv@digcomplinkkey}{\ul{\mbox{\textcolor{ecvlanglinkcolor}{\ecv@digcompfooterkey}}}}} + \renewcommand{\arraystretch}{0} +} + +\newcommand*\ecvBasic{\ecv@dcbasickey} +\newcommand*\ecvIndependent{\ecv@dcindepkey} +\newcommand*\ecvProficient{\ecv@dcprofkey} + + \def\ecv(a)kern{\kern0.5pt} %\def\ecv@kern{} \newcommand*{\ecvTitleKern}[1]{\def\ecv@kern{\kern#1}} @@ -594,20 +666,13 @@ \newlength\ecv@leftcolwidth \newlength\ecv@rightcolwidth \newlength\ecv@extrarowheight -\newlength\ecv@leftboxwidth -\newlength\ecv@rightboxwidth \newcommand*{\ecvRuleWidth}[1]{\setlength\ecv@rulewidth{#1}} -\newcommand*{\ecvColSep}[1]{% - \setlength\ecv@colsep{#1} - \addtolength{\ecv@rightcolwidth}{-\ecv@colsep} - \addtolength{\ecv@rightboxwidth}{-\ecv@colsep} - } -\newcommand*{\ecvLeftColumnWidth}[1]{\setlength\ecv@leftcolwidth{#1}% - \setlength{\ecv@rightcolwidth}{\textwidth} - \addtolength{\ecv@rightcolwidth}{-\ecv@leftcolwidth} - \addtolength{\ecv@rightcolwidth}{-\ecv@rulewidth} - \setlength{\ecv@rightboxwidth}{\ecv@rightcolwidth} - \setlength{\ecv@leftboxwidth}{\ecv@leftcolwidth} +\newcommand*{\ecvColSep}[1]{\setlength\ecv@colsep{#1}} +\newcommand*{\ecvLeftColumnWidth}[1]{ + \setlength\ecv@leftcolwidth{#1} + \setlength{\ecv@rightcolwidth}{\textwidth} + \addtolength{\ecv@rightcolwidth}{-\ecv@leftcolwidth} + \addtolength{\ecv@rightcolwidth}{-\ecv@colsep} } \newcommand*{\ecvExtraRowHeight}[1]{\setlength\ecv@extrarowheight{#1}} \newcommand*{\ecvNoHorRule}{\def\ecv@hrule{}} @@ -643,29 +708,42 @@ \addtolength{\ecv@langparwidth}{-2\tabcolsep} \addtolength{\ecv@langparwidth}{-2\arrayrulewidth} -\fontfamily{phv} \ifx\@empty\ecv@narrow \fontseries{mc} \else \fontseries{m} \fi -\if@ecvbigfont\else \fontsize{9}{10.8} \fi \selectfont + \ifPDFTeX + \fontfamily{\ecv@font} \ifx\@empty\ecv@narrow \fontseries{mc} \else \fontseries{m} \fi + \fi + \if@ecvbigfont\else \fontsize{9}{10.8} \fi \selectfont \setlength\baselineskip{0pt} \color{\ecv@textcolor} } + +\newif\if@ecvinsideEcvItemize\@ecvinsideEcvItemizefalse \newenvironment{ecvitemize}{ +\if@ecvinsideEcvItemize +\else +\ifhmode \newline \else \fi \ \vspace*{\ecv@itemizeskip} +\@ecvinsideEcvItemizetrue +\fi \begin{itemize}[leftmargin=*,nolistsep,nosep,topsep=0pt] }{ \end{itemize} +\if@ecvinsideEcvItemize +\else \ \vspace{-0.8\baselineskip} +\@ecvinsideEcvItemizefalse +\fi } % styles -\newcommand{\ecvsectionstyle}[1]{\textcolor{ecvsectioncolor}{\fontfamily{phv}\fontseries{m}\selectfont \MakeUppercase{\expandafter{#1}}}} -\newcommand{\ecvbluenormalstyle}[1]{\fontfamily{phv}\fontseries{m}\selectfont\textcolor{ecvsectioncolor}{#1}} +\newcommand{\ecvsectionstyle}[1]{\textcolor{ecvsectioncolor}{\MakeUppercase{\expandafter{#1}}}} +\newcommand{\ecvbluenormalstyle}[1]{\textcolor{ecvsectioncolor}{#1}} \newcommand{\ecvtitlestyle}[1]{\large{\ecvbluenormalstyle{#1}}} -\newcommand{\ecvlargenormalstyle}[1]{\large \fontfamily{phv}\fontseries{m}\selectfont #1} -\newcommand{\ecvLargenormalstyle}[1]{\Large \fontfamily{phv}\fontseries{m}\selectfont #1} +\newcommand{\ecvlargenormalstyle}[1]{\large #1} +\newcommand{\ecvLargenormalstyle}[1]{\Large #1} \newcommand{\ecvhighlight}[1]{\textcolor{ecvhighlightcolor}{#1}} \newcommand{\ecvbluestyle}[1]{\textcolor{ecvsectioncolor}{#1}} @@ -690,6 +768,7 @@ \setlength{\baselineskip}{1.5\ht\strutbox} }p{#1} } +\newcolumntype{R}[1]{>{\raggedleft}p{#1}} \newcommand\ecvitem[3][\ecv@itemskip]{% \if@ecvdebug \renewcommand{\ecv@secondarg}{#2} @@ -698,7 +777,11 @@ \message{[europasscv] typesetting ^^J} \message{[europasscv] \meaning\ecv@secondarg^^J} \message{[europasscv] \meaning\ecv@thirdarg^^J} - \message{[europasscv] ecvitemskip = \if@ecvitemskip true, skipping \the\ecv@currentskip \else false\fi} + \message{[europasscv] ecvitemskip = \if@ecvitemskip true, skipping \the\ecv@currentskip \else false\fi^^J} + \message{[europasscv] leftcolwidth = \the\ecv@leftcolwidth^^J} + \message{[europasscv] ecv@colsep = \the\ecv@colsep^^J} + \message{[europasscv] rightcolwidth = \the\ecv@rightcolwidth^^J} + \message{[europasscv] textwidth = \the\textwidth^^J} \fi \if@ecvitemskip @@ -714,9 +797,11 @@ \setlength\ecv@itemizeskip{-\ht\strutbox}\addtolength{\ecv@itemizeskip}{-2\dp\strutbox} - \begin{tabular}{@{}p{\ecv@leftcolwidth}@{\extracolsep{\ecv@colsep}}P{\ecv@rightcolwidth}@{}} - \if@ecvdebug\cellcolor{yellow!25}\fi \raggedleft #2 & \if@ecvdebug\cellcolor{blue!25}\fi #3 + \noindent\begin{tabular}{@{}R{\ecv@leftcolwidth}@{\hspace{\ecv@colsep}}P{\ecv@rightcolwidth}@{}} + \if@ecvdebug\cellcolor{yellow!25}\fi #2 & \if@ecvdebug\cellcolor{blue!25}\fi #3 \end{tabular} + % do not delete the blank line below + \@ecvitemskiptrue \@ecvlastitemwassectionfalse \@ecvitemcommandtrue @@ -724,7 +809,7 @@ \newlength{\ecv@sectionrulelength} -\newcommand{\ecvsection}[2][1.3\bigskipamount]{% +\newcommand{\ecvsection}[2][\bigskipamount]{% \@ecvitemcommandfalse \setlength{\ecv@sectionrulelength}{\ecv@rightcolwidth} \addtolength{\ecv@sectionrulelength}{-7pt} @@ -741,21 +826,20 @@ \ecvitem[#1]{\small \ecvbluenormalstyle{#2}}{\ecvtitlestyle{#3}} } -\newcommand{\ecvtitlelevel}[4][\if@ecvitemskip 1.3\bigskipamount \else 0pt \fi]{\ecvtitle[#1]{#2}{ - \begin{tabular}[t]{@{}p{0.8\ecv@rightcolwidth}@{}p{0.2\ecv@rightcolwidth}@{}} - #3 & \if@ecvdebug\cellcolor{green!25}\fi \raggedleft \ecvhighlight{\small #4} - \end{tabular} \nolinebreak[4] -} +\newcommand{\ecvtitlelevel}[4][\if@ecvitemskip 1.3\bigskipamount \else 0pt \fi]{ + \ecvtitle[#1]{#2}{ + #3 \if@ecvdebug\cellcolor{green!25}\fi \hfill \ecvhighlight{\small #4} + \nolinebreak[4] + } } -\newcommand\ecvblueitem[3][\if@ecvitemskip 1.3\bigskipamount\else 0pt \fi]{\ecvitem[#1]{\textcolor{ecvsectioncolor}{#2}}{ -% \setlength\ecv@itemizeskip{-1.3\bigskipamount}\addtolength{\ecv@itemizeskip}{0.5\dp\strutbox} - #3} +\newcommand\ecvblueitem[3][\if@ecvitemskip 1.3\bigskipamount\else 0pt \fi]{ + \ecvitem[#1]{\textcolor{ecvsectioncolor}{#2}}{#3} } -\newcommand{\ecvbigitem}[3][\bigskipamount]{ +\newcommand{\ecvbigitem}[3][0.8\bigskipamount]{ \ecvitem[#1]{\ecvsectionstyle{#2}}{\ecvlargenormalstyle{#3}} - \vspace{\bigskipamount} + \vspace{0.8\bigskipamount} \@ecvitemskipfalse } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_cs.def new/tex/latex/europasscv/europasscv_cs.def --- old/tex/latex/europasscv/europasscv_cs.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/europasscv/europasscv_cs.def 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,57 @@ +%!TEX encoding = UTF-8 Unicode +% +% Translation completed on 2016/09/09 +\ProvidesFile{europasscv_cs.def}[europasscv Czech definitions] +\def\ecv@currvitaekey{\ecv@utf{{\v Z}ivotopis}} +% Personal information +\def\ecv@infosectionkey{\ecv@utf{Osobn{\'\i} {\'u}daje}} +\def\ecv@namekey{\ecv@utf{Jm{\'e}no / P{\v r}{\'\i}jmen{\'\i}}} +\def\ecv@addresskey{\ecv@utf{Adresa}} +\def\ecv@telkey{\ecv@utf{Telefon}} +\def\ecv@mobilekey{\ecv@utf{Mobiln{\'\i} telefon}} +\def\ecv@faxkey{\ecv@utf{Fax}} +\def\ecv@emailkey{\ecv@utf{E-mail}} +\def\ecv@nationalitykey{\ecv@utf{St{\'a}tn{\'\i} p{\v r}{\'\i}slu{\v s}nost}} +\def\ecv@birthkey{\ecv@utf{Datum narozen{\'\i}}} +\def\ecv@genderkey{\ecv@utf{Pohlav{\'\i}}} +% Footer +\def\ecv@pagekey{\ecv@utf{Strana}} +\def\ecv@cvofkey{\ecv@utf{{\v Z}ivotopis}} +% Language table +\def\ecv@mothertonguekey{\ecv@utf{Mate{\v r}sk{\'y} jazyk(y)}} +\def\ecv@otherlanguageskey{\ecv@utf{Dal{\v s}{\'i} jazyky}} +\def\ecv@assesskey{\ecv@utf{Sebehodnocen{\'i}}} +\def\ecv@levelkey{\ecv@utf{Evropsk{\'a} {\'u}rove{\v n}}} +\def\ecv@understandkey{\ecv@utf{Porozum{\v e}n{\'\i}}} +\def\ecv@speakkey{\ecv@utf{Mluven{\'\i}}} +\def\ecv@writekey{\ecv@utf{Psan{\'\i}}} +\def\ecv@listenkey{\ecv@utf{Poslech}} +\def\ecv@readkey{\ecv@utf{{\v C}ten{\'\i}}} +\def\ecv@interactkey{\ecv@utf{{\'U}stn{\'\i} interakce}} +\def\ecv@productkey{\ecv@utf{Samostatn{\'y} {\'u}stn{\'\i} projev}} +\def\ecv@langshortdesckey{\ecv@utf{{\'U}rovn{\v e}: A1/A2: U{\v z}ivatel z{\'a}klad{\r u} jazyka -- B1/B2: Samostatn{\'y} u{\v z}ivatel -- C1/C2: Zku{\v s}en{\'y} u{\v z}ivatel}} +\def\ecv@langfooterkey{\ecv@utf{Spole{\v c}n{\'y} evropsk{\'y} referen{\v c}n{\'\i} r{\'a}mec pro jazyky}} +\def\ecv@langlinkkey{\ecv@utf{http://europass.cedefop.europa.eu/cs/resources/european-language-levels-cefr}} +\def\ecv@cefbasickey{\ecv@utf{U{\v z}ivatel z{\'a}klad{\r u} jazyka}} +\def\ecv@cefindepkey{\ecv@utf{Samostatn{\'y} u{\v z}ivatel}} +\def\ecv@cefprofkey{\ecv@utf{Zku{\v s}en{\'y} u{\v z}ivatel}} +\def\ecv@europeanunionkey{\ecv@utf{Evropsk{\'a} unie}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Digit{\'a}ln{\'\i} dovednosti}} +\def\ecv@informationprocessingkey{\ecv@utf{Zpracov{\'a}n{\'\i} informac{\'\i}}} +\def\ecv@communicationkey{\ecv@utf{Komunikace}} +\def\ecv@contentcreationkey{\ecv@utf{Vytv{\'a}{\v r}en{\'\i} obsahu}} +\def\ecv@safetykey{\ecv@utf{Bezpe{\v c}nost}} +\def\ecv@problensolvingkey{\ecv@utf{{\v R}e{\v s}en{\'\i} probl{\'e}mu}} +\def\ecv@digcompfooterkey{\ecv@utf{Digit{\'a}ln{\'\i} dovednosti - Stupnice pro sebehodnocen{\'\i}}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/cs/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Z{\'a}kladn{\'\i} u{\v z}ivatel}} +\def\ecv@dcindepkey{\ecv@utf{Samostatn{\'y} u{\v z}ivatel}} +\def\ecv@dcprofkey{\ecv@utf{Zku{\v s}en{\'y} u{\v z}ivatel}} + +% Width of language columns +\def\ecv(a)langcola{0.15} +\def\ecv(a)langcolb{0.15} +\def\ecv(a)langcolc{0.25} +\def\ecv(a)langcold{0.25} +\def\ecv(a)langcole{0.2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_de.def new/tex/latex/europasscv/europasscv_de.def --- old/tex/latex/europasscv/europasscv_de.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_de.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{ecven.def}[europecv German definitions] +\ProvidesFile{europasscv_de.def}[europasscv German definitions] % Personal information \def\ecv@infosectionkey{\ecv@utf{Angaben zur Person}} \def\ecv@namekey{\ecv@utf{Nachname(n) / Vorname(n)}} @@ -35,6 +35,18 @@ \def\ecv@cefindepkey{\ecv@utf{SelbstÃ€ndige Sprachverwendung}} \def\ecv@cefprofkey{\ecv@utf{Kompetente Sprachverwendung}} \def\ecv@europeanunionkey{\ecv@utf{EuropÃ€ische Union}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Digitale Kompetenzen}} +\def\ecv@informationprocessingkey{\ecv@utf{Datenverarbeitung}} +\def\ecv@communicationkey{\ecv@utf{Kommunikation}} +\def\ecv@contentcreationkey{\ecv@utf{Erstellung von Inhalten}} +\def\ecv@safetykey{\ecv@utf{Sicherheit}} +\def\ecv@problensolvingkey{\ecv@utf{ProblemlÃ¶sung}} +\def\ecv@digcompfooterkey{\ecv@utf{Digitale Kompetenzen - Raster zur Selbstbeurteilung}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/de/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Elementare Verwendung}} +\def\ecv@dcindepkey{\ecv@utf{SelbststÃ€ndige Verwendung}} +\def\ecv@dcprofkey{\ecv@utf{Kompetente Verwendung}} % Width of language columns \def\ecv(a)langcola{0.15} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_el.def new/tex/latex/europasscv/europasscv_el.def --- old/tex/latex/europasscv/europasscv_el.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/europasscv/europasscv_el.def 2017-01-24 00:01:05.000000000 +0100 @@ -0,0 +1,48 @@ +%!TEX encoding = UTF-8 Unicode +% +% WARNING: Requires XeLaTeX or LuaLaTeX +% +\ProvidesFile{europasscv_el.def}[europasscv Greek definitions] +% Personal information +\def\ecv@infosectionkey{\ecv@utf{Î ÏÎ¿ÏÏÏÎ¹ÎºÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÎµÏ}} +\def\ecv@nationalitykey{\ecv@utf{ÎÎžÎœÎ¹ÎºÏÏÎ·ÏÎ±}} +\def\ecv@birthkey{\ecv@utf{ÎÎŒÎµÏÎ¿ÎŒÎ·ÎœÎ¯Î± ÎÎÎœÎœÎ·ÏÎ·Ï}} +\def\ecv@genderkey{\ecv@utf{ÎŠÏÎ»Î¿}} +% Footer +\def\ecv@pagekey{\ecv@utf{Î£ÎµÎ»Î¯ÎŽÎ±}} +\def\ecv@currvitaekey{\ecv@utf{ÎÎ¹Î¿Î³ÏÎ±ÏÎ¹ÎºÏ ÏÎ·ÎŒÎµÎ¯ÏÎŒÎ±}} +% Language table +\def\ecv@mothertonguekey{\ecv@utf{ÎÎ·ÏÏÎ¹ÎºÎ® Î³Î»ÏÏÏÎ±}} +\def\ecv@otherlanguageskey{\ecv@utf{ÎÎ¿Î¹ÏÎÏ Î³Î»ÏÏÏÎµÏ}} +\def\ecv@assesskey{\ecv@utf{ÎÏÏÎ¿Î±ÎŸÎ¹Î¿Î»ÏÎ³Î·ÏÎ·}} +\def\ecv@understandkey{\ecv@utf{ÎÎ±ÏÎ±ÎœÏÎ·ÏÎ·}} +\def\ecv@speakkey{\ecv@utf{ÎÎŒÎ¹Î»Î¯Î±}} +\def\ecv@writekey{\ecv@utf{ÎÏÎ±ÏÎ·}} +\def\ecv@listenkey{\ecv@utf{Î ÏÎ¿ÏÎ¿ÏÎ¹ÎºÎ®}} +\def\ecv@readkey{\ecv@utf{ÎÏÎ±ÏÏÎ® (Î±ÎœÎ¬Î³ÎœÏÏÎ·)}} +\def\ecv@interactkey{\ecv@utf{ÎÏÎ¹ÎºÎ¿Î¹ÎœÏÎœÎ¯Î±}} +\def\ecv@productkey{\ecv@utf{Î ÏÎ¿ÏÎ¿ÏÎ¹ÎºÎ® ÎÎºÏÏÎ±ÏÎ·}} +\def\ecv@langshortdesckey{\ecv@utf{ÎÏÎ¯ÏÎµÎŽÎ±: Î1/A2: ÎÎ±ÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï - Î1/B2: ÎÎœÎµÎŸÎ¬ÏÏÎ·ÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï - C1/C2: ÎÎŒÏÎµÎ¹ÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï}} +\def\ecv@langfooterkey{\ecv@utf{ÎÎ¿Î¹ÎœÏ ÎÏÏÏÏÎ±ÏÎºÏ Î Î»Î±Î¯ÏÎ¹Î¿ ÎÎœÎ±ÏÎ¿ÏÎ¬Ï Î³Î¹Î± ÎÎ»ÏÏÏÎµÏ}} +\def\ecv@langlinkkey{\ecv@utf{http://europass.cedefop.europa.eu/el/resources/european-language-levels-cefr}} + +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{ÎšÎ·ÏÎ¹Î±ÎºÎ® ÎŽÎµÎŸÎ¹ÏÏÎ·ÏÎ±}} +\def\ecv@informationprocessingkey{\ecv@utf{ÎÏÎµÎŸÎµÏÎ³Î±ÏÎ¯Î± ÎŽÎµÎŽÎ¿ÎŒÎÎœÏÎœ}} +\def\ecv@communicationkey{\ecv@utf{ÎÏÎ¹ÎºÎ¿Î¹ÎœÏÎœÎ¯Î±}} +\def\ecv@contentcreationkey{\ecv@utf{ÎÎ·ÎŒÎ¹Î¿ÏÏÎ³Î¯Î± Î ÎµÏÎ¹ÎµÏÎ¿ÎŒÎÎœÎ¿Ï}} +\def\ecv@safetykey{\ecv@utf{ÎÏÏÎ¬Î»ÎµÎ¹Î±}} +\def\ecv@problensolvingkey{\ecv@utf{ÎÏÎ¯Î»ÏÏÎ· ÏÏÎ¿Î²Î»Î·ÎŒÎ¬ÏÏÎœ}} +\def\ecv@digcompfooterkey{\ecv@utf{ÎšÎ·ÏÎ¹Î±ÎºÎÏ ÎŽÎµÎŸÎ¹ÏÏÎ·ÏÎµÏ - Î Î¯ÎœÎ±ÎºÎ±Ï Î±ÏÏÎ¿Î±ÎŸÎ¹Î¿Î»ÏÎ³Î·ÏÎ·Ï}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/el/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{ÎÎ±ÏÎ¹ÎºÏÏ ÏÏÎ®ÏÏÎ·Ï}} +\def\ecv@dcindepkey{\ecv@utf{ÎÎœÎµÎŸÎ¬ÏÏÎ·ÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï}} +\def\ecv@dcprofkey{\ecv@utf{\textasciiacute EÎŒÏÎµÎ¹ÏÎ¿Ï ÏÏÎ®ÏÏÎ·Ï}} + +% Width of language columns +\def\ecv(a)langcola{0.15} +\def\ecv(a)langcolb{0.28} +\def\ecv(a)langcolc{0.18} +\def\ecv(a)langcold{0.28} +\def\ecv(a)langcole{0.11} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_en.def new/tex/latex/europasscv/europasscv_en.def --- old/tex/latex/europasscv/europasscv_en.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_en.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{ecven.def}[europecv English definitions] +\ProvidesFile{europasscv_en.def}[europasscv English definitions] % Personal information \def\ecv@infosectionkey{\ecv@utf{Personal information}} \def\ecv@namekey{\ecv@utf{Surname / First name}} @@ -35,6 +35,18 @@ \def\ecv@cefindepkey{\ecv@utf{Independent user}} \def\ecv@cefprofkey{\ecv@utf{Proficient user}} \def\ecv@europeanunionkey{\ecv@utf{European Union}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Digital competences}} +\def\ecv@informationprocessingkey{\ecv@utf{Information Processing}} +\def\ecv@communicationkey{\ecv@utf{Communication}} +\def\ecv@contentcreationkey{\ecv@utf{Content creation}} +\def\ecv@safetykey{\ecv@utf{Safety}} +\def\ecv@problensolvingkey{\ecv@utf{Problem solving}} +\def\ecv@digcompfooterkey{\ecv@utf{Digital competences - Self-assessment grid}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/en/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Basic user}} +\def\ecv@dcindepkey{\ecv@utf{Independent user}} +\def\ecv@dcprofkey{\ecv@utf{Proficient user}} % Width of language columns \def\ecv(a)langcola{0.15} @@ -42,4 +54,3 @@ \def\ecv(a)langcolc{0.25} \def\ecv(a)langcold{0.25} \def\ecv(a)langcole{0.2} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_es.def new/tex/latex/europasscv/europasscv_es.def --- old/tex/latex/europasscv/europasscv_es.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_es.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{europasscv_es.def}[europecv Spanish definitions] +\ProvidesFile{europasscv_es.def}[europasscv Spanish definitions] \def\ecv@currvitaekey{\ecv@utf{Curr\'{i}culum vitae}} % Personal information \def\ecv@infosectionkey{\ecv@utf{Informaci\'{o}n personal}} @@ -36,6 +36,18 @@ \def\ecv@cefindepkey{\ecv@utf{Usuario independiente}} \def\ecv@cefprofkey{\ecv@utf{Usuario competente}} \def\ecv@europeanunionkey{\ecv@utf{Uni\'{o}n Europea}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Competencias digitales}} +\def\ecv@informationprocessingkey{\ecv@utf{Tratamiento de la informaci{\'o}n}} +\def\ecv@communicationkey{\ecv@utf{Comunicaci{\'o}n}} +\def\ecv@contentcreationkey{\ecv@utf{Creaci{\'o}n del contenido}} +\def\ecv@safetykey{\ecv@utf{Seguridad}} +\def\ecv@problensolvingkey{\ecv@utf{Resoluci{\'o}n de problemas}} +\def\ecv@digcompfooterkey{\ecv@utf{Competencias digitales - Tabla de auto evaluaci{\'o}n}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/es/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Usuario b{\'a}sico}} +\def\ecv@dcindepkey{\ecv@utf{Usuario independiente}} +\def\ecv@dcprofkey{\ecv@utf{Usuario competente}} % Width of language columns \def\ecv(a)langcola{0.15} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_fr.def new/tex/latex/europasscv/europasscv_fr.def --- old/tex/latex/europasscv/europasscv_fr.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_fr.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,5 +1,6 @@ %!TEX encoding = UTF-8 Unicode % +\ProvidesFile{europasscv_fr.def}[europasscv French definitions] % Informations personnelles \def\ecv@infosectionkey{\ecv@utf{Informations personnelles}} \def\ecv@namekey{\ecv@utf{Nom(s) / Pr\'enom(s)}} @@ -14,7 +15,7 @@ % Pied de page \def\ecv@pagekey{\ecv@utf{Page}} \def\ecv@cvofkey{\ecv@utf{Curriculum vit\ae\ de}} -% Grille d'AutoÂvaluation des langues +% Grille d'AutoÃ©valuation des langues \def\ecv@mothertonguekey{\ecv@utf{Langue maternelle}} \def\ecv@otherlanguageskey{\ecv@utf{Autres langues}} \def\ecv@assesskey{\ecv@utf{Auto \'evaluation}} @@ -27,13 +28,24 @@ \def\ecv@interactkey{\ecv@utf{Prendre part \`a une conversation}} \def\ecv@productkey{\ecv@utf{S'exprimer oralement en continu}} \def\ecv@langlinkkey{\ecv@utf{http://europass.cedefop.europa.eu/fr/resources/european-language-levels-cefr}} -\def\ecv@langfooterkey{\ecv@utf{Cadre europÃ©en commun de rÃ©fÃ©rence pour les langues}} +\def\ecv@langfooterkey{\ecv@utf{Cadre europ{\'e}en commun de r{\'e}f{\'e}rence pour les langues}} \def\ecv@langshortdesckey{\ecv@utf{Niveaux: A1/A2: utilisateur \'el\'ementaire -- B1/B2: utilisateur ind\'ependant -- C1/C2: utilisateur exp\'eriment\'e}} \def\ecv@cefbasickey{\ecv@utf{Utilisateur \'el\'ementaire}} \def\ecv@cefindepkey{\ecv@utf{Utilisateur Ind\'ependant}} \def\ecv@cefprofkey{\ecv@utf{Utilisateur exp\'eriment\'e}} - \def\ecv@europeanunionkey{\ecv@utf{Union europ\'eenne}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Comp{\'e}tences num{\'e}riques}} +\def\ecv@informationprocessingkey{\ecv@utf{Traitement de l'information}} +\def\ecv@communicationkey{\ecv@utf{Communication}} +\def\ecv@contentcreationkey{\ecv@utf{Cr{\'e}ation de contenu}} +\def\ecv@safetykey{\ecv@utf{S{\'e}curit{\'e}}} +\def\ecv@problensolvingkey{\ecv@utf{R{\'e}solution de probl{\`e}mes}} +\def\ecv@digcompfooterkey{\ecv@utf{Comp{\'e}tences num{\'e}riques - Grille d'auto{\'e}valuation}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/fr/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Utilisateur {\'e}l{\'e}mentaire}} +\def\ecv@dcindepkey{\ecv@utf{Utilisateur ind{\'e}pendant}} +\def\ecv@dcprofkey{\ecv@utf{Utilisateur exp{\'e}riment{\'e}}} % Width of language columns \def\ecv(a)langcola{0.15} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_it.def new/tex/latex/europasscv/europasscv_it.def --- old/tex/latex/europasscv/europasscv_it.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_it.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{ecvit.def}[europecv Italian definitions] +\ProvidesFile{europasscv_it.def}[europasscv Italian definitions] % Personal information \def\ecv@infosectionkey{\ecv@utf{Informazioni personali}} \def\ecv@namekey{\ecv@utf{Nome e cognome}} @@ -35,6 +35,18 @@ \def\ecv@cefindepkey{\ecv@utf{Utente autonomo}} \def\ecv@cefprofkey{\ecv@utf{Utente avanzato}} \def\ecv@europeanunionkey{\ecv@utf{Unione Europea}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Competenze digitali}} +\def\ecv@informationprocessingkey{\ecv@utf{Elaborazione delle informazioni}} +\def\ecv@communicationkey{\ecv@utf{Comunicazione}} +\def\ecv@contentcreationkey{\ecv@utf{Creazione di Contenuti}} +\def\ecv@safetykey{\ecv@utf{Sicurezza}} +\def\ecv@problensolvingkey{\ecv@utf{Risoluzione di problemi}} +\def\ecv@digcompfooterkey{\ecv@utf{Competenze digitali - Scheda per l'autovalutazione}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/it/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Utente base}} +\def\ecv@dcindepkey{\ecv@utf{Utente autonomo}} +\def\ecv@dcprofkey{\ecv@utf{Utente avanzato}} % Width of language columns \def\ecv(a)langcola{0.15} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_pl.def new/tex/latex/europasscv/europasscv_pl.def --- old/tex/latex/europasscv/europasscv_pl.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/europasscv/europasscv_pl.def 2016-11-25 19:33:47.000000000 +0100 @@ -0,0 +1,56 @@ +%!TEX encoding = UTF-8 Unicode +% +% +\ProvidesFile{europasscv_pl.def}[europasscv Polish definitions] +% Personal information +\def\ecv@infosectionkey{\ecv@utf{Dane osobowe}} +\def\ecv@namekey{\ecv@utf{Nazwisko / Imi\k{e}}} +\def\ecv@addresskey{\ecv@utf{Adres}} +\def\ecv@telkey{\ecv@utf{Telefon}} +\def\ecv@mobilekey{\ecv@utf{Kom\'orkowy}} +\def\ecv@faxkey{\ecv@utf{Faks}} +\def\ecv@emailkey{\ecv@utf{E-mail}} +\def\ecv@nationalitykey{\ecv@utf{Narodowo\'s\'c}} +\def\ecv@birthkey{\ecv@utf{Data urodzenia}} +\def\ecv@genderkey{\ecv@utf{P\l{}e\'c}} +% Footer +\def\ecv@pagekey{\ecv@utf{Strona internetowa}} +\def\ecv@cvofkey{\ecv@utf{Curriculum vit\ae\: }} +% Language table +\def\ecv@mothertonguekey{\ecv@utf{J\k{e}zyk ojczysty}} +\def\ecv@otherlanguageskey{\ecv@utf{Inne j\k{e}zyki}} +\def\ecv@assesskey{\ecv@utf{Samoocena}} +\def\ecv@levelkey{\ecv@utf{Poziom europejski}} +\def\ecv@understandkey{\ecv@utf{Rozumienie}} +\def\ecv@speakkey{\ecv@utf{M\'owienie}} +\def\ecv@writekey{\ecv@utf{Pisanie}} +\def\ecv@listenkey{\ecv@utf{S\l{}uchanie}} +\def\ecv@readkey{\ecv@utf{Czytanie}} +\def\ecv@interactkey{\ecv@utf{Porozumiewanie si\k{e}}} +\def\ecv@productkey{\ecv@utf{Samodzielne wypowiadanie si\k{e}}} +\def\ecv@langshortdesckey{\ecv@utf{Poziomy: A1/A2: Podstawowy -- B1/B2: Samodzielno\'sci -- C1/C2: Bieg\l{}o\'sci}} +\def\ecv@langfooterkey{\ecv@utf{Europejski system opisu kszta\l{}cenia j\k{e}zykowego (CEF)}} +\def\ecv@langlinkkey{\ecv@utf{http://europass.cedefop.europa.eu/pl/resources/european-language-levels-cefr}} +\def\ecv@cefbasickey{\ecv@utf{Podstawowy}} +\def\ecv@cefindepkey{\ecv@utf{Samodzielno\'sci}} +\def\ecv@cefprofkey{\ecv@utf{Bieg\l{}o\'sci}} +\def\ecv@europeanunionkey{\ecv@utf{Unia Europejska}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Umiej{\k{e}}tno{\'s}ci cyfrowe}} +\def\ecv@informationprocessingkey{\ecv@utf{Przetwarzanie informacji}} +\def\ecv@communicationkey{\ecv@utf{Komunikacja}} +\def\ecv@contentcreationkey{\ecv@utf{Tworzenie tre{\'s}ci}} +\def\ecv@safetykey{\ecv@utf{Bezpiecze{\'n}stwo}} +\def\ecv@problensolvingkey{\ecv@utf{RozwiÄzywanie problem{\'o}w}} +\def\ecv@digcompfooterkey{\ecv@utf{Umiej{\k{e}}tno{\'s}ci cyfrowe - Tabela samooceny}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/pl/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Poziom podstawowy}} +\def\ecv@dcindepkey{\ecv@utf{Poziom samodzielno{\'s}ci}} +\def\ecv@dcprofkey{\ecv@utf{Poziom bieg\l{}o{\'s}ci}} + +% Width of language columns +\def\ecv(a)langcola{0.15} +\def\ecv(a)langcolb{0.15} +\def\ecv(a)langcolc{0.25} +\def\ecv(a)langcold{0.25} +\def\ecv(a)langcole{0.2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_pt.def new/tex/latex/europasscv/europasscv_pt.def --- old/tex/latex/europasscv/europasscv_pt.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_pt.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{ecvpt.def}[europecv Portuguese definitions] +\ProvidesFile{europasscv_pt.def}[europasscv Portuguese definitions] % Personal information \def\ecv@infosectionkey{\ecv@utf{Informa\c{c}\~ao pessoal}} \def\ecv@namekey{\ecv@utf{Nome(s) Apelido(s)}} @@ -35,6 +35,18 @@ \def\ecv@cefindepkey{\ecv@utf{Utilizador independente}} \def\ecv@cefprofkey{\ecv@utf{Utilizador avan\c{c}ado}} \def\ecv@europeanunionkey{\ecv@utf{Uni\~ao Europeia}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Compet{\^e}ncias digitais}} +\def\ecv@informationprocessingkey{\ecv@utf{Processamento de informa\c{c}{\~a}o}} +\def\ecv@communicationkey{\ecv@utf{Comunica\c{c}{\~a}o}} +\def\ecv@contentcreationkey{\ecv@utf{Cria\c{c}{\~a}o de conte{\'u}dos}} +\def\ecv@safetykey{\ecv@utf{Seguran\c{c}a}} +\def\ecv@problensolvingkey{\ecv@utf{Resolu\c{c}{\~a}o de problemas}} +\def\ecv@digcompfooterkey{\ecv@utf{Compet{\^e}ncias digitais - Grelha de auto-avalia\c{c}{\~a}o}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/pt/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Utilizador b{\'a}sico}} +\def\ecv@dcindepkey{\ecv@utf{Utilizador independente}} +\def\ecv@dcprofkey{\ecv@utf{Utilizador avan\c{c}ado}} % Width of language columns \def\ecv(a)langcola{0.22} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_sl.def new/tex/latex/europasscv/europasscv_sl.def --- old/tex/latex/europasscv/europasscv_sl.def 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/europasscv_sl.def 2016-11-25 19:33:47.000000000 +0100 @@ -1,7 +1,7 @@ %!TEX encoding = UTF-8 Unicode % % -\ProvidesFile{ecvsl.def}[europecv Slovenian definitions] +\ProvidesFile{europasscv_sl.def}[europasscv Slovenian definitions] % Personal information \def\ecv@infosectionkey{\ecv@utf{Osebni podatki}} \def\ecv@namekey{\ecv@utf{Ime~/ Priimek}} @@ -35,6 +35,18 @@ \def\ecv@cefindepkey{\ecv@utf{Samostojni uporabnik}} \def\ecv@cefprofkey{\ecv@utf{Usposobljeni uporabnik}} \def\ecv@europeanunionkey{\ecv@utf{Evropska unija}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Digitalne kompetence}} +\def\ecv@informationprocessingkey{\ecv@utf{Obdelava informacij}} +\def\ecv@communicationkey{\ecv@utf{Komunikacija}} +\def\ecv@contentcreationkey{\ecv@utf{Ustvarjanje\\ vsebin}} +\def\ecv@safetykey{\ecv@utf{Varnost}} +\def\ecv@problensolvingkey{\ecv@utf{Re{\v s}evanje problemov}} +\def\ecv@digcompfooterkey{\ecv@utf{Digitalne kompetence - Samoocenjevalna lestvica}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/sl/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{Osnovni uporabnik}} +\def\ecv@dcindepkey{\ecv@utf{Samostojni uporabnik}} +\def\ecv@dcprofkey{\ecv@utf{Usposobljeni uporabnik}} % Width of language columns \def\ecv(a)langcola{0.15} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/europasscv_sv.def new/tex/latex/europasscv/europasscv_sv.def --- old/tex/latex/europasscv/europasscv_sv.def 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/europasscv/europasscv_sv.def 2017-01-24 00:01:05.000000000 +0100 @@ -0,0 +1,56 @@ +%!TEX encoding = UTF-8 Unicode +% +% +\ProvidesFile{europasscv_sv.def}[europasscv Swedish definitions] +% Personal information +\def\ecv@infosectionkey{\ecv@utf{Personlig information}} +\def\ecv@namekey{\ecv@utf{FÃ¶rnamn Efternamn}} +\def\ecv@addresskey{\ecv@utf{Adress}} +\def\ecv@telkey{\ecv@utf{Telefonnummer}} +\def\ecv@mobilekey{\ecv@utf{Mobiltelefonnummer}} +\def\ecv@faxkey{\ecv@utf{Fax}} +\def\ecv@emailkey{\ecv@utf{E-postadress}} +\def\ecv@nationalitykey{\ecv@utf{Nationalitet}} +\def\ecv@birthkey{\ecv@utf{FÃ¶delsedatum}} +\def\ecv@genderkey{\ecv@utf{KÃ¶n}} +% Footer +\def\ecv@pagekey{\ecv@utf{Sida}} +\def\ecv@cvofkey{\ecv@utf{Curriculum vit\ae\ of}} +% Language table +\def\ecv@mothertonguekey{\ecv@utf{ModersmÃ¥l}} +\def\ecv@otherlanguageskey{\ecv@utf{Andra sprÃ¥k}} +\def\ecv@assesskey{\ecv@utf{SjÃ€lvbedÃ¶mning}} +\def\ecv@levelkey{\ecv@utf{Europeisk nivÃ¥}} +\def\ecv@understandkey{\ecv@utf{FÃ¶rstÃ¥else}} +\def\ecv@speakkey{\ecv@utf{Tala}} +\def\ecv@writekey{\ecv@utf{Skriftlig fÃ€rdighet}} +\def\ecv@listenkey{\ecv@utf{HÃ¶rfÃ¶rstÃ¥else}} +\def\ecv@readkey{\ecv@utf{LÃ€sfÃ¶rstÃ¥else}} +\def\ecv@interactkey{\ecv@utf{Samtal/muntlig interaktion}} +\def\ecv@productkey{\ecv@utf{Muntlig produktion}} +\def\ecv@langshortdesckey{\ecv@utf{NivÃ¥er: A1/A2: NybÃ¶rjare -- B1/B2: SjÃ€lvstÃ€ndig anvÃ€ndare -- C1/C2: Avancerad anvÃ€ndare}} +\def\ecv@langfooterkey{\ecv@utf{Gemensam europeisk referensram fÃ¶r sprÃ¥k}} +\def\ecv@langlinkkey{\ecv@utf{http://europass.cedefop.europa.eu/sv/resources/european-language-levels-cefr}} +\def\ecv@cefbasickey{\ecv@utf{NybÃ¶rjare}} +\def\ecv@cefindepkey{\ecv@utf{SjÃ€lvstÃ€ndig anvÃ€ndare}} +\def\ecv@cefprofkey{\ecv@utf{Avancerad anvÃ€ndare}} +\def\ecv@europeanunionkey{\ecv@utf{Europeiska unionen}} +% Digital competences self-assessment grid +\def\ecv@digitalcompetenceskey{\ecv@utf{Digital fÃ€rdighet}} +\def\ecv@informationprocessingkey{\ecv@utf{In\-for\-ma\-tions\-be\-hand\-ling}} +\def\ecv@communicationkey{\ecv@utf{Kommunikation}} +\def\ecv@contentcreationkey{\ecv@utf{In\-ne\-hÃ¥lls\-pro\-duk\-tion}} +\def\ecv@safetykey{\ecv@utf{SÃ€kerhet}} +\def\ecv@problensolvingkey{\ecv@utf{ProblemlÃ¶sning}} +\def\ecv@digcompfooterkey{\ecv@utf{Digitala fÃ€rdigheter - Skala fÃ¶r sjÃ€lvbedÃ¶mning}} +\def\ecv@digcomplinkkey{\ecv@utf{http://europass.cedefop.europa.eu/sv/resources/digital-competences}} +\def\ecv@dcbasickey{\ecv@utf{NybÃ¶rjare}} +\def\ecv@dcindepkey{\ecv@utf{SjÃ€lvstÃ€ndig anvÃ€ndare}} +\def\ecv@dcprofkey{\ecv@utf{Avancerad anvÃ€ndare}} + +% Width of language columns +\def\ecv(a)langcola{0.15} +\def\ecv(a)langcolb{0.15} +\def\ecv(a)langcolc{0.25} +\def\ecv(a)langcold{0.25} +\def\ecv(a)langcole{0.2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/im_europass_icon.pdf new/tex/latex/europasscv/im_europass_icon.pdf --- old/tex/latex/europasscv/im_europass_icon.pdf 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/im_europass_icon.pdf 2017-01-24 00:01:05.000000000 +0100 @@ -43,12 +43,12 @@ <?adobe-xap-filters esc="CRLF"?> <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'> <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> -<rdf:Description rdf:about='uuid:44232769-52dc-11f1-0000-871774c54bfd' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.10'/> -<rdf:Description rdf:about='uuid:44232769-52dc-11f1-0000-871774c54bfd' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-05-15T19:09:00+02:00</xmp:ModifyDate> -<xmp:CreateDate>2016-05-15T19:09:00+02:00</xmp:CreateDate> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-871774c54bfd' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.10'/> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-871774c54bfd' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2017-01-22T22:46:40+01:00</xmp:ModifyDate> +<xmp:CreateDate>2017-01-22T22:46:40+01:00</xmp:CreateDate> <xmp:CreatorTool>GPL Ghostscript 910 (ps2write)</xmp:CreatorTool></rdf:Description> -<rdf:Description rdf:about='uuid:44232769-52dc-11f1-0000-871774c54bfd' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:44232769-52dc-11f1-0000-871774c54bfd'/> -<rdf:Description rdf:about='uuid:44232769-52dc-11f1-0000-871774c54bfd' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-871774c54bfd' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:ce61bc90-1908-11f2-0000-871774c54bfd'/> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-871774c54bfd' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> </rdf:RDF> </x:xmpmeta> @@ -58,8 +58,8 @@ endobj 2 0 obj <</Producer(GPL Ghostscript 9.10) -/CreationDate(D:20160515190900+02'00') -/ModDate(D:20160515190900+02'00') +/CreationDate(D:20170122224640+01'00') +/ModDate(D:20170122224640+01'00') /Creator(GPL Ghostscript 910 $ps2write$)>>endobj xref 0 10 @@ -75,7 +75,7 @@ 0000000643 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R -/ID [<535CA34EC4D9EE6EC92F19249953F73D><535CA34EC4D9EE6EC92F19249953F73D>] +/ID [<A19FA09C0C53393E9AB05924E83CD36C><A19FA09C0C53393E9AB05924E83CD36C>] >> startxref 2241 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europasscv/mail_europass_icon.pdf new/tex/latex/europasscv/mail_europass_icon.pdf --- old/tex/latex/europasscv/mail_europass_icon.pdf 2016-05-16 22:35:41.000000000 +0200 +++ new/tex/latex/europasscv/mail_europass_icon.pdf 2017-01-24 00:01:05.000000000 +0100 @@ -46,12 +46,12 @@ <?adobe-xap-filters esc="CRLF"?> <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'> <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> -<rdf:Description rdf:about='uuid:44bbbde9-52dc-11f1-0000-c0953e69916e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.10'/> -<rdf:Description rdf:about='uuid:44bbbde9-52dc-11f1-0000-c0953e69916e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2016-05-15T19:09:01+02:00</xmp:ModifyDate> -<xmp:CreateDate>2016-05-15T19:09:01+02:00</xmp:CreateDate> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-c0953e69916e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.10'/> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-c0953e69916e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2017-01-22T22:46:40+01:00</xmp:ModifyDate> +<xmp:CreateDate>2017-01-22T22:46:40+01:00</xmp:CreateDate> <xmp:CreatorTool>GPL Ghostscript 910 (ps2write)</xmp:CreatorTool></rdf:Description> -<rdf:Description rdf:about='uuid:44bbbde9-52dc-11f1-0000-c0953e69916e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:44bbbde9-52dc-11f1-0000-c0953e69916e'/> -<rdf:Description rdf:about='uuid:44bbbde9-52dc-11f1-0000-c0953e69916e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-c0953e69916e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:ce61bc90-1908-11f2-0000-c0953e69916e'/> +<rdf:Description rdf:about='uuid:ce61bc90-1908-11f2-0000-c0953e69916e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> </rdf:RDF> </x:xmpmeta> @@ -61,8 +61,8 @@ endobj 2 0 obj <</Producer(GPL Ghostscript 9.10) -/CreationDate(D:20160515190901+02'00') -/ModDate(D:20160515190901+02'00') +/CreationDate(D:20170122224640+01'00') +/ModDate(D:20170122224640+01'00') /Creator(GPL Ghostscript 910 $ps2write$)>>endobj xref 0 10 @@ -78,7 +78,7 @@ 0000000756 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R -/ID [<809DB3C4308D5CC0FCEDC072D32450D7><809DB3C4308D5CC0FCEDC072D32450D7>] +/ID [<1290D6C0BF3B205F96CC046A0207F8DD><1290D6C0BF3B205F96CC046A0207F8DD>] >> startxref 2354 Binary files old/tex/latex/europasscv/mobile_europass_icon.pdf and new/tex/latex/europasscv/mobile_europass_icon.pdf differ Binary files old/tex/latex/europasscv/telephone_europass_icon.pdf and new/tex/latex/europasscv/telephone_europass_icon.pdf differ Binary files old/tex/latex/europasscv/website_europass_icon.pdf and new/tex/latex/europasscv/website_europass_icon.pdf differ Binary files old/tex/latex/europasscv/work_europass_icon.pdf and new/tex/latex/europasscv/work_europass_icon.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/europasscv.tlpobj new/tlpkg/tlpobj/europasscv.tlpobj --- old/tlpkg/tlpobj/europasscv.tlpobj 2016-05-17 03:19:26.000000000 +0200 +++ new/tlpkg/tlpobj/europasscv.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -1,6 +1,6 @@ name europasscv category Package -revision 41201 +revision 43033 shortdesc Unofficial class for the new version of the Europass curriculum vitae relocated 1 longdesc This class is an unofficial LaTeX implementation of the @@ -8,24 +8,29 @@ longdesc recommended by the European Commission. It includes the major longdesc style updates that came out in 2013, featuring a neater, more longdesc compact and somewhat fancier layout. -runfiles size=23 +runfiles size=29 RELOC/tex/latex/europasscv/address_europass_icon.pdf RELOC/tex/latex/europasscv/europasscv.cls + RELOC/tex/latex/europasscv/europasscv_cs.def RELOC/tex/latex/europasscv/europasscv_de.def + RELOC/tex/latex/europasscv/europasscv_el.def RELOC/tex/latex/europasscv/europasscv_en.def RELOC/tex/latex/europasscv/europasscv_es.def RELOC/tex/latex/europasscv/europasscv_fr.def RELOC/tex/latex/europasscv/europasscv_it.def + RELOC/tex/latex/europasscv/europasscv_pl.def RELOC/tex/latex/europasscv/europasscv_pt.def RELOC/tex/latex/europasscv/europasscv_sl.def + RELOC/tex/latex/europasscv/europasscv_sv.def RELOC/tex/latex/europasscv/europasslogo2013.pdf RELOC/tex/latex/europasscv/im_europass_icon.pdf RELOC/tex/latex/europasscv/mail_europass_icon.pdf RELOC/tex/latex/europasscv/mobile_europass_icon.pdf RELOC/tex/latex/europasscv/telephone_europass_icon.pdf RELOC/tex/latex/europasscv/website_europass_icon.pdf + RELOC/tex/latex/europasscv/work_europass_icon.pdf catalogue-also europecv curve currvita cv esieecv vita catalogue-ctan /macros/latex/contrib/europasscv -catalogue-date 2016-05-16 05:39:00 +0200 +catalogue-date 2017-01-22 23:05:40 +0100 catalogue-license lppl1.3 catalogue-topics cv class ++++++ europecv.doc.tar.xz ++++++ ++++++ europecv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/europecv.tlpobj new/tlpkg/tlpobj/europecv.tlpobj --- old/tlpkg/tlpobj/europecv.tlpobj 2016-04-14 19:00:25.000000000 +0200 +++ new/tlpkg/tlpobj/europecv.tlpobj 2017-04-14 17:39:38.000000000 +0200 @@ -52,6 +52,6 @@ RELOC/tex/latex/europecv/europecv.cls catalogue-also europasscv curve currvita cv esieecv vita catalogue-ctan /macros/latex/contrib/europecv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cv class ++++++ eurosym.doc.tar.xz ++++++ ++++++ eurosym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eurosym.tlpobj new/tlpkg/tlpobj/eurosym.tlpobj --- old/tlpkg/tlpobj/eurosym.tlpobj 2016-04-14 19:00:26.000000000 +0200 +++ new/tlpkg/tlpobj/eurosym.tlpobj 2017-04-14 17:39:39.000000000 +0200 @@ -39,7 +39,7 @@ RELOC/tex/latex/eurosym/eurosym.sty catalogue-also europs marvosym catalogue-ctan /fonts/eurosym -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 catalogue-version 1.4-subrfix ++++++ euxm.tar.xz ++++++ ++++++ everyhook.doc.tar.xz ++++++ ++++++ everyhook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/everyhook.tlpobj new/tlpkg/tlpobj/everyhook.tlpobj --- old/tlpkg/tlpobj/everyhook.tlpobj 2016-04-14 19:00:26.000000000 +0200 +++ new/tlpkg/tlpobj/everyhook.tlpobj 2017-04-14 17:39:39.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/everyhook/everyhook.sty catalogue-ctan /macros/latex/contrib/everyhook -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.2 ++++++ everypage.doc.tar.xz ++++++ ++++++ everypage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/everypage.tlpobj new/tlpkg/tlpobj/everypage.tlpobj --- old/tlpkg/tlpobj/everypage.tlpobj 2016-04-14 19:00:26.000000000 +0200 +++ new/tlpkg/tlpobj/everypage.tlpobj 2017-04-14 17:39:39.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/everypage/everypage.sty catalogue-also everyshi bophook catalogue-ctan /macros/latex/contrib/everypage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics defer-stuff catalogue-version 1.1 ++++++ exam-n.doc.tar.xz ++++++ ++++ 2263 lines of diff (skipped) ++++++ exam-n.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exam-n/exam-n.cls new/tex/latex/exam-n/exam-n.cls --- old/tex/latex/exam-n/exam-n.cls 2014-05-06 00:02:58.000000000 +0200 +++ new/tex/latex/exam-n/exam-n.cls 2016-12-21 00:01:04.000000000 +0100 @@ -6,10 +6,10 @@ %% %% exam-n.dtx (with options: `package') %% exam-n: format exam questions -%% Release version 1.1, 2014 May 03. +%% Release version 1.1.4, 2016 December 19. %% %%%% File: exam-n.dtx -%%%% Copyright 2005--2014, Norman Gray +%%%% Copyright 2005--2016, Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -27,12 +27,12 @@ %% the derived file exam-n.cls, %% and the associated *.clo files. -%%%% Source: Mercurial revision 6f818b549982, 2014-05-03 13:42 +0100, tag 1.1 + 0 +%%%% Source: Mercurial revision e8a612cb25f4, 2016-12-19 16:49 +0000, tag exam-n-1.1.4 + 0 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{exam-n}[2014/05/03 1.1] -\typeout{Class: `exam-n 1.1 <2014/05/03>} +\ProvidesClass{exam-n}[2016/12/19 1.1.4] +\typeout{Class: `exam-n 1.1.4 <2016/12/19>} @@ -94,9 +94,15 @@ \def\examn@header@shoutformat#1{{\Huge\bfseries #1}} } \DeclareOption{colour}{} +\newcount\examn@fontvariant + \examn@fontvariant=0 % the default \newif\ifbigfont -\bigfontfalse -\DeclareOption{bigfont}{\bigfonttrue} + \bigfontfalse +\DeclareOption{largefont}{\examn@fontvariant=1 \bigfontfalse} +\DeclareOption{bigfont}{% + \ClassWarning{exam-n}{OPTION [bigfont] HAS BEEN DEPRECATED; use [hugefont] instead} + \examn@fontvariant=2 \bigfonttrue} +\DeclareOption{hugefont}{\examn@fontvariant=2 \bigfonttrue} \PassOptionsToClass{a4paper}{article} \newtoks\@styleoverrides \@styleoverrides={} @@ -228,7 +234,25 @@ \DeclareRobustCommand\normalfont {\usefont\encodingdefault\sfdefault\seriesdefault\shapedefault \relax} \fi -\ifbigfont +\ifcase\examn@fontvariant + % default: do nothing +\or + % font variant 1: 18pt + \def\examn@bodyfontchange{ + \renewcommand\normalsize{% + \@setfontsize\normalsize{18}{24}% + \abovedisplayskip 18\p@ \@plus3.5\p@ \@minus9\p@ + \abovedisplayshortskip \z@ \@plus5\p@ + \belowdisplayshortskip 10\p@ \@plus5\p@ \@minus5\p@ + \belowdisplayskip \abovedisplayskip + \let\@listi\@listI} + \parindent=24pt + \parskip=18pt + % Redefine \FormatPartMarks so that it doesn't push the text off the paper + \let\FormatPartMarks\examn@variantFormatPartMarks + } +\or + % font variant 2: 36pt \def\examn@bodyfontchange{ \renewcommand\normalsize{% \@setfontsize\normalsize{36}{42}% @@ -240,16 +264,23 @@ \parindent=48pt \parskip=36pt % Redefine \FormatPartMarks so that it doesn't push the text off the paper - \def\FormatPartMarks##1{ - \setbox0=\hbox{\hskip 1em \textbf{[##1]}} - \(a)tempdima=0.8\marginsize - \ifdim\wd0>\@tempdima - \advance\@tempdima -\wd0 - \hbox to 0pt{\hskip\@tempdima \box0\hss}% - \else - \hbox to 0pt{\box0\hss} - \fi}} + \let\FormatPartMarks\examn@variantFormatPartMarks + } +\else + % Bad font variant + \ClassError{exam-n} + {Bad font variant \examn@fontvariant} + {I didn't expect to see that number (broken style file re largefont/hugefont?)} \fi +\def\examn@variantFormatPartMarks#1{% + \setbox0=\hbox{\hskip 1em \textbf{[#1]}}% + \(a)tempdima=0.8\marginsize + \ifdim\wd0>\@tempdima + \advance\@tempdima -\wd0 + \hbox to 0pt{\hskip\@tempdima \box0\hss}% + \else + \hbox to 0pt{\box0\hss}% + \fi} \def\@exambanner{} \def\exambanner{\def\@exambanner} @@ -303,12 +334,12 @@ \def\CheckTotalQuestions{% \ifnum\@draftstatus < 2 \ifx\@numquestions\@empty \else - \ifnum\questionnumber=\@numquestions \else + \ifnum\c@questionnumber=\@numquestions \else \ClassWarning{exam-n} - {Expected \@numquestions\space questions, got \the\questionnumber!} + {Expected \@numquestions\space questions, got \thequestionnumber!} \ifnum\@draftstatus > 0 % draft mode \begin{center} - \textbf{\highlighted{Expected \@numquestions\space questions, got \the\questionnumber}} + \textbf{\highlighted{Expected \@numquestions\space questions, got \thequestionnumber}} \end{center} \fi \fi @@ -365,16 +396,28 @@ } \setlength{\parindent}{2em} \setlength{\parskip}{\bigskipamount} +\def\examn@flushfloats{\par + \begingroup + \edef\@tempa{\@deferlist\@dbldeferlist} + \ifx\@tempa\@empty \else + \clearpage + \fi + \endgroup +} \ifcase\@draftstatus % Final version \def\ClosingText{ + \examn@flushfloats \begin{center}\textbf{End of Paper}\\\end{center} \mark{END}} \or % Draft version \def\ClosingText{ + \examn@flushfloats \begin{center}\textbf{End of Draft Paper}\\\end{center} \mark{END}} \else % Compose version (nothing, because this would be on a page by itself) - \def\ClosingText{\mark{END}} + \def\ClosingText{ + \examn@flushfloats + \mark{END}} \fi \RequirePackage{fancyhdr} \pagestyle{fancy} @@ -390,7 +433,7 @@ \def\@tempa{END} \xdef\examn@topmark{\botmark} \ifx\examn@topmark\@empty - \formatcontinuations{Paper continued over}% + \formatcontinuations{Paper continued over\dots}% \else\ifx\examn@topmark\@tempa \formatcontinuations{END} \else @@ -552,15 +595,16 @@ \vskip 2\baselineskip plus 0.3fil \parindent=0pt \parskip=0.5\baselineskip - \ifbigfont + \ifnum\examn@fontvariant > 0 % Don't put the rubric here (see below) + {\LARGE Rubric: see overleaf} \else \ifx\@rubric\@empty\else \ifx\@rubric\@nnil\else - % if there's a rubric, separate from the base rubric, then + % If there's a rubric, separate from the base rubric, then % separate the two with an hrule (the per-exam rubric % presumably represents special instructions for this exam, - % so should be highlighted + % so should be highlighted) \vbox{\let\emph\textbf \@rubric \par} @@ -569,10 +613,10 @@ \vskip1.5\baselineskip \fi \fi - \ifx\@baserubric\@empty \else - \@baserubric \par - \fi - \fi % end \ifbigfont\else + \ifx\@baserubric\@empty \else + \@baserubric \par + \fi + \fi % end \ifbigfont \else ... \end{center} \vskip 2\baselineskip plus 0.6fil % \newpage is {\vfil\penalty-\@M} \vbox to 0pt{\hbox to \textwidth{% @@ -606,7 +650,7 @@ % \examn@bodyfontchange \normalfont\normalsize - \ifbigfont + \ifnum\examn@fontvariant>0 % Put the rubric on a second page, in the 'huge' size. \begin{center} \parskip=18pt @@ -654,11 +698,13 @@ \def\subsubsection{\@badsection{subsubsection}} \def\paragraph{\@badsection{paragraph}} \def\subparagraph{\@badsection{subparagraph}} +\renewcommand\tableofcontents{\bigskip + \hbox to \textwidth{\hfil\textbf{\Large Contents}\hfil}% + \@starttoc{toc}} \newcount\marktotal % number of marks accumulated so far \newcount\markgoal % number of marks we should have in the end - -\newcount\questionnumber -\questionnumber=0 +\newcounter{questionnumber} +\setcounter{questionnumber}0 \newcounter{partnumber} \renewcommand\part{% \if@nobreak \else @@ -672,7 +718,8 @@ \stepcounter{partnumber}% \noindent\FormatPartNumber } -\newcommand\FormatPartNumber{\hbox to \parindent{(\alph{partnumber})\hss}} +\newcommand\FormatPartNumber{\hbox to \parindent{(\StylePartNumber{partnumber})\hss}} +\let\StylePartNumber\alph \newif\if@newpagebeforequestion \if@pageperquestion \@newpagebeforequestiontrue @@ -713,7 +760,7 @@ % visual display only -- doesn't count towards mark total \setbox0=\vbox to 0pt{\vss \hbox to \textwidth{\hfil\hbox to 0pt{\quad\small[\dots #1]\hss}} - \vskip0.25ex } + \vskip0.25ex }% % the next line is probably unnecessary, but guarantees that box0 % has zero depth, so no extra vertical space appears because of % this new box @@ -726,13 +773,24 @@ \else \global\advance\marktotal #1 \if@tempswa - \setbox0=\vbox to 0pt{\vss - \hbox to \textwidth{\strut\hfill\FormatPartMarks{#1}}% - \vskip 1\baselineskip} % vskip means box has zero depth - \ifvmode - \box0 + \ifdim\displaywidth>0pt + \if@eqnsw + \ClassError{exam-n}{\string\partmarks* may not be used + within numbered equations}{Replace \string\partmarks* + with a \string\partmarks\ after the equation} + \global\advance\marktotal -#1 % to cause the mark total to be wrong + \else + \eqno \hbox to 1sp{\FormatPartMarks{#1}\hfil}% + \fi \else - \vadjust{\box0}% + \setbox0=\vbox to 0pt{\vss + \hbox to \textwidth{\strut\hfill\FormatPartMarks{#1}}% + \vskip 1\baselineskip}% vskip means box has zero depth + \ifvmode + \box0 + \else + \vadjust{\box0}% + \fi \fi \else \ifdim\@partmarksspace > 0pt @@ -770,8 +828,8 @@ {Missing mark goal for question (using 0 instead)} {Missing mark goal for question (using 0 instead)} \def\@tempa{0} - \fi - \ifx\@includequestionoverridenumber\@empty + \fi + \ifx\@includequestionoverridenumber\@empty \do@question{#1}{\@tempa}% \else \ClassWarning{exam-n}{Forcing question number @@ -802,16 +860,16 @@ \fi} {\par \ifnum\ex@mcqi<\ex@nmcq - \ClassWarning{exam-n}{Too few potential answers in MCQ \the\questionnumber} - \@shout{Too few potential answers in MCQ \the\questionnumber} + \ClassWarning{exam-n}{Too few potential answers in MCQ \thequestionnumber} + \@shout{Too few potential answers in MCQ \thequestionnumber} \ifnum\@draftstatus > 0 \highlighted{TOO FEW ANSWERS}\par \fi \fi \ifcase\ex@mcqnanswer \ClassWarning{exam-n} - {No correct MCQ answer provided in question \the\questionnumber} - \@shout{No correct MCQ answer provided in question \the\questionnumber} + {No correct MCQ answer provided in question \thequestionnumber} + \@shout{No correct MCQ answer provided in question \thequestionnumber} \ifnum\@draftstatus > 0 \highlighted{NO CORRECT ANSWER PROVIDED}\par \fi @@ -819,8 +877,8 @@ % ex@mcqanswer=1: correct -- do nothing \else \ClassWarning{exam-n} - {Too many correct MCQ answers provided in question \the\questionnumber} - \@shout{Too many correct MCQ answers provided in question \the\questionnumber} + {Too many correct MCQ answers provided in question \thequestionnumber} + \@shout{Too many correct MCQ answers provided in question \thequestionnumber} \ifnum\@draftstatus > 0 \highlighted{TOO MANY CORRECT ANSWERS}\par \fi @@ -862,7 +920,12 @@ \questionpreamble{} \fi \setcounter{partnumber}{0} - \global\advance\questionnumber 1 + \setcounter{answerpartnumber}{0} + \refstepcounter{questionnumber} + \def\@tempa{#1} + \ifx\@tempa\@empty \else + \edef\@currentlabel{#1} + \fi \examn@prequestionspace{% \if@nobreak % after a heading (or something like that) @@ -876,7 +939,7 @@ \def\@tempa{#1}% intended question number \ifx\@tempa\@empty % no optional argument -- easy - \def\@currentquestion{\the\questionnumber} + \def\@currentquestion{\thequestionnumber} \else \setbox0=\hbox{\@tempcnta=#1} \ifdim\wd0>0pt @@ -889,21 +952,21 @@ \ifcase\@draftstatus % Final version \@tempcnta=#1 - \ifnum\questionnumber=\@tempcnta + \ifnum\c@questionnumber=\@tempcnta \def\@currentquestion{#1} \else \ifx\@includequestionoverridenumber\@empty \ClassError{exam-n} - {\string\question[#1] is actually question \the\questionnumber!} + {\string\question[#1] is actually question \thequestionnumber!} {The question in {question} environment number - \the\questionnumber\space is specified as + \thequestionnumber\space is specified as \string\question[#1].\MessageBreak This is an error in 'final' mode.\MessageBreak Perhaps you need \string\QuestionNumberChecksOff?} \def\@currentquestion{???} \else \ClassWarning{exam-n}{Forcing question number \@includequestionoverridenumber, - in {question} environment number \the\questionnumber} + in {question} environment number \thequestionnumber} \edef\@currentquestion{\@includequestionoverridenumber}% this doesn't seem to expand in fact! \message{current question=\@currentquestion, override \@includequestionoverridenumber} \fi @@ -912,9 +975,9 @@ % Draft version -- let the given number override % \the\questionnumber, but warn if there's a difference. \@tempcnta=#1 - \ifnum\questionnumber=\@tempcnta \else + \ifnum\c@questionnumber=\@tempcnta \else \ClassWarning{exam-n} - {\string\question[#1] is actually question \the\questionnumber!} + {\string\question[#1] is actually question \thequestionnumber!} \fi \def\@currentquestion{#1} \else @@ -929,16 +992,16 @@ % no optional argument -- this is possibly an error, so warn \ClassWarning{exam-n}{\string\QuestionNumberChecksOff\ is in force, but this question has no [number]} - \def\@currentquestion{\the\questionnumber} + \def\@currentquestion{\thequestionnumber} \else - \typeout{Forcing question \the\questionnumber\space to be #1} + \typeout{Forcing question \thequestionnumber\space to be #1} \def\@currentquestion{#1} \fi \fi \everypar{\setbox0=\lastbox % discard \box0 \FormatQuestionNumber \mark{\@currentquestion}% - \everypar{}} + \global\everypar{}} } \newcommand\FormatQuestionNumber {\hbox to 0pt{\hss \textbf{\@currentquestion}\hskip1em}} @@ -987,6 +1050,7 @@ } } \newenvironment{questiondata}{% + \par \penalty50 % poor break \vbox\bgroup \slshape @@ -1002,7 +1066,7 @@ \medskip \hrule width \textwidth \par - \egroup + \egroup % end of \vbox } \newcommand\questionpreamble[1]{\gdef\examn@questionpreamble{#1}} \let\examn@questionpreamble\@empty @@ -1080,6 +1144,11 @@ \let\@includequestionoverridenumber\@empty \newif\if@insolution \@insolutionfalse +\newcounter{answerpartnumber} +\newcommand{\examn@solutionpart}{% + \par + \stepcounter{answerpartnumber} + \noindent\hbox to \parindent{(\StylePartNumber{answerpartnumber})\hss}} \def\@formatsolution{\par \if@insolution \ClassError{exam-n}{Misplaced solution}{You can't have a solution within a solution} @@ -1088,12 +1157,13 @@ \fi \examn@dummycaptions % dummy captions within solutions \typeout{SHOWING SOLUTIONS} + \let\part\examn@solutionpart \vskip 1ex plus 2\bigskipamount % add stretchable space... \penalty-\@lowpenalty % ...and encouragement to break here \parskip 0.5\baselineskip \raggedright \color{solutiontext}%\slshape - \ifbigfont\else + \ifbigfont \else \small \fi \hrule @@ -1102,6 +1172,7 @@ \vskip -\parskip % cancel out the following parskip \textbf{\highlighted{Solution:}}\hskip2em \ignorespaces + \parindent=2em } \def\end@formatsolution{% \par diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exam-n.tlpobj new/tlpkg/tlpobj/exam-n.tlpobj --- old/tlpkg/tlpobj/exam-n.tlpobj 2016-04-14 19:00:28.000000000 +0200 +++ new/tlpkg/tlpobj/exam-n.tlpobj 2017-04-14 17:39:40.000000000 +0200 @@ -1,6 +1,6 @@ name exam-n category Package -revision 33862 +revision 42755 shortdesc Exam class, focused on collaborative authoring relocated 1 longdesc The class design offers: Direct support for collaborative @@ -11,10 +11,10 @@ longdesc department). All of the 'traditional' exam paper features such longdesc as sectioning, per-part running marks, 'Question n continued' longdesc catchwords, and so on. Readily configured local adaptation. -runfiles size=10 +runfiles size=11 RELOC/tex/latex/exam-n/exam-n.cls catalogue-ctan /macros/latex/contrib/exam-n -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2016-12-20 13:14:33 +0100 +catalogue-license lppl1.3 catalogue-topics exam -catalogue-version 1.1 +catalogue-version 1.1.4 ++++++ exam.doc.tar.xz ++++++ ++++++ exam.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exam.tlpobj new/tlpkg/tlpobj/exam.tlpobj --- old/tlpkg/tlpobj/exam.tlpobj 2016-04-14 19:00:27.000000000 +0200 +++ new/tlpkg/tlpobj/exam.tlpobj 2017-04-14 17:39:39.000000000 +0200 @@ -27,7 +27,7 @@ runfiles size=58 RELOC/tex/latex/exam/exam.cls catalogue-ctan /macros/latex/contrib/exam -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics exam class catalogue-version 2.5 ++++++ examdesign.doc.tar.xz ++++++ ++++++ examdesign.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/examdesign.tlpobj new/tlpkg/tlpobj/examdesign.tlpobj --- old/tlpkg/tlpobj/examdesign.tlpobj 2016-04-14 19:00:29.000000000 +0200 +++ new/tlpkg/tlpobj/examdesign.tlpobj 2017-04-14 17:39:40.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/examdesign/examdesign.cls catalogue-also exams exam catalogue-ctan /macros/latex/contrib/examdesign -catalogue-date 2015-09-16 13:40:05 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics exam class catalogue-version 1.101 ++++++ example.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/example.tlpobj new/tlpkg/tlpobj/example.tlpobj --- old/tlpkg/tlpobj/example.tlpobj 2016-04-14 19:00:29.000000000 +0200 +++ new/tlpkg/tlpobj/example.tlpobj 2017-04-14 17:39:40.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/example/example.sty catalogue-also examplep catalogue-ctan /macros/latex209/contrib/misc/example.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-17 13:26:10 +0200 catalogue-license gpl catalogue-topics listing ++++++ examplep.doc.tar.xz ++++++ ++++++ examplep.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/examplep.tlpobj new/tlpkg/tlpobj/examplep.tlpobj --- old/tlpkg/tlpobj/examplep.tlpobj 2016-04-14 19:00:29.000000000 +0200 +++ new/tlpkg/tlpobj/examplep.tlpobj 2017-04-14 17:39:40.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/examplep/examplep.sty RELOC/tex/latex/examplep/verbfwr.sty catalogue-ctan /macros/latex/contrib/examplep -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics listing catalogue-version 0.04 ++++++ exceltex.doc.tar.xz ++++++ ++++++ exceltex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exceltex.tlpobj new/tlpkg/tlpobj/exceltex.tlpobj --- old/tlpkg/tlpobj/exceltex.tlpobj 2016-04-14 19:00:30.000000000 +0200 +++ new/tlpkg/tlpobj/exceltex.tlpobj 2017-04-14 17:39:40.000000000 +0200 @@ -18,7 +18,7 @@ texmf-dist/scripts/exceltex/exceltex texmf-dist/tex/latex/exceltex/exceltex.sty catalogue-ctan /macros/latex/contrib/exceltex -catalogue-date 2015-09-01 06:38:31 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics foreign-import catalogue-version 0.5.1 ++++++ excludeonly.doc.tar.xz ++++++ ++++++ excludeonly.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/excludeonly.tlpobj new/tlpkg/tlpobj/excludeonly.tlpobj --- old/tlpkg/tlpobj/excludeonly.tlpobj 2016-04-14 19:00:30.000000000 +0200 +++ new/tlpkg/tlpobj/excludeonly.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/excludeonly/excludeonly.sty catalogue-ctan /macros/latex/contrib/excludeonly -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics compilation catalogue-version 1.0 ++++++ exercise.doc.tar.xz ++++++ ++++++ exercise.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exercise.tlpobj new/tlpkg/tlpobj/exercise.tlpobj --- old/tlpkg/tlpobj/exercise.tlpobj 2016-04-14 19:00:30.000000000 +0200 +++ new/tlpkg/tlpobj/exercise.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=9 RELOC/tex/latex/exercise/exercise.sty catalogue-ctan /macros/latex/contrib/exercise -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics exercise catalogue-version 1.6 ++++++ exercises.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exercises.doc.tlpobj new/tlpkg/tlpobj/exercises.doc.tlpobj --- old/tlpkg/tlpobj/exercises.doc.tlpobj 2016-04-14 19:00:30.000000000 +0200 +++ new/tlpkg/tlpobj/exercises.doc.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -1,6 +1,6 @@ name exercises.doc category Package -revision 38430 +revision 42428 shortdesc doc files of exercises relocated 1 docfiles size=103 ++++++ exercises.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exercises.tlpobj new/tlpkg/tlpobj/exercises.tlpobj --- old/tlpkg/tlpobj/exercises.tlpobj 2016-04-14 19:00:31.000000000 +0200 +++ new/tlpkg/tlpobj/exercises.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -1,6 +1,6 @@ name exercises category Package -revision 38430 +revision 42428 shortdesc Typeset exercises and solutions with automatic addition of points relocated 1 longdesc This package defines the environments exercise and solution. @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/exercises/exercises.sty catalogue-ctan /macros/latex/contrib/exercises -catalogue-date 2015-09-30 06:04:59 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics exercise catalogue-version 1.0 ++++++ exp-testopt.doc.tar.xz ++++++ ++++++ exp-testopt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exp-testopt.tlpobj new/tlpkg/tlpobj/exp-testopt.tlpobj --- old/tlpkg/tlpobj/exp-testopt.tlpobj 2016-04-14 19:00:31.000000000 +0200 +++ new/tlpkg/tlpobj/exp-testopt.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/exp-testopt/exp-testopt.sty catalogue-ctan /macros/latex/contrib/exp-testopt -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 0.3 ++++++ expdlist.doc.tar.xz ++++++ ++++++ expdlist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/expdlist.tlpobj new/tlpkg/tlpobj/expdlist.tlpobj --- old/tlpkg/tlpobj/expdlist.tlpobj 2016-04-14 19:00:31.000000000 +0200 +++ new/tlpkg/tlpobj/expdlist.tlpobj 2017-04-14 17:39:41.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/expdlist/expdlist.sty catalogue-ctan /macros/latex/contrib/expdlist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list-descr catalogue-version 2.4 ++++++ expex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/expex/README new/doc/generic/expex/README --- old/doc/generic/expex/README 2014-03-12 23:34:30.000000000 +0100 +++ new/doc/generic/expex/README 2017-06-06 23:50:19.000000000 +0200 @@ -1,5 +1,5 @@ -ExPex Mar 2014 +ExPex May 2017 ------------------------------------------------------------- ExPex is maintained by John Frampton <j.frampton(a)neu.edu> @@ -11,7 +11,7 @@ ------------------------------------------------------------- -COPYRIGHT 2006-2014 by John Frampton <j.frampton(a)neu.edu> +COPYRIGHT 2006-2017 by John Frampton <j.frampton(a)neu.edu> This program can be redistributed and/or modified under the terms of the LaTeX Project Public License, which can be found in the CTAN @@ -19,7 +19,7 @@ ------------------------------------------------------------- -The files in this distribution (v 5.0b) are: +The files in this distribution (v 5.1b) are: README expex.tex Main macro file @@ -45,21 +45,6 @@ expex.sty, all files needed to run expex-demo should be part of any Tex installation. -------------------------------------------------------------- - -Changes (from Version 5.0): - -1. In earlier versions before 5.0, {} empty items on the gla line were -possible. In 5.0, {{}} was required. This version restores the old -behavior. - -2. In versions before 5.0, glosses were built in a vbox, hence could -not split between pages. 5.0 made glosses breakable, provided no -explicit width was specified. 5.0 restores the old behavior but -introduces a parameter <glossbreaking>. It is set to false in -expex.tex so that the default behavior is the old behavior. But it -can be set to true if the user wants glosses to break between pages. - -John Frampton 2014/03/10 +John Frampton 5/25/2017 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/expex.doc.tlpobj new/tlpkg/tlpobj/expex.doc.tlpobj --- old/tlpkg/tlpobj/expex.doc.tlpobj 2016-04-14 19:00:31.000000000 +0200 +++ new/tlpkg/tlpobj/expex.doc.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,6 +1,6 @@ name expex.doc category Package -revision 33163 +revision 44499 shortdesc doc files of expex relocated 1 docfiles size=129 ++++++ expex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/expex/expex.sty new/tex/generic/expex/expex.sty --- old/tex/generic/expex/expex.sty 2014-03-11 23:16:14.000000000 +0100 +++ new/tex/generic/expex/expex.sty 2017-06-06 23:50:19.000000000 +0200 @@ -1,5 +1,5 @@ -\ProvidesPackage{expex}% - [2014/03/10 v5.0b LaTex wrapper for expex.tex (JF)] +\ProvidesPackage{expex} + [5/1/2017 v5.1b LaTex wrapper for expex.tex (JF)] \RequirePackage{xkeyval} \input expex \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/expex/expex.tex new/tex/generic/expex/expex.tex --- old/tex/generic/expex/expex.tex 2014-03-11 23:16:14.000000000 +0100 +++ new/tex/generic/expex/expex.tex 2017-06-06 23:50:19.000000000 +0200 @@ -1,5 +1,5 @@ \def\ExPexMessage - {2014/03/10 v5.0b ExPex linguistics example formatter (JF)} + {5/25/2017 v5.1b ExPex linguistics example formatter (JF)} % ------------------------------------------------------- % jf 2011/12/09 (v4.0a) % 1) fixed bug in how exceptional gla items are detected @@ -36,18 +36,46 @@ % for more detail about the changes % jf 2014/03/08 (v5.0b) % 1. restored allowing {} empty items in wrap glosses -% 2. introduced <glossbreaking> parameter +% 2. introduced <glbreaking> parameter +% jf 2014/03/14 (v5.0c) +% 1. fixed reference for IJAL style +% 2. fixed initialization for roman number parts in \pex +% jf 2015/01/06 (v5.0d) +% glftpos=right now works with the nlevel style +% many internal names were changed to the general form +% \gl@<style>@<ftpos>@<name> to make the code for switching style and +% ftpos much more transparent +% jf 2015/09/30 (v5.0e) +% right panel in nlevel style +% jf 4/11/2016 (v5.0f) +% fixed \ep@setlist so that it does not make global asssigment +% changed some names of the append commands to better match their effect +% jf 3/9/2017 (v5.1) +% fixed bug so that \glbreaking works if extraglskip has stretch and/or +% shrink components +% jf 5/1/2017 (v5.1a) +% 1. made \sc equivalent to \scshape if the LaTex engine is used +% 2. made \it equivalent to \itshape if the LaTex engine is used +% 3. fixed bug in \getref in the IJAL style +% Vanya Kapitinov (v5.1b) +% define \rm and \tt in LaTex for modern LaTex compatibility % -------------------------------------------------------- \edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax} \catcode`\@=11\relax \ifx\XKeyValLoaded\endinput \else \input xkeyval \fi +\newif\ifeplatex \ifx\ProvidesFile\@undefined + \eplatexfalse \message{\ExPexMessage} \else \ProvidesFile{expex.tex}[\ExPexMessage] + \eplatextrue \(a)addtofilelist{expex.tex} \let\it=\itshape + \let\sc=\scshape + \def\rm{\normalfont\rmfamily} % VK 5/13/2017 + \def\tt{\normalfont\ttfamily} % VK 5/13/2017 \let\pageno=\c@page % 2013/07/27 \g@addto@macro\cl@@ckpt @@ -104,11 +132,12 @@ \def\define@linginckey#1#2{% \define@key{ling}{#2}{% \ep@expandafterafter\@setinckey - #1\csname ling#2\endcsname ##1\@nil}% + #1\csname ling#2\endcsname ##1\@nil\relax}% test \relax %%%%%%%%%%%%%%%%%%%%%%% } -\def\define@lingincdimenkeys#1{\XKV@for@n{#1}\@key{% +\let\XKVforn=\XKV@for@n % added 2016/04/23 for easy use +\def\define@lingincdimenkeys#1{\XKVforn{#1}\@key{% \expandafter\define@linginckey\expandafter\dimen\expandafter{\@key}}} -\def\define@lingincskipkeys#1{\XKV@for@n{#1}\@key{% +\def\define@lingincskipkeys#1{\XKVforn{#1}\@key{% \expandafter\define@linginckey\expandafter\skip\expandafter{\@key}}} \def\@setinckey#1#2#3#4\@nil{% \ifx#3!% @@ -216,6 +245,8 @@ \let\stepexcnt=\ep@globalstepexcnt \def\keepexcntlocal{\let\stepexcnt=\ep@localstepexcnt} \def\ex@setup{% also used by \pex +%% TENTATIVE, insert \par +% \par \global\@specialexnofalse \latex@tagex \lingEveryex @@ -340,19 +371,41 @@ \leavevmode \next } +\def\ep@setdimensions{% \epd@numright=\wd\numbox \epd@labelleft=\linglabeloffset + \epd@numright=\wd\numbox + \epd@labelleft=\linglabeloffset + \advance\epd@labelleft by + \ifcase\ep@labelanchor + \epd@numright + \or + \lingnumoffset + \or + 0pt + \fi + \ep@settosum\epd@labelright\epd@labelleft\linglabelwidth + \ifcase\ep@textanchor % numleft + \ep@settosum\epd@textleft\lingnumoffset\lingtextoffset + \or % normal + \ep@settosum\epd@textleft\epd@labelright\lingtextoffset + \fi +} \def\ep@setdimensions{% \epd@numright=\wd\numbox \epd@labelleft=\linglabeloffset - \advance\epd@labelleft by \ifcase\ep@labelanchor - \epd@numright\or \lingnumoffset\or 0pt \fi -% \ep@setdimlabelleft + \advance\epd@labelleft by + \ifcase\ep@labelanchor + \epd@numright + \or + \lingnumoffset + \or + 0pt + \fi \ep@settosum\epd@labelright\epd@labelleft\linglabelwidth - \ifcase\ep@textanchor % numleft + \ifcase\ep@textanchor % numleft \ep@settosum\epd@textleft\lingnumoffset\lingtextoffset \or % normal \ep@settosum\epd@textleft\epd@labelright\lingtextoffset \fi -% \ep@setdimtextleft } %\def\lingnumrightoffset{\the\epd@numright}% \def\ep@setdimpreambleleft{% @@ -361,8 +414,7 @@ \epd@numright\or \epd@labelleft\or \epd@textleft \fi } \def\ep@pexcntinit{\ifnum\ep@labelgen=2\else - \pexcnt=\ling@pexcnt - \advance\pexcnt by -1 \fi} + \pexcnt=\ling@pexcnt \fi} \define@key[epx@]{labels}{tag}{\def\@optionaltag{#1}} \define@key[epx@]{labels}{label}{\def\@specialexno{#1}} \def\ep@setlabelkeys{\setkeys[epx@]{labels}} @@ -386,19 +438,22 @@ \def\@specialexno{}\def\@optionaltag{}% \@getoptionalarg\ep@putlabel@a } +% 03/14/2014 changed defs to edefs below \def\ep@putlabel@a{% \ep@useoptionallabelarg \ifx\@specialexno\empty \ifcase\ep@labelgen - \def\ep@label{\the\ep@everylabel \char\the\pexcnt}% + \edef\ep@label{\the\ep@everylabel \char\the\pexcnt}% +% \edef\ep@label{\the\ep@everylabel \char\noexpand\the\pexcnt}% \advance\pexcnt by 1 \or - \def\ep@label{\the\ep@everylabel \number\pexcnt}% + \edef\ep@label{\the\ep@everylabel \number\pexcnt}% +% \edef\ep@label{\the\ep@everylabel \number\noexpand\pexcnt}% \advance\pexcnt by 1 \or \ep@popLL \or - \def\ep@label{\the\ep@everylabel \romannumeral\pexcnt}% + \edef\ep@label{\the\ep@everylabel \romannumeral\noexpand\pexcnt}% \advance\pexcnt by 1 \fi \else @@ -423,6 +478,12 @@ \define@choicekey{ling}{labelanchor}[\scratch\ep@labelanchor]% {numright,numleft,margin}[]{} \define@lingkey{pexcnt}{\edef\ling@pexcnt{#1}} +% IJAL style +\definelingstyle{IJAL}{labelwidth=2em,labelanchor=numleft, + labeloffset=0pt,labelformat=(A),everylabel=\actualexno, + textanchor=normal,textoffset=1em,preambleanchor=text, + preambleoffset=0pt,avoidnumlabelclash, + appendtopexarg={samplelabel=(\actualexno a)}} %----------------------------------------- %----- judgments ----- \def\judge#1{\rm #1\kern .1em \ignorespaces} @@ -447,10 +508,10 @@ \ifcase\ep@labelgen \def\ep@label{\the\ep@everylabel \char\the\pexcnt}% \or - \def\ep@label{\the\ep@everylabel \number\pexcnt} + \def\ep@label{\the\ep@everylabel \number\pexcnt}% \or \or - \def\ep@label{\the\ep@everylabel \romannumeral\pexcnt} + \def\ep@label{\the\ep@everylabel \romannumeral\pexcnt}% \fi \ling@usearg \dimen0=\lingtextoffset @@ -463,11 +524,12 @@ } \def\ep@inserttabellabel{\@getoptionaltag\ep@inserttablelabel@a} \def\ep@inserttablelabel@a{% - \global\advance\pexcnt by 1 +% \global\advance\pexcnt by 1 \ifx\@optionaltag\empty \else \deftaglabel{\@optionaltag}% \fi \edef\foop{\ep(a)label.}\foop + \global\advance\pexcnt by 1 } \def\ep@omitlabel{\omit\hskip\linglabeloffset\hfil} %\def\endpextable{\egroup\egroup \par \prevdepth=\dp\strutbox} @@ -524,7 +586,9 @@ fullrefformat=XA,labelalign=left,labelwidth=.92em} \definelabeltype{numeric}{labelgen=number,pexcnt=1,labelformat=A., fullrefformat=X.A,labelalign=right,labelwidth=.75em} -\definelabeltype{roman}{labelgen=romannumber,pexcnt=1,labelformat=(A), +% 03/14/14 bug fix (wrong start to roman series labels) +\definelabeltype{roman}{labelgen=romannumber,pexcnt=2,labelformat=(A), +%\definelabeltype{roman}{labelgen=romannumber,pexcnt=1,labelformat=(A), fullrefformat=XA,labelalign=left,labelwidth=1.5em} %-- tags and reference ----- %----- local reference to example numbers ----- @@ -604,12 +668,10 @@ \@g@thertagsfalse \newwrite\ling@tagsfile \def\write@tags{\write\ling@tagsfile} -\def\tagfilesuffix#1{\edef\@tagfilesuffix{#1}} -\def\@tagfilesuffix{-tags} \def\gathertags{% \@setupreadtags \@g@thertagstrue - \immediate\openout\ling@tagsfile=\jobname\@tagfilesuffix\relax + \immediate\openout\ling@tagsfile=\jobname-tags\relax \immediate\write@tags{\noexpand\relax}% } %------ reading the tag file and defining the tags it encodes ----- @@ -625,10 +687,10 @@ \def\@setupreadtags{\if@readtags \do@readtags \global\@readtagsfalse \fi} \def\do@readtags{% - \immediate\openin\ling@tagsin=\jobname\@tagfilesuffix\relax + \immediate\openin\ling@tagsin=\jobname-tags\relax \ifeof\ling@tagsin \else \closein\ling@tagsin - {\catcode`@=11 \input \jobname\@tagfilesuffix\relax}% + {\catcode`@=11 \input \jobname-tags\relax}% \fi } %! @@ -706,26 +768,28 @@ \def\chooseref@a#1#2{#2} \def\chooseref@g#1#2{#1} % ----- glosses ----- -\define@choicekey{ling}{glstyle}[\ling@glstyle\gl@stylenum]{wrap,nlevel}{% - \ifcase\gl@stylenum - \let\gl@beginglstyle\glw@begingl - \let\endgl\glw@endgl - \glw@assignlevels - \let\glpreamble=\glw@preamble - \let\glft=\glw@glft - \else - \let\gl@beginglstyle\gln@begingl - \let\endgl\gln@endgl - \let\glpreamble=\gln@preamble - \let\glft=\gln@ft - \fi +\def\ling@glstyle{wrap} +\def\ling@glftpos{below} +\define@choicekey{ling}{glstyle}[\ling@glstyle\gl@style@num]{wrap,nlevel}{% + \ifnum\gl@style@num=0 \glw@assignlevels \fi + \gl@setprefix } \def\begingl{\bgroup\@getoptionalarg\gl@begingl} +% bug fix 2105/10/27 eliminate stray space +%\def\gl@begingl{% +% \ling@usearg +% \ling@everygl +% \gl@beginglstyle@a +%} \def\gl@begingl{% + \let\everylist=\empty \ling@usearg \ling@everygl - \gl@beginglstyle + \gl@beginglstyle@a } +\def\gl@beginglstyle@a{\@ifnextchar\@space\gl@beginglstyle@b\gl@beginglstyle} +\def\gl@beginglstyle@b #1{\gl@beginglstyle} +% end bug fix % parameters which are used in both gloss styles \define@ling@cmdkeys{everygl,everyglpreamble,everyglilg, everyglft, everyglword,glrightskip,glhangindent,glwidth} @@ -757,7 +821,7 @@ \gltoks@b=\expandafter{#2}% \edef#2{\the\gltoks@a\the\gltoks@b}% } -\def\gl@append #1\to #2{% +\def\gl@xappend #1\to #2{% renamed from \gl@append \gltoks@a={\\{#1}}% \gltoks@b=\expandafter{#2}% \xdef#2{\the\gltoks@b\the\gltoks@a}% @@ -765,14 +829,14 @@ \def\gl@lop#1\to#2{\ifx#1\empty \let#2\empty \else\expandafter\gl@lopoff#1\gl@lopoff#1#2\fi} \long\def\gl@lopoff\\#1#2\gl@lopoff#3#4{\def#4{#1}\def#3{#2}} -\def\gl@eappend{\expandafter\gl@append} +\def\gl@exappend{\expandafter\gl@xappend} % renamed from \gl@eappend \newif\ifgl@loopmore \def\gl@lopTL#1\to#2{% \ifx#1\empty #2={}\else \expandafter\gl@lopoffTL#1\gl@lopoffTL#1#2\fi} \long\def\gl@lopoffTL\\#1#2\gl@lopoffTL#3#4{#4={#1}\def#3{#2}} %%%%%%%%%%%%%%%%%%%% wrap style glosses %%%%%%%%%%%%%%%%%%%% -% \glw@begingl sets up the environment +% \gl@wrap@below@begin sets up the environment % \gla, \glb, etc. fill in the various lists which are initialized in % the environment % The input (something like the following) @@ -787,16 +851,23 @@ % are built. The vboxes are fed into Tex's regular paragraph % building machinary. %%%%%%%%%%%%%%%%%%%%%%%%%%%% -% introduced "glossbreaking" boolean parameter -\define@boolkey{ling}[ling@]{glossbreaking}{} -\lingset{glossbreaking=false} -\def\glw@begingl{\glw@begingl@a} -\def\glw@begingl@a{% +% introduced "glbreaking" boolean parameter +\define@boolkey{ling}[ling@]{glbreaking}[true]{} +\lingset{glbreaking=false} +\def\ep@setlist#1#2{\def#1{}\XKVforn{#2}\@this{\gl@eappend\@this\to#1}} +% 2016/04/18 support for LaTex color and xcolor packages +\define@ling@cmdkeys{glacolor} +\define@lingkey{glnlinecolors}{\ep@setlist\colorlist{#1}} +\lingset{glnlinecolors={},glacolor=} +% various modifications of gloss building macros which follow were made +% to make use of these parameters +\def\gl@wrap@below@begin{\gl@wrap@below@begin@a} +\def\gl@wrap@below@begin@a{% \bgroup \parindent0pt \ep@setglstrut \ifdim\ling@glwidth=0pt - \ifling@glossbreaking + \ifling@glbreaking \bgroup \else \vtop\bgroup @@ -809,6 +880,7 @@ \hsize=\ling@glwidth \leftskip=0pt \fi + \leavevmode \bgroup \parindent=0pt \@glpreamblefalse @@ -818,6 +890,7 @@ \let\aboveskiplist=\empty \let\strutlist=\empty \let\everylist=\empty + \let\colorlist=\empty } % As the list of lists is assembled, heights and depths of each % item are computed and maximum row heights and maximum row depths @@ -876,63 +949,68 @@ % action for empty words added 2014/03/08 \glw@wordfalse \@itemtype=0 - \gl@append \\{\glstrut}\to\mainlist - \gl@eappend 0\to\itemtypelist + \gl@xappend \\{\glstrut}\to\mainlist + \gl@exappend 0\to\itemtypelist \else \@setitemtype #1\@nil - \ifnum\@itemtype=0 \gl@append \\{\glstrut #1}\to\mainlist - \else \ifnum\@itemtype=5 \gl@eappend\@itembody\to\mainlist - \else \gl@append \\{}\to\mainlist + \ifnum\@itemtype=0 \gl@xappend \\{\glstrut #1}\to\mainlist + \else \ifnum\@itemtype=5 \gl@exappend\@itembody\to\mainlist + \else \gl@xappend \\{}\to\mainlist \fi\fi - \gl@eappend \the\@itemtype \to\itemtypelist + \gl@exappend \the\@itemtype \to\itemtypelist \fi \ifglw@word \setbox0=\hbox{\ling@everygla #1}% \ifdim\glw@maxht<\ht0 \glw@maxht=\ht0 \fi \ifdim\glw@maxdp<\dp0 \glw@maxdp=\dp0 \fi - \fi + \fi \glw@gla@b } \newdimen\gl@maxdplast \def\glw@updatelists{% + \edef\temp{\csname ling@gl\gl@linelabel color\endcsname}% + \gl@exappend\temp \to\colorlist \edef\temp{\csname lingabovegl\gl@linelabel skip\endcsname}% - \gl@eappend\temp \to\aboveskiplist + \gl@exappend\temp \to\aboveskiplist \edef\temp{\vrule width0pt height\the\glw@maxht\space depth\the\glw@maxdp\space }% \global\gl@maxdplast=\glw@maxdp - \gl@eappend\temp\to\strutlist + \gl@exappend\temp\to\strutlist \expandafter\expandafter\expandafter - \gl@append\csname ling@everygl\gl@linelabel\endcsname + \gl@xappend\csname ling@everygl\gl@linelabel\endcsname \to\everylist \gltoks@a=\expandafter{\everylist}% } \def\glw@assignlevels{% - \expandafter\XKV@for@n\expandafter{\glw@levels}\levelname + \expandafter\XKVforn\expandafter{\glw@levels}\levelname {\glw@assign@level\levelname}% } \def\glw@assign@level#1{% - \edef\temp{\noexpand\let - \expandafter\noexpand\csname gl#1\endcsname - \expandafter\noexpand\csname glw@gl#1\endcsname}% + \edef\Temp{#1}\def\XTemp{ft}% + \ifx\Temp\XTemp \let\temp\relax \else + \edef\temp{\noexpand\let + \expandafter\noexpand\csname gl#1\endcsname + \expandafter\noexpand\csname glw@gl#1\endcsname}\fi \temp } -% \glw@gla and \glw@glft get their definitions directly +% \glw@gla and \gl@wrap@below@ft get their definitions directly % \glw@gl<name> gets defined via \defineglwlevels, which adds <name> to the % list \glw@levels of defined glw levels \def\glw@levels{a,ft} \def\define@glw@level#1{% \expandafter\ifx\csname glw@gl#1\endcsname\relax + \define@ling@cmdkeys{gl#1color}% \define@ling@cmdkeys{everygl#1}% \define@linginckey\skip{abovegl#1skip}% \XKV@addtolist@o\glw@levels{#1}% - \lingset{everygl#1=,abovegl#1skip=0pt} + \lingset{everygl#1=,abovegl#1skip=0pt,gl#1color=} \expandafter\def\csname glw@gl#1\endcsname{\glw@glx{#1}}% - \ifx\gl@stylenum\undefined \else - \ifnum\gl@stylenum=0 \glw@assign@level{#1}\fi\fi + \ifx\gl@style@num\undefined \else + \ifnum\gl@style@num=0 \glw@assign@level{#1}\fi\fi \else \@expexwarn{Level #1 is already defined} \fi } -\def\defineglwlevels#1{\XKV@for@n{#1}\thislevel +\def\defineglwlevels#1{\XKVforn{#1}\thislevel {\expandafter\define@glw@level\expandafter{\thislevel}}% } \def\glw@glx#1{% x suggests any label (as argument to \glw@glx) @@ -941,6 +1019,7 @@ \def\gl@linelabel{#1}% \@getoptionalarg\glw@glx@a } + \def\glw@glx@a #1// {\bgroup \ling@usearg \expandafter\let\expandafter\@every @@ -962,12 +1041,12 @@ \gl@lop\blist\to\currb \ifnum\@itemtype=0 \gl@lop\alist\to\curra - \gl@eappend\curra\to\currb - \gl@eappend\currb\to\clist + \gl@exappend\curra\to\currb + \gl@exappend\currb\to\clist \else \ifnum\@itemtype=5 - \gl@eappend\currb\to\clist + \gl@exappend\currb\to\clist \else - \gl@append\\{}\to\clist + \gl@xappend\\{}\to\clist \fi\fi \repeat \global\let#2=\clist @@ -976,19 +1055,20 @@ \setbox0=\hbox{\@every #1}% \ifdim\glw@maxht<\ht0 \glw@maxht=\ht0 \fi \ifdim\glw@maxdp<\dp0 \glw@maxdp=\dp0 \fi - \gl@append {\glstrut #1}\to\worklist + \gl@xappend {\glstrut #1}\to\worklist \glw@glx@b } \defineglwlevels{b,c} \newif\ifglw@spacebefore -\long\def\glw@preamble #1// {% +\long\def\gl@wrap@below@preamble #1// {% \@glpreambletrue - {\hangindent=0pt \hangafter=0 \ling@everyglpreamble #1\strut + {\hangindent=0pt \hangafter=0 + \leavevmode\ling@everyglpreamble #1\strut \par \vskip\lingbelowglpreambleskip }% } -\def\glw@glft{\@getoptionalarg\glw@glft@a} -\long\def\glw@glft@a #1//{% +\def\gl@wrap@below@ft{\@getoptionalarg\gl@wrap@below@ft@a} +\long\def\gl@wrap@below@ft@a #1//{% \glw@printilgsetup \glw@printilg@a \vskip\lingaboveglftskip @@ -1003,7 +1083,7 @@ \ling@everyglft \strut #1\par } -\def\glw@endgl{% +\def\gl@wrap@below@end{% \if@glft \else \glw@printilg\egroup \fi \egroup\egroup\egroup } @@ -1013,7 +1093,9 @@ \rightskip=\ling@glrightskip \lineskiplimit=0pt \lineskip=\lingextraglskip - \ifdim\lingextraglskip=0pt \global\let\@ilgborderadjustment=\relax +% bug fix, 3/9/2017 +% \ifdim\lingextraglskip=0pt \global\let\@ilgborderadjustment=\relax + \ifdim\lineskip=0pt \global\let\@ilgborderadjustment=\relax \else \xdef\@ilgborderadjustment{\vskip\the\lineskip}\fi \if@glpreamble \@ilgborderadjustment \fi \ifcase\ep@glhangstyle @@ -1095,24 +1177,41 @@ \newtoks\gltoks@every \newtoks\gltoks@next \newbox\debug@glword +\def\ep@mklinecolorop{% + \ifx\@linecolor\empty \let\@linecolorop=\empty + \else \ep@mklinecolorop@a \fi} +\def\ep@mklinecolorop@a{% + \edef\@linecolorop{\noexpand\noexpand\noexpand\color{\@linecolor}}% +} +\def\pstglcolors{% + \def\ep@mklinecolorop@a{% + \edef\@@linecolor{\noexpand\csname\@linecolor\noexpand\endcsname}% + \edef\@@@linecolor{\ep@expandtwice\@@linecolor}% + \edef\@linecolorop{\expandafter\noexpand + \expandafter\noexpand\expandafter\noexpand\@@@linecolor}% + }% +} \def\glw@printglword{% \begingroup \gltoks@sofar={}% \gl@loopmoretrue \loop\ifgl@loopmore + \gl@lop\colorlist\to\@linecolor + \ep@mklinecolorop \gl@lop\aboveskiplist\to\@aboveskip \expandafter\ifdim\@aboveskip=0pt \def\@above{}\else \edef\@above{\noalign{\vskip\@aboveskip}}\fi \gl@lop\strutlist\to\@strut \gl@lopTL\everylist\to\gltoks@every \gl@lopTL\@currentitem\to\gltoks@next - \edef\temp{\the\gltoks@sofar \@above\@strut\the\gltoks@every\the\gltoks@next \cr}% + \edef\temp{\the\gltoks@sofar \@above\@strut + {\@linecolorop\the\gltoks@every \the\gltoks@next}\cr}% \gltoks@sofar=\expandafter{\temp}% \ifx\@currentitem\empty \gl@loopmorefalse \fi \repeat \setbox0\vtop{% \ling@everyglword - \halign{\glwordalign{##}\cr \the\gltoks@sofar}}% + \halign{\glwordalign{##}\cr \the\gltoks@sofar }}% \box0 \endgroup } @@ -1134,8 +1233,8 @@ \fi } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\gln@begingl{\gln@begingl@a} -\def\gln@begingl@a{% +\def\gl@nlevel@below@begin{\gl@nlevel@below@begin@a} +\def\gl@nlevel@below@begin@a{% \bgroup \parindent0pt \bgroup @@ -1148,19 +1247,33 @@ \hsize=\ling@glwidth \leftskip=0pt \fi - \futurelet\temp\gln@begingl@b + \futurelet\tempt\gl@nlevel@below@begin@b } -\def\gln@begingl@b{% - \ifx\temp\glpreamble \let\next=\relax +\def\gl@nlevel@below@begin@b{% + \ifx\tempt\glpreamble \let\next=\gl@nlevel@below@preamble@c \else \let\next=\gln@ilg \fi \next} -\def\gln@preamble #1\endpreamble{% +\def\gl@nlevel@below@preamble@c #1{\gl@nlevel@below@preamble@d} +\def\gl@nlevel@below@preamble@d #1\endpreamble{% + \bgroup \ling@everyglpreamble #1\strut \vskip\lingbelowglpreambleskip \vskip\lingextraglskip - \egroup\bgroup + \egroup \gln@ilg } +%\def\gl@nlevel@below@begin@b{% +% \ifx\temp\glpreamble \let\next=\relax +% \else \let\next=\gln@ilg \fi \next} +%\def\gl@nlevel@below@preamble #1\endpreamble{% +% \ling@everyglpreamble +% #1\strut +% \vskip\lingbelowglpreambleskip +% \vskip\lingextraglskip +% \egroup +% \bgroup +% \gln@ilg +%} \def\gln@ilg{% \ling@everyglilg \lineskip=\lingextraglskip @@ -1191,8 +1304,8 @@ } \def\nogloss#1{{#1}[]}% \def\gln@ilg@f{\@ifnextchar\@space\gln@ilg@fi\gln@ilg@fii} -\def\gln@ilg@fi #1#2/{\gl@append #2\to\@currentitem \gln@ilg@g} -\def\gln@ilg@fii#1/{\gl@append #1\to\@currentitem \gln@ilg@g} +\def\gln@ilg@fi #1#2/{\gl@xappend #2\to\@currentitem \gln@ilg@g} +\def\gln@ilg@fii#1/{\gl@xappend #1\to\@currentitem \gln@ilg@g} \def\gln@ilg@g{\@ifnextchar\@nil\gln@ilg@h\gln@ilg@f} \def\gln@ilg@h #1{% \gln@printglword @@ -1207,13 +1320,15 @@ \ling@everyglword \gl@loopmoretrue \loop\ifgl@loopmore + \gl@lop\colorlist\to\@linecolor + \ep@mklinecolorop \gl@lop\gln@abovelineskip\to\@aboveskip \ifx\@aboveskip\empty \let\@above=\empty \else \edef\@above{\noalign{\vskip\@aboveskip}}\fi \gl@lopTL\gln@everyline\to\gltoks@every \gl@lopTL\@currentitem\to\gltoks@next \edef\temp{\the\gltoks@sofar \@above - \glstrut \the\gltoks@every \the\gltoks@next \cr}% + \glstrut {\@linecolorop \the\gltoks@every \the\gltoks@next}\cr}% \gltoks@sofar=\expandafter{\temp}% \ifx\@currentitem\empty \gl@loopmorefalse \fi \repeat @@ -1243,7 +1358,7 @@ } \def\ep@diacriticerror#1{% \@expexerror{bad gloss diacritic: #1 (only @ and + permitted)}\end} -\def\gln@ft{% +\def\gl@nlevel@below@ft{% \vskip\lingaboveglftskip \vskip\lingextraglskip \egroup\bgroup @@ -1251,13 +1366,20 @@ \strut \ling@everyglft } -\def\gln@endgl{\par\egroup\egroup\egroup\egroup} +\def\gl@nlevel@below@end{\par\egroup\egroup\egroup\egroup} \define@lingkey{glneveryline}{\ep@setlist\gln@everyline{#1}} \define@lingkey{glnabovelineskip}{\ep@setlist\gln@abovelineskip{#1}% - \gl@lop\gln@abovelineskip\to\temp + \gl@lop\gln@abovelineskip\to\temp % no first line abovelineskip \gl@push{}\to\gln@abovelineskip - } -\def\ep@setlist#1#2{\def#1{}\XKV@for@n{#2}\@this{\gl@eappend\@this\to#1}} +} +% bug fix 4/9/2016 +\def\gl@append #1\to #2{% + \gltoks@a={\\{#1}}% + \gltoks@b=\expandafter{#2}% + \edef#2{\the\gltoks@b\the\gltoks@a}% +} +\def\gl@eappend{\expandafter\gl@append} +% end bug fix \lingset{glneveryline={\it},glnabovelineskip={}} %%%%%%%%%%%%%%%% end nlevel %%%%%%%%%%%%%%%%%%%% @@ -1305,29 +1427,19 @@ \ep@glmkcascade } % ----- side by side (ss) gloss style ----- -\define@choicekey{ling}{glftpos}[\temp\ep@glftpos]% - {below,right}{% - \ifcase\ep@glftpos - \let\gl@beginglstyle\glw@begingl - \let\endgl\glw@endgl - \let\glft=\glw@glft - \or - \let\gl@beginglstyle=\glw@ss@begingl - \let\endgl=\glw@ss@endgl - \let\glft\glw@ss@glft - \fi -} +\def\gl@setprefix{\edef\gl@prefix{gl@\ling@glstyle @\ling@glftpos @}} +\def\glft{\csname \gl@prefix ft\endcsname} +\def\gl@beginglstyle{\csname \gl@prefix begin\endcsname} +\def\endgl{\csname \gl@prefix end\endcsname} +\def\glpreamble{\csname \gl@prefix preamble\endcsname} + +\define@choicekey{ling}{glftpos}[\ling@glftpos\gl@ftpos@num]% + {below,right}{\gl@setprefix} + \define@lingcmdkeys{sssep,ssratio,ssrightskip} \lingset{sssep=2em,ssratio=.6,ssrightskip=0pt plus 2em} \newdimen\ssleftwd \newdimen\ssrightwd -\def\glw@ss@begingl{% - \ep@setssdims - \leavevmode\bgroup\hbox\bgroup - \hsize=\ssleftwd - \lingset{glwidth=\ssleftwd} - \glw@begingl -} \def\ep@setssdims{% \dimen0 =\hsize \advance\dimen0 by -\leftskip @@ -1336,9 +1448,16 @@ \ssrightwd=\dimen0 \advance\ssrightwd by -\ssleftwd } -\def\glw@ss@endgl{\egroup\egroup} -\def\glw@ss@glft #1//{% - \glw@endgl +\def\gl@wrap@right@begin{% + \ep@setssdims + \leavevmode\bgroup\hbox\bgroup + \hsize=\ssleftwd + \lingset{glwidth=\ssleftwd} + \gl@wrap@below@begin +} +\def\gl@wrap@right@end{\egroup\egroup} +\def\gl@wrap@right@ft #1//{% + \gl@wrap@below@end \hskip\lingsssep \vtop{% \leftskip=0pt @@ -1349,21 +1468,50 @@ #1}% \ignorespaces } +\expandafter\def\expandafter\gl@nlevel@right@medial\expandafter + {\gl@nlevel@below@end \gl@nlevel@right@medial@a} +\def\gl@nlevel@right@medial@a{\egroup + \def\gl@prefix{gl@nlevel@right@}% + \hskip\lingsssep + \vtop\bgroup + \leftskip=0pt + \rightskip=\lingssrightskip + \parindent=0pt + \hsize=\ssrightwd + \ling@everyglft +} +\def\gl@nlevel@right@begin{% + \ep@setssdims + \leavevmode + \vtop\bgroup + \hsize=\ssleftwd + \leftskip=0pt + \def\gl@prefix{gl@nlevel@below@} + \let\gl@nlevel@below@ft=\gl@nlevel@right@medial \begingl } + \def\gl@nlevel@right@end{\egroup\egroup} % ----- gloss with a side panel +%2015 added macros for side panel in nlevel style \define@lingcmdkeys{everypanel} \lingset{everypanel={}} \def\beginglpanel{\@getoptionalarg\beginglpanel@a} \def\beginglpanel@a{% \bgroup - \let\endgl=\endgl@panel + \ifcase\gl@style@num + \let\endgl=\gl@wrap@panel@end + \else + \let\endgl=\gl@nlevel@panel@end + \fi + \begin@glpanel@right +} +\def\begin@glpanel@right{% \ling@usearg \ep@setssdims \leavevmode - \lingset{glwidth=\ssleftwd} - \begingl + \lingset{glwidth=\ssleftwd} + \begingl } -\def\endgl@panel{% - \glw@endgl +\def\gl@wrap@panel@end{% + \gl@wrap@below@end \hfill \vtop\bgroup \hsize=\ssrightwd @@ -1371,16 +1519,28 @@ \rightskip=\lingssrightskip \lingeverypanel } +\def\gl@nlevel@panel@end{% + \gl@nlevel@below@end + \hfill + \vtop\bgroup + \hsize=\ssrightwd + \leftskip=0pt + \rightskip=\lingssrightskip + \lingeverypanel +}% \def\endpanel{\egroup\egroup\par} % ----- underfixes ----- +% removed 11/4/2015 +% put back temporarily 3/9/2017 (still needed in manual) \def\gluf/#1/#2/{% \vtop{\offinterlineskip\halign{\hfil##\hfil\cr \strut #1\cr \noalign{\vskip-\ling@glufcloseup} \ling@everygluf \strut#2\cr }}} +% ---------- \define@ling@cmdkeys{everygluf,glufcloseup} -%\lingset{glufcloseup=.4ex,everygluf=\sc} +\lingset{glufcloseup=.4ex,everygluf=\sc} % ----- gloss comments and citations ----- \def\rightcomment#1{\leavevmode\rlap{% \hbox to\hsize{\hfil \rm #1\hskip\leftskip}}\ignorespaces} @@ -1444,11 +1604,15 @@ glwidth=0pt, glufcloseup=.4ex, everygluf=, -% everybrack=\rm, -% glbracketsep=.15em, glstyle=wrap, extraglskip=.5ex, mincitesep=1.5em, glstruts=true } +%%%%%%%%%%%%%%%% additions to the CTAN file +\def\tspacea{\hskip\lingdima} +\def\tspaceb{\hskip\lingdimb} +\def\tspacec{\hskip\lingdimc} +\lingset{dimb=1.5em,dimc=1.5em} + \resetatcatcode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/expex.tlpobj new/tlpkg/tlpobj/expex.tlpobj --- old/tlpkg/tlpobj/expex.tlpobj 2016-04-14 19:00:32.000000000 +0200 +++ new/tlpkg/tlpobj/expex.tlpobj 2017-06-07 02:21:38.000000000 +0200 @@ -1,21 +1,21 @@ name expex category Package -revision 33163 -shortdesc Format linguistic examples and glosses, with reference capabilities +revision 44499 +shortdesc Linguistic examples and glosses, with reference capabilities relocated 1 longdesc The package provides macros for typesetting linguistic examples longdesc and glosses, with a refined mechanism for referencing examples longdesc and parts of examples. The package can be used with LaTeX using longdesc the .sty wrapper or with PlainTex. -runfiles size=22 +runfiles size=24 RELOC/tex/generic/expex/epltxchapno.sty RELOC/tex/generic/expex/epltxfn.sty RELOC/tex/generic/expex/eptexfn.tex RELOC/tex/generic/expex/expex-demo.tex RELOC/tex/generic/expex/expex.sty RELOC/tex/generic/expex/expex.tex -catalogue-ctan /macros/plain/contrib/expex -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-ctan /macros/generic/expex +catalogue-date 2017-05-26 16:42:23 +0200 catalogue-license lppl catalogue-topics linguistic -catalogue-version 5.0b +catalogue-version 5.1b ++++++ export.doc.tar.xz ++++++ ++++++ export.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/export.tlpobj new/tlpkg/tlpobj/export.tlpobj --- old/tlpkg/tlpobj/export.tlpobj 2016-04-14 19:00:32.000000000 +0200 +++ new/tlpkg/tlpobj/export.tlpobj 2017-04-14 17:39:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/export/dvipaste.sty RELOC/tex/latex/export/export.sty catalogue-ctan /macros/latex/contrib/export -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.8 ++++++ expressg.doc.tar.xz ++++++ ++++++ expressg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/expressg.tlpobj new/tlpkg/tlpobj/expressg.tlpobj --- old/tlpkg/tlpobj/expressg.tlpobj 2016-04-14 19:00:33.000000000 +0200 +++ new/tlpkg/tlpobj/expressg.tlpobj 2017-04-14 17:39:42.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/metapost/expressg/expressg.mp catalogue-also metauml catalogue-ctan /graphics/metapost/contrib/macros/expressg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram graphics-in-tex catalogue-version 1.5 ++++++ exsheets.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsheets/README new/doc/latex/exsheets/README --- old/doc/latex/exsheets/README 2016-02-02 00:05:57.000000000 +0100 +++ new/doc/latex/exsheets/README 2017-02-11 01:01:03.000000000 +0100 @@ -1,17 +1,17 @@ -------------------------------------------------------------------------- -EXSHEETS 2016/02/01 +EXSHEETS 2017/02/08 v0.21i bundled packages: -the EXSHEETS package v0.21b +the EXSHEETS package Yet another package for the creation of exercise sheets -the EXSHEETS-LISTINGS package v0.21b +the EXSHEETS-LISTINGS package Using listings in exsheets -------------------------------------------------------------------------- Clemens Niederberger -Web: http://www.mychemistry.eu/forums/forum/exsheets/ +Web: https://bitbucket.org/cgnieder/exsheets/ E-Mail: contact(a)mychemistry.eu -------------------------------------------------------------------------- -Copyright 2011-2016 Clemens Niederberger +Copyright 2011-2017 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 Binary files old/doc/latex/exsheets/exsheets_en.pdf and new/doc/latex/exsheets/exsheets_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsheets/exsheets_en.tex new/doc/latex/exsheets/exsheets_en.tex --- old/doc/latex/exsheets/exsheets_en.tex 2016-02-02 00:05:57.000000000 +0100 +++ new/doc/latex/exsheets/exsheets_en.tex 2017-02-11 01:01:03.000000000 +0100 @@ -1,8 +1,8 @@ +% !arara: pdflatex +% !arara: biber % arara: pdflatex -% arara: biber % arara: pdflatex % arara: pdflatex -% !arara: pdflatex % -------------------------------------------------------------------------- % the EXSHEETS package % @@ -13,7 +13,7 @@ % Web: http://www.mychemistry.eu/forums/forum/exsheets/ % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011-2016 Clemens Niederberger +% Copyright 2011-2017 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -33,6 +33,7 @@ \documentclass[load-preamble+]{cnltx-doc} \usepackage{exsheets} +\usepackage{bookmark} \setcnltx{ package = {exsheets} , @@ -282,7 +283,7 @@ Then there is --~at least in Germany~-- the habit of having lists of exercises aligned in columns but counting from the left to the right instead from up to down. That's why the \pkg{tasks} package was developed as part of \ExSheets{} -and was ditrsibuted as part of the bundle\changedversion{0.15}. Now it is a +and was distributed as part of the bundle\changedversion{0.15}. Now it is a package of its own but is loaded by \ExSheets{} automatically with the necessary setup to make them work together nicely. @@ -342,8 +343,8 @@ % released independently. You can find it as every other package on \ctan\ and % in a full \TeX~Live or \hologo{MiKTeX} installation. -\section{News} -\begin{description} +% \section{News} +% \begin{description} % \item[Version 0.7] % With version~0.7 there has been a potentially breaking change: the % \code{tasks} environment previously provided by \ExSheets\ has been @@ -379,121 +380,121 @@ % the \ExSheets\ bundle. From now on (July~17.\@ 2013) it is provided as a % package of its own. -\item[Version 0.10] - The \ExSheets\ family has got a new member: \ExSheetslistings. This package - proposes a solution for the problem of using verbatim material in \ExSheets' - \env{question} and \env{solution} environments. It is presented in - part~\ref{part:listings}. - - Question now can get subtitles that are printed if the heading instance - supports it, see section~\ref{sec:subtitles-questions}. - -\item[Version 0.11] - The commands \cs{GetQuestionClass} and \cs{PrintQuestionClassTF} have been - added. They're explained in section~\ref{sec:retr-class-value}. +% \item[Version 0.10] +% The \ExSheets\ family has got a new member: \ExSheetslistings. This package +% proposes a solution for the problem of using verbatim material in \ExSheets' +% \env{question} and \env{solution} environments. It is presented in +% part~\ref{part:listings}. + +% Question now can get subtitles that are printed if the heading instance +% supports it, see section~\ref{sec:subtitles-questions}. + +% \item[Version 0.11] +% The commands \cs{GetQuestionClass} and \cs{PrintQuestionClassTF} have been +% added. They're explained in section~\ref{sec:retr-class-value}. -\item[Version 0.12] - The \option{auto-label} is now more flexible to allow the use together with - packages \pkg{cleveref}. - - Question properties can now be retrieved before the question is printed (by - writing the properties to the \code{aux} file). - -\item[Version 0.13] - New options: - \begin{itemize} - \item \option{chapter-hook} allows to add code to the list of solutions - when the solutions of a new chapter are printed, see - section~\ref{sec:solutions-print-all}. - \item \option{section-hook} allows to add code to the list of solutions - when the solutions of a new section are printed, see - section~\ref{sec:solutions-print-all}. - \end{itemize} - -\item[Version 0.14] - New options: - \begin{itemize} - \item New option \option{pre-hook} to the \env{question} environment that - allows to add code directly before the question body, see - section~\ref{sec:opti-ques-envir}. - \item New option \option{post-hook} to the \env{question} environment that - allows to add code directly after the question body, see - section~\ref{sec:opti-ques-envir}. - \item New command \cs{ExSheetsHeading}, see - section~\ref{sec:using-an-exsheets}. - \item New pre-defined question properties \code{question-body}, - \code{bonus-points} and \code{counter}, see - section~\ref{sec:additional_info}. - \item New option \option{save-to-aux}, see - section~\ref{sec:additional_info}. - \end{itemize} - -\item[Version 0.15] - \begin{itemize} - \item The packages \pkg{tasks} and \pkg{cntformats} have been removed from - the bundle and are now distributed as packages of their own. - \item The options \option*{load-headings} and \option*{load-tasks} have - been dropped. The optional functionality they provided is now provided - all the time. - \item New command \cs{IfQuestionPropertyTF}, see - section~\ref{sec:additional_info}. - \end{itemize} - -\item[Version 0.16] - New options/changes: - \begin{itemize} - \item The option \option{pre-hook} to the \env{question} environment now - places its contents before the question heading, see - section~\ref{sec:opti-ques-envir}. - \item New option \option{pre-body-hook} to the \env{question} environment - which adds its contents before the question body, see - section~\ref{sec:opti-ques-envir}. - \item New option \option{post-body-hook} to the \env{question} environment - which adds its contents after the question body, see - section~\ref{sec:opti-ques-envir}. - \item New option \option{pre-hook} to the \env{solution} environment which - adds code before a solution, see section~\ref{sec:opti-soli-envir}. - \item New option \option{post-hook} to the \env{solution} environment which - adds code after a solution, see section~\ref{sec:opti-soli-envir}. - \item New option \option{pre-body-hook} to the \env{solution} environment - which adds its contents before the solution body, see - section~\ref{sec:opti-soli-envir}. - \item New option \option{post-body-hook} to the \env{solution} environment - which adds its contents after the solution body, see - section~\ref{sec:opti-soli-envir}. - \end{itemize} - -\item[Version 0.17] - New option: - \begin{itemize} - \item The option \option{use-saved-counter-format} has been introduced. It - is described in section~\ref{sec:solutions} on - page~\pageref{option:use-saved-counter-format}. - \end{itemize} - -\item[Version 0.18] - The package now provides the correct Danish translations, thanks to Jonas - Nyrup. - - The macro \cs{exsheetsprintsolution} is introduced, see - page~\pageref{exsheetsprintsolution} for a little bit of an explanation. - - The option \option{no-skip-below} is introduced which disables the insertion - of vertical space after the question and solution environments. - -\item[Version 0.20] - New command \cs{DeclareExSheetsHeadingContainer}. - -\item[Version 0.21] Changes: - \begin{itemize} - \item \cs{includequestions} issues an error if it can't find the file to - include. - \item question properties are now also accessable when the corresponding - question isn't printed. - \item The variables \verbcode+\l_exsheets_counter_qu_int+ and \\ - \verbcode+\g_exsheets_question_identification_prop+ are now public. - \end{itemize} -\end{description} +% \item[Version 0.12] +% The \option{auto-label} is now more flexible to allow the use together with +% packages \pkg{cleveref}. + +% Question properties can now be retrieved before the question is printed (by +% writing the properties to the \code{aux} file). + +% \item[Version 0.13] +% New options: +% \begin{itemize} +% \item \option{chapter-hook} allows to add code to the list of solutions +% when the solutions of a new chapter are printed, see +% section~\ref{sec:solutions-print-all}. +% \item \option{section-hook} allows to add code to the list of solutions +% when the solutions of a new section are printed, see +% section~\ref{sec:solutions-print-all}. +% \end{itemize} + +% \item[Version 0.14] +% New options: +% \begin{itemize} +% \item New option \option{pre-hook} to the \env{question} environment that +% allows to add code directly before the question body, see +% section~\ref{sec:opti-ques-envir}. +% \item New option \option{post-hook} to the \env{question} environment that +% allows to add code directly after the question body, see +% section~\ref{sec:opti-ques-envir}. +% \item New command \cs{ExSheetsHeading}, see +% section~\ref{sec:using-an-exsheets}. +% \item New pre-defined question properties \code{question-body}, +% \code{bonus-points} and \code{counter}, see +% section~\ref{sec:additional_info}. +% \item New option \option{save-to-aux}, see +% section~\ref{sec:additional_info}. +% \end{itemize} + +% \item[Version 0.15] +% \begin{itemize} +% \item The packages \pkg{tasks} and \pkg{cntformats} have been removed from +% the bundle and are now distributed as packages of their own. +% \item The options \option*{load-headings} and \option*{load-tasks} have +% been dropped. The optional functionality they provided is now provided +% all the time. +% \item New command \cs{IfQuestionPropertyTF}, see +% section~\ref{sec:additional_info}. +% \end{itemize} + +% \item[Version 0.16] +% New options/changes: +% \begin{itemize} +% \item The option \option{pre-hook} to the \env{question} environment now +% places its contents before the question heading, see +% section~\ref{sec:opti-ques-envir}. +% \item New option \option{pre-body-hook} to the \env{question} environment +% which adds its contents before the question body, see +% section~\ref{sec:opti-ques-envir}. +% \item New option \option{post-body-hook} to the \env{question} environment +% which adds its contents after the question body, see +% section~\ref{sec:opti-ques-envir}. +% \item New option \option{pre-hook} to the \env{solution} environment which +% adds code before a solution, see section~\ref{sec:opti-soli-envir}. +% \item New option \option{post-hook} to the \env{solution} environment which +% adds code after a solution, see section~\ref{sec:opti-soli-envir}. +% \item New option \option{pre-body-hook} to the \env{solution} environment +% which adds its contents before the solution body, see +% section~\ref{sec:opti-soli-envir}. +% \item New option \option{post-body-hook} to the \env{solution} environment +% which adds its contents after the solution body, see +% section~\ref{sec:opti-soli-envir}. +% \end{itemize} + +% \item[Version 0.17] +% New option: +% \begin{itemize} +% \item The option \option{use-saved-counter-format} has been introduced. It +% is described in section~\ref{sec:solutions} on +% page~\pageref{option:use-saved-counter-format}. +% \end{itemize} + +% \item[Version 0.18] +% The package now provides the correct Danish translations, thanks to Jonas +% Nyrup. + +% The macro \cs{exsheetsprintsolution} is introduced, see +% page~\pageref{exsheetsprintsolution} for a little bit of an explanation. + +% The option \option{no-skip-below} is introduced which disables the insertion +% of vertical space after the question and solution environments. + +% \item[Version 0.20] +% New command \cs{DeclareExSheetsHeadingContainer}. + +% \item[Version 0.21] Changes: +% \begin{itemize} +% \item \cs{includequestions} issues an error if it can't find the file to +% include. +% \item question properties are now also accessable when the corresponding +% question isn't printed. +% \item The variables \verbcode+\l_exsheets_counter_qu_int+ and \\ +% \verbcode+\g_exsheets_question_identification_prop+ are now public. +% \end{itemize} +% \end{description} \section{Thanks} I need to thank the many users who gave me feedback so far! For one thing @@ -542,7 +543,7 @@ the objects used by \ExSheets. This is explained in a little more detail in part~\ref{part:style} on page~\pageref{part:style}\,ff. This third type, however, brings in a possible instability: the \pkg{xtemplate} package is in -an experimental and developping state. This means that the sytax of the +an experimental and developing state. This means that the sytax of the package may and possibly will change sometime in the future. I cannot foresee what any consequences of that will be for \ExSheets. @@ -624,7 +625,7 @@ \begin{environments} \environment{question}[\oarg{options}\marg{points}] The main environment: creates a new exercise/question. Both arguments are - optionial! + optional! \end{environments} \begin{example} \begin{question} @@ -669,7 +670,7 @@ Beware that this also prevents bonus points. The points simply will be written where the heading instance puts them. -\sinceversion{0.3}On additional thing: you might want to define custom +\sinceversion{0.3}One additional thing: you might want to define custom commands that should behave differently if they're inside or outside of the \env{question} environment. In this case you can use these commands: \begin{commands} @@ -692,7 +693,7 @@ from ``Exercise'' to ``Question''. These default names are language dependent.\par If you use \cs*{usepackage}\oarg{ngerman}\marg{babel}, for example, then - the names are ``\"Ubung and ``Aufgabe''. + the names are ``Ãbung'' and ``Aufgabe''. \keyval{name}{name}\Module{question}\Default Sets a custom name. All predefined names are discarded. \keyval{subtitle}{subtitle}\Module{question}\Default @@ -1023,7 +1024,7 @@ points. \end{options} -\begin{example} +\begin{example}[add-sourcecode-options={literate=}] \SetupExSheets[points]{name=point/s,number-format=\color{red}} \begin{question}{1} This one's easy so only 1 point can be earned. @@ -1074,17 +1075,17 @@ with the exercises and one with the solutions, and you want to add different titles to these versions, for instance. -When solutions are saved a lot of information is saved. One of them is the -current counter format. The following option determines wether the saved -counter format or the currently active one is used when \cs{printsolutions} is -called: -\begin{options} - \keybool{use-saved-counter-format}\Default{true} - \changedversion{0.21}When set to true the counter format of solutions - printed by \cs{printsolutions}\label{option:use-saved-counter-format} are - independent from the setting of \option{counter-format}. The saved format - is used instead. -\end{options} +% When solutions are saved a lot of information is saved. One of them is the +% current counter format. The following option determines wether the saved +% counter format or the currently active one is used when \cs{printsolutions} is +% called: +% \begin{options} +% \keybool{use-saved-counter-format}\Default{true} +% \changedversion{0.21}When set to true the counter format of solutions +% printed by \cs{printsolutions}\label{option:use-saved-counter-format} are +% independent from the setting of \option{counter-format}. The saved format +% is used instead. +% \end{options} \subsection{Print all}\label{sec:solutions-print-all} The first and easiest usage of \cs{printsolutions} is the following: @@ -1305,8 +1306,8 @@ \ExplSyntaxOff \subsection{Own Dividing Concepts} -\noindent\sinceversion{0.8}Actually both classes and topics are introduced -into \ExSheets\ internally this way: +Actually\sinceversion{0.8} both classes and topics are introduced into +\ExSheets\ internally this way: \begin{sourcecode} \DeclareQuestionClass{class}{classes} \DeclareQuestionClass{topic}{topics} @@ -1771,9 +1772,8 @@ The command should take one mandatory argument. \end{options} - \section{Own Question/Solution Pairs} -\noindent\changedversion{0.9}\ExSheets\ provides he possibility to create new +\ExSheets\changedversion{0.9} provides the possibility to create new environments that behave like the \env{question} and \env{solution} environments. This would allow, for example, to define a \env*{question*}/\env*{solution*} environment pair for bonus questions. The @@ -1815,9 +1815,9 @@ \section{Filling in the Blanks} \subsection{Cloze} -\noindent\changedversion{0.4}Both in exercise sheets and in exams it is -sometimes desirable to be able to create \blank{blanks} that have to be filled -in. Or maybe some more lines: \blank[width=5\linewidth]{} +Both\changedversion{0.4} in exercise sheets and in exams it is sometimes +desirable to be able to create \blank{blanks} that have to be filled in. Or +maybe some more lines: \blank[width=5\linewidth]{} \begin{commands} \command{blank}[\sarg\oarg{options}\marg{text to be filled in}] @@ -1843,6 +1843,14 @@ \keyval{linespread}{num}\Module{blank}\Default{1} Set the linespread for the blank lines. This only has an effect if \cs{blank} is used at the begin of a paragraph. + \keyval{line-increment}{dim}\Module{blank}\Default{1pt} + \sinceversion{0.21h}When the blank line ist built it is built in multiples + of this value. If the value is too large you may end up with uneven + lines. If the value is too small you may end up with a non-ending + compilation. + \keyval{line-minimum-length}{dim}\Module{blank}\Default{2em} + \sinceversion{0.21h}The minimal length a line must have before it is built + step by step. \end{options} \begin{example} \begin{question} @@ -1862,12 +1870,12 @@ \end{example} \subsection{Vertical Space for answers} -\noindent\sinceversion{0.3}When you're creating an exam you might want to add -some vertical space where the students can write down their answers. While -you can always use \cs*{vspace} this is not always handy when the space left -on the page is less than you want. In this case it would be nice if a) there -would be no warning and b) the rest of the space would be added at the top of -the next page. This is what the following command is for: +When\sinceversion{0.3} you're creating an exam you might want to add some +vertical space where the students can write down their answers. While you can +always use \cs*{vspace} this is not always handy when the space left on the +page is less than you want. In this case it would be nice if a) there would +be no warning and b) the rest of the space would be added at the top of the +next page. This is what the following command is for: \begin{commands} \command{examspace}[\sarg\marg{dim}] Add space as specified in \meta{dim}. If the space available on the @@ -2043,7 +2051,6 @@ A `block' heading. \sample \end{question} -\newpage \subsubsection{The `runin' Instance} \begin{sourcecode} \DeclareInstance{exsheets-heading}{runin}{default}{ @@ -2082,7 +2089,6 @@ A `simple' heading. \sample \end{question} -\newpage \subsubsection{The `empty' Instance} \sinceversion{0.9a} \begin{sourcecode} @@ -2289,7 +2295,6 @@ A `runin-fixed-nr' heading. \sample \end{question} -\newpage \subsubsection{The `runin-nr-wp' Instance} \begin{sourcecode} \DeclareInstance{exsheets-heading}{runin-nr-wp}{default}{ @@ -2463,8 +2468,8 @@ vscale = 2 , pre-code = \rule{\linewidth}{1pt} , post-code = \rule{\linewidth}{1pt} , - title-format = \large\scshape\color{exsheetsred} , - number-format = \large\bfseries\color{exsheetsblue} , + title-format = \large\scshape\color{rgb:red,0.65;green,0.04;blue,0.07} , + number-format = \large\bfseries\color{rgb:red,0.02;green,0.04;blue,0.48} , points-format = \itshape , join = { number[r,B]title[l,B](.333em,0pt) } , attach = @@ -2487,8 +2492,8 @@ vscale = 2 , pre-code = \rule{\linewidth}{1pt} , post-code = \rule{\linewidth}{1pt} , - title-format = \large\scshape\color{exsheetsred} , - number-format = \large\bfseries\color{exsheetsblue} , + title-format = \large\scshape\color{rgb:red,0.65;green,0.04;blue,0.07} , + number-format = \large\bfseries\color{rgb:red,0.02;green,0.04;blue,0.48} , points-format = \itshape , points-pre-code = ( , points-post-code = ) , Binary files old/doc/latex/exsheets/grading-table.pdf and new/doc/latex/exsheets/grading-table.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsheets/grading-table.tex new/doc/latex/exsheets/grading-table.tex --- old/doc/latex/exsheets/grading-table.tex 2012-12-20 01:32:28.000000000 +0100 +++ new/doc/latex/exsheets/grading-table.tex 2017-02-11 01:01:03.000000000 +0100 @@ -1,15 +1,42 @@ +% ---------------------------------------------------------------------------- +% the EXSHEETS package +% +% Yet another package for the creation of exercise sheets +% +% ---------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/exsheets +% E-Mail: contact(a)mychemistry.eu +% ---------------------------------------------------------------------------- +% Copyright 2011-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. +% ---------------------------------------------------------------------------- \documentclass{scrartcl} \usepackage{exsheets} \begin{document} -\begin{question}{3}\SetQuestionProperties{points=3} +\begin{question}{3} \end{question} -\begin{question}{5}\SetQuestionProperties{points=5} +\begin{question}{5} \end{question} -\begin{question}{10}\SetQuestionProperties{points=10} +\begin{question}{10} \end{question} -\begin{question}{8}\SetQuestionProperties{points=8} +\begin{question}{8} \end{question} \begin{tabular}{|l|*{\numberofquestions}{c|}c|}\hline @@ -18,4 +45,4 @@ Reached & \ForEachQuestion{\iflastquestion{}{&}} & \\ \hline \end{tabular} -\end{document} \ No newline at end of file +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exsheets.doc.tlpobj new/tlpkg/tlpobj/exsheets.doc.tlpobj --- old/tlpkg/tlpobj/exsheets.doc.tlpobj 2016-04-19 17:45:41.000000000 +0200 +++ new/tlpkg/tlpobj/exsheets.doc.tlpobj 2017-04-14 17:39:42.000000000 +0200 @@ -1,9 +1,9 @@ name exsheets.doc category Package -revision 40613 +revision 43188 shortdesc doc files of exsheets relocated 1 -docfiles size=202 +docfiles size=198 RELOC/doc/latex/exsheets/README RELOC/doc/latex/exsheets/exsheets_en.pdf RELOC/doc/latex/exsheets/exsheets_en.tex ++++++ exsheets.tar.xz ++++++ ++++ 1852 lines of diff (skipped) ++++++ exsol.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsol/README new/doc/latex/exsol/README --- old/doc/latex/exsol/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/exsol/README 2016-11-25 19:28:50.000000000 +0100 @@ -0,0 +1,44 @@ +************************************************************ +* * +* The exsol package * +* * +************************************************************ + Walter Daems + walter.daems(at)uantwerpen.be + +The package \exsol{} provides macros to allow +embedding exercises and solutions in the LaTeX source of an +instructional text (e.g., a book or a course text) while generating +the following separate documents: + - your original text that only contains the exercises, and + - a solution book that only contains the solutions to the + exercises (a package option exists to also copy the exercises + themselves to the solution book). + +The former is generated when running LaTeX on your document. This +run writes the solutions to a secondary file that can be included +into a simple document harness, such that when running LaTeX on +the latter, you can generate a nice solution book. + +The code of the exsol package was taken almost literally from +fancyvrb [http://www.ctan.org/pkg/fancyvrb]. +Therefore, all credits go to the authors/maintainers of fancyvrb. + +If you think + - there's an error in this package, + - there's a feature missing in this package, +please, don't hesitate to contact the author through e-mail +(walter.daems(a)uantwerpen.be). + +Do you like this class file? You're welcome to send beer, wine, or +just kind words. + +License +======= + + see file LICENSE + +History +======= + + see documentation (exsol.pdf) \ No newline at end of file Binary files old/doc/latex/exsol/example-formulacollection.pdf and new/doc/latex/exsol/example-formulacollection.pdf differ Binary files old/doc/latex/exsol/example-local.pdf and new/doc/latex/exsol/example-local.pdf differ Binary files old/doc/latex/exsol/example-solutionbook.pdf and new/doc/latex/exsol/example-solutionbook.pdf differ Binary files old/doc/latex/exsol/example.pdf and new/doc/latex/exsol/example.pdf differ Binary files old/doc/latex/exsol/exsol.pdf and new/doc/latex/exsol/exsol.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exsol.doc.tlpobj new/tlpkg/tlpobj/exsol.doc.tlpobj --- old/tlpkg/tlpobj/exsol.doc.tlpobj 2016-04-14 19:00:34.000000000 +0200 +++ new/tlpkg/tlpobj/exsol.doc.tlpobj 2017-04-14 17:39:42.000000000 +0200 @@ -1,8 +1,13 @@ name exsol.doc category Package -revision 35071 +revision 41377 shortdesc doc files of exsol relocated 1 -docfiles size=64 +docfiles size=169 RELOC/doc/latex/exsol/LICENSE + RELOC/doc/latex/exsol/README + RELOC/doc/latex/exsol/example-formulacollection.pdf + RELOC/doc/latex/exsol/example-local.pdf + RELOC/doc/latex/exsol/example-solutionbook.pdf + RELOC/doc/latex/exsol/example.pdf RELOC/doc/latex/exsol/exsol.pdf ++++++ exsol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsol/exsol.sty new/tex/latex/exsol/exsol.sty --- old/tex/latex/exsol/exsol.sty 2014-08-30 23:39:23.000000000 +0200 +++ new/tex/latex/exsol/exsol.sty 2016-11-25 19:33:47.000000000 +0100 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2014 by Walter Daems <walter.daems(a)ieee.org> +%% Copyright (C) 2015 by Walter Daems <walter.daems(a)uantwerpen.org> %% %% 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,10 +22,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{exsol} - [2014/08/31 v0.91 ExSol - Exercises and Solutions package (DMW)] + [2016/05/13 v1.2 ExSol - Exercises and Solutions package (DMW)] +\RequirePackage{ifmtarg} \RequirePackage{fancyvrb} \RequirePackage{ifthen} \RequirePackage{kvoptions} +\RequirePackage{multicol} +\DeclareBoolOption[false]{local} +\DeclareBoolOption[false]{nolabels} \DeclareStringOption[normalsize]{exercisesfontsize} \DeclareBoolOption[false]{exerciseaslist} \DeclareBoolOption[false]{copyexercisesinsolutions} @@ -33,9 +37,9 @@ \ProcessKeyvalOptions* \newcommand{\exercisesfontsize}{\csname \exsol@exercisesfontsize\endcsname} \newlength{\exsolexercisesaboveskip} -\setlength{\exsolexercisesaboveskip}{1ex plus 1pt minus 1pt} +\setlength{\exsolexercisesaboveskip}{0ex plus 1pt minus 1pt} \newlength{\exsolexercisesbelowskip} -\setlength{\exsolexercisesbelowskip}{1ex plus 1pt minus 1pt} +\setlength{\exsolexercisesbelowskip}{0ex plus 1pt minus 1pt} \newlength{\exsolexercisetopbottomsep} \setlength{\exsolexercisetopbottomsep}{0pt plus 0pt minus 1pt} \newlength{\exsolexerciseleftmargin} @@ -53,25 +57,44 @@ \newlength{\exsolexerciseparsep} \setlength{\exsolexerciseparsep}{\parskip} \AtBeginDocument{ + \typeout{Writing solutions to solution file \jobname.sol.tex} \newwrite\solutionstream \immediate\openout\solutionstream=\jobname.sol.tex + \typeout{Using intermediate exercise file \jobname.exc.tex} \newwrite\exercisestream + \typeout{Writing formulae to formula collection file \jobname.fc.tex} + \newwrite\formulacollectionstream + \immediate\openout\formulacollectionstream=\jobname.fc.tex + \typeout{Using intermediate formula file \jobname.for.tex} + \newwrite\formulastream } \AtEndDocument{ + \immediate\closeout\formulacollectionstream \immediate\closeout\solutionstream } -\newcounter{exercise}[subsection] +\newcommand\loadSolutions{ + \immediate\closeout\solutionstream + \input{\jobname.sol.tex} +} +\newcounter{exerciseseries}[subsubsection] +\setcounter{exerciseseries}{0} +\renewcommand{\theexerciseseries}{\arabic{exerciseseries}} +\newcounter{exercise}[exerciseseries] \setcounter{exercise}{0} \renewcommand{\theexercise}{% + \ifexsol@local + \arabic{exerciseseries}.\arabic{exercise}% + \else \@ifundefined{c@chapter}{}{\if0\arabic{chapter}\else\arabic{chapter}.\fi}% \if0\arabic{section}\else\arabic{section}\fi% \if0\arabic{subsection}\else.\arabic{subsection}\fi% \if0\arabic{subsubsection}\else.\arabic{subsubsection}\fi% \if0\arabic{exercise}\else% - \@ifundefined{c@chapter}% - {\if0\arabic{section}\else-\fi}% - {-}% - \arabic{exercise}% + \@ifundefined{c@chapter}% + {\if0\arabic{section}\else-\fi}% + {-}% + \arabic{exercise}% + \fi \fi } \newcommand{\GPES@write@detok}[1]{% @@ -81,18 +104,24 @@ \newcommand{\GPESS@write@detok}[1]{% \GPES@write@detok{#1}% \GPSS@write@detok{#1}}% +\newcommand{\GPFORCOL@write@detok}[1]{% + \immediate\write\formulacollectionstream{\detokenize{#1}}% + \immediate\write\formulastream{\detokenize{#1}}}% +\newcommand{\GPFORCOLONLY@write@detok}[1]{% + \immediate\write\formulacollectionstream{\detokenize{#1}}}% \def\exercise{\FV@Environment{}{exercise}} \def\FVB@exercise{% \refstepcounter{exercise}% \immediate\openout\exercisestream=\jobname.exc.tex - \ifexsol@copyexercisesinsolutions - \typeout{Writing exercise to \jobname.sol.tex} - \immediate\write\solutionstream{\string\par---\string\newline - \string\textbf\string{\exercisename{} \theexercise \string}} + \ifexsol@local \else - \immediate\write\solutionstream{\string\par---\string\newline} \fi - \immediate\write\exercisestream{\string\begin{exsol@exercise}} + \ifexsol@copyexercisesinsolutions + % WDSC tofix + % \typeout{Writing exercise to \jobname.sol.tex} + \immediate\write\solutionstream{\string\begin{exsol@exercise}{\theexercise}} + \fi + \immediate\write\exercisestream{\string\begin{exsol@exercise}{\theexercise}} \@bsphack \begingroup \FV@UseKeyValues @@ -113,13 +142,13 @@ \endgroup\@esphack \immediate\write\exercisestream{\string\end{exsol@exercise}} \ifexsol@copyexercisesinsolutions - \immediate\write\solutionstream{\string~\string\newline} + \immediate\write\solutionstream{\string\end{exsol@exercise}} \fi \immediate\closeout\exercisestream \input{\jobname.exc.tex} } \DefineVerbatimEnvironment{exercise}{exercise}{} -\newenvironment{exsol@exercise}[0] +\newenvironment{exsol@exercise}[1] {% \ifthenelse{\boolean{exsol@minipage}}{\begin{minipage}[t]{\textwidth}}{}% \ifthenelse{\boolean{exsol@exerciseaslist}} @@ -135,9 +164,11 @@ \setlength{\parsep}{\exsolexerciseparsep} \setlength{\labelsep}{\exsolexerciselabelsep} \setlength{\labelwidth}{\exsolexerciselabelwidth}} - \item[\textit{~\exercisename{} \theexercise:~}] + \item[\ifexsol@nolabels~#1:\else% + \subparagraph{\exercisename{}~#1:}\fi] }% - {\textit{\exercisename{} \theexercise:}} + {\ifexsol@nolabels #1:\else% + \subparagraph{\exercisename{}~#1:}\fi} } {% \ifthenelse{\boolean{exsol@exerciseaslist}}% @@ -146,13 +177,11 @@ } \def\solution{\FV@Environment{}{solution}} \def\FVB@solution{% - \typeout{Writing solution to \jobname.sol.tex} - \immediate\write\solutionstream{\string\textbf\string{\solutionname{}\string}} + %\typeout{Writing solution to \jobname.sol.tex} \ifexsol@copyexercisesinsolutions - \immediate\write\solutionstream{\string\newline} + \immediate\write\solutionstream{\string\begin{exsol@solution}{}} \else - \immediate\write\solutionstream{\string\textbf\string{\theexercise\string}% - \string\newline} + \immediate\write\solutionstream{\string\begin{exsol@solution}{\theexercise}} \fi \@bsphack \begingroup @@ -166,44 +195,187 @@ \let\@noligs\relax \FV@Scan } -\def\FVE@solution{\endgroup\@esphack} +\def\FVE@solution{ + \endgroup\@esphack + \immediate\write\solutionstream{\string\end{exsol@solution}} +} \DefineVerbatimEnvironment{solution}{solution}{} -\newenvironment{exercises} -{\par\exercisesfontsize\rule{.25\linewidth}{0.15mm}\vspace*{\exsolexercisesaboveskip}\\*% - \textbf{\normalsize \exercisesname}} -{\vspace*{-\baselineskip}\vspace*{\exsolexercisesbelowskip}\rule{.25\linewidth}{0.15mm}\par} +\newenvironment{exsol@solution}[1] +{% + \ifthenelse{\boolean{exsol@minipage}}{\begin{minipage}[t]{\textwidth}}{}% + \ifthenelse{\boolean{exsol@exerciseaslist}} + {\begin{list}% + {% + }% + {% + \setlength{\topsep}{\exsolexercisetopbottomsep}% + \setlength{\leftmargin}{\exsolexerciseleftmargin}% + \setlength{\rightmargin}{\exsolexerciserightmargin}% + \setlength{\listparindent}{\exsolexerciseparindent}% + \setlength{\itemindent}{\exsolexerciseitemindent}% + \setlength{\parsep}{\exsolexerciseparsep} + \setlength{\labelsep}{\exsolexerciselabelsep} + \setlength{\labelwidth}{\exsolexerciselabelwidth}} + \item[\ifexsol@nolabels #1:\else% + \subparagraph{\solutionname{}\@ifmtarg{#1}{}{~}#1:}\fi] + }% + {\ifexsol@nolabels #1:\else% + \subparagraph{\solutionname{}\@ifmtarg{#1}{}{~}#1:}\fi} + } + {% + \ifthenelse{\boolean{exsol@exerciseaslist}}% + {\end{list}}{}% + \ifthenelse{\boolean{exsol@minipage}}{\end{minipage}}{\par}% +} +\define@key{exercises}{columns}{\renewcommand\columncount{#1}} +\define@key{exercises}{exsubrule}{\renewcommand\exsubrule{#1}} +\define@key{exercises}{solsubrule}{\renewcommand\solsubrule{#1}} +\define@key{exercises}{subrule}{\renewcommand\exsubrule{#1}\renewcommand\solsubrule{#1}} +\newenvironment{exercises}[1][] +{ + \newcommand\columncount{1} % default + \newcommand\exsubrule{} % default + \newcommand\solsubrule{} % default + \setkeys{exercises}{#1} + \par\exercisesfontsize\rule{.25\linewidth}{0.15mm}% + \vspace*{\exsolexercisesaboveskip}% + \paragraph{\exercisesname}~\par + \ifthenelse{\columncount > 1}{\begin{multicols}{\columncount}}{} + } + { + \ifthenelse{\columncount > 1}{\end{multicols}}{}\relax + \vspace*{-\baselineskip}\vspace*{\exsolexercisesbelowskip}% + %\rule{.25\linewidth}{0.15mm} + \exsubrule\par} +\define@key{exerciseseries}{columns}{\renewcommand\columncount{#1}} +\define@key{exerciseseries}{exsubrule}{\renewcommand\exsubrule{#1}} +\define@key{exerciseseries}{solsubrule}{\renewcommand\solsubrule{#1}} +\define@key{exerciseseries}{subrule}{\renewcommand\exsubrule{#1}\renewcommand\solsubrule{#1}} +\newenvironment{exerciseseries}[2][] +{ + \refstepcounter{exerciseseries}% + \newcommand\columncount{1} % default + \newcommand\exsubrule{} % default + \newcommand\solsubrule{} % default + \setkeys{exerciseseries}{#1} + \paragraph{\seriesname~\theexerciseseries:~#2}~\par + \ifthenelse{\columncount > 1}{\begin{multicols}{\columncount}}{} + \immediate\write\solutionstream{\string\begin\string{solutionseries\string}% + \string[#1\string]\string{#2\string}\string{\theexerciseseries\string}} + } + { + \ifthenelse{\columncount > 1}{\end{multicols}}{}\relax + \exsubrule\par + \immediate\write\solutionstream{\string\end\string{solutionseries\string}} +} +\newenvironment{solutionseries}[3][] +{ + \newcommand\columncount{1} % default + \newcommand\exsubrule{} % default + \newcommand\solsubrule{} % default + \setkeys{exercises}{#1} + \paragraph{\seriesname~#3}~\par + \ifthenelse{\columncount > 1}{\begin{multicols}{\columncount}}{} + } + { + \ifthenelse{\columncount > 1}{\end{multicols}}{} + \solsubrule\par +} +\def\informulacollection{\FV@Environment{}{informulacollection}} +\def\FVB@informulacollection{% + \immediate\openout\formulastream=\jobname.for.tex + %\typeout{Writing formula to \jobname.for.tex and \jobname.fc.tex} + \@bsphack + \begingroup + \FV@UseKeyValues + \FV@DefineWhiteSpace + \def\FV@Space{\space}% + \FV@DefineTabOut + \let\FV@ProcessLine\GPFORCOL@write@detok % + \relax + \let\FV@FontScanPrep\relax + \let\@noligs\relax + \FV@Scan + } +\def\FVE@informulacollection{ + \endgroup\@esphack + \immediate\closeout\formulastream + \input{\jobname.for.tex} +} +\DefineVerbatimEnvironment{informulacollection}{informulacollection}{} +\def\informulacollectiononly{\FV@Environment{}{informulacollectiononly}} +\def\FVB@informulacollectiononly{% + %\typeout{Writing special to \jobname.fc.tex} + \@bsphack + \begingroup + \FV@UseKeyValues + \FV@DefineWhiteSpace + \def\FV@Space{\space}% + \FV@DefineTabOut + \let\FV@ProcessLine\GPFORCOLONLY@write@detok % + \relax + \let\FV@FontScanPrep\relax + \let\@noligs\relax + \FV@Scan + } +\def\FVE@informulacollectiononly{ + \endgroup\@esphack +} +\DefineVerbatimEnvironment{informulacollectiononly}{informulacollectiononly}{} \newcommand{\exercisename}{Exercise} \newcommand{\exercisesname}{Exercises} \newcommand{\solutionname}{Solution} \newcommand{\solutionsname}{Solutions} +\newcommand{\seriesname}{Series} \addto\captionsdutch{% \renewcommand{\exercisename}{Oefening}% \renewcommand{\exercisesname}{Oefeningen}% \renewcommand{\solutionname}{Oplossing}% \renewcommand{\solutionsname}{Oplossingen}% + \renewcommand{\seriesname}{Reeks}% } \addto\captionsgerman{% \renewcommand{\exercisename}{Aufgabe}% \renewcommand{\exercisesname}{Aufgaben}% \renewcommand{\solutionname}{L\"osung}% \renewcommand{\solutionsname}{L\"osungen}% + \renewcommand{\seriesname}{Serie}% +} +\addto\captionsngerman{% + \renewcommand{\exercisename}{Aufgabe}% + \renewcommand{\exercisesname}{Aufgaben}% + \renewcommand{\solutionname}{L\"osung}% + \renewcommand{\solutionsname}{L\"osungen}% + \renewcommand{\seriesname}{Serie}% } \addto\captionsfrench{% \renewcommand{\exercisename}{Exercice}% \renewcommand{\exercisesname}{Exercices}% \renewcommand{\solutionname}{Solution}% \renewcommand{\solutionsname}{Solutions}% + \renewcommand{\seriesname}{Serie}% } \addto\captionsfinnish{ \renewcommand{\exercisename}{Teht\"av\"a}% \renewcommand{\exercisesname}{Teht\"avi\"a}% \renewcommand{\solutionname}{Ratkaisu}% \renewcommand{\solutionsname}{Ratkaisut}% + \renewcommand{\seriesname}{Sarja} +} +\addto\captionsspanish{% + \renewcommand{\exercisename}{Ejercicio}% + \renewcommand{\exercisesname}{Ejercicios}% + \renewcommand{\solutionname}{Soluci\'on}% + \renewcommand{\solutionsname}{Soluciones}% + \renewcommand{\seriesname}{Serie}% } +\ifexsol@local +\else \let\exsol@@makechapterhead\@makechapterhead \def\@makechapterhead#1{% - \immediate\write\solutionstream{\string\chapter{#1}}% \exsol@@makechapterhead{#1} + \immediate\write\solutionstream{\string\setcounter{chapter}{\arabic{chapter}}% + \string\chapter{#1}}% } \ifdefined\frontmatter \let\exsol@@frontmatter\frontmatter @@ -226,6 +398,14 @@ \exsol@@backmatter } \fi +\ifdefined\appendix + \let\exsol@@appendix\appendix + \def\appendix{% + \immediate\write\solutionstream{\string\appendix}% + \exsol@@appendix + } +\fi +\fi \newcommand{\noexercisesinchapter} { \immediate\write\solutionstream{No exercises in this chapter} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exsol.tlpobj new/tlpkg/tlpobj/exsol.tlpobj --- old/tlpkg/tlpobj/exsol.tlpobj 2016-04-14 19:00:34.000000000 +0200 +++ new/tlpkg/tlpobj/exsol.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -1,25 +1,24 @@ name exsol category Package -revision 35071 +revision 41377 shortdesc Exercises and solutions from the same source, into a book relocated 1 -longdesc The packageThe exsol package provides macros to allow for -longdesc embedding exercises and solutions in the LaTeX source of an -longdesc instructional text (e.g., a book or a course text) while -longdesc generating the following separate documents: your original text -longdesc that only contains the exercises, and a solution book that -longdesc contains only the solutions to the exercises (optionally, the -longdesc exercises themselves are also copied to the solution book). The -longdesc exercise data are generated when running LaTeX on your -longdesc document; the first run also writes the solutions to a -longdesc secondary file that may be included in a simple document -longdesc harness, may be processed by LaTeX, to generate a nice solution -longdesc book. The code of the package was derived (in large part) from -longdesc fancyvrb. -runfiles size=2 +longdesc This package provides macros to allow for embedding exercises +longdesc and solutions in the LaTeX source of an instructional text +longdesc (e.g., a book or a course text) while generating the following +longdesc separate documents: your original text that only contains the +longdesc exercises, and a solution book that contains only the solutions +longdesc to the exercises (optionally, the exercises themselves can also +longdesc be copied to the solution book). The exercise data are +longdesc generated when running LaTeX on your document; the first run +longdesc also writes the solutions to a secondary file that may be +longdesc included in a simple document harness, may be processed by +longdesc LaTeX, to generate a nice solution book. The code of the +longdesc package was derived (in large part) from fancyvrb. +runfiles size=4 RELOC/tex/latex/exsol/exsol.sty catalogue-ctan /macros/latex/contrib/exsol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics exercise -catalogue-version 0.91 +catalogue-version 1.2 ++++++ extarrows.doc.tar.xz ++++++ ++++++ extarrows.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extarrows.tlpobj new/tlpkg/tlpobj/extarrows.tlpobj --- old/tlpkg/tlpobj/extarrows.tlpobj 2016-04-14 19:00:34.000000000 +0200 +++ new/tlpkg/tlpobj/extarrows.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/extarrows/extarrows.sty catalogue-ctan /macros/latex/contrib/extarrows -catalogue-date 2015-08-17 17:40:16 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics maths catalogue-version 1.0b ++++++ exteps.doc.tar.xz ++++++ ++++++ exteps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exteps.tlpobj new/tlpkg/tlpobj/exteps.tlpobj --- old/tlpkg/tlpobj/exteps.tlpobj 2016-04-14 19:00:34.000000000 +0200 +++ new/tlpkg/tlpobj/exteps.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/metapost/exteps/exteps.mp catalogue-ctan /graphics/metapost/contrib/macros/exteps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-prep catalogue-version 0.41 ++++++ extpfeil.doc.tar.xz ++++++ ++++++ extpfeil.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extpfeil.tlpobj new/tlpkg/tlpobj/extpfeil.tlpobj --- old/tlpkg/tlpobj/extpfeil.tlpobj 2016-04-14 19:00:34.000000000 +0200 +++ new/tlpkg/tlpobj/extpfeil.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/extpfeil/extpfeil.sty catalogue-ctan /macros/latex/contrib/extpfeil -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 catalogue-version 0.4 ++++++ extract.doc.tar.xz ++++++ ++++++ extract.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extract.tlpobj new/tlpkg/tlpobj/extract.tlpobj --- old/tlpkg/tlpobj/extract.tlpobj 2016-04-14 19:00:35.000000000 +0200 +++ new/tlpkg/tlpobj/extract.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -20,7 +20,7 @@ runfiles size=4 RELOC/tex/latex/extract/extract.sty catalogue-ctan /macros/latex/contrib/extract -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics editorial catalogue-version 1.8 ++++++ extsizes.doc.tar.xz ++++++ ++++++ extsizes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extsizes.tlpobj new/tlpkg/tlpobj/extsizes.tlpobj --- old/tlpkg/tlpobj/extsizes.tlpobj 2016-04-14 19:00:35.000000000 +0200 +++ new/tlpkg/tlpobj/extsizes.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/latex/extsizes/size8.clo RELOC/tex/latex/extsizes/size9.clo catalogue-ctan /macros/latex/contrib/extsizes -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.4a ++++++ facsimile.doc.tar.xz ++++++ ++++++ facsimile.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/facsimile.tlpobj new/tlpkg/tlpobj/facsimile.tlpobj --- old/tlpkg/tlpobj/facsimile.tlpobj 2016-04-14 19:00:35.000000000 +0200 +++ new/tlpkg/tlpobj/facsimile.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/facsimile/fac-en.cfg RELOC/tex/latex/facsimile/facsimile.cls catalogue-ctan /macros/latex/contrib/facsimile -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter class catalogue-version 1.0 ++++++ factura.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/README new/doc/latex/factura/README --- old/doc/latex/factura/README 2016-03-08 00:21:11.000000000 +0100 +++ new/doc/latex/factura/README 2017-03-12 01:01:04.000000000 +0100 @@ -13,7 +13,7 @@ La clase de LaTeX 'factura' estÃ¡ diseÃ±ada para su uso en la RepÃºblica Bolivariana de Venezuela, conforme a los requerimientos fijados por las -providencias del SENIAT, vÃ¡lidas para marzo del aÃ±o 2016. +providencias del SENIAT, vÃ¡lidas para la fecha de este paquete. Con la clase 'factura' se pueden elaborar facturas en formas libres fiscales, se pueden elaborar cotizaciones y reportes de servicios. @@ -31,6 +31,12 @@ $ pdflatex factura-ejemplo-membrete.tex $ xelatex factura-ejemplo-firma.tex $ pdflatex factura-ejemplo-prefactura.tex +$ pdflatex factura-ejemplo-cotizacion.tex +$ pdflatex factura-ejemplo-factura1.tex +... hasta el Ãºltimo +$ pdflatex factura-ejemplo-reporte1.tex +... hasta el Ãºltimo +$ pdflatex factura-beispiel-rechnung.tex $ pdflatex factura.dtx Los Ãndices y la lista de cambios se generan automÃ¡ticamente al compilar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-beispiel-rechnung.tex new/doc/latex/factura/factura-beispiel-rechnung.tex --- old/doc/latex/factura/factura-beispiel-rechnung.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-beispiel-rechnung.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `beispiel') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,7 +35,9 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Adaptado a otra legislaciÃ³n. +%%</desc> %% \documentclass[ prefactura, @@ -47,46 +49,46 @@ \usepackage[ngerman]{babel} \usepackage[T1]{fontenc} - \def\Moneda{\euro{}} +\def\Moneda{\euro{}} \makeatletter - \def\(a)AlicuotaG{0.19} - \def\(a)AlicuotaR{0.07} - \def\@DenomAlicuotaG{A} - \def\@DenomAlicuotaR{C} - \def\@DenomAlicuotaE{B} - \def\@@Datos{Kundenidentifikation} - \def\@@Resumen{Zusammenfassung} - \def\@@Fecha{Datum:} - \def\@@Nombre{Kunde:} \def\@@RazonSocial{Kunde:} - \def\@@RIF{USt-IdNr:} \def\@@CT{USt-IdNr:} - \def\@@Contacto{Kontactperson:} - \def\@@Direccion{Adresse:} - \def\@@Telefono{Telefon:} - \def\@@Email{E-mail:} - \def\@@Cliente{Kunde:} - \def\@@Proveedor{Lieferant:} - \def\@@Cantidad{Menge} - \def\@@Descripcion{Beschreibung} - \def\@@PrecioU{Einzelpreis} - \def\@@PrecioT{Gesamt} - \def\@@Precio{Preis} - \def\@@AlicuotaG{MwSt A} - \def\@@AlicuotaR{MwSt C} - \def\@@BIG{Netto 19\%} - \def\@@BIR{Netto 7\%} - \def\@@BIE{Mwst-befreit} - \def\@@Total{Brutto}% Zu zahlen / Brutto / Summe / Gesamt - \def\@@Conforme{der Kunde} - \def\@@DenomFactura{Rechnung} - \def\@@DenomCotiza{Voranschlag} - % \LetraNumeracion{\fontsize{14}{14}\bfseries} - \renewcommand{\@EstiloDenom}{\@LetraDenom\@Denominacion-\if@sinnumero\else\@LetraNumeracion Nr:\space\@Num\fi} - \renewcommand{\@EstiloNumControl}{} +\def\(a)AlicuotaG{0.19} +\def\(a)AlicuotaR{0.07} +\def\@DenomAlicuotaG{A} +\def\@DenomAlicuotaR{C} +\def\@DenomAlicuotaE{B} +\def\@@Datos{Kundenidentifikation} +\def\@@Resumen{Zusammenfassung} +\def\@@Fecha{Datum:} +\def\@@Nombre{Kunde:} \def\@@RazonSocial{Kunde:} +\def\@@RIF{USt-IdNr:} \def\@@CT{USt-IdNr:} +\def\@@Contacto{Kontactperson:} +\def\@@Direccion{Adresse:} +\def\@@Telefono{Telefon:} +\def\@@Email{E-mail:} +\def\@@Cliente{Kunde:} +\def\@@Proveedor{Lieferant:} +\def\@@Cantidad{Menge} +\def\@@Descripcion{Beschreibung} +\def\@@PrecioU{Einzelpreis} +\def\@@PrecioT{Gesamt} +\def\@@Precio{Preis} +\def\@@AlicuotaG{MwSt A} +\def\@@AlicuotaR{MwSt C} +\def\@@BIG{Netto 19\%} +\def\@@BIR{Netto 7\%} +\def\@@BIE{Mwst-befreit} +\def\@@Total{Brutto}% Zu zahlen / Brutto / Summe / Gesamt +\def\@@Conforme{der Kunde} +\def\@@DenomFactura{Rechnung} +\def\@@DenomCotiza{Voranschlag} +% \LetraNumeracion{\fontsize{14}{14}\bfseries} +\renewcommand{\@EstiloDenom}{\@LetraDenom\@Denominacion-\if@sinnumero\else\@LetraNumeracion Nr:\space\@Num\fi} +\renewcommand{\@EstiloNumControl}{} \makeatother \FondoFactura{factura-ejemplo-fondo} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \Nombre{Jacinto de Ayala y San Vicente} \CI{V-987.654.321} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-cotizacion.tex new/doc/latex/factura/factura-ejemplo-cotizacion.tex --- old/doc/latex/factura/factura-ejemplo-cotizacion.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-cotizacion.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `cotiza') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,16 +35,20 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una cotizaciÃ³n (cotizacion), -%% Escribe la denominaciÃ³n ("COTIZACIÃN") pero sin nÃºmero (sinnumero), +%% Escribe la denominaciÃ³n (âCOTIZACIÃNâ) pero sin nÃºmero (sinnumero), +%% No totaliza, para que el cliente tenga un presupuesto por distintos Ãtems que luego elegirÃ¡ entre ellos, es decir, una lista de precios. (sintotales), %% Con el fondo de la imprenta agregado (\FondoFactura), %% Agregando la firma escaneada en la factura, es decir, en la cotizaciÃ³n (\FirmaFactura), %% Sin resumen, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ cotizacion, sinnumero, % sin esta opciÃ³n aparecerÃ¡ el nÃºmero de la cotizaciÃ³n. +sintotales, % dosfirmas, % para poner las dos firmas % sinfirmas, % para no poner firmas ]{factura} @@ -55,7 +59,7 @@ \FirmaFactura{\includegraphics[width=5cm]{factura-ejemplo-firma.pdf}}[0pt][21pt] % \Denom{PRESUPUESTO} % TambiÃ©n podemos cambiar el nombre del documento -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} @@ -69,6 +73,8 @@ \begin{factura} \Item{1}{Ãtem con IVA general}{1000} + \Item{1}{otro Ãtem con IVA general}{1100} + \Item{1}{otro Ãtem mÃ¡s con IVA general}{1200} \end{factura} \Descripcion{DescripciÃ³n larga del servicio} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura1.tex new/doc/latex/factura/factura-ejemplo-factura1.tex --- old/doc/latex/factura/factura-ejemplo-factura1.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura1.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factuno') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,16 +35,18 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Todo con los valores por omisiÃ³n, %% Con resumen (\Resumen), %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass{factura} \usepackage[utf8]{inputenc} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} \Contacto{Jacinto de Ayala} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura2.tex new/doc/latex/factura/factura-ejemplo-factura2.tex --- old/doc/latex/factura/factura-ejemplo-factura2.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura2.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factdos') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,37 +35,45 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, +%% Con la columna para enumerar los Ãtems (numitem), %% Con descuentos individuales (descuentos), %% Primero la descripciÃ³n, luego la cantidad, luego el precio unitario (dcu), %% Sin lÃneas verticales externas (sinlineasve), +%% Centra la descripciÃ³n en los elementos en la factura (centradesc), %% SÃ³lo la firma del emisor (unafirma), %% Alterando la separaciÃ³n mÃnima vertical entre los elementos (\SepElementos), %% Alterando la separaciÃ³n horizontal en el encabezado y la distancia desde el contorno hasta el texto (\SepEncabez), +%% Agregando una separaciÃ³n extra entre los Ãtems en la factura (\SepItemsExtra), %% Alterando la la distancia desde el contorno hasta el texto en la descripciÃ³n (\SepDescrip), %% Alterando la lÃnea de la descripciÃ³n, la curvatura en la esquina y la sombra (\LineaDescrip), -%% Usando \Nombre y \CI en lugar de \RazonSocial y \RIF, +%% Usando â\Nombreâ y â\CIâ en lugar de â\RazonSocialâ y â\RIFâ, %% Con resumen (\Resumen), %% Agregando un Ãtem sin precio (\ItemX), %% Con artÃculos gravados con todos los IVA, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ +numitem, descuentos, dcu, sinlineasve, % sinlineasv, % sin ninguna lÃnea vertical +centradesc, unafirma, ]{factura} \usepackage[utf8]{inputenc} -\SepElementos{1cm} +\SepElementos{0.75cm} \SepEncabez{1cm}{16pt} +\SepItemsExtra{8pt} \SepDescrip{16pt} \LineaDescrip{1pt}{20pt}{3pt} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Nombre{Jacinto de Ayala y San Vicente} \CI{V-987.654.321} \Direccion{Av. Ayala, GalpÃ³n San Vicente, Sector Arauca, Apure, Venezuela} @@ -80,7 +88,7 @@ \Item{1}{Ãtem con IVA general, con descuento}{1000}{8} \ItemR{1}{Ãtem con IVA reducido, con descuento}{1000}{5} \ItemA{1}{Ãtem con IVA adicional, con descuento}{1000}{10} - \ItemE{1}{Ãtem exento de impuesto, con descuento}{1000}{8} + \ItemE{1}{Ãtem exento de impuesto, con descuento}{1000} \ItemX{1}{lÃnea sin precio} \end{factura} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura3.tex new/doc/latex/factura/factura-ejemplo-factura3.tex --- old/doc/latex/factura/factura-ejemplo-factura3.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura3.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `facttres') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Agrupados los totales por gravÃ¡menes (agrupado), %% Sin lÃneas verticales internas (sinlineasvi), @@ -50,6 +51,7 @@ %% Sin resumen, %% Con artÃculos gravados con todos los IVA, %% Sin descripciÃ³n larga. +%%</desc> %% \documentclass[ agrupado, @@ -64,11 +66,11 @@ \usepackage[utf8]{inputenc} -\SepElementos{1cm} +\SepElementos{0.75cm} \SepEncabez{1cm}{16pt} \LineaEncabez{1pt}{20pt}{3pt} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} \Contacto{Jacinto de Ayala} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura4.tex new/doc/latex/factura/factura-ejemplo-factura4.tex --- old/doc/latex/factura/factura-ejemplo-factura4.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura4.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factcuatro') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,23 +35,28 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% TotalizaciÃ³n en modo de filas (filas), +%% Centrados los totales en el modo de filas (centrado), %% Primero la descripciÃ³n, luego el precio unitario, luego la cantidad (duc), %% Sin lÃneas verticales internas (sinlineasvi), %% Sin lÃneas horizontales internas (sinlineashi), %% Expande el cuadro de la factura con espacio en blanco (exparriba), %% Sin condiciones del documento (sincondiciones), +%% Agregando una separaciÃ³n extra entre los Ãtems en la factura (\SepItemsExtra), %% Cambiando varias de las tipografÃas (\Letra...), -%% Usando \Nombre y \CI en lugar de \RazonSocial y \RIF, +%% Usando â\Nombreâ y â\CIâ en lugar de â\RazonSocialâ y â\RIFâ, %% Sin especificar la persona de contacto, %% Sin especificar el e-mail del cliente, %% Sin resumen, %% Agregando un Ãtem sin precio (\ItemX), %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ filas, +centrado, duc, sinlineasvi, % sinlineasv, % sin ninguna lÃnea vertical @@ -63,12 +68,13 @@ \usepackage[utf8]{inputenc} +\SepItemsExtra{8pt} \LetraDescripcion{\fontsize{20}{30}} \LetraTitEnc{\fontsize{15}{20}\bfseries} \LetraFirmas{\fontsize{16}{20}\itshape} \LetraCondiciones{\fontsize{18}{28}\bfseries} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Nombre{Jacinto de Ayala y San Vicente} \CI{V-987.654.321} \Direccion{Av. Ayala, GalpÃ³n San Vicente, Sector Arauca, Apure, Venezuela} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura5.tex new/doc/latex/factura/factura-ejemplo-factura5.tex --- old/doc/latex/factura/factura-ejemplo-factura5.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura5.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factcinco') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,12 +35,12 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Escribimos factura y reporte, pero sÃ³lo producimos la factura, %% Cuadro de la factura sin la columna de cantidades (sincantidad), %% TotalizaciÃ³n en modo de filas (filas), -%% Centrados los totales en el modo de filas (centrado), -%% Escribe la denominaciÃ³n ("FACTURA") y el nÃºmero (denom), +%% Escribe la denominaciÃ³n (âFACTURAâ) y el nÃºmero (denom), %% Separado cada Ãtem con una lÃnea horizontal (conlineasha), %% Sin expandir el cuadro de la factura ni la descripciÃ³n (sinexpandir), %% Obligando a especificar todos los IVA asÃ no existan productos gravados con ellos (todosiva), @@ -49,11 +49,11 @@ %% Con resumen (\Resumen), %% Agregando un Ãtem sin precio (\ItemX), %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ sincantidad, filas, -centrado, denom, conlineasha, sinexpandir, @@ -62,7 +62,7 @@ \usepackage[utf8]{inputenc} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura6.tex new/doc/latex/factura/factura-ejemplo-factura6.tex --- old/doc/latex/factura/factura-ejemplo-factura6.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura6.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factseis') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,10 +35,13 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, -%% Escribe la denominaciÃ³n ("FACTURA") y el nÃºmero (denom), +%% Con la columna para enumerar los Ãtems (numitem), +%% Escribe la denominaciÃ³n (âFACTURAâ) y el nÃºmero (denom), %% Sin lÃneas verticales externas (sinlineasve), %% Sin lÃneas horizontales externas (sinlineashe), +%% Escribimos un Ãtem cuya descripciÃ³n ocupa mÃ¡s que una lÃnea, %% Obligando a especificar todos los IVA asÃ no existan productos gravados con ellos (todosiva), %% Especificando 'G' en los Ãtems gravados con IVA general (G), %% Escribe un archivo CSV con la informaciÃ³n numÃ©rica de la factura (csv), @@ -46,8 +49,10 @@ %% Especificando el nombre de quien firma la copia de la factura como recibida (\Conforme), %% Con etiquetas y referencias, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ +numitem, denom, sinlineasve, % sinlineasv, % sin ninguna lÃnea vertical @@ -61,11 +66,11 @@ \usepackage[utf8]{inputenc} \makeatletter - \renewcommand{\@@Fecha}{\slshape FECHA DE EMISIÃN:} + \renewcommand{\@@Fecha}{\slshape FECHA:} \renewcommand{\@EstiloFecha}{\@LetraFecha\bfseries\@@Fecha\space{\color{blue}\@Fecha}} \makeatother -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} @@ -80,12 +85,13 @@ \begin{factura} \Item{2}{Ãtem con IVA general}{1000}\label{primeritem} + \Item{10}{otro Ãtem con IVA general -descripciÃ³n larga para mostrar el cambio de lÃnea-}{1000} \end{factura} \Descripcion{DescripciÃ³n larga del servicio. - Se facturaron \cantref{primeritem} \descref{primeritem} por un valor de \Moneda\puref{primeritem} cada uno, dando un total de \Moneda\ptref{primeritem}. El IVA es de \Moneda\AlicuotaG, y el total final es \Moneda\Total. - % TambiÃ©n podemos usar \itemref{primeritem}, \dctoref{primeritem}, y en cuanto a las totalizaciones: \BIE, \BIR, \BIA, \AlicuotaR, \AlicuotaA, \SubtG, \SubtE, \SubtR, \SubtA, \DescG, \DescE, \DescR, \DescA para los demÃ¡s totales. + En el artÃculo nÃºmero \itemref{primeritem} se facturaron \cantref{primeritem} \descref{primeritem} por un valor de \Moneda\puref{primeritem} cada uno, el descuento porcentual de ese artÃculo es \dctoref{primeritem}, dando un total de \Moneda\ptref{primeritem}. El IVA de este Ãtem es de \Moneda\numprint\AlicuotaG; luego se facturÃ³ otro artÃculo mÃ¡s, dando un total final de \Moneda\numprint\Total. + % TambiÃ©n podemos usar \dctoref{primeritem} para la referencia al descuento, y en cuanto a las totalizaciones: \BIE, \BIR, \BIA, \AlicuotaR, \AlicuotaA, \SubtG, \SubtE, \SubtR, \SubtA, \DescG, \DescE, \DescR, \DescA para los demÃ¡s totales. } \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura7.tex new/doc/latex/factura/factura-ejemplo-factura7.tex --- old/doc/latex/factura/factura-ejemplo-factura7.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura7.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factsiete') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,8 +35,11 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% TotalizaciÃ³n en modo de filas (filas), +%% Escribimos un Ãtem cuya descripciÃ³n ocupa mÃ¡s que una lÃnea, +%% Cuando la descripciÃ³n de un Ãtem ocupa mÃ¡s que una lÃnea, no pone el carÃ¡cter que indica continuaciÃ³n en la siguiente lÃnea ni los caracteres en las columnas vacÃas (sinmarcas), %% Obligando a especificar todos los IVA asÃ no existan productos gravados con ellos (todosiva), %% Cambiando la geometrÃa del papel de la factura (\GeometriaFactura), %% Alterando la separaciÃ³n mÃnima vertical entre los elementos (\SepElementos), @@ -48,16 +51,18 @@ %% Alterando la longitud de las lÃneas para firmar y su grosor (\LineaFirmas), %% Alterando la posiciÃ³n de la fecha, las firmas y de la denominaciÃ³n del documento (\PosFecha, \PosFirmas y \PosDenom), %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ filas, +sinmarcas, todosiva, ]{factura} \usepackage[utf8]{inputenc} \GeometriaFactura{legalpaper,vmargin={5cm,5.5cm},hmargin={1cm,1cm},footskip=0pt,headsep=0pt,headheight=0pt} -\SepElementos{1cm} +\SepElementos{0.75cm} \SepEncabez{1cm}{16pt} \SepDescrip{16pt} \SepFilas{1cm}{10pt} @@ -68,7 +73,7 @@ \PosFirmas{1cm}{1cm}{-3cm} \PosDenom{-0cm}{4.3cm} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} \Contacto{Jacinto de Ayala} @@ -81,6 +86,7 @@ \begin{factura} \Item{1}{Ãtem con IVA general}{1000} + \Item{10}{otro Ãtem con IVA general -descripciÃ³n larga para mostrar el cambio de lÃnea-}{1000} \end{factura} \Descripcion{DescripciÃ³n larga del servicio} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura8.tex new/doc/latex/factura/factura-ejemplo-factura8.tex --- old/doc/latex/factura/factura-ejemplo-factura8.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-factura8.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `factocho') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Escribimos factura y reporte, pero sÃ³lo producimos la factura, %% Sin expandir el cuadro de la factura ni la descripciÃ³n (sinexpandir), @@ -43,6 +44,7 @@ %% Con descuentos totales en moneda aplicables por igual a todos los tipos de elementos existentes (\Descuento*), %% Con resumen (\Resumen), %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ sinexpandir, @@ -61,7 +63,7 @@ \LetraNumTotal{\fontsize{20}{30}\bfseries} \tabcolsep7pt -\Fecha{05-11-2016} +\Fecha{06-11-2017} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} \Contacto{Jacinto de Ayala} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-firma.tex new/doc/latex/factura/factura-ejemplo-firma.tex --- old/doc/latex/factura/factura-ejemplo-firma.tex 2016-03-08 00:21:11.000000000 +0100 +++ new/doc/latex/factura/factura-ejemplo-firma.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `firma') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-fondo.tex new/doc/latex/factura/factura-ejemplo-fondo.tex --- old/doc/latex/factura/factura-ejemplo-fondo.tex 2016-03-08 00:21:11.000000000 +0100 +++ new/doc/latex/factura/factura-ejemplo-fondo.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `fondo') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -82,7 +82,7 @@ \fontdimen2\font=0.55em Imprenta: \hfill IMPRESOS DE LA VEGA. Av. Garcilaso de la Vega, Qta. San RomÃ¡n, Santa MÃ³nica, Caracas, Venezuela. RIF: R-87.654.321-0. Tlf: (0123) 456.78.90\newline \fontdimen2\font=0.65em - e-mail: \hfill imprenta(a)sanrom.xn--n-5ba1r. No. Providencia SENIAT 01/01060 de fecha 12/11/2008 - Control desde No. 00-000001 hasta No. 00-010000 / Fecha 01/01/2016.\par + e-mail: \hfill imprenta(a)sanrom.xn--n-5ba1r. No. Providencia SENIAT 01/01060 de fecha 12/11/2008 - Control desde No. 00-000001 hasta No. 00-010000 / Fecha 01/01/2017.\par \end{minipage} \end{document} %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-membrete.tex new/doc/latex/factura/factura-ejemplo-membrete.tex --- old/doc/latex/factura/factura-ejemplo-membrete.tex 2016-03-08 00:21:11.000000000 +0100 +++ new/doc/latex/factura/factura-ejemplo-membrete.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `membrete') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-prefactura.tex new/doc/latex/factura/factura-ejemplo-prefactura.tex --- old/doc/latex/factura/factura-ejemplo-prefactura.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-prefactura.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `prefac') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una prefactura (prefactura), %% Expande el cuadro de la factura con espacio en blanco (exparriba), %% Con lÃnea protectora del espacio en blanco (linea), @@ -42,6 +43,7 @@ %% Con descuentos totales en porcentaje aplicables por igual a todos los tipos de elementos existentes (\Descuento), %% Sin resumen, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ prefactura, @@ -55,7 +57,7 @@ \FondoFactura{factura-ejemplo-fondo} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte1.tex new/doc/latex/factura/factura-ejemplo-reporte1.tex --- old/doc/latex/factura/factura-ejemplo-reporte1.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-reporte1.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `repuno') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Escribimos un reporte, %% Generamos factura y reporte (conreporte), @@ -45,6 +46,7 @@ %% Sin especificar el proveedor, asÃ toma el emisor de la factura como el nombre del proveedor, %% Sin resumen, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ conreporte, @@ -65,7 +67,7 @@ % \EstiloPagReporte[empty]{soloarriba} % \EstiloPagReporte{soloarriba} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte2.tex new/doc/latex/factura/factura-ejemplo-reporte2.tex --- old/doc/latex/factura/factura-ejemplo-reporte2.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-reporte2.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `repdos') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos una factura, %% Escribimos un reporte, %% Escribimos factura y reporte, pero sÃ³lo producimos el reporte (soloreporte), @@ -45,6 +46,7 @@ %% Sin resumen, %% Con etiquetas y referencias, %% Con descripciÃ³n larga (\Descripcion). +%%</desc> %% \documentclass[ soloreporte, @@ -59,7 +61,7 @@ % \EstiloPagReporte{solonumpag} % \EstiloPagReporte{soloabajo} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \Num{1} \RazonSocial{Ayala San Vicente Usureros} \RIF{Y-12.345.678-9} @@ -74,6 +76,7 @@ \begin{factura} \Item{2}{Ãtem con IVA general}{1000}\label{primeritem} + \Item{4}{otro Ãtem con IVA general}{100} \end{factura} \Descripcion{DescripciÃ³n larga del servicio} @@ -81,8 +84,8 @@ \begin{reporte} El reporte - pÃ¡gina 1\newpage El reporte - pÃ¡gina 2 \newpage El reporte - pÃ¡gina 3. - Se facturaron \cantref{primeritem} \descref{primeritem} por un valor de \Moneda\puref{primeritem} cada uno, dando un total de \Moneda\ptref{primeritem}. El IVA es de \Moneda\AlicuotaG, y el total final es \Moneda\Total. - % TambiÃ©n podemos usar \itemref{primeritem}, \dctoref{primeritem}, y en cuanto a las totalizaciones: \BIE, \BIR, \BIA, \AlicuotaR, \AlicuotaA, \SubtG, \SubtE, \SubtR, \SubtA, \DescG, \DescE, \DescR, \DescA para los demÃ¡s totales. + En el artÃculo nÃºmero \itemref{primeritem} se facturaron \cantref{primeritem} \descref{primeritem} por un valor de \Moneda\puref{primeritem} cada uno, el descuento porcentual de ese artÃculo es \dctoref{primeritem}, dando un total de \Moneda\ptref{primeritem}. El IVA de este Ãtem es de \Moneda\numprint\AlicuotaG; luego se facturÃ³ otro artÃculo mÃ¡s, dando un total final de \Moneda\numprint\Total. + % TambiÃ©n podemos usar \dctoref{primeritem} para la referencia al descuento, y en cuanto a las totalizaciones: \BIE, \BIR, \BIA, \AlicuotaR, \AlicuotaA, \SubtG, \SubtE, \SubtR, \SubtA, \DescG, \DescE, \DescR, \DescA para los demÃ¡s totales. \end{reporte} \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte3.tex new/doc/latex/factura/factura-ejemplo-reporte3.tex --- old/doc/latex/factura/factura-ejemplo-reporte3.tex 2016-05-16 22:36:12.000000000 +0200 +++ new/doc/latex/factura/factura-ejemplo-reporte3.tex 2017-03-12 01:01:04.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `reptres') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,6 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% %% DescripciÃ³n de este ejemplo: +%%<desc> %% Escribimos un reporte, %% Generamos solamente un reporte (soloreporte), %% El reporte se imprime en las dos caras del papel (twoside), @@ -44,6 +45,7 @@ %% Cambiamos el estilo de pÃ¡gina para que la informaciÃ³n del reporte aparezca como pie de pÃ¡gina (\EstiloPagReporte), %% Agregando en el reporte la lÃnea para firmar a mano (\FirmaReporte), %% Sin descripciÃ³n larga. +%%</desc> %% \documentclass[ soloreporte, @@ -66,7 +68,7 @@ % \EstiloPagReporte[empty]{soloarriba} % \EstiloPagReporte{soloarriba} -\Fecha{05-11-2016} +\Fecha{06-11-2017} \RazonSocial{Ayala San Vicente Usureros} \Proveedor{LÃ¡zaro de la Vega y San RomÃ¡n} Binary files old/doc/latex/factura/factura.pdf and new/doc/latex/factura/factura.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/factura.doc.tlpobj new/tlpkg/tlpobj/factura.doc.tlpobj --- old/tlpkg/tlpobj/factura.doc.tlpobj 2016-05-17 03:19:27.000000000 +0200 +++ new/tlpkg/tlpobj/factura.doc.tlpobj 2017-04-14 17:39:43.000000000 +0200 @@ -1,9 +1,9 @@ name factura.doc category Package -revision 41202 +revision 43470 shortdesc doc files of factura relocated 1 -docfiles size=231 +docfiles size=371 RELOC/doc/latex/factura/README RELOC/doc/latex/factura/factura-beispiel-rechnung.tex RELOC/doc/latex/factura/factura-ejemplo-cotizacion.tex ++++++ factura.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/factura/factura.cls new/tex/latex/factura/factura.cls --- old/tex/latex/factura/factura.cls 2016-05-16 22:36:12.000000000 +0200 +++ new/tex/latex/factura/factura.cls 2017-03-12 01:01:05.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `class') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -36,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{factura} -[2016/05/16 v2.72 +[2017/03/11 v3.00 Clase para elaborar facturas legales en la RepÃºblica Bolivariana de Venezuela. ] @@ -55,8 +55,12 @@ \newif\if@descuentos \newif\if@denom \newif\if@sinnumero +\newif\if@sintotales \newif\if@conlineasha \newif\if@linea +\newif\if@lineacompleta +\newif\if@lineahastatotal +\newif\if@lineadesdeinicio \newif\if@G \newif\if@BIR \newif\if@BIA @@ -83,11 +87,14 @@ \newif\if@nombre \newif\if@pagado \newif\if@impdesc +\newif\if@centradesc +\newif\if@sinmarcas \newif\if@pruebaref \RequirePackage{etoolbox}% 'etoolbox' para los condicionales binarios. \newbool{Descuentos} +\newbool{Subtotal} \newbool{SinCantidad} \newbool{SinLineasVertInt} \newbool{SinLineasVertExt} @@ -95,17 +102,10 @@ \newbool{SinLineasHoriExt} \newbool{DCU} \newbool{DUC} -\newbool{PrimeroDesc} +\newbool{NumItem} +\newbool{PrimeroDescrip} \newbool{ExpAbajo}\booltrue{ExpAbajo} -%% Condicionales auxiliares para hacer que la lÃnea oblicua salga donde corresponde. -\newbool{LineaDesdeColUno} -\newbool{LineaDesdeColDos} -\newbool{LineaHastaColUno} -\newbool{LineaHastaColDos} -\newbool{LineaHastaFinal} -\newbool{LineaHastaTotal} - %% Condicionales auxiliares para la posiciÃ³n de los objetos fijos cuando son medidos desde la derecha, o desde abajo. \newbool{FechaXnegativo} \newbool{FechaYnegativo} @@ -123,11 +123,26 @@ \DeclareOption{unafirma}{\@unafirmatrue\@confirmastrue}% No agrega el espacio para que firme quien recibe. \DeclareOption{dosfirmas}{\@unafirmafalse\@confirmastrue}% Pone las dos firmas para firmar. \DeclareOption{descuentos}{\booltrue{Descuentos}\@descuentostrue}% Para los descuentos individuales. +\DeclareOption{subtotal}{% Para la columna extra del subtotal antes del descuento. + \if@descuentos + \booltrue{Subtotal} + \else + \ClassWarning{factura}{La opciÃ³n 'subtotal' no aplica sin descuentos individuales. Sin efecto opciÃ³n 'subtotal'}{} + \fi} \DeclareOption{sincondiciones}{\@concondicionesfalse}% No agrega el texto con las condiciones del documento. \DeclareOption{denom}{\@denomtrue}% Agrega el texto con la denominaciÃ³n del documento, para las formas libres que no tienen el nÃºmero de factura. \DeclareOption{sinnumero}{\@sinnumerotrue\@denomtrue}% Escribir el texto de la denominaciÃ³n del documento pero sin escribir el nÃºmero. \DeclareOption{G}{\@Gtrue}% Con esta opciÃ³n sale la letra 'G' en los items con IVA general, y sale el porcentaje en la base imponible general. \DeclareOption{filas}{\@filastrue}% Estilo de totalizaciÃ³n en filas. +\DeclareOption{sintotales}{\@sintotalestrue% No escribe los totales al final, por ejemplo para cotizaciones de productos similares. + \if@filas + \ClassWarning{factura}{La opciÃ³n 'sintotales' no aplica para el modo de totalizaciÃ³n en filas. Sin efecto opciÃ³n 'filas'.}{} + \@filasfalse + \fi + \if@cotizacion + \else + \ClassWarning{factura}{La opciÃ³n 'sintotales' no debe usarse en facturas sino en cotizaciones. No es vÃ¡lida una factura sin totales.}{} + \fi} \DeclareOption{centrado}{% Total y exento 'centrado'; sÃ³lo para estilo 'filas' \if@filas \@centradotrue @@ -141,18 +156,21 @@ \@agrupadotrue \fi} \DeclareOption{impdesc}{\@impdesctrue}% Para el tipo de impuesto en la descripciÃ³n y no en el precio unitario y total. +\DeclareOption{centradesc}{\@centradesctrue}% Para centrar la descripciÃ³n de cada Ãtem. +\DeclareOption{sinmarcas}{\@sinmarcastrue}% Para evitar que aparezcan los caracteres especiales cuando la descripciÃ³n es larga. +\DeclareOption{numitem}{\booltrue{NumItem}}% Para poner una columna extra al principio con el nÃºmero del Ãtem. \DeclareOption{dcu}{% DescripciÃ³n, luego cantidad y luego precio unitario. \@dcutrue\@cdufalse\@ducfalse \booltrue{DCU}\boolfalse{DUC} - \booltrue{PrimeroDesc}} + \booltrue{PrimeroDescrip}} \DeclareOption{duc}{% DescripciÃ³n, luego precio unitario y luego cantidad. \if@dcu \ClassWarning{factura}{Las opciones 'duc' y 'dcu' no son compatibles. Sin efecto ambas opciones}{} - \boolfalse{PrimeroDesc}\boolfalse{DCU}\@dcufalse\@cdutrue + \boolfalse{PrimeroDescrip}\boolfalse{DCU}\@dcufalse\@cdutrue \else \@ductrue\@cdufalse\@dcufalse \booltrue{DUC}\boolfalse{DCU} - \booltrue{PrimeroDesc} + \booltrue{PrimeroDescrip} \fi} \DeclareOption{siniva}{\AtBeginDocument{\gdef\@ImpuestoG{0}\gdef\@ImpuestoR{0}\gdef\@ImpuestoA{0}}}% No cobra IVA. \DeclareOption{todosiva}{\@todosivatrue}% Con esta opciÃ³n salen todos los IVA asÃ valgan cero. @@ -168,11 +186,11 @@ \booltrue{SinCantidad} \if@dcu \ClassWarning{factura}{La opciÃ³n 'sincantidad' no es compatible con 'dcu' . Sin efecto opciÃ³n 'dcu'}{} - \@dcufalse\@cdutrue\boolfalse{DCU}\boolfalse{PrimeroDesc} + \@dcufalse\@cdutrue\boolfalse{DCU}\boolfalse{PrimeroDescrip} \fi \if@duc \ClassWarning{factura}{La opciÃ³n 'sincantidad' no es compatible con 'duc' . Sin efecto opciÃ³n 'duc'}{} - \@ducfalse\@cdutrue\boolfalse{DUC}\boolfalse{PrimeroDesc} + \@ducfalse\@cdutrue\boolfalse{DUC}\boolfalse{PrimeroDescrip} \fi} \DeclareOption{conlineasha}{\@conlineashatrue}% Una lÃnea horizontal para cada Ãtem, como las facturas a mano. @@ -198,7 +216,7 @@ \DeclareOption{csv}{% Para la salida en modo csv tambiÃ©n. \if@factura \@csvtrue - \AtEndDocument{\@EscribeTotalesEnCSV} + \if@sintotales\else\AtEndDocument{\@EscribeTotalesEnCSV}\fi \else \ClassWarning{factura}{La opciÃ³n 'csv' require generar la factura. Sin efecto opciÃ³n 'csv'.}{} \fi} @@ -219,7 +237,6 @@ \RequirePackage{tabularx}% Con 'tabularx' hacemos la tabla. \RequirePackage{environ}% Con 'environ' podemos usar tabularx dentro del ambiente de la factura y escribir texto en el enddef. \RequirePackage{fancyhdr}% Las cabeceras fancy; asÃ se use solamente en reporte, hay que cargarlo siempre. -\RequirePackage{MnSymbol}% Para el sÃmbolo $\lcurvearrowsw$ cuando la descripciÃ³n ocupa mÃ¡s de una lÃnea. \AtBeginDocument{% Da error si algÃºn campo necesario no estÃ¡ definido. \if@reporte @@ -275,7 +292,10 @@ \ClassWarning{factura}{** Fecha del documento\space \@Fecha\space distinta de la fecha de hoy. **}{}% \fi \fi - \if@factura\ClassInfo{factura}{\@@Total: \space\space\space \Moneda \Total}{}\fi} + \if@sintotales + \else + \if@factura\ClassInfo{factura}{\@@Total: \space\space\space \Moneda \Total}{}\fi + \fi} %% La geometrÃa en formato de factura y de reporte. %% El margen superior estÃ¡ definido desde el encabezado con los datos del cliente. @@ -374,7 +394,7 @@ \def\PosFecha#1#2{% \IfBeginWith{#1}{-} {\StrBehind{#1}{-}[\templeng]\setlength{\@PosFechaX}{-\templeng}\booltrue{FechaXnegativo}} - {\boolfalse{FechaXnegativo}\setlength{\@PosFechaX}{#1}}% + {\boolfalse{FechaXnegativo}\setlength{\@PosFechaX}{#1}} \IfBeginWith{#2}{-} {\StrBehind{#2}{-}[\templeng]\setlength{\@PosFechaY}{-\templeng}\booltrue{FechaYnegativo}} {\boolfalse{FechaYnegativo}\setlength{\@PosFechaY}{#2}}} @@ -382,7 +402,7 @@ \def\PosDenom#1#2{% \IfBeginWith{#1}{-} {\StrBehind{#1}{-}[\templeng]\setlength{\@PosDenomX}{-\templeng}\booltrue{DenomXnegativo}} - {\boolfalse{DenomXnegativo}\setlength{\@PosDenomX}{#1}}% + {\boolfalse{DenomXnegativo}\setlength{\@PosDenomX}{#1}} \IfBeginWith{#2}{-} {\StrBehind{#2}{-}[\templeng]\setlength{\@PosDenomY}{-\templeng}\booltrue{DenomYnegativo}} {\boolfalse{DenomYnegativo}\setlength{\@PosDenomY}{#2}}} @@ -390,7 +410,7 @@ \def\PosControl#1#2{% \IfBeginWith{#1}{-} {\StrBehind{#1}{-}[\templeng]\setlength{\@PosControlX}{-\templeng}\booltrue{ControlXnegativo}} - {\boolfalse{ControlXnegativo}\setlength{\@PosControlX}{#1}}% + {\boolfalse{ControlXnegativo}\setlength{\@PosControlX}{#1}} \IfBeginWith{#2}{-} {\StrBehind{#2}{-}[\templeng]\setlength{\@PosControlY}{-\templeng}\booltrue{ControlYnegativo}} {\boolfalse{ControlYnegativo}\setlength{\@PosControlY}{#2}}} @@ -424,6 +444,9 @@ %% SeparaciÃ³n horizontal entre las cajas del encabezado y separaciÃ³n interna entre la lÃnea y el texto. \def\SepEncabez#1#2{\setlength{\@SeparaEncabez}{#1}\setlength{\@SeparaInternaEncabez}{#2}} +%% SeparaciÃ³n extra entre los elementos en la factura. +\def\SepItemsExtra#1{\setlength{\@SeparaItemsExtra}{#1}} + %% SeparaciÃ³n interna entre la lÃnea y el texto de la descripciÃ³n. \def\SepDescrip#1{\setlength{\@SeparaInternaDescrip}{#1}} @@ -500,10 +523,10 @@ %% Comando para incluir la firma escaneada en el sitio donde va la lÃnea de la firma del emisor. \NewDocumentCommand{\FirmaFactura}{m O{0pt} O{0pt}}{% \FirmaFactura{imagen}[x-corr][y-corr] \if@factura - \RequirePackage{graphicx}% + \RequirePackage{graphicx} \ifx&#2&\else\setlength{\@FirmaFacturaXcorr}{#2}\fi \ifx&#3&\else\setlength{\@FirmaFacturaYcorr}{#3}\fi - \savebox{\@CajaFirmaEmisor}{#1}% + \savebox{\@CajaFirmaEmisor}{#1} \if@reporte \expandafter\AtBeginShipoutNext \else @@ -561,30 +584,30 @@ \end{textblock*} \fi} -%% Con \FondoFactura le damos el nombre del archivo que contiene el formato de la factura, por ejemplo para compilaciones con 'prefactura', 'cotizacion' o para incluir una imagen de fondo como 'marca de agua'. -\newcommand{\FondoFactura}[1]{% +%% Con \FondoFactura le damos el nombre del archivo que contiene el formato de la factura, por ejemplo para compilaciones con 'prefactura', 'cotizacion' o para incluir una imagen de fondo como 'marca de agua'. +\newcommand{\FondoFactura}[1]{ \if@factura - \RequirePackage{graphicx}% + \RequirePackage{graphicx} \@fondofacturatrue - \gdef\@FondoFactura{#1}% + \gdef\@FondoFactura{#1} \fi} %% Con \FondoReporte le damos el nombre del archivo que contiene el formato del reporte. Existen dos posibilidades: que dicho fondo salga en todas las pÃ¡ginas o sÃ³lo en la primera. -\NewDocumentCommand{\FondoReporte}{s m}{% +\NewDocumentCommand{\FondoReporte}{s m}{ \if@reporte \@fondoreportetrue - \RequirePackage{graphicx}% - \gdef\@FondoReporte{#2}% + \RequirePackage{graphicx} + \gdef\@FondoReporte{#2} \IfBooleanT{#1}{\@fondoreportestartrue}% Con * sale en todas las pÃ¡ginas; sin * sale sÃ³lo en la primera pÃ¡gina. \fi} %% Comando para establecer desde el preÃ¡mbulo el estilo de pÃ¡gina (\pagestyle) del reporte, tanto para la primera pÃ¡gina como para las siguientes. -\NewDocumentCommand{\EstiloPagReporte}{o m}{% +\NewDocumentCommand{\EstiloPagReporte}{o m}{ \gdef\@EstiloPagReporteResto{#2} \IfValueTF{#1}{\gdef\@EstiloPagReporteUno{#1}}{\gdef\@EstiloPagReporteUno{\@EstiloPagReporteResto}}} %% El tÃtulo para el reporte. -\NewDocumentCommand{\TituloReporte}{s m}{% +\NewDocumentCommand{\TituloReporte}{s m}{ \gdef\@TituloReporte{#2}% \IfBooleanTF{#1}{% Con '*' sale el tÃtulo en las cabeceras o piÃ©s. Sin '*' no. \gdef\@InfoPagina{\let\\\relax\@InfoPaginaTitulo}}% @@ -592,8 +615,8 @@ %% Para cada cliente o para cada personalizaciÃ³n se puede tener un archivo .def o .tex con su nombre y ciertas macros cargadas. Ese archivo lo ponemos incluir con '\Cliente' en lugar de usar \input, y la extensiÃ³n deberÃ¡ ser .def o .tex. \newcommand{\Cliente}[1]{% - \IfFileExists{#1.def}{\input{#1.def}}{% - \IfFileExists{#1.tex}{\input{#1.tex}}{% + \IfFileExists{#1.def}{\input{#1.def}}{ + \IfFileExists{#1.tex}{\input{#1.tex}}{ \ClassError{factura}{** No existe #1.def ni #1.tex **}{}}}} %% Comando para mostrar macros con '@'. @@ -604,8 +627,11 @@ \newlength{\@TamResumen} \newlength{\@TamFinalEncabez} \newlength{\@TamLineaFirmas} +\newlength{\@TamNumItem} \newlength{\@TamCantidad} +\newlength{\@TamDescrip} \newlength{\@TamPrecioU} +\newlength{\@TamPrecioS} \newlength{\@TamDescuento} \newlength{\@TamPrecioT} \newlength{\@GrosorLineaFirmas} @@ -634,6 +660,8 @@ \newlength{\@EspacioVacioInicial} \newlength{\@EspacioVacioFinal} \newlength{\@SeparaEncabez} +\newlength{\@SeparaItemsExtra} +\newlength{\@SeparaItemsExtraFinal} \newlength{\@SeparaInternaEncabez} \newlength{\@SeparaInternaDescrip} \newlength{\@SeparaElementos} @@ -665,7 +693,7 @@ %% Contadores para uso interno para uso interno: \newcounter{@IVANoGeneral}% '0' con sÃ³lo IVA G, '1' cuando hay IVA R o IVA A, y '2' cuando hay ambos. -\newcounter{@NumItem}% NÃºmero del Ãtem actual, para uso de algunas macros en el cuadro de la factura. +\newcounter{@NumItem}% NÃºmero del Ãtem actual, para uso de algunas macros en el cuadro de la factura y para cuando se usa la opciÃ³n 'numitem'. \input{factura.def}% Cargamos los valores predeterminados. @@ -688,7 +716,7 @@ \fi \if@exparriba - \RequirePackage{zref-savepos}% Para guardar la posiciÃ³n en 'Y'. + \RequirePackage{zref-savepos}[2016/05/21]% Para guardar la posiciÃ³n en 'Y'. \fi \if@reporte @@ -696,6 +724,12 @@ \RequirePackage{zref-savepos}% Para la firma, que debe ser cargado aquÃ porque \FirmaReporte no se ejecuta desde el preÃ¡mbulo. \fi +\if@sinmarcas + \setlength{\@SeparaFinLineaDesc}{0pt} + \def\@CaracterCR{\mbox{}} + \def\@CaracterCeldasVacias{\mbox{}} +\fi + %% Comando para escribir el encabezado en la factura. \newcommand\@EncabezadoFactura{% \ifdefvoid{\@Resumen}{\@EscribeDatos}{\@EscribeDatosResumen}% @@ -727,15 +761,19 @@ %% http://tex.stackexchange.com/questions/296035/insert-a-special-character-at… %% http://tex.stackexchange.com/questions/248944/how-to-put-before-lines \newcommand{\@DescripcionAuxCmd}[2]{% - \setbox0\hbox{\parbox[t]{\linewidth}{#1% + \immediate\write\@auxout{\gdef\noexpand\@TamDescrip{\the\linewidth}}% Para poder establecer la lÃnea diagonal hay que saber el tamaÃ±o del campo de la descripciÃ³n. + \setbox0\hbox{\parbox[t]{\linewidth}{\if@centradesc\centering\arraybackslash\fi#1% \if@impdesc\hfill\ \@EscribeTipoDeImpuesto{#2}\fi% \par\global\count1=\prevgraf}}% \ifnum\count1 = 1 - #1% - \if@impdesc\hfill\ \@EscribeTipoDeImpuesto{#2}\fi + \if@centradesc\centering\arraybackslash\fi#1% + \if@impdesc\vskip-\baselineskip\hfill\ \@EscribeTipoDeImpuesto{#2}\fi \else \parbox[t]{\linewidth-\wd\@CajaCaracterCR-\@SeparaFinLineaDesc}{% - \David@XStart#1\David@XEnd + \David@XStart + \if@centradesc\centering\arraybackslash\fi + #1% + \David@XEnd \par \count0=\prevgraf \count2=\prevgraf @@ -757,25 +795,35 @@ \fi} %% Comandos auxiliares para colocar en \parbox cada celda. +\newcommand{\@NumItemAuxCmd}[1]{% + \savebox{\@CajaPrueba}{#1}% + \ifdim\wd\@CajaPrueba > \@TamNumItem \global\@TamNumItem=\wd\@CajaPrueba\fi + \parbox[t]{\@TamNumItem}{#1}} + \newcommand{\@CantidadAuxCmd}[1]{% \savebox{\@CajaPrueba}{#1}% \ifdim\wd\@CajaPrueba > \@TamCantidad \global\@TamCantidad=\wd\@CajaPrueba\fi - \parbox{\@TamCantidad}{#1}} + \parbox[t]{\@TamCantidad}{#1}} \newcommand{\@PrecioUAuxCmd}[1]{% \savebox{\@CajaPrueba}{#1}% \ifdim\wd\@CajaPrueba > \@TamPrecioU \global\@TamPrecioU=\wd\@CajaPrueba\fi - \parbox{\@TamPrecioU}{#1}} + \parbox[t]{\@TamPrecioU}{#1}} + +\newcommand{\@PrecioSAuxCmd}[1]{% + \savebox{\@CajaPrueba}{#1}% + \ifdim\wd\@CajaPrueba > \@TamPrecioS \global\@TamPrecioS=\wd\@CajaPrueba\fi + \parbox[t]{\@TamPrecioS}{#1}} \newcommand{\@DescuentoAuxCmd}[1]{% \savebox{\@CajaPrueba}{#1}% \ifdim\wd\@CajaPrueba > \@TamDescuento \global\@TamDescuento=\wd\@CajaPrueba\fi - \parbox{\@TamDescuento}{#1}} + \parbox[t]{\@TamDescuento}{#1}} \newcommand{\@PrecioTAuxCmd}[1]{% \savebox{\@CajaPrueba}{#1}% \ifdim\wd\@CajaPrueba > \@TamPrecioT \global\@TamPrecioT=\wd\@CajaPrueba\fi - \parbox{\@TamPrecioT}{#1}} + \parbox[t]{\@TamPrecioT}{#1}} %% PresentaciÃ³n de totales en modo de columnas. \newcommand{\@EscribeTotalCol}[1]{% @@ -939,11 +987,6 @@ \if@Exento\usebox{\@CajaBIET}\else\usebox{\@CajaTotal}\fi \if@centrado\hspace*{\@SepTotales}\fi} -%% Comando que guarda la posiciÃ³n en X para el nodo A de la lÃnea. -\newcommand{\@LineaNodoACoordX}{\hspace*{-\tabcolsep}\zsaveposx{LineaNodoACoordX}\hspace*{\tabcolsep}} -%% Comando que guarda la posiciÃ³n en X para el nodo B de la lÃnea. -\newcommand{\@LineaNodoBCoordX}{\hspace*{-\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{\tabcolsep}} - %% Escribe la letra que designa al tipo de impuesto que aplica al Ãtem. \NewDocumentCommand{\@EscribeTipoDeImpuesto}{m}{% % Hay que abrir un grupo de ejecuciÃ³n porque el cambio en la tipografÃa altera la celda. @@ -1000,42 +1043,61 @@ %% Comandos auxiliares para poder evaluar la definiciÃ³n de las columnas en la tabla con un comando que se expande completamente. \def\@FacturaAuxColumnasEval{ - % Primera lÃnea. + % Primera lÃnea, la mÃ¡s externa. \ifbool{SinLineasVertExt}{}{|} + % Columna para el nÃºmero del Ãtem, si aplica. + \ifbool{NumItem}{c}{r@{\extracolsep{0pt}}} + % Segunda lÃnea, que sale solamente cuando se usa la opciÃ³n 'numitem' + \ifbool{NumItem}{\ifbool{SinLineasVertInt}{}{|}}{} % Columna 'X' con DCU, columna fantasma con 'sincantidad' y columna 'c' con CDU. - \ifbool{PrimeroDesc}{X}{ + \ifbool{PrimeroDescrip}{X}{ \ifbool{SinCantidad}{l@{\extracolsep{0pt}}}{c}} - % Segunda lÃnea. + % Tercera lÃnea. \ifbool{SinCantidad}{}{\ifbool{SinLineasVertInt}{}{|}} % Columna 'c' con DCU, columna 'r' con DUC, columna 'X' sin espacio para 'sincantidad' y columna 'X' con CDU. \ifbool{DCU}{c}{ \ifbool{DUC}{r}{ \ifbool{SinCantidad}{X@{\extracolsep{0pt}}}{X}}} - % Tercera lÃnea, que sale solamente cuando no se usa 'sincantidad'. + % Cuarta lÃnea, que sale solamente cuando no se usa 'sincantidad'. \ifbool{SinCantidad}{}{\ifbool{SinLineasVertInt}{}{|}} % Columna 'c' para DUC y columna 'r' para cualquier otro caso (DCU, CDU y 'sincantidad'). \ifbool{DUC}{c}{r} - % Cuarta lÃnea. + % Quinta lÃnea. \ifbool{SinLineasVertInt}{}{|} + % Columna 'r' para subtotal antes del descuento, o columna fantasma si no se especifica 'subtotal'). + \ifbool{Subtotal}{r}{l@{\extracolsep{0pt}}} + % Sexta lÃnea, que sale solamente cuando hay columna de subtotales. + \ifbool{Subtotal}{\ifbool{SinLineasVertInt}{}{|}}{} % Columna 'c' para 'descuentos' y columna 'r' sin espacio si no hay descuentos individuales. \ifbool{Descuentos}{c}{r@{\extracolsep{0pt}}} - % Quinta lÃnea, que sale solamente cuando hay descuentos. + % SÃ©ptima lÃnea, que sale solamente cuando hay descuentos. \ifbool{Descuentos}{\ifbool{SinLineasVertInt}{}{|}}{} % Columna 'r' siempre. r - % Sexta y Ãºltima lÃnea. + % Octava y Ãºltima lÃnea. \ifbool{SinLineasVertExt}{}{|}} +%% Comando auxiliar para abrir la tabla del cuadro de la factura y expandir completamente las columnas. \edef\@FacturaAuxInicioCmd{\noexpand\begin{tabularx}{\textwidth}{\@FacturaAuxColumnasEval}} +%% Comando auxiliar para abrir el '\multicolumn' para los totales en el modo de columnas y expandir completamente las columnas cuando hay o no barras verticales. +\edef\@ColumnasMultiColumnTotalesAuxCmd{% + \noexpand\multicolumn{7}{\ifbool{SinLineasVertExt}{}{|} r}\begingroup + \noexpand\ifdim \noexpand\ht\noexpand\@CajaEspacioVacio=0pt + \noexpand\else + \noexpand\if@linea\noexpand\zsaveposx{LineaNodoBCoordX}\noexpand\zsaveposy{LineaNodoBCoordY}\noexpand\fi\noexpand\fi% Fijamos la posiciÃ³n (x,y) final para la lÃnea ya que estaremos justo en el punto donde escribimos el total, y hasta allÃ llega la lÃnea en el modo de columnas. + \noexpand\begin{tabular}[b]{@{\noexpand\extracolsep{2\noexpand\tabcolsep}}lr \ifbool{SinLineasVertExt}{}{|}}} + %% Comando para hacer los cÃ¡lculos sobre cada Ãtem y establecer las macros con el contenido de cada Ãtem introducido. \newcommand{\@CalculaItem}[5]{% \addtocounter{@NumItem}{1}% % Calculamos. \FPupn\PrecioU{#4 \@DigitosMoneda{} round}% \ifx\\#5\\\FPset\Dcto{0}\else\FPupn\Dcto{#5 \@DigitosPorc{} round clip}\fi% Fijamos en 0 el descuento si no se especifica. - \FPupn\PrecioT{100 \Dcto{} 100 - / #2 * \PrecioU{} * \@DigitosMoneda{} round}% + \FPupn\PrecioS{#2 \PrecioU{} * \@DigitosMoneda{} round}% + \FPupn\PrecioT{100 \Dcto{} 100 - / \PrecioS{} * \@DigitosMoneda{} round}% \global\let\PrecioU\PrecioU + \global\let\PrecioS\PrecioS \global\let\Dcto\Dcto \global\let\PrecioT\PrecioT % Suma el elemento actual al subtotal acumulado. @@ -1045,30 +1107,36 @@ \expandafter\gdef\csname @Item@\romannumeral\value{@NumItem}@Cantidad\endcsname{\numprint{#2}}% \expandafter\gdef\csname @Item@\romannumeral\value{@NumItem}@Descripcion\endcsname{#3}% \expandafter\global\expandafter\edef\csname @Item@\romannumeral\value{@NumItem}@PrecioU\endcsname{\noexpand\numprint{\PrecioU}}% + \expandafter\global\expandafter\edef\csname @Item@\romannumeral\value{@NumItem}@PrecioS\endcsname{\noexpand\numprint{\PrecioS}}% \expandafter\global\expandafter\edef\csname @Item@\romannumeral\value{@NumItem}@Descuento\endcsname{\noexpand\numprint{\Dcto}}% \expandafter\global\expandafter\edef\csname @Item@\romannumeral\value{@NumItem}@PrecioT\endcsname{\noexpand\numprint{\PrecioT}}} \gdef\@pruebaref#1{% - \expandafter\ifx\csname @Etiqueta@@#1\endcsname\relax + \expandafter\ifx\csname @Etiqueta@#1\endcsname\relax \ClassWarning{factura}{La etiqueta `#1' no estÃ¡ definida}{}\ignorespaces \@pruebareffalse \else \@pruebareftrue \fi} -\gdef\itemref#1{\@pruebaref{#1}\if@pruebaref \csname @Etiqueta@@#1\endcsname \fi} -\gdef\cantref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@@#1\endcsname @Cantidad\endcsname \fi} -\gdef\descref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@@#1\endcsname @Descripcion\endcsname \fi} -\gdef\puref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@@#1\endcsname @PrecioU\endcsname \fi} -\gdef\dctoref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@@#1\endcsname @Descuento\endcsname \fi} -\gdef\ptref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@@#1\endcsname @PrecioT\endcsname \fi} +\gdef\itemref#1{% + \ifbool{NumItem}{}{\ClassWarning{factura}{Es recomendable usar la opciÃ³n 'numitem' para enumerar los Ãtems}{}}% + \@pruebaref{#1}\if@pruebaref \csname @Etiqueta@#1\endcsname \fi} +\gdef\cantref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @Cantidad\endcsname \fi} +\gdef\descref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @Descripcion\endcsname \fi} +\gdef\puref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @PrecioU\endcsname \fi} +\gdef\subtref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @PrecioS\endcsname \fi} +\gdef\dctoref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @Descuento\endcsname \fi} +\gdef\ptref#1{\@pruebaref{#1}\if@pruebaref \csname @Item@\expandafter\romannumeral\csname @Etiqueta@#1\endcsname @PrecioT\endcsname \fi} \newcommand{\label@factura}[1]{% - \expandafter\ifx\csname @Etiqueta@@#1\endcsname\relax - \expandafter\global\expandafter\edef\csname @Etiqueta@@#1\endcsname{\arabic{@NumItem}}\ignorespaces + \expandafter\ifx\csname @Etiqueta@#1\endcsname\relax + \expandafter\global\expandafter\edef\csname @Etiqueta@#1\endcsname{\arabic{@NumItem}}\ignorespaces + \ClassInfo{factura}{Etiqueta `#1' definida para el Ãtem \arabic{@NumItem}}{}% \else - \expandafter\if\csname @Etiqueta@@#1\endcsname\the@NumItem - \ClassInfo{factura}{Etiqueta `#1' definida para el Ãtem \arabic{@NumItem}}{}% + \edef\@label@test@uno{\csname @Etiqueta@#1\endcsname}% + \edef\@label@test@dos{\the@NumItem}% + \ifx\@label@test@uno\@label@test@dos \else \ClassWarning{factura}{La etiqueta `#1' se definiÃ³ mÃ¡s de una vez}{}\ignorespaces \fi @@ -1081,9 +1149,20 @@ \setlength{\@EspacioVacioFinal}{\zposy{EspacioVacioFinal}sp}% \global\@EspacioVacioInicial=\@EspacioVacioInicial% Â¿por quÃ© tendrÃ© que globalizarlas? \global\@EspacioVacioFinal=\@EspacioVacioFinal - \savebox{\@CajaEspacioVacio}{\parbox[b][\@EspacioVacioInicial-\@EspacioVacioFinal]{1pt}{\mbox{}}}% + \savebox{\@CajaEspacioVacio}{\parbox[b][\@EspacioVacioInicial-\@EspacioVacioFinal]{\@TamDescrip}{% + \if@linea + \if@lineacompleta + \zsaveposy{LineaNodoBCoordY}% + \else + \if@lineahastatotal + \else + \zsaveposx{LineaNodoACoordX}\mbox{}\hfill \zsaveposx{LineaNodoBCoordX}\zsaveposy{LineaNodoBCoordY}% + \fi + \fi + \fi}}% \ifdim \ht\@CajaEspacioVacio=0pt \global\@lineafalse \fi \fi + \ifx\undefined\Total\relax\else\ClassError{factura}{** Parece ya haberse usado un entorno de factura **}{}\fi % % Comandos \David@SavePos, \David@XStart, \David@XEnd, \David@XPad, \David@XLeft y \David@XRight para poder manejar el salto de lÃnea en las columnas adyacentes a la columna 'X' del tabularx (la descripciÃ³n), cuando esta ocupa mÃ¡s que una lÃnea. @@ -1106,7 +1185,7 @@ \advance\dimen@-\baselineskip \settowidth{\@TempDimen}{##3}% \ifdim\@TempDimen=0pt\settowidth{\@TempDimen}{##2}\fi - \hbox{\parbox{\@TempDimen}{\mbox{}\hfill\@CaracterCeldasVacias\hfill\mbox{}}}% + \hbox{\parbox{\@TempDimen}{\@CaracterCeldasVacias}}% \repeat \fi ##3}}% @@ -1122,17 +1201,21 @@ % Si no es el primer Ãtem, entonces hace falta \\ para terminar el Ãtem anterior. \ifnum\value{@NumItem}=1% \else - \\ + \setlength{\@SeparaItemsExtraFinal}{\numexpr\the\count1\normalbaselineskip-\normalbaselineskip+\@SeparaItemsExtra}% + \\[\@SeparaItemsExtraFinal] \if@conlineasha\hline\fi% LÃneas para separar cada Ãtem, si hiciera falta. \fi - % Primer campo: AcÃ¡ puede ir la cantidad (cdu) o la descripciÃ³n (dcu y duc). + % Primer -opcional- campo: El nÃºmero del Ãtem. + \ifbool{NumItem}{\David@XLeft{\@NumItemAuxCmd{\mbox{}\hfill \@LetraNumeros \arabic{@NumItem}\hfill\mbox{}}}}{}% + & + % Segundo campo: AcÃ¡ puede ir la cantidad (cdu) o la descripciÃ³n (dcu y duc). \ifbool{SinCantidad}{}{% - \ifbool{PrimeroDesc} + \ifbool{PrimeroDescrip} {\@DescripcionAuxCmd{##3}{##1}}% dcu y duc. {\David@XLeft{\@CantidadAuxCmd{\mbox{}\hfill \@LetraNumeros \numprint{##2}\hfill\mbox{}}}}}% cdu. & - % Segundo campo: AcÃ¡ puede ir la descripciÃ³n (cdu), la cantidad (dcu), o el precio unitario (duc). - \ifbool{PrimeroDesc}{% + % Tercer campo: AcÃ¡ puede ir la descripciÃ³n (cdu), la cantidad (dcu), o el precio unitario (duc). + \ifbool{PrimeroDescrip}{% \if@dcu \David@XRight{\@CantidadAuxCmd{\mbox{}\hfill \@LetraNumeros \numprint{##2}\hfill\mbox{}}}% dcu. \else @@ -1144,7 +1227,7 @@ \fi} {\@DescripcionAuxCmd{##3}{##1}}% cdu. & - % Tercer campo: AcÃ¡ puede ir el precio unitario (cdu y dcu) o la cantidad (duc). + % Cuarto campo: AcÃ¡ puede ir el precio unitario (cdu y dcu) o la cantidad (duc). \FPifeq\PrecioU{##4}\else\ClassWarning{factura}{** Se estÃ¡ introduciendo un precio con mÃ¡s de dos decimales: (##3 - ##4. Redondeado a \PrecioU) **}{}\fi% Advertimos cuando el precio unitario tiene mÃ¡s de dos decimales. \ifbool{SinCantidad}{}{% \if@duc @@ -1156,16 +1239,23 @@ \if@impdesc\else\@EscribeTipoDeImpuesto{##1}\fi \hfill \@LetraNumeros \numprint{\PrecioU} \fi}}% dcu y cdu. \fi}% + & % Quinto -opcional- campo: Subtotal (para luego descuentos). + \ifbool{Subtotal}{% + \David@XRight{\@PrecioSAuxCmd{% + \ifx##1X \hfill \@CaracterItemXVacio \hfill\mbox{}% + \else + \if@impdesc\else\@EscribeTipoDeImpuesto{##1}\fi \hfill \@LetraNumeros \numprint{\PrecioS} + \fi}}}{} & - % Cuarto campo: Descuento. + % Sexto -opcional- campo: Descuento. \ifbool{Descuentos}{% \David@XRight{\@DescuentoAuxCmd{% \ifx##1X \hfill \@CaracterItemXVacio \hfill\mbox{}% \else - \mbox{}\hfill \@LetraNumeros \numprint{\Dcto}\%\hfill\mbox{} + \mbox{}\hfill \@LetraNumeros \numprint{\Dcto}\%\hfill\mbox{}% \fi}}}{}% Tenemos que usar un condicional booleano porque si no da problemas con el condicional \FPifeq. & - % Quinto campo: El total. + % SÃ©ptimo campo: El total. \David@XRight{\@PrecioTAuxCmd{% \ifx##1X \hfill \@CaracterItemXVacio \hfill\mbox{}% \else @@ -1208,31 +1298,33 @@ \@FacturaAuxInicioCmd \ifbool{SinLineasHoriExt}{}{\hline}% \@ZERO - % Estamos en la cantidad, o la descripciÃ³n. - \ifbool{LineaDesdeColUno}{\@LineaNodoACoordX}{}% - \ifbool{SinCantidad}{}{\ifbool{PrimeroDesc}{\@DescripcionAuxCmd{\@LetraTitCuadro \@@Descripcion}{}}{\@CantidadAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@Cantidad \hfill\mbox{}}}}% + % Estamos en el nÃºmero del Ãtem, si aplicara. + \if@lineadesdeinicio \hspace*{-\tabcolsep}\zsaveposx{LineaNodoACoordX}\hspace*{\tabcolsep}\fi + \ifbool{NumItem}{\@NumItemAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@NumItem \hfill\mbox{}}}{}% + & + % Avanzamos a la cantidad, o la descripciÃ³n. + \ifbool{SinCantidad}{}{\ifbool{PrimeroDescrip}{\@DescripcionAuxCmd{\@LetraTitCuadro \@@Descripcion}{}}{\@CantidadAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@Cantidad \hfill\mbox{}}}}% &% Avanzamos hasta la descripciÃ³n, la cantidad o el precio unitario. - \ifbool{LineaDesdeColDos}{\@LineaNodoACoordX}{}% - \ifbool{LineaHastaColUno}{\hspace*{-\arrayrulewidth}\@LineaNodoBCoordX\hspace*{\arrayrulewidth}}{}% \ifbool{SinCantidad}{\@DescripcionAuxCmd{\@LetraTitCuadro \@@Descripcion}{}} {\if@cdu \@DescripcionAuxCmd{\@LetraTitCuadro \@@Descripcion}{}\fi \if@dcu \@CantidadAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@Cantidad \hfill\mbox{}}\fi \if@duc \@PrecioUAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@PrecioU \space (\Moneda)\hfill\mbox{}}\fi}% &% Avanzamos hasta el precio unitario, o la cantidad, o columna fantasma cuando es 'sincantidad'. - \ifbool{SinCantidad}{% - \ifbool{LineaHastaColDos}{\hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}}{}}% - {\ifbool{LineaHastaColDos}{\hspace*{-\arrayrulewidth}\@LineaNodoBCoordX\hspace*{\arrayrulewidth}}{}% + \ifbool{SinCantidad}{} + {% \mbox{}\hfill \if@duc \@CantidadAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@Cantidad \hfill\mbox{}}% \else \@PrecioUAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@PrecioU \space (\Moneda)\hfill\mbox{}}% \fi}% + &% Avanzamos hasta el subtotal, que puede o no existir, + \ifbool{Subtotal}{\@PrecioSAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@PrecioS \space (\Moneda)\hfill\mbox{}}}{}% &% Avanzamos hasta el descuento, que puede o no existir. \if@descuentos \@DescuentoAuxCmd{\mbox{}\hfill \@LetraTitCuadro \@@Descuento \hfill\mbox{}}\fi &% Avanzamos hasta el precio total. \@PrecioTAuxCmd{\mbox{}\hfill \@LetraTitCuadro \ifbool{SinCantidad}{\@@Precio}{\@@PrecioT}\space (\Moneda)\hfill\mbox{}}% - \ifbool{LineaHastaFinal}{\hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}}{}% + \if@lineacompleta \hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}\fi \\ \ifbool{SinLineasHoriInt}{}{\hline}% % @@ -1244,9 +1336,7 @@ \ifdim \ht\@CajaEspacioVacio=0pt \ifbool{SinLineasHoriExt}{}{\if@conlineasha\else\hline\fi}% Verificamos si hay que poner la lÃnea horizontal. Si estÃ¡ 'conlineasha' ya saliÃ³ debido a esta opciÃ³n. \else - &\usebox{\@CajaEspacioVacio}% - \if@linea\mbox{}\zsaveposy{LineaNodoBCoordY}\fi% Se guarda la coordenada Y del punto de la derecha de la lÃnea diagonal. Tiene que haber \mbox{}. - &&&\\ + \ifbool{PrimeroDescrip}{&\usebox{\@CajaEspacioVacio}&&&&&\\}{&&\usebox{\@CajaEspacioVacio}&&&&\\}% \ifbool{SinLineasHoriExt}{}{\hline}% Siempre que hay relleno se pone la lÃnea acÃ¡. \fi \else @@ -1255,33 +1345,34 @@ \ifdim \ht\@CajaEspacioVacio=0pt \else % Rellenamos la tabla con espacio espÃºreo, y le agregamos las lineas externas, si aplica. - \ifbool{SinLineasVertExt}{\multicolumn{5}{c}{\usebox{\@CajaEspacioVacio}}}{\multicolumn{5}{|c|}{\usebox{\@CajaEspacioVacio}}}\\ + \ifbool{SinLineasVertExt}{\multicolumn{7}{c}{\usebox{\@CajaEspacioVacio}}}{\multicolumn{7}{|c|}{\usebox{\@CajaEspacioVacio}}}\\ \fi - % Abrimos la tabla para escribir los totales, y le agregamos las lÃneas verticales externas, si aplica. - \ifbool{SinLineasVertExt} - {\multicolumn{5}{r}\begingroup - \ifdim \ht\@CajaEspacioVacio=0pt \else \if@linea\zsaveposx{LineaNodoBCoordX}\zsaveposy{LineaNodoBCoordY}\fi\fi - \begin{tabular}[b]{@{\extracolsep{2\tabcolsep}}lr}} - {\multicolumn{5}{|r}\begingroup - \ifdim \ht\@CajaEspacioVacio=0pt \else \if@linea\zsaveposx{LineaNodoBCoordX}\zsaveposy{LineaNodoBCoordY}\fi\fi - \begin{tabular}[b]{@{\extracolsep{2\tabcolsep}}lr|}}% Una vaina loca... tuve que meter tambiÃ©n el tabular con la lÃnea '|' porque no pude poner esa lÃnea en el multicolumn. - \@CalculaTotalesI - \if@agrupado - \@EscribeTotalColAgrupado + % Si pedimos sin totalizaciones, entonces cerramos la tabla ya, si no, calculamos los totales y los escribimos + \if@sintotales \else - \if@Exento \@EscribeTotalCol{E}\fi - \if@BIR\@EscribeTotalCol{R}\if@ivaexpresado\@EscribeTotalColAlicuota{R}\fi\fi - \@EscribeTotalCol{G}\if@ivaexpresado\@EscribeTotalColAlicuota{G}\fi - \if@BIA\@EscribeTotalCol{A}\if@ivaexpresado\@EscribeTotalColAlicuota{A}\fi\fi - \fi - \if@ivaexpresado\cline{2-2}\fi - \hfill \@LetraTitTotal\@@Total & \@LetraNumTotal\numprint{\Total}\\ - \end{tabular}\endgroup - \\ - \ifbool{SinLineasHoriExt}{}{\hline}% + % Modo de columnas: Abrimos la tabla para escribir los totales, y le agregamos las lÃneas verticales externas, si aplica. + \@ColumnasMultiColumnTotalesAuxCmd + \@CalculaTotalesI + \if@agrupado + \@EscribeTotalColAgrupado + \else + \if@Exento \@EscribeTotalCol{E}\fi + \if@BIR\@EscribeTotalCol{R}\if@ivaexpresado\@EscribeTotalColAlicuota{R}\fi\fi + \@EscribeTotalCol{G}\if@ivaexpresado\@EscribeTotalColAlicuota{G}\fi + \if@BIA\@EscribeTotalCol{A}\if@ivaexpresado\@EscribeTotalColAlicuota{A}\fi\fi + \fi + \if@ivaexpresado\cline{2-2}\fi + \hfill \@LetraTitTotal\@@Total & \@LetraNumTotal\numprint{\Total}\\ + \end{tabular}\endgroup + \\ + \ifbool{SinLineasHoriExt}{}{\hline}% + \fi \fi \end{tabularx}% % + % Generamos la macro \Total vacÃa para que no dÃ© error en algÃºn posible uso dentro del documento. + \if@sintotales\gdef\Total{}\fi + % Si pedimos no totalizar (sintotales), la opciÃ³n filas queda desactivada. \if@filas \@CalculaTotalesI \@LetraNumTotales @@ -1355,13 +1446,13 @@ \vspace*{\@SeparaElementos}\par} \ifbool{SinCantidad} - % Definamos todos los comandos \Item***. + % Definamos todos los comandos \Item***. El descuento es opcional; por eso usamos G{0} en \NewDocumentCommand. {% \if@descuentos - \newcommand{\Item}[3]{\@ITEM{G}{1}{#1}{#2}{#3}}% Ãtem normal. - \newcommand{\ItemR}[3]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. - \newcommand{\ItemA}[3]{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. - \newcommand{\ItemE}[3]{\global\@Exentotrue\global\@Gtrue\@ITEM{E}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. + \NewDocumentCommand{\Item}{m m G{0}}{\@ITEM{G}{1}{#1}{#2}{#3}}% Ãtem normal. + \NewDocumentCommand{\ItemR}{m m G{0}}{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. + \NewDocumentCommand{\ItemA}{m m G{0}}{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. + \NewDocumentCommand{\ItemE}{m m G{0}}{\global\@Exentotrue\global\@Gtrue\@ITEM{E}{1}{#1}{#2}{#3}}% Ãtem con IVA reducido. \else \newcommand{\Item}[2]{\@ITEM{G}{1}{#1}{#2}{0}}% Ãtem normal. \newcommand{\ItemR}[2]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{1}{#1}{#2}{0}}% Ãtem con IVA reducido. @@ -1379,10 +1470,10 @@ \fi} {% \if@descuentos - \newcommand{\Item}[4]{\@ITEM{G}{#1}{#2}{#3}{#4}}% Ãtem normal. - \newcommand{\ItemR}[4]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{#1}{#2}{#3}{#4}}% Ãtem con IVA reducido. - \newcommand{\ItemA}[4]{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{#1}{#2}{#3}{#4}}% Ãtem con IVA adicional. - \newcommand{\ItemE}[4]{\global\@Exentotrue\global\@Gtrue\@ITEM{E}{#1}{#2}{#3}{#4}}% Ãtem exento de IVA. + \NewDocumentCommand{\Item}{m m m G{0}}{\@ITEM{G}{#1}{#2}{#3}{#4}}% Ãtem normal. + \NewDocumentCommand{\ItemR}{m m m G{0}}{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{#1}{#2}{#3}{#4}}% Ãtem con IVA reducido. + \NewDocumentCommand{\ItemA}{m m m G{0}}{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{#1}{#2}{#3}{#4}}% Ãtem con IVA adicional. + \NewDocumentCommand{\ItemE}{m m m G{0}}{\global\@Exentotrue\global\@Gtrue\@ITEM{E}{#1}{#2}{#3}{#4}}% Ãtem exento de IVA. \else \newcommand{\Item}[3]{\@ITEM{G}{#1}{#2}{#3}{0}}% Ãtem normal. \newcommand{\ItemR}[3]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{#1}{#2}{#3}{0}}% Ãtem con IVA reducido. @@ -1462,14 +1553,9 @@ \RequirePackage{eso-pic}% Para poder usar \AtBeginShipoutNext porque si no se hace en el 'shipout' de la pÃ¡gina se genera un espacio en blanco extra. \AtBeginShipoutNext{\if@linea\@DibujaLinea\fi} \if@filas - \ifbool{SinLineasVertInt} - {\booltrue{LineaDesdeColUno}\booltrue{LineaHastaFinal}} - {\ifbool{PrimeroDesc} - {\booltrue{LineaDesdeColUno}\booltrue{LineaHastaColUno}} - {\booltrue{LineaDesdeColDos}\booltrue{LineaHastaColDos}}} + \ifbool{SinLineasVertInt}{\@lineacompletatrue} \else - \ifbool{SinCantidad}{\booltrue{LineaDesdeColDos}}{\booltrue{LineaDesdeColUno}} - \booltrue{LineaHastaTotal} + \@lineahastatotaltrue\@lineadesdeiniciotrue \fi \fi @@ -1497,7 +1583,7 @@ \let\@ITEM\@CalculaItem \BODY \@CalculaTotalesI} - \NewDocumentCommand{\Descripcion}{s +m}{} + \NewDocumentCommand{\Descripcion}{+m}{} \fi \if@reporte diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/factura/factura.def new/tex/latex/factura/factura.def --- old/tex/latex/factura/factura.def 2016-05-16 22:36:12.000000000 +0200 +++ new/tex/latex/factura/factura.def 2017-03-12 01:01:05.000000000 +0100 @@ -6,7 +6,7 @@ %% %% factura.dtx (with options: `def') %% -%% Copyright 2016 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> +%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -35,7 +35,7 @@ %% and factura-beispiel-rechnung.tex. %% \ProvidesFile{factura.def} -[2016/05/16 v2.72 +[2017/03/11 v3.00 Archivo valores iniciales y condiciones de borde para factura.cls ] @@ -70,9 +70,11 @@ %% Macros que guardan textos que corresponden a nombres de campos: \def\@@Fecha{Fecha de emisi\'on:} \def\@@RazonSocial{Raz\'on social:} +\def\@@NumItem{\#} \def\@@Cantidad{Cantidad} \def\@@Descripcion{Descripci\'on} \def\@@PrecioU{Precio U.} +\def\@@PrecioS{Subtotal} \def\@@PrecioT{Precio T.} \def\@@Precio{Precio} \def\@@AlicuotaG{IVA G} @@ -111,13 +113,17 @@ %% i) carÃ¡cter para separar el telÃ©fono del e-mail del cliente, %% ii) carÃ¡cter para los campos vacÃos cuando se usa \ItemX, -%% iii) carÃ¡cter para las celdas vacÃos cuando la descripciÃ³n del Ãtem ocupa mÃ¡s que una lÃnea. +%% iii) carÃ¡cter para las celdas vacÃas cuando la descripciÃ³n del Ãtem ocupa mÃ¡s que una lÃnea. %% iv) carÃ¡cter de retorno de carro en el cuadro de la factura, \def\@CaracterSeparaTelefonoEmail{$\diamond$} \def\@CaracterItemXVacio{...} -\def\@CaracterCeldasVacias{$\cdot$} -\def\@CaracterCR{$\lcurvearrowsw\!$}% (del paquete MnSymbol) -%% \def\@CaracterCR{$\hookleftarrow$}% tambiÃ©n puede usarse este. +\def\@CaracterCeldasVacias{\mbox{}\hfill$\cdot$\hfill\mbox{}} +\def\@CaracterCR{\flechaCR} +\def\flechaCR{% + \raisebox{-0.4ex}{% + \begin{tikzpicture} + \draw[line width=0.075ex] (0,0) arc (20:70:0.75ex) + (0,0) arc (-70:-20:0.75ex) ++ (0.8ex,0.55ex) arc (0:-100:1ex); + \end{tikzpicture}}} %% SeparaciÃ³n entre la Ãºltima letra y el carÃ¡cter que indica que se continÃºa en la lÃnea siguiente en la descripciÃ³n cuando ocupa mÃ¡s de una lÃnea. No vale la pena hacer una macro para cambiar esto. \setlength{\(a)SeparaFinLineaDesc}{0.05cm} @@ -146,6 +152,9 @@ %% SeparaciÃ³n horizontal entre las cajas del encabezado y separaciÃ³n interna entre la lÃnea y el texto. \SepEncabez{0.2cm}{6pt} +%% SeparaciÃ³n extra entre los elementos en la factura. +\SepItemsExtra{0pt} + %% SeparaciÃ³n interna entre la lÃnea y el texto de la descripciÃ³n. \SepDescrip{6pt} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/factura.tlpobj new/tlpkg/tlpobj/factura.tlpobj --- old/tlpkg/tlpobj/factura.tlpobj 2016-05-17 03:19:27.000000000 +0200 +++ new/tlpkg/tlpobj/factura.tlpobj 2017-04-14 17:39:44.000000000 +0200 @@ -1,18 +1,20 @@ name factura category Package -revision 41202 +revision 43470 shortdesc Typeset and calculate invoices according to Venezuelan law relocated 1 -longdesc The class provides convenient means for typesetting and -longdesc calculating invoices, according to the requirements of SENIAT -longdesc legislation (tax collecting entity of the Bolivarian Republic -longdesc of Venezuela). The author suggests that the class may well be -longdesc re-usable for other jurisdictions, by rather simple editing. -runfiles size=23 +longdesc 'factura' is the Spanish word for 'invoice', so this is a LaTeX +longdesc class for typesetting and calculating invoices, taking into +longdesc account requirements of SENIAT legislation (tax collector +longdesc entity on the Bolivarian Republic of Venezuela). However, its +longdesc use is not restricted to Venezuela because all variables and +longdesc the displayed text can be redefined by invoking commands or +longdesc editing. +runfiles size=24 RELOC/tex/latex/factura/factura.cls RELOC/tex/latex/factura/factura.def catalogue-ctan /macros/latex/contrib/factura -catalogue-date 2016-05-16 07:23:48 +0200 +catalogue-date 2017-03-11 10:27:17 +0100 catalogue-license lppl1.3 catalogue-topics invoice spanish class -catalogue-version 2.72 +catalogue-version 3.00 ++++++ facture.doc.tar.xz ++++++ Binary files old/doc/xelatex/facture/exemple.pdf and new/doc/xelatex/facture/exemple.pdf differ Binary files old/doc/xelatex/facture/exemplesansTVA.pdf and new/doc/xelatex/facture/exemplesansTVA.pdf differ Binary files old/doc/xelatex/facture/exemplesansremise.pdf and new/doc/xelatex/facture/exemplesansremise.pdf differ Binary files old/doc/xelatex/facture/facture.pdf and new/doc/xelatex/facture/facture.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/facture/makefile new/doc/xelatex/facture/makefile --- old/doc/xelatex/facture/makefile 2015-01-17 00:23:30.000000000 +0100 +++ new/doc/xelatex/facture/makefile 2017-04-17 00:21:38.000000000 +0200 @@ -4,7 +4,7 @@ rm -f ../facture.zip rm -rf facture mkdir facture - ln *pdf *ins *dtx *cls *tex README makefile facture + ln *pdf *ins *dtx *tex README makefile facture zip -r ../facture.zip facture diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/facture.doc.tlpobj new/tlpkg/tlpobj/facture.doc.tlpobj --- old/tlpkg/tlpobj/facture.doc.tlpobj 2016-04-14 19:00:36.000000000 +0200 +++ new/tlpkg/tlpobj/facture.doc.tlpobj 2017-04-17 16:25:04.000000000 +0200 @@ -1,6 +1,6 @@ name facture.doc category Package -revision 36075 +revision 43865 shortdesc doc files of facture relocated 1 docfiles size=46 ++++++ facture.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/facture/facture.cls new/tex/xelatex/facture/facture.cls --- old/tex/xelatex/facture/facture.cls 2015-01-17 00:23:30.000000000 +0100 +++ new/tex/xelatex/facture/facture.cls 2017-04-17 00:21:38.000000000 +0200 @@ -11,7 +11,7 @@ %% http://creativecommons.org/licenses/by-sa/2.0/fr/ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{facture}[16/01/2015 v1.2] +\ProvidesClass{facture}[2017/04/12/04 v1.2.2] \LoadClass[a4paper]{article}%On se base sur la classe article \RequirePackage{fontspec} \RequirePackage{xunicode} @@ -27,8 +27,6 @@ \RequirePackage{colortbl} \RequirePackage{advdate}%Pour manipuler les dates \RequirePackage{xargs}%Pour des arguments conditionnels -\newif\ifsansreduction -\DeclareOption{sansreduction}{\sansreductiontrue} \newif\ifsansTVA \DeclareOption{sansTVA}{\sansTVAtrue} \newif\ifsansremise @@ -66,8 +64,14 @@ \newcommand{\postTotaux}{} \fi \newcommand{\largeurDescriptif}{0.2\textwidth} -\newcommand{\largeurChiffres}{0.2\textwidth} -\newcommand{\largeurChiffresAvecTVA}{0.1\textwidth} +\newcommand{\largeurTVA}{0.2\textwidth} +\ifsansremise + \newcommand{\largeurChiffresAvecTVA}{\dimexpr (\textwidth-\largeurDescriptif-\largeurTVA)/4\relax} + \newcommand{\largeurChiffres}{\dimexpr (\textwidth-\largeurDescriptif)/3 \relax} +\else + \newcommand{\largeurChiffresAvecTVA}{\dimexpr (\textwidth-\largeurDescriptif-\largeurTVA)/5\relax} + \newcommand{\largeurChiffres}{\dimexpr (\textwidth-\largeurDescriptif)/4 \relax} +\fi \npaddmissingzero \nprounddigits{2} \def\@TVAdefaut{19,6} @@ -94,8 +98,8 @@ \noindent\node (b)[xshift=0.5\textwidth,text width=0.5\textwidth, right]{% \@adresseemet% }; - \coordinate[xshift=-1\textwidth,yshift=1ex] (a) at (b.north); - \coordinate[xshift=1em,yshift=-1ex] (c) at (b.south); + \coordinate[xshift=-\textwidth-\epaisseurcadre,yshift=1ex] (a) at (b.north); + \coordinate[xshift=-\epaisseurcadre,yshift=-1ex] (c) at (b.south); \draw[color=encadre,line width=\epaisseurcadre] (a) rectangle (c); \end{tikzpicture} @@ -129,8 +133,8 @@ \libelle{{\datetxt}} \today \\ \ifdef{\@numero}{% \libelle{{\@type\ntxt}} \@numero + \\ }{} - \\ \ifdef{\@codedest}{% \libelle{{\codeclient}} \@codedest }{} @@ -151,14 +155,18 @@ \newenvironment{facture}{% \setlength{\extrarowheight}{0.5ex} \setlength{\tabcolsep}{0.5em} + \edef\@largeurDescriptif{\dimexpr\largeurDescriptif -2\tabcolsep\relax} + \edef\@largeurChiffres{\dimexpr\largeurChiffres -2\tabcolsep\relax} + \edef\@largeurTVA{\dimexpr\largeurTVA -2\tabcolsep\relax} + \edef\@largeurChiffresAvecTVA{\dimexpr\largeurChiffresAvecTVA -2\tabcolsep\relax} \arrayrulecolor{encadre} \ifsansTVA% \ifsansremise% \begin{longtable}{% - |p{\largeurDescriptif}%Descriptif - |P{\largeurChiffres}%Qt - |P{\largeurChiffres}%Prix - |P{\largeurChiffres}|%Total + |p{\@largeurDescriptif}%Descriptif + |P{\@largeurChiffres}%Qt + |P{\@largeurChiffres}%Prix + |P{\@largeurChiffres}|%Total }% \hline% \rowcolor{entetes}% @@ -169,11 +177,11 @@ \tabularnewline[1ex]% \else% \begin{longtable}{% - |p{\largeurDescriptif}%Descriptif - |P{\largeurChiffres}%Qt - |P{\largeurChiffres}%Prix - |P{\largeurChiffres}%Remise - |P{\largeurChiffres}|%Total + |p{\@largeurDescriptif}%Descriptif + |P{\@largeurChiffres}%Qt + |P{\@largeurChiffres}%Prix + |P{\@largeurChiffres}%Remise + |P{\@largeurChiffres}|%Total }% \hline% \rowcolor{entetes}% @@ -187,12 +195,12 @@ \else% \ifsansremise% \begin{longtable}{% - |p{\largeurDescriptif}|%Descriptif - P{\largeurChiffresAvecTVA}|%Qt - P{\largeurChiffresAvecTVA}|%HT unitaire - P{\largeurChiffresAvecTVA}|%Totalht - P{\largeurChiffresAvecTVA}|%TVA - P{\largeurChiffresAvecTVA}|%Total TTC + |p{\@largeurDescriptif}|%Descriptif + P{\@largeurChiffresAvecTVA}|%Qt + P{\@largeurChiffresAvecTVA}|%HT unitaire + P{\@largeurChiffresAvecTVA}|%Totalht + P{\@largeurTVA}|%TVA + P{\@largeurChiffresAvecTVA}|%Total TTC }% \hline% \rowcolor{entetes} @@ -205,13 +213,13 @@ \else% \begin{longtable}{% - |p{\largeurDescriptif}|%Descriptif - P{\largeurChiffresAvecTVA}|%Qt - P{\largeurChiffresAvecTVA}|%HT unitaire - P{\largeurChiffresAvecTVA}|%Remise - P{\largeurChiffresAvecTVA}|%Totalht - P{\largeurChiffresAvecTVA}|%TVA - P{\largeurChiffresAvecTVA}|%Total TTC + |p{\@largeurDescriptif}|%Descriptif + P{\@largeurChiffresAvecTVA}|%Qt + P{\@largeurChiffresAvecTVA}|%HT unitaire + P{\@largeurChiffresAvecTVA}|%Remise + P{\@largeurChiffresAvecTVA}|%Totalht + P{\@largeurTVA}|%TVA + P{\@largeurChiffresAvecTVA}|%Total TTC }% \hline% \rowcolor{entetes} @@ -230,18 +238,14 @@ }% {% \end{longtable} - \begin{tikzpicture} - \draw[color=white] (0,0) circle (0.001); - \node[right,xshift=0.66\textwidth,text width=0.33\textwidth]{% \ifsansTVA% - \hfill \libelle{\tottxt:} \numprint[\unite]{\tot}\\% + \noindent\hspace{0.66\textwidth}\hfill \libelle{\tottxt:} \numprint[\unite]{\tot}\\% \else% - \libelle{\totHTtxt:}\hfill \numprint[\unite]{\totHT} \\% - \libelle{\totTVAtxt:}\hfill \numprint[\unite]{\totTVA} \\% - \libelle{\totTTCtxt:}\hfill \numprint[\unite]{\totTTC} \\ + \noindent\hspace{0.66\textwidth}\libelle{\totHTtxt:}\hfill \numprint[\unite]{\totHT}\\% + \hbox{}\hspace{0.66\textwidth}\libelle{\totTVAtxt:}\hfill \numprint[\unite]{\totTVA}\\% + \hbox{}\noindent\hspace{0.66\textwidth}\libelle{\totTTCtxt:}\hfill \numprint[\unite]{\totTTC}\\ \fi - \postTotaux}; - \end{tikzpicture} + \hspace{0.66\textwidth}\postTotaux } \newcommand{\lignesansTVA}[5]{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/facture.tlpobj new/tlpkg/tlpobj/facture.tlpobj --- old/tlpkg/tlpobj/facture.tlpobj 2016-04-14 19:00:36.000000000 +0200 +++ new/tlpkg/tlpobj/facture.tlpobj 2017-04-17 16:25:04.000000000 +0200 @@ -1,6 +1,6 @@ name facture category Package -revision 36075 +revision 43865 shortdesc Generate an invoice relocated 1 longdesc Une classe simple permettant de produire une facture, avec ou @@ -10,9 +10,9 @@ longdesc addresses for delivery and for billing are permitted. runfiles size=3 RELOC/tex/xelatex/facture/facture.cls -catalogue-also invoice +catalogue-also invoice factura catalogue-ctan /macros/xetex/latex/facture -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2017-04-13 13:45:47 +0200 +catalogue-license cc-by-sa-2 catalogue-topics invoice class xetex -catalogue-version 1.2.1 +catalogue-version 1.2.2 ++++++ faktor.doc.tar.xz ++++++ ++++++ faktor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/faktor.tlpobj new/tlpkg/tlpobj/faktor.tlpobj --- old/tlpkg/tlpobj/faktor.tlpobj 2016-04-14 19:00:36.000000000 +0200 +++ new/tlpkg/tlpobj/faktor.tlpobj 2017-04-14 17:39:44.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/faktor/faktor.sty catalogue-ctan /macros/latex/contrib/faktor -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 0.1b ++++++ fancybox.doc.tar.xz ++++++ ++++++ fancybox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancybox.tlpobj new/tlpkg/tlpobj/fancybox.tlpobj --- old/tlpkg/tlpobj/fancybox.tlpobj 2016-04-14 19:00:37.000000000 +0200 +++ new/tlpkg/tlpobj/fancybox.tlpobj 2017-04-14 17:39:44.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=7 RELOC/tex/latex/fancybox/fancybox.sty catalogue-ctan /macros/latex/contrib/fancybox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics boxing catalogue-version 1.4 ++++++ fancyhdr-it.doc.tar.xz ++++++ ++++++ fancyhdr.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fancyhdr/README new/doc/latex/fancyhdr/README --- old/doc/latex/fancyhdr/README 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/fancyhdr/README 2017-06-06 01:14:32.000000000 +0200 @@ -1,31 +1,32 @@ -This is fancyhdr, a replacement for fancyheadings. +fancyhdr â Extensive control of page headers and footers in LaTeX2Îµ -I still still intend to make sometime in the future a real .dtx of it, -including the minimal documentation. The current documentation is in -fancyhdr.tex, but this contains much more material than the fancyhdr doc. -When the fancyhdr.dtx is ready, I will rename fancyhdr.tex into something -like pagelayout.tex to get it more in line with the title (Page Layout in -LaTeX). - -fancyhdr is 99% compatible with fancyheadings. The only incompatibility is -that \headrulewidth and \footrulewidth and their \plain... versions are no -longer length parameters, but normal macros (to be changed with -\renewcommand rather than \setlength). - -Although all the other old fancyheadings commands continue to work you are -advised to use the new syntax as described in fancyhdr.tex, because this is -much easier to use in complicated cases. The old way of doing is no longer -described in the manual, except for the simplest use of \lhead etc. - -In order to latex the documentation you need to install a copy of -tex-archive/macros/latex/contrib/other/misc/boxedminipage.sty - -The fixmarks.sty is now obsolete, as it is superseded by David Carlisle's -fix2col.sty (tex-archive/macros/latex/contrib/supported/carlisle/) so it is -no longer included here. +The package provides extensive facilities, both for constructing headers and footers, and for controlling their use (for example, at times when LaTeX would automatically change the heading style in use). -fancyhdr.sty version 3 and extramarks.sty version 2 are the packages -as described in the second edition of The LaTeX Companion. +The package consists of the following files: + +README This file +fancyhdr.sty the LaTeX package +fancyhdr.tex extensive documentation file +fancyhdr.pdf PDF of the above +fancyheadings.sty this loads fancyhdr with a warning message +extramarks.sty a package for additional marks + +Fancyhdr is a replacement for the old LaTeX2 package fancyheadings. That +one should not be used anymore. The package fancyheadings included here +just loads fancyhdr with a warning message. + +The documentation (fancyhdr.tex/fancyhdr.pdf) describes both +fancyhdr.sty and extramarks.sty. +In order to latex the documentation you need to have a copy of +boxedminipage.sty (CTAN:/macros/latex/contrib/boxedminipage) installed. + +There used to be a package fixmarks.sty, but that is obsolete. It fixed +a problem in LaTeX, but that is now solved in the LaTeX2Îµ system itself. +So it is no longer included. + +fancyhdr.sty version 3 and extramarks.sty version 2 are the packages as +described in the second edition of The LaTeX Companion. But that +documentation should also suffice for the newer versions. LICENCE: All files in this package may be distributed under the terms of the LaTeX Project Public License, as described in lppl.txt in the base @@ -33,7 +34,7 @@ version. -- Piet van Oostrum. -<piet(a)cs.ruu.nl> -http://www.cs.ruu.nl/~piet +<piet(a)vanoostrum.org> +http://www.piet.vanoostrum.org/ Binary files old/doc/latex/fancyhdr/fancyhdr.pdf and new/doc/latex/fancyhdr/fancyhdr.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fancyhdr/fancyhdr.tex new/doc/latex/fancyhdr/fancyhdr.tex --- old/doc/latex/fancyhdr/fancyhdr.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/fancyhdr/fancyhdr.tex 2017-06-06 01:14:32.000000000 +0200 @@ -6,18 +6,14 @@ \usepackage{array} \usepackage{a4wide} \usepackage{boxedminipage} -%%\usepackage{fancyheadings} -%%\pagestyle{fancy} -%%\lhead{\rightmark} -%%\rhead{\thepage} -%%\cfoot{} +\usepackage{fourier-orns} \makeindex \title{Page layout in \LaTeX} \author{Piet van Oostrum\thanks{A considerable part of this article was written by George Gr\"atzer (University of Manitoba) in \emph{Notices Amer. Math. Soc.} Thanks, George!}\\ - Dept.\ of Computer Science\\ + Dept.\ of Computer Science\thanks{This was my employer at the time I developed this package. I am now retired.}\\ Utrecht University} \def\latex/{\protect\LaTeX{}} \def\tex/{\TeX} @@ -29,9 +25,9 @@ PSNFSS}} \newcommand{\bs}{\symbol{'134}} \newcommand{\Cmd}[1]{\texttt{\def\{{\char`\{}\def\}{\char`\}}\bs#1}} -\newcommand{\CmdIndex}[1]{\index{#1@\texttt{\bs#1}}} -\newcommand{\TTindex}[1]{\index{#1@\texttt{#1}}} -\newcommand{\PSindex}[1]{\index{page style!#1@\texttt{#1}}} +\newcommand{\CmdIndex}[1]{\index{#1@\string\texttt{\bs#1}}} +\newcommand{\TTindex}[1]{\index{#1@\string\texttt{#1}}} +\newcommand{\PSindex}[1]{\index{page style!#1@\string\texttt{#1}}} %\floatstyle{ruled} \restylefloat{figure} \renewcommand{\topfraction}{0.9} @@ -58,12 +54,9 @@ Originally this was the documentation of the \textsf{fancyheadings} package. It did contain also other info, e.g. advanced use of marks. It has now been upgraded to include more, e.g. the handling of floats. - The fancyheadings documentation has been upgraded to conform to version 2 - of this package\footnote{this version is due to be released Real Soon Now}. For reasons of compatibility with certain operating systems, the - name of the package has been changed to \textsf{fancyhdr}. + The documentation describes version 3.6 or later of the \textsf{fancyhdr} package + and version 2.1 or later of the \textsf{extramarks} package. - Although this paper uses \LaTeXe{} commands, most of the techniques can - be used with older \LaTeX versions with appropriate changes. \end{abstract} \tableofcontents @@ -94,7 +87,7 @@ these packages to get the desired result rather than fiddling with the output routine yourself. -There a a number of things that you must be aware of: +There are a number of things that you must be aware of: \begin{enumerate} \item The margins on the left are not called \Cmd{leftmargin}, but \Cmd{evensidemargin} (on even-numbered pages) and \Cmd{oddsidemargin} @@ -201,22 +194,6 @@ Of course, you also have complete control over fonts, uppercase and lowercase displays, etc. -%%% \section{Where to get it?}\label{get} -%%% You only need the file \verb|fancyhdr.sty| which you can find at the -%%% \index{ftp} -%%% CTAN sites: \verb|ftp.shsu.edu| (U.S.), \verb|ftp.tex.ac.uk| (U.K.), and -%%% \verb|ftp.dante.de| (Germany). -%%% You will find it in the directory\\ -%%% \verb|/tex-archive/macros/latex209/contrib/fancyhdr|. Although -%%% \textsf{fancyhdr} -%%% is a \latex/ 2.09 style file, it will work with \LaTeXe{}. Also this -%%% \TTindex{fixmarks.sty} -%%% \TTindex{extramarks.sty} -%%% article and the two packages \texttt{fixmarks} and \texttt{extramarks} can -%%% be found there. (The code for these packages given in this article is a -%%% simplified version.) - - \section{Simple use of \textsf{fancyhdr}} To use this package in a \LaTeXe\ document, place the file \verb|fancyhdr.sty| in a directory/folder where \tex/ can find it (normally in the input @@ -226,9 +203,7 @@ \begin{verbatim} \documentclass{...} \end{verbatim} -the commands\footnote{For LaTeX2.09 you should specify \texttt{[fancyhdr]} - in the \Cmd{documentstyle} instead of the \Cmd{usepackage} - command.}: +the commands: \PSindex{fancy} \begin{verbatim} @@ -261,8 +236,8 @@ following page layout: \begin{fblock} -\noindent\makebox[\textwidth]{\hfill\bfseries The performance of new -graduates} +\noindent\makebox[\textwidth]{\hfill\textbf{The performance of new +graduates}} \noindent\makebox[\textwidth]{\hrulefill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hfill page body\hfill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hrulefill} @@ -287,7 +262,7 @@ \begin{verbatim} \lhead{} \chead{} -\rhead{\bfseries The performance of new graduates} +\rhead{\textbf{The performance of new graduates}} \lfoot{From: K. Grant} \cfoot{To: Dean A. Smith} \rfoot{\thepage} @@ -295,7 +270,7 @@ \renewcommand{\footrulewidth}{0.4pt} \end{verbatim} (The \Cmd{thepage} macro displays the current page number. -\Cmd{bfseries} is the \LaTeXe's way of selecting bold face.) +\Cmd{textbf} puts it in bold face.) This is now fine, except that the first page does not need all these headers and footers. To eliminate all but the @@ -337,8 +312,8 @@ \begin{fblock} -\noindent\makebox[\textwidth]{\bfseries The performance of new -graduates\hfill} +\noindent\makebox[\textwidth]{\textbf{The performance of new +graduates}\hfill} \noindent\makebox[\textwidth]{\hrulefill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hfill page body\hfill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hrulefill} @@ -352,7 +327,7 @@ \begin{verbatim} \fancyhead{} % clear all header fields -\fancyhead[RO,LE]{\bfseries The performance of new graduates} +\fancyhead[RO,LE]{\textbf{The performance of new graduates}} \fancyfoot{} % clear all footer fields \fancyfoot[LE,RO]{\thepage} \fancyfoot[LO,CE]{From: K. Grant} @@ -437,7 +412,7 @@ \begin{verbatim} \fancypagestyle{plain}{% \fancyhf{} % clear all header and footer fields -\fancyfoot[C]{\bfseries \thepage} % except the center +\fancyfoot[C]{\textbf{\thepage}} % except the center \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt}} \end{verbatim} @@ -458,7 +433,7 @@ On an even page, we get the layout: \begin{fblock} -\noindent\makebox[\textwidth]{\sl 1.2 EVALUATION\hfill +\noindent\makebox[\textwidth]{\textsl{1.2 EVALUATION}\hfill CHAPTER 1. INTRODUCTION} \noindent\makebox[\textwidth]{\hrulefill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hfill page body\hfill}\\[\baselineskip] @@ -469,7 +444,7 @@ On an odd page, we get the layout: \begin{fblock} -\noindent\makebox[\textwidth]{\sl CHAPTER 1. INTRODUCTION\hfill +\noindent\makebox[\textwidth]{\textsl{CHAPTER 1. INTRODUCTION}\hfill 1.2 EVALUATION} \noindent\makebox[\textwidth]{\hrulefill}\\[\baselineskip] \noindent\makebox[\textwidth]{\hfill page body\hfill}\\[\baselineskip] @@ -484,8 +459,8 @@ \CmdIndex{rightmark} \CmdIndex{leftmark} \begin{verbatim} -\fancyhead[LE,RO]{\slshape \rightmark} -\fancyhead[LO,RE]{\slshape \leftmark} +\fancyhead[LE,RO]{\textsl{\rightmark}} +\fancyhead[LO,RE]{\textsl{\leftmark}} \fancyfoot[C]{\thepage} \end{verbatim} @@ -749,11 +724,6 @@ \fancyhead[LO,RE]{\thepage} \end{verbatim} -Dictionaries are often done with two columns. Unfortunately there is a bug -in \latex/'s twocolumn option which causes some marks to be lost. If you -use David Carlisle's fix2col.sty\TTindex{fix2col.sty} this will be solved. - - \section{Fancy layouts} \index{multi-line} @@ -807,6 +777,23 @@ to\headwidth{\dotfill}\vss}} \end{verbatim} +As an alternative to changing \Cmd{headrulewidth} to 0 to have the rule disappear, you can also make it empty with +\begin{verbatim} +\renewcommand{\headrule}{} +\end{verbatim} +Visually this make no difference, but it is more difficult to restore it later to its default value. + +Finally, let us make a real `decorative' line\footnote{Based upon an idea by Wayne Chan.}. +\begin{verbatim} +\usepackage{fourier-orns} +... +\renewcommand\headrule{\hrulefill +\raisebox{-2.1pt}[10pt][10pt]{\quad\decofourleft\decotwo\decofourright\quad}\hrulefill} +\end{verbatim} +This gives us the following headrule: + +\noindent\makebox[\textwidth]{\hrulefill \raisebox{-2.1pt}[10pt][10pt]{\quad\decofourleft\decotwo\decofourright\quad}\hrulefill} + \CmdIndex{footruleskip} There is one additional parameter that you can set: \Cmd{footruleskip}. It defines the distance between the decorative line in the footer and the top @@ -814,72 +801,50 @@ distance. You may want to adjust it if you use unusally large or small fonts in the footer. Change it with \Cmd{renewcommand}. +\section{Two book examples} +The following definitions give an approximation of the style +used in L. Lamport's \latex/ book. -\section{The width of the headers and footers} - +Lamport's header overhangs the outside margin. This is done as follows. The width of headers and footers is \Cmd{headwidth}, which by default equals the width of the text: \Cmd{textwidth}. You can make the width \CmdIndex{headwidth} -wider (or narrower) by using the commands -\CmdIndex{fancyheadoffset} -\CmdIndex{fancyfootoffset} -\CmdIndex{fancyhfoffset} -\Cmd{fancyheadoffset}, \Cmd{fancyfootoffset} and \Cmd{fancyhfoffset}% -\footnote{These commands are defined since fancyhdr version 3.0. In older - versions you just changed \Cmd{headwidth} with the -\Cmd{setlength} and \Cmd{addtolength} commands. You are encouraged to use - these newer offset commands instead. You certainly can't mix the two - approaches.}. -These are similar to \Cmd{fancyhead}, \Cmd{fancyfoot} and \Cmd{fancyhf}. -The only difference is that the offsets don't accept the C option. - -Usage: \Cmd{fancyhfoffset[place]\{length\}} -and similar for the others. - -It defines offsets to be applied to the header/footer to let it stick into -the margins if length $>$ 0 and to be smaller if length $<$ 0. -place is like in \Cmd{fancyhead}, except that only E,O,L,R (or the lowercase) -can be used. - -With these commands \Cmd{headwidth} will be dynamically calculated in -the headers/footers to be \Cmd{textwidth} + left offset + right offset, so -that e.g. you can use the following to define a red line in the header -and a blue line in the footer (please note that the width of the footer is -also called \Cmd{headwidth} although it may differ from the width of the -header): - -\begin{verbatim} -\renewcommand{\headrule}{{\color{red}% - \hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}} - -\setlength{\footrulewidth}{\headrulewidth} - -\renewcommand{\footrule}{{\color{blue}% - \vskip-\footruleskip\vskip-\footrulewidth -\hrule width\headwidth height\footrulewidth\vskip\footruleskip}} -\end{verbatim} +wider (or narrower) by redefining \Cmd{headwidth} with the +\Cmd{setlength} and \Cmd{addtolength} commands. +To overhang the outside margin where the marginal notes are +\CmdIndex{marginparsep} +\CmdIndex{marginparwidth} +printed, add both \Cmd{marginparsep} and \Cmd{marginparwidth} to +\Cmd{headwidth} with the commands: + +\begin{verbatim} +\addtolength{\headwidth}{\marginparsep} +\addtolength{\headwidth}{\marginparwidth} +\end{verbatim} + +\begin{flushleft} +You must issue these commands \emph{after} the first +\Cmd{pagestyle\{fancy\}} command as this +will establish the default for \Cmd{headwidth}\footnote{In version 2 of + \textsf{fancyhdr} it is usually safe to do it before, but it is still + advised to do after.}. +\end{flushleft} -\section{Two book examples} - -The following definitions give an approximation of the style -used in Leslie Lamport's \latex/ book. - -Lamport's header overhangs the outside margin. This is done with the -offset commands described in the previous section. +And now a complete definition of Lamport's book style: \begin{verbatim} \documentclass{book} \usepackage{fancyhdr} \pagestyle{fancy} -\usepackage{calc} -\fancyheadoffset[LE,RO]{\marginparsep+\marginparwidth} +\addtolength{\headwidth}{\marginparsep} +\addtolength{\headwidth}{\marginparwidth} \renewcommand{\chaptermark}[1]{\markboth{#1}{}} \renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} \fancyhf{} -\fancyhead[LE,RO]{\bfseries\thepage} -\fancyhead[LO]{\bfseries\rightmark} -\fancyhead[RE]{\bfseries\leftmark} +\fancyhead[LE,RO]{\textbf{\thepage}} +\fancyhead[LO]{\textbf{\rightmark}} +\fancyhead[RE]{\textbf{\leftmark}} \fancypagestyle{plain}{% \fancyhead{} % get rid of headers \renewcommand{\headrulewidth}{0pt} % and the line @@ -890,6 +855,20 @@ Notice that the \Cmd{chaptermark} and \Cmd{sectionmark} commands have been redefined to eliminate the chapter numbers and the uppercaseness. +For more control about the horizontal position of the headers and/or footers, \textsf{fancyhdr} has additional commands to specify the offset of the header and/or footer elements. Use \Cmd{fancyhfoffset[place]\{length\}} +\CmdIndex{fancyhfoffset} +to offset one or more elements. The \texttt{place} parameter is like the optional parameter of \Cmd{fancyhf}, like \texttt{L R E O}, except that \texttt{C} cannot be used. It specifies for which elements the offset should be applied. The \texttt{length} parameter specifies the actual offset. Positive values move the element outward (into the margin), negative values inward. There are also specialised commands \Cmd{fancyheadoffset} and \Cmd{fancyfootoffset}, which have the \texttt{H} and \texttt{F} parameter pre-applied, respectively. +\CmdIndex{fancyheadoffset} +\CmdIndex{fancyfootoffset} + +When you use these commands, \latex/ will recalculate \Cmd{headwidth}, based on the given parameters. + +So the above example could also have been done with (N.B. You can only use such an expression as a length parameter if the \textsf{calc} package is used): + +\begin{verbatim} +\fancyheadoffset[LE,RO]{\marginparsep+\marginparwidth} +\end{verbatim} + For the second example, we take the \amslatex/ book.% \cite{gG93B}. % George Gratzer, Math into LaTeX, An Introduction to LaTeX and AMS-LaTeX, % Birkhauser Boston, ISBN 0-8176-3805-9 @@ -981,11 +960,10 @@ \end{verbatim} Sometimes you may want to change the layout also for pages that contain a -float on the top of the page or a float on the bottom of the page. +float on the top of the page, a float on the bottom of the page or a footnote on the bottom of the page. -\textsf{fancyhdr} gives you the commands \Cmd{iftopfloat} and \Cmd{ifbotfloat} -similar to - \Cmd{iffloatpage}. +\textsf{fancyhdr} gives you the commands \Cmd{iftopfloat}, \Cmd{ifbotfloat} and \Cmd{iffootnote} +similar to \Cmd{iffloatpage}. Note: Marks in floats will not be visible in \latex/'s output routine, so it is not useful to put marks in floats. So there is currently no way to @@ -1034,12 +1012,7 @@ \label{sec:nofm} Some document writers prefer the pages to be numbered as \textsf{n} of -\textsf{m} where \textsf{m} is the number of pages in the document. There -\TTindex{nofm.sty} -is a package \texttt{nofm.sty} available, but some versions of it are -defective, and most don't work with fancyhdr because they take over the -\TTindex{lastpage.sty} -complete page layout. For \LaTeXe{} there is a package \texttt{lastpage} +\textsf{m} where \textsf{m} is the number of pages in the document. There is a package \texttt{lastpage} available which you can use with \textsf{fancyhdr} as follows: \begin{verbatim} @@ -1048,24 +1021,11 @@ \cfoot{\thepage\ of \pageref{LastPage}} \end{verbatim} -If you are still using \latex/2.09 and you are not able to switch to -\LaTeXe{} you can use the \latex/2.09 compatible \texttt{lastpage209.sty}. -which is defined as -follows: - -\begin{verbatim} -\let\origenddocument=\enddocument -\def\enddocument{\clearpage\if@filesw - {\addtocounter{page}{-1} \immediate\write\@mainaux - {\string\newlabel{LastPage}{{}{\thepage}}}}\origenddocument} -\end{verbatim} - The value of the \texttt{LastPage} label can be used to make different headers or footers on the last page of a document. E.g.\ if you want the footer of every odd page, except if it is the last one, to contain the text ``please turn over'', this can be done as -follows\footnote{This requires a reasonably recent version of the - \texttt{ifthen} package.}: +follows: \begin{verbatim} \usepackage{lastpage} @@ -1080,18 +1040,30 @@ In technical documentation very often page numbers are used of the form 2-10 where the first number is the chapter number and the second is the pagenumber relative to the chapter. Sometimes section is used rather than -chapter. The package \textsf{chappg} can be used to get this format. If you -want to change the layout e.g. use a dot rather than a dash, or a section -rather than a chapter, you should make a private copy and edit it. - -This package redefines \Cmd{thepage} as -\Cmd{arabic\{chapter\}-}\Cmd{arabic\{page\}}. -Unfortunately this gives numbers rather than letters for appendices. A -better definition would be \Cmd{thechapter-}\Cmd{arabic\{page\}} but you can -give this definition yourself after the \Cmd{usepackage\{chappg\}} command. +chapter. The package \textsf{chappg} can be used to get this format. + +Basically this package redefines \Cmd{thepage} as +\Cmd{thechapter}\Cmd{chappgsep}\Cmd{arabic\{page\}}, where \Cmd{chappgsep} by default is ``-''. If you want do use a different separator, you must redefine \Cmd{chappgsep}, for example to use an en-dash: + +\begin{verbatim} +\renewcommand{\chappgsep}{--} +\end{verbatim} + +To use a different prefix, for example the section number, use the \Cmd{pagenumbering\{bychapter\}} command with an optional argument specifying the prefix. +\CmdIndex{pagenumbering} + +\begin{verbatim} +\pagenumbering[\thesection]{bychapter} +\end{verbatim} + What the package also does is reset the page number to 1 at the beginning of each chapter. +There is a caveat when you have appendixes in your document. Before the +\Cmd{appendix} command you should give a \Cmd{clearpage} or +\Cmd{cleardoublepage}. See the \textsf{chappg} documentation for +details. + There is a fundamental difference between the page numbering of the style ``\emph{m} of \emph{n}'' as described in the previous section and the current one. The \emph{m} of \emph{n} style is only used in the page header @@ -1123,7 +1095,7 @@ \texttt{afterpage} package with:\\ \Cmd{afterpage\{}\Cmd{lhead\{new value\}\}} or \CmdIndex{pagenumbering} -\Cmd{afterpage\{}\Cmd{pagenumbering\{roman\}}. You cannot use \Cmd{afterpage} +\Cmd{afterpage\{}\Cmd{pagenumbering\{roman\}\}}. You cannot use \Cmd{afterpage} to change the \Cmd{pagestyle} as the commands issued by \Cmd{afterpage} are local in a group, and the \Cmd{pagestyle} command makes only local changes. The \Cmd{pagenumbering} and the \textsf{fancyhdr} commands @@ -1180,11 +1152,8 @@ You cannot use \latex/'s mark mechanisms for this if you also want to use chapter and section information. -The fancyhdr distribution includes a package that gives you -two extra marks that can be used in this situation\footnote{After I made - this package I discovered a package \texttt{secret.sty} that does a - similar thing to mark confidential paragraphs if they cross a page - boundary. It does it, however, by changing the output routine.}. +The \textsf{extramarks} package gives you +two extra marks that can be used in this situation. Here is a way to use this package: \begin{verbatim} @@ -1207,32 +1176,24 @@ There are two new marks that can be used in the page layout with this package: If commands of the form \verb|\extramarks{|$m_1$\verb|}{|$m_2$\verb|}| are given -\CmdIndex{firstleftxmark} -\Cmd{firstleftxmark}\footnote{% - In extramarks.sty before version 2.0 only the shorthand commands - \Cmd{firstxmark} and \Cmd{lastxmark} were defined.} -gives you the first $m_1$ value, +\CmdIndex{firstxmark} +\CmdIndex{lastxmark} +\Cmd{firstxmark} gives you the first $m_1$ value and +\Cmd{lastxmark} gives you the last $m_2$ value +of the current page. + +In case you want the last $m_1$ value or the first $m_2$ value, you can use the \Cmd{lastleftxmark} or \Cmd{firstrightxmark}, respectively. For symmetry reasons there are also commands \Cmd{firstleftxmark} (=\Cmd{firstxmark}), \Cmd{lastrightxmark} (=\Cmd{lastxmark}), \Cmd{topleftxmark} (=\Cmd{topxmark}) and \Cmd{toprightxmark}. The top-marks are basically the last-marks of the previous page. \CmdIndex{lastleftxmark} -\Cmd{lastleftxmark} gives you the last $m_1$ value, \CmdIndex{firstrightxmark} -\Cmd{firstrightxmark} gives you the first $m_2$ value and +\CmdIndex{firstleftxmark} \CmdIndex{lastrightxmark} -\Cmd{lastrightxmark} gives you the last $m_2$ value -of the current page. -\CmdIndex{firstxmark} -Also for convenience (similar to the standard \latex/ marks) -\Cmd{firstxmark} is an alias for \Cmd{firstleftxmark} and -\CmdIndex{lastxmark} -\Cmd{lastxmark} is an alias for \Cmd{lastrightxmark}. -There is also a \Cmd{topxmark} or \Cmd{topleftxmark} similar to \tex/'s -\Cmd{topmark} but it probably is not of much use. +\CmdIndex{topleftxmark} +\CmdIndex{toprightxmark} +The package also gives you the \Cmd{firstleftmark} and \Cmd{lastrightmark} +commands that complement the standard \latex/ marks. \CmdIndex{firstleftmark} \CmdIndex{lastrightmark} -Finally it also gives you the \Cmd{firstleftmark} and \Cmd{lastrightmark} -commands that complement the standard \latex/ marks. - - To stress the point that marks are the correct way to do this, let me give you a ``solution'' that will not work\footnote{Actually there is @@ -1560,8 +1521,7 @@ next page. \item use the \texttt{flafter} package which causes floats never to be placed ``backwards''. -\item use the command \Cmd{suppressfloats[t]}\footnote{This command and the - ``!'' placement parameter are not defined in \LaTeX2.09.}. This +\item use the command \Cmd{suppressfloats[t]}. This command will cause floats for the top position \emph{on this page} to be moved to the next page. This can also be done with \texttt{[b]} or without parameter for all floats on this page. @@ -1588,10 +1548,9 @@ \end{verbatim} in the preamble. Now you will be able to specify \texttt{[H]} as the position parameter, which will mean ``HERE and only -HERE''. This may cause an unwanted page break however\footnote{There used -to be a \texttt{here.sty} with the same effect, but this is incompatible -with \LaTeXe}. If you want to avoid the unwanted pagebreak, i.e. let -\LaTeX{} move the float only if it doesn't fit on the page, the use the +HERE''. This may cause an unwanted page break however. +If you want to avoid the unwanted pagebreak, i.e. let +\LaTeX{} move the float only if it doesn't fit on the page, then use the \textsf{afterpage} package with: \begin{verbatim} \afterpage{\clearpage \begin{figure}[H] ... \end{figure}} @@ -1710,13 +1669,36 @@ \section{Contact information} Piet van Oostrum\\ -Dept.\ of Computer Science\\ -Utrecht University\\ -P.O. Box 80.089\\ -3508 TB Utrecht, The Netherlands\\ -Telephone: +31 30 2532180 Telefax: +31 30 2513791\\ -E-mail: piet(a)cs.uu.nl \\ -WWW: http://www.cs.uu.nl/people/piet +E-mail: piet(a)vanoostrum.org \\ +WWW: http://piet.vanoostrum.org + +\section{Version information} +\begin{itemize} +\item Version 1.0. March 11, 2003. This is the version that was distributed for a + long time on CTAN. Version history before this has been lost. +\item Version 2.0. August 27, 2016: + \begin{itemize} + \item Removed references to fixmarks.sty as that is no longer used. + \item References to older \LaTeX{} versions removed. + \item Removed obsolete source code of \texttt{extramarks.sty} + \item Changed font commands to \Cmd{textbf} and \Cmd{textsl}. + \item Added description of the \Cmd{fancy\ldots offset} commands. + \item Added various \Cmd{\ldots xmark} commands from \texttt{extramarks.sty}. + \item Various corrections applied. + \item Updated contact information. + \item Added Version information. :) + \end{itemize} +\item Version 2.1. August 28...., 2016: + \begin{itemize} + \item Explain what the top-marks are. + \end{itemize} +\item Version 2.1. Sept. 6, 2016 + \begin{itemize} + \item Add \verb|\string| to special indexing commands to get a neater index file. + \item Add a decorative headrule example + \end{itemize} + +\end{itemize} \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyhdr.doc.tlpobj new/tlpkg/tlpobj/fancyhdr.doc.tlpobj --- old/tlpkg/tlpobj/fancyhdr.doc.tlpobj 2016-04-14 19:00:37.000000000 +0200 +++ new/tlpkg/tlpobj/fancyhdr.doc.tlpobj 2017-06-06 02:21:53.000000000 +0200 @@ -1,9 +1,9 @@ name fancyhdr.doc category Package -revision 15878 +revision 44479 shortdesc doc files of fancyhdr relocated 1 -docfiles size=95 +docfiles size=112 RELOC/doc/latex/fancyhdr/README RELOC/doc/latex/fancyhdr/fancyhdr.pdf RELOC/doc/latex/fancyhdr/fancyhdr.tex ++++++ fancyhdr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyhdr/extramarks.sty new/tex/latex/fancyhdr/extramarks.sty --- old/tex/latex/fancyhdr/extramarks.sty 2006-01-13 00:55:33.000000000 +0100 +++ new/tex/latex/fancyhdr/extramarks.sty 2017-06-06 01:14:32.000000000 +0200 @@ -1,104 +1,46 @@ -% Extra marks for latex. Version 2.0. -% Piet van Oostrum, -% Dept of Computer and Information Sciences, University of Utrecht, -% Padualaan 14, P.O. Box 80.089, 3508 TB Utrecht, The Netherlands -% Telephone: +31 30 2532180. Email: piet(a)cs.uu.nl -% ======================================================================== -% LICENCE: -% This file may be distributed under the terms of the LaTeX Project Public -% License, as described in lppl.txt in the base LaTeX distribution. -% Either version 1 or, at your option, any later version. -% ======================================================================== -% MODIFICATION HISTORY: -% Oct 11, 2000 -% version 1.99e -% Added a few % marks to get rid of unwanted spaces, and \endinput. -% Added LPPL license clause. -% March 12, 2002 -% version 2.0beta -% Adapted for the new implementation of marks in LaTeX to solve bug -% latex/3203. -% Added symmetric commands \firstrightmark, \lastleftmark, \firstleftxmark, -% \firstrightxmark, \lastrightxmark, \lastleftxmark, \topleftxmark and -% \toprightxmark. -% March 3, 2004 -% version 2.0 -% Release. - -% This package gives you two additional marks. -% \extramarks{m1}{m2} define two extra marks for headers/footers -% (especially for use with fancyheadings), which can be retrieved -% by \firstxmark and \lastxmark resp. Usually m1 is what would -% appear at the top of the page, m2 at the bottom of the page. -% Typical usage: -% \pagestyle{fancy} -% \lhead{\firstxmark} -% \rfoot{\lastxmark} -% -% \extramarks{}{Continued on next page...} -% text text text text text text text text text text text text text text text -% text text text text text text text text text text text text text text text -% text text text text text text text text text text text text text text text -% text text text text text text text text text text text text text text text -% text text text text text text text text text text text text text text text -% \extramarks{Continued}{} -% \extramarks{}{} - -% This package also provides two extra handles to the standard LaTeX marks, -% namely \firstleftmark and \lastrightmark (the standard \leftmark and -% \rightmark of LaTeX always give you the last and first, respectively. -% These are the complementary values). For symmetry reasons \firstrightmark -% is an alias for \rightmark and \lastleftmark is an alias for \leftmark - -% Similarly there are now \firstleftxmark \firstrightxmark \lastrightxmark -% \lastleftxmark. Here first and last apply to the position on the page, -% left and right select the m1 and m2 values, respectively. - -% Note: there is an extra command \topxmark, but this doesn't work properly -% if marginpars or floats are used, as LaTeX clobbers TeX's topmark in this -% case. - -\newtoks\@temptokenb - -%Just in case. +%% +%% This is file `extramarks.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fancyhdr.dtx (with options: `extramarks') +%% +%% This is a generated file. +%% +%% This file 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. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{extramarks} + [2016/10/11 v3.9 + Extra marks for LaTeX] +% Copyright (C) 1994-2016 by Piet van Oostrum <piet(a)vanoostrum.org> +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \providecommand\unrestored@protected@xdef{% - \let\protect\@unexpandable@protect - \xdef -} - + \let\protect\@unexpandable@protect \xdef} \def\markboth#1#2{% \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markboth\@themark{#1}{#2}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markboth\@themark{#1}{#2}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% \endgroup \if@nobreak\ifvmode\nobreak\fi\fi} -% This definitions is in latex.ltx. No use to duplicate here -%\def\markright#1{% -% \begingroup -% \let\label\relax \let\index\relax \let\glossary\relax -% \expandafter\@markright\@themark {#1}% -% \@temptokena \expandafter{\@themark}% -% \mark{\the\@temptokena}% -% \endgroup -% \if@nobreak\ifvmode\nobreak\fi\fi} - -% Old definition: -%\def\@markboth#1#2#3#4#5#6{\gdef\@themark{{#5}{#6}{#3}{#4}}} -%\def\@markright#1#2#3#4#5{\gdef\@themark{{#1}{#5}{#3}{#4}}} - -% Note: put #3#4 in toks register. -\def\@markboth#1#2#3#4#5#6{\@temptokena {{#3}{#4}}% +\def\@markboth#1#2#3#4#5#6{\@temptokena{{#3}{#4}}% \unrestored@protected@xdef\@themark{{#5}{#6}\the\@temptokena}} - -% Note: put #1 and #3#4 in toks register. -% Maybe I can get rid of the extra temptokenb by doing the expansion of #5 -% to a temp separately. -\def\@markright#1#2#3#4#5{\@temptokena {#1}\@temptokenb {{#3}{#4}}% +\def\@markright#1#2#3#4#5{\@temptokena{#1}\@temptokenb{{#3}{#4}}% \unrestored@protected@xdef\@themark{{\the\@temptokena}{#5}\the\@temptokenb}} -\def\@leftmark#1#2#3#4{#1} +\def\@leftmark#1#2#3#4{#1} \def\@rightmark#1#2#3#4{#2} \def\leftmark{\expandafter\@leftmark @@ -114,15 +56,14 @@ \def\@themark{{}{}{}{}} -\def\extramarks#1#2{% +\newcommand\extramarks[2]{% \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markextra\@themark{#1}{#2}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markextra\@themark{#1}{#2}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% \endgroup \if@nobreak\ifvmode\nobreak\fi\fi} -%Note Put #1#2 in toks register \def\@markextra#1#2#3#4#5#6{\@temptokena {{#1}{#2}}% \unrestored@protected@xdef\@themark{\the\@temptokena{#5}{#6}}} \def\firstleftxmark{\expandafter\@leftxmark @@ -143,3 +84,5 @@ \def\@leftxmark#1#2#3#4{#3} \def\@rightxmark#1#2#3#4{#4} \endinput +%% +%% End of file `extramarks.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyhdr/fancyhdr.sty new/tex/latex/fancyhdr/fancyhdr.sty --- old/tex/latex/fancyhdr/fancyhdr.sty 2006-10-07 00:52:14.000000000 +0200 +++ new/tex/latex/fancyhdr/fancyhdr.sty 2017-06-06 01:14:32.000000000 +0200 @@ -1,485 +1,236 @@ -% fancyhdr.sty version 3.2 -% Fancy headers and footers for LaTeX. -% Piet van Oostrum, -% Dept of Computer and Information Sciences, University of Utrecht, -% Padualaan 14, P.O. Box 80.089, 3508 TB Utrecht, The Netherlands -% Telephone: +31 30 2532180. Email: piet(a)cs.uu.nl -% ======================================================================== -% LICENCE: -% This file may be distributed under the terms of the LaTeX Project Public -% License, as described in lppl.txt in the base LaTeX distribution. -% Either version 1 or, at your option, any later version. -% ======================================================================== -% MODIFICATION HISTORY: -% Sep 16, 1994 -% version 1.4: Correction for use with \reversemargin -% Sep 29, 1994: -% version 1.5: Added the \iftopfloat, \ifbotfloat and \iffloatpage commands -% Oct 4, 1994: -% version 1.6: Reset single spacing in headers/footers for use with -% setspace.sty or doublespace.sty -% Oct 4, 1994: -% version 1.7: changed \let\@mkboth\markboth to -% \def\@mkboth{\protect\markboth} to make it more robust -% Dec 5, 1994: -% version 1.8: corrections for amsbook/amsart: define \@chapapp and (more -% importantly) use the \chapter/sectionmark definitions from ps@headings if -% they exist (which should be true for all standard classes). -% May 31, 1995: -% version 1.9: The proposed \renewcommand{\headrulewidth}{\iffloatpage... -% construction in the doc did not work properly with the fancyplain style. -% June 1, 1995: -% version 1.91: The definition of \@mkboth wasn't restored on subsequent -% \pagestyle{fancy}'s. -% June 1, 1995: -% version 1.92: The sequence \pagestyle{fancyplain} \pagestyle{plain} -% \pagestyle{fancy} would erroneously select the plain version. -% June 1, 1995: -% version 1.93: \fancypagestyle command added. -% Dec 11, 1995: -% version 1.94: suggested by Conrad Hughes <chughes(a)maths.tcd.ie> -% CJCH, Dec 11, 1995: added \footruleskip to allow control over footrule -% position (old hardcoded value of .3\normalbaselineskip is far too high -% when used with very small footer fonts). -% Jan 31, 1996: -% version 1.95: call \@normalsize in the reset code if that is defined, -% otherwise \normalsize. -% this is to solve a problem with ucthesis.cls, as this doesn't -% define \@currsize. Unfortunately for latex209 calling \normalsize doesn't -% work as this is optimized to do very little, so there \@normalsize should -% be called. Hopefully this code works for all versions of LaTeX known to -% mankind. -% April 25, 1996: -% version 1.96: initialize \headwidth to a magic (negative) value to catch -% most common cases that people change it before calling \pagestyle{fancy}. -% Note it can't be initialized when reading in this file, because -% \textwidth could be changed afterwards. This is quite probable. -% We also switch to \MakeUppercase rather than \uppercase and introduce a -% \nouppercase command for use in headers. and footers. -% May 3, 1996: -% version 1.97: Two changes: -% 1. Undo the change in version 1.8 (using the pagestyle{headings} defaults -% for the chapter and section marks. The current version of amsbook and -% amsart classes don't seem to need them anymore. Moreover the standard -% latex classes don't use \markboth if twoside isn't selected, and this is -% confusing as \leftmark doesn't work as expected. -% 2. include a call to \ps@empty in ps@@fancy. This is to solve a problem -% in the amsbook and amsart classes, that make global changes to \topskip, -% which are reset in \ps@empty. Hopefully this doesn't break other things. -% May 7, 1996: -% version 1.98: -% Added % after the line \def\nouppercase -% May 7, 1996: -% version 1.99: This is the alpha version of fancyhdr 2.0 -% Introduced the new commands \fancyhead, \fancyfoot, and \fancyhf. -% Changed \headrulewidth, \footrulewidth, \footruleskip to -% macros rather than length parameters, In this way they can be -% conditionalized and they don't consume length registers. There is no need -% to have them as length registers unless you want to do calculations with -% them, which is unlikely. Note that this may make some uses of them -% incompatible (i.e. if you have a file that uses \setlength or \xxxx=) -% May 10, 1996: -% version 1.99a: -% Added a few more % signs -% May 10, 1996: -% version 1.99b: -% Changed the syntax of \f@nfor to be resistent to catcode changes of := -% Removed the [1] from the defs of \lhead etc. because the parameter is -% consumed by the \@[xy]lhead etc. macros. -% June 24, 1997: -% version 1.99c: -% corrected \nouppercase to also include the protected form of \MakeUppercase -% \global added to manipulation of \headwidth. -% \iffootnote command added. -% Some comments added about \@fancyhead and \@fancyfoot. -% Aug 24, 1998 -% version 1.99d -% Changed the default \ps@empty to \ps@@empty in order to allow -% \fancypagestyle{empty} redefinition. -% Oct 11, 2000 -% version 2.0 -% Added LPPL license clause. -% -% A check for \headheight is added. An errormessage is given (once) if the -% header is too large. Empty headers don't generate the error even if -% \headheight is very small or even 0pt. -% Warning added for the use of 'E' option when twoside option is not used. -% In this case the 'E' fields will never be used. -% -% Mar 10, 2002 -% version 2.1beta -% New command: \fancyhfoffset[place]{length} -% defines offsets to be applied to the header/footer to let it stick into -% the margins (if length > 0). -% place is like in fancyhead, except that only E,O,L,R can be used. -% This replaces the old calculation based on \headwidth and the marginpar -% area. -% \headwidth will be dynamically calculated in the headers/footers when -% this is used. -% -% Mar 26, 2002 -% version 2.1beta2 -% \fancyhfoffset now also takes h,f as possible letters in the argument to -% allow the header and footer widths to be different. -% New commands \fancyheadoffset and \fancyfootoffset added comparable to -% \fancyhead and \fancyfoot. -% Errormessages and warnings have been made more informative. -% -% Dec 9, 2002 -% version 2.1 -% The defaults for \footrulewidth, \plainheadrulewidth and -% \plainfootrulewidth are changed from \z@skip to 0pt. In this way when -% someone inadvertantly uses \setlength to change any of these, the value -% of \z@skip will not be changed, rather an errormessage will be given. - -% March 3, 2004 -% Release of version 3.0 - -% Oct 7, 2004 -% version 3.1 -% Added '\endlinechar=13' to \fancy@reset to prevent problems with -% includegraphics in header when verbatiminput is active. - -% March 22, 2005 -% version 3.2 -% reset \everypar (the real one) in \fancy@reset because spanish.ldf does -% strange things with \everypar between << and >>. - -\def\ifancy@mpty#1{\def\temp@a{#1}\ifx\temp@a\@empty} - -\def\fancy@def#1#2{\ifancy@mpty{#2}\fancy@gbl\def#1{\leavevmode}\else - \fancy@gbl\def#1{#2\strut}\fi} - -\let\fancy@gbl\global - -\def\@fancyerrmsg#1{% - \ifx\PackageError\undefined - \errmessage{#1}\else - \PackageError{Fancyhdr}{#1}{}\fi} -\def\@fancywarning#1{% - \ifx\PackageWarning\undefined - \errmessage{#1}\else - \PackageWarning{Fancyhdr}{#1}{}\fi} - -% Usage: \@forc \var{charstring}{command to be executed for each char} -% This is similar to LaTeX's \@tfor, but expands the charstring. - -\def\@forc#1#2#3{\expandafter\f@rc\expandafter#1\expandafter{#2}{#3}} +%% +%% This is file `fancyhdr.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fancyhdr.dtx (with options: `fancyhdr') +%% +%% This is a generated file. +%% +%% This file 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. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{fancyhdr}% + [2016/10/11 v3.9 + Extensive control of page headers and footers]% +% Copyright (C) 1994-2016 by Piet van Oostrum <piet(a)vanoostrum.org> +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\def\if@nch@mpty#1{\def\temp@a{#1}\ifx\temp@a\@empty} +\def\f@nch@def#1#2{\if@nch@mpty{#2}\f@nch@gbl\def#1{\leavevmode}\else + \f@nch@gbl\def#1{#2\strut}\fi} +\let\f@nch@gbl\global +\def\f@nch@errmsg#1{% + \ifx\PackageError\undefined \errmessage{#1}\else + \PackageError{Fancyhdr}{#1}{}\fi} +\def\f@nch@warning#1{% + \ifx\PackageWarning\undefined \errmessage{#1}\else + \PackageWarning{Fancyhdr}{#1}{}\fi} +\def\f@nch@forc#1#2#3{\expandafter\f@rc\expandafter#1\expandafter{#2}{#3}} \def\f@rc#1#2#3{\def\temp@ty{#2}\ifx\@empty\temp@ty\else - \f@@rc#1#2\f@@rc{#3}\fi} -\def\f@@rc#1#2#3\f@@rc#4{\def#1{#2}#4\f@rc#1{#3}{#4}} - -% Usage: \f@nfor\name:=list\do{body} -% Like LaTeX's \@for but an empty list is treated as a list with an empty -% element - -\newcommand{\f@nfor}[3]{\edef\@fortmp{#2}% - \expandafter\@forloop#2,\@nil,\@nil\@@#1{#3}} - -% Usage: \def@ult \cs{defaults}{argument} -% sets \cs to the characters from defaults appearing in argument -% or defaults if it would be empty. All characters are lowercased. - -\newcommand\def@ult[3]{% - \edef\temp@a{\lowercase{\edef\noexpand\temp@a{#3}}}\temp@a - \def#1{}% - \@forc\tmpf@ra{#2}% - {\expandafter\if@in\tmpf@ra\temp@a{\edef#1{#1\tmpf@ra}}{}}% - \ifx\@empty#1\def#1{#2}\fi} -% -% \if@in <char><set><truecase><falsecase> -% -\newcommand{\if@in}[4]{% - \edef\temp@a{#2}\def\temp@b##1#1##2\temp@b{\def\temp@b{##1}}% - \expandafter\temp@b#2#1\temp@b\ifx\temp@a\temp@b #4\else #3\fi} - -\newcommand{\fancyhead}{\@ifnextchar[{\f@ncyhf\fancyhead h}% - {\f@ncyhf\fancyhead h[]}} -\newcommand{\fancyfoot}{\@ifnextchar[{\f@ncyhf\fancyfoot f}% - {\f@ncyhf\fancyfoot f[]}} -\newcommand{\fancyhf}{\@ifnextchar[{\f@ncyhf\fancyhf{}}% - {\f@ncyhf\fancyhf{}[]}} - -% New commands for offsets added - -\newcommand{\fancyheadoffset}{\@ifnextchar[{\f@ncyhfoffs\fancyheadoffset h}% - {\f@ncyhfoffs\fancyheadoffset h[]}} -\newcommand{\fancyfootoffset}{\@ifnextchar[{\f@ncyhfoffs\fancyfootoffset f}% - {\f@ncyhfoffs\fancyfootoffset f[]}} -\newcommand{\fancyhfoffset}{\@ifnextchar[{\f@ncyhfoffs\fancyhfoffset{}}% - {\f@ncyhfoffs\fancyhfoffset{}[]}} - -% The header and footer fields are stored in command sequences with -% names of the form: \f@ncy<x><y><z> with <x> for [eo], <y> from [lcr] -% and <z> from [hf]. - -\def\f@ncyhf#1#2[#3]#4{% - \def\temp@c{}% - \@forc\tmpf@ra{#3}% - {\expandafter\if@in\tmpf@ra{eolcrhf,EOLCRHF}% - {}{\edef\temp@c{\temp@c\tmpf@ra}}}% - \ifx\@empty\temp@c\else - \@fancyerrmsg{Illegal char `\temp@c' in \string#1 argument: - [#3]}% - \fi - \f@nfor\temp@c{#3}% - {\def@ult\f@@@eo{eo}\temp@c - \if@twoside\else - \if\f@@@eo e\@fancywarning - {\string#1's `E' option without twoside option is useless}\fi\fi - \def@ult\f@@@lcr{lcr}\temp@c - \def@ult\f@@@hf{hf}{#2\temp@c}% - \@forc\f@@eo\f@@@eo - {\@forc\f@@lcr\f@@@lcr - {\@forc\f@@hf\f@@@hf - {\expandafter\fancy@def\csname - f@ncy\f@@eo\f@@lcr\f@@hf\endcsname - {#4}}}}}} - -\def\f@ncyhfoffs#1#2[#3]#4{% - \def\temp@c{}% - \@forc\tmpf@ra{#3}% - {\expandafter\if@in\tmpf@ra{eolrhf,EOLRHF}% - {}{\edef\temp@c{\temp@c\tmpf@ra}}}% - \ifx\@empty\temp@c\else - \@fancyerrmsg{Illegal char `\temp@c' in \string#1 argument: - [#3]}% - \fi - \f@nfor\temp@c{#3}% - {\def@ult\f@@@eo{eo}\temp@c - \if@twoside\else - \if\f@@@eo e\@fancywarning - {\string#1's `E' option without twoside option is useless}\fi\fi - \def@ult\f@@@lcr{lr}\temp@c - \def@ult\f@@@hf{hf}{#2\temp@c}% - \@forc\f@@eo\f@@@eo - {\@forc\f@@lcr\f@@@lcr - {\@forc\f@@hf\f@@@hf - {\expandafter\setlength\csname - f@ncyO@\f@@eo\f@@lcr\f@@hf\endcsname - {#4}}}}}% - \fancy@setoffs} - -% Fancyheadings version 1 commands. These are more or less deprecated, -% but they continue to work. - -\newcommand{\lhead}{\@ifnextchar[{\@xlhead}{\@ylhead}} -\def\@xlhead[#1]#2{\fancy@def\f@ncyelh{#1}\fancy@def\f@ncyolh{#2}} -\def\@ylhead#1{\fancy@def\f@ncyelh{#1}\fancy@def\f@ncyolh{#1}} - -\newcommand{\chead}{\@ifnextchar[{\@xchead}{\@ychead}} -\def\@xchead[#1]#2{\fancy@def\f@ncyech{#1}\fancy@def\f@ncyoch{#2}} -\def\@ychead#1{\fancy@def\f@ncyech{#1}\fancy@def\f@ncyoch{#1}} - -\newcommand{\rhead}{\@ifnextchar[{\@xrhead}{\@yrhead}} -\def\@xrhead[#1]#2{\fancy@def\f@ncyerh{#1}\fancy@def\f@ncyorh{#2}} -\def\@yrhead#1{\fancy@def\f@ncyerh{#1}\fancy@def\f@ncyorh{#1}} - -\newcommand{\lfoot}{\@ifnextchar[{\@xlfoot}{\@ylfoot}} -\def\@xlfoot[#1]#2{\fancy@def\f@ncyelf{#1}\fancy@def\f@ncyolf{#2}} -\def\@ylfoot#1{\fancy@def\f@ncyelf{#1}\fancy@def\f@ncyolf{#1}} - -\newcommand{\cfoot}{\@ifnextchar[{\@xcfoot}{\@ycfoot}} -\def\@xcfoot[#1]#2{\fancy@def\f@ncyecf{#1}\fancy@def\f@ncyocf{#2}} -\def\@ycfoot#1{\fancy@def\f@ncyecf{#1}\fancy@def\f@ncyocf{#1}} - -\newcommand{\rfoot}{\@ifnextchar[{\@xrfoot}{\@yrfoot}} -\def\@xrfoot[#1]#2{\fancy@def\f@ncyerf{#1}\fancy@def\f@ncyorf{#2}} -\def\@yrfoot#1{\fancy@def\f@ncyerf{#1}\fancy@def\f@ncyorf{#1}} - -\newlength{\fancy@headwidth} -\let\headwidth\fancy@headwidth -\newlength{\f@ncyO@elh} -\newlength{\f@ncyO@erh} -\newlength{\f@ncyO@olh} -\newlength{\f@ncyO@orh} -\newlength{\f@ncyO@elf} -\newlength{\f@ncyO@erf} -\newlength{\f@ncyO@olf} -\newlength{\f@ncyO@orf} + \f@nch@rc#1#2\f@nch@rc{#3}\fi} +\def\f@nch@rc#1#2#3\f@nch@rc#4{\def#1{#2}#4\f@rc#1{#3}{#4}} +\newcommand{\f@nch@for}[3]{\edef\@fortmp{#2}% + \expandafter\@forloop#2,\@nil,\@nil\@@#1{#3}} +\newcommand\f@nch@default[3]{% + \edef\temp@a{\lowercase{\edef\noexpand\temp@a{#3}}}\temp@a \def#1{}% + \f@nch@forc\tmpf@ra{#2}% + {\expandafter\f@nch@ifin\tmpf@ra\temp@a{\edef#1{#1\tmpf@ra}}{}}% + \ifx\@empty#1\def#1{#2}\fi} +\newcommand{\f@nch@ifin}[4]{% + \edef\temp@a{#2}\def\temp@b##1#1##2\temp@b{\def\temp@b{##1}}% + \expandafter\temp@b#2#1\temp@b\ifx\temp@a\temp@b #4\else #3\fi} +\newcommand{\fancyhead}[2][]{\f@nch@fancyhf\fancyhead h[#1]{#2}}% +\newcommand{\fancyfoot}[2][]{\f@nch@fancyhf\fancyfoot f[#1]{#2}}% +\newcommand{\fancyhf}[2][]{\f@nch@fancyhf\fancyhf {}[#1]{#2}}% +\newcommand{\fancyheadoffset}[2][]{\f@nch@fancyhfoffs\fancyheadoffset h[#1]{#2}}% +\newcommand{\fancyfootoffset}[2][]{\f@nch@fancyhfoffs\fancyfootoffset f[#1]{#2}}% +\newcommand{\fancyhfoffset}[2][]{\f@nch@fancyhfoffs\fancyhfoffset {}[#1]{#2}}% +\def\f@nch@fancyhf#1#2[#3]#4{% + \def\temp@c{}% + \f@nch@forc\tmpf@ra{#3}% + {\expandafter\f@nch@ifin\tmpf@ra{eolcrhf,EOLCRHF}% + {}{\edef\temp@c{\temp@c\tmpf@ra}}}% + \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in + \string#1 argument: [#3]}% + \fi \f@nch@for\temp@c{#3}% + {\f@nch@default\f@nch@@eo{eo}\temp@c \if@twoside\else \if\f@nch@@eo + e\f@nch@warning {\string#1's `E' option without twoside option is + useless}\fi\fi \f@nch@default\f@nch@@lcr{lcr}\temp@c + \f@nch@default\f@nch@@hf{hf}{#2\temp@c}% + \f@nch@forc\f@nch@eo\f@nch@@eo + {\f@nch@forc\f@nch@lcr\f@nch@@lcr + {\f@nch@forc\f@nch@hf\f@nch@@hf + {\expandafter\f@nch@def\csname + f@nch@\f@nch@eo\f@nch@lcr\f@nch@hf\endcsname {#4}}}}}} +\def\f@nch@fancyhfoffs#1#2[#3]#4{% + \def\temp@c{}% + \f@nch@forc\tmpf@ra{#3}% + {\expandafter\f@nch@ifin\tmpf@ra{eolrhf,EOLRHF}% + {}{\edef\temp@c{\temp@c\tmpf@ra}}}% + \ifx\@empty\temp@c\else \f@nch@errmsg{Illegal char `\temp@c' in + \string#1 argument: [#3]}% + \fi \f@nch@for\temp@c{#3}% + {\f@nch@default\f@nch@@eo{eo}\temp@c \if@twoside\else \if\f@nch@@eo + e\f@nch@warning {\string#1's `E' option without twoside option is + useless}\fi\fi \f@nch@default\f@nch@@lcr{lr}\temp@c + \f@nch@default\f@nch@@hf{hf}{#2\temp@c}% + \f@nch@forc\f@nch@eo\f@nch@@eo + {\f@nch@forc\f@nch@lcr\f@nch@@lcr + {\f@nch@forc\f@nch@hf\f@nch@@hf + {\expandafter\setlength\csname + f@nch@O@\f@nch@eo\f@nch@lcr\f@nch@hf\endcsname {#4}}}}}% + \f@nch@setoffs} +\newcommand{\lhead}[2][\f@nch@olh]% + {\f@nch@def\f@nch@olh{#2}\f@nch@def\f@nch@elh{#1}} +\newcommand{\chead}[2][\f@nch@och]% + {\f@nch@def\f@nch@och{#2}\f@nch@def\f@nch@ech{#1}} +\newcommand{\rhead}[2][\f@nch@orh]% + {\f@nch@def\f@nch@orh{#2}\f@nch@def\f@nch@erh{#1}} +\newcommand{\lfoot}[2][\f@nch@olf]% + {\f@nch@def\f@nch@olf{#2}\f@nch@def\f@nch@elf{#1}} +\newcommand{\cfoot}[2][\f@nch@ocf]% + {\f@nch@def\f@nch@ocf{#2}\f@nch@def\f@nch@ecf{#1}} +\newcommand{\rfoot}[2][\f@nch@orf]% + {\f@nch@def\f@nch@orf{#2}\f@nch@def\f@nch@erf{#1}} +\newlength{\f@nch@headwidth} \let\headwidth\f@nch@headwidth +\newlength{\f@nch@O@elh} +\newlength{\f@nch@O@erh} +\newlength{\f@nch@O@olh} +\newlength{\f@nch@O@orh} +\newlength{\f@nch@O@elf} +\newlength{\f@nch@O@erf} +\newlength{\f@nch@O@olf} +\newlength{\f@nch@O@orf} \newcommand{\headrulewidth}{0.4pt} \newcommand{\footrulewidth}{0pt} -\newcommand{\footruleskip}{.3\normalbaselineskip} - -% Fancyplain stuff shouldn't be used anymore (rather -% \fancypagestyle{plain} should be used), but it must be present for -% compatibility reasons. - +\@ifundefined{footruleskip}% + {\newcommand{\footruleskip}{.3\normalbaselineskip}}{} \newcommand{\plainheadrulewidth}{0pt} \newcommand{\plainfootrulewidth}{0pt} \newif\if@fancyplain \@fancyplainfalse \def\fancyplain#1#2{\if@fancyplain#1\else#2\fi} - -\headwidth=-123456789sp %magic constant - -% Command to reset various things in the headers: -% a.o. single spacing (taken from setspace.sty) -% and the catcode of ^^M (so that epsf files in the header work if a -% verbatim crosses a page boundary) -% It also defines a \nouppercase command that disables \uppercase and -% \Makeuppercase. It can only be used in the headers and footers. -\let\fnch@everypar\everypar% save real \everypar because of spanish.ldf -\def\fancy@reset{\fnch@everypar{}\restorecr\endlinechar=13 - \def\baselinestretch{1}% - \def\nouppercase##1{{\let\uppercase\relax\let\MakeUppercase\relax - \expandafter\let\csname MakeUppercase \endcsname\relax##1}}% - \ifx\undefined\@newbaseline% NFSS not present; 2.09 or 2e - \ifx\@normalsize\undefined \normalsize % for ucthesis.cls - \else \@normalsize \fi - \else% NFSS (2.09) present +\headwidth=-123456789sp +\let\f@nch@raggedleft\raggedleft +\let\f@nch@raggedright\raggedright +\let\f@nch@centering\centering +\let\f@nch@everypar\everypar +\def\f@nch@reset{\f@nch@everypar{}\restorecr\endlinechar=13 + \let\\\@normalcr \let\raggedleft\f@nch@raggedleft + \let\raggedright\f@nch@raggedright \let\centering\f@nch@centering + \def\baselinestretch{1}% + \hsize=\headwidth + \def\nouppercase##1{{\let\uppercase\relax\let\MakeUppercase\relax + \expandafter\let\csname MakeUppercase \endcsname\relax##1}}% + \ifx\undefined\@newbaseline % NFSS not present; 2.09 or 2e + \ifx\@normalsize\undefined \normalsize % for ucthesis.cls + \else \@normalsize \fi \else % NFSS (2.09) present \@newbaseline% - \fi} - -% Initialization of the head and foot text. - -% The default values still contain \fancyplain for compatibility. -\fancyhf{} % clear all -% lefthead empty on ``plain'' pages, \rightmark on even, \leftmark on odd pages -% evenhead empty on ``plain'' pages, \leftmark on even, \rightmark on odd pages + \fi} +\fancyhf{} \if@twoside - \fancyhead[el,or]{\fancyplain{}{\sl\rightmark}} - \fancyhead[er,ol]{\fancyplain{}{\sl\leftmark}} + \fancyhead[el,or]{\fancyplain{}{\slshape\rightmark}} + \fancyhead[er,ol]{\fancyplain{}{\slshape\leftmark}} \else - \fancyhead[l]{\fancyplain{}{\sl\rightmark}} - \fancyhead[r]{\fancyplain{}{\sl\leftmark}} + \fancyhead[l]{\fancyplain{}{\slshape\rightmark}} + \fancyhead[r]{\fancyplain{}{\slshape\leftmark}} \fi -\fancyfoot[c]{\rm\thepage} % page number - -% Use box 0 as a temp box and dimen 0 as temp dimen. -% This can be done, because this code will always -% be used inside another box, and therefore the changes are local. - -\def\@fancyvbox#1#2{\setbox0\vbox{#2}\ifdim\ht0>#1\@fancywarning - {\string#1 is too small (\the#1): ^^J Make it at least \the\ht0.^^J - We now make it that large for the rest of the document.^^J - This may cause the page layout to be inconsistent, however\@gobble}% - \dimen0=#1\global\setlength{#1}{\ht0}\ht0=\dimen0\fi - \box0} - -% Put together a header or footer given the left, center and -% right text, fillers at left and right and a rule. -% The \lap commands put the text into an hbox of zero size, -% so overlapping text does not generate an errormessage. -% These macros have 5 parameters: -% 1. LEFTSIDE BEARING % This determines at which side the header will stick -% out. When \fancyhfoffset is used this calculates \headwidth, otherwise -% it is \hss or \relax (after expansion). -% 2. \f@ncyolh, \f@ncyelh, \f@ncyolf or \f@ncyelf. This is the left component. -% 3. \f@ncyoch, \f@ncyech, \f@ncyocf or \f@ncyecf. This is the middle comp. -% 4. \f@ncyorh, \f@ncyerh, \f@ncyorf or \f@ncyerf. This is the right component. -% 5. RIGHTSIDE BEARING. This is always \relax or \hss (after expansion). - -\def\@fancyhead#1#2#3#4#5{#1\hbox to\headwidth{\fancy@reset - \@fancyvbox\headheight{\hbox - {\rlap{\parbox[b]{\headwidth}{\raggedright#2}}\hfill - \parbox[b]{\headwidth}{\centering#3}\hfill - \llap{\parbox[b]{\headwidth}{\raggedleft#4}}}\headrule}}#5} - -\def\@fancyfoot#1#2#3#4#5{#1\hbox to\headwidth{\fancy@reset - \@fancyvbox\footskip{\footrule +\fancyfoot[c]{\rmfamily\thepage} % page number +\def\f@nch@vbox#1#2{\setbox0\vbox{#2}\ifdim\ht0>#1\f@nch@warning + {\string#1 is too small (\the#1): ^^J Make it at least \the\ht0.^^J We + now make it that large for the rest of the document.^^J This may + cause the page layout to be inconsistent, however\@gobble}% + \dimen0=#1\global\setlength{#1}{\ht0}\ht0=\dimen0\fi \box0} +\def\f@nch@head#1#2#3#4#5{#1\hbox to\headwidth{\f@nch@reset + \f@nch@vbox\headheight{\hbox + {\rlap{\parbox[b]{\headwidth}{\raggedright#2}}\hfill + \parbox[b]{\headwidth}{\centering#3}\hfill + \llap{\parbox[b]{\headwidth}{\raggedleft#4}}}\headrule}}#5} +\def\f@nch@foot#1#2#3#4#5{#1\hbox to\headwidth{\f@nch@reset + \f@nch@vbox\footskip{\footrule \hbox{\rlap{\parbox[t]{\headwidth}{\raggedright#2}}\hfill \parbox[t]{\headwidth}{\centering#3}\hfill \llap{\parbox[t]{\headwidth}{\raggedleft#4}}}}}#5} - \def\headrule{{\if@fancyplain\let\headrulewidth\plainheadrulewidth\fi - \hrule\@height\headrulewidth\@width\headwidth \vskip-\headrulewidth}} - + \hrule\@height\headrulewidth\@width\headwidth + \vskip-\headrulewidth}} \def\footrule{{\if@fancyplain\let\footrulewidth\plainfootrulewidth\fi \vskip-\footruleskip\vskip-\footrulewidth \hrule\@width\headwidth\@height\footrulewidth\vskip\footruleskip}} - \def\ps@fancy{% -\@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}%for amsbook -% -% Define \MakeUppercase for old LaTeXen. -% Note: we used \def rather than \let, so that \let\uppercase\relax (from -% the version 1 documentation) will still work. -% + \@ifundefined{@chapapp}{\let\@chapapp\chaptername}{}% for amsbook \@ifundefined{MakeUppercase}{\def\MakeUppercase{\uppercase}}{}% -\@ifundefined{chapter}{\def\sectionmark##1{\markboth -{\MakeUppercase{\ifnum \c@secnumdepth>\z@ - \thesection\hskip 1em\relax \fi ##1}}{}}% +\ifx\chapter\@undefined \def\sectionmark##1{\markboth + {\MakeUppercase{\ifnum \c@secnumdepth>\z@ \thesection\hskip 1em\relax + \fi ##1}}{}}% \def\subsectionmark##1{\markright {\ifnum \c@secnumdepth >\@ne - \thesubsection\hskip 1em\relax \fi ##1}}}% -{\def\chaptermark##1{\markboth {\MakeUppercase{\ifnum \c@secnumdepth>\m@ne - \@chapapp\ \thechapter. \ \fi ##1}}{}}% + \thesubsection\hskip 1em\relax \fi ##1}}% +\else \def\chaptermark##1{\markboth {\MakeUppercase{\ifnum + \c@secnumdepth>\m@ne \@chapapp\ \thechapter. \ \fi ##1}}{}}% \def\sectionmark##1{\markright{\MakeUppercase{\ifnum \c@secnumdepth >\z@ - \thesection. \ \fi ##1}}}}% -%\csname ps@headings\endcsname % use \ps@headings defaults if they exist + \thesection. \ \fi ##1}}}% +\fi \ps@@fancy \gdef\ps@fancy{\@fancyplainfalse\ps@@fancy}% -% Initialize \headwidth if the user didn't -% \ifdim\headwidth<0sp -% -% This catches the case that \headwidth hasn't been initialized and the -% case that the user added something to \headwidth in the expectation that -% it was initialized to \textwidth. We compensate this now. This loses if -% the user intended to multiply it by a factor. But that case is more -% likely done by saying something like \headwidth=1.2\textwidth. -% The doc says you have to change \headwidth after the first call to -% \pagestyle{fancy}. This code is just to catch the most common cases were -% that requirement is violated. -% \global\advance\headwidth123456789sp\global\advance\headwidth\textwidth \fi} \def\ps@fancyplain{\ps@fancy \let\ps@plain\ps@plain@fancy} \def\ps@plain@fancy{\@fancyplaintrue\ps@@fancy} \let\ps@@empty\ps@empty \def\ps@@fancy{% -\ps@@empty % This is for amsbook/amsart, which do strange things with \topskip -\def\@mkboth{\protect\markboth}% -\def\@oddhead{\@fancyhead\fancy@Oolh\f@ncyolh\f@ncyoch\f@ncyorh\fancy@Oorh}% -\def\@oddfoot{\@fancyfoot\fancy@Oolf\f@ncyolf\f@ncyocf\f@ncyorf\fancy@Oorf}% -\def\@evenhead{\@fancyhead\fancy@Oelh\f@ncyelh\f@ncyech\f@ncyerh\fancy@Oerh}% -\def\@evenfoot{\@fancyfoot\fancy@Oelf\f@ncyelf\f@ncyecf\f@ncyerf\fancy@Oerf}% + \ps@@empty + \def\@mkboth{\protect\markboth}% + \def\@oddhead{\f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh}% + \def\@oddfoot{\f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf}% + \def\@evenhead{\f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh}% + \def\@evenfoot{\f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf}% +} +\def\f@nch@Oolh{\if@reversemargin\hss\else\relax\fi} +\def\f@nch@Oorh{\if@reversemargin\relax\else\hss\fi} +\let\f@nch@Oelh\f@nch@Oorh +\let\f@nch@Oerh\f@nch@Oolh +\let\f@nch@Oolf\f@nch@Oolh +\let\f@nch@Oorf\f@nch@Oorh +\let\f@nch@Oelf\f@nch@Oelh +\let\f@nch@Oerf\f@nch@Oerh +\def\f@nch@offsolh{\headwidth=\textwidth\advance\headwidth\f@nch@O@olh + \advance\headwidth\f@nch@O@orh\hskip-\f@nch@O@olh} +\def\f@nch@offselh{\headwidth=\textwidth\advance\headwidth\f@nch@O@elh + \advance\headwidth\f@nch@O@erh\hskip-\f@nch@O@elh} +\def\f@nch@offsolf{\headwidth=\textwidth\advance\headwidth\f@nch@O@olf + \advance\headwidth\f@nch@O@orf\hskip-\f@nch@O@olf} +\def\f@nch@offself{\headwidth=\textwidth\advance\headwidth\f@nch@O@elf + \advance\headwidth\f@nch@O@erf\hskip-\f@nch@O@elf} +\def\f@nch@setoffs{% + \f@nch@gbl\let\headwidth\f@nch@headwidth + \f@nch@gbl\let\f@nch@Oolh\f@nch@offsolh + \f@nch@gbl\let\f@nch@Oelh\f@nch@offselh \f@nch@gbl\let\f@nch@Oorh\hss + \f@nch@gbl\let\f@nch@Oerh\hss \f@nch@gbl\let\f@nch@Oolf\f@nch@offsolf + \f@nch@gbl\let\f@nch@Oelf\f@nch@offself \f@nch@gbl\let\f@nch@Oorf\hss + \f@nch@gbl\let\f@nch@Oerf\hss +} +\newif\iff@nch@footnote +\AtBeginDocument{% + \let\latex@makecol\@makecol + \def\@makecol{\ifvoid\footins\f@nch@footnotefalse\else\f@nch@footnotetrue\fi + \let\topfloat\@toplist\let\botfloat\@botlist\latex@makecol}% } -% Default definitions for compatibility mode: -% These cause the header/footer to take the defined \headwidth as width -% And to shift in the direction of the marginpar area - -\def\fancy@Oolh{\if@reversemargin\hss\else\relax\fi} -\def\fancy@Oorh{\if@reversemargin\relax\else\hss\fi} -\let\fancy@Oelh\fancy@Oorh -\let\fancy@Oerh\fancy@Oolh - -\let\fancy@Oolf\fancy@Oolh -\let\fancy@Oorf\fancy@Oorh -\let\fancy@Oelf\fancy@Oelh -\let\fancy@Oerf\fancy@Oerh - -% New definitions for the use of \fancyhfoffset -% These calculate the \headwidth from \textwidth and the specified offsets. - -\def\fancy@offsolh{\headwidth=\textwidth\advance\headwidth\f@ncyO@olh - \advance\headwidth\f@ncyO@orh\hskip-\f@ncyO@olh} -\def\fancy@offselh{\headwidth=\textwidth\advance\headwidth\f@ncyO@elh - \advance\headwidth\f@ncyO@erh\hskip-\f@ncyO@elh} - -\def\fancy@offsolf{\headwidth=\textwidth\advance\headwidth\f@ncyO@olf - \advance\headwidth\f@ncyO@orf\hskip-\f@ncyO@olf} -\def\fancy@offself{\headwidth=\textwidth\advance\headwidth\f@ncyO@elf - \advance\headwidth\f@ncyO@erf\hskip-\f@ncyO@elf} - -\def\fancy@setoffs{% -% Just in case \let\headwidth\textwidth was used - \fancy@gbl\let\headwidth\fancy@headwidth - \fancy@gbl\let\fancy@Oolh\fancy@offsolh - \fancy@gbl\let\fancy@Oelh\fancy@offselh - \fancy@gbl\let\fancy@Oorh\hss - \fancy@gbl\let\fancy@Oerh\hss - \fancy@gbl\let\fancy@Oolf\fancy@offsolf - \fancy@gbl\let\fancy@Oelf\fancy@offself - \fancy@gbl\let\fancy@Oorf\hss - \fancy@gbl\let\fancy@Oerf\hss} - -\newif\iffootnote -\let\latex@makecol\@makecol -\def\@makecol{\ifvoid\footins\footnotetrue\else\footnotefalse\fi -\let\topfloat\@toplist\let\botfloat\@botlist\latex@makecol} -\def\iftopfloat#1#2{\ifx\topfloat\empty #2\else #1\fi} -\def\ifbotfloat#1#2{\ifx\botfloat\empty #2\else #1\fi} -\def\iffloatpage#1#2{\if@fcolmade #1\else #2\fi} - +\newcommand\iftopfloat[2]{\ifx\topfloat\empty #2\else #1\fi}% +\newcommand\ifbotfloat[2]{\ifx\botfloat\empty #2\else #1\fi}% +\newcommand\iffloatpage[2]{\if@fcolmade #1\else #2\fi}% +\newcommand\iffootnote[2]{\iff@nch@footnote #1\else #2\fi}% \newcommand{\fancypagestyle}[2]{% - \@namedef{ps@#1}{\let\fancy@gbl\relax#2\relax\ps@fancy}} + \@namedef{ps@#1}{\let\f@nch@gbl\relax#2\relax\ps@fancy}} +\endinput +%% +%% End of file `fancyhdr.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyhdr/fancyheadings.sty new/tex/latex/fancyhdr/fancyheadings.sty --- old/tex/latex/fancyhdr/fancyheadings.sty 2008-02-12 19:35:34.000000000 +0100 +++ new/tex/latex/fancyhdr/fancyheadings.sty 2017-06-06 01:14:32.000000000 +0200 @@ -1,6 +1,30 @@ -% Public domain. -\NeedsTeXFormat{LaTeX2e}[1995/06/01]% -\ProvidesPackage{fancyheadings}[2008/02/04 1.99 Dummy package to call fancyhdr]% +%% +%% This is file `fancyheadings.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fancyhdr.dtx (with options: `fancyheadings') +%% +%% This is a generated file. +%% +%% This file 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. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{fancyheadings} + [2016/10/11 v3.9 + Legacy package to call fancyhdr] +% Public domain +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \PackageWarningNoLine{fancyheadings}{% Please stop using fancyheadings!\MessageBreak Use fancyhdr instead.\MessageBreak @@ -9,10 +33,12 @@ \MessageBreak fancyhdr is 99 percent compatible with\MessageBreak fancyheadings. The only incompatibility is\MessageBreak - that \protect\headrulewidth\space and \protect\footrulewidth\space + that \protect\headrulewidth\space and \protect\footrulewidth\space and\MessageBreak their \protect\plain... versions are no longer length\MessageBreak parameters, but normal macros (to be changed\MessageBreak with \protect\renewcommand\space rather than \protect\setlength).} \RequirePackage{fancyhdr} \endinput +%% +%% End of file `fancyheadings.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyhdr.tlpobj new/tlpkg/tlpobj/fancyhdr.tlpobj --- old/tlpkg/tlpobj/fancyhdr.tlpobj 2016-04-14 19:00:37.000000000 +0200 +++ new/tlpkg/tlpobj/fancyhdr.tlpobj 2017-06-06 02:21:53.000000000 +0200 @@ -1,19 +1,19 @@ name fancyhdr category Package -revision 15878 +revision 44479 shortdesc Extensive control of page headers and footers in LaTeX2e relocated 1 longdesc The package provides extensive facilities, both for longdesc constructing headers and footers, and for controlling their use longdesc (for example, at times when LaTeX would automatically change longdesc the heading style in use). -runfiles size=9 +runfiles size=5 RELOC/tex/latex/fancyhdr/extramarks.sty RELOC/tex/latex/fancyhdr/fancyhdr.sty RELOC/tex/latex/fancyhdr/fancyheadings.sty catalogue-also titleps catalogue-ctan /macros/latex/contrib/fancyhdr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-05-31 15:48:05 +0200 catalogue-license lppl catalogue-topics page-hf -catalogue-version 3.1 +catalogue-version 3.9 ++++++ fancylabel.doc.tar.xz ++++++ ++++++ fancylabel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancylabel.tlpobj new/tlpkg/tlpobj/fancylabel.tlpobj --- old/tlpkg/tlpobj/fancylabel.tlpobj 2016-04-14 19:00:38.000000000 +0200 +++ new/tlpkg/tlpobj/fancylabel.tlpobj 2017-04-14 17:39:44.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=9 RELOC/tex/latex/fancylabel/fancylabel.sty catalogue-ctan /macros/latex/contrib/fancylabel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics label-ref chemistry catalogue-version 1.0 ++++++ fancynum.doc.tar.xz ++++++ ++++++ fancynum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancynum.tlpobj new/tlpkg/tlpobj/fancynum.tlpobj --- old/tlpkg/tlpobj/fancynum.tlpobj 2016-04-14 19:00:38.000000000 +0200 +++ new/tlpkg/tlpobj/fancynum.tlpobj 2017-04-14 17:39:45.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/fancynum/fancynum.sty catalogue-ctan /macros/latex/contrib/fancynum -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 catalogue-version 0.92 ++++++ fancypar.doc.tar.xz ++++++ ++++++ fancypar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancypar.tlpobj new/tlpkg/tlpobj/fancypar.tlpobj --- old/tlpkg/tlpobj/fancypar.tlpobj 2016-04-14 19:00:38.000000000 +0200 +++ new/tlpkg/tlpobj/fancypar.tlpobj 2017-04-14 17:39:45.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/fancypar/fancypar.sty catalogue-also boites framed catalogue-ctan /macros/latex/contrib/fancypar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics decoration catalogue-version 1.1 ++++++ fancyref.doc.tar.xz ++++++ ++++++ fancyref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyref.tlpobj new/tlpkg/tlpobj/fancyref.tlpobj --- old/tlpkg/tlpobj/fancyref.tlpobj 2016-04-14 19:00:39.000000000 +0200 +++ new/tlpkg/tlpobj/fancyref.tlpobj 2017-04-14 17:39:45.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=4 RELOC/tex/latex/fancyref/fancyref.sty catalogue-ctan /macros/latex/contrib/fancyref -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 catalogue-version 0.9c ++++++ fancyslides.doc.tar.xz ++++++ ++++++ fancyslides.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyslides.tlpobj new/tlpkg/tlpobj/fancyslides.tlpobj --- old/tlpkg/tlpobj/fancyslides.tlpobj 2016-04-14 19:00:40.000000000 +0200 +++ new/tlpkg/tlpobj/fancyslides.tlpobj 2017-04-14 17:39:46.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/fancyslides/fancyslides.cls catalogue-ctan /macros/latex/contrib/fancyslides -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation class catalogue-version 1.0 ++++++ fancytabs.doc.tar.xz ++++++ Binary files old/doc/latex/fancytabs/fancytabs.pdf and new/doc/latex/fancytabs/fancytabs.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancytabs.doc.tlpobj new/tlpkg/tlpobj/fancytabs.doc.tlpobj --- old/tlpkg/tlpobj/fancytabs.doc.tlpobj 2016-04-14 19:00:41.000000000 +0200 +++ new/tlpkg/tlpobj/fancytabs.doc.tlpobj 2017-04-14 17:39:46.000000000 +0200 @@ -1,8 +1,8 @@ name fancytabs.doc category Package -revision 27684 +revision 41549 shortdesc doc files of fancytabs relocated 1 -docfiles size=45 +docfiles size=46 RELOC/doc/latex/fancytabs/README RELOC/doc/latex/fancytabs/fancytabs.pdf ++++++ fancytabs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancytabs/fancytabs.sty new/tex/latex/fancytabs/fancytabs.sty --- old/tex/latex/fancytabs/fancytabs.sty 2012-09-18 02:03:43.000000000 +0200 +++ new/tex/latex/fancytabs/fancytabs.sty 2016-11-25 19:33:47.000000000 +0100 @@ -22,10 +22,11 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{fancytabs} - [2012/09/17 1.8 Fancy page border tabs with Tikz] + [2016/03/29 1.9 Fancy page border tabs with Tikz] \ProvidesPackage{fancytabs} \RequirePackage{tikz} +\RequirePackage{etoolbox} \newcommand{\tab@style}{\Large\scshape} \newlength{\tab@height} \setlength{\tab@height}{4cm} @@ -41,6 +42,7 @@ \newlength{\tab@gap} \setlength{\tab@gap}{0in} \newcommand{\tab@floor}{0} +\newcommand{\tab@rotate}{90} \newcommand{\fancytabsStyle}[1]{\renewcommand{\tab@style}{#1}} \newcommand{\fancytabsHeight}[1]{\setlength{\tab@height}{#1}} \newcommand{\fancytabsWidth}[1]{\setlength{\tab@width}{#1}} @@ -52,6 +54,7 @@ \newcommand{\fancytabsTextHPos}[1]{\renewcommand{\tab@texthpos}{#1}} \newcommand{\fancytabsGap}[1]{\setlength{\tab@gap}{#1}} \newcommand{\fancytabsFloor}[1]{\renewcommand{\tab@floor}{#1}} +\newcommand{\fancytabsRotate}[1]{\renewcommand{\tab@rotate}{#1}} \AtBeginDocument{\@ifpackageloaded{babel} {\@ifundefined{active@char;}{}{% \g@addto@macro\tikz@installcommands{% @@ -61,19 +64,28 @@ }% }{}% } -\newcommand{\fancytab}[2]{% +\newcommand{\fancytab}[3][RIGHT]{% + \ifstrequal{#1}{LEFT} + { + \newcommand{\eastwest}{west} + \newcommand{\multiplier}{0.5} + } + { %else + \newcommand{\eastwest}{east} + \newcommand{\multiplier}{-0.5} + } \begin{tikzpicture}[remember picture,overlay]% \node[yshift={-1*(\the\tab@top+\the\tab@height/2+ - mod(#2-1-\tab@floor,\tab@count)* + mod(#3-1-\tab@floor,\tab@count)* (\the\tab@height+\the\tab@gap))}, - xshift=-0.5*\the\tab@width] - at (current page.north east) { + xshift=\multiplier*\the\tab@width] + at (current page.north \eastwest) { \tikz\shade[shading=axis,bottom color=\tab@leftcolor, top color=\tab@rightcolor,shading angle=-90] (0,0) rectangle (\the\tab@width,\the\tab@height) node[rotate=0] at (\tab@texthpos*\the\tab@width,\tab@textvpos*\the\tab@height) - {\rotatebox{90}{\tab@style#1}};% + {\rotatebox{\tab@rotate}{\tab@style#2}};% };% \end{tikzpicture}% } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancytabs.tlpobj new/tlpkg/tlpobj/fancytabs.tlpobj --- old/tlpkg/tlpobj/fancytabs.tlpobj 2016-04-14 19:00:41.000000000 +0200 +++ new/tlpkg/tlpobj/fancytabs.tlpobj 2017-04-14 17:39:46.000000000 +0200 @@ -1,6 +1,6 @@ name fancytabs category Package -revision 27684 +revision 41549 shortdesc Fancy page border tabs relocated 1 longdesc The package can typeset tabs on the side of a page. It requires @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/fancytabs/fancytabs.sty catalogue-ctan /macros/latex/contrib/fancytabs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-27 10:08:39 +0200 catalogue-license lppl1.3 catalogue-topics decoration -catalogue-version 1.8 +catalogue-version 1.9 ++++++ fancytooltips.doc.tar.xz ++++++ ++++++ fancytooltips.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancytooltips.tlpobj new/tlpkg/tlpobj/fancytooltips.tlpobj --- old/tlpkg/tlpobj/fancytooltips.tlpobj 2016-04-14 19:00:42.000000000 +0200 +++ new/tlpkg/tlpobj/fancytooltips.tlpobj 2017-04-14 17:39:46.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/fancytooltips/fancytipmark.svg RELOC/tex/latex/fancytooltips/fancytooltips.sty catalogue-ctan /macros/latex/contrib/fancytooltips -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics pdf-feat catalogue-version 1.8 ++++++ fancyvrb.doc.tar.xz ++++++ ++++++ fancyvrb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyvrb.tlpobj new/tlpkg/tlpobj/fancyvrb.tlpobj --- old/tlpkg/tlpobj/fancyvrb.tlpobj 2016-04-14 19:00:43.000000000 +0200 +++ new/tlpkg/tlpobj/fancyvrb.tlpobj 2017-04-14 17:39:46.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/fancyvrb/hbaw.sty RELOC/tex/latex/fancyvrb/hcolor.sty catalogue-ctan /macros/latex/contrib/fancyvrb -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 2.8 ++++++ fandol.doc.tar.xz ++++++ ++++++ fandol.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-i/fandol.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-i.new/fandol.tar.xz differ: char 27, line 1 ++++++ fast-diagram.doc.tar.xz ++++++ ++++++ fast-diagram.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fast-diagram.tlpobj new/tlpkg/tlpobj/fast-diagram.tlpobj --- old/tlpkg/tlpobj/fast-diagram.tlpobj 2016-04-14 19:01:22.000000000 +0200 +++ new/tlpkg/tlpobj/fast-diagram.tlpobj 2017-04-14 17:40:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/latex/fast-diagram/fast-diagram.sty catalogue-ctan /graphics/pgf/contrib/fast-diagram -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 pgf-tikz catalogue-version 1.1 ++++++ fbb.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fbb/README new/doc/fonts/fbb/README --- old/doc/fonts/fbb/README 2015-12-12 00:12:20.000000000 +0100 +++ new/doc/fonts/fbb/README 2017-03-12 01:01:03.000000000 +0100 @@ -2,7 +2,19 @@ http://www.ctan.org/license/lppl1.3 for the details of that license. Note that Bembo is a name trademarked by Monotype, and Cardo is a reserved name under the OFL, hence the strange name for this package, drawn from the Berry id for the Bembo font family. -Current version: 1.10/ 2015-12-08 +Current version: 1.12/ 2017-03-11 + +Changes in version 1.12 +Modified the sty file so that fbb text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.) + +Changes in version 1.112 +Modified some metadata in the otf files, correcting some misbehaviors in some programs and platforms. + +Changes in version 1.111 +Added two entries to smcp table so that dotlessi and dotlessj map to correct small cap glyph. + +Changes in version 1.11 +Modified a couple of sidebearings and corrected direction of P.alt. Changes in version 1.10 (Thanks, Bob Curran Jr) 1. Reworked f and all principal f-ligatures to better resemble traditional Bembo. Binary files old/doc/fonts/fbb/fbb-doc.pdf and new/doc/fonts/fbb/fbb-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fbb/fbb-doc.tex new/doc/fonts/fbb/fbb-doc.tex --- old/doc/fonts/fbb/fbb-doc.tex 2015-12-12 00:12:20.000000000 +0100 +++ new/doc/fonts/fbb/fbb-doc.tex 2017-03-12 01:01:03.000000000 +0100 @@ -2,7 +2,7 @@ \documentclass{article} \usepackage[margin=1in]{geometry} \usepackage[parfill]{parskip}% Begin paragraphs with an empty line, no indent -\pdfmapfile{=fbb.map} +%\pdfmapfile{=fbb.map} \usepackage{enumitem} \setlist[description]{style=sameline,font=\mdseries\scshape} \setlength\unitlength{1pt}% for picture @@ -17,15 +17,14 @@ %SetFonts %fbb plus newtxmath \usepackage[full]{textcomp} % to get the right copyright, etc. -\usepackage[sups]{fbb} +\usepackage[sups,osf,p]{fbb} \usepackage[scaled=.95,type1]{cabin} \usepackage[varqu,varl]{zi4}% typewriter -\usepackage[libertine,bigdelims]{newtxmath} +\usepackage[libertine]{newtxmath} \usepackage[bb=boondox,frak=boondox]{mathalfa} %SetFonts \font\altp=fbbP-Regular-lf-t1 \usepackage[T1]{fontenc} -\useosf \usepackage{fonttable} \usepackage{url,hyperref} \title{The \textbf{fbb} package---a Bembo--like font} @@ -64,16 +63,14 @@ There is a {\tt scaled} option (\emph{e.g.}, {\tt scaled=.97}) that allow you to adjust the text size against, say, a math package. This text package works well with {\tt newtxmath} with the {\tt libertine} option, because the latter has italics of the same italic angle as {\tt fbb} and of very similar xheight and weight. The suggested invocation is: \begin{verbatim} +% load babel package and options here \usepackage[full]{textcomp} % to get the right copyright, etc. -\usepackage[lining,tabular]{fbb} % so math uses tabular lining figures +\usepackage[p,osf]{fbb} % osf in text, tabular lining figures in math \usepackage[scaled=.95,type1]{cabin} % sans serif in style of Gill Sans \usepackage[varqu,varl]{zi4}% inconsolata typewriter \usepackage[T1]{fontenc} % LY1 also works -\usepackage[libertine,bigdelims]{newtxmath} +\usepackage[libertine]{newtxmath} \usepackage[cal=boondoxo,bb=boondox,frak=boondox]{mathalfa} -\useosf % change normal text to use oldstyle figures -\useproportional -% can also set option proportional (or p) for proportionally spaced figures \end{verbatim} Here is a short sample based on this preamble:\\[4pt] \def\Pr{\ensuremath{\mathbb{P}}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbb.doc.tlpobj new/tlpkg/tlpobj/fbb.doc.tlpobj --- old/tlpkg/tlpobj/fbb.doc.tlpobj 2016-04-14 19:01:22.000000000 +0200 +++ new/tlpkg/tlpobj/fbb.doc.tlpobj 2017-04-14 17:40:04.000000000 +0200 @@ -1,9 +1,9 @@ name fbb.doc category Package -revision 39071 +revision 43464 shortdesc doc files of fbb relocated 1 -docfiles size=125 +docfiles size=123 RELOC/doc/fonts/fbb/OFL.txt RELOC/doc/fonts/fbb/README RELOC/doc/fonts/fbb/fbb-doc.pdf ++++++ fbb.tar.xz ++++++ ++++ 5575 lines of diff (skipped) ++++++ fbithesis.doc.tar.xz ++++++ ++++++ fbithesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbithesis.tlpobj new/tlpkg/tlpobj/fbithesis.tlpobj --- old/tlpkg/tlpobj/fbithesis.tlpobj 2016-04-14 19:01:27.000000000 +0200 +++ new/tlpkg/tlpobj/fbithesis.tlpobj 2017-04-14 17:40:06.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/fbithesis/fbithesis.cfg RELOC/tex/latex/fbithesis/fbithesis.cls catalogue-ctan /macros/latex/contrib/fbithesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics dissertation catalogue-version 1.2m ++++++ fbs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbs.tlpobj new/tlpkg/tlpobj/fbs.tlpobj --- old/tlpkg/tlpobj/fbs.tlpobj 2016-04-14 19:01:27.000000000 +0200 +++ new/tlpkg/tlpobj/fbs.tlpobj 2017-04-14 17:40:06.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=7 RELOC/bibtex/bst/fbs/fbs.bst catalogue-ctan /biblio/bibtex/contrib/misc/fbs.bst -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub biology bibtex-sty ++++++ fc.doc.tar.xz ++++++ ++++++ fc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fc.tlpobj new/tlpkg/tlpobj/fc.tlpobj --- old/tlpkg/tlpobj/fc.tlpobj 2016-04-14 19:01:27.000000000 +0200 +++ new/tlpkg/tlpobj/fc.tlpobj 2017-04-14 17:40:07.000000000 +0200 @@ -495,7 +495,7 @@ RELOC/tex/latex/fc/t4fcr.fd RELOC/tex/latex/fc/t4phonet.sty catalogue-ctan /fonts/jknappen/fc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font font-mf multilingual catalogue-version 1.4 ++++++ fcavtex.doc.tar.xz ++++++ ++++++ fcavtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fcavtex.tlpobj new/tlpkg/tlpobj/fcavtex.tlpobj --- old/tlpkg/tlpobj/fcavtex.tlpobj 2016-04-14 19:01:29.000000000 +0200 +++ new/tlpkg/tlpobj/fcavtex.tlpobj 2017-04-14 17:40:07.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/bibtex/bst/fcavtex/fcavtex.bst RELOC/tex/latex/fcavtex/fcavtex.cls catalogue-ctan /macros/latex/contrib/fcavtex -catalogue-date 2015-08-12 06:28:09 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class catalogue-version 1.1 ++++++ fcltxdoc.doc.tar.xz ++++++ ++++++ fcltxdoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fcltxdoc.tlpobj new/tlpkg/tlpobj/fcltxdoc.tlpobj --- old/tlpkg/tlpobj/fcltxdoc.tlpobj 2016-04-14 19:01:30.000000000 +0200 +++ new/tlpkg/tlpobj/fcltxdoc.tlpobj 2017-04-14 17:40:07.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=9 RELOC/tex/latex/fcltxdoc/fcltxdoc.sty catalogue-ctan /macros/latex/contrib/fcltxdoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-supp catalogue-version 1.0 ++++++ fcolumn.doc.tar.xz ++++++ ++++++ fcolumn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fcolumn.tlpobj new/tlpkg/tlpobj/fcolumn.tlpobj --- old/tlpkg/tlpobj/fcolumn.tlpobj 2016-04-14 19:01:30.000000000 +0200 +++ new/tlpkg/tlpobj/fcolumn.tlpobj 2017-04-14 17:40:07.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/fcolumn/fcolumn.sty catalogue-ctan /macros/latex/contrib/fcolumn -catalogue-date 2015-09-27 21:05:38 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics table catalogue-version 1.1.1 ++++++ fdsymbol.doc.tar.xz ++++++ ++++++ fdsymbol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fdsymbol.tlpobj new/tlpkg/tlpobj/fdsymbol.tlpobj --- old/tlpkg/tlpobj/fdsymbol.tlpobj 2016-04-14 19:01:31.000000000 +0200 +++ new/tlpkg/tlpobj/fdsymbol.tlpobj 2017-04-14 17:40:08.000000000 +0200 @@ -107,7 +107,7 @@ RELOC/fonts/type1/public/fdsymbol/FdSymbolF-Regular.pfb RELOC/tex/latex/fdsymbol/fdsymbol.sty catalogue-ctan /fonts/fdsymbol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-symbol font-symbol-maths font-type1 font-otf catalogue-version 0.8 ++++++ featpost.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-i/featpost.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-i.new/featpost.doc.tar.xz differ: char 27, line 1 ++++++ featpost.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/featpost.tlpobj new/tlpkg/tlpobj/featpost.tlpobj --- old/tlpkg/tlpobj/featpost.tlpobj 2016-04-14 19:01:50.000000000 +0200 +++ new/tlpkg/tlpobj/featpost.tlpobj 2017-04-14 17:40:16.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/metapost/featpost/featpost.mp RELOC/metapost/featpost/featpost3Dplus2D.mp catalogue-ctan /graphics/metapost/contrib/macros/featpost -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-3d catalogue-version 0.8.8 ++++++ fei.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/README new/doc/latex/fei/README --- old/doc/latex/fei/README 2015-09-12 23:28:44.000000000 +0200 +++ new/doc/latex/fei/README 2016-11-25 19:28:51.000000000 +0100 @@ -11,11 +11,11 @@ fei is loosely based in the Brazilian National Standards Organization (AssociaÃ§Ã£o Brasileira de Normas TÃ©cnicas, ABNT) standards for the creation of academic works, such as ABNT NBR 10520:2002 (Citations) and ABNT NBR 6023:2002 (Bibligraphic References). -In the manual (fei.pdf), users will find detailed information regarding the class commands, environments and best practices to create a an academic text of good quality. We also made available a template file (fei-template.tex) which students may use as a starting point for their texts. +In the manual, users will find detailed information regarding the class commands, environments and best practices to create an academic text of good quality. We also made available a few template files which students may use as a starting point for their texts. ##License Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt ##Latest releases and version control -To get the newest version of fei.cls, as well as to know the change we are doing to the class and its functionalities, visit https://github.com/OpenFEI/Classe-Latex-FEI/. +To get the newest version of the class, as well as to know the changes we are doing to the class and its functionalities, visit https://douglasrizzo.github.io/Classe-Latex-FEI/. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/README.txt new/doc/latex/fei/README.txt --- old/doc/latex/fei/README.txt 2015-09-12 23:28:44.000000000 +0200 +++ new/doc/latex/fei/README.txt 2016-11-25 19:28:51.000000000 +0100 @@ -11,11 +11,11 @@ fei is loosely based in the Brazilian National Standards Organization (Associa^^c3^^a7^^c3^^a3o Brasileira de Normas T^^c3^^a9cnicas, ABNT) standards for the creation of academic works, such as ABNT NBR 10520:2002 (Citations) and ABNT NBR 6023:2002 (Bibligraphic References). -In the manual (fei.pdf), users will find detailed information regarding the class commands, environments and best practices to create a an academic text of good quality. We also made available a template file (fei-template.tex) which students may use as a starting point for their texts. +In the manual, users will find detailed information regarding the class commands, environments and best practices to create an academic text of good quality. We also made available a few template files which students may use as a starting point for their texts. ##License Released under the LaTeX Project Public License v1.3c or later See http://www.latex-project.org/lppl.txt ##Latest releases and version control -To get the newest version of fei.cls, as well as to know the change we are doing to the class and its functionalities, visit https://github.com/OpenFEI/Classe-Latex-FEI/. +To get the newest version of the class, as well as to know the changes we are doing to the class and its functionalities, visit https://douglasrizzo.github.io/Classe-Latex-FEI/. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/fei-template-sublist.tex new/doc/latex/fei/fei-template-sublist.tex --- old/doc/latex/fei/fei-template-sublist.tex 2015-09-12 23:28:44.000000000 +0200 +++ new/doc/latex/fei/fei-template-sublist.tex 2016-12-16 00:01:03.000000000 +0100 @@ -25,24 +25,26 @@ %% -- Simbolos %% -- Latin letters -%\newglossaryentry{}{parent=geral,type=simbolos,name={},sort=a,description={} -\newglossaryentry{A}{parent=geral,type=simbolos,name={\ensuremath{A}},sort=a,description={exchanger total heat transfer area, $m^2$}} -\newglossaryentry{G}{parent=geral,type=simbolos,name={\ensuremath{G}},sort=g,description={exchanger flow-stream mass velocity, $kg/(s m^2)$}} -\newglossaryentry{f}{parent=geral,type=simbolos,name={\ensuremath{j}},sort=j,description={friction factor, dimensionless}} +%\newglossaryentry{}{parent=geral,type=symbols,name={},sort=a,description={} +\newglossaryentry{A}{parent=geral,type=symbols,name={\ensuremath{A}},sort=a,description={exchanger total heat transfer area, $m^2$}} +\newglossaryentry{G}{parent=geral,type=symbols,name={\ensuremath{G}},sort=g,description={exchanger flow-stream mass velocity, $kg/(s m^2)$}} +\newglossaryentry{f}{parent=geral,type=symbols,name={\ensuremath{j}},sort=j,description={friction factor, dimensionless}} %% -- Greek letters -%\newglossaryentry{}{parent=geral,type=simbolos,name={},sort=a,description={} -\newglossaryentry{deltap}{parent=greek,type=simbolos,name={\ensuremath{\Delta P}},sort=p,description={pressure drop, $Pa$}} -\newglossaryentry{nu}{parent=greek,type=simbolos,name={\ensuremath{\nu}},sort=b,description={specific volume, $m^3/kg$}} -\newglossaryentry{beta}{parent=greek,type=simbolos,name={\ensuremath{\beta}},sort=b,description={ratio of free-flow area $A_{ff}$ and frontal area $A_{fr}$ of one side of exchanger, dimensionless}} +%\newglossaryentry{}{parent=geral,type=symbols,name={},sort=a,description={} +\newglossaryentry{deltap}{parent=greek,type=symbols,name={\ensuremath{\Delta P}},sort=p,description={pressure drop, $Pa$}} +\newglossaryentry{nu}{parent=greek,type=symbols,name={\ensuremath{\nu}},sort=b,description={specific volume, $m^3/kg$}} +\newglossaryentry{beta}{parent=greek,type=symbols,name={\ensuremath{\beta}},sort=b,description={ratio of free-flow area $A_{ff}$ and frontal area $A_{fr}$ of one side of exchanger, dimensionless}} %% -- Subscripts -%\newglossaryentry{}{parent=geral,type=simbolos,name={},sort=a,description={} -\newglossaryentry{fr}{parent=sub,type=simbolos,name={\ensuremath{fr}},sort=fr,description={frontal}} -\newglossaryentry{in}{parent=sub,type=simbolos,name={\ensuremath{i}},sort=in,description={inlet}} -\newglossaryentry{out}{parent=sub,type=simbolos,name={\ensuremath{o}},sort=out,description={outlet}} +%\newglossaryentry{}{parent=geral,type=symbols,name={},sort=a,description={} +\newglossaryentry{fr}{parent=sub,type=symbols,name={\ensuremath{fr}},sort=fr,description={frontal}} +\newglossaryentry{in}{parent=sub,type=symbols,name={\ensuremath{i}},sort=in,description={inlet}} +\newglossaryentry{out}{parent=sub,type=symbols,name={\ensuremath{o}},sort=out,description={outlet}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\addbibresource{referencias.bib} + \makeindex \makeglossaries @@ -149,15 +151,15 @@ \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo} \centering \begin{tabular}{|c|c|c|c|} - \hline - & $x_1$ & $x_2$ & $x_3$ \\ - \hline - $y_1$ & 1 & 0 & 0 \\ - \hline - $y_2$ & 0 & 1 & 0 \\ - \hline - $y_3$ & 0 & 0 & 1 \\ - \hline + \hline + & $x_1$ & $x_2$ & $x_3$ \\ + \hline + $y_1$ & 1 & 0 & 0 \\ + \hline + $y_2$ & 0 & 1 & 0 \\ + \hline + $y_3$ & 0 & 0 & 1 \\ + \hline \end{tabular} \caption*{Fonte: Autor} \end{table} @@ -174,11 +176,11 @@ \Retorna $c$ -\caption{Algoritmo que calcula o teorema de PitÃ¡goras, de acordo com \citeonline{heath1921history}.} +\caption{Algoritmo que calcula o teorema de PitÃ¡goras, de acordo com \textcite{heath1921history}.} \label{lst:alg} \end{algorithm} -\bibliography{referencias} +\printbibliography \printindex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/fei-template.tex new/doc/latex/fei/fei-template.tex --- old/doc/latex/fei/fei-template.tex 2015-09-12 23:28:44.000000000 +0200 +++ new/doc/latex/fei/fei-template.tex 2017-03-28 22:37:38.000000000 +0200 @@ -17,17 +17,19 @@ \newacronym[longplural=Computational Aided Design]{cad}{CAD}{Computational Aided Design} \newacronym[longplural=Centro UniversitÃ¡rio da FEI]{fei}{FEI}{Centro UniversitÃ¡rio da FEI} %% -- Simbolos -\newglossaryentry{A}{type=simbolos,name={\ensuremath{A}},sort=a,description={exchanger total heat transfer area, $m^2$}} -\newglossaryentry{G}{type=simbolos,name={\ensuremath{G}},sort=g,description={exchanger flow-stream mass velocity, $kg/(s m^2)$}} -\newglossaryentry{f}{type=simbolos,name={\ensuremath{j}},sort=j,description={friction factor, dimensionless}} -\newglossaryentry{deltap}{type=simbolos,name={\ensuremath{\Delta P}},sort=p,description={pressure drop, $Pa$}} -\newglossaryentry{nu}{type=simbolos,name={\ensuremath{\nu}},sort=b,description={specific volume, $m^3/kg$}} -\newglossaryentry{beta}{type=simbolos,name={\ensuremath{\beta}},sort=b,description={ratio of free-flow area $A_{ff}$ and frontal area $A_{fr}$ of one side of exchanger, dimensionless}} -\newglossaryentry{fr}{type=simbolos,name={\ensuremath{fr}},sort=fr,description={frontal}} -\newglossaryentry{in}{type=simbolos,name={\ensuremath{i}},sort=in,description={inlet}} -\newglossaryentry{out}{type=simbolos,name={\ensuremath{o}},sort=out,description={outlet}} +\newglossaryentry{A}{type=symbols,name={\ensuremath{A}},sort=a,description={exchanger total heat transfer area, $m^2$}} +\newglossaryentry{G}{type=symbols,name={\ensuremath{G}},sort=g,description={exchanger flow-stream mass velocity, $kg/(s m^2)$}} +\newglossaryentry{f}{type=symbols,name={\ensuremath{j}},sort=j,description={friction factor, dimensionless}} +\newglossaryentry{deltap}{type=symbols,name={\ensuremath{\Delta P}},sort=p,description={pressure drop, $Pa$}} +\newglossaryentry{nu}{type=symbols,name={\ensuremath{\nu}},sort=b,description={specific volume, $m^3/kg$}} +\newglossaryentry{beta}{type=symbols,name={\ensuremath{\beta}},sort=b,description={ratio of free-flow area $A_{ff}$ and frontal area $A_{fr}$ of one side of exchanger, dimensionless}} +\newglossaryentry{fr}{type=symbols,name={\ensuremath{fr}},sort=fr,description={frontal}} +\newglossaryentry{in}{type=symbols,name={\ensuremath{i}},sort=in,description={inlet}} +\newglossaryentry{out}{type=symbols,name={\ensuremath{o}},sort=out,description={outlet}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\addbibresource{referencias.bib} + \makeindex \makeglossaries @@ -82,12 +84,15 @@ \listoffigures \listoftables \listofalgorithms -\glsaddall \printglossaries \tableofcontents \chapter{LOREM IPSUM} +% remova este comando caso nÃ£o use lista de abreviaturas e sÃmbolos +% ou se vocÃª referenciar os termos com \gls{} no texto +\glsaddall + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit. @@ -134,15 +139,15 @@ \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo} \centering \begin{tabular}{|c|c|c|c|} - \hline - & $x_1$ & $x_2$ & $x_3$ \\ - \hline - $y_1$ & 1 & 0 & 0 \\ - \hline - $y_2$ & 0 & 1 & 0 \\ - \hline - $y_3$ & 0 & 0 & 1 \\ - \hline + \hline + & $x_1$ & $x_2$ & $x_3$ \\ + \hline + $y_1$ & 1 & 0 & 0 \\ + \hline + $y_2$ & 0 & 1 & 0 \\ + \hline + $y_3$ & 0 & 0 & 1 \\ + \hline \end{tabular} \caption*{Fonte: Autor} \end{table} @@ -159,11 +164,11 @@ \Retorna $c$ -\caption{Algoritmo que calcula o teorema de PitÃ¡goras, de acordo com \citeonline{heath1921history}.} +\caption{Algoritmo que calcula o teorema de PitÃ¡goras, de acordo com \textcite{heath1921history}.} \label{lst:alg} \end{algorithm} -\bibliography{referencias} +\printbibliography \printindex Binary files old/doc/latex/fei/fei.pdf and new/doc/latex/fei/fei.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/referencias.bib new/doc/latex/fei/referencias.bib --- old/doc/latex/fei/referencias.bib 2015-09-12 23:28:44.000000000 +0200 +++ new/doc/latex/fei/referencias.bib 2017-03-19 00:01:06.000000000 +0100 @@ -1,132 +1,242 @@ -@article{j:turing50, - added-at = {2008-03-17T11:27:54.000+0100}, - author = {Turing, Alan M.}, - biburl = {http://www.bibsonomy.org/bibtex/284f8dcb41f0c8f26e10641a347e30ab0/nlp}, - interhash = {3f7a151a4f79fe75b4bb148b41279a9b}, - intrahash = {84f8dcb41f0c8f26e10641a347e30ab0}, - journal = {Mind}, - keywords = {2000 book nlp}, - pages = {433--460}, - timestamp = {2008-03-17T11:27:54.000+0100}, - title = {Computing Machinery and Intelligence}, - volume = 59, - year = 1950 -} - -@book{Goldberg1989, -address = {Boston, MA, USA}, -author = {Goldberg, David E}, -edition = {1st}, -isbn = {0201157675}, -mendeley-groups = {Books}, -publisher = {Addison-Wesley Longman Publishing Co., Inc.}, -title = {{Genetic Algorithms in Search, Optimization and Machine Learning}}, -year = {1989} -} - -@article{Mcc43, - added-at = {2008-09-29T18:25:59.000+0200}, - author = {McCulloch, W.S. and Pitts, W.}, - biburl = {http://www.bibsonomy.org/bibtex/21bb9f5a562a4ca7ad9c5d9ba8af91562/mcdiaz}, - interhash = {f9ac013a9ed96a36c8771b3a1ce71702}, - intrahash = {1bb9f5a562a4ca7ad9c5d9ba8af91562}, - journal = {Bulletin of Mathematical Biophysic}, - keywords = {imported}, - number = 5, - pages = {115-133}, - timestamp = {2008-09-29T18:25:59.000+0200}, - title = {A logical calculus of the ideas immanent in nervous activity}, - year = 1943 -} - -@book{mittelbach_latex_2004, - edition = {2}, - title = {The Latex Companion}, - publisher = {Addison-Wesley}, - author = {Mittelbach, Frank and Goossens, Michel}, - year = {2004}, - file = {Mittelbach and Goossens - 2004 - The Latex Companion.pdf:/home/douglas/Copy/zotero/storage/STJH9E6U/Mittelbach and Goossens - 2004 - The Latex Companion.pdf:application/pdf} -} - -@book{russell_artificial_2010, - address = {Upper Saddle River, {NJ}}, - edition = {3}, - title = {Artificial intelligence: a modern approach}, - isbn = {9780136042594 0136042597 9780132071482 0132071487}, - shorttitle = {Artificial intelligence}, - abstract = {In this third edition, the authors have updated the treatment of all major areas. A new organizing principle--the representational dimension of atomic, factored, and structured models--has been added. Significant new material has been provided in areas such as partially observable search, contingency planning, hierarchical planning, relational and first-order probability models, regularization and loss functions in machine learning, kernel methods, Web search engines, information extraction, and learning in vision and robotics. The book also includes hundreds of new exercises.}, - language = {English}, - publisher = {Prentice Hall}, - author = {Russell, Stuart J and Norvig, Peter and Davis, Ernest}, - year = {2010}, - file = {Russell et al. - 2010 - Artificial intelligence a modern approach.pdf:/home/douglas/Copy/zotero/storage/85JRWWV7/Russell et al. - 2010 - Artificial intelligence a modern approach.pdf:application/pdf;Russell et al. - 2010 - Artificial intelligence a modern approach.pdf:/home/douglas/Copy/zotero/storage/C59CZJU5/Russell et al. - 2010 - Artificial intelligence a modern approach.pdf:application/pdf} -} - -@book{haykin99a, - added-at = {2009-10-27T06:49:28.000+0100}, - author = {Haykin, Simon}, - biburl = {http://www.bibsonomy.org/bibtex/2e13a49ec715f4e52f1dcca0d4c5c8b2c/chrmina}, - description = {Thesis BIB}, - interhash = {9c833e39d6ac9c0a31aca034fb641190}, - intrahash = {e13a49ec715f4e52f1dcca0d4c5c8b2c}, - keywords = {imported}, - publisher = {Prentice Hall}, - timestamp = {2009-10-27T06:49:28.000+0100}, - title = {Neural Networks: A Comprehensive Foundation}, - year = 1999 -} - -@book{galilei_dialogue_1953, - title = {Dialogue concerning the two chief world systems: Ptolemaic and Copernican}, - shorttitle = {Dialogue concerning the two chief world systems}, - publisher = {University of California Pr}, - author = {Galilei, Galileo}, - year = {1953} -}, - -@book{galilei_sidereus_2004, - title = {Sidereus Nuncius, Or The Sidereal Messenger}, - isbn = {9780226279039}, - language = {en}, - publisher = {Byzantium Press}, author = {Galilei, Galileo}, - year = {2004}, - keywords = {Science / Astronomy, Science / General} -} - -@book{dyson_disturbing_1979, - title={Disturbing the Universe}, - author={Dyson, F.J.}, - isbn={9780465016778}, - lccn={78020665}, - series={Basic Books 50 years}, - url={http://books.google.com.br/books?id=RHzoMeU2bxsC}, - year={1979}, - publisher={Basic Books} -} - -@book{heath1921history, - title={A History of Greek Mathematics}, - author={Heath, T.L.}, - number={v. 1}, - lccn={22005925}, - series={A History of Greek Mathematics}, - url={http://books.google.com.br/books?id=h4JsAAAAMAAJ}, - year={1921}, - publisher={Clarendon Press} -} - - @Unpublished{lshort, - author = {Tobias Oetiker and Hubert Partl and Irene Hyna and Elisabeth Schlegl}, - title = {The Not So Short Introduction to {\LaTeXe}}, - month = {apr}, - year = {2014}, - note = {Distribuido digitalmente}, - url={http://tobi.oetiker.ch/lshort/} - } - - @book{lamport1994latex, - title={{\LaTeX} - A Document Preparation System}, - author={Lamport, Leslie}, - year={1994}, - publisher={Adisson-Wesley} + +@Book{art1, + title = {The Art of Computer Programming: Fundamental algorithms}, + author = {Donald Knuth}, + year = {1997}, + publisher = {Addison-Wesley}, + url = {https://books.google.com.br/books?id=B31GAAAAYAAJ}, + number = {v. 1}, + lccn = {97002147}, + series = {Addison-Wesley series in computer science and information processing} +} + +@Book{assange2012, + title = {Cypherpunks: freedom and the future of the internet}, + author = {Assange, Julian and Appelbaum, Jacob and MÃŒller-Maguhn, Andy and Zimmermann, JÃ©rÃ©mie}, + year = {2012}, + publisher = {OR Books}, + shorttitle = {Cypherpunks}, + address = {New York ; London} +} + +@Book{clarke19932001, + title = {2001, a Space Odyssey}, + author = {Arthur Charles Clarke and Kubrick, Stanley}, + year = {1993}, + publisher = {ROC}, + url = {https://books.google.com.br/books?id=atx0AAAACAAJ}, + lccn = {92245352}, + series = {ROC Book} +} + +@Article{duan2012large, + title = {Large-scale brain networks in board game experts: insights from a domain-related task and task-free resting state}, + author = {Duan, Xujun and Liao, Wei and Liang, Dongmei and Qiu, Lihua and Gao, Qing and Liu, Chengyi and Gong, Qiyong and Chen, Huafu}, + year = {2012}, + journal = {PloS one}, + publisher = {Public Library of Science}, + volume = {7}, + pages = {e32532}, + number = {3} +} + +@Article{duan2012reduced, + title = {Reduced caudate volume and enhanced striatal-DMN integration in chess experts}, + author = {Duan, Xujun and He, Sheng and Liao, Wei and Liang, Dongmei and Qiu, Lihua and Wei, Luqing and Li, Yuan and Liu, Chengyi and Gong, Qiyong and Chen, Huafu}, + year = {2012}, + journal = {Neuroimage}, + publisher = {Elsevier}, + volume = {60}, + pages = {1280--1286}, + number = {2} +} + +@Article{duan2014functional, + title = {Functional organization of intrinsic connectivity networks in Chinese-chess experts}, + author = {Duan, Xujun and Long, Zhiliang and Chen, Huafu and Liang, Dongmei and Qiu, Lihua and Huang, Xiaoqi and Liu, Timon Cheng-Yi and Gong, Qiyong}, + year = {2014}, + journal = {Brain research}, + publisher = {Elsevier}, + volume = {1558}, + pages = {33--43} +} + +@Book{dyson_disturbing_1979, + title = {Disturbing the Universe}, + author = {Freeman Dyson}, + year = {1979}, + publisher = {Basic Books}, + url = {http://books.google.com.br/books?id=RHzoMeU2bxsC}, + series = {Basic Books 50 years} +} + +@Book{galilei_dialogue_1953, + title = {Dialogue concerning the two chief world systems: Ptolemaic and Copernican}, + author = {Galileo Galilei}, + year = {1953}, + publisher = {University of California Pr}, + shorttitle = {Dialogue concerning the two chief world systems} +} + +@Book{galilei_sidereus_2004, + title = {Sidereus Nuncius, Or The Sidereal Messenger}, + author = {Galileo Galilei}, + year = {2004}, + publisher = {Byzantium Press}, + language = {en} +} + +@Book{goldberg1989, + title = {Genetic Algorithms in Search, Optimization and Machine Learning}, + author = {David Goldberg}, + year = {1989}, + publisher = {Addison-Wesley Longman Publishing Co., Inc.}, + address = {Boston, MA, USA}, + edition = {1st} +} + +@Book{hamlet, + title = {Hamlet}, + author = {William Shakespeare and Burton Raffel and Harold Bloom}, + year = {2003}, + publisher = {Yale University Press}, + url = {http://www.jstor.org/stable/j.ctt1njkw8} +} + +@Book{haykin99a, + title = {Neural Networks: A Comprehensive Foundation}, + author = {Simon Haykin}, + year = {1999}, + publisher = {Prentice Hall} +} + +@Book{heath1921history, + title = {A History of Greek Mathematics}, + author = {Thomas Little Heath}, + year = {1921}, + publisher = {Clarendon Press}, + url = {http://books.google.com.br/books?id=h4JsAAAAMAAJ}, + number = {v. 1}, + series = {A History of Greek Mathematics} +} + +@Book{kahneman2011, + title = {Thinking, fast and slow}, + author = {Kahneman, Daniel}, + year = {2011}, + publisher = {Macmillan} +} + +@Book{kernighan1988, + title = {The {C} programming language}, + author = {Kernighan, Brian W. and Ritchie, Dennis M. and Ejeklint, Per}, + year = {1988}, + publisher = {Prentice-Hall Englewood Cliffs}, + volume = {2} +} + +@Book{kurzweil2013, + title = {How to create a mind: the secret of human thought revealed}, + author = {Kurzweil, Ray}, + year = {2013}, + publisher = {Penguin Books}, + shorttitle = {How to create a mind}, + address = {New York, NY}, + language = {eng} +} + +@Book{lamport1994latex, + title = {{\LaTeX} - A Document Preparation System}, + author = {Leslie Lamport}, + year = {1994}, + publisher = {Adisson-Wesley} +} + +@Unpublished{lshort, + title = {The Not So Short Introduction to {\LaTeXe}}, + author = {Tobias Oetiker and Hubert Partl and Irene Hyna and Elisabeth Schlegl}, + year = {2014}, + month = {apr}, + url = {http://tobi.oetiker.ch/lshort/}, + note = {Distribuido digitalmente} +} + +@Article{mcc43, + title = {A logical calculus of the ideas immanent in nervous activity}, + author = {Warren McCulloch and Walter Pitts}, + year = {1943}, + journal = {Bulletin of Mathematical Biophysic}, + pages = {115-133}, + keywords = {imported}, + number = 5 +} + +@Book{mittelbach_latex_2004, + title = {The Latex Companion}, + author = {Frank Mittelbach and Michel Goossens}, + year = {2004}, + publisher = {Addison-Wesley}, + edition = {2} +} + +@Article{rocha2005brain, + title = {Brain mappings of the arithmetic processing in children and adults}, + author = {Rocha, Fabio and Rocha, Armando F and Massad, Eduardo and Menezes, Renee}, + year = {2005}, + journal = {Cognitive Brain Research}, + publisher = {Elsevier}, + volume = {22}, + pages = {359--372}, + number = {3} +} + +@Article{rocha2014brain, + title = {Brain mapping and interpretation of reading processing in children using EEG and multivariate statistical analysis}, + author = {Rocha, Fabio and Thomaz, Carlos Eduardo and da Rocha, Armando Freitas and Massad, Eduardo}, + year = {2014}, + booktitle = {2014 27th SIBGRAPI Conference on Graphics, Patterns and Images}, + pages = {251--258}, + organization = {IEEE} +} + +@Article{rocha2016eeg, + title = {EEG acquisition and processing for cognitive brain mapping during chess problem solving}, + author = {Rocha, Fabio and de Magalhaes Junior, Roberto Goncalves and Horta, Thomas Oliveira and Cesar, Fabio Henrique Goncalves and D'Israel, David Maurice and da Silva, Wilson and Thomaz, + Carlos Eduardo}, + year = {2016}, + journal = {IEEE Latin America Transactions}, + publisher = {IEEE}, + volume = {14}, + pages = {1129--1134}, + number = {3} +} + +@Book{russell2010, + title = {Artificial intelligence: a modern approach}, + author = {Stuart Russell and Peter Norvig and Ernest Davis}, + year = {2010}, + publisher = {Prentice Hall}, + shorttitle = {Artificial intelligence}, + address = {Upper Saddle River, {NJ}}, + edition = {3}, + language = {English} +} + +@Book{stewart2012, + title = {Calculus - 7th edition}, + author = {Stewart, James}, + year = {2012}, + publisher = {Brooks/Cole, Cengage Learning}, + address = {Australia ; Belmont, CA}, + edition = {7}, + language = {English} +} + +@Article{turing50, + title = {Computing Machinery and Intelligence}, + author = {Alan Turing}, + year = {1950}, + journal = {Mind}, + volume = {59}, + pages = {433--460} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fei.doc.tlpobj new/tlpkg/tlpobj/fei.doc.tlpobj --- old/tlpkg/tlpobj/fei.doc.tlpobj 2016-04-14 19:01:50.000000000 +0200 +++ new/tlpkg/tlpobj/fei.doc.tlpobj 2017-04-14 17:40:16.000000000 +0200 @@ -1,9 +1,9 @@ name fei.doc category Package -revision 38364 +revision 43630 shortdesc doc files of fei relocated 1 -docfiles size=80 +docfiles size=84 RELOC/doc/latex/fei/README RELOC/doc/latex/fei/README.txt RELOC/doc/latex/fei/fei-template-sublist.tex ++++++ fei.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fei/fei.cls new/tex/latex/fei/fei.cls --- old/tex/latex/fei/fei.cls 2015-09-12 23:28:44.000000000 +0200 +++ new/tex/latex/fei/fei.cls 2017-03-28 22:37:38.000000000 +0200 @@ -14,86 +14,68 @@ %% See http://www.latex-project.org/lppl.txt %% ----------------------------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{fei}[2015/09/10 2.0 Modelo da FEI] -\LoadClass{report} +\ProvidesClass{fei}[2017/03/27 3.0.6 Modelo da FEI] \DeclareOption{xindy}{ - \PassOptionsToPackage{\CurrentOption}{imakeidx} - \PassOptionsToPackage{\CurrentOption}{glossaries} +\PassOptionsToPackage{\CurrentOption}{imakeidx} +\PassOptionsToPackage{\CurrentOption}{glossaries} } - \newif\ifrascunho -\rascunhotrue -\DeclareOption{rascunho} -{ \rascunhofalse -} +\DeclareOption{rascunho}{\rascunhotrue} \newif\ifsublist \sublistfalse -\DeclareOption{sublist} -{ - \sublisttrue -} +\DeclareOption{sublist}{\sublisttrue} \newif\ifarial -\DeclareOption{arial} -{ - \arialtrue -} - -\DeclareOption{times} -{ - \arialfalse -} - -\newif\iftwoside -\twosidefalse -\DeclareOption{twoside} -{ - \twosidetrue -} - -\DeclareOption{algo-as-figure} -{ - \PassOptionsToPackage{figure}{algorithm2e} -} - - +\DeclareOption{arial}{\arialtrue} +\DeclareOption{times}{\arialfalse} +\newif\ifoneside +\DeclareOption{oneside}{\onesidetrue} +\DeclareOption{twoside}{\onesidefalse} +\DeclareOption{algo-as-figure}{\PassOptionsToPackage{figure}{algorithm2e}}% +\PassOptionsToClass{a4paper}{memoir} +\ExecuteOptions{oneside,times} +\ProcessOptions\relax % processa todas as op^^c3^^a7^^c3^^b5es -\ExecuteOptions{times} % processa op^^c3^^a7^^c3^^b5es-padr^^c3^^a3o +\ifoneside +\LoadClass[oneside]{memoir} +\else +\LoadClass{memoir} +\fi -\ProcessOptions\relax % processa todas as op^^c3^^a7^^c3^^b5es +\RequirePackage[utf8]{inputenc} +\RequirePackage[T1]{fontenc} +\RequirePackage[english,brazil]{babel} +\RequirePackage{csquotes} \renewcommand{\normalsize}{\fontsize{12pt}{14.4pt}\selectfont} % fonte do texto \renewcommand{\footnotesize}{\fontsize{10pt}{12pt}\selectfont} % fonte das notas de rodap^^c3^^a9 -\RequirePackage[a4paper,top=3cm,bottom=2cm,left=3cm,right=2cm,bindingoffset=0cm,nofoot]{geometry} - -\RequirePackage{fancyhdr} -\pagenumbering{arabic} % estilo da numera^^c3^^a7^^c3^^a3o das p^^c3^^a1ginas -\pagestyle{fancy} % estilo dos cabe^^c3^^a7alhos/rodap^^c3^^a9s -\fancyhf{} -\renewcommand{\footrulewidth}{0pt} -\renewcommand{\headrulewidth}{0pt} -\fancyhead[RO,LE]{\footnotesize\thepage}% numero da p^^c3^^a1gina em fonte menor que a do texto -\setlength{\headheight}{14.4pt} -\RequirePackage[english,portuges]{babel} -\RequirePackage[T1]{fontenc} +\setlrmarginsandblock{30mm}{20mm}{*} +\setulmarginsandblock{30mm}{20mm}{*} +\checkandfixthelayout -\RequirePackage{setspace} -\spacing{1.45} +\linespread{1.25} % espa^^c3^^a7amento entre linhas \setlength{\parindent}{1.25cm} % recuo do paragrafo +\makepagestyle{title} % pagina de titulo +\makepagestyle{plain} % estilo padr^^c3^^a3o +\makeevenhead{plain}{\footnotesize\thepage}{}{} +\makeoddhead{plain}{}{}{\footnotesize\thepage} + +\setlength{\headheight}{14.4pt} % remove warning do memoir + \RequirePackage[font={singlespacing},format=hang, justification=raggedright,labelsep=endash,singlelinecheck=false]{caption} % fontes das legendas -\selectlanguage{portuges} % idioma do documento +\selectlanguage{brazil} % idioma do documento \widowpenalty=10000 \clubpenalty=10000 @@ -103,11 +85,10 @@ \RequirePackage{icomma} % v^^c3^^adrgula como separador decimal \ifarial - % \RequirePackage{helvet} - \usepackage[scaled]{uarial} - \renewcommand*\familydefault{\sfdefault} %% Only if the base font of the document is to be sans serif +\usepackage[scaled]{uarial} +\renewcommand*\familydefault{\sfdefault} %% Only if the base font of the document is to be sans serif \else - \RequirePackage{times} % usar fonte times no texto todo +\RequirePackage{times} % usar fonte times no texto todo \fi \RequirePackage{graphicx} % figuras @@ -134,6 +115,17 @@ \SetAlgoCaptionSeparator{ --} % separador da legenda \SetAlCapSty{} % estilo da primeira parte da legenda (remove negrito padr^^c3^^a3o) \SetAlCapFnt{\normalsize} % fonte da primeira parte da legenda + +\let\l@algocf\l@figure + +\let\oldlistofalgorithms\listofalgorithms +\renewcommand{\listofalgorithms}{{% +\setlength{\cftfigurenumwidth}{6.2em} % espa^^c3^^a7o onde a palavra "Algoritmo" ^^c3^^a9 escrita +\renewcommand{\cftfigurepresnum}{Algoritmo } % escrita que precede cada entrada na lista +\renewcommand{\cftfigureaftersnum}{\hfill--\hfill} % tra^^c3^^a7o na frente da escrita que precede as entradas na lista +\part*{\listalgorithmcfname}\pagestyle{empty}\@starttoc{loa}\cleardoublepage % titulo com formato padr^^c3^^a3o de todas as listas +}} + \RequirePackage{amsthm,thmtools} \renewcommand{\listtheoremname}{Lista de Teoremas} % traduz nome da lista de teoremas @@ -165,18 +157,19 @@ \renewcommand{\figurename}{\fontsize{10pt}{10pt}\selectfont Figura} \renewcommand{\tablename}{\fontsize{10pt}{10pt}\selectfont Tabela} + \RequirePackage{enumitem} -\setlist[1]{align=left,labelindent=\parindent,labelwidth=*,labelsep=0.5em,label={\alph*)},ref=\theenumi} -\setlist[2]{align=left,labelindent=\parindent,labelwidth=*,labelsep=0.5em,label={--},ref=\theenumii} +\setlist[1]{align=left,leftmargin=2.25cm,labelsep=0.5em,label={\alph*)},ref=\theenumi} +\setlist[2]{align=left,labelwidth=*,labelsep=0.5em,label={--},ref=\theenumii} \renewenvironment{itemize}{\begin{enumerate}}{\end{enumerate}} % troca o itemize pelo enumerate (seguindo o manual da biblioteca) \renewcommand{\floatpagefraction}{.8} % p^^c3^^a1gina ter^^c3^^a1 apenas floats se o float ocupar pelo menos 80% da p^^c3^^a1gina \renewcommand{\part}{% n^^c3^^a3o usado no texto, s^^c3^^b3 para algumas p^^c3^^a1ginas (resumo, abstract, agradecimentos...) -\@startsection{part}{-1}{0pt}{2\baselineskip}{2\baselineskip}{\cleardoublepage\fontsize{12pt}{14.4pt}\centering\bf\MakeUppercase}} +\@startsection{part}{-1}{0pt}{\baselineskip}{\baselineskip}{\cleardoublepage\fontsize{12pt}{14.4pt}\centering\bfseries\MakeUppercase}} -\renewcommand{\chapter}{\clearpage\pagestyle{fancy}% -\(a)startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}} +\renewcommand{\chapter}{\cleardoublepage\pagestyle{plain}% +\@startsection{chapter}{0}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}} \renewcommand{\section}{% \@startsection{section}{1}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\MakeUppercase}} @@ -188,59 +181,47 @@ \@startsection{subsubsection}{3}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries\itshape}} \renewcommand{\paragraph}{% -\@startsection{paragraph}{4}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\it}} +\@startsection{paragraph}{4}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\itshape}} \setcounter{secnumdepth}{4} % numerar divis^^c3^^b5es at^^c3^^a9 o quarto n^^c3^^advel (paragraph) \setcounter{tocdepth}{4} % incluir divis^^c3^^b5es no sum^^c3^^a1rio at^^c3^^a9 o quarto n^^c3^^advel (paragraph) -%% configuracao do sumario e listas de tabelas e figuras -\RequirePackage[titles]{tocloft} % para poder fazer mais coisas no sumario e nas listas +\renewcommand{\cftchapterindent}{0pt} +\renewcommand{\cftsectionindent}{0pt} +\renewcommand{\cftsubsectionindent}{0pt} +\renewcommand{\cftsubsubsectionindent}{0pt} +\renewcommand{\cftparagraphindent}{0pt} + +\renewcommand{\cftchapternumwidth}{4em} +\renewcommand{\cftsectionnumwidth}{4em} +\renewcommand{\cftsubsectionnumwidth}{4em} +\renewcommand{\cftsubsubsectionnumwidth}{4em} +\renewcommand{\cftparagraphnumwidth}{4em} + +\renewcommand{\cftbeforechapterskip}{0pt} % remove recuo antes de entradas de cap^^c3^^adtulos no sum^^c3^^a1rio + +\renewcommand{\cftchapterfont}{\bfseries} % coloca o titulo de cap^^c3^^adtulos em negrito +\renewcommand{\cftsubsectionfont}{\bfseries} % coloca o titulo das secoes em negrito +\renewcommand{\cftsubsubsectionfont}{\bfseries\itshape} % coloca o titulo das secoes em negrito +\renewcommand{\cftparagraphfont}{\itshape} % coloca o titulo das secoes em negrito -\tocloftpagestyle{empty} % remove numera^^c3^^a7^^c3^^a3o das p^^c3^^a1ginas controladas pelo tocloft - -\renewcommand{\cfttoctitlefont}{\hfil\bf\MakeUppercase} -\renewcommand{\cftloftitlefont}{\hfill\bf\MakeUppercase} -\renewcommand{\cftlottitlefont}{\hfill\bf\MakeUppercase} -\renewcommand{\cftafterloftitle}{\hfill} -\renewcommand{\cftafterlottitle}{\hfill} - -\renewcommand{\cftchapindent}{0pt} -\renewcommand{\cftsecindent}{0pt} -\renewcommand{\cftsubsecindent}{0pt} -\renewcommand{\cftsubsubsecindent}{0pt} -\renewcommand{\cftparaindent}{0pt} - -\renewcommand{\cftchapnumwidth}{\cftparanumwidth} -\renewcommand{\cftsecnumwidth}{\cftparanumwidth} -\renewcommand{\cftsubsecnumwidth}{\cftparanumwidth} -\renewcommand{\cftsubsubsecnumwidth}{\cftparanumwidth} -\renewcommand{\cftparanumwidth}{4em} - -\renewcommand{\cftbeforechapskip}{0pt} % remove recuo antes de entradas de cap^^c3^^adtulos no sum^^c3^^a1rio -\renewcommand{\cftchapfont}{\bfseries} % coloca o titulo de cap^^c3^^adtulos em negrito -\renewcommand{\cftchappagefont}{} % o n^^c3^^bamero da p^^c3^^a1gina dos cap^^c3^^adtulos n^^c3^^a3o ^^c3^^a9 em negrito -\renewcommand{\cftsubsecfont}{\bfseries} % coloca o titulo das secoes em negrito -\renewcommand{\cftsubsubsecfont}{\bfseries\itshape} % coloca o titulo das secoes em negrito -\renewcommand{\cftparafont}{\itshape} % coloca o titulo das secoes em negrito \renewcommand{\cftpartleader}{\cftdotfill{\cftdotsep}} % pontos no sum^^c3^^a1rio para partes -\renewcommand{\cftchapleader}{\cftdotfill{\cftdotsep}} % pontos no sum^^c3^^a1rio para cap^^c3^^adtulos +\renewcommand{\cftchapterleader}{\cftdotfill{\cftdotsep}} % pontos no sum^^c3^^a1rio para cap^^c3^^adtulos + +\renewcommand{\cftchapterpagefont}{} % o n^^c3^^bamero da p^^c3^^a1gina dos cap^^c3^^adtulos n^^c3^^a3o ^^c3^^a9 em negrito -\setlength{\cftfignumwidth}{7.2em} % espa^^c3^^a7o onde a palavra "Ilustra^^c3^^a7^^c3^^a3o" ^^c3^^a9 escrita -\setlength{\cfttabnumwidth}{5.7em} % espa^^c3^^a7o onde a palavra "Tabela" ^^c3^^a9 escrita -\renewcommand{\cftfigpresnum}{Ilustra\c{c}\~ao } % escrita que precede cada entrada na lista de ilustra^^c3^^a7^^c3^^b5es -\renewcommand{\cfttabpresnum}{Tabela } % escrita que precede cada entrada na lista de tabelas -\renewcommand{\cftfigaftersnum}{ --} % tra^^c3^^a7o na frente da escrita que precede as entradas na lista de ilustra^^c3^^a7^^c3^^b5es -\renewcommand{\cfttabaftersnum}{ --} % tra^^c3^^a7o na frente da escrita que precede as entradas na lista de tabelas +\setlength{\cftfigurenumwidth}{7.2em} % espa^^c3^^a7o onde a palavra "Ilustra^^c3^^a7^^c3^^a3o" ^^c3^^a9 escrita +\setlength{\cfttablenumwidth}{5.7em} % espa^^c3^^a7o onde a palavra "Tabela" ^^c3^^a9 escrita +\renewcommand{\cftfigurepresnum}{Ilustra\c{c}\~ao } % escrita que precede cada entrada na lista de ilustra^^c3^^a7^^c3^^b5es +\renewcommand{\cfttablepresnum}{Tabela } % escrita que precede cada entrada na lista de tabelas +\renewcommand{\cftfigureaftersnum}{\hfill--\hfill} % tra^^c3^^a7o na frente da escrita que precede as entradas na lista de ilustra^^c3^^a7^^c3^^b5es +\renewcommand{\cfttableaftersnum}{\hfill--\hfill} % tra^^c3^^a7o na frente da escrita que precede as entradas na lista de tabelas \renewcommand{\tableofcontents}{\part*{\contentsname}\pagestyle{empty}\@starttoc{toc}\cleardoublepage} \renewcommand{\listoftables}{\part*{\listtablename}\pagestyle{empty}\@starttoc{lot}\cleardoublepage} \renewcommand{\listoffigures}{\part*{\listfigurename}\pagestyle{empty}\@starttoc{lof}\cleardoublepage} -\renewcommand{\listofalgorithms}{\begingroup% -\let\oldnumberline\numberline% -\renewcommand{\numberline}{Algoritmo~\oldnumberline}% -\part*{\listalgorithmcfname}\pagestyle{empty}\@starttoc{loa}\cleardoublepage\endgroup} \renewcommand{\listoftheorems}{\begingroup% \let\oldnumberline\numberline% @@ -249,22 +230,20 @@ \def\and{\\} % modifica fun^^c3^^a7^^c3^^a3o do comando \and para ele ser usado na declara^^c3^^a7^^c3^^a3o de m^^c3^^baltiplos autores -\renewcommand{\maketitle}{ -\pagestyle{empty} -\begin{center} -\textbf{ -\MakeUppercase{\@instituicao}\\[\baselineskip] -\uppercase\expandafter{\@author} -\vfill -\MakeUppercase{\@title}\ifthenelse{\isundefined{\@subtitulo}}{}{: \@subtitulo}} -\vfill -\@cidade\\ +\renewcommand{\maketitle}{% +\pagestyle{empty}% +\begin{center}% +\MakeUppercase{\@instituicao}\\[\baselineskip]% +\uppercase\expandafter{\@author}% +\vfill% +\textbf{\MakeUppercase{\@title}}\ifthenelse{\isundefined{\@subtitulo}}{}{: \@subtitulo}% +\vfill% +\@cidade\\% \number\year% -\end{center} +\end{center}% \cleardoublepage } - \newenvironment{folhaderosto}{ \setcounter{page}{1} \thispagestyle{empty} @@ -273,9 +252,9 @@ \vspace*{0.45\textheight} \textbf{\MakeUppercase{\@title}}\ifthenelse{\isundefined{\@subtitulo}}{}{: \@subtitulo} \vfill -\begin{flushright} +\begin{flushright}\begin{SingleSpace} \begin{minipage}{0.55\textwidth}}{\end{minipage}{} -\end{flushright} +\end{SingleSpace}\end{flushright} \vfill \@cidade\\ \number\year @@ -286,22 +265,21 @@ \RequirePackage{ifthen} \newcommand{\folhadeaprovacao}{ \ifrascunho - \includepdf{ata.pdf}\cleardoublepage +\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Folha de aprova\c{c}\~{a}o\end{Huge}\vfill\end{center}\cleardoublepage \else - \thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Folha de aprova\c{c}\~{a}o\end{Huge}\vfill\end{center}\cleardoublepage +\includepdf{ata.pdf}\cleardoublepage \fi } \newcommand{\fichacatalografica}{ - \iftwoside - \else - % se n^^c3^^a3o for frente e verso, a ficha catalogr^^c3^^a1fica n^^c3^^a3o ^^c3^^a9 contada no verso da folha de rosto - \addtocounter{page}{-1} - \fi +\if@twoside +\else +\addtocounter{page}{-1} +\fi \ifrascunho -\includepdf{ficha.pdf}\cleardoublepage +\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Ficha catalogr\'{a}fica\end{Huge}\vfill\end{center}\cleardoublepage \else - \thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Ficha catalogr\'{a}fica\end{Huge}\vfill\end{center}\cleardoublepage +\includepdf{ficha.pdf}\cleardoublepage \fi } @@ -312,7 +290,7 @@ \def\@cidade{S\~ao Bernardo do Campo} \newcommand{\cidade}[1]{\def\@cidade{#1}} -\def\@instituicao{Centro Universit\'ario da FEI} +\def\@instituicao{Centro Universit\'ario FEI} \newcommand{\instituicao}[1]{\def\@instituicao{#1}} \newcommand{\advisor}[1]{\def\@advisor{#1}} @@ -344,61 +322,55 @@ \end{flushleft} } -\newenvironment{resumo}{\part*{Resumo}\pagestyle{empty}\begin{spacing}{1.1}\noindent\normalsize}{\end{spacing}\cleardoublepage\pagestyle{fancy}} +\newenvironment{resumo}{\part*{Resumo}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}\setlength{\parindent}{1.25cm}} -\renewenvironment{abstract}{\selectlanguage{english}\part*{Abstract}\pagestyle{empty}\begin{spacing}{1.1}\noindent\normalsize}{\end{spacing}\cleardoublepage\pagestyle{fancy}\selectlanguage{portuges}} +\renewenvironment{abstract}{\selectlanguage{english}\part*{Abstract}\pagestyle{empty}\setlength{\parindent}{1.25cm}}{\cleardoublepage\pagestyle{plain}\selectlanguage{brazil}} -\newenvironment{agradecimentos}{\part*{Agradecimentos}\pagestyle{empty}}{\cleardoublepage\pagestyle{fancy}} +\newenvironment{agradecimentos}{\part*{Agradecimentos}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}} \RequirePackage{imakeidx} \renewcommand{\indexname}{\'Indice} \let\oldmakeindex\makeindex \let\oldprintindex\printindex -\renewcommand{\makeindex}{\oldmakeindex[title=\hfill \'INDICE \hfill \mbox{}]} -\renewcommand{\printindex}{\addcontentsline{toc}{chapter}{\hspace{\cftsubsubsecnumwidth}\'INDICE}% +\renewcommand{\makeindex}{\oldmakeindex[title=\noindent\hfill\'INDICE\hfill\mbox{}]} +\renewcommand{\printindex}{\addcontentsline{toc}{chapter}{\hspace{\cftchapternumwidth}\'INDICE}% \renewcommand{\chapter}{% -\(a)startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\clearpage\fontsize{12pt}{14.4pt}\bf\MakeUppercase}}% +\(a)startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\clearpage\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}% \oldprintindex}% \RequirePackage[pdftex,pdfborder={0 0 0},colorlinks={false}]{hyperref} \ifsublist - \RequirePackage[symbols,nomain,acronym,nonumberlist]{glossaries} - % estilo usado como base - \setglossarystyle{alttree} - % Configuracao de identacao do nivel 0 (titulos) - \glssetwidest[0]{} - % Configuracao de identacao do nivel 1 (a lista de simbolos em si) - \glssetwidest[1]{aaaaaaaaaaaa} +\RequirePackage[symbols,nomain,acronym,nonumberlist]{glossaries} +\setglossarystyle{alttree} +\glssetwidest[0]{} +\glssetwidest[1]{aaaaaaaaaaaa} - % remove n^^c3^^bamero de p^^c3^^a1gina das listas de s^^c3^^admbolos e abreviaturas (executado na primeira p^^c3^^a1gina) - \renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}\vspace*{-2\baselineskip}} +\renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}\vspace*{-2\baselineskip}} \else - \RequirePackage[symbols,nomain,acronym,nonumberlist,nogroupskip]{glossaries} +\RequirePackage[symbols,nomain,acronym,nonumberlist,nogroupskip]{glossaries} - \newglossarystyle{mylong}{% - \setglossarystyle{long}% base this style on the long style - \renewenvironment{theglossary}{% - \begin{longtable*}{lp{\glsdescwidth}}}% - {\end{longtable*}}% - }% - - \setglossarystyle{mylong} - \renewcommand{\glsnamefont}[1]{\textbf{#1}} - \setlength\LTleft{0pt} - \setlength\LTright{0pt} - \setlength\glsdescwidth{\linewidth} +\newglossarystyle{mylong}{% +\setglossarystyle{long}% base this style on the long style +\renewenvironment{theglossary}{% +\begin{longtable*}{lp{\glsdescwidth}}}% +{\end{longtable*}}% +}% + +\setglossarystyle{mylong} +\setlength\LTleft{0pt} +\setlength\LTright{0pt} +\setlength\glsdescwidth{\linewidth} - % remove n^^c3^^bamero de p^^c3^^a1gina das listas de s^^c3^^admbolos e abreviaturas (executado na primeira p^^c3^^a1gina) - \renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}} +\renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}} \fi -\addto\captionsportuges{% - \renewcommand*{\listfigurename}{Lista de Ilustra\c{c}\~oes}% - \renewcommand*{\contentsname}{Sum\'ario}% - \renewcommand*{\acronymname}{\hfill Lista de Abreviaturas \hfill \mbox{}}% - \renewcommand*{\glssymbolsgroupname}{\hfill Lista de S\'imbolos \hfill \mbox{}}} +\addto\captionsbrazil{% +\renewcommand*{\listfigurename}{Lista de Ilustra\c{c}\~oes}% +\renewcommand*{\contentsname}{Sum\'ario}% +\renewcommand*{\acronymname}{\noindent\hfill Lista de Abreviaturas \hfill \mbox{}}% +\renewcommand*{\glssymbolsgroupname}{\noindent\hfill Lista de S\'imbolos \hfill \mbox{}}} \renewcommand*{\glsclearpage}{\pagestyle{empty}} \renewcommand*{\glossarypostamble}{\pagestyle{empty}\cleardoublepage} @@ -412,8 +384,8 @@ \renewcommand{\thechapter}{\Alph{chapter}}% deixa o contador do cap^^c3^^adtulo em alfab^^c3^^a9tico \renewcommand{\chapter}[1]{% redefine o comando do cap^^c3^^adtulo \stepcounter{chapter}% soma 1 ao contador do cap^^c3^^adtulo -\clearpage\phantomsection\thispagestyle{empty}\mbox{}\vfill\begin{center}\MakeUppercase{\textbf{AP\^ENDICE \thechapter\ --} ##1}\end{center}\vfill% adiciona uma folha com a letra e t^^c3^^adtulo do ap^^c3^^aandice -\addcontentsline{toc}{chapter}{\hspace{\cftparanumwidth}AP\^ENDICE \Alph{chapter} -- ##1}% +\cleardoublepage\phantomsection\thispagestyle{empty}\mbox{}\vfill\begin{center}\MakeUppercase{\textbf{AP\^ENDICE \thechapter\ --} ##1}\end{center}\vfill% adiciona uma folha com a letra e t^^c3^^adtulo do ap^^c3^^aandice +\addcontentsline{toc}{chapter}{\hspace{\cftchapternumwidth}AP\^ENDICE \Alph{chapter} -- ##1}% \newpage% }% }% @@ -424,48 +396,48 @@ \renewcommand{\thechapter}{\Alph{chapter}}% \renewcommand{\chapter}[1]{% \stepcounter{chapter}% -\clearpage\phantomsection\thispagestyle{empty}\mbox{}\vfill\begin{center}\MakeUppercase{\textbf{ANEXO \thechapter\ --} ##1}\end{center}\vfill% +\cleardoublepage\phantomsection\thispagestyle{empty}\mbox{}\vfill\begin{center}\MakeUppercase{\textbf{ANEXO \thechapter\ --} ##1}\end{center}\vfill% \phantomsection% -\addcontentsline{toc}{chapter}{\hspace{\cftparanumwidth}ANEXO \Alph{chapter} -- ##1}% +\addcontentsline{toc}{chapter}{\hspace{\cftchapternumwidth}ANEXO \Alph{chapter} -- ##1}% \newpage% }% }% -\RequirePackage[alf,abnt-emphasize=bf,abnt-repeated-author-omit=yes,abnt-thesis-year=title]{abntex2cite} -\newcommand*{\citefloat}[1]{\citeauthoronline{#1}, \citeyear{#1}} - -\renewenvironment{quote} - {\begin{singlespace}\list{}{% - \fontsize{10pt}{1em}% - \leftmargin=4cm}% - \item\relax\ignorespaces} - {\endlist\end{singlespace}} +\RequirePackage[backend=biber, safeinputenc=true, uniquelist=false, isbn=false, doi=false, style=abnt]{biblatex} +\setlength{\bibitemsep}{1.0\baselineskip} -\renewenvironment{quotation} - {\begin{singlespace}\list{}{% - \fontsize{10pt}{1em}% - \leftmargin=2cm \rightmargin=2cm% - \listparindent .5cm \itemindent}% - \item\relax} - {\endlist\end{singlespace}} - -\newlength{\bibitemsep}\setlength{\bibitemsep}{18pt} -\newlength{\bibparskip}\setlength{\bibparskip}{0pt} % zera o espa^^c3^^a7o entre par^^c3^^a1grafos -\let\oldthebibliography\thebibliography -\renewcommand\thebibliography[1]{% - \oldthebibliography{#1}% - \setlength{\parskip}{\bibparskip}% - \setlength{\itemsep}{\bibitemsep}% +\DefineBibliographyStrings{brazil}{% +bibliography = {REFER\^ENCIAS} } -\let\oldbibliography\bibliography -\renewcommand{\bibliography}[1]{% -\renewcommand{\bibname}{\hfill Refer\^encias \hfill\mbox{}}% muda o nome do titulo (modelo da biblioteca) -\clearpage\phantomsection\addcontentsline{toc}{chapter}{\hspace{\cftparanumwidth}\mdseries REFER\^ENCIAS}% adiciona o titulo ao sumario -\oldbibliography{#1}% adiciona realmente a bibliografia +\newcommand{\citeonline}[1]{\textcite{#1}} + +\renewcommand*{\bibfont}{\raggedright} % bibliografia alinhada ^^c3^^a0 esquerda + +\defbibheading{bibliography}[\bibname]{% +\clearpage\phantomsection\addcontentsline{toc}{chapter}{\bfseries\hspace{\cftchapternumwidth}REFER\^ENCIAS}% adiciona o titulo ao sumario +\noindent\hfill\textbf{REFER\^ENCIAS}\hfill\mbox{}% +\urlstyle{same} % URLs nas refer^^c3^^aancias devem ter a mesma fonte do texto } + +\newcommand*{\citefloat}[1]{\citeauthor*{#1}, \citeyear*{#1}} + +\renewenvironment{quote} +{\begin{SingleSpace}\list{}{% +\fontsize{10pt}{1em}% +\leftmargin=4cm}% +\item\relax\ignorespaces} +{\endlist\end{SingleSpace}} + +\renewenvironment{quotation} +{\begin{SingleSpace}\list{}{% +\fontsize{10pt}{1em}% +\leftmargin=2cm \rightmargin=2cm% +\listparindent .5cm \itemindent}% +\item\relax} +{\endlist\end{SingleSpace}} %% -%% Copyright (C) 2014 by Douglas De Rizzo Meneghetti <douglasrizzo(a)fei.edu.br> +%% Copyright (C) 2017 by Douglas De Rizzo Meneghetti <douglasrizzo(a)fei.edu.br> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fei.tlpobj new/tlpkg/tlpobj/fei.tlpobj --- old/tlpkg/tlpobj/fei.tlpobj 2016-04-14 19:01:50.000000000 +0200 +++ new/tlpkg/tlpobj/fei.tlpobj 2017-04-14 17:40:16.000000000 +0200 @@ -1,6 +1,6 @@ name fei category Package -revision 38364 +revision 43630 shortdesc Class for academic works at FEI University Center -- Brazil relocated 1 longdesc fei is a class created by graduate students and LaTeX @@ -19,7 +19,7 @@ runfiles size=5 RELOC/tex/latex/fei/fei.cls catalogue-ctan /macros/latex/contrib/fei -catalogue-date 2015-09-14 17:15:40 +0200 +catalogue-date 2017-04-13 06:43:22 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class -catalogue-version 2.0 +catalogue-version 3.0.6 ++++++ fenixpar.doc.tar.xz ++++++ ++++++ fenixpar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fenixpar.tlpobj new/tlpkg/tlpobj/fenixpar.tlpobj --- old/tlpkg/tlpobj/fenixpar.tlpobj 2016-04-14 19:01:50.000000000 +0200 +++ new/tlpkg/tlpobj/fenixpar.tlpobj 2017-04-14 17:40:16.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/generic/fenixpar/fenixpar.sty RELOC/tex/generic/fenixpar/fenixtok.sty catalogue-ctan /macros/generic/fenixpar -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 0.92 ++++++ fetamont.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fetamont/README new/doc/fonts/fetamont/README --- old/doc/fonts/fetamont/README 2014-07-02 23:36:15.000000000 +0200 +++ new/doc/fonts/fetamont/README 2017-04-16 00:58:09.000000000 +0200 @@ -1,3 +1,6 @@ +VERSION: +2017/04/15 + DESCRIPTION: The Logo typeface, which is known from logos like METAFONT, METAPOST or METATYPE1 used to be very limited in the number of glyphs. The Fetamont @@ -7,10 +10,21 @@ the corresponding glyphs in the METATYPE1 logo that is due to the METATYPE1 team (Boguslaw Jackowski, Janusz M. Nowacki and Piotr Strzelczyk). There exists a LaTeX package for the Fetamont typeface. -Both the package and the typeface are distributed under the terms of the -LaTeX Project Public License (LPPL). -Copyright (c) 2014 Linus Romer +COPYRIGHT AND LICENSE: +Copyright (c) 2014-2017 Linus Romer + +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 2011/06/27 or later. + +This work has the LPPL maintenance status `maintained'. + +The current maintainer of this work is Linus Romer. Please write to linus dot romer at gmx dot ch @@ -26,8 +40,7 @@ 1. Run LaTeX on fetamont.ins: latex fetamont.ins - This will produce the files fetamont.map, T1ffm.fd, T1ffmw.fd and - fetamont.sty. + This will produce the files T1ffm.fd, T1ffmw.fd and fetamont.sty. 2. Determine your local texmf tree: kpsexpand '$TEXMFLOCAL' In the following, we assume that /usr/local/share/texmf is your @@ -39,19 +52,26 @@ cp opentype/* /usr/local/share/texmf/fonts/opentype/public/fetamont cp fetamont.sty T1ffm.fd T1ffmw.fd /usr/local/share/texmf/tex/latex/fetamont cp fetamont.map /usr/local/share/texmf/fonts/map/dvips/fetamont + cp fetamont.pdf /usr/local/share/texmf/doc/fonts/fetamont + cp fetamont-typeface.pdf /usr/local/share/texmf/doc/fonts/fetamont + cp fetamont-typeface.tex /usr/local/share/texmf/doc/fonts/fetamont + cp ffmconstructions.mp /usr/local/share/texmf/doc/fonts/fetamont 4. Add the line "Map fetamont.map" to your updmap.cfg and refresh the LaTeX database: mktexlsr updmap-sys --enable Map fetamont.map update-updmap updmap-sys -5. (Optional) Running pdfLaTeX on fetamont.dtx should now produce the - package documentation in pdf format: - pdflatex fetamont.dtx - cp fetamont.pdf /usr/local/share/texmf/doc/fonts/fetamont - cp fetamont-typeface.pdf /usr/local/share/texmf/doc/fonts/fetamont CONTENTS: +fetamont/README +fetamont/fetamont.dtx +fetamont/fetamont.ins +fetamont/fetamont.pdf +fetamont/fetamont-typeface.tex +fetamont/fetamont-typeface.pdf +fetamont/ffmconstructions.mp +fetamont/fetamont.map fetamont/opentype/ffmo9.otf fetamont/opentype/ffmb8.otf fetamont/opentype/ffmw10.otf @@ -88,8 +108,6 @@ fetamont/opentype/ffml10.otf fetamont/opentype/ffmr10.otf fetamont/opentype/ffmbo8.otf -fetamont/fetamont.map -fetamont/fetamont-typeface.pdf fetamont/afm/ffmbo10.afm fetamont/afm/ffmlwo10.afm fetamont/afm/ffmlo10.afm @@ -126,9 +144,6 @@ fetamont/afm/ffmb8.afm fetamont/afm/ffmlq10.afm fetamont/afm/ffmco10.afm -fetamont/fetamont.pdf -fetamont/fetamont.ins -fetamont/README fetamont/tfm/ffmbo8.tfm fetamont/tfm/ffmb10.tfm fetamont/tfm/ffmw10.tfm @@ -201,5 +216,4 @@ fetamont/type1/ffmlqo10.pfb fetamont/type1/ffmbo10.pfb fetamont/type1/ffmb10.pfb -fetamont/fetamont.dtx Binary files old/doc/fonts/fetamont/fetamont-typeface.pdf and new/doc/fonts/fetamont/fetamont-typeface.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fetamont/fetamont-typeface.tex new/doc/fonts/fetamont/fetamont-typeface.tex --- old/doc/fonts/fetamont/fetamont-typeface.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/fonts/fetamont/fetamont-typeface.tex 2017-04-16 00:58:09.000000000 +0200 @@ -0,0 +1,1313 @@ +% !TEX program = LuaLaTeX +\documentclass[a4paper]{scrartcl} +\usepackage{fontspec,fetamont,hologo,tikz,graphicx} +\usepackage[unicode,bookmarks]{hyperref} + +\hypersetup{ + bookmarksnumbered, + colorlinks=false, + pdfborder={0 0 0}, + pdftitle={The Fetamont Typeface}, + pdfauthor={Linus Romer}, + pdfkeywords={LaTeX, METAFONT, Fetamont, Typeface} +} + +\providecommand\acro[1]{{\small #1}\@} + +\begin{document} +\begin{titlepage} +\centering +\vspace*{3cm} +{\large\scshape Linus Romer}\\[3ex] +\rule{.618\textwidth}{1.6pt}\vspace*{-\baselineskip}\vspace*{2pt} +\rule{.618\textwidth}{0.4pt}\\[1ex] +{\itshape The}\\[3ex] +{\ffmfamily\fontseries{c}\fontsize{67}{1.2}\selectfont FETAMONT}\\[\baselineskip] +{\itshape Typeface}\\ +\rule{.618\textwidth}{0.4pt}\vspace*{-\baselineskip}\vspace{3.2pt} +\rule{.618\textwidth}{1.6pt}\\[5ex] +{\large\scshape Design and Constructions}\par +{\small\scshape \today} +\vfill +\tableofcontents +\end{titlepage} +% +\section{Introduction} +The logo font, known from logos like \MF{} or \MP{}, has been very limited in its collection of glyphs. The new typeface \emph{Fetamont} extends the logo typeface in two ways: +\begin{itemize} + \item Fetamont consists of 256+ glyphs, such that the T1 (a.k.a.\ EC, a.k.a.\ Cork) encoding table is complete now. + \item Fetamont has additional faces like ``light ultracondensed'' or ``script''. +\end{itemize} +The \verb|fetamont| package provides \LaTeX{} support for the Fetamont typeface. Both the package and the typeface are distributed on \acro{CTAN} under the terms of the \emph{\LaTeX{} Project Public License} (\acro{LPPL}). + +This document describes the design and the constructions of the typeface itself. The \LaTeX{} support for the Fetamont typeface is described in \cite{romer17}. For Greek, the use of \hologo{LuaTeX} or \hologo{XeTeX} is recommended. +% +\section{Comparison With Existing Logos} +% +The following picture shows the \MP{} and the \MF{} logos written in +Fetamont (gray) and Taco Hoekwater's Type~1 version of the logo font +(outlined). +% +\begin{center} +\begin{tikzpicture}[y=0.80pt, x=0.80pt,yscale=-1] +\begin{scope}[cm={{1.25,0.0,0.0,-1.25,(0.0,100.0)}}] +\begin{scope}[xscale=1.000,yscale=-1.000,fill=black!30] +\path[fill] (43.2956,-78.3386) .. controls (42.6044,-78.3386) and + (41.9708,-77.9930) .. (41.6252,-77.4170) -- (26.6492,-51.3818) -- + (11.6732,-77.4170) .. controls (11.3852,-77.9354) and (10.7516,-78.3386) .. + (10.0028,-78.3386) .. controls (8.9660,-78.3386) and (8.1020,-77.5322) .. + (8.1020,-76.6106) -- (8.1020,-44.2394) .. controls (8.1020,-43.3178) and + (8.9660,-42.5114) .. (10.0028,-42.5114) .. controls (11.0396,-42.5114) and + (11.9036,-43.3178) .. (11.9036,-44.2394) -- (11.9036,-69.5834) -- + (24.9788,-46.8890) .. controls (25.3244,-46.3130) and (25.9580,-45.9674) .. + (26.6492,-45.9674) .. controls (27.3980,-45.9674) and (28.0316,-46.4282) .. + (28.3196,-46.8890) -- (41.3948,-69.5834) -- (41.3948,-44.2394) .. controls + (41.3948,-43.3178) and (42.2588,-42.5114) .. (43.2956,-42.5114) .. controls + (44.3324,-42.5114) and (45.1964,-43.3178) .. (45.1964,-44.2394) -- + (45.1964,-76.6106) .. controls (45.1964,-77.5322) and (44.3324,-78.3386) .. + (43.2956,-78.3386) -- cycle; +\path[fill] (81.7022,-44.8730) .. controls (81.7022,-45.7946) and + (80.8382,-46.6010) .. (79.8014,-46.6010) -- (58.0286,-46.6010) -- + (58.0286,-56.9690) -- (76.3454,-56.9690) .. controls (77.3822,-56.9690) and + (78.2462,-57.7754) .. (78.2462,-58.6970) .. controls (78.2462,-59.6186) and + (77.3822,-60.4250) .. (76.3454,-60.4250) -- (58.0286,-60.4250) -- + (58.0286,-74.2490) -- (79.8014,-74.2490) .. controls (80.8382,-74.2490) and + (81.7022,-75.0554) .. (81.7022,-75.9770) .. controls (81.7022,-76.8986) and + (80.8382,-77.7050) .. (79.8014,-77.7050) -- (56.1278,-77.7050) .. controls + (55.3214,-77.7050) and (54.2270,-77.0138) .. (54.2270,-75.9770) -- + (54.2270,-44.8730) .. controls (54.2270,-44.1242) and (54.9758,-43.1450) .. + (56.1278,-43.1450) -- (79.8014,-43.1450) .. controls (80.8382,-43.1450) and + (81.7022,-43.9514) .. (81.7022,-44.8730) -- cycle; +\path[fill] (85.5092,-75.9770) .. controls (85.5092,-75.0554) and + (86.3732,-74.2490) .. (87.4100,-74.2490) -- (100.2548,-74.2490) -- + (100.2548,-44.2394) .. controls (100.2548,-43.3178) and (101.1188,-42.5114) .. + (102.1556,-42.5114) .. controls (103.1924,-42.5114) and (104.0564,-43.3178) .. + (104.0564,-44.2394) -- (104.0564,-74.2490) -- (116.8436,-74.2490) .. controls + (117.8804,-74.2490) and (118.8020,-75.0554) .. (118.8020,-75.9770) .. controls + (118.8020,-76.8986) and (117.8804,-77.7050) .. (116.8436,-77.7050) -- + (87.4100,-77.7050) .. controls (86.3732,-77.7050) and (85.5092,-76.8986) .. + (85.5092,-75.9770) -- cycle; +\path[fill] (123.9653,-42.5114) .. controls (125.0021,-42.5114) and + (125.8661,-43.3178) .. (125.8661,-44.2394) -- (125.8661,-56.9690) -- + (147.6965,-56.9690) -- (147.6965,-44.2394) .. controls (147.6965,-43.3178) and + (148.5605,-42.5114) .. (149.5973,-42.5114) .. controls (150.6341,-42.5114) and + (151.4981,-43.3178) .. (151.4981,-44.2394) -- (151.4981,-60.1370) .. controls + (151.4981,-64.8026) and (151.3253,-70.1594) .. (148.6181,-73.9610) .. controls + (145.7957,-77.9354) and (140.6693,-78.3386) .. (136.7525,-78.3386) .. controls + (132.8357,-78.3386) and (127.7669,-77.9354) .. (124.9445,-73.9610) .. controls + (122.2373,-70.1594) and (122.0645,-64.8026) .. (122.0645,-60.1370) -- + (122.0645,-44.2394) .. controls (122.0645,-43.3178) and (122.9285,-42.5114) .. + (123.9653,-42.5114) -- cycle(125.8661,-60.4250) .. controls + (125.9237,-64.9178) and (126.2693,-69.5258) .. (128.1125,-72.1178) .. controls + (129.7253,-74.3642) and (132.9509,-74.8826) .. (136.7525,-74.8826) .. controls + (140.5541,-74.8826) and (143.7797,-74.3642) .. (145.3925,-72.1178) .. controls + (147.2357,-69.5258) and (147.5813,-64.9178) .. (147.6389,-60.4250) -- + (125.8661,-60.4250) -- cycle; +\path[fill] (162.4403,-42.5114) .. controls (163.4771,-42.5114) and + (164.3411,-43.3178) .. (164.3411,-44.2394) -- (164.3411,-56.9690) -- + (182.6579,-56.9690) .. controls (183.6947,-56.9690) and (184.5587,-57.7754) .. + (184.5587,-58.6970) .. controls (184.5587,-59.6186) and (183.6947,-60.4250) .. + (182.6579,-60.4250) -- (164.3411,-60.4250) -- (164.3411,-74.2490) -- + (186.1139,-74.2490) .. controls (187.1507,-74.2490) and (188.0147,-75.0554) .. + (188.0147,-75.9770) .. controls (188.0147,-76.8986) and (187.1507,-77.7050) .. + (186.1139,-77.7050) -- (162.4403,-77.7050) .. controls (161.6339,-77.7050) and + (160.5395,-77.0138) .. (160.5395,-75.9770) -- (160.5395,-44.2394) .. controls + (160.5395,-43.3178) and (161.4035,-42.5114) .. (162.4403,-42.5114) -- cycle; +\path[fill] (208.4150,-74.8826) .. controls (213.0230,-74.8826) and + (216.9974,-74.5946) .. (219.2438,-72.0026) .. controls (221.7206,-69.0650) and + (221.8934,-63.8234) .. (221.8934,-58.6970) .. controls (221.8934,-54.4346) and + (221.7206,-50.5178) .. (219.3590,-48.3290) .. controls (216.9974,-46.1402) and + (212.9078,-45.9674) .. (208.4150,-45.9674) .. controls (203.9222,-45.9674) and + (199.8902,-46.1402) .. (197.5286,-48.3290) .. controls (195.1670,-50.5178) and + (194.9942,-54.4346) .. (194.9942,-58.6970) .. controls (194.9942,-63.8234) and + (195.1670,-69.0650) .. (197.6438,-72.0026) .. controls (199.8902,-74.5946) and + (203.8070,-74.8826) .. (208.4150,-74.8826) -- cycle(208.4150,-78.3386) .. + controls (203.9798,-78.3386) and (198.2198,-78.2810) .. (194.6486,-74.0762) .. + controls (191.3078,-70.2170) and (191.1926,-64.7450) .. (191.1926,-60.0218) -- + (191.1926,-57.8330) .. controls (191.1926,-53.9162) and (191.3078,-49.2506) .. + (194.7638,-45.9674) .. controls (198.2774,-42.6842) and (203.3462,-42.5114) .. + (207.4358,-42.5114) -- (209.4518,-42.5114) .. controls (213.5414,-42.5114) and + (218.6102,-42.6842) .. (222.1238,-45.9674) .. controls (225.5798,-49.2506) and + (225.6950,-53.9162) .. (225.6950,-57.8330) -- (225.6950,-60.0218) .. controls + (225.6950,-64.7450) and (225.5798,-70.2170) .. (222.2390,-74.0762) .. controls + (218.6678,-78.2810) and (212.8502,-78.3386) .. (208.4150,-78.3386) -- cycle; +\path[fill] (234.1028,-42.5114) .. controls (235.1396,-42.5114) and + (236.0036,-43.3178) .. (236.0036,-44.2394) -- (236.0036,-71.7146) -- + (257.8340,-47.1194) -- (257.8340,-44.2394) .. controls (257.8340,-43.3178) and + (258.6980,-42.5114) .. (259.7348,-42.5114) .. controls (260.7716,-42.5114) and + (261.6356,-43.3178) .. (261.6356,-44.2394) -- (261.6356,-76.6106) .. controls + (261.6356,-77.5322) and (260.7716,-78.3386) .. (259.7348,-78.3386) .. controls + (258.6980,-78.3386) and (257.8340,-77.5322) .. (257.8340,-76.6106) -- + (257.8340,-52.5914) -- (235.6004,-77.7050) .. controls (235.3124,-77.9930) and + (234.7364,-78.3386) .. (234.1028,-78.3386) .. controls (233.0660,-78.3386) and + (232.2020,-77.5322) .. (232.2020,-76.6106) -- (232.2020,-44.2394) .. controls + (232.2020,-43.3178) and (233.0660,-42.5114) .. (234.1028,-42.5114) -- cycle; +\path[fill] (266.1842,-75.9770) .. controls (266.1842,-75.0554) and + (267.0482,-74.2490) .. (268.0850,-74.2490) -- (280.9298,-74.2490) -- + (280.9298,-44.2394) .. controls (280.9298,-43.3178) and (281.7938,-42.5114) .. + (282.8306,-42.5114) .. controls (283.8674,-42.5114) and (284.7314,-43.3178) .. + (284.7314,-44.2394) -- (284.7314,-74.2490) -- (297.5186,-74.2490) .. controls + (298.5554,-74.2490) and (299.4770,-75.0554) .. (299.4770,-75.9770) .. controls + (299.4770,-76.8986) and (298.5554,-77.7050) .. (297.5186,-77.7050) -- + (268.0850,-77.7050) .. controls (267.0482,-77.7050) and (266.1842,-76.8986) .. + (266.1842,-75.9770) -- cycle;\end{scope} +\begin{scope}[xscale=1.000,yscale=-1.000,fill=black!30] +\path[fill] (43.2956,-38.3386) .. controls (42.6044,-38.3386) and + (41.9708,-37.9930) .. (41.6252,-37.4170) -- (26.6492,-11.3818) -- + (11.6732,-37.4170) .. controls (11.3852,-37.9354) and (10.7516,-38.3386) .. + (10.0028,-38.3386) .. controls (8.9660,-38.3386) and (8.1020,-37.5322) .. + (8.1020,-36.6106) -- (8.1020,-4.2394) .. controls (8.1020,-3.3178) and + (8.9660,-2.5114) .. (10.0028,-2.5114) .. controls (11.0396,-2.5114) and + (11.9036,-3.3178) .. (11.9036,-4.2394) -- (11.9036,-29.5834) -- + (24.9788,-6.8890) .. controls (25.3244,-6.3130) and (25.9580,-5.9674) .. + (26.6492,-5.9674) .. controls (27.3980,-5.9674) and (28.0316,-6.4282) .. + (28.3196,-6.8890) -- (41.3948,-29.5834) -- (41.3948,-4.2394) .. controls + (41.3948,-3.3178) and (42.2588,-2.5114) .. (43.2956,-2.5114) .. controls + (44.3324,-2.5114) and (45.1964,-3.3178) .. (45.1964,-4.2394) -- + (45.1964,-36.6106) .. controls (45.1964,-37.5322) and (44.3324,-38.3386) .. + (43.2956,-38.3386) -- cycle; +\path[fill] (81.7022,-4.8730) .. controls (81.7022,-5.7946) and + (80.8382,-6.6010) .. (79.8014,-6.6010) -- (58.0286,-6.6010) -- + (58.0286,-16.9690) -- (76.3454,-16.9690) .. controls (77.3822,-16.9690) and + (78.2462,-17.7754) .. (78.2462,-18.6970) .. controls (78.2462,-19.6186) and + (77.3822,-20.4250) .. (76.3454,-20.4250) -- (58.0286,-20.4250) -- + (58.0286,-34.2490) -- (79.8014,-34.2490) .. controls (80.8382,-34.2490) and + (81.7022,-35.0554) .. (81.7022,-35.9770) .. controls (81.7022,-36.8986) and + (80.8382,-37.7050) .. (79.8014,-37.7050) -- (56.1278,-37.7050) .. controls + (55.3214,-37.7050) and (54.2270,-37.0138) .. (54.2270,-35.9770) -- + (54.2270,-4.8730) .. controls (54.2270,-4.1242) and (54.9758,-3.1450) .. + (56.1278,-3.1450) -- (79.8014,-3.1450) .. controls (80.8382,-3.1450) and + (81.7022,-3.9514) .. (81.7022,-4.8730) -- cycle; +\path[fill] (85.5092,-35.9770) .. controls (85.5092,-35.0554) and + (86.3732,-34.2490) .. (87.4100,-34.2490) -- (100.2548,-34.2490) -- + (100.2548,-4.2394) .. controls (100.2548,-3.3178) and (101.1188,-2.5114) .. + (102.1556,-2.5114) .. controls (103.1924,-2.5114) and (104.0564,-3.3178) .. + (104.0564,-4.2394) -- (104.0564,-34.2490) -- (116.8436,-34.2490) .. controls + (117.8804,-34.2490) and (118.8020,-35.0554) .. (118.8020,-35.9770) .. controls + (118.8020,-36.8986) and (117.8804,-37.7050) .. (116.8436,-37.7050) -- + (87.4100,-37.7050) .. controls (86.3732,-37.7050) and (85.5092,-36.8986) .. + (85.5092,-35.9770) -- cycle; +\path[fill] (123.9653,-2.5114) .. controls (125.0021,-2.5114) and + (125.8661,-3.3178) .. (125.8661,-4.2394) -- (125.8661,-16.9690) -- + (147.6965,-16.9690) -- (147.6965,-4.2394) .. controls (147.6965,-3.3178) and + (148.5605,-2.5114) .. (149.5973,-2.5114) .. controls (150.6341,-2.5114) and + (151.4981,-3.3178) .. (151.4981,-4.2394) -- (151.4981,-20.1370) .. controls + (151.4981,-24.8026) and (151.3253,-30.1594) .. (148.6181,-33.9610) .. controls + (145.7957,-37.9354) and (140.6693,-38.3386) .. (136.7525,-38.3386) .. controls + (132.8357,-38.3386) and (127.7669,-37.9354) .. (124.9445,-33.9610) .. controls + (122.2373,-30.1594) and (122.0645,-24.8026) .. (122.0645,-20.1370) -- + (122.0645,-4.2394) .. controls (122.0645,-3.3178) and (122.9285,-2.5114) .. + (123.9653,-2.5114) -- cycle(125.8661,-20.4250) .. controls (125.9237,-24.9178) + and (126.2693,-29.5258) .. (128.1125,-32.1178) .. controls (129.7253,-34.3642) + and (132.9509,-34.8826) .. (136.7525,-34.8826) .. controls (140.5541,-34.8826) + and (143.7797,-34.3642) .. (145.3925,-32.1178) .. controls (147.2357,-29.5258) + and (147.5813,-24.9178) .. (147.6389,-20.4250) -- (125.8661,-20.4250) -- + cycle; +\path[fill] (164.3411,-20.4250) -- (164.3411,-34.2490) -- (176.6675,-34.2490) .. + controls (179.8355,-34.2490) and (182.8307,-34.1338) .. (184.2707,-32.9818) .. + controls (185.4803,-32.0602) and (185.8259,-29.9290) .. (185.8259,-27.3370) .. + controls (185.8259,-24.7450) and (185.4803,-22.6138) .. (184.2707,-21.6922) .. + controls (182.8307,-20.5402) and (179.8355,-20.4250) .. (176.6675,-20.4250) -- + (164.3411,-20.4250) -- cycle(164.3411,-16.9690) -- (177.8195,-16.9690) .. + controls (180.6419,-16.9690) and (184.1555,-17.1418) .. (186.7475,-19.1578) .. + controls (189.5699,-21.3466) and (189.6275,-24.8026) .. (189.6275,-27.3370) .. + controls (189.6275,-29.8714) and (189.5699,-33.3274) .. (186.7475,-35.5162) .. + controls (184.1555,-37.5322) and (180.6419,-37.7050) .. (177.8195,-37.7050) -- + (162.4403,-37.7050) .. controls (161.6339,-37.7050) and (160.5395,-37.0138) .. + (160.5395,-35.9770) -- (160.5395,-4.2394) .. controls (160.5395,-3.3178) and + (161.4035,-2.5114) .. (162.4403,-2.5114) .. controls (163.4771,-2.5114) and + (164.3411,-3.3178) .. (164.3411,-4.2394) -- (164.3411,-16.9690) -- cycle; +\path[fill] (213.5900,-34.8826) .. controls (218.1980,-34.8826) and + (222.1724,-34.5946) .. (224.4188,-32.0026) .. controls (226.8956,-29.0650) and + (227.0684,-23.8234) .. (227.0684,-18.6970) .. controls (227.0684,-14.4346) and + (226.8956,-10.5178) .. (224.5340,-8.3290) .. controls (222.1724,-6.1402) and + (218.0828,-5.9674) .. (213.5900,-5.9674) .. controls (209.0972,-5.9674) and + (205.0652,-6.1402) .. (202.7036,-8.3290) .. controls (200.3420,-10.5178) and + (200.1692,-14.4346) .. (200.1692,-18.6970) .. controls (200.1692,-23.8234) and + (200.3420,-29.0650) .. (202.8188,-32.0026) .. controls (205.0652,-34.5946) and + (208.9820,-34.8826) .. (213.5900,-34.8826) -- cycle(213.5900,-38.3386) .. + controls (209.1548,-38.3386) and (203.3948,-38.2810) .. (199.8236,-34.0762) .. + controls (196.4828,-30.2170) and (196.3676,-24.7450) .. (196.3676,-20.0218) -- + (196.3676,-17.8330) .. controls (196.3676,-13.9162) and (196.4828,-9.2506) .. + (199.9388,-5.9674) .. controls (203.4524,-2.6842) and (208.5212,-2.5114) .. + (212.6108,-2.5114) -- (214.6268,-2.5114) .. controls (218.7164,-2.5114) and + (223.7852,-2.6842) .. (227.2988,-5.9674) .. controls (230.7548,-9.2506) and + (230.8700,-13.9162) .. (230.8700,-17.8330) -- (230.8700,-20.0218) .. controls + (230.8700,-24.7450) and (230.7548,-30.2170) .. (227.4140,-34.0762) .. controls + (223.8428,-38.2810) and (218.0252,-38.3386) .. (213.5900,-38.3386) -- cycle; +\path[fill] (264.1889,-35.9770) .. controls (264.1889,-36.8986) and + (263.3249,-37.7050) .. (262.2881,-37.7050) -- (248.0609,-37.7050) .. controls + (245.5265,-37.7050) and (241.7825,-37.7050) .. (239.4785,-34.9402) .. controls + (237.4625,-32.5786) and (237.3473,-29.4106) .. (237.3473,-26.7610) -- + (237.3473,-25.6090) .. controls (237.3473,-23.5930) and (237.3473,-20.7130) .. + (239.7665,-18.8122) .. controls (241.8977,-17.1418) and (244.7201,-16.9690) .. + (246.9665,-16.9690) -- (259.9841,-16.9690) .. controls (261.5969,-16.9690) and + (262.8065,-16.8538) .. (263.1521,-16.5658) .. controls (263.3249,-16.4506) and + (263.5553,-15.8170) .. (263.5553,-14.5498) .. controls (263.5553,-11.9002) and + (263.4401,-8.9050) .. (262.6913,-7.5802) .. controls (262.3457,-6.9466) and + (261.4817,-6.6010) .. (259.9841,-6.6010) -- (239.2481,-6.6010) .. controls + (238.2113,-6.6010) and (237.3473,-5.7946) .. (237.3473,-4.8730) .. controls + (237.3473,-3.9514) and (238.2113,-3.1450) .. (239.2481,-3.1450) -- + (259.9841,-3.1450) .. controls (262.0001,-3.1450) and (264.7649,-3.6634) .. + (266.0897,-6.0250) .. controls (267.2993,-8.1562) and (267.3569,-10.9210) .. + (267.3569,-13.2826) -- (267.3569,-14.5498) .. controls (267.3569,-15.7594) and + (267.4145,-17.7754) .. (265.6289,-19.1578) .. controls (264.1313,-20.3098) and + (262.2881,-20.4250) .. (260.9057,-20.4250) -- (248.0609,-20.4250) .. controls + (245.4689,-20.4250) and (243.2801,-20.5402) .. (242.2433,-21.3466) .. controls + (241.4369,-21.9802) and (241.1489,-23.5354) .. (241.1489,-25.6090) .. controls + (241.1489,-28.6042) and (241.3217,-31.4842) .. (242.5313,-32.8666) .. controls + (243.5105,-34.0186) and (245.4113,-34.2490) .. (248.0609,-34.2490) -- + (262.2881,-34.2490) .. controls (263.3249,-34.2490) and (264.1889,-35.0554) .. + (264.1889,-35.9770) -- cycle; +\path[fill] (268.6592,-35.9770) .. controls (268.6592,-35.0554) and + (269.5232,-34.2490) .. (270.5600,-34.2490) -- (283.4048,-34.2490) -- + (283.4048,-4.2394) .. controls (283.4048,-3.3178) and (284.2688,-2.5114) .. + (285.3056,-2.5114) .. controls (286.3424,-2.5114) and (287.2064,-3.3178) .. + (287.2064,-4.2394) -- (287.2064,-34.2490) -- (299.9936,-34.2490) .. controls + (301.0304,-34.2490) and (301.9520,-35.0554) .. (301.9520,-35.9770) .. controls + (301.9520,-36.8986) and (301.0304,-37.7050) .. (299.9936,-37.7050) -- + (270.5600,-37.7050) .. controls (269.5232,-37.7050) and (268.6592,-36.8986) .. + (268.6592,-35.9770) -- cycle;\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (33.5660,1.0080) -- (18.6480,26.9300) -- (3.7300,1.0080) .. + controls (3.3830,0.4920) and (2.6910,0.0860) .. (2.0000,0.0860) .. controls + (1.0780,0.0860) and (0.1020,0.7770) .. (0.1020,1.7580) -- (0.1020,34.1880) .. + controls (0.1020,35.1640) and (0.9650,35.9140) .. (2.0000,35.9140) .. controls + (3.0940,35.9140) and (3.9020,35.1640) .. (3.9020,34.1880) -- (3.9020,8.8980) + .. controls (8.2770,16.4450) and (12.5980,23.9920) .. (16.9180,31.5390) .. + controls (17.2070,32.1130) and (17.8980,32.4570) .. (18.6480,32.4570) .. + controls (19.4530,32.4570) and (19.9140,31.9960) .. (20.3750,31.5390) .. + controls (24.6950,23.9920) and (29.0160,16.4450) .. (33.3950,8.8980) -- + (33.3950,34.1880) .. controls (33.3950,35.1640) and (34.1990,35.9140) .. + (35.2930,35.9140) .. controls (36.3320,35.9140) and (37.1950,35.1640) .. + (37.1950,34.1880) -- (37.1950,1.8160) .. controls (37.1950,0.8360) and + (36.2150,0.0860) .. (35.2930,0.0860) .. controls (34.6020,0.0860) and + (33.9100,0.3750) .. (33.5660,1.0080);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (231.1910,71.8240) .. controls (230.1560,71.8240) and + (229.2930,72.5740) .. (229.2930,73.5550) .. controls (229.2930,74.5310) and + (230.1560,75.2810) .. (231.1910,75.2810) -- (245.8830,75.2810) .. controls + (248.5900,75.2810) and (252.6800,75.2810) .. (255.3870,73.6090) -- + (255.4410,73.6090) .. controls (257.9180,71.9960) and (258.3790,69.0040) .. + (258.3790,66.4100) .. controls (258.3790,64.3360) and (257.9180,61.3440) .. + (255.4410,59.7300) .. controls (255.3870,59.7300) and (255.3870,59.6720) .. + (255.3870,59.6720) .. controls (252.6800,58.0000) and (248.5310,58.0000) .. + (245.8830,58.0000) -- (239.7730,58.0000) .. controls (237.0660,58.0000) and + (235.3980,57.8870) .. (234.3590,56.8480) .. controls (233.2070,55.8120) and + (233.0940,53.9100) .. (233.0940,50.8590) .. controls (233.0940,48.2110) and + (233.2660,46.4220) .. (234.3590,45.3280) .. controls (234.9960,44.8120) and + (235.5120,44.5820) .. (236.2030,44.4060) .. controls (236.8360,44.2930) and + (237.5860,44.2340) .. (238.1640,44.1760) -- (254.2340,44.1760) .. controls + (255.3280,44.1760) and (256.1330,43.4300) .. (256.1330,42.4490) .. controls + (256.1330,41.4690) and (255.3280,40.7230) .. (254.2340,40.7230) -- + (238.0470,40.7230) .. controls (237.2420,40.7770) and (236.4340,40.8360) .. + (235.6290,41.0080) .. controls (234.2460,41.2970) and (232.7500,41.8750) .. + (231.5390,43.0230) .. controls (229.3520,45.3870) and (229.2930,48.4960) .. + (229.2930,51.1480) .. controls (229.2930,53.4490) and (229.2930,56.7340) .. + (231.5390,59.1520) .. controls (233.6680,61.3980) and (237.2420,61.4570) .. + (239.4880,61.4570) -- (245.4220,61.4570) .. controls (248.8750,61.4570) and + (251.5820,61.5740) .. (253.1950,62.5510) .. controls (254.0040,63.1290) and + (254.5200,64.4530) .. (254.5780,66.6410) .. controls (254.5780,68.7730) and + (254.0590,70.1560) .. (253.1950,70.7300) .. controls (251.5820,71.7110) and + (248.9920,71.8240) .. (245.6520,71.8240) -- (231.1910,71.8240);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (277.2230,40.7230) -- (262.4770,40.7230) .. controls + (261.4380,40.7230) and (260.5740,41.4690) .. (260.5740,42.4490) .. controls + (260.5740,43.4300) and (261.4380,44.1760) .. (262.4770,44.1760) -- + (275.3200,44.1760) -- (275.3200,74.1880) .. controls (275.3200,75.1640) and + (276.1250,75.9140) .. (277.2230,75.9140) .. controls (278.2580,75.9140) and + (279.1210,75.1640) .. (279.1210,74.1880) -- (279.1210,44.1760) -- + (292.1410,44.1760) .. controls (293.0040,44.1210) and (293.8670,43.3710) .. + (293.8670,42.4490) .. controls (293.8670,41.4690) and (292.8870,40.7230) .. + (291.9100,40.7230) -- (277.2230,40.7230);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (33.5660,41.0080) -- (18.6480,66.9300) -- (3.7300,41.0080) .. + controls (3.3830,40.4920) and (2.6910,40.0860) .. (2.0000,40.0860) .. controls + (1.0780,40.0860) and (0.1020,40.7770) .. (0.1020,41.7580) -- (0.1020,74.1880) + .. controls (0.1020,75.1640) and (0.9650,75.9140) .. (2.0000,75.9140) .. + controls (3.0940,75.9140) and (3.9020,75.1640) .. (3.9020,74.1880) -- + (3.9020,48.8980) .. controls (8.2770,56.4450) and (12.5980,63.9920) .. + (16.9180,71.5390) .. controls (17.2070,72.1130) and (17.8980,72.4570) .. + (18.6480,72.4570) .. controls (19.4530,72.4570) and (19.9140,71.9960) .. + (20.3750,71.5390) .. controls (24.6950,63.9920) and (29.0160,56.4450) .. + (33.3950,48.8980) -- (33.3950,74.1880) .. controls (33.3950,75.1640) and + (34.1990,75.9140) .. (35.2930,75.9140) .. controls (36.3320,75.9140) and + (37.1950,75.1640) .. (37.1950,74.1880) -- (37.1950,41.8160) .. controls + (37.1950,40.8360) and (36.2150,40.0860) .. (35.2930,40.0860) .. controls + (34.6020,40.0860) and (33.9100,40.3750) .. (33.5660,41.0080);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (73.7580,73.5550) .. controls (73.7580,72.5740) and + (72.8950,71.8240) .. (71.8010,71.8240) -- (50.0270,71.8240) -- + (50.0270,61.4570) -- (68.3440,61.4570) .. controls (69.4380,61.4570) and + (70.3010,60.7070) .. (70.3010,59.7300) .. controls (70.3010,58.7500) and + (69.4380,58.0000) .. (68.3440,58.0000) -- (50.0270,58.0000) -- + (50.0270,44.1760) -- (71.9730,44.1760) .. controls (72.8360,44.1760) and + (73.7580,43.3710) .. (73.7580,42.4490) .. controls (73.7580,41.4140) and + (72.7230,40.7230) .. (71.8010,40.7230) -- (48.3550,40.7230) .. controls + (47.2620,40.7230) and (46.2270,41.4140) .. (46.2270,42.3910) -- + (46.2270,73.3240) .. controls (46.2270,74.3590) and (47.0310,75.2810) .. + (48.1840,75.2810) -- (71.8010,75.2810) .. controls (72.8950,75.2810) and + (73.7580,74.5310) .. (73.7580,73.5550);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (94.1520,40.7230) -- (79.4060,40.7230) .. controls + (78.3710,40.7230) and (77.5080,41.4690) .. (77.5080,42.4490) .. controls + (77.5080,43.4300) and (78.3710,44.1760) .. (79.4060,44.1760) -- + (92.2540,44.1760) -- (92.2540,74.1880) .. controls (92.2540,75.1640) and + (93.0590,75.9140) .. (94.1520,75.9140) .. controls (95.1910,75.9140) and + (96.0550,75.1640) .. (96.0550,74.1880) -- (96.0550,44.1760) -- + (109.0700,44.1760) .. controls (109.9380,44.1210) and (110.8010,43.3710) .. + (110.8010,42.4490) .. controls (110.8010,41.4690) and (109.8200,40.7230) .. + (108.8400,40.7230) -- (94.1520,40.7230);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (116.9140,44.4650) .. controls (114.1480,48.3240) and + (114.0310,54.1990) .. (114.0310,58.6910) -- (114.0310,74.1880) .. controls + (114.0310,75.1640) and (114.8980,75.9140) .. (115.9340,75.9140) .. controls + (117.0270,75.9140) and (117.8360,75.1640) .. (117.8360,74.1880) -- + (117.8360,61.4570) -- (139.6640,61.4570) -- (139.6640,74.1880) .. controls + (139.6640,75.1640) and (140.4730,75.9140) .. (141.5660,75.9140) .. controls + (142.6020,75.9140) and (143.4650,75.1640) .. (143.4650,74.1880) -- + (143.4650,59.2110) .. controls (143.4650,54.6600) and (143.4100,48.4410) .. + (140.5860,44.4650) .. controls (137.8200,40.6050) and (132.7540,40.1450) .. + (128.7230,40.0860) .. controls (124.8630,40.0860) and (119.7340,40.4920) .. + (116.9140,44.4650)(117.8360,58.0000) .. controls (117.8360,53.3360) and + (118.1800,49.0160) .. (120.1370,46.3090) .. controls (121.6950,44.1210) and + (124.7460,43.6020) .. (128.7230,43.5430) .. controls (132.6370,43.5430) and + (135.7460,44.0620) .. (137.3590,46.3090) .. controls (139.3200,49.0160) and + (139.6050,53.3360) .. (139.6640,58.0000) -- (117.8360,58.0000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (178.7730,42.9100) .. controls (175.9490,40.7230) and + (171.7460,40.7230) .. (169.0390,40.7230) -- (154.4100,40.7230) .. controls + (153.4300,40.7230) and (152.5080,41.4140) .. (152.5080,42.4490) -- + (152.5080,74.1880) .. controls (152.5080,75.1640) and (153.3710,75.9140) .. + (154.4100,75.9140) .. controls (155.5040,75.9140) and (156.3090,75.1640) .. + (156.3090,74.1880) -- (156.3090,61.4570) -- (169.0390,61.4570) .. controls + (171.7460,61.4570) and (175.9490,61.4570) .. (178.7730,59.2700) .. controls + (181.5390,57.1370) and (181.5980,53.4490) .. (181.5980,51.0900) .. controls + (181.5980,48.7270) and (181.5390,45.0430) .. + (178.7730,42.9100)(156.3090,58.0000) -- (156.3090,44.1760) -- + (168.8670,44.1760) .. controls (172.2660,44.1760) and (174.6840,44.3520) .. + (176.2380,45.5040) .. controls (177.3910,46.4220) and (177.7930,48.2110) .. + (177.7930,50.8590) .. controls (177.7930,53.9100) and (177.3910,55.6950) .. + (176.2970,56.6170) .. controls (176.2970,56.6760) and (176.2380,56.6760) .. + (176.2380,56.6760) .. controls (174.6840,57.8870) and (172.2660,58.0000) .. + (168.8670,58.0000) -- (156.3090,58.0000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (222.7850,60.4220) .. controls (222.7850,54.1410) and + (222.6720,48.2110) .. (219.2150,44.2340) .. controls (215.6990,40.2030) and + (209.9960,40.0860) .. (205.7340,40.0860) .. controls (201.0700,40.0860) and + (195.3670,40.2030) .. (191.7970,44.1760) .. controls (188.3400,48.0940) and + (188.2270,54.1990) .. (188.2270,60.0740) .. controls (188.2270,63.8750) and + (188.2810,69.0040) .. (191.9100,72.4570) .. controls (195.4260,75.9140) and + (201.1290,75.9140) .. (205.1600,75.9140) .. controls (209.8240,75.9140) and + (215.4140,75.9140) .. (219.0430,72.5740) .. controls (222.6720,69.2340) and + (222.7850,64.2230) .. (222.7850,60.4220)(218.9840,59.5000) .. controls + (218.9840,64.2810) and (218.7540,67.7930) .. (216.4490,69.9800) .. controls + (214.0310,72.3440) and (210.4020,72.4570) .. (205.2730,72.4570) .. controls + (200.6680,72.4570) and (196.9220,72.4020) .. (194.5620,70.1560) .. controls + (192.2580,67.9100) and (192.0270,64.3360) .. (192.0270,59.9610) .. controls + (192.0270,54.6600) and (192.0860,49.0740) .. (194.6760,46.3670) .. controls + (197.1520,43.8320) and (200.8980,43.5430) .. (205.5040,43.5430) .. controls + (210.3440,43.5430) and (214.0310,43.8910) .. (216.2770,46.4220) .. controls + (218.8120,49.6480) and (218.9840,54.3160) .. (218.9840,59.5000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (73.7580,33.5550) .. controls (73.7580,32.5740) and + (72.8950,31.8240) .. (71.8010,31.8240) -- (50.0270,31.8240) -- + (50.0270,21.4570) -- (68.3440,21.4570) .. controls (69.4380,21.4570) and + (70.3010,20.7070) .. (70.3010,19.7300) .. controls (70.3010,18.7500) and + (69.4380,18.0000) .. (68.3440,18.0000) -- (50.0270,18.0000) -- + (50.0270,4.1760) -- (71.9730,4.1760) .. controls (72.8360,4.1760) and + (73.7580,3.3710) .. (73.7580,2.4490) .. controls (73.7580,1.4140) and + (72.7230,0.7230) .. (71.8010,0.7230) -- (48.3550,0.7230) .. controls + (47.2620,0.7230) and (46.2270,1.4140) .. (46.2270,2.3910) -- (46.2270,33.3240) + .. controls (46.2270,34.3590) and (47.0310,35.2810) .. (48.1840,35.2810) -- + (71.8010,35.2810) .. controls (72.8950,35.2810) and (73.7580,34.5310) .. + (73.7580,33.5550);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (94.1520,0.7230) -- (79.4060,0.7230) .. controls + (78.3710,0.7230) and (77.5080,1.4690) .. (77.5080,2.4490) .. controls + (77.5080,3.4300) and (78.3710,4.1760) .. (79.4060,4.1760) -- (92.2540,4.1760) + -- (92.2540,34.1880) .. controls (92.2540,35.1640) and (93.0590,35.9140) .. + (94.1520,35.9140) .. controls (95.1910,35.9140) and (96.0550,35.1640) .. + (96.0550,34.1880) -- (96.0550,4.1760) -- (109.0700,4.1760) .. controls + (109.9380,4.1210) and (110.8010,3.3710) .. (110.8010,2.4490) .. controls + (110.8010,1.4690) and (109.8200,0.7230) .. (108.8400,0.7230) -- + (94.1520,0.7230);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (116.9140,4.4650) .. controls (114.1480,8.3240) and + (114.0310,14.1990) .. (114.0310,18.6910) -- (114.0310,34.1880) .. controls + (114.0310,35.1640) and (114.8980,35.9140) .. (115.9340,35.9140) .. controls + (117.0270,35.9140) and (117.8360,35.1640) .. (117.8360,34.1880) -- + (117.8360,21.4570) -- (139.6640,21.4570) -- (139.6640,34.1880) .. controls + (139.6640,35.1640) and (140.4730,35.9140) .. (141.5660,35.9140) .. controls + (142.6020,35.9140) and (143.4650,35.1640) .. (143.4650,34.1880) -- + (143.4650,19.2110) .. controls (143.4650,14.6600) and (143.4100,8.4410) .. + (140.5860,4.4650) .. controls (137.8200,0.6050) and (132.7540,0.1450) .. + (128.7230,0.0860) .. controls (124.8630,0.0860) and (119.7340,0.4920) .. + (116.9140,4.4650)(117.8360,18.0000) .. controls (117.8360,13.3360) and + (118.1800,9.0160) .. (120.1370,6.3090) .. controls (121.6950,4.1210) and + (124.7460,3.6020) .. (128.7230,3.5430) .. controls (132.6370,3.5430) and + (135.7460,4.0620) .. (137.3590,6.3090) .. controls (139.3200,9.0160) and + (139.6050,13.3360) .. (139.6640,18.0000) -- (117.8360,18.0000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (174.6250,18.0000) -- (156.3090,18.0000) -- (156.3090,4.1760) + -- (178.3120,4.1760) .. controls (179.2340,4.1760) and (180.0390,3.3120) .. + (180.0390,2.3910) .. controls (179.9260,1.4690) and (179.1170,0.8360) .. + (178.3120,0.7230) -- (154.4100,0.7230) .. controls (153.4880,0.7230) and + (152.5080,1.2970) .. (152.5080,2.3320) -- (152.5080,34.1880) .. controls + (152.5080,35.1640) and (153.3710,35.9140) .. (154.4100,35.9140) .. controls + (155.5040,35.9140) and (156.3090,35.1640) .. (156.3090,34.1880) -- + (156.3090,21.4570) -- (174.6250,21.4570) .. controls (175.7190,21.4570) and + (176.5860,20.7070) .. (176.5860,19.7300) .. controls (176.5860,18.7500) and + (175.7190,18.0000) .. (174.6250,18.0000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (217.7150,20.4220) .. controls (217.7150,14.1410) and + (217.6020,8.2110) .. (214.1450,4.2340) .. controls (210.6330,0.2030) and + (204.9300,0.0860) .. (200.6680,0.0860) .. controls (196.0000,0.0860) and + (190.3010,0.2030) .. (186.7270,4.1760) .. controls (183.2730,8.0940) and + (183.1560,14.1990) .. (183.1560,20.0740) .. controls (183.1560,23.8750) and + (183.2150,29.0040) .. (186.8440,32.4570) .. controls (190.3550,35.9140) and + (196.0590,35.9140) .. (200.0900,35.9140) .. controls (204.7580,35.9140) and + (210.3440,35.9140) .. (213.9730,32.5740) .. controls (217.6020,29.2340) and + (217.7150,24.2230) .. (217.7150,20.4220)(213.9140,19.5000) .. controls + (213.9140,24.2810) and (213.6840,27.7930) .. (211.3790,29.9800) .. controls + (208.9610,32.3440) and (205.3320,32.4570) .. (200.2070,32.4570) .. controls + (195.5980,32.4570) and (191.8550,32.4020) .. (189.4920,30.1560) .. controls + (187.1880,27.9100) and (186.9570,24.3360) .. (186.9570,19.9610) .. controls + (186.9570,14.6600) and (187.0160,9.0740) .. (189.6090,6.3670) .. controls + (192.0860,3.8320) and (195.8280,3.5430) .. (200.4380,3.5430) .. controls + (205.2730,3.5430) and (208.9610,3.8910) .. (211.2070,6.4220) .. controls + (213.7420,9.6480) and (213.9140,14.3160) .. (213.9140,19.5000);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (251.7580,0.0860) .. controls (250.6600,0.0860) and + (249.7970,0.8360) .. (249.7970,1.8160) -- (249.7970,25.7770) .. controls + (242.4840,17.4840) and (235.1680,9.1880) .. (227.7930,0.8950) .. controls + (227.3910,0.3750) and (226.7580,0.0860) .. (226.1250,0.0860) .. controls + (225.0860,0.0860) and (224.2230,0.8360) .. (224.2230,1.8160) -- + (224.2230,34.1880) .. controls (224.2230,35.1640) and (225.0860,35.9140) .. + (226.1250,35.9140) .. controls (227.2190,35.9140) and (228.0230,35.1640) .. + (228.0230,34.1880) -- (228.0230,6.6520) -- (228.0820,6.7110) .. controls + (235.4570,14.8320) and (242.5390,23.1290) .. (249.7970,31.3630) -- + (249.7970,34.1880) .. controls (249.7970,35.1640) and (250.6600,35.9140) .. + (251.7580,35.9140) .. controls (252.7930,35.9140) and (253.5980,35.1640) .. + (253.5980,34.1880) -- (253.5980,1.8160) .. controls (253.5980,0.8360) and + (252.7930,0.0860) .. (251.7580,0.0860);\end{scope} +\begin{scope}[cm={{1.0,0.0,0.0,-1.0,(7.9996,78.4252)}}] +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (274.8520,0.7230) -- (260.1050,0.7230) .. controls + (259.0700,0.7230) and (258.2070,1.4690) .. (258.2070,2.4490) .. controls + (258.2070,3.4300) and (259.0700,4.1760) .. (260.1050,4.1760) -- + (272.9530,4.1760) -- (272.9530,34.1880) .. controls (272.9530,35.1640) and + (273.7580,35.9140) .. (274.8520,35.9140) .. controls (275.8910,35.9140) and + (276.7540,35.1640) .. (276.7540,34.1880) -- (276.7540,4.1760) -- + (289.7700,4.1760) .. controls (290.6330,4.1210) and (291.5000,3.3710) .. + (291.5000,2.4490) .. controls (291.5000,1.4690) and (290.5200,0.7230) .. + (289.5390,0.7230) -- (274.8520,0.7230);\end{scope} +\end{scope} +\end{tikzpicture} +\end{center} +% +There are hardly any differences; only the ``S'' is significantly +different, because its shape was changed by D.~E.~Knuth in +1997. The other faces of +Hoekwater's \emph{Logo} are also very similar to their corresponding Fetamont +faces. Widths and kernings may rarely differ by one unit (except for +the ``A'' in \emph{Logo 9}, which has a strange width). + +A comparison with the \textffm{METATYPE1} logo from \cite{jackowski01} +shows virtually no differences as well.\footnote{I have never seen the +original sources of the ``Y'' and the ``1'' but I think that my +imitated ``Y'' and ``1'' are extremely close to the original.} +% +\begin{center} +\begin{tikzpicture}[y=0.80pt, x=0.80pt,inner sep=0pt, outer sep=0pt] +\begin{scope}[xscale=1.000,yscale=-1.000,fill=black!30] + \path[fill] (43.2956,-38.3386) .. controls (42.6044,-38.3386) and + (41.9708,-37.9930) .. (41.6252,-37.4170) -- (26.6492,-11.3818) -- + (11.6732,-37.4170) .. controls (11.3852,-37.9354) and (10.7516,-38.3386) .. + (10.0028,-38.3386) .. controls (8.9660,-38.3386) and (8.1020,-37.5322) .. + (8.1020,-36.6106) -- (8.1020,-4.2394) .. controls (8.1020,-3.3178) and + (8.9660,-2.5114) .. (10.0028,-2.5114) .. controls (11.0396,-2.5114) and + (11.9036,-3.3178) .. (11.9036,-4.2394) -- (11.9036,-29.5834) -- + (24.9788,-6.8890) .. controls (25.3244,-6.3130) and (25.9580,-5.9674) .. + (26.6492,-5.9674) .. controls (27.3980,-5.9674) and (28.0316,-6.4282) .. + (28.3196,-6.8890) -- (41.3948,-29.5834) -- (41.3948,-4.2394) .. controls + (41.3948,-3.3178) and (42.2588,-2.5114) .. (43.2956,-2.5114) .. controls + (44.3324,-2.5114) and (45.1964,-3.3178) .. (45.1964,-4.2394) -- + (45.1964,-36.6106) .. controls (45.1964,-37.5322) and (44.3324,-38.3386) .. + (43.2956,-38.3386) -- cycle; + \path[fill] (81.7022,-4.8730) .. controls (81.7022,-5.7946) and + (80.8382,-6.6010) .. (79.8014,-6.6010) -- (58.0286,-6.6010) -- + (58.0286,-16.9690) -- (76.3454,-16.9690) .. controls (77.3822,-16.9690) and + (78.2462,-17.7754) .. (78.2462,-18.6970) .. controls (78.2462,-19.6186) and + (77.3822,-20.4250) .. (76.3454,-20.4250) -- (58.0286,-20.4250) -- + (58.0286,-34.2490) -- (79.8014,-34.2490) .. controls (80.8382,-34.2490) and + (81.7022,-35.0554) .. (81.7022,-35.9770) .. controls (81.7022,-36.8986) and + (80.8382,-37.7050) .. (79.8014,-37.7050) -- (56.1278,-37.7050) .. controls + (55.3214,-37.7050) and (54.2270,-37.0138) .. (54.2270,-35.9770) -- + (54.2270,-4.8730) .. controls (54.2270,-4.1242) and (54.9758,-3.1450) .. + (56.1278,-3.1450) -- (79.8014,-3.1450) .. controls (80.8382,-3.1450) and + (81.7022,-3.9514) .. (81.7022,-4.8730) -- cycle; + \path[fill] (85.5092,-35.9770) .. controls (85.5092,-35.0554) and + (86.3732,-34.2490) .. (87.4100,-34.2490) -- (100.2548,-34.2490) -- + (100.2548,-4.2394) .. controls (100.2548,-3.3178) and (101.1188,-2.5114) .. + (102.1556,-2.5114) .. controls (103.1924,-2.5114) and (104.0564,-3.3178) .. + (104.0564,-4.2394) -- (104.0564,-34.2490) -- (116.8436,-34.2490) .. controls + (117.8804,-34.2490) and (118.8020,-35.0554) .. (118.8020,-35.9770) .. controls + (118.8020,-36.8986) and (117.8804,-37.7050) .. (116.8436,-37.7050) -- + (87.4100,-37.7050) .. controls (86.3732,-37.7050) and (85.5092,-36.8986) .. + (85.5092,-35.9770) -- cycle; + \path[fill] (123.9653,-2.5114) .. controls (125.0021,-2.5114) and + (125.8661,-3.3178) .. (125.8661,-4.2394) -- (125.8661,-16.9690) -- + (147.6965,-16.9690) -- (147.6965,-4.2394) .. controls (147.6965,-3.3178) and + (148.5605,-2.5114) .. (149.5973,-2.5114) .. controls (150.6341,-2.5114) and + (151.4981,-3.3178) .. (151.4981,-4.2394) -- (151.4981,-20.1370) .. controls + (151.4981,-24.8026) and (151.3253,-30.1594) .. (148.6181,-33.9610) .. controls + (145.7957,-37.9354) and (140.6693,-38.3386) .. (136.7525,-38.3386) .. controls + (132.8357,-38.3386) and (127.7669,-37.9354) .. (124.9445,-33.9610) .. controls + (122.2373,-30.1594) and (122.0645,-24.8026) .. (122.0645,-20.1370) -- + (122.0645,-4.2394) .. controls (122.0645,-3.3178) and (122.9285,-2.5114) .. + (123.9653,-2.5114) -- cycle(125.8661,-20.4250) .. controls (125.9237,-24.9178) + and (126.2693,-29.5258) .. (128.1125,-32.1178) .. controls (129.7253,-34.3642) + and (132.9509,-34.8826) .. (136.7525,-34.8826) .. controls (140.5541,-34.8826) + and (143.7797,-34.3642) .. (145.3925,-32.1178) .. controls (147.2357,-29.5258) + and (147.5813,-24.9178) .. (147.6389,-20.4250) -- (125.8661,-20.4250) -- + cycle; + \path[fill] (154.8092,-35.9770) .. controls (154.8092,-35.0554) and + (155.6732,-34.2490) .. (156.7100,-34.2490) -- (169.5548,-34.2490) -- + (169.5548,-4.2394) .. controls (169.5548,-3.3178) and (170.4188,-2.5114) .. + (171.4556,-2.5114) .. controls (172.4924,-2.5114) and (173.3564,-3.3178) .. + (173.3564,-4.2394) -- (173.3564,-34.2490) -- (186.1436,-34.2490) .. controls + (187.1804,-34.2490) and (188.1020,-35.0554) .. (188.1020,-35.9770) .. controls + (188.1020,-36.8986) and (187.1804,-37.7050) .. (186.1436,-37.7050) -- + (156.7100,-37.7050) .. controls (155.6732,-37.7050) and (154.8092,-36.8986) .. + (154.8092,-35.9770) -- cycle; + \path[fill] (194.5028,-38.3386) .. controls (193.4660,-38.3386) and + (192.6020,-37.5322) .. (192.6020,-36.6106) -- (192.6020,-29.7562) .. controls + (192.6020,-26.5306) and (192.6020,-22.3834) .. (195.8852,-19.6762) .. controls + (198.7652,-17.3146) and (202.6820,-16.9690) .. (206.0228,-16.9690) -- + (206.0228,-4.2394) .. controls (206.0228,-3.3178) and (206.8868,-2.5114) .. + (207.9236,-2.5114) .. controls (208.9604,-2.5114) and (209.8244,-3.3178) .. + (209.8244,-4.2394) -- (209.8244,-16.9690) .. controls (213.1652,-16.9690) and + (217.0820,-17.3146) .. (219.9620,-19.6762) .. controls (223.2452,-22.3834) and + (223.3028,-26.5306) .. (223.3028,-29.7562) -- (223.3028,-36.6106) .. controls + (223.3028,-37.5322) and (222.4388,-38.3386) .. (221.4020,-38.3386) .. controls + (220.3652,-38.3386) and (219.5012,-37.5322) .. (219.5012,-36.6106) -- + (219.5012,-29.7562) .. controls (219.5012,-26.4154) and (219.1556,-23.5930) .. + (217.4276,-22.1530) .. controls (215.4692,-20.5402) and (211.8404,-20.4250) .. + (207.9236,-20.4250) .. controls (204.0068,-20.4250) and (200.4356,-20.5402) .. + (198.4772,-22.1530) .. controls (196.7492,-23.5930) and (196.4036,-26.4154) .. + (196.4036,-29.7562) -- (196.4036,-36.6106) .. controls (196.4036,-37.5322) and + (195.5396,-38.3386) .. (194.5028,-38.3386) -- cycle; + \path[fill] (236.1161,-20.4250) -- (236.1161,-34.2490) -- (248.4425,-34.2490) .. + controls (251.6105,-34.2490) and (254.6057,-34.1338) .. (256.0457,-32.9818) .. + controls (257.2553,-32.0602) and (257.6009,-29.9290) .. (257.6009,-27.3370) .. + controls (257.6009,-24.7450) and (257.2553,-22.6138) .. (256.0457,-21.6922) .. + controls (254.6057,-20.5402) and (251.6105,-20.4250) .. (248.4425,-20.4250) -- + (236.1161,-20.4250) -- cycle(236.1161,-16.9690) -- (249.5945,-16.9690) .. + controls (252.4169,-16.9690) and (255.9305,-17.1418) .. (258.5225,-19.1578) .. + controls (261.3449,-21.3466) and (261.4025,-24.8026) .. (261.4025,-27.3370) .. + controls (261.4025,-29.8714) and (261.3449,-33.3274) .. (258.5225,-35.5162) .. + controls (255.9305,-37.5322) and (252.4169,-37.7050) .. (249.5945,-37.7050) -- + (234.2153,-37.7050) .. controls (233.4089,-37.7050) and (232.3145,-37.0138) .. + (232.3145,-35.9770) -- (232.3145,-4.2394) .. controls (232.3145,-3.3178) and + (233.1785,-2.5114) .. (234.2153,-2.5114) .. controls (235.2521,-2.5114) and + (236.1161,-3.3178) .. (236.1161,-4.2394) -- (236.1161,-16.9690) -- cycle; + \path[fill] (295.5647,-4.8730) .. controls (295.5647,-5.7946) and + (294.7007,-6.6010) .. (293.6639,-6.6010) -- (271.8911,-6.6010) -- + (271.8911,-16.9690) -- (290.2079,-16.9690) .. controls (291.2447,-16.9690) and + (292.1087,-17.7754) .. (292.1087,-18.6970) .. controls (292.1087,-19.6186) and + (291.2447,-20.4250) .. (290.2079,-20.4250) -- (271.8911,-20.4250) -- + (271.8911,-34.2490) -- (293.6639,-34.2490) .. controls (294.7007,-34.2490) and + (295.5647,-35.0554) .. (295.5647,-35.9770) .. controls (295.5647,-36.8986) and + (294.7007,-37.7050) .. (293.6639,-37.7050) -- (269.9903,-37.7050) .. controls + (269.1839,-37.7050) and (268.0895,-37.0138) .. (268.0895,-35.9770) -- + (268.0895,-4.8730) .. controls (268.0895,-4.1242) and (268.8383,-3.1450) .. + (269.9903,-3.1450) -- (293.6639,-3.1450) .. controls (294.7007,-3.1450) and + (295.5647,-3.9514) .. (295.5647,-4.8730) -- cycle; + \path[fill] (305.7653,-22.7866) .. controls (306.3413,-22.7866) and + (306.9173,-23.0170) .. (307.2629,-23.4778) -- (314.1173,-31.5418) -- + (314.1173,-4.2394) .. controls (314.1173,-3.3178) and (314.9813,-2.5114) .. + (316.0181,-2.5114) .. controls (317.0549,-2.5114) and (317.9189,-3.3178) .. + (317.9189,-4.2394) -- (317.9189,-36.6106) .. controls (317.9189,-37.5322) and + (316.9973,-38.3386) .. (316.0181,-38.3386) .. controls (315.4421,-38.3386) and + (314.8661,-38.1082) .. (314.5205,-37.6474) -- (304.2677,-25.5514) .. controls + (304.0373,-25.2634) and (303.8645,-24.8602) .. (303.8645,-24.5146) .. controls + (303.8645,-23.5930) and (304.7285,-22.7866) .. (305.7653,-22.7866) -- cycle; +\end{scope} +\begin{scope}[shift={(-177.32711,97.2679)}] + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (37.2730,-34.2750) -- (37.2730,-1.8360) .. controls + (37.2730,-0.8530) and (36.4100,-0.1060) .. (35.3670,-0.1060) .. controls + (34.6170,-0.1060) and (33.9840,-0.4580) .. (33.6910,-1.0290) -- + (18.6880,-26.4930) -- (3.6800,-1.0290) .. controls (3.3980,-0.4580) and + (2.7540,-0.1060) .. (2.0040,-0.1060) .. controls (0.9770,-0.1060) and + (0.1090,-0.8530) .. (0.1090,-1.8360) -- (0.1090,-34.2750) .. controls + (0.1090,-35.2570) and (0.9770,-36.0050) .. (2.0040,-36.0050) .. controls + (3.0470,-36.0050) and (3.9140,-35.2570) .. (3.9140,-34.2750) -- + (3.9140,-8.7680) -- (17.0120,-30.9830) .. controls (17.3050,-31.5740) and + (17.9380,-31.9100) .. (18.6880,-31.9100) .. controls (19.4490,-31.9100) and + (20.0820,-31.5740) .. (20.3590,-30.9830) -- (33.4730,-8.7680) -- + (33.4730,-34.2750) .. controls (33.4730,-35.2570) and (34.3400,-36.0050) .. + (35.3670,-36.0050) .. controls (36.4100,-36.0050) and (37.2730,-35.2570) .. + (37.2730,-34.2750); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (73.5940,-33.6410) .. controls (73.5940,-32.6580) and + (72.7270,-31.9100) .. (71.6840,-31.9100) -- (49.8630,-31.9100) -- + (49.8630,-21.5290) -- (68.2190,-21.5290) .. controls (69.2620,-21.5290) and + (70.1250,-20.7660) .. (70.1250,-19.7950) .. controls (70.1250,-18.8130) and + (69.2620,-18.0610) .. (68.2190,-18.0610) -- (49.8630,-18.0610) -- + (49.8630,-4.2000) -- (71.6840,-4.2000) .. controls (72.7270,-4.2000) and + (73.5940,-3.4530) .. (73.5940,-2.4700) .. controls (73.5940,-1.4990) and + (72.7270,-0.7360) .. (71.6840,-0.7360) -- (47.9530,-0.7360) .. controls + (46.9260,-0.7360) and (46.0590,-1.4990) .. (46.0590,-2.4700) -- + (46.0590,-33.6410) .. controls (46.0590,-34.6270) and (46.9260,-35.3750) .. + (47.9530,-35.3750) -- (71.6840,-35.3750) .. controls (72.7270,-35.3750) and + (73.5940,-34.6270) .. (73.5940,-33.6410); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (110.7580,-2.4700) .. controls (110.7580,-1.4990) and + (109.8910,-0.7360) .. (108.8480,-0.7360) -- (79.3050,-0.7360) .. controls + (78.2620,-0.7360) and (77.3950,-1.4990) .. (77.3950,-2.4700) .. controls + (77.3950,-3.4530) and (78.2620,-4.2000) .. (79.3050,-4.2000) -- + (92.1680,-4.2000) -- (92.1680,-34.2750) .. controls (92.1680,-35.2570) and + (93.0350,-36.0050) .. (94.0780,-36.0050) .. controls (95.1210,-36.0050) and + (95.9840,-35.2570) .. (95.9840,-34.2750) -- (95.9840,-4.2000) -- + (108.8480,-4.2000) .. controls (109.8910,-4.2000) and (110.7580,-3.4530) .. + (110.7580,-2.4700); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (143.4380,-34.2750) -- (143.4380,-19.7950) .. controls + (143.4380,-14.4800) and (143.4380,-8.4750) .. (140.5590,-4.4940) .. controls + (138.0200,-0.8530) and (133.2300,-0.1060) .. (128.7230,-0.1060) .. controls + (124.2150,-0.1060) and (119.4300,-0.8530) .. (116.8870,-4.4940) .. controls + (114.0080,-8.4750) and (114.0080,-14.4800) .. (114.0080,-19.7950) -- + (114.0080,-34.2750) .. controls (114.0080,-35.2570) and (114.8750,-36.0050) .. + (115.9020,-36.0050) .. controls (116.9450,-36.0050) and (117.8130,-35.2570) .. + (117.8130,-34.2750) -- (117.8130,-21.5290) -- (139.6330,-21.5290) -- + (139.6330,-34.2750) .. controls (139.6330,-35.2570) and (140.5000,-36.0050) .. + (141.5430,-36.0050) .. controls (142.5700,-36.0050) and (143.4380,-35.2570) .. + (143.4380,-34.2750) -- cycle(139.6330,-18.0610) -- (117.8130,-18.0610) .. + controls (117.8710,-13.7910) and (118.1050,-9.1640) .. (120.0590,-6.3450) .. + controls (121.9100,-3.7460) and (125.4920,-3.5700) .. (128.7230,-3.5700) .. + controls (131.9530,-3.5700) and (135.5350,-3.7460) .. (137.3870,-6.3450) .. + controls (139.3400,-9.1640) and (139.5740,-13.7910) .. (139.6330,-18.0610); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (179.9880,-2.4700) .. controls (179.9880,-1.4990) and + (179.1210,-0.7360) .. (178.0780,-0.7360) -- (148.5350,-0.7360) .. controls + (147.4920,-0.7360) and (146.6250,-1.4990) .. (146.6250,-2.4700) .. controls + (146.6250,-3.4530) and (147.4920,-4.2000) .. (148.5350,-4.2000) -- + (161.3980,-4.2000) -- (161.3980,-34.2750) .. controls (161.3980,-35.2570) and + (162.2660,-36.0050) .. (163.3090,-36.0050) .. controls (164.3520,-36.0050) and + (165.2150,-35.2570) .. (165.2150,-34.2750) -- (165.2150,-4.2000) -- + (178.0780,-4.2000) .. controls (179.1210,-4.2000) and (179.9880,-3.4530) .. + (179.9880,-2.4700); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (215.2030,-8.7100) -- (215.2030,-1.8360) .. controls + (215.2030,-0.8530) and (214.3400,-0.1060) .. (213.2970,-0.1060) .. controls + (212.2540,-0.1060) and (211.3870,-0.8530) .. (211.3870,-1.8360) -- + (211.3870,-8.7100) .. controls (211.3870,-11.4850) and (211.3870,-14.5970) .. + (209.3160,-16.2720) .. controls (207.1880,-18.0610) and (203.1910,-18.0610) .. + (199.8440,-18.0610) .. controls (196.4960,-18.0610) and (192.5160,-18.0610) .. + (190.3910,-16.2720) .. controls (188.3050,-14.5970) and (188.3050,-11.4850) .. + (188.3050,-8.7100) -- (188.3050,-1.8360) .. controls (188.3050,-0.8530) and + (187.4380,-0.1060) .. (186.3950,-0.1060) .. controls (185.3670,-0.1060) and + (184.5000,-0.8530) .. (184.5000,-1.8360) -- (184.5000,-8.7100) .. controls + (184.5000,-12.4520) and (184.8980,-16.5070) .. (187.7890,-18.8720) .. controls + (190.5510,-21.1180) and (194.2500,-21.4710) .. (197.9490,-21.5290) -- + (197.9490,-34.2750) .. controls (197.9490,-35.2570) and (198.8160,-36.0050) .. + (199.8440,-36.0050) .. controls (200.8870,-36.0050) and (201.7540,-35.2570) .. + (201.7540,-34.2750) -- (201.7540,-21.5290) .. controls (205.4530,-21.4710) and + (209.1410,-21.1180) .. (211.9140,-18.8720) .. controls (214.7930,-16.5070) and + (215.2030,-12.4520) .. (215.2030,-8.7100); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (253.3010,-11.1330) .. controls (253.3010,-8.1340) and + (253.0080,-4.9520) .. (250.8200,-2.9980) .. controls (248.3980,-0.7950) and + (244.9340,-0.7360) .. (241.7030,-0.7360) -- (226.0470,-0.7360) .. controls + (225.0200,-0.7360) and (224.1520,-1.4990) .. (224.1520,-2.4700) -- + (224.1520,-34.2750) .. controls (224.1520,-35.2570) and (225.0200,-36.0050) .. + (226.0470,-36.0050) .. controls (227.0900,-36.0050) and (227.9570,-35.2570) .. + (227.9570,-34.2750) -- (227.9570,-21.5290) -- (241.7030,-21.5290) .. controls + (244.9340,-21.5290) and (248.3980,-21.4710) .. (250.8200,-19.2670) .. controls + (253.0080,-17.3140) and (253.3010,-14.1270) .. (253.3010,-11.1330) -- + cycle(249.4840,-11.1330) .. controls (249.4840,-13.1560) and + (249.4840,-15.4620) .. (248.1050,-16.8440) .. controls (246.8870,-18.0610) and + (244.0080,-18.0610) .. (241.7030,-18.0610) -- (227.9570,-18.0610) -- + (227.9570,-4.2000) -- (241.7030,-4.2000) .. controls (244.0080,-4.2000) and + (246.8870,-4.2000) .. (248.1050,-5.4210) .. controls (249.4840,-6.7990) and + (249.4840,-9.1050) .. (249.4840,-11.1330); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (287.5350,-33.6410) .. controls (287.5350,-32.6580) and + (286.6680,-31.9100) .. (285.6250,-31.9100) -- (263.8050,-31.9100) -- + (263.8050,-21.5290) -- (282.1600,-21.5290) .. controls (283.2030,-21.5290) and + (284.0660,-20.7660) .. (284.0660,-19.7950) .. controls (284.0660,-18.8130) and + (283.2030,-18.0610) .. (282.1600,-18.0610) -- (263.8050,-18.0610) -- + (263.8050,-4.2000) -- (285.6250,-4.2000) .. controls (286.6680,-4.2000) and + (287.5350,-3.4530) .. (287.5350,-2.4700) .. controls (287.5350,-1.4990) and + (286.6680,-0.7360) .. (285.6250,-0.7360) -- (261.8950,-0.7360) .. controls + (260.8670,-0.7360) and (260.0000,-1.4990) .. (260.0000,-2.4700) -- + (260.0000,-33.6410) .. controls (260.0000,-34.6270) and (260.8670,-35.3750) .. + (261.8950,-35.3750) -- (285.6250,-35.3750) .. controls (286.6680,-35.3750) and + (287.5350,-34.6270) .. (287.5350,-33.6410); + \end{scope} + \begin{scope}[cm={{1.00048,0.0,0.0,0.99839,(185.34435,-58.78669)}}] + \path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (309.8670,-34.2750) -- (309.8670,-1.8360) .. controls + (309.8670,-0.8530) and (309.0590,-0.1060) .. (307.9610,-0.1060) .. controls + (307.3870,-0.1060) and (306.8130,-0.3990) .. (306.4610,-0.7950) -- + (296.2420,-12.9220) .. controls (296.0080,-13.2030) and (295.8440,-13.5560) .. + (295.8440,-13.9670) .. controls (295.8440,-14.9340) and (296.7110,-15.6970) .. + (297.7380,-15.6970) .. controls (298.3870,-15.6970) and (298.8980,-15.4620) .. + (299.2500,-14.9920) -- (306.0510,-6.9170) -- (306.0510,-34.2750) .. controls + (306.0510,-35.2570) and (306.9180,-36.0050) .. (307.9610,-36.0050) .. controls + (309.0590,-36.0050) and (309.8670,-35.2570) .. (309.8670,-34.2750); + \end{scope} +\end{scope} +\end{tikzpicture} +\end{center} +% +The following picture compares \emph{Fetamont Bold Condensed 40} with a traced version of the \emph{Title Font} from \verb|manfnt.mf|. +% +\begin{center} +\begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-1.000000, xscale=1.000000, inner sep=0pt, outer sep=0pt] +\path[fill=black!30,nonzero rule] (33.2773,0.1328) .. controls (32.1836,0.1328) + and (31.0898,0.6523) .. (30.6289,1.6328) -- (18.1289,27.0898) -- + (5.6289,1.6328) .. controls (5.2266,0.7695) and (4.1328,0.0781) .. + (2.9805,0.0781) .. controls (1.4258,0.0781) and (0.1016,1.2266) .. + (0.1016,2.6680) -- (0.1016,38.7852) .. controls (0.1016,40.2227) and + (1.4258,41.3750) .. (2.9805,41.3750) .. controls (4.5352,41.3750) and + (5.8594,40.2227) .. (5.8594,38.7852) -- (5.8594,14.9375) -- (15.4805,34.5195) + .. controls (15.9414,35.5000) and (17.0352,36.0781) .. (18.1289,36.0781) .. + controls (19.3984,36.0781) and (20.3750,35.3867) .. (20.7773,34.5195) -- + (30.3984,14.9375) -- (30.3984,38.7852) .. controls (30.3984,40.2227) and + (31.7227,41.3750) .. (33.2773,41.3750) .. controls (34.8320,41.3750) and + (36.1602,40.2227) .. (36.1602,38.7852) -- (36.1602,2.6680) .. controls + (36.1602,1.4023) and (34.9492,0.1328) .. (33.2773,0.1328); +\path[fill=black!30,nonzero rule] (69.9844,38.1484) .. controls (69.9844,36.7109) + and (68.6602,35.5586) .. (67.1055,35.5586) -- (48.3867,35.5586) -- + (48.3867,25.3047) -- (62.9570,25.3047) .. controls (64.5156,25.3047) and + (65.7812,24.1523) .. (65.7812,22.7695) .. controls (65.7812,21.3867) and + (64.5156,20.1797) .. (62.9570,20.1797) -- (48.3867,20.1797) -- + (48.3867,5.9531) -- (67.1055,5.9531) .. controls (68.6602,5.9531) and + (69.9844,4.8008) .. (69.9844,3.3594) .. controls (69.9844,1.9180) and + (68.6602,0.7695) .. (67.1055,0.7695) -- (45.5039,0.7695) .. controls + (43.9492,0.7695) and (42.6250,1.9180) .. (42.6250,3.3594) -- (42.6250,38.1484) + .. controls (42.6250,39.5898) and (43.9492,40.7422) .. (45.5039,40.7422) -- + (67.1055,40.7422) .. controls (68.6602,40.7422) and (69.9844,39.5898) .. + (69.9844,38.1484); +\path[fill=black!30,nonzero rule] (72.6445,3.3594) .. controls (72.6445,4.7422) + and (73.9141,5.8945) .. (75.4688,5.8945) -- (85.1445,5.8945) -- + (85.1445,38.7852) .. controls (85.1445,40.2227) and (86.4688,41.3750) .. + (88.0234,41.3750) .. controls (89.5781,41.3750) and (90.9062,40.2227) .. + (90.9062,38.7852) -- (90.9062,5.8945) -- (100.5820,5.8945) .. controls + (102.1367,5.8945) and (103.4023,4.7422) .. (103.4023,3.3594) .. controls + (103.4023,1.9766) and (102.1367,0.7695) .. (100.5820,0.7695) -- + (75.4688,0.7695) .. controls (73.9141,0.7695) and (72.6445,1.9766) .. + (72.6445,3.3594); +\path[fill=black!30,nonzero rule] (108.3672,41.3750) .. controls + (109.9219,41.3750) and (111.2461,40.2227) .. (111.2461,38.7852) -- + (111.2461,25.3047) -- (128.8125,25.3047) -- (128.8125,38.7852) .. controls + (128.8125,40.2227) and (130.1406,41.3750) .. (131.6953,41.3750) .. controls + (133.2500,41.3750) and (134.5742,40.2227) .. (134.5742,38.7852) -- + (134.5742,20.6406) .. controls (134.5742,15.5703) and (134.3438,9.8125) .. + (131.8672,5.4922) .. controls (129.2734,1.0547) and (124.0352,0.0781) .. + (120.0000,0.0781) .. controls (115.9688,0.0781) and (110.7266,1.0547) .. + (108.1367,5.4922) .. controls (105.6016,9.8125) and (105.4883,15.5703) .. + (105.4883,20.6406) -- (105.4883,38.7852) .. controls (105.4883,40.2227) and + (106.8125,41.3750) .. (108.3672,41.3750)(128.7578,20.1797) -- + (111.2461,20.1797) .. controls (111.3047,15.3984) and (111.7656,10.5586) .. + (113.2617,7.9102) .. controls (114.3008,6.1250) and (116.7188,5.2617) .. + (120.0000,5.2617) .. controls (123.2852,5.2617) and (125.7617,6.1250) .. + (126.7969,7.9102) .. controls (128.2969,10.5586) and (128.6992,15.3984) .. + (128.7578,20.1797); +\path[fill=black!30,nonzero rule] (143.9180,41.3750) .. controls + (145.4727,41.3750) and (146.7969,40.2227) .. (146.7969,38.7852) -- + (146.7969,25.3047) -- (161.3711,25.3047) .. controls (162.9258,25.3047) and + (164.1914,24.1523) .. (164.1914,22.7695) .. controls (164.1914,21.3867) and + (162.9258,20.1797) .. (161.3711,20.1797) -- (146.7969,20.1797) -- + (146.7969,5.9531) -- (165.5156,5.9531) .. controls (167.0703,5.9531) and + (168.3945,4.8008) .. (168.3945,3.3594) .. controls (168.3945,1.9180) and + (167.0703,0.7695) .. (165.5156,0.7695) -- (143.9180,0.7695) .. controls + (142.3594,0.7695) and (141.0352,1.9180) .. (141.0352,3.3594) -- + (141.0352,38.7852) .. controls (141.0352,40.2227) and (142.3594,41.3750) .. + (143.9180,41.3750); +\path[fill=black!30,nonzero rule] (186.4336,5.2617) .. controls (190.5820,5.2617) + and (193.6914,5.9531) .. (195.1914,8.0820) .. controls (197.3203,11.1367) and + (197.5508,17.1250) .. (197.5508,22.7695) .. controls (197.5508,27.4375) and + (197.2656,31.8125) .. (195.3633,34.0039) .. controls (193.6914,35.9023) and + (190.6406,36.1914) .. (186.4336,36.1914) .. controls (182.2305,36.1914) and + (179.2344,35.9023) .. (177.5664,34.0039) .. controls (175.6641,31.8125) and + (175.3750,27.4375) .. (175.3750,22.7695) .. controls (175.3750,17.1250) and + (175.6055,11.1367) .. (177.7383,8.0820) .. controls (179.2344,5.9531) and + (182.2891,5.2617) .. (186.4336,5.2617)(186.6641,41.3750) .. controls + (190.6406,41.3750) and (196.2852,41.3164) .. (199.9141,37.1719) .. controls + (203.1406,33.4844) and (203.3125,28.5898) .. (203.3125,24.4414) -- + (203.3125,20.6953) .. controls (203.3125,15.5703) and (203.1406,9.6953) .. + (200.0859,5.3164) .. controls (196.8047,0.5938) and (190.7539,0.0781) .. + (186.4336,0.0781) .. controls (182.1133,0.0781) and (176.1250,0.5938) .. + (172.8398,5.3164) .. controls (169.7891,9.6953) and (169.6172,15.5703) .. + (169.6172,20.6953) -- (169.6172,24.4414) .. controls (169.6172,28.5898) and + (169.7891,33.4844) .. (173.0156,37.1719) .. controls (176.6445,41.3164) and + (182.2891,41.3750) .. (186.2617,41.3750) -- (186.6641,41.3750); +\path[fill=black!30,nonzero rule] (210.3516,41.3750) .. controls + (211.9062,41.3750) and (213.2305,40.2227) .. (213.2305,38.7852) -- + (213.2305,11.0781) -- (230.7969,34.2891) -- (230.7969,38.7852) .. controls + (230.7969,40.2227) and (232.1211,41.3750) .. (233.6797,41.3750) .. controls + (235.2344,41.3750) and (236.5586,40.2227) .. (236.5586,38.7852) -- + (236.5586,2.6680) .. controls (236.5586,1.2266) and (235.2344,0.0781) .. + (233.6797,0.0781) .. controls (232.1211,0.0781) and (230.7969,1.2266) .. + (230.7969,2.6680) -- (230.7969,25.0742) -- (212.7109,1.2266) .. controls + (212.3086,0.6523) and (211.3281,0.0781) .. (210.3516,0.0781) .. controls + (208.7930,0.0781) and (207.4688,1.2266) .. (207.4688,2.6680) -- + (207.4688,38.7852) .. controls (207.4688,40.2227) and (208.7930,41.3750) .. + (210.3516,41.3750); +\path[fill=black!30,nonzero rule] (239.8516,3.3594) .. controls (239.8516,4.7422) + and (241.1211,5.8945) .. (242.6758,5.8945) -- (252.3516,5.8945) -- + (252.3516,38.7852) .. controls (252.3516,40.2227) and (253.6758,41.3750) .. + (255.2305,41.3750) .. controls (256.7852,41.3750) and (258.1094,40.2227) .. + (258.1094,38.7852) -- (258.1094,5.8945) -- (267.7891,5.8945) .. controls + (269.3438,5.8945) and (270.6094,4.7422) .. (270.6094,3.3594) .. controls + (270.6094,1.9766) and (269.3438,0.7695) .. (267.7891,0.7695) -- + (242.6758,0.7695) .. controls (241.1211,0.7695) and (239.8516,1.9766) .. + (239.8516,3.3594); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (2.6367,0.1211) .. controls (1.7266,0.2188) and (0.9375,0.6953) + .. (0.4766,1.3867) .. controls (0.3008,1.6758) and (0.1875,1.9492) .. + (0.1133,2.2930) .. controls (0.1016,2.4219) and (0.1016,3.1719) .. + (0.1016,20.7266) .. controls (0.1016,35.5859) and (0.1016,39.0586) .. + (0.1133,39.1289) .. controls (0.2148,39.7188) and (0.4766,40.1953) .. + (0.9062,40.5820) .. controls (1.3398,40.9883) and (1.8438,41.2305) .. + (2.4609,41.3320) .. controls (2.6211,41.3594) and (2.6914,41.3594) .. + (2.9805,41.3594) .. controls (3.2539,41.3594) and (3.3281,41.3594) .. + (3.5000,41.3320) .. controls (4.3203,41.1875) and (4.9961,40.7695) .. + (5.4297,40.1367) .. controls (5.6172,39.8789) and (5.7461,39.5742) .. + (5.8164,39.2148) -- (5.8477,39.0703) -- (5.8594,27.0469) -- (5.8750,15.0078) + -- (10.4688,24.3711) .. controls (15.4375,34.4336) and (15.5078,34.5781) .. + (15.5938,34.7383) .. controls (15.9844,35.3711) and (16.7031,35.8477) .. + (17.5117,36.0039) .. controls (18.7500,36.2500) and (20.0312,35.7148) .. + (20.6367,34.7383) .. controls (20.7227,34.5781) and (20.7930,34.4336) .. + (25.7617,24.3711) -- (30.3711,15.0078) -- (30.3711,27.0469) -- + (30.3828,39.0703) -- (30.4141,39.2148) .. controls (30.5273,39.7773) and + (30.7891,40.2109) .. (31.1914,40.5820) .. controls (31.6211,40.9883) and + (32.1250,41.2305) .. (32.7461,41.3320) .. controls (32.9023,41.3594) and + (32.9766,41.3594) .. (33.2656,41.3594) .. controls (33.5391,41.3594) and + (33.6094,41.3594) .. (33.7812,41.3320) .. controls (34.6016,41.1875) and + (35.2812,40.7695) .. (35.7109,40.1367) .. controls (35.9141,39.8477) and + (36.0430,39.5195) .. (36.1133,39.1289) .. controls (36.1289,39.0586) and + (36.1445,35.5859) .. (36.1445,20.7422) .. controls (36.1445,5.8945) and + (36.1289,2.4219) .. (36.1133,2.3359) .. controls (36.0156,1.7617) and + (35.7539,1.2852) .. (35.3242,0.8984) .. controls (34.8906,0.4922) and + (34.3867,0.2500) .. (33.7812,0.1484) .. controls (33.6094,0.1211) and + (33.5391,0.1211) .. (33.2656,0.1211) .. controls (32.9766,0.1211) and + (32.9023,0.1211) .. (32.7461,0.1484) .. controls (31.8945,0.2930) and + (31.2188,0.7227) .. (30.7891,1.3711) .. controls (30.7305,1.4453) and + (30.5703,1.7617) .. (30.4141,2.0508) .. controls (30.2695,2.3516) and + (27.4453,8.0977) .. (24.1328,14.8203) .. controls (20.8242,21.5312) and + (18.1133,27.0352) .. (18.1133,27.0352) .. controls (18.1133,27.0352) and + (15.4062,21.5312) .. (12.0977,14.8203) .. controls (8.7852,8.0977) and + (5.9609,2.3516) .. (5.8164,2.0508) .. controls (5.4570,1.3438) and + (5.3438,1.1719) .. (5.0391,0.8984) .. controls (4.6094,0.4922) and + (4.1055,0.2500) .. (3.5000,0.1484) .. controls (3.2969,0.1211) and + (2.8359,0.1055) .. (2.6367,0.1211); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (45.1445,0.7539) .. controls (44.7852,0.7969) and + (44.4102,0.8984) .. (44.0938,1.0547) .. controls (43.7656,1.2148) and + (43.5195,1.3867) .. (43.2734,1.6445) .. controls (42.8984,2.0508) and + (42.6680,2.5234) .. (42.5977,3.0430) .. controls (42.5703,3.2734) and + (42.5703,38.2070) .. (42.5977,38.4375) .. controls (42.6992,39.1719) and + (43.1172,39.8047) .. (43.7773,40.2383) .. controls (44.1680,40.5117) and + (44.6875,40.6836) .. (45.1914,40.7266) .. controls (45.3203,40.7422) and + (48.4297,40.7422) .. (56.4062,40.7422) -- (67.4375,40.7266) -- + (67.5977,40.6992) .. controls (68.2305,40.5820) and (68.7031,40.3516) .. + (69.1367,39.9492) .. controls (69.5703,39.5625) and (69.8281,39.0859) .. + (69.9297,38.4961) .. controls (69.9570,38.3672) and (69.9570,37.9180) .. + (69.9297,37.7773) .. controls (69.8281,37.1992) and (69.5703,36.7227) .. + (69.1367,36.3359) .. controls (68.7031,35.9336) and (68.2305,35.7031) .. + (67.5977,35.5859) -- (67.4375,35.5586) -- (57.8906,35.5430) -- + (48.3594,35.5430) -- (48.3594,25.3477) -- (55.8008,25.3477) -- + (63.2617,25.3359) -- (63.4219,25.3047) .. controls (64.0547,25.1914) and + (64.5273,24.9609) .. (64.9609,24.5547) .. controls (65.3945,24.1680) and + (65.6523,23.6914) .. (65.7539,23.1016) .. controls (65.7812,22.9727) and + (65.7812,22.5273) .. (65.7539,22.3828) .. controls (65.6523,21.8047) and + (65.3945,21.3320) .. (64.9609,20.9414) .. controls (64.5273,20.5391) and + (64.0547,20.3086) .. (63.4219,20.1914) -- (63.2617,20.1641) -- + (55.8008,20.1484) -- (48.3594,20.1484) -- (48.3594,5.9375) -- (57.8906,5.9375) + -- (67.4375,5.9219) -- (67.5977,5.8945) .. controls (68.2305,5.7773) and + (68.7031,5.5469) .. (69.1367,5.1445) .. controls (69.5703,4.7578) and + (69.8281,4.2812) .. (69.9297,3.6914) .. controls (69.9570,3.5625) and + (69.9570,3.1133) .. (69.9297,2.9727) .. controls (69.8281,2.3945) and + (69.5703,1.9180) .. (69.1367,1.5312) .. controls (68.7031,1.1289) and + (68.2305,0.8984) .. (67.5977,0.7812) -- (67.4375,0.7539) -- (56.3516,0.7383) + .. controls (49.7852,0.7383) and (45.2188,0.7539) .. (45.1445,0.7539); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (75.0938,0.7539) .. controls (74.5312,0.8125) and + (73.9414,1.0547) .. (73.5234,1.4023) .. controls (73.0195,1.7891) and + (72.7031,2.3086) .. (72.5742,2.9258) .. controls (72.5469,3.1016) and + (72.5469,3.5469) .. (72.5742,3.6914) .. controls (72.6758,4.2812) and + (72.9336,4.7578) .. (73.3672,5.1445) .. controls (73.7969,5.5469) and + (74.2734,5.7773) .. (74.9062,5.8945) -- (75.0781,5.9219) -- (80.0781,5.9375) + -- (85.0859,5.9375) -- (85.0859,22.5117) -- (85.1016,39.0703) -- + (85.1289,39.2148) .. controls (85.2461,39.7773) and (85.5039,40.2109) .. + (85.9102,40.5820) .. controls (86.3398,40.9883) and (86.8438,41.2305) .. + (87.4648,41.3320) .. controls (87.6211,41.3594) and (87.6953,41.3594) .. + (87.9805,41.3594) .. controls (88.2539,41.3594) and (88.3281,41.3594) .. + (88.5000,41.3320) .. controls (89.3203,41.1875) and (89.9961,40.7695) .. + (90.4297,40.1367) .. controls (90.6172,39.8789) and (90.7461,39.5742) .. + (90.8203,39.2148) -- (90.8477,39.0703) -- (90.8633,22.5117) -- + (90.8633,5.9375) -- (95.8750,5.9375) -- (100.8828,5.9219) -- (101.0430,5.8945) + .. controls (101.6758,5.7773) and (102.1523,5.5469) .. (102.5820,5.1445) .. + controls (103.0156,4.7578) and (103.2734,4.2812) .. (103.3750,3.6914) .. + controls (103.4062,3.5625) and (103.4062,3.1133) .. (103.3750,2.9727) .. + controls (103.2734,2.3945) and (103.0156,1.9180) .. (102.5820,1.5312) .. + controls (102.1523,1.1289) and (101.6758,0.8984) .. (101.0430,0.7812) -- + (100.8828,0.7539) -- (88.0547,0.7383) .. controls (80.6797,0.7383) and + (75.1641,0.7539) .. (75.0938,0.7539); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (119.2109,0.1211) .. controls (115.6094,0.2500) and + (112.7422,1.1133) .. (110.6289,2.6953) .. controls (109.5625,3.5039) and + (108.7539,4.4102) .. (108.1055,5.5195) .. controls (107.0117,7.4062) and + (106.2656,9.5938) .. (105.8594,12.1016) .. controls (105.5430,14.0586) and + (105.3984,16.3047) .. (105.4297,19.2578) .. controls (105.4414,19.8320) and + (105.4570,24.5430) .. (105.4570,29.6953) -- (105.4727,39.0703) -- + (105.5000,39.2148) .. controls (105.6172,39.7617) and (105.8750,40.2109) .. + (106.2773,40.5820) .. controls (106.7109,40.9883) and (107.2148,41.2305) .. + (107.8320,41.3320) .. controls (107.9922,41.3594) and (108.0625,41.3594) .. + (108.3516,41.3594) .. controls (108.6250,41.3594) and (108.6992,41.3594) .. + (108.8711,41.3320) .. controls (109.6914,41.1875) and (110.3672,40.7695) .. + (110.8008,40.1367) .. controls (110.9883,39.8789) and (111.1172,39.5742) .. + (111.1875,39.2148) -- (111.2188,39.0703) -- (111.2305,32.2188) -- + (111.2305,25.3477) -- (128.7578,25.3477) -- (128.7578,32.2188) -- + (128.7695,39.0703) -- (128.8008,39.2148) .. controls (128.9141,39.7773) and + (129.1758,40.2109) .. (129.5781,40.5820) .. controls (130.0078,40.9883) and + (130.5117,41.2305) .. (131.1328,41.3320) .. controls (131.2930,41.3594) and + (131.3633,41.3594) .. (131.6523,41.3594) .. controls (131.9258,41.3594) and + (131.9961,41.3594) .. (132.1680,41.3320) .. controls (132.9922,41.1875) and + (133.6680,40.7695) .. (134.0977,40.1367) .. controls (134.2852,39.8789) and + (134.4141,39.5742) .. (134.4883,39.2148) -- (134.5156,39.0703) -- + (134.5312,29.6953) .. controls (134.5312,24.5430) and (134.5469,19.8320) .. + (134.5586,19.2578) .. controls (134.5898,16.3047) and (134.4453,14.0586) .. + (134.1289,12.1016) .. controls (133.7266,9.5938) and (132.9766,7.4062) .. + (131.8828,5.5195) .. controls (131.2344,4.4102) and (130.4258,3.5039) .. + (129.3633,2.6953) .. controls (127.4883,1.2852) and (124.9688,0.4375) .. + (121.9609,0.1914) .. controls (121.3398,0.1328) and (120.9531,0.1211) .. + (120.1602,0.1211) .. controls (119.7148,0.1055) and (119.2812,0.1055) .. + (119.2109,0.1211)(120.7070,5.3164) .. controls (122.7500,5.4062) and + (124.3945,5.8203) .. (125.4727,6.5547) .. controls (125.9648,6.8867) and + (126.4102,7.3477) .. (126.6836,7.7930) .. controls (126.9844,8.2852) and + (127.3750,9.0898) .. (127.6055,9.7109) .. controls (128.2812,11.5117) and + (128.6289,13.5391) .. (128.7422,16.3203) .. controls (128.7852,17.2539) and + (128.8008,19.1289) .. (128.7695,19.8320) -- (128.7695,20.1484) -- + (111.2188,20.1484) -- (111.2188,19.8320) .. controls (111.1875,19.1289) and + (111.2031,17.2539) .. (111.2461,16.3203) .. controls (111.3633,13.5391) and + (111.7070,11.5117) .. (112.3828,9.7109) .. controls (112.6133,9.0898) and + (113.0039,8.2852) .. (113.3047,7.7930) .. controls (113.5078,7.4648) and + (113.8945,7.0312) .. (114.2266,6.7734) .. controls (115.2344,5.9805) and + (116.7031,5.5039) .. (118.6641,5.3477) .. controls (119.2539,5.3047) and + (120.0586,5.2891) .. (120.7070,5.3164); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (143.5430,0.7539) .. controls (142.9648,0.8125) and + (142.3750,1.0547) .. (141.9297,1.4141) .. controls (141.7695,1.5312) and + (141.5547,1.7773) .. (141.4414,1.9336) .. controls (141.1953,2.2812) and + (141.0352,2.6836) .. (140.9922,3.1016) .. controls (140.9805,3.2148) and + (140.9805,7.6797) .. (140.9805,21.1562) -- (140.9922,39.0703) -- + (141.0234,39.2148) .. controls (141.1367,39.7773) and (141.3984,40.2109) .. + (141.8008,40.5820) .. controls (142.2305,40.9883) and (142.7344,41.2305) .. + (143.3555,41.3320) .. controls (143.5156,41.3594) and (143.5859,41.3594) .. + (143.8750,41.3594) .. controls (144.1484,41.3594) and (144.2188,41.3594) .. + (144.3906,41.3320) .. controls (145.2148,41.1875) and (145.8906,40.7695) .. + (146.3203,40.1367) .. controls (146.5078,39.8789) and (146.6367,39.5742) .. + (146.7109,39.2148) -- (146.7383,39.0703) -- (146.7539,32.2188) -- + (146.7539,25.3477) -- (154.1992,25.3477) -- (161.6562,25.3359) -- + (161.8164,25.3047) .. controls (162.4492,25.1914) and (162.9258,24.9609) .. + (163.3555,24.5547) .. controls (163.7891,24.1680) and (164.0469,23.6914) .. + (164.1484,23.1016) .. controls (164.1797,22.9727) and (164.1797,22.5273) .. + (164.1484,22.3828) .. controls (164.0469,21.8047) and (163.7891,21.3320) .. + (163.3555,20.9414) .. controls (162.9258,20.5391) and (162.4492,20.3086) .. + (161.8164,20.1914) -- (161.6562,20.1641) -- (154.1992,20.1484) -- + (146.7539,20.1484) -- (146.7539,5.9375) -- (156.2852,5.9375) -- + (165.8320,5.9219) -- (165.9922,5.8945) .. controls (166.6250,5.7773) and + (167.1016,5.5469) .. (167.5312,5.1445) .. controls (167.9648,4.7578) and + (168.2227,4.2812) .. (168.3242,3.6914) .. controls (168.3555,3.5625) and + (168.3555,3.1133) .. (168.3242,2.9727) .. controls (168.2227,2.3945) and + (167.9648,1.9180) .. (167.5312,1.5312) .. controls (167.1016,1.1289) and + (166.6250,0.8984) .. (165.9922,0.7812) -- (165.8320,0.7539) -- + (154.7461,0.7383) .. controls (148.1797,0.7383) and (143.6133,0.7539) .. + (143.5430,0.7539); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (185.1094,0.1211) .. controls (182.5352,0.1914) and + (180.4297,0.5234) .. (178.5859,1.1406) .. controls (177.2188,1.6016) and + (176.0547,2.1914) .. (175.0156,2.9844) .. controls (174.0078,3.7344) and + (173.2578,4.5391) .. (172.5234,5.6484) .. controls (171.1289,7.7500) and + (170.2656,10.1992) .. (169.8320,13.1680) .. controls (169.6445,14.4922) and + (169.5430,15.8594) .. (169.5000,17.6602) .. controls (169.4883,18.4219) and + (169.5000,25.1172) .. (169.5156,26.0820) .. controls (169.5430,27.6094) and + (169.6445,28.7773) .. (169.8047,29.9141) .. controls (170.0781,31.7578) and + (170.5664,33.3828) .. (171.2734,34.7383) .. controls (171.7344,35.6445) and + (172.2070,36.3359) .. (172.8867,37.1406) .. controls (173.0742,37.3594) and + (173.6758,37.9766) .. (173.9062,38.1641) .. controls (175.8359,39.8359) and + (178.2852,40.8008) .. (181.5234,41.1602) .. controls (182.8359,41.3164) and + (184.1758,41.3750) .. (186.3789,41.3750) .. controls (187.8594,41.3750) and + (188.7695,41.3477) .. (189.7344,41.2891) .. controls (193.7812,41.0430) and + (196.6172,40.0781) .. (198.8477,38.1641) .. controls (198.9219,38.0938) and + (199.1523,37.8750) .. (199.3398,37.6875) .. controls (200.7188,36.3086) and + (201.7578,34.5508) .. (202.3750,32.4922) .. controls (202.9102,30.7188) and + (203.1680,28.7773) .. (203.2266,26.0820) .. controls (203.2422,25.1172) and + (203.2539,18.4219) .. (203.2422,17.6602) .. controls (203.2109,16.6641) and + (203.1836,15.9609) .. (203.1250,15.1680) .. controls (202.8359,11.4961) and + (202.0469,8.6875) .. (200.5781,6.2266) .. controls (199.7539,4.8438) and + (198.8789,3.8477) .. (197.7266,2.9844) .. controls (196.6875,2.1914) and + (195.5234,1.6016) .. (194.1523,1.1406) .. controls (192.2812,0.5234) and + (190.2383,0.2070) .. (187.5586,0.1211) .. controls (186.9961,0.1055) and + (185.6875,0.1055) .. (185.1094,0.1211)(187.8477,5.3320) .. controls + (189.5898,5.4180) and (190.9297,5.6211) .. (192.0234,5.9805) .. controls + (193.0039,6.2969) and (193.7500,6.6992) .. (194.3711,7.2617) .. controls + (194.9883,7.8242) and (195.5781,8.6875) .. (196.1133,9.8828) .. controls + (196.8164,11.4805) and (197.2500,13.5273) .. (197.3945,16.0742) .. controls + (197.4805,17.4141) and (197.4805,18.1328) .. (197.4648,22.4531) .. controls + (197.4531,24.5430) and (197.4531,26.3867) .. (197.4375,26.5586) .. controls + (197.3789,27.9688) and (197.2773,28.8906) .. (197.1211,29.7969) .. controls + (196.8047,31.5391) and (196.1992,32.9219) .. (195.3047,33.9297) .. controls + (195.1484,34.1172) and (194.8164,34.4336) .. (194.6445,34.5781) .. controls + (193.5078,35.4844) and (191.8359,35.9609) .. (189.2852,36.1055) .. controls + (188.4805,36.1641) and (187.9766,36.1641) .. (186.3789,36.1641) .. controls + (184.7656,36.1641) and (184.2617,36.1641) .. (183.4688,36.1055) .. controls + (180.9062,35.9609) and (179.2344,35.4844) .. (178.0977,34.5781) .. controls + (177.9258,34.4336) and (177.5938,34.1172) .. (177.4375,33.9297) .. controls + (176.5430,32.9219) and (175.9375,31.5391) .. (175.6211,29.7969) .. controls + (175.4648,28.8906) and (175.3633,27.9688) .. (175.3047,26.5586) .. controls + (175.2891,26.3867) and (175.2891,24.5430) .. (175.2773,22.4531) .. controls + (175.2617,18.1328) and (175.2617,17.4141) .. (175.3477,16.0742) .. controls + (175.5352,12.6484) and (176.2266,10.2148) .. (177.5078,8.2695) .. controls + (177.9414,7.6367) and (178.3867,7.1758) .. (178.9922,6.7852) .. controls + (179.2656,6.6016) and (179.4102,6.5117) .. (179.7109,6.3711) .. controls + (180.5742,5.9531) and (181.7109,5.6484) .. (183.0391,5.4922) .. controls + (183.7734,5.3906) and (184.4766,5.3477) .. (185.5156,5.3164) .. controls + (185.8320,5.3047) and (187.5156,5.3164) .. (187.8477,5.3320); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (209.9062,0.1211) .. controls (208.9961,0.2188) and + (208.2070,0.6953) .. (207.7461,1.3867) .. controls (207.5703,1.6758) and + (207.4570,1.9492) .. (207.3867,2.2930) .. controls (207.3711,2.4219) and + (207.3711,3.1719) .. (207.3711,20.7266) .. controls (207.3711,35.5859) and + (207.3711,39.0586) .. (207.3867,39.1289) .. controls (207.4844,39.7188) and + (207.7461,40.1953) .. (208.1758,40.5820) .. controls (208.6094,40.9883) and + (209.1133,41.2305) .. (209.7305,41.3320) .. controls (209.8906,41.3594) and + (209.9609,41.3594) .. (210.2500,41.3594) .. controls (210.5234,41.3594) and + (210.5977,41.3594) .. (210.7695,41.3320) .. controls (211.5898,41.1875) and + (212.2656,40.7695) .. (212.6992,40.1367) .. controls (212.8867,39.8789) and + (213.0156,39.5742) .. (213.0859,39.2148) -- (213.1172,39.0703) -- + (213.1289,25.1055) -- (213.1445,11.1367) -- (221.8984,22.6992) -- + (230.6562,34.2461) -- (230.6562,36.6680) .. controls (230.6680,39.0586) and + (230.6680,39.0859) .. (230.6992,39.2148) .. controls (230.8125,39.7773) and + (231.0742,40.2109) .. (231.4766,40.5820) .. controls (231.9062,40.9883) and + (232.4102,41.2305) .. (233.0312,41.3320) .. controls (233.1914,41.3594) and + (233.2617,41.3594) .. (233.5508,41.3594) .. controls (233.8242,41.3594) and + (233.8945,41.3594) .. (234.0664,41.3320) .. controls (234.8906,41.1875) and + (235.5664,40.7695) .. (235.9961,40.1367) .. controls (236.1992,39.8477) and + (236.3281,39.5195) .. (236.4023,39.1289) .. controls (236.4141,39.0586) and + (236.4297,35.5859) .. (236.4297,20.7422) .. controls (236.4297,5.8945) and + (236.4141,2.4219) .. (236.4023,2.3359) .. controls (236.3008,1.7617) and + (236.0391,1.2852) .. (235.6094,0.8984) .. controls (235.1758,0.4922) and + (234.6719,0.2500) .. (234.0664,0.1484) .. controls (233.8945,0.1211) and + (233.8242,0.1211) .. (233.5508,0.1211) .. controls (233.2617,0.1211) and + (233.1914,0.1211) .. (233.0312,0.1484) .. controls (232.1953,0.2930) and + (231.5195,0.7109) .. (231.0859,1.3438) .. controls (230.8984,1.6016) and + (230.7695,1.9062) .. (230.6992,2.2656) -- (230.6680,2.3945) -- + (230.6562,13.7148) -- (230.6562,25.0312) -- (221.6133,13.0938) .. controls + (216.6289,6.5273) and (212.5391,1.1289) .. (212.5117,1.0859) .. controls + (212.4258,0.9961) and (212.1953,0.7812) .. (212.0781,0.6953) .. controls + (211.7031,0.4219) and (211.2578,0.2344) .. (210.7695,0.1484) .. controls + (210.5664,0.1211) and (210.1055,0.1055) .. (209.9062,0.1211); +\path[draw=black,line join=miter,line cap=butt,miter limit=4.00,line + width=0.160pt] (242.1992,0.7539) .. controls (241.6406,0.8125) and + (241.0508,1.0547) .. (240.6328,1.4023) .. controls (240.1289,1.7891) and + (239.8125,2.3086) .. (239.6797,2.9258) .. controls (239.6523,3.1016) and + (239.6523,3.5469) .. (239.6797,3.6914) .. controls (239.7812,4.2812) and + (240.0430,4.7578) .. (240.4727,5.1445) .. controls (240.9062,5.5469) and + (241.3789,5.7773) .. (242.0156,5.8945) -- (242.1875,5.9219) -- + (247.1836,5.9375) -- (252.1953,5.9375) -- (252.1953,22.5117) -- + (252.2109,39.0703) -- (252.2383,39.2148) .. controls (252.3516,39.7773) and + (252.6133,40.2109) .. (253.0156,40.5820) .. controls (253.4492,40.9883) and + (253.9531,41.2305) .. (254.5703,41.3320) .. controls (254.7305,41.3594) and + (254.8008,41.3594) .. (255.0898,41.3594) .. controls (255.3633,41.3594) and + (255.4336,41.3594) .. (255.6094,41.3320) .. controls (256.4297,41.1875) and + (257.1055,40.7695) .. (257.5352,40.1367) .. controls (257.7227,39.8789) and + (257.8555,39.5742) .. (257.9258,39.2148) -- (257.9531,39.0703) -- + (257.9688,22.5117) -- (257.9688,5.9375) -- (262.9805,5.9375) -- + (267.9922,5.9219) -- (268.1484,5.8945) .. controls (268.7852,5.7773) and + (269.2578,5.5469) .. (269.6914,5.1445) .. controls (270.1211,4.7578) and + (270.3828,4.2812) .. (270.4844,3.6914) .. controls (270.5117,3.5625) and + (270.5117,3.1133) .. (270.4844,2.9727) .. controls (270.3828,2.3945) and + (270.1211,1.9180) .. (269.6914,1.5312) .. controls (269.2578,1.1289) and + (268.7852,0.8984) .. (268.1484,0.7812) -- (267.9922,0.7539) -- + (255.1602,0.7383) .. controls (247.7891,0.7383) and (242.2734,0.7539) .. + (242.1992,0.7539); +\end{tikzpicture} +\end{center} +% +\section{Compiling The Sources} +% +Since version 2017/03/13, Fetamont contains more than 256 glyphs, but \MF{} is only capable of storing 256 glyphs. Therefor, \MF{} has been replaced by \MP{} for compilation. Additionally, a special base file called \verb|mf2outline.mp| has to be used. There is a Python script called \textffm{mf2outline} (\url{github.com/linusromer/mf2outline}) that can produce the necessary outline font formats. Store \verb|mf2outline.mp| and \verb|mf2outline.py| in the same place you can make outline fonts in your terminal with something like: \verb|./mf2outline.py --encoding=unicode ffmr10| +% +\section{The Fetamont Faces} +Fetamont comes in 36 different faces, including script faces and condensed faces. +\begin{center} +\begin{tikzpicture} + \draw (0,0) node[above right]{\fontspec[Scale=10.5]{ffml10.otf} \&}; + \draw (1.9,1.4) node[above right]{\fontspec[Scale=3.8]{ffmbco40.otf} AVANTI!}; + \draw (3,0) node[above right]{\fontspec[Scale=3.8]{ffmbc40.otf} ÎÎ»Î»Î¬Ï}; + \draw (0,-1.8) node[above right]{\fontspec[Scale=4.5]{ffmhw10.otf} Â¿Que?}; + \draw (1.35,-2.2) node[above right]{\fontspec[Scale=1.8]{ffmh10.otf} ÎŠ = 0.618}; + \draw (7.3,1.2) node[above right]{\fontspec[Scale=5.2]{ffmlw10.otf} Donald}; + \draw (6,1.2) node[below right,align=right]{\fontspec[Scale=3.2]{ffmlq10.otf} JE MEHR KÃSE, DESTO MEHR LÃCHER. \\[.7ex] \fontspec[Scale=3.2]{ffmlq10.otf} JE MEHR LÃCHER, DESTO WENIGER KÃSE.\\[.7ex] \fontspec[Scale=3.2]{ffmlq10.otf} ERGO: JE MEHR KÃSE, DESTO WENIGER KÃSE.}; +\end{tikzpicture} +\end{center} +% +The file name of every face begins with the prefix \verb|ffm|, which stands for Â«\emph{f}ree typeface \emph{f}eta\emph{m}ontÂ». The suffixes normally contain a symbol for the weight: \verb|l| for light, \verb|r| for regular, \verb|b| for bold and \verb|h| for heavy. The number at the end stands for the optical size (e.g. 10~pt). Depending on the face, the suffix is made of additional symbols: +\begin{center} +\begin{tabular}{|cccc|cccc|} + \hline + \multicolumn{4}{|c|}{Upright} & \multicolumn{4}{c|}{Oblique}\\\hline + & r8 & b8 & h8 & & o8 & bo8 & ho8\\ + & r9 & b9 & h9 & & o9 & bo9 & ho9\\ + l10 & r10 & b10 & h10 & lo10 & o10 & bo10 & ho10\\ + \hline + \multicolumn{4}{|c|}{Condensed Upright} & \multicolumn{4}{c|}{Condensed Oblique}\\\hline + lc10 & c10 & & & lco10 & co10 & & \\ + & & bc40 & & & & bco40 & \\ + \hline + \multicolumn{4}{|c|}{Ultracondensed Upright} & \multicolumn{4}{c|}{Ultracondensed Oblique}\\\hline + lq10 & & & & lqo10 & & & \\ + \hline + \multicolumn{4}{|c|}{Script Upright} & \multicolumn{4}{c|}{Script Oblique}\\\hline + lw10 & w10 & bw10 & hw10 & lwo10 & wo10 & bwo10 & hwo10\\\hline +\end{tabular} +\end{center} +The number of possible faces is theoretically endless. Anyone wishing to design +a new face for Fetamont can do so by just redefining the parameters of \verb|ffmr10.mf| , saving the file under a new name and compiling this file with \textffm{mf2outline}. +\section{Special Techniques} +% +Fetamont uses some special techniques. The following subsections will document these techniques. +% +\subsection{Arc Constructions} +% +Practically all curved paths in \emph{Fetamont} are made out of so-called \emph{arcs}. An arc is a kind of a quarter of a skewed superellipse. The skew is only needed if the arcs have to look randomized like in the script style of fetamont. +\begin{center} + \includegraphics{ffmconstructions-0.mps} + \hfill + \includegraphics{ffmconstructions-1.mps} +\end{center} +In order to draw such an arc, the user defines the starting points $z_i$, the starting direction $\mathrm{dir}_i$, the ending point $z_j$, the ending direction $\mathrm{dir}_j$ and a so-called \emph{superness}. The macro $\mathbf{arc}(z_i,\mathrm{dir}_i,z_j,\mathrm{dir}_j)$ then defines the path as follows: +\begin{itemize} + \item Compute the point $z_{ij}$, which is at $\mathrm{center}+\mathrm{superness}\cdot(\mathrm{corner}-\mathrm{center})$ in vector terms. So if e.g. $\mathrm{superness}=0.8$, $z_{ij}$ is reached after travelling 80~\% of the straight path from $\mathrm{corner}$ to $\mathrm{center}$. One can see easily, that $z_{ij}$ can also be computed by + \[ + z_{ij}=z_i+\mathrm{superness}\cdot(\mathrm{corner}-z_i)+(1-\mathrm{superness})\cdot(z_j-\mathrm{corner}) + \] + \item Now make a nice curve, that leaves $z_i$ in the direction $\mathrm{dir}_i$, passes $z_{ij}$ in the direction $z_j-z_i$ and ends in $z_j$ heading for the direction $\mathrm{dir}_j$. +\end{itemize} +% +Here is the \MF{} translation of this construction report: +% +\begin{verbatim} +vardef arc(expr zi,diri,zj,dirj) = + zi{diri}... + begingroup + save corner,zij; + pair corner,zij; + corner=zi+whatever*diri=zj+whatever*dirj; + zij=zi+superness*(corner-zi)+(1-superness)*(zj-corner); + zij + endgroup{zj-zi} + ...zj{dirj} +enddef; +\end{verbatim} +Everything in between \verb|begingroup| and \verb|endgroup| is just the computation of $z_{ij}$. + +Note that Donald E. Knuth used a little different approach to draw randomized arcs for his Â«crazy shapesÂ» of the Logo typeface. +% +\subsection{Combined Characters} +% +In order to draw accented and other combined characters, it is helpful to use \emph{anchors}. The concept of anchors is common in type design outside of the \textffm{METAFONT}/-\textffm{POST} world. However, anchors rarely have been seen in \textffm{METAFONT}/-\textffm{POST} up to now. + +The idea is easy: Put an anchor at a given point in a base glyph and in the accent glyph; then overlay the two glyphs such that the anchors coincide, producing the pre-composed accented character. +% +\begin{center} + \raisebox{-0.5\height}{\includegraphics{ffmconstructions-2.mps}} + $\quad + \quad$ + \raisebox{-0.5\height}{\includegraphics{ffmconstructions-3.mps}} + $\quad \Rightarrow \quad$ + \raisebox{-0.5\height}{\includegraphics{ffmconstructions-4.mps}} +\end{center} +Normally there are several kind of anchors needed. E.g. Â«ÃÂ» and Â«ÄÂ» need two different anchors and so do Â«Ä¹Â» and Â«ÄœÂ». Fetamont needs five kind of anchors: Â«topÂ», Â«toprightÂ», Â«botÂ» and Â«cedillaÂ». +% +\subsection{Italic Corrections} +Letter spacing is unproblematic if two upright letters are combined, like Â«\textffm{NN}Â». But if the first letter is italic, the letters will get too close (like Â«\textffm{{\itshape N}N}Â») and need additional space (like Â«\textffm{\textit{N}N}Â»). This additional space is called \emph{italic correction}. +\begin{center} + \includegraphics{ffmconstructions-5.mps} + \includegraphics{ffmconstructions-6.mps} + \includegraphics{ffmconstructions-7.mps} +\end{center} +D.~E.~Knuth has already defined an italic correction for the letter Â«TÂ», because this is the last letter of the logos \MF{} and \MP. As for the \emph{Computer Modern} typeface he found \verb|italcorr ht#*slant+.5u#| to be a suitable italic correction. However, this is not a perfect idea because the italic correction should tend to $0$ (and not \verb|.5u#|) when the slant tends to $0$. Hence, every character in Fetamont different to Â«TÂ» has an italic correction proportional to the slant and the letter height. E.g. the letter Â«AÂ» has an italic correction of \verb|.8ht#*slant|. +% +\subsection{Randomize Feature} +% +Normally, the randomization of the script faces has a fixed seed. However, for the OpenType versions of the script faces I have additionaly included five variants with random seeds. \hologo{LuaTeX} can access these variants via the Randomize feature. +\begin{center} +\begin{minipage}{.5\linewidth} +{\fontspec[Letters=Random]{Fetamont Script}\noindent \textbf{Eben schlieÃt in sanfter Ruh}\\ +LÃ€mpel seine Kirche zu;\\ Und mit Buch und Notenheften\\ +Nach besorgten AmtsgeschÃ€ften,\\ Lenkt er freudig seine Schritte\\ +Zu der heimatlichen HÃŒtte,\\ ZÃŒndet er sein Pfeifchen an.} +\end{minipage} +\end{center} +The text shown above is the product of the following source: +% +\begin{verbatim} +\documentclass[11pt]{article} +\usepackage{fontspec} +\setmainfont[Letters=Random]{Fetamont Script} +\begin{document} +\noindent \textbf{Eben schlieÃt in sanfter Ruh}\\ +LÃ€mpel seine Kirche zu;\\ Und mit Buch und Notenheften\\ +Nach besorgten AmtsgeschÃ€ften,\\ Lenkt er freudig seine Schritte\\ +Zu der heimatlichen HÃŒtte,\\ ZÃŒndet er sein Pfeifchen an. +\end{document} +\end{verbatim} +% +\begin{thebibliography}{Jackowski01} + \bibitem[Jackowski01]{jackowski01} + BogusÅaw Jackowski, Janusz M. Nowacki, and Piotr Strzelczyk. + \emph{\MT: A \MP-based engine for generating Type 1 fonts}. + \url{ntg.nl/eurotex/JackowskiMT.pdf}, 2001 + \bibitem[Romer17]{romer17} + Linus Romer. + \emph{The Fetamont Package}. + 2017 + \end{thebibliography} +\end{document} Binary files old/doc/fonts/fetamont/fetamont.pdf and new/doc/fonts/fetamont/fetamont.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fetamont.doc.tlpobj new/tlpkg/tlpobj/fetamont.doc.tlpobj --- old/tlpkg/tlpobj/fetamont.doc.tlpobj 2016-04-14 19:01:50.000000000 +0200 +++ new/tlpkg/tlpobj/fetamont.doc.tlpobj 2017-04-17 16:25:04.000000000 +0200 @@ -1,9 +1,10 @@ name fetamont.doc category Package -revision 38746 +revision 43812 shortdesc doc files of fetamont relocated 1 -docfiles size=396 +docfiles size=99 RELOC/doc/fonts/fetamont/README RELOC/doc/fonts/fetamont/fetamont-typeface.pdf + RELOC/doc/fonts/fetamont/fetamont-typeface.tex RELOC/doc/fonts/fetamont/fetamont.pdf ++++++ fetamont.tar.xz ++++++ ++++ 236768 lines of diff (skipped) ++++++ feupphdteses.doc.tar.xz ++++++ ++++++ feupphdteses.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/feupphdteses.tlpobj new/tlpkg/tlpobj/feupphdteses.tlpobj --- old/tlpkg/tlpobj/feupphdteses.tlpobj 2016-04-14 19:01:58.000000000 +0200 +++ new/tlpkg/tlpobj/feupphdteses.tlpobj 2017-04-14 17:40:21.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/latex/feupphdteses/feupphdteses.sty catalogue-ctan /macros/latex/contrib/feupphdteses -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 4.0 ++++++ feyn.doc.tar.xz ++++++ ++++++ feyn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/feyn.tlpobj new/tlpkg/tlpobj/feyn.tlpobj --- old/tlpkg/tlpobj/feyn.tlpobj 2016-04-14 19:01:58.000000000 +0200 +++ new/tlpkg/tlpobj/feyn.tlpobj 2017-04-14 17:40:22.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/fonts/tfm/public/feyn/feyntext24.tfm RELOC/tex/latex/feyn/feyn.sty catalogue-ctan /fonts/feyn -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-use physics catalogue-version 0.3.3 ++++++ feynmf.doc.tar.xz ++++++ ++++++ feynmf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/feynmf.tlpobj new/tlpkg/tlpobj/feynmf.tlpobj --- old/tlpkg/tlpobj/feynmf.tlpobj 2016-04-14 19:01:59.000000000 +0200 +++ new/tlpkg/tlpobj/feynmf.tlpobj 2017-04-14 17:40:22.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/feynmf/feynmf.sty RELOC/tex/latex/feynmf/feynmp.sty catalogue-ctan /macros/latex/contrib/feynmf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-use mp-use physics catalogue-version 1.08 ++++++ feynmp-auto.doc.tar.xz ++++++ ++++++ feynmp-auto.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/feynmp-auto.tlpobj new/tlpkg/tlpobj/feynmp-auto.tlpobj --- old/tlpkg/tlpobj/feynmp-auto.tlpobj 2016-04-14 19:01:59.000000000 +0200 +++ new/tlpkg/tlpobj/feynmp-auto.tlpobj 2017-04-14 17:40:22.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/feynmp-auto/feynmp-auto.sty catalogue-ctan /macros/latex/contrib/feynmp-auto -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-inline catalogue-version 1.1 ++++++ ffslides.doc.tar.xz ++++++ ++++++ ffslides.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ffslides.tlpobj new/tlpkg/tlpobj/ffslides.tlpobj --- old/tlpkg/tlpobj/ffslides.tlpobj 2016-04-14 19:02:00.000000000 +0200 +++ new/tlpkg/tlpobj/ffslides.tlpobj 2017-04-14 17:40:23.000000000 +0200 @@ -16,6 +16,6 @@ runfiles size=4 RELOC/tex/latex/ffslides/ffslides.cls catalogue-ctan /macros/latex/contrib/ffslides -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics presentation ++++++ fge.doc.tar.xz ++++++ ++++++ fge.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fge.tlpobj new/tlpkg/tlpobj/fge.tlpobj --- old/tlpkg/tlpobj/fge.tlpobj 2016-04-14 19:02:01.000000000 +0200 +++ new/tlpkg/tlpobj/fge.tlpobj 2017-04-14 17:40:23.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/latex/fge/fge.cfg RELOC/tex/latex/fge/fge.sty catalogue-ctan /fonts/fge -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-type1 maths catalogue-version 1.25 ++++++ fibeamer.doc.tar.xz ++++++ Binary files old/doc/latex/fibeamer/fibeamer.pdf and new/doc/latex/fibeamer/fibeamer.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/econ.pdf and new/doc/latex/fibeamer/guide/mu/econ.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/fi.pdf and new/doc/latex/fibeamer/guide/mu/fi.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/fsps.pdf and new/doc/latex/fibeamer/guide/mu/fsps.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/fss.pdf and new/doc/latex/fibeamer/guide/mu/fss.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/law.pdf and new/doc/latex/fibeamer/guide/mu/law.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/med.pdf and new/doc/latex/fibeamer/guide/mu/med.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/ped.pdf and new/doc/latex/fibeamer/guide/mu/ped.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/phil.pdf and new/doc/latex/fibeamer/guide/mu/phil.pdf differ Binary files old/doc/latex/fibeamer/guide/mu/sci.pdf and new/doc/latex/fibeamer/guide/mu/sci.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fibeamer.doc.tlpobj new/tlpkg/tlpobj/fibeamer.doc.tlpobj --- old/tlpkg/tlpobj/fibeamer.doc.tlpobj 2016-05-09 03:15:44.000000000 +0200 +++ new/tlpkg/tlpobj/fibeamer.doc.tlpobj 2017-05-08 02:08:24.000000000 +0200 @@ -1,9 +1,9 @@ name fibeamer.doc category Package -revision 40954 +revision 44239 shortdesc doc files of fibeamer relocated 1 -docfiles size=815 +docfiles size=806 RELOC/doc/latex/fibeamer/fibeamer.pdf RELOC/doc/latex/fibeamer/guide/mu/econ.pdf RELOC/doc/latex/fibeamer/guide/mu/fi.pdf ++++++ fibeamer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/beamerthemefibeamer.sty new/tex/latex/fibeamer/beamerthemefibeamer.sty --- old/tex/latex/fibeamer/beamerthemefibeamer.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/beamerthemefibeamer.sty 2017-05-07 23:23:06.000000000 +0200 @@ -6,7 +6,7 @@ %% %% fibeamer.dtx (with options: `class') %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -55,8 +55,10 @@ \gdef\fibeamer@version@number{#1} \gdef\fibeamer@version@date{#2} \gdef\fibeamer@version{#2 #1 fibeamer MU beamer theme}} -\fibeamer(a)versiondef{v1.1.4}{2016/05/07}} -\hypersetup{pdfcreator=\fibeamer@version} +\fibeamer(a)versiondef{v1.1.7}{2017/07/05}} +\hypersetup{% + pdfcreator=\fibeamer@version, + pdfencoding=auto} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesPackage{fibeamer/beamerthemefibeamer}[\fibeamer@version] @@ -139,8 +141,8 @@ logo=\fibeamer@logoPath fibeamer-\fibeamer@university-% \fibeamer@faculty-\fibeamer@logoLocale} \DeclareOptionBeamer{fallbackLogo}{\def\fibeamer@fallbackLogo{#1}} -\def\fibeamer@fallbackLogo{% - \fibeamer@logoPath fibeamer-\fibeamer@university-% +\ExecuteOptionsBeamer{% + fallbackLogo=\fibeamer@logoPath fibeamer-\fibeamer@university-% \fibeamer@faculty-english} \def\fibeamer(a)require#1{\IfFileExists{#1.sty}{% \@ifpackageloaded{#1}{}{\RequirePackage{#1}}}{}} @@ -209,9 +211,9 @@ \ifthenelse{\boolean{xetex}\OR\boolean{luatex}}{ \RequirePackage{fontspec} - \setmonofont[Scale=0.85,Ligatures=TeX]{DejaVu Sans Mono} + \setmonofont[Scale=0.85]{DejaVu Sans Mono} }{ - \usepackage[scaled=0.85]{DejaVuSansMono} + \RequirePackage[scaled=0.85]{DejaVuSansMono} \RequirePackage[resetfonts]{cmap} \RequirePackage[T1]{fontenc} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:51 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:18 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.789 38.423 m f q 0 87.161 179 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 59.98 35.113 m 59.98 33.301 61.105 32.043 62.82 32.043 c 64.535 32.043 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-econ-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:52 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:18 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.859 29.958 m f q 0 87.161 188 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 62.867 32.113 m 63.934 32.113 64.449 32.367 64.953 32.656 c 65.562 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:53 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:19 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -81,7 +81,7 @@ 59.145 38.423 m f q 0 87.161 134 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 69.73 32.113 m 70.941 32.113 71.578 32.906 71.59 34.047 c 71.637 39.262 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fi-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:54 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:19 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.84 29.959 m f q 0 87.162 143 -88 re W n -[ 1 0 0 1 0 -0.837898 ] concat +[ 1 0 0 1 0 -0.837906 ] concat q 1 g 62.848 32.113 m 63.918 32.113 64.434 32.367 64.938 32.652 c 65.547 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:54 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:19 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -81,7 +81,7 @@ 59.145 38.426 m f q 0 87.16 168 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 69.73 32.117 m 70.945 32.117 71.578 32.906 71.59 34.047 c 71.641 39.262 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fsps-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:55 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:19 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.844 29.957 m f q 0 87.16 137 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 62.852 32.117 m 63.918 32.117 64.434 32.367 64.938 32.656 c 65.547 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:56 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:20 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -81,7 +81,7 @@ 59.145 38.426 m f q 0 87.16 155 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 69.73 32.117 m 70.945 32.117 71.578 32.906 71.59 34.047 c 71.641 39.262 @@ -157,7 +157,7 @@ 126.426 23.945 m f 134.738 18.117 m 135.953 18.117 136.586 18.906 136.598 20.047 c 136.648 25.262 l 138.18 25.262 l 138.137 19.965 l 138.098 17.926 136.695 16.797 - 134.719 16.797 c 132.75 16.797 131.371 17.887 131.371 20.047 c 131.371 + 134.715 16.797 c 132.75 16.797 131.371 17.887 131.371 20.047 c 131.371 21.785 131.406 23.523 131.418 25.262 c 132.953 25.262 l 132.941 23.488 132.906 21.738 132.906 19.965 c 132.906 18.801 133.719 18.117 134.738 18.117 c f 142.594 18.281 m 144.391 18.281 145.605 19.312 145.605 21.176 c 145.605 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-fss-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:56 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:20 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.844 29.957 m f q 0 87.16 135 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 62.852 32.117 m 63.918 32.117 64.434 32.367 64.938 32.656 c 65.547 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:57 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:20 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -68,7 +68,7 @@ q 0 -1 134 89 rectclip q q 0 87.16 134 -88 re W n -[ 1 0 0 1 0 -0.839798 ] concat +[ 1 0 0 1 0 -0.839806 ] concat q 1 g 47.914 35.461 m 48.742 35.461 49.379 35.965 49.379 36.746 c 49.379 37.262 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-law-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:58 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:20 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.855 29.958 m f q 0 87.161 121 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 62.863 32.113 m 63.93 32.113 64.445 32.367 64.949 32.656 c 65.562 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:58 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:21 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -85,7 +85,7 @@ 66.039 29.957 m f q 0 87.16 134 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 75.836 35.535 m 76.277 35.535 77.203 35.727 77.203 36.816 c 77.203 37.621 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-med-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:00:59 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:21 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.855 29.957 m f q 0 87.16 121 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 62.867 32.113 m 63.934 32.113 64.449 32.367 64.953 32.656 c 65.562 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:00 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:21 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -68,7 +68,7 @@ q 0 -1 134 89 rectclip q q 0 87.161 134 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 47.918 35.461 m 48.746 35.461 49.379 35.965 49.379 36.742 c 49.379 37.262 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-ped-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:00 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:22 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.859 29.958 m f q 0 87.161 131 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 62.867 32.113 m 63.934 32.113 64.449 32.367 64.953 32.656 c 65.566 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:01 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:22 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -78,7 +78,7 @@ 59.887 30.126 m f q 0 87.161 134 -88 re W n -[ 1 0 0 1 0 -0.838898 ] concat +[ 1 0 0 1 0 -0.838905 ] concat q 1 g 61.98 35.113 m 61.98 33.301 63.109 32.043 64.824 32.043 c 66.539 32.043 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-phil-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:02 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:22 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.855 29.959 m f q 0 87.162 121 -88 re W n -[ 1 0 0 1 0 -0.837898 ] concat +[ 1 0 0 1 0 -0.837906 ] concat q 1 g 62.867 32.113 m 63.934 32.113 64.449 32.367 64.953 32.652 c 65.562 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-czech.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-czech.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-czech.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-czech.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:02 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:22 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -68,7 +68,7 @@ q 0 -1 150 89 rectclip q q 0 87.16 150 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 47.918 35.465 m 48.746 35.465 49.379 35.969 49.379 36.746 c 49.379 37.262 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-english.eps new/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-english.eps --- old/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-english.eps 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/logo/mu/fibeamer-mu-sci-english.eps 2017-05-07 23:23:06.000000000 +0200 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%Creator: cairo 1.14.6 (http://cairographics.org) -%%CreationDate: Sat May 7 20:01:03 2016 +%%Creator: cairo 1.14.8 (http://cairographics.org) +%%CreationDate: Sun May 7 09:54:23 2017 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 @@ -77,7 +77,7 @@ 51.859 29.957 m f q 0 87.16 121 -88 re W n -[ 1 0 0 1 0 -0.839897 ] concat +[ 1 0 0 1 0 -0.839905 ] concat q 1 g 62.867 32.113 m 63.934 32.113 64.449 32.367 64.953 32.656 c 65.562 31.598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-econ.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-econ.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-econ.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-econ.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% econ.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -80,7 +80,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightBrown} \setbeamercolor*{footnote mark}{fg=fibeamer@lightBrown} - \hypersetup{urlcolor=fibeamer@lightBrown} + \hypersetup{urlcolor=fibeamer@lightBrown, citecolor=fibeamer@lightBrown} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@brown!60!fibeamer@white} @@ -113,7 +113,7 @@ %% Items, footnotes and links \setbeamercolor{item}{fg=fibeamer@brown} \setbeamercolor{footnote mark}{fg=fibeamer@brown} - \hypersetup{urlcolor=fibeamer@brown} + \hypersetup{urlcolor=fibeamer@brown, citecolor=fibeamer@brown} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@brown} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fi.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fi.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fi.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fi.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% fi.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -52,16 +52,16 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fibeamer/theme/mu/% - beamercolorthemefibeamer-mu-fi}[2016/05/06] + beamercolorthemefibeamer-mu-fi}[2016/06/16] \mode<presentation> \definecolor{fibeamer@black}{HTML}{2B2E34} - \definecolor{fibeamer@white}{HTML}{FFFFFF} + \definecolor{fibeamer@white}{HTML}{F3EEE1} \definecolor{fibeamer@yellow}{HTML}{FFD564} \definecolor{fibeamer@orange}{HTML}{FF5500} \colorlet{fibeamer@lightGray}{white!80!fibeamer@black} \colorlet{fibeamer@gray}{white!35!fibeamer@black} \colorlet{fibeamer@darkGray}{white!20!fibeamer@black} - \colorlet{fibeamer@blue}{blue!60!fibeamer@lightGray} + \definecolor{fibeamer@blue}{HTML}{3333B3} \definecolor{fibeamer@lightRed}{HTML}{FF8E6B} \colorlet{fibeamer@darkRed}{red!80!fibeamer@white} %% Background gradients @@ -82,7 +82,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@yellow} \setbeamercolor*{footnote mark}{fg=fibeamer@yellow} - \hypersetup{urlcolor=fibeamer@yellow} + \hypersetup{urlcolor=fibeamer@yellow, citecolor=fibeamer@yellow} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@black, bg=fibeamer@yellow} @@ -102,7 +102,7 @@ }{% \endgroup} %% Structures - \setbeamercolor{frametitle}{fg=fibeamer@black} + \setbeamercolor{frametitle}{fg=fibeamer@blue} \setbeamercolor{framesubtitle}{fg=fibeamer@gray} %% Text \setbeamercolor{normal text}{fg=fibeamer@black, bg=fibeamer@white} @@ -113,9 +113,9 @@ \setbeamercolor{alerted text}{fg=fibeamer@darkRed} \fi}{} %% Items and links - \setbeamercolor{item}{fg=fibeamer@gray} - \setbeamercolor{footnote mark}{fg=fibeamer@gray} - \hypersetup{urlcolor=fibeamer@blue} + \setbeamercolor{item}{fg=fibeamer@blue} + \setbeamercolor{footnote mark}{fg=fibeamer@blue} + \hypersetup{urlcolor=fibeamer@blue, citecolor=fibeamer@blue} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@black, bg=fibeamer@yellow} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fsps.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fsps.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fsps.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fsps.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% fsps.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -81,7 +81,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightBlue} \setbeamercolor*{footnote mark}{fg=fibeamer@lightBlue} - \hypersetup{urlcolor=fibeamer@lightBlue} + \hypersetup{urlcolor=fibeamer@lightBlue, citecolor=fibeamer@lightBlue} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@blue!60!fibeamer@white} @@ -114,7 +114,7 @@ %% Items, footnotes and links \setbeamercolor{item}{fg=fibeamer@blue} \setbeamercolor{footnote mark}{fg=fibeamer@blue} - \hypersetup{urlcolor=fibeamer@blue} + \hypersetup{urlcolor=fibeamer@blue, citecolor=fibeamer@blue} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@blue} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fss.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fss.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fss.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-fss.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% fss.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -80,7 +80,7 @@ %% Items, footnotes and links \setbeamercolor{item}{fg=fibeamer@lightCyan} \setbeamercolor{footnote mark}{fg=fibeamer@lightCyan} - \hypersetup{urlcolor=fibeamer@lightCyan} + \hypersetup{urlcolor=fibeamer@lightCyan, citecolor=fibeamer@lightCyan} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@cyan!60!fibeamer@white} @@ -113,7 +113,7 @@ %% Items, footnotes and links \setbeamercolor{item}{fg=fibeamer@cyan} \setbeamercolor{footnote mark}{fg=fibeamer@cyan} - \hypersetup{urlcolor=fibeamer@cyan} + \hypersetup{urlcolor=fibeamer@cyan, citecolor=fibeamer@cyan} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@cyan} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-law.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-law.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-law.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-law.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% law.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -80,7 +80,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightViolet} \setbeamercolor*{footnote mark}{fg=fibeamer@lightViolet} - \hypersetup{urlcolor=fibeamer@lightViolet} + \hypersetup{urlcolor=fibeamer@lightViolet, citecolor=fibeamer@lightViolet} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@violet!60!fibeamer@white} @@ -113,7 +113,7 @@ %% Items, footnotes and links \setbeamercolor{item}{fg=fibeamer@violet} \setbeamercolor{footnote mark}{fg=fibeamer@violet} - \hypersetup{urlcolor=fibeamer@violet} + \hypersetup{urlcolor=fibeamer@violet, citecolor=fibeamer@violet} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@violet} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-med.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-med.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-med.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-med.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% med.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -80,7 +80,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightRed} \setbeamercolor*{footnote mark}{fg=fibeamer@lightRed} - \hypersetup{urlcolor=fibeamer@lightRed} + \hypersetup{urlcolor=fibeamer@lightRed, citecolor=fibeamer@lightRed} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@red!60!fibeamer@white} @@ -113,7 +113,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@red} \setbeamercolor*{footnote mark}{fg=fibeamer@red} - \hypersetup{urlcolor=fibeamer@red} + \hypersetup{urlcolor=fibeamer@red, citecolor=fibeamer@red} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@red} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-ped.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-ped.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-ped.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-ped.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% ped.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -82,7 +82,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightOrange} \setbeamercolor*{footnote mark}{fg=fibeamer@lightOrange} - \hypersetup{urlcolor=fibeamer@lightOrange} + \hypersetup{urlcolor=fibeamer@lightOrange, citecolor=fibeamer@lightOrange} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@black, bg=fibeamer@lightOrange} @@ -115,7 +115,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@orange} \setbeamercolor*{footnote mark}{fg=fibeamer@orange} - \hypersetup{urlcolor=fibeamer@blue} + \hypersetup{urlcolor=fibeamer@blue, citecolor=fibeamer@blue} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@black, bg=fibeamer@lightOrange} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-phil.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-phil.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-phil.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-phil.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% phil.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -80,7 +80,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightBlue} \setbeamercolor*{footnote mark}{fg=fibeamer@lightBlue} - \hypersetup{urlcolor=fibeamer@lightBlue} + \hypersetup{urlcolor=fibeamer@lightBlue, citecolor=fibeamer@lightBlue} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@blue!60!fibeamer@white} @@ -113,7 +113,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@blue} \setbeamercolor*{footnote mark}{fg=fibeamer@blue} - \hypersetup{urlcolor=fibeamer@blue} + \hypersetup{urlcolor=fibeamer@blue, citecolor=fibeamer@blue} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@blue} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-sci.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-sci.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-sci.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu-sci.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% sci.dtx %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -81,7 +81,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@lightGreen} \setbeamercolor*{footnote mark}{fg=fibeamer@lightGreen} - \hypersetup{urlcolor=fibeamer@lightGreen} + \hypersetup{urlcolor=fibeamer@lightGreen, citecolor=fibeamer@lightGreen} %% Blocks \setbeamercolor*{block title}{% fg=fibeamer@white, bg=fibeamer@green!60!fibeamer@white} @@ -114,7 +114,7 @@ %% Items, footnotes and links \setbeamercolor*{item}{fg=fibeamer@green} \setbeamercolor*{footnote mark}{fg=fibeamer@green} - \hypersetup{urlcolor=fibeamer@green} + \hypersetup{urlcolor=fibeamer@green, citecolor=fibeamer@green} %% Blocks \setbeamercolor{block title}{% fg=fibeamer@white, bg=fibeamer@green} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu.sty new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu.sty --- old/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamercolorthemefibeamer-mu.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `color') %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamerfontthemefibeamer-mu.sty new/tex/latex/fibeamer/theme/mu/beamerfontthemefibeamer-mu.sty --- old/tex/latex/fibeamer/theme/mu/beamerfontthemefibeamer-mu.sty 2016-01-15 00:37:42.000000000 +0100 +++ new/tex/latex/fibeamer/theme/mu/beamerfontthemefibeamer-mu.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `font') %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamerinnerthemefibeamer-mu.sty new/tex/latex/fibeamer/theme/mu/beamerinnerthemefibeamer-mu.sty --- old/tex/latex/fibeamer/theme/mu/beamerinnerthemefibeamer-mu.sty 2016-01-19 00:36:59.000000000 +0100 +++ new/tex/latex/fibeamer/theme/mu/beamerinnerthemefibeamer-mu.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `inner') %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fibeamer/theme/mu/beamerouterthemefibeamer-mu.sty new/tex/latex/fibeamer/theme/mu/beamerouterthemefibeamer-mu.sty --- old/tex/latex/fibeamer/theme/mu/beamerouterthemefibeamer-mu.sty 2016-05-09 00:28:47.000000000 +0200 +++ new/tex/latex/fibeamer/theme/mu/beamerouterthemefibeamer-mu.sty 2017-04-27 23:35:42.000000000 +0200 @@ -6,7 +6,7 @@ %% %% base.dtx (with options: `outer') %% -%% Copyright 2015 VÃt NovotnÃœ <witiko(a)mail.muni.cz> +%% Copyright 2016-2017 VÃt NovotnÃœ <witiko(a)mail.muni.cz> %% Faculty of Informatics, Masaryk University (Brno, Czech Republic) %% %% This work is based on the (Unofficial) University of Manchester @@ -122,6 +122,8 @@ \end{tikzpicture} \fi} \defbeamertemplate*{title page}{fibeamer}{% + \begin{darkframes} + % This is slide 0 \setcounter{framenumber}{0} @@ -173,7 +175,8 @@ \begin{minipage}{\textwidth} \raggedright% \insertauthor% - \end{minipage}} + \end{minipage} + \end{darkframes}} \mode <all> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fibeamer.tlpobj new/tlpkg/tlpobj/fibeamer.tlpobj --- old/tlpkg/tlpobj/fibeamer.tlpobj 2016-05-09 03:15:45.000000000 +0200 +++ new/tlpkg/tlpobj/fibeamer.tlpobj 2017-05-08 02:08:25.000000000 +0200 @@ -1,6 +1,6 @@ name fibeamer category Package -revision 40954 +revision 44239 shortdesc Beamer theme for thesis defense presentations at Masaryk University (Brno, Czech Republic) relocated 1 longdesc A beamer theme for the typesetting of thesis defense @@ -59,7 +59,7 @@ RELOC/tex/latex/fibeamer/theme/mu/beamerinnerthemefibeamer-mu.sty RELOC/tex/latex/fibeamer/theme/mu/beamerouterthemefibeamer-mu.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/fibeamer -catalogue-date 2016-05-08 20:36:04 +0200 +catalogue-date 2017-05-07 13:42:49 +0200 catalogue-license lppl1.3 catalogue-topics dissertation presentation -catalogue-version 1.1.4 +catalogue-version 1.1.7 ++++++ fifinddo-info.doc.tar.xz ++++++ ++++++ fifo-stack.doc.tar.xz ++++++ ++++++ fifo-stack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fifo-stack.tlpobj new/tlpkg/tlpobj/fifo-stack.tlpobj --- old/tlpkg/tlpobj/fifo-stack.tlpobj 2016-04-14 19:02:04.000000000 +0200 +++ new/tlpkg/tlpobj/fifo-stack.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/fifo-stack/fifo-stack.sty catalogue-ctan /macros/latex/contrib/fifo-stack -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.0 ++++++ fig4latex.doc.tar.xz ++++++ ++++++ fig4latex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fig4latex.tlpobj new/tlpkg/tlpobj/fig4latex.tlpobj --- old/tlpkg/tlpobj/fig4latex.tlpobj 2016-04-14 19:02:05.000000000 +0200 +++ new/tlpkg/tlpobj/fig4latex.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 texmf-dist/scripts/fig4latex/fig4latex catalogue-ctan /graphics/fig4latex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics graphics-incl catalogue-version 0.2 ++++++ figbas.doc.tar.xz ++++++ ++++++ figbas.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/figbas.tlpobj new/tlpkg/tlpobj/figbas.tlpobj --- old/tlpkg/tlpobj/figbas.tlpobj 2016-04-14 19:02:05.000000000 +0200 +++ new/tlpkg/tlpobj/figbas.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/fonts/type1/public/figbas/cmssj.pfb RELOC/fonts/type1/public/figbas/plrj.pfb catalogue-ctan /fonts/figbas -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics music catalogue-version 1.0.3 ++++++ figbib.doc.tar.xz ++++++ ++++++ figbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/figbib.tlpobj new/tlpkg/tlpobj/figbib.tlpobj --- old/tlpkg/tlpobj/figbib.tlpobj 2016-04-14 19:02:05.000000000 +0200 +++ new/tlpkg/tlpobj/figbib.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -15,6 +15,6 @@ RELOC/bibtex/bst/figbib/figbib1.bst RELOC/tex/latex/figbib/figbib.sty catalogue-ctan /macros/latex/contrib/figbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-util ++++++ figflow.doc.tar.xz ++++++ ++++++ figflow.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/figflow.tlpobj new/tlpkg/tlpobj/figflow.tlpobj --- old/tlpkg/tlpobj/figflow.tlpobj 2016-04-14 19:02:05.000000000 +0200 +++ new/tlpkg/tlpobj/figflow.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=1 RELOC/tex/plain/figflow/figflow.tex catalogue-ctan /macros/plain/contrib/figflow -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics text-flow ++++++ figsize.doc.tar.xz ++++++ ++++++ figsize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/figsize.tlpobj new/tlpkg/tlpobj/figsize.tlpobj --- old/tlpkg/tlpobj/figsize.tlpobj 2016-04-14 19:02:05.000000000 +0200 +++ new/tlpkg/tlpobj/figsize.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=1 RELOC/tex/latex/figsize/figsize.sty catalogue-ctan /macros/latex/contrib/figsize -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics catalogue-version 0.1 ++++++ filecontents.doc.tar.xz ++++++ ++++++ filecontents.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filecontents.tlpobj new/tlpkg/tlpobj/filecontents.tlpobj --- old/tlpkg/tlpobj/filecontents.tlpobj 2016-04-14 19:02:06.000000000 +0200 +++ new/tlpkg/tlpobj/filecontents.tlpobj 2017-04-14 17:40:25.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/filecontents/filecontents.sty catalogue-ctan /macros/latex/contrib/filecontents -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics file-mgmt catalogue-version 1.3 ++++++ filedate.doc.tar.xz ++++++ ++++++ filedate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filedate.tlpobj new/tlpkg/tlpobj/filedate.tlpobj --- old/tlpkg/tlpobj/filedate.tlpobj 2016-04-14 19:02:06.000000000 +0200 +++ new/tlpkg/tlpobj/filedate.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/filedate/filedate.RLS RELOC/tex/latex/filedate/filedate.sty catalogue-ctan /macros/latex/contrib/filedate -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics file-mgmt date-time ++++++ filehook.doc.tar.xz ++++++ ++++++ filehook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filehook.tlpobj new/tlpkg/tlpobj/filehook.tlpobj --- old/tlpkg/tlpobj/filehook.tlpobj 2016-04-14 19:02:06.000000000 +0200 +++ new/tlpkg/tlpobj/filehook.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/filehook/filehook.sty RELOC/tex/latex/filehook/pgf-filehook.sty catalogue-ctan /macros/latex/contrib/filehook -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.5d ++++++ fileinfo.doc.tar.xz ++++++ ++++++ fileinfo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fileinfo.tlpobj new/tlpkg/tlpobj/fileinfo.tlpobj --- old/tlpkg/tlpobj/fileinfo.tlpobj 2016-04-14 19:02:07.000000000 +0200 +++ new/tlpkg/tlpobj/fileinfo.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/fileinfo/myfilist.sty RELOC/tex/latex/fileinfo/readprov.sty catalogue-ctan /macros/latex/contrib/fileinfo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-mgmt catalogue-version 0.81a ++++++ filemod.doc.tar.xz ++++++ ++++++ filemod.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filemod.tlpobj new/tlpkg/tlpobj/filemod.tlpobj --- old/tlpkg/tlpobj/filemod.tlpobj 2016-04-14 19:02:07.000000000 +0200 +++ new/tlpkg/tlpobj/filemod.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/filemod/filemod.sty catalogue-also stampinclude catalogue-ctan /macros/latex/contrib/filemod -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-tool catalogue-version 1.2 ++++++ finbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/finbib.tlpobj new/tlpkg/tlpobj/finbib.tlpobj --- old/tlpkg/tlpobj/finbib.tlpobj 2016-04-14 19:02:07.000000000 +0200 +++ new/tlpkg/tlpobj/finbib.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=7 RELOC/bibtex/bst/finbib/finplain.bst catalogue-ctan /biblio/bibtex/contrib/misc/finplain.bst -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license other-free catalogue-topics bibtex-sty finnish ++++++ findhyph.doc.tar.xz ++++++ ++++++ findhyph.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/findhyph.tlpobj new/tlpkg/tlpobj/findhyph.tlpobj --- old/tlpkg/tlpobj/findhyph.tlpobj 2016-04-14 19:02:08.000000000 +0200 +++ new/tlpkg/tlpobj/findhyph.tlpobj 2017-04-14 17:40:26.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 texmf-dist/scripts/findhyph/findhyph catalogue-ctan /support/findhyph -catalogue-date 2015-10-19 21:00:36 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics hyph-gen catalogue-version 3.4 ++++++ fink.doc.tar.xz ++++++ ++++++ fink.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fink.tlpobj new/tlpkg/tlpobj/fink.tlpobj --- old/tlpkg/tlpobj/fink.tlpobj 2016-04-14 19:02:08.000000000 +0200 +++ new/tlpkg/tlpobj/fink.tlpobj 2017-04-14 17:40:27.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/fink/fink.sty catalogue-also currfile catalogue-ctan /macros/latex/contrib/fink -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-tool catalogue-version 2.2.1 ++++++ finstrut.doc.tar.xz ++++++ ++++++ finstrut.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/finstrut.tlpobj new/tlpkg/tlpobj/finstrut.tlpobj --- old/tlpkg/tlpobj/finstrut.tlpobj 2016-04-14 19:02:08.000000000 +0200 +++ new/tlpkg/tlpobj/finstrut.tlpobj 2017-04-14 17:40:27.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/finstrut/finstrut.sty catalogue-ctan /macros/latex/contrib/finstrut -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.5 ++++++ fira.doc.tar.xz ++++++ Binary files old/doc/fonts/fira/Fira_4_1_Version_Report.pdf and new/doc/fonts/fira/Fira_4_1_Version_Report.pdf differ Binary files old/doc/fonts/fira/Fira_4_2_Version_Log.pdf and new/doc/fonts/fira/Fira_4_2_Version_Log.pdf differ Binary files old/doc/fonts/fira/Fira_Sans_font_specimen.png and new/doc/fonts/fira/Fira_Sans_font_specimen.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fira/README new/doc/fonts/fira/README --- old/doc/fonts/fira/README 2016-02-15 23:12:15.000000000 +0100 +++ new/doc/fonts/fira/README 2016-11-25 19:27:28.000000000 +0100 @@ -1,4 +1,4 @@ -This is the README for the fira package, version 4.1-2016-02-13. +This is the README for the fira package, version 4.2-2016-11-12. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Fira Sans family of fonts (version 4.1) @@ -34,13 +34,13 @@ \usepackage{FiraMono} -to activate Fira Mono as the monospaced text font. +to activate Fira Mono as the monospaced text font. The nomap +option will suppress the tex-text mapping of TeX "smart +quotes" and other ligatures into unicode glyphs for xeLaTeX +and luaLaTeX. LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish to avoid fontspec may use the type1 option. -The nomap option will suppress the tex-text mapping -of TeX "smart quotes" and other ligatures into unicode -glyphs for xeLaTeX and luaLaTeX. Options scaled=<number> or scale=<number> may be used to scale the fonts. @@ -68,11 +68,7 @@ The original OpenType fonts were obtained from -http://www.carrois.com/en/fira-4-0/ - -and - -http://www.carrois.com/en/fira-3-1/ +https://github.com/carrois/Fira and are licensed under the SIL Open Font License, version 1.1; the text may be found in the doc directory. The Binary files old/doc/fonts/fira/TechnicalReportFiraSans4203.pdf and new/doc/fonts/fira/TechnicalReportFiraSans4203.pdf differ Binary files old/doc/fonts/fira/fira-samples.pdf and new/doc/fonts/fira/fira-samples.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fira/fira-samples.tex new/doc/fonts/fira/fira-samples.tex --- old/doc/fonts/fira/fira-samples.tex 2015-05-11 23:02:03.000000000 +0200 +++ new/doc/fonts/fira/fira-samples.tex 2016-11-25 19:27:28.000000000 +0100 @@ -1,7 +1,7 @@ \documentclass{article} \usepackage[T1]{fontenc} \usepackage[sfdefault]{FiraSans} -\usepackage{FiraMono} +\usepackage[nomap]{FiraMono} \usepackage{lipsum} \begin{document} @@ -101,13 +101,22 @@ X{\sufigures 1234567890} +\subsection*{Ligatures} + + +Officially broken off. Often offline, find me flowerless. + \section*{Fira Mono} \ttfamily + +'a' \quad "a" \quad `a' \quad ``a'' + \subsection*{Regular} \lipsum[1] + \subsection*{Bold} \ttfamily diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fira.doc.tlpobj new/tlpkg/tlpobj/fira.doc.tlpobj --- old/tlpkg/tlpobj/fira.doc.tlpobj 2016-04-14 19:02:08.000000000 +0200 +++ new/tlpkg/tlpobj/fira.doc.tlpobj 2017-04-14 17:40:27.000000000 +0200 @@ -1,12 +1,12 @@ name fira.doc category Package -revision 39731 +revision 42501 shortdesc doc files of fira relocated 1 -docfiles size=54 - RELOC/doc/fonts/fira/Fira_4_1_Version_Report.pdf - RELOC/doc/fonts/fira/Fira_Sans_font_specimen.png +docfiles size=207 + RELOC/doc/fonts/fira/Fira_4_2_Version_Log.pdf RELOC/doc/fonts/fira/LICENSE RELOC/doc/fonts/fira/README + RELOC/doc/fonts/fira/TechnicalReportFiraSans4203.pdf RELOC/doc/fonts/fira/fira-samples.pdf RELOC/doc/fonts/fira/fira-samples.tex ++++++ fira.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-i/fira.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-i.new/fira.tar.xz differ: char 26, line 1 ++++++ first-latex-doc.doc.tar.xz ++++++ ++++++ fitbox.doc.tar.xz ++++++ ++++++ fitbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fitbox.tlpobj new/tlpkg/tlpobj/fitbox.tlpobj --- old/tlpkg/tlpobj/fitbox.tlpobj 2016-04-14 19:02:31.000000000 +0200 +++ new/tlpkg/tlpobj/fitbox.tlpobj 2017-04-14 17:40:40.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/fitbox/fitbox.sty catalogue-ctan /macros/latex/contrib/fitbox -catalogue-date 2015-08-19 06:05:44 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics boxing catalogue-version 1.00 ++++++ fithesis.doc.tar.xz ++++++ Binary files old/doc/latex/fithesis/fithesis.pdf and new/doc/latex/fithesis/fithesis.pdf differ Binary files old/doc/latex/fithesis/guide/mu/econ.pdf and new/doc/latex/fithesis/guide/mu/econ.pdf differ Binary files old/doc/latex/fithesis/guide/mu/fi.pdf and new/doc/latex/fithesis/guide/mu/fi.pdf differ Binary files old/doc/latex/fithesis/guide/mu/fsps.pdf and new/doc/latex/fithesis/guide/mu/fsps.pdf differ Binary files old/doc/latex/fithesis/guide/mu/fss.pdf and new/doc/latex/fithesis/guide/mu/fss.pdf differ Binary files old/doc/latex/fithesis/guide/mu/law.pdf and new/doc/latex/fithesis/guide/mu/law.pdf differ Binary files old/doc/latex/fithesis/guide/mu/med.pdf and new/doc/latex/fithesis/guide/mu/med.pdf differ Binary files old/doc/latex/fithesis/guide/mu/ped.pdf and new/doc/latex/fithesis/guide/mu/ped.pdf differ Binary files old/doc/latex/fithesis/guide/mu/phil.pdf and new/doc/latex/fithesis/guide/mu/phil.pdf differ Binary files old/doc/latex/fithesis/guide/mu/sci.pdf and new/doc/latex/fithesis/guide/mu/sci.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fithesis.doc.tlpobj new/tlpkg/tlpobj/fithesis.doc.tlpobj --- old/tlpkg/tlpobj/fithesis.doc.tlpobj 2016-06-07 17:33:49.000000000 +0200 +++ new/tlpkg/tlpobj/fithesis.doc.tlpobj 2017-06-06 02:21:53.000000000 +0200 @@ -1,9 +1,9 @@ name fithesis.doc category Package -revision 41303 +revision 44472 shortdesc doc files of fithesis relocated 1 -docfiles size=984 +docfiles size=1001 RELOC/doc/latex/fithesis/fithesis.pdf RELOC/doc/latex/fithesis/guide/mu/econ.pdf RELOC/doc/latex/fithesis/guide/mu/fi.pdf ++++++ fithesis.tar.xz ++++++ ++++ 4311 lines of diff (skipped) ++++++ fix2col.doc.tar.xz ++++++ ++++++ fix2col.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fix2col.tlpobj new/tlpkg/tlpobj/fix2col.tlpobj --- old/tlpkg/tlpobj/fix2col.tlpobj 2016-04-14 19:02:39.000000000 +0200 +++ new/tlpkg/tlpobj/fix2col.tlpobj 2017-04-14 17:40:42.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/latex/fix2col/fix2col.sty catalogue-ctan /macros/latex/contrib/fix2col -catalogue-date 2015-11-04 07:05:06 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting macro-supp catalogue-version 0.04 ++++++ fixcmex.doc.tar.xz ++++++ ++++++ fixcmex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixcmex.tlpobj new/tlpkg/tlpobj/fixcmex.tlpobj --- old/tlpkg/tlpobj/fixcmex.tlpobj 2016-04-14 19:02:39.000000000 +0200 +++ new/tlpkg/tlpobj/fixcmex.tlpobj 2017-04-14 17:40:42.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/fixcmex/fixcmex.sty catalogue-ctan /macros/latex/contrib/fixcmex -catalogue-date 2015-11-18 06:11:07 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp-maths catalogue-version 1.0 ++++++ fixfoot.doc.tar.xz ++++++ ++++++ fixfoot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixfoot.tlpobj new/tlpkg/tlpobj/fixfoot.tlpobj --- old/tlpkg/tlpobj/fixfoot.tlpobj 2016-04-14 19:02:39.000000000 +0200 +++ new/tlpkg/tlpobj/fixfoot.tlpobj 2017-04-14 17:40:42.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/fixfoot/fixfoot.sty catalogue-also savefnmark catalogue-ctan /macros/latex/contrib/fixfoot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics footnote catalogue-version 0.3a ++++++ fixlatvian.doc.tar.xz ++++++ ++++++ fixlatvian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixlatvian.tlpobj new/tlpkg/tlpobj/fixlatvian.tlpobj --- old/tlpkg/tlpobj/fixlatvian.tlpobj 2016-04-14 19:02:39.000000000 +0200 +++ new/tlpkg/tlpobj/fixlatvian.tlpobj 2017-04-14 17:40:42.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/makeindex/fixlatvian/lv.ist RELOC/tex/xelatex/fixlatvian/fixlatvian.sty catalogue-ctan /macros/xetex/latex/fixlatvian -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-addon catalogue-version 1a

1 0

commit texlive-specs-h 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-h for openSUSE:Factory checked in at 2017-06-25 19:21:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-h (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-h.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-h" Sun Jun 25 19:21:50 2017 rev:26 rq:504798 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.changes 2017-06-08 14:54:39.409699463 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-h.new/texlive-specs-h.changes 2017-06-25 19:25:25.900311220 +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: ---- eqnarray.doc.tar.xz eqnarray.tar.xz eqparbox.doc.tar.xz eqparbox.tar.xz erdc.doc.tar.xz erdc.tar.xz erewhon.doc.tar.xz erewhon.tar.xz errata.doc.tar.xz errata.tar.xz es-tex-faq.doc.tar.xz esami.doc.tar.xz esami.tar.xz esdiff.doc.tar.xz esdiff.tar.xz esint-type1.doc.tar.xz esint-type1.tar.xz esint.doc.tar.xz esint.tar.xz esk.doc.tar.xz esk.tar.xz eskd.doc.tar.xz eskd.tar.xz eskdx.doc.tar.xz eskdx.tar.xz eso-pic.doc.tar.xz eso-pic.tar.xz esrelation.doc.tar.xz esrelation.tar.xz esstix.doc.tar.xz esstix.tar.xz estcpmm.doc.tar.xz estcpmm.tar.xz esvect.doc.tar.xz esvect.tar.xz etaremune.doc.tar.xz etaremune.tar.xz etdipa.doc.tar.xz etex-pkg.doc.tar.xz etex-pkg.tar.xz etex.doc.tar.xz etex.tar.xz etextools.doc.tar.xz etextools.tar.xz ethiop-t1.doc.tar.xz ethiop-t1.tar.xz ethiop.doc.tar.xz ethiop.tar.xz etoc.doc.tar.xz etoc.tar.xz etoolbox-de.doc.tar.xz etoolbox.doc.tar.xz etoolbox.tar.xz euenc.doc.tar.xz euenc.tar.xz New: ---- dtxdescribe.doc.tar.xz dtxdescribe.tar.xz dtxgallery.doc.tar.xz dtxgallery.source.tar.xz dtxgen.doc.tar.xz dtxgen.tar.xz dtxtut.doc.tar.xz duerer-latex.doc.tar.xz duerer-latex.tar.xz duerer.doc.tar.xz duerer.tar.xz duotenzor.doc.tar.xz duotenzor.tar.xz dutchcal.doc.tar.xz dutchcal.tar.xz dvdcoll.doc.tar.xz dvdcoll.tar.xz dvgloss.doc.tar.xz dvgloss.tar.xz dviasm.doc.tar.xz dviasm.tar.xz dvicopy.doc.tar.xz dvidvi.doc.tar.xz dviincl.doc.tar.xz dviincl.tar.xz dviinfox.doc.tar.xz dviinfox.tar.xz dviljk.doc.tar.xz dvipdfmx.doc.tar.xz dvipdfmx.tar.xz dvipng.doc.tar.xz dvipos.doc.tar.xz dvips.doc.tar.xz dvips.tar.xz dvips_config.dif dvipsconfig.tar.xz dvisvgm.doc.tar.xz dynamicnumber.doc.tar.xz dynamicnumber.tar.xz dynblocks.doc.tar.xz dynblocks.tar.xz dyntree.doc.tar.xz dyntree.tar.xz e-french.doc.tar.xz e-french.tar.xz ean.doc.tar.xz ean.tar.xz ean13isbn.doc.tar.xz ean13isbn.tar.xz easy.doc.tar.xz easy.tar.xz easyformat.doc.tar.xz easyformat.tar.xz ecgdraw.doc.tar.xz ecgdraw.tar.xz emf.doc.tar.xz emf.tar.xz eqnalign.doc.tar.xz eqnalign.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-h.spec ++++++ ++++ 33104 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-h.new/texlive-specs-h.spec ++++++ dvips_config.dif ++++++ --- texmf-dist/dvips/config/config.ps +++ texmf-dist/dvips/config/config.ps 2015-03-30 07:16:30.017519469 +0000 @@ -46,7 +46,9 @@ Z0 % Partially download Type 1 fonts by default. Only reason not to do % this is if you encounter bugs. (Please report them to % @email{tex-k@tug.org} if you do.) -j +% Change for SUSE: The option j *does* trouble if a embedded eps file +% uses the same font but includes other characters as well (boo#897284). +j0 % This shows how to add your own map file. % Remove the comment and adjust the name: ++++++ erewhon.doc.tar.xz -> ean.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/FontLog.txt new/doc/fonts/erewhon/FontLog.txt --- old/doc/fonts/erewhon/FontLog.txt 2014-09-30 02:08:26.000000000 +0200 +++ new/doc/fonts/erewhon/FontLog.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,176 +0,0 @@ -These fonts are based on Utopia font which was released by Adobe for TeX -users group with following license: - -Adobe Systems Incorporated ("Adobe") hereby grants to the TeX Users -Group and its members a nonexclusive, royalty-free, perpetual license to -the typeface software for the Utopia Regular, Utopia Italic, Utopia Bold -and Utopia bold Italic typefaces, including Adobe Type 1 font programs -for each style (collectively, the "Software") as set forth below. - -Adobe grants the TeX Users Group a license under its copyrights, to use, -reproduce, display and distribute the Software for any purpose and -without fee provided that the following copyright notice appears in all -whole and partial copies of the Software and provided that the following -trademark symbol and attribution appear in all unmodified copies of the -Software: - -Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved. -(alternatively, @1989, 1991 Adobe Systems Incorporated. All rights reserved.) -Utopia(R) -Utopia is either a registered trademark or trademark of Adobe Systems -Incorporated in the United States and/or other countries. Used under -license. - -Adobe also grants to the TeX Users Group a license to modify the -Software for any purpose and redistribute such modifications, for any -purpose and royalty-free, provided that the modified Software shall not -use the font name(s) or trademark(s), in whole or in part, unless -explicit written permission is granted by Adobe. This restriction -applies to all references stored in the Software for identification -purposes, such as the font menu name and other font description -fields. The TeX Users Group is also permitted to sublicense, and grant -such sublicensees the right to further sublicense, any or all the -foregoing rights through multiple tiers of distribution. The licenses -granted herein are granted in perpetuity and may not be terminated by -either party unless such termination is based on a breach of the terms -and conditions herein stated. - -Adobe retains ownership of the copyright in the Software. The TeX Users -Group agrees that Adobe and its suppliers are the sole and exclusive -owners of all rights, title and interest, including all copyrights, -patents, trademarks, trade names, trade secrets and other intellectual -property rights in the Software. No title or ownership of the Software, -any copies of the Software, or the patent, copyright, trade secret, -trademark, trade name or other proprietary rights contained in the -Software is transferred to the TeX Users Group. - -The Adobe trademarks shall not be used in advertising pertaining to the -distribution of the Software without express prior permission from -Adobe. Any such use shall be in accordance with the Adobe trademark -guidelines, available on the Adobe website at -http://www.adobe.com/misc/pdfs/TM GuideforThirdPartiesFinal.pdf. -If any portion of the Software is changed, it cannot be marketed under -Adobe's trademarks unless Adobe, in its sole discretion, approves by a -prior writing the quality of the resulting implementation. - -The TeX Users Group shall have the right to evaluate the Software -provided by Adobe. - -Then the TeX Users Group (TUG) gave all such rights, irrevocably and in -perpetuity, to any and all interested parties. - -Heuristica fonts contains glyphs from Vntopia font family, -http://vntex.sf.net which was released by Han The Thanh on 2006 -according to the conditions of the Adobe/TUG license agreement. - -Build and install instructions -============================== - -You need fontforge (http://fontforge.sourceforge.net/), xgridfit -(http://xgridfit.sourceforge.net/) and font-helpers -(http://code.google.com/p/font-helpers/ ) in order to build the fonts from -the sources. Also you should have GNU make and coreutils. At first you -must unpack/copy files from font-helpers into the directory where the *.sfd -files are located. Then type - -make - -and the truetype fonts will be produced. On systems with X.Org you may do - -make install - -as root to install the fonts system-wide (/usr/share/fonts/TTF). Otherwise -copy the *.ttf files into ~/.fonts/ directory. Then run fc-cache if you have -fontconfig. - -ChangeLog ---------- - -2014-09-06 Michael Sharpe - Because of many changes to heuristica glyphs and metrics, renamed package to Erewhon. - -2014-04-15 Michael Sharpe - Added lnum and sups tables to otf file for better processing by autoinst. - Added hints to a number of glyphs that lacked them. - -2012-03-06 Andrey V. Panov - Added more smallcaps. - Added substitutions for the Ewe language. - Added several extended Latin characters. - Added ligatures with "esh". - Version 1.0.1 is released. - -2011-12-28 Andrey V. Panov - Added panose values. - Changed Win and HHead OS/2 metrics. - Added more ligatures with "f" and "longs". - Added "beta", "gamma", "lambda", "theta", "chi" to Regular; - Version 1.0 is released. - -2011-02-15 Andrey V. Panov - Added subscript, superscript and tabular oldstyle figures. - Added more vulgar fractions. - Added several extended Latin and Cyrillic characters. - Version 0.4 is released. - -2010-10-28 Andrey V. Panov - Added small capitals (basic Latin and Cyrillic) in Regular. - Added more phonetic characters to Regular. - Version 0.3 is released. - -2010-06-09 Andrey V. Panov - Added several characters mostly for support of Polish and Romanian. - Version 0.2.2 is released. - -2010-02-15 Andrey V. Panov - Tuned some kerning pairs in Cyrillic. - Added U+211F, U+2123. - Added LaTeX support. - Manually instructed "g" in Regular. - Version 0.2.1 is released. - -2009-08-09 Andrey V. Panov - Version 0.2 is released. - -2009-08-08 Andrey V. Panov - Added Cyrillic letters to support modern Abkhazian alphabet. - Added "Euro". - -2009-08-07 Andrey V. Panov - Added kerning to Cyrillic. - -2009-07-08 Andrey V. Panov - Added old style kerning ('kern' table). - -2009-03-21 Andrey V. Panov - - Some elements of truetype control value table are now modified - with xgridfit. So build process requires ttx from fontutils and - xgridfit. - -2009-03-11 Andrey V. Panov - - Merged glyphs from Vntopia fonts of Han The Thanh with modifications for - more condensed accents. - Added U+494, U+495, U+4C7, U+4C8, U+512, U+513. - Added several IPA charters to Regular. - Updated scripts for producing fonts. - -2009-01-25 Andrey V. Panov - - Fixed spacing of generated rotated glyphs in italic fonts. - Added longs, u+268, esh, several extended Cyrillic letters. - -2008-12-24 Andrey V. Panov - - Added more accents. - -2008-12-07 Andrey V. Panov - - Added capital variants for "ring", "tilde". Generating script now builds - a lot of accented Latin and Cyrillic glyphs and several IPA rotated - symbols. - -2008-11-25 Andrey V. Panov - - The first beta version (0.1) is released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/OFL-FAQ.txt new/doc/fonts/erewhon/OFL-FAQ.txt --- old/doc/fonts/erewhon/OFL-FAQ.txt 2014-09-30 02:08:26.000000000 +0200 +++ new/doc/fonts/erewhon/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,369 +0,0 @@ -OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL) -Version 1.1-update2 - 23 August 2010 -(See http://scripts.sil.org/OFL for updates) - - -CONTENTS OF THIS FAQ -1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL -2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES -3 MODIFYING OFL-LICENSED FONTS -4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL -5 CHOOSING RESERVED FONT NAMES -6 ABOUT THE FONTLOG -7 MAKING CONTRIBUTIONS TO OFL PROJECTS -8 ABOUT THE LICENSE ITSELF -9 ABOUT SIL INTERNATIONAL -APPENDIX A - FONTLOG EXAMPLE - - -1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL - -1.1 Can I use the fonts for a book or other print publication? -Yes. You can mention the font and author in the book's colophon if you wish, but that is not required. - -1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions? -Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.) - -1.3 I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software? -No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well. - -1.4 Can I sell a software package that includes these fonts? -Yes, you can do this with both the Original Version and a Modified Version of the fonts. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, games and entertainment software, mobile device applications, etc. - -1.5 Can I include the fonts on a CD of freeware or commercial fonts? -Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself. - -1.6 Why won't the OFL let me sell the fonts alone? -The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honour and respect their contribution! - -1.7 What about sharing OFL fonts with friends on a CD, DVD or USB stick? -You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software. - -1.8 Can I host the fonts on a web site for others to use? -Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2. - -1.9 Can I host the fonts on a server for use over our internal network? -Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included. - -1.10 Does the full OFL license text always need to accompany the font? -The only situation in which an OFL font can be distributed without the text of the OFL (either in a separate file or in font metadata), is when a font is embedded in a document or bundled within a program. In the case of metadata included within a font, it is legally sufficient to include only a link to the text of the OFL on http://scripts.sil.org/OFL, but we strongly recommend against this. Most modern font formats include metadata fields that will accept the full OFL text, and full inclusion increases the likelihood that users will understand and properly apply the license. - -1.11 What do you mean by 'embedding'? How does that differ from other means of distribution? -By 'embedding' we mean inclusion of the font in a document or file in a way that makes extraction (and redistribution) difficult or clearly discouraged. In many cases the names of embedded fonts might also not be obvious to those reading the document, the font data format might be altered, and only a subset of the font - only the glyphs required for the text - might be included. Any other means of delivering a font to another person is considered 'distribution', and needs to be accompanied by any copyright notices and licensing information available in OFL.txt. - -1.12 So can I embed OFL fonts in my document? -Yes, either in full or a subset. The restrictions regarding font modification and redistribution do not apply, as the font is not intended for use outside the document. - -1.13 Does embedding alter the license of the document itself? -No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL. - -1.14 If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)? -The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model. - -1.15 What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding? -Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s). - -1.16 What about ebooks shipping with open fonts? -The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15. - -1.17 Can Font Software released under the OFL be subject to URL-based access restrictions methods or DRM (Digital Rights Management) mechanisms? -Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL. - -1.18 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions? -Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible. - -1.19 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement? -The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not. - - -2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES - -2.1 Can I make webpages using these fonts? -Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options: -- referring directly in your stylesheet to open fonts which may be available on the user's system -- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves -- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing. - -2.2 Can I make and use WOFF (Web Open Font Format) versions of OFL fonts? -Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if: - -- the original font data remains unchanged except for WOFF compression, and -- WOFF-specific metadata is either omitted altogether or present and includes, unaltered, the contents of all equivalent metadata in the original font. - -If the original font data or metadata is changed, or the WOFF-specific metadata is incomplete, the font must be considered a Modified Version, the OFL restrictions would apply and the name of the font must be changed: any RFNs cannot be used and copyright notices and licensing information must be included and cannot be deleted or modified. You must come up with a unique name - we recommend one corresponding to your domain or your particular web application. Be aware that only the original author(s) can use RFNs. This is to prevent collisions between a derivative tuned to your audience and the original upstream version and so to reduce confusion. - -Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata. - -2.3 What about other webfont formats such as EOT/EOTLite/CWT/etc.? -In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used. - -2.4 Can I make OFL fonts available through webfont online services? -Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms). - -2.5 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package? -Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles). - -2.6 Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed? -Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font. - - -3 MODIFYING OFL-LICENSED FONTS - -3.1 Can I change the fonts? Are there any limitations to what things I can and cannot change? -You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution. - -3.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine? -Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license. - -3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font? -Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package. - -3.4 Can I pay someone to enhance the fonts for my use and distribution? -Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefited from the contributions of others. - -3.5 I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use? -No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way beyond what the OFL permits and requires. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefited from the contributions of others. - -3.6 Do I have to make any derivative fonts (including extended source files, build scripts, documentation, etc.) publicly available? -No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave. - -3.7 If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts? -Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws. - - -4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL - -4.1 Can I use the SIL OFL for my own fonts? -Yes! We heartily encourage everyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. The licensing model is used successfully by various organisations, both for-profit and not-for-profit, to release fonts of varying levels of scope and complexity. - -4.2 What do I have to do to apply the OFL to my font? -If you want to release your fonts under the OFL, we recommend you do the following: - -4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package. - -4.2.2 Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata. - -4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package. - -4.2.4 Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package. - -4.3 Will you make my font OFL for me? -We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL. - -4.4 Will you distribute my OFL font for me? -No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you. - -4.5 Why should I use the OFL for my fonts? -- to meet needs for fonts that can be modified to support minority languages -- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy) -- to involve others in your font project -- to enable your fonts to be expanded with new weights and improved writing system/language support -- to allow more technical font developers to add features to your design (such as OpenType and Graphite support) -- to renew the life of an old font lying on your hard drive with no business model -- to allow your font to be included in Libre Software operating systems like Ubuntu -- to give your font world status and wide, unrestricted distribution -- to educate students about quality typeface and font design -- to expand your test base and get more useful feedback -- to extend your reach to new markets when users see your metadata and go to your website -- to get your font more easily into one of the webfont online services -- to attract attention for your commercial fonts -- to make money through webfont services -- to make money by bundling fonts with applications -- to make money adjusting and extending existing open fonts -- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you -- to be part of a sharing design and development community -- to give back and contribute to a growing body of font sources - - -5 CHOOSING RESERVED FONT NAMES - -5.1 What are Reserved Font Names? -These are font names, or portions of font names, that the author has chosen to reserve for use only with the Original Version of the font, or for Modified Version(s) created by the original author. - -5.2 Why can't I use the Reserved Font Names in my derivative font names? I'd like people to know where the design came from. -The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Names ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name, be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. Any substitution and matching mechanism is outside the scope of the license. - -5.3 What do you mean by "primary name as presented to the user"? Are you referring to the font menu name? -Yes, this applies to the font menu name and other mechanisms that specify a font in a document. It would be fine, however, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement). Users who install derivatives (Modified Versions) on their systems should not see any of the original Reserved Font Names in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake one font for another and so expect features only another derivative or the Original Version can actually offer. - -5.4 Am I not allowed to use any part of the Reserved Font Names? -You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute. - -5.5 So what should I, as an author, identify as Reserved Font Names? -Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own. - -5.6 Do I, as an author, have to identify any Reserved Font Names? -No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions. - -5.7 Are any names (such as the main font name) reserved by default? -No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s). - -5.8 Is there any situation in which I can use Reserved Font Names for a Modified Version? -The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion. - -5.9 Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source? -Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream. - -5.10 Can I add other Reserved Font Names when making a derivative font? -Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own. - - -6 ABOUT THE FONTLOG - -6.1 What is this FONTLOG thing exactly? -It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it! - -6.2 Is the FONTLOG required? -It is not a requirement of the license, but we strongly recommend you have one. - -6.3 Am I required to update the FONTLOG when making Modified Versions? -No, but users, designers and other developers might get very frustrated with you if you don't. People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. There are utilities that can help create and maintain a FONTLOG, such as the FONTLOG support in FontForge. - -6.4 What should the FONTLOG look like? -It is typically a separate text file (FONTLOG.txt), but can take other formats. It commonly includes these four sections: - -- brief header describing the FONTLOG itself and name of the font family -- Basic Font Information - description of the font family, purpose and breadth -- ChangeLog - chronological listing of changes -- Acknowledgements - list of authors and contributors with contact information - -It could also include other sections, such as: where to find documentation, how to make contributions, information on contributing organizations, source code details, and a short design guide. See Appendix A for an example FONTLOG. - - -7 MAKING CONTRIBUTIONS TO OFL PROJECTS - -7.1 Can I contribute work to OFL projects? -In many cases, yes. It is common for OFL fonts to be developed by a team of people who welcome contributions from the wider community. Contact the original authors for specific information on how to participate in their projects. - -7.2 Why should I contribute my changes back to the original authors? -It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute. - -7.3 I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions? -Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate. - -7.4 How can I financially support the development of OFL fonts? -It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version. - - -8 ABOUT THE LICENSE ITSELF - -8.1 I see that this is version 1.1 of the license. Will there be later changes? -Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL. - -8.2 Does this license restrict the rights of the Copyright Holder(s)? -No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this. - -8.3 Is the OFL a contract or a license? -The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license. - -8.4 I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts? -We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us. - -8.5 Can I translate the license and the FAQ into other languages? -SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best. - -If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems. - -SIL gives permission to publish unofficial translations into other languages provided that they comply with the following guidelines: - -- Put the following disclaimer in both English and the target language stating clearly that the translation is unofficial: - -"This is an unofficial translation of the SIL Open Font License into <language_name>. It was not published by SIL International, and does not legally state the distribution terms for fonts that use the OFL. A release under the OFL is only valid when using the original English text. However, we recognize that this unofficial translation will help users and designers not familiar with English to better understand and use the OFL. We encourage designers who consider releasing their creation under the OFL to read the OFL-FAQ in their own language if it is available. Please go to http://scripts.sil.org/OFL for the official version of the license and the accompanying OFL-FAQ." - -- Keep your unofficial translation current and update it at our request if needed, for example if there is any ambiguity which could lead to confusion. - -If you start such a unofficial translation effort of the OFL and OFL-FAQ please let us know. - - -9 ABOUT SIL INTERNATIONAL - -9.1 Who is SIL International and what do they do? -SIL serves language communities worldwide, building their capacity for sustainable language development, by means of research, translation, training and materials development. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment. - -9.2 What does this have to do with font licensing? -The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack), so SIL developed the SIL Open Font License with the help of the Free/Libre and Open Source Software community. - -9.3 How can I contact SIL? -Our main web site is: http://www.sil.org/ -Our site about complex scripts is: http://scripts.sil.org/ -Information about this license (and contact information) is at: http://scripts.sil.org/OFL - - -APPENDIX A - FONTLOG EXAMPLE - -Here is an example of the recommended format for a FONTLOG, although other formats are allowed. - ------ -FONTLOG for the GlobalFontFamily fonts - -This file provides detailed information on the GlobalFontFamily Font Software. This information should be distributed along with the GlobalFontFamily fonts and any derivative works. - -Basic Font Information - -GlobalFontFamily is a Unicode typeface family that supports all languages that use the Latin script and its variants, and could be expanded to support other scripts. - -NewWorldFontFamily is based on the GlobalFontFamily and also supports Greek, Hebrew, Cyrillic and Armenian. - -More specifically, this release supports the following Unicode ranges... -This release contains... -Documentation can be found at... -To contribute to the project... - -ChangeLog - -1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1 -- Tweaked the smart font code (Branch merged with trunk version) -- Provided improved build and debugging environment for smart behaviours - -7 February 2007 (Pat Johnson) NewWorldFontFamily Version 1.3 -- Added Greek and Cyrillic glyphs - -7 March 2006 (Fred Foobar) NewWorldFontFamily Version 1.2 -- Tweaked contextual behaviours - -1 Feb 2005 (Jane Doe) NewWorldFontFamily Version 1.1 -- Improved build script performance and verbosity -- Extended the smart code documentation -- Corrected minor typos in the documentation -- Fixed position of combining inverted breve below (U+032F) -- Added OpenType/Graphite smart code for Armenian -- Added Armenian glyphs (U+0531 -> U+0587) -- Released as "NewWorldFontFamily" - -1 Jan 2005 (Joe Smith) GlobalFontFamily Version 1.0 -- Initial release - -Acknowledgements - -If you make modifications be sure to add your name (N), email (E), web-address (if you have one) (W) and description (D). This list is in alphabetical order. - -N: Jane Doe -E: jane(a)university.edu -W: http://art.university.edu/projects/fonts -D: Contributor - Armenian glyphs and code - -N: Fred Foobar -E: fred(a)foobar.org -W: http://foobar.org -D: Contributor - misc Graphite fixes - -N: Pat Johnson -E: pat(a)fontstudio.org -W: http://pat.fontstudio.org -D: Designer - Greek & Cyrillic glyphs based on Roman design - -N: Tom Parker -E: tom(a)company.com -W: http://www.company.com/tom/projects/fonts -D: Engineer - original smart font code - -N: Joe Smith -E: joe(a)fontstudio.org -W: http://joe.fontstudio.org -D: Designer - original Roman glyphs - -Fontstudio.org is an not-for-profit design group whose purpose is... -Foobar.org is a distributed community of developers... -Company.com is a small business who likes to support community designers... -University.edu is a renowed educational institution with a strong design department... ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/OFL.txt new/doc/fonts/erewhon/OFL.txt --- old/doc/fonts/erewhon/OFL.txt 2014-09-30 02:08:26.000000000 +0200 +++ new/doc/fonts/erewhon/OFL.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved. -Utopia is either a registered trademark or trademark of Adobe Systems -Incorporated in the United States and/or other countries. Used under -license. - -Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net - -Copyright (c) 2008-2012, Andrey V. Panov (panov(a)canopus.iacp.dvo.ru), -with Reserved Font Name Heuristica. - -Copyright (c) 2014, Michael J. Sharpe (msharpe at ucsd dot edu), -with Reserved Font Name Erewhon. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/README new/doc/fonts/erewhon/README --- old/doc/fonts/erewhon/README 2016-02-07 00:01:30.000000000 +0100 +++ new/doc/fonts/erewhon/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -This package provides LaTeX support files for the Erewhon fonts, made up of fonts files and LaTeX support files for a family based on Andrey V. Panov's Heuristica fonts, version 1.0.1, which were in turn a substantial extension of the free Utopia font family making available Cyrillic glyphs, Small Caps in regular weight, upright shape, and oldstyle fixed-width figures in all styles. Erewhon adds small caps in all styles, slanted shapes distinct from italic, superior letter and figures in all styles, as well as inferior, numerator and denominator figures in all styles. The six font files in this package are in otf and pfb format, licensed under the SIL OFL. All other support files are subject to the LaTeX Project Public License. See -http://www.ctan.org/license/lppl1.3 -for the details of that license. - -Current version: 1.05, 2016-02-05 - -Changes in version 1.04 -1. Changed the subfamily names in RegularSlanted and BoldSlanted to Oblique and BoldOblique. The otfs now cooperate much better with fontspec, and show up properly in Windows and Linux font menus. -2. Added small caps to Italic and BoldItalic, copying the Oblique versions. These are not yet well kerned. -3. Added a number of small caps glyphs so that all small caps in T1 encoding are really small caps. -4. Added an OT2 encoded version with TLF figures only. -5. The T2A, T2B and T2C encodings are much improved---otftotfm seems to require a lot of help to get good encoding files. - -Changes in version 1.04 -1. Changed \Erewhon@scale in erewhon.sty to \erewhon@scale, in accordance with .fd files. (Thanks Marco Zunino.) -2. Added a new macro, \useproportional, to erewhon.sty. It works analogously to \useosf, and may be useful if working with babel, where the option proportional to newtxtext should not be used if loading a math font. - -Changes in version 1.03 -Brought erewhon.sty more into conformance with newtxtext.sty with respect to handling babel, osf and figure commands like \osfstyle. - -Changes in version 1.02 -1. Added a visiblespace (uni2423) glyph to all fonts. -2. Changed erewhon.fontspec so it provides by default correct upright shapes for {upright, sc} when using fontspec. (I am not able to make this work with {bold,sc}. You can make it work with {italic,sc} and {bolditalic,sc} using, e.g., -\setmainfont{Erewhon}[ -ItalicFeatures={SmallCapsFont={Erewhon-RegularSlanted}, SmallCapsFeatures={Letters=SmallCaps}}, -BoldItalicFeatures={ SmallCapsFont={Erewhon-BoldSlanted},SmallCapsFeatures={Letters=SmallCaps}} -] -If you use any similar settings for SlantedFeatures, you will not get upright small caps in upright mode. I believe this is most likely a fontspec bug. - -Changes in version 1.01a -Corrected folder hierarchy names for afm files in tds. - -Changes in version 1.01 -1. Corrected spacing errors in italic and bold italic fonts. -2. Minor corrections to some italic and bold italic superior letters. - -Changes in version 1.001 -1. Modified BlueValues of fonts to correct problems with t1lint, though t1lint still provokes warnings. -2. Added afm files to distribution. - -The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the LaTeX support files may be re-created using the command - -/usr/texbin/autoinst --inferiors --fractions --verbose --noupdmap --noswash --notitling --noornaments --target=./texmf --encoding=TS1,LY1,T2A,T2B,T2C,T1 --vendor=public --typeface=erewhon *.otf - -after cding to the folder containing just the modified otf fonts and a subfolder named texmf. You should replace the newly generated erewhon.sty with the one from the distribution in order to preserve its functionality. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder: - -#!/bin/bash -pushd texmf/fonts/map/dvips/erewhon -sed -i '' 's/<\[a_/<\[zut1_/g' erewhon.map -popd -pushd texmf/fonts/enc/dvips/erewhon -for f in *.enc; do mv ${f} zut1${f:1}; done -popd - -Installation: - -Mac OS X: To install, open a Terminal window and cd to inside the downloaded TDS folder. - -Method A (recommended): type - -sudo /bin/cp -Rfp * /usr/local/texlive/texmf-local - -then - -sudo mktexlsr - -then - -sudo -H updmap-sys --enable Map=erewhon.map - -Method B: If you insist on making your font installations in your home folder, potentially making your personal installation become out of sync with updates to TeXLive, use instead - -(i) if you checked Update for All Users in TeXLive utility - -/bin/cp -Rfp * ~/Library/texmf - -then - -updmap --enable Map=erewhon.map - -(ii) otherwise - -/bin/cp -Rfp * ~/Library/texmf - -then - -sudo updmap-sys --enable Map=erewhon.map - -Linux: Very similar to Mac OS X. - -MikTeX: Copy erewhon.tds.zip to the root of the folder you use for personal additions to the TeX trees, open a command window, chdir to that folder, and type - -unzip erewhon.tds.zip -initexmf --update-fndb -initexmf --edit-config-file updmap - -The latter command should open updmap.cfg in your default editor, commonly Notepad. Add the line - -Map erewhon.map - -to updmap.cfg, save and close. Then, in the command window, type - -initexmf --mkmaps - -You can ignore error messages that may occur here. This should result in a properly enabled erewhon. - -Please send comments and bug reports or suggestions for improvement to - -msharpe at ucsd dot edu \ No newline at end of file Binary files old/doc/fonts/erewhon/erewhon-doc.pdf and new/doc/fonts/erewhon/erewhon-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/erewhon-doc.tex new/doc/fonts/erewhon/erewhon-doc.tex --- old/doc/fonts/erewhon/erewhon-doc.tex 2016-02-07 00:01:30.000000000 +0100 +++ new/doc/fonts/erewhon/erewhon-doc.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -% !TEX TS-program = pdflatexmk -\documentclass[11pt]{amsart} -\usepackage[margin=1.5in]{geometry} -\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent -\usepackage{graphicx} -\pdfmapfile{=erewhon.map} -%SetFonts -% erewhon+newtxmath -\usepackage[sups,p,osf,scaled=.98]{erewhon} -\usepackage[T2A,OT2,T1]{fontenc} -\usepackage{textcomp} -\usepackage{cabin} -\usepackage[varqu,varl]{zi4}% inconsolata -\usepackage[utopia,vvarbb,bigdelims]{newtxmath} -%SetFonts -\usepackage{fonttable} -\title{LaTeX Support for Erewhon} -\author{Michael Sharpe} -\date{\today} % Activate to display a given date or no date -\begin{document} -\maketitle -\emph{Erewhon} is a font package based largely on Andrey V.\ Panov's \emph{Heuristica}, but with so many changes that it is no longer strictly compatible with that package, and is offered instead as an enhanced alternative. (\emph{Heuristica} extended the \emph{Utopia} font family made available by the \TeX\ Users' Group, adding many accented glyphs, Cyrillic glyphs, ligatures, superior and oldstyle fixed-width figures in all styles, and Small Caps in Regular style only. It is widely distributed as a free font collection in OpenType, TrueType and Type$1$ formats.) \emph{Erewhon} is provided in OpenType and Type$1$ formats with \LaTeX\ support files in encodings T$1$, TS$1$, LY$1$, OT$2$, T$2$A, T$2$B and T$2$C. Changes made in the transition from \emph{Heuristica} to \emph{Erewhon} include: -\begin{itemize} -\item -\textsl{slanted} as well as \textit{Italic} shapes; -\item -\textsc{Small Caps} in \textsc{\textbf{bold}} as well as \textsc{regular} upright shapes, with \textsc{\textit{italic}} and \textsc{\textsl{slanted Small Caps}} shapes from the slanted variants; -\item expanded lookup tables in the {\tt.otf} files for users of XeLaTeX and LuaLaTeX; -\item a number of f-ligatures have been modified, and a \verb|T_h| ligature added; -\item proportionally spaced figures (lining and oldstyle), adding to the existing taboldstyle figures; -\item full collections of superior lowercase letters (including \`e as \textsu{\`e} and \'e as \textsu{\'e}), mainly for the benefit of languages in which those are in common use---e.g., French, Spanish; -\item size reduced by 6\% from Heuristica, which matched the old version of Utopia---the new size matches that of Adobe's commercial UtopiaStd; -\item shapes of some oldstyle figures modified to have more of an oldstyle appearance; -\item fraction macros based on the new numerator and denominator figures; -\item the bold upright face has been made less cramped. -\end{itemize} - -The {\tt newtx} package has been modified, as of version $1.26$, to offer a new option {\tt utopia} (or, equivalently, {\tt heuristica} or {\tt erewhon}) that uses math italic glyphs taken from Utopia and oldstyle figures from \emph{Erewhon}. Its slanted Greek alphabets are constructed from the {\tt txfonts} slanted Greek letters by reducing their italic angle from $15.5$\textdegree\ to $13$\textdegree, matching Utopia's italic angle. So, for Erewhon text and matching math, you can use\footnote{There is most likely also a way to use {\tt MathDesign} or {\tt fourier} with at least partial compatibility.}: -\begin{verbatim} -\usepackage[p,osf,scaled=.98]{erewhon} -\usepackage[varqu,varl]{inconsolata} % typewriter -\usepackage[type1,scaled=.95]{cabin} % sans serif like Gill Sans -\usepackage[utopia,vvarbb,bigdelims]{newtxmath} -\end{verbatim} -The effect of the options {\tt p,osf} is to force the default figure style in {\tt erewhon} text to be proportional oldstyle 0123456789 while using lining figures $0123456789$ in math mode. If no options are specified, tabular lining figures will be used throughout. - -\textsc{Options available:} -\begin{itemize} -\item The option {\tt scaled} allows you to change the scale. E.g., if you want \emph{Erewhon} to render at the same size as the original \emph{Utopia} or \emph{Heuristica}, use {\tt scaled=1.064}. -\item -The option {\tt proportional}, or, equivalently, {\tt p}, specifies the use of proportional rather than the default tabular figures. -\item - The {\tt space} option allows you to specify a factor by which to increase the interword spacing, which is, IMO, a bit tight. -\item -The option {\tt oldstyle}, or, equivalently, {\tt osf}, specifies oldstyle figures in text mode---math mode always uses tabular lining figures. By itself, {\tt osf} results in tabular oldstyle figures unless you also specify the option {\tt p}, or {\tt proportional}. -\item The option {\tt scosf} changes the figure style to {\tt osf} only within small caps. -\item - The option {\tt sups} changes the footnote marker style to use the superior figures from \emph{Erewhon} rather than the default superscripts based on reduced lining figures, which usually appear too light. (The {\tt superiors} package offers further options.) -\end{itemize} - -\emph{Erewhon} is so austere for a text font and \emph{Inconsolata} is so fancy for a typewriter font that you may find they blend together all too well. For more of a distinction replace the {\tt inconsolata} line above with -\begin{verbatim} -\usepackage{zlmtt} % serifed typewriter font extending cmtt -\end{verbatim} - -As Utopia text is a bit cramped, you might try applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package, or use the {\tt space} option. - -\textsc{Macros:} -\begin{itemize} -\item -\verb|\textlf| and \verb|\texttlf| render their arguments in proportional and tabular lining figures respectively, no matter what the default figure style. E.g., \verb|\textlf{345}| produces \textlf{345}. -\item -\verb|\textosf| and \verb|\texttosf| render their arguments in proportional and tabular oldstyle figures respectively, no matter what the default figure style. For example, \verb|\textosf{345}| produces~\textosf{345}. -\item -\verb|\textsu| renders its argument in superior figures, no matter what the default figure style. E.g., \verb|\textsu{345}| produces \textsu{345}. -\item -\verb|\textin| renders its argument in inferior figures, no matter what the default figure style. E.g., \verb|\textin{345}| produces \textin{345}. -\item -\verb|\textnu| renders its argument in numerator figures, no matter what the default figure style. E.g., \verb|\textnu{345}| produces \textnu{345}. -\item -\verb|\textde| renders its argument in denominator figures, no matter what the default figure style. E.g., \verb|\textde{345}| produces \textde{345}. -\item -\verb|\textfrac| renders its two arguments as a vulgar fraction, using \verb|\textnu| for the numerator and \verb|\textde| for the denominator. E.g., \verb|\textfrac{31}{64}| produces~\textfrac{31}{64}. -\end{itemize} -\textsc{Very Brief, Nonsensical Math Example:}\\ -Let $B(X)$ be the set of blocks of $\Lambda_{X}$ -and let $b(X) \coloneq |{B(X)}|$ so that $\hat\phi=\sum_{Y\subset X}(-1)^{b(Y)}b(Y)$. - -\textsc{Glyph Coverage Examples}\\ -\textbf{Erewhon-Regular-tlf-ot2}\\ -\fonttable{Erewhon-Regular-tlf-ot2} - -(This 7-bit encoding is intended for users lacking a Cyrillic keyboard. For further information, consult the documentation for the package {\tt nimbus15}.) - -\textbf{Erewhon-Regular-tlf-t2a}\\ -\fonttable{Erewhon-Regular-tlf-t2a} -\newpage -\textbf{Erewhon-Regular-tlf-t2b}\\ -\fonttable{Erewhon-Regular-tlf-t2b} -\newpage -\textbf{Erewhon-Regular-tlf-t2c}\\ -\fonttable{Erewhon-Regular-tlf-t2c} - - -\end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ean/README new/doc/generic/ean/README --- old/doc/generic/ean/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/ean/README 2016-11-25 19:27:41.000000000 +0100 @@ -0,0 +1,22 @@ +This directory contains the macro ean13 and ean8 for making EAN +barcodes (13 or 8 digit on input and kern-rule queue on output). + +The usage of the macros is commeted in the file ean13.tex or ean8.tex. +The simple test is presented in file eantest.tex (for plain). +Macro works in plain and LateX and other standard macro packages. + +The fonts ocrb9 and ocrb7 is used. The mf-sources are presented (this +is the copy from CTAN:fonts/ocr-b) with a little correction (the +mode_setup is added to begin of file ocrbmac.mf). + +ean13.tex .... EAN 13 macro by Petr Olsak +ean8.tex .... EAN 8 macro by Jaroslav Moucka (student) +eantest.tex .. test of ean13 and ean8 in plain. +*.mf ......... mf-sources of OCR-b font by Norbert Schwarz + +Petr Olsak (Ol\v{s}\'ak) +Department of Mathematics +Czech Techical University in Prague, +Czech Republic +e-mail: olsak(a)math.feld.cvut.cz + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ean/eantest.tex new/doc/generic/ean/eantest.tex --- old/doc/generic/ean/eantest.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/ean/eantest.tex 2016-11-25 19:27:41.000000000 +0100 @@ -0,0 +1,8 @@ +\input ean13 +\nopagenumbers +\ISBN 80-901950-0-8 \EAN 978-80-901950-0-4 % Typesetting System TeX +\vskip1cm +\input ean8 +\EAN 8591-2342 +\end + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ean.doc.tlpobj new/tlpkg/tlpobj/ean.doc.tlpobj --- old/tlpkg/tlpobj/ean.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/ean.doc.tlpobj 2017-04-14 17:39:02.000000000 +0200 @@ -0,0 +1,8 @@ +name ean.doc +category Package +revision 20851 +shortdesc doc files of ean +relocated 1 +docfiles size=2 + RELOC/doc/generic/ean/README + RELOC/doc/generic/ean/eantest.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erewhon.doc.tlpobj new/tlpkg/tlpobj/erewhon.doc.tlpobj --- old/tlpkg/tlpobj/erewhon.doc.tlpobj 2016-04-14 18:59:57.000000000 +0200 +++ new/tlpkg/tlpobj/erewhon.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -name erewhon.doc -category Package -revision 39604 -shortdesc doc files of erewhon -relocated 1 -docfiles size=81 - RELOC/doc/fonts/erewhon/FontLog.txt - RELOC/doc/fonts/erewhon/OFL-FAQ.txt - RELOC/doc/fonts/erewhon/OFL.txt - RELOC/doc/fonts/erewhon/README - RELOC/doc/fonts/erewhon/erewhon-doc.pdf - RELOC/doc/fonts/erewhon/erewhon-doc.tex ++++++ erewhon.tar.xz -> ean.tar.xz ++++++ ++++ 134804 lines of diff (skipped) ++++++ easy-todo.doc.tar.xz ++++++ ++++++ easy-todo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easy-todo.tlpobj new/tlpkg/tlpobj/easy-todo.tlpobj --- old/tlpkg/tlpobj/easy-todo.tlpobj 2016-04-14 18:58:58.000000000 +0200 +++ new/tlpkg/tlpobj/easy-todo.tlpobj 2017-04-14 17:39:02.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=1 RELOC/tex/latex/easy-todo/easy-todo.sty catalogue-ctan /macros/latex/contrib/easy-todo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license apache2 catalogue-topics notes editorial ++++++ easyfig.doc.tar.xz ++++++ ++++++ easyfig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easyfig.tlpobj new/tlpkg/tlpobj/easyfig.tlpobj --- old/tlpkg/tlpobj/easyfig.tlpobj 2016-04-14 18:58:59.000000000 +0200 +++ new/tlpkg/tlpobj/easyfig.tlpobj 2017-04-14 17:39:02.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/easyfig/easyfig.sty catalogue-ctan /macros/latex/contrib/easyfig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics float graphics-use catalogue-version 1.2 ++++++ easylist.doc.tar.xz ++++++ ++++++ easylist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easylist.tlpobj new/tlpkg/tlpobj/easylist.tlpobj --- old/tlpkg/tlpobj/easylist.tlpobj 2016-04-14 18:58:59.000000000 +0200 +++ new/tlpkg/tlpobj/easylist.tlpobj 2017-04-14 17:39:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=8 RELOC/tex/latex/easylist/easylist.sty catalogue-ctan /macros/latex/contrib/easylist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list catalogue-version 1.3 ++++++ easyreview.doc.tar.xz ++++++ ++++++ easyreview.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easyreview.tlpobj new/tlpkg/tlpobj/easyreview.tlpobj --- old/tlpkg/tlpobj/easyreview.tlpobj 2016-04-14 18:58:59.000000000 +0200 +++ new/tlpkg/tlpobj/easyreview.tlpobj 2017-04-14 17:39:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/easyreview/easyReview.sty catalogue-ctan /macros/latex/contrib/easyreview -catalogue-date 2015-09-16 06:57:29 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics notes editorial catalogue-version 1.0 ++++++ ebezier.doc.tar.xz ++++++ ++++++ ebezier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebezier.tlpobj new/tlpkg/tlpobj/ebezier.tlpobj --- old/tlpkg/tlpobj/ebezier.tlpobj 2016-04-14 18:59:00.000000000 +0200 +++ new/tlpkg/tlpobj/ebezier.tlpobj 2017-04-14 17:39:03.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/ebezier/ebezier.sty catalogue-also pst-bezier catalogue-ctan /macros/latex/contrib/ebezier -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-curve graphics-in-tex catalogue-version 4 ++++++ ebgaramond-maths.doc.tar.xz ++++++ ++++++ ebgaramond-maths.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond-maths.tlpobj new/tlpkg/tlpobj/ebgaramond-maths.tlpobj --- old/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2016-04-14 18:59:03.000000000 +0200 +++ new/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2017-04-14 17:39:04.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/ebgaramond-maths/ebgaramond-maths.sty catalogue-also ebgaramond catalogue-ctan /fonts/ebgaramond-maths -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-maths font-virtual catalogue-version 1.1 ++++++ ebgaramond.doc.tar.xz ++++++ ++++++ ebgaramond.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond.tlpobj new/tlpkg/tlpobj/ebgaramond.tlpobj --- old/tlpkg/tlpobj/ebgaramond.tlpobj 2016-04-14 18:59:01.000000000 +0200 +++ new/tlpkg/tlpobj/ebgaramond.tlpobj 2017-04-14 17:39:03.000000000 +0200 @@ -351,7 +351,7 @@ RELOC/tex/latex/ebgaramond/ebgaramond.sty RELOC/tex/latex/ebgaramond/mt-EBGaramond.cfg catalogue-ctan /fonts/ebgaramond -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-serif font-otf font-type1 catalogue-version 0.16 ++++++ ebong.doc.tar.xz ++++++ ++++++ ebong.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebong.tlpobj new/tlpkg/tlpobj/ebong.tlpobj --- old/tlpkg/tlpobj/ebong.tlpobj 2016-04-14 18:59:03.000000000 +0200 +++ new/tlpkg/tlpobj/ebong.tlpobj 2017-04-14 17:39:04.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=2 texmf-dist/scripts/ebong/ebong.py catalogue-ctan /language/ebong -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics indic ++++++ ebook.doc.tar.xz ++++++ ++++++ ebook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebook.tlpobj new/tlpkg/tlpobj/ebook.tlpobj --- old/tlpkg/tlpobj/ebook.tlpobj 2016-04-14 18:59:04.000000000 +0200 +++ new/tlpkg/tlpobj/ebook.tlpobj 2017-04-14 17:39:04.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/latex/ebook/ebook.sty catalogue-ctan /macros/latex/contrib/ebook -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics geometry font-use ebook ++++++ ebproof.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/README new/doc/latex/ebproof/README --- old/doc/latex/ebproof/README 2015-03-22 22:22:17.000000000 +0100 +++ new/doc/latex/ebproof/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -== Presentation == - -The ebproofs package provides commands to typeset proof trees, in the style of -sequent calculus and related systems. The commands allow for writing -inferences with any number of premisses and alignment of successive formulas -on an arbitrary point. Various options allow complete control over spacing, -styles of inference rules, placement of labels, etc. - -The distribution includes the following files: - - - ebproof.sty : the package - - ebproof.pdf : the documentation - - ebproof.tex : the LaTeX source for the documentation - -The package requires pgfkeys (from TikZ/PGF) for the option system. - - -== License == - -Copyright 2015 Emmanuel Beffara <manu(a)beffara.org> - -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 Emmanuel Beffara. - -This work consists of the files ebproof.sty and ebproof.tex. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/README.md new/doc/latex/ebproof/README.md --- old/doc/latex/ebproof/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/ebproof/README.md 2017-05-17 23:51:34.000000000 +0200 @@ -0,0 +1,42 @@ +The ebproof package +=================== + +A LaTeX package to typeset formal proofs in the style of sequent calculus. + +Presentation +------------ + +The `ebproof` package provides commands to typeset proof trees, in the style +of sequent calculus and related systems. The commands allow for writing +inferences with any number of premisses and alignment of successive formulas +on an arbitrary point. Various options allow complete control over spacing, +styles of inference rules, placement of labels, etc. + +The distribution includes the following files: + +- `ebproof.sty` : the package +- `ebproof.pdf` : the documentation +- `ebproof.tex` : the LaTeX source for the documentation + +The package requires `expl3` (the LaTeX3 programming environment) which +provides many useful programming tools. + + +License +------- + +Copyright 2015 Emmanuel Beffara <manu(a)beffara.org> + +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 Emmanuel Beffara. + +This work consists of the files `ebproof.sty` and `ebproof.tex`. Binary files old/doc/latex/ebproof/ebproof.pdf and new/doc/latex/ebproof/ebproof.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/ebproof.tex new/doc/latex/ebproof/ebproof.tex --- old/doc/latex/ebproof/ebproof.tex 2015-03-22 22:22:17.000000000 +0100 +++ new/doc/latex/ebproof/ebproof.tex 2017-05-17 23:51:34.000000000 +0200 @@ -1,5 +1,5 @@ %% ebproof.sty -%% Copyright 2015 Emmanuel Beffara <manu(a)beffara.org> +%% Copyright 2017 Emmanuel Beffara <manu(a)beffara.org> % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ \title{The \package{ebproof} package} \author{Emmanuel Beffara \\ \url{manu(a)beffara.org}} -\date{Version 1.1 \\ March 13, 2015} +\date{Version 2.0 \\ March 17, 2017} \usepackage{amssymb} \usepackage{color} @@ -40,7 +40,7 @@ \newcommand\env[1]{\lit{#1}} \newcommand\opt[1]{\lit{#1}} \newcommand\meta[1]{$\langle$\textit{#1}$\rangle$} -\newcommand\oarg[1]{\lit{[}\meta{#1}\lit{]}} +\newcommand\oarg[1]{\lit[\meta{#1}\lit]} \newcommand\marg[1]{\lit{\{}\meta{#1}\lit{\}}} \newenvironment{csdoc}[1]{% @@ -84,10 +84,10 @@ \begin{example}{gobble=2} \begin{prooftree} - \Hypo{ \Gamma, A &\vdash B } - \Infer1[abs]{ \Gamma &\vdash A\to B } - \Hypo{ \Gamma \vdash A } - \Infer2[app]{ \Gamma \vdash B } + \hypo{ \Gamma, A &\vdash B } + \infer1[abs]{ \Gamma &\vdash A\to B } + \hypo{ \Gamma \vdash A } + \infer2[app]{ \Gamma \vdash B } \end{prooftree} \end{example} @@ -107,7 +107,7 @@ \cs{begin}\lit{\{prooftree\}}\oarg{options} \meta{statements} \cs{end}\lit{\{prooftree\}}} - Typeset the proof tree desribed by the \meta{statements}, as described in + Typeset the proof tree described by the \meta{statements}, as described in section~\ref{sec:statements}. The \meta{options} provide default formatting options for the proof tree. This environment can be used either in math mode or in text mode. @@ -118,8 +118,8 @@ \cs{begin}\lit{\{prooftree*\}}\oarg{options} \meta{statements} \cs{end}\lit{\{prooftree*\}}} - Typeset the proof centered on a line of its own; it is essentially - equivalent to wrapping the \env{prooftree} environment inside a \env{center} + Typeset the proof on a line of its own; it is essentially equivalent to + wrapping the \env{prooftree} environment inside a displayed math environment. \end{csdoc} @@ -132,15 +132,15 @@ \begin{example}{gobble=2} \[ \begin{prooftree} - \Hypo{ \vdash A } - \Hypo{ \vdash B } \Infer1{ \vdash B, C } - \Infer2{ \vdash A\wedge B, C } + \infer0{ \vdash A } + \hypo{ \vdash B } \infer1{ \vdash B, C } + \infer2{ \vdash A\wedge B, C } \end{prooftree} \quad \rightsquigarrow \quad \begin{prooftree} - \Hypo{ \vdash A } \Hypo{ \vdash B } - \Infer2{ \vdash A\wedge B } - \Infer1{ \vdash A\wedge B, C } + \infer0{ \vdash A } \hypo{ \vdash B } + \infer2{ \vdash A\wedge B } + \infer1{ \vdash A\wedge B, C } \end{prooftree} \] \end{example} @@ -148,10 +148,10 @@ \section{Statements} \label{sec:statements} -Statements describes proofs in postfix notation: when typesetting a proof tree +Statements describe proofs in postfix notation: when typesetting a proof tree whose last rule has, say, two premisses, you will first write statements for the subtree of the first premiss, then statements for the subtree of the -second premiss, then a statement like \cs{Infer2}\{\meta{conclusion}\} to +second premiss, then a statement like \cs{infer2}\{\meta{conclusion}\} to build an inference with these two subtrees as premisses and the given text as conclusion. @@ -160,17 +160,26 @@ At the end, it must contain exactly one tree, which is the one that will be printed. +Note that the commands defined in this section only exist right inside +\env{prooftree} environments. +If you have a macro with the same name as one of the statements, for instance +\cs{hypo}, then this macro will keep its meaning outside \env{prooftree} +environments as well as inside the arguments of a statement. +If you really need to access the statements in another context, you can can +always call them by prefixing their names with \lit{ebproof}, for instance as +\cs{ebproofhypo}. + \subsection{Basic statements} The basic statements for building proofs are the following, where \meta{options} stands for arbitrary options as described in section~\ref{sec:options}. -\begin{csdoc}{\cs{Hypo}\oarg{options}\marg{text}} +\begin{csdoc}{\cs{hypo}\oarg{options}\marg{text}} Push a new proof tree consisting only in one conclusion line, with no premiss and no line above, in other words a tree with only a leaf - (\cs{Hypo} stands for \emph{hypothesis}). + (\cs{hypo} stands for \emph{hypothesis}). \end{csdoc} -\begin{csdoc}{\cs{Infer}\oarg{options}\marg{arity}\oarg{label}\marg{text}} +\begin{csdoc}{\cs{infer}\oarg{options}\marg{arity}\oarg{label}\marg{text}} Build an inference step by taking some proof trees from the top of the stack, assembling them with a rule joining their conclusions and putting a new conclusion below. @@ -192,70 +201,92 @@ root of the tree: if \meta{text} contains the alignment character \verb|&| then the axis is set at that position, otherwise the axis is set at the center of the conclusion text. -The \cs{Infer} statement makes sure that the axis of the premiss is at the +The \cs{infer} statement makes sure that the axis of the premiss is at the same position as the axis of the conclusion. If there are several premisses, it places the axis at the center between the left of the leftmost conclusion and the right of the rightmost conclusion: \begin{example}{gobble=2} \begin{prooftree} - \Hypo{ &\vdash A, B, C } - \Infer1{ A &\vdash B, C } - \Infer1{ A, B &\vdash C } - \Hypo{ D &\vdash E } - \Infer2{ A, B, D &\vdash C, E } - \Infer1{ A, B &\vdash C, D, E } - \Infer1{ A &\vdash B, C, D, E } + \hypo{ &\vdash A, B, C } + \infer1{ A &\vdash B, C } + \infer1{ A, B &\vdash C } + \hypo{ D &\vdash E } + \infer2{ A, B, D &\vdash C, E } + \infer1{ A, B &\vdash C, D, E } + \infer1{ A &\vdash B, C, D, E } \end{prooftree} \end{example} -\subsection{Additional statements} - -The following additional statements may be used to affect the format of the -last proof tree on the stack: - -\begin{csdoc}{\cs{Ellipsis}\marg{label}\marg{text}} +\begin{csdoc}{\cs{ellipsis}\marg{label}\marg{text}} Typeset vertical dots, with a label on the right, and a new conclusion. No inference lines are inserted. \begin{example}{gobble=4} \begin{prooftree} - \Hypo{ \Gamma &\vdash A } - \Ellipsis{foo}{ \Gamma &\vdash A, B } + \hypo{ \Gamma &\vdash A } + \ellipsis{foo}{ \Gamma &\vdash A, B } \end{prooftree} \end{example} \end{csdoc} -\begin{csdoc}{\cs{Alter}\marg{code}} - Modify the proof with arbitrary commands, assuming that these commands do - not affect the size. - The \meta{code} is executed in an \cs{hbox} and is followed by the insertion - of the actual box with the current sub-proof. - It is mostly useful with \cs{color} commands: + +\subsection{Modifying proof trees} + +The following additional statements may be used to affect the format of the +last proof tree on the stack: + +\begin{csdoc}{\cs{rewrite}\marg{code}} + Rewrite the proof while preserving its size and alignment. The \meta{code} + is typeset in horizontal mode, with the following control sequences defined: + \begin{itemize} + \item \cs{treebox} is a box register that contains the original material, + \item \cs{treemark}\marg{name} expands as the position of a given mark with + respect to the left of the box. + \end{itemize} + A simple use of this statement is to change the color of a proof tree: + \begin{example}{gobble=4} + \begin{prooftree} + \hypo{ \Gamma, A &\vdash B } + \infer1[abs]{ \Gamma &\vdash A\to B } + \rewrite{\color{red}\box\treebox} + \hypo{ \Gamma \vdash A } + \infer2[app]{ \Gamma \vdash B } + \end{prooftree} + \end{example} + Note the absence of spaces inside the call to \cs{rewrite}, because spaces + would affect the position of the tree box. + Note also that explicit use of \cs{treebox} is required to actually draw the + subtree. + Not using it will effectively not render the subtree, while still reserving + its space in the enclosing tree: \begin{example}{gobble=4} \begin{prooftree} - \Hypo{ \Gamma, A &\vdash B } - \Infer1[abs]{ \Gamma &\vdash A\to B } - \Alter{\color{red}} - \Hypo{ \Gamma \vdash A } - \Infer2[app]{ \Gamma \vdash B } + \hypo{ \Gamma, A &\vdash B } + \infer1[abs]{ \Gamma &\vdash A\to B } + \rewrite{} + \hypo{ \Gamma \vdash A } + \infer2[app]{ \Gamma \vdash B } \end{prooftree} \end{example} + This kind of manipulation is useful for instance in conjunction with the + \package{beamer} package to allow revealing subtrees of a proof tree + progressively in successive slides of a given frame. \end{csdoc} -\begin{csdoc}{\cs{Delims}\marg{left}\marg{right}} +\begin{csdoc}{\cs{delims}\marg{left}\marg{right}} Put left and right delimiters around the whole sub-proof, without changing the alignment (the spacing is affected by the delimiters, however). The \meta{left} text must contain an opening occurrence of \cs{left} and the \meta{right} text must contain a matching occurrence of \cs{right}. - For instance, \verb|\Delims{\left(}{\right)}| will put the + For instance, \verb|\delims{\left(}{\right)}| will put the sub-proof between parentheses. \begin{example}{gobble=4} \begin{prooftree} - \Hypo{ A_1 \vee \cdots \vee A_n } - \Hypo{ [A_i] } - \Ellipsis{}{ B } - \Delims{ \left( }{ \right)_{1\leq i\leq n} } - \Infer2{ B } + \hypo{ A_1 \vee \cdots \vee A_n } + \hypo{ [A_i] } + \ellipsis{}{ B } + \delims{ \left( }{ \right)_{1\leq i\leq n} } + \infer2{ B } \end{prooftree} \end{example} \end{csdoc} @@ -264,10 +295,8 @@ \label{sec:options} The formatting of trees, conclusion texts and inference rules is affected by -options, specfied using the key-value system of PGF/TikZ, provided by the -\package{pgfkeys} package. -All options are in the \lit{/ebproof/} path in the key tree of -\package{pgfkeys}. +options, specified using the \LaTeX3 key-value system. +All options are in the \lit{ebproof} module in the key tree. They can be set locally for a proof tree or for a single statement using optional arguments in the associated commands. @@ -297,10 +326,10 @@ Proof trees grow downwards, with conclusions above and premisses below. \begin{example}{gobble=4} \begin{prooftree}[proof style=downwards] - \Hypo{ \Gamma, A &\vdash B } - \Infer1[abs]{ \Gamma &\vdash A\to B } - \Hypo{ \Gamma \vdash A } - \Infer2[app]{ \Gamma \vdash B } + \hypo{ \Gamma, A &\vdash B } + \infer1[abs]{ \Gamma &\vdash A\to B } + \hypo{ \Gamma \vdash A } + \infer2[app]{ \Gamma \vdash B } \end{prooftree} \end{example} \end{csdoc} @@ -319,12 +348,12 @@ The default value is \lit{true}. \begin{example}{gobble=4} \begin{prooftree}[center=false] - \Infer0{ A \vdash A } + \infer0{ A \vdash A } \end{prooftree} \qquad \begin{prooftree}[center=false] - \Hypo{ \Gamma, A \vdash B } - \Infer1{ \Gamma \vdash A \to B } + \hypo{ \Gamma, A \vdash B } + \infer1{ \Gamma \vdash A \to B } \end{prooftree} \end{example} \end{csdoc} @@ -336,9 +365,9 @@ The default value is \lit{1.5em}. \begin{example}{gobble=4} \begin{prooftree}[separation=0.5em] - \Hypo{ A } \Hypo{ B } \Infer2{ C } - \Hypo{ D } \Hypo{ E } \Hypo{ F } \Infer3{ G } - \Hypo{ H } \Infer[separation=3em]3{ K } + \hypo{ A } \hypo{ B } \infer2{ C } + \hypo{ D } \hypo{ E } \hypo{ F } \infer3{ G } + \hypo{ H } \infer[separation=3em]3{ K } \end{prooftree} \end{example} \end{csdoc} @@ -348,10 +377,10 @@ The default value is \lit{0.7ex}. \begin{example}{gobble=4} \begin{prooftree}[rule margin=2ex] - \Hypo{ \Gamma, A &\vdash B } - \Infer1[abs]{ \Gamma &\vdash A\to B } - \Hypo{ \Gamma \vdash A } - \Infer2[app]{ \Gamma \vdash B } + \hypo{ \Gamma, A &\vdash B } + \infer1[abs]{ \Gamma &\vdash A\to B } + \hypo{ \Gamma \vdash A } + \infer2[app]{ \Gamma \vdash B } \end{prooftree} \end{example} \end{csdoc} @@ -377,24 +406,25 @@ \end{csdoc} The precise rendering is influenced by parameters specified below. Arbitrary new shapes can defined using the \lit{rule code} option described - afterwards. + below and the \cs{ebproofnewrulestyle} command described in + section~\ref{sec:styles}. \end{csdoc} -In the optional argument of the \cs{Infer} statement, rule styles can be +In the optional argument of the \cs{infer} statement, rule styles can be specified directly, without prefixing the style name by ``\lit{rule style=}''. -For instance, \cs{Infer}\lit{[dashed]} is equivalent to -\cs{Infer}\lit{[rule style=dashed]}. +For instance, \cs{infer}\lit{[dashed]} is equivalent to +\cs{infer}\lit{[rule style=dashed]}. \begin{example}{gobble=2} \begin{prooftree} - \Hypo{ \Gamma &\vdash A \to B } - \Infer[no rule]1{ \Gamma &\vdash {!A} \multimap B } - \Hypo{ \Delta &\vdash A } - \Infer[rule thickness=2pt]1{ \Delta &\vdash {!A} } - \Infer0{ B \vdash B } - \Infer[dashed]2{ \Delta, {!A}\multimap B \vdash B } - \Infer2{ \Gamma, \Delta &\vdash B } - \Infer[double]1{ \Gamma \cup \Delta &\vdash B } + \hypo{ \Gamma &\vdash A \to B } + \infer[no rule]1{ \Gamma &\vdash {!A} \multimap B } + \hypo{ \Delta &\vdash A } + \infer[rule thickness=2pt]1{ \Delta &\vdash {!A} } + \infer0{ B \vdash B } + \infer[dashed]2{ \Delta, {!A}\multimap B \vdash B } + \infer2{ \Gamma, \Delta &\vdash B } + \infer[double]1{ \Gamma \cup \Delta &\vdash B } \end{prooftree} \end{example} @@ -426,34 +456,16 @@ \begin{prooftree}[rule code={\hbox{\tikz \draw[decorate,decoration={snake,amplitude=.3ex}] (0,0) -- (\hsize,0);}}] - \Hypo{ \Gamma &\vdash A } - \Infer1{ \Gamma &\vdash A, \ldots, A } - \Hypo{ \Delta, A, \ldots, A \vdash \Theta } - \Infer2{ \Gamma, \Delta \vdash \Theta } + \hypo{ \Gamma &\vdash A } + \infer1{ \Gamma &\vdash A, \ldots, A } + \hypo{ \Delta, A, \ldots, A \vdash \Theta } + \infer2{ \Gamma, \Delta \vdash \Theta } \end{prooftree} \end{example} Note that this example requires the \package{tikz} package, with the \package{decorations.pathmorphing} library for the \lit{snake} decoration. \end{csdoc} -The option \opt{rule code} is particularly useful in a ``styles'' in the sense of -\package{pgfkeys} as it allows to define new rule styles. -The allowed values for \opt{rule style} are actually defined this way. -The above example could be turned into a new rule style \lit{zigzag} with the -following command: -\begin{example}{gobble=2} - \ebproofset{ - rule style/zigzag/.style={rule code={\hbox{\tikz - \draw[decorate,decoration={snake,amplitude=.3ex}] - (0,0) -- (\hsize,0);}}}} - \begin{prooftree} - \Hypo{ \Gamma &\vdash A } - \Infer1{ \Gamma &\vdash A, \ldots, A } - \Hypo{ \Delta, A, \ldots, A \vdash \Theta } - \Infer[zigzag]2{ \Gamma, \Delta \vdash \Theta } - \end{prooftree} -\end{example} - \subsection{Format of conclusions} \begin{csdoc}{% @@ -462,8 +474,8 @@ \opt{right template=}\meta{code}} Defines how conclusions are formatted. The code is arbitrary \TeX\ code, composed in horizontal mode. - The macro \cs{inserttext} can be used inside the actual text passed to the - \cs{Hypo} and \cs{Infer} statements. + The macro \cs{inserttext} is used to insert the actual text passed to the + \cs{hypo} and \cs{infer} statements. The \opt{template} value is used for conclusions with no alignment mark. The \opt{left template} and \opt{right template} values are used on the left and right side of the alignment mark when it is present. @@ -471,14 +483,14 @@ conclusions are set in math mode. The default values for \opt{left template} and \opt{right template} are similar, with spacing assuming that a relation symbol is put near the - alignment mark, so that \verb|\Infer1{A &\vdash B}| is spaced correctly. + alignment mark, so that \verb|\infer1{A &\vdash B}| is spaced correctly. \begin{example}{gobble=4} \begin{prooftree}[template=(\textbf\inserttext)] - \Hypo{ foo } - \Hypo{ bar } - \Infer1{ baz } - \Infer2{ quux } + \hypo{ foo } + \hypo{ bar } + \infer1{ baz } + \infer2{ quux } \end{prooftree} \end{example} \end{csdoc} @@ -490,8 +502,18 @@ \opt{right label=}\meta{text}} The text to use as the labels of the rules, on the left and on the right of the inference line. - Using the second optional argument in \cs{Infer} is equivalent to setting + Using the second optional argument in \cs{infer} is equivalent to setting the \env{right label} option with the value of that argument. + + \begin{example}{gobble=4} + \begin{prooftree} + \hypo{ \Gamma, A &\vdash B } + \infer[left label=$\lambda$]1[abs] + { \Gamma &\vdash A\to B } + \hypo{ \Gamma \vdash A } + \infer[left label=@]2[app]{ \Gamma \vdash B } + \end{prooftree} + \end{example} \end{csdoc} \begin{csdoc}{% \opt{left label template=}\meta{code} \\ @@ -508,6 +530,60 @@ The spacing between an inference lines and its labels. The default value is \lit{0.5em}. \end{csdoc} +\begin{csdoc}{\opt{label axis=}\meta{dimension}} + The height of the horizontal axis used for aligning the labels with the + rules. The default value is \lit{0.5ex}. +\end{csdoc} + + +\subsection{Style macros} +\label{sec:styles} + +The following commands allow for the definition of custom styles using the +basic style options, in a way similar to PGF's ``styles'' and \LaTeX3's +``meta-keys''. +This allows setting a bunch of options with the same values in many proofs +using a single definition. + +\begin{csdoc}{\cs{ebproofnewstyle}\marg{name}\marg{options}} + Define a new style option \meta{name} that sets the given \meta{options}. + + For instance, the following code defines a new option \opt{small} that sets + various parameters so that proofs are rendered smaller. + \begin{example}{gobble=4} + \ebproofnewstyle{small}{ + separation = 1em, rule margin = .5ex, + template = \footnotesize$\inserttext$ } + \begin{prooftree}[small] + \hypo{ \Gamma, A \vdash B } + \infer1{ \Gamma \vdash A\to B } + \hypo{ \Gamma \vdash A } \infer2{ \Gamma \vdash B } + \end{prooftree} + \end{example} +\end{csdoc} + +\begin{csdoc}{\cs{ebproofnewrulestyle}\marg{name}\marg{options}} + Define a new rule style. + The \meta{options} part includes options used to set how to draw rules in + the new style. + + The option \opt{rule code} is useful in this command as it allows to + define arbitrary rule styles. + For instance, the squiggly rule example above could be turned into a new + rule style \lit{zigzag} with the following code: + \begin{example}{gobble=4} + \ebproofnewrulestyle{zigzag}{ + rule code = {\hbox{\tikz + \draw[decorate,decoration={snake,amplitude=.3ex}] + (0,0) -- (\hsize,0);}}} + \begin{prooftree} + \hypo{ \Gamma &\vdash A } + \infer1{ \Gamma &\vdash A, \ldots, A } + \hypo{ \Delta, A, \ldots, A \vdash \Theta } + \infer[zigzag]2{ \Gamma, \Delta \vdash \Theta } + \end{prooftree} + \end{example} +\end{csdoc} \section{License} @@ -528,4 +604,35 @@ This work consists of the files \texttt{ebproof.sty} and \texttt{ebproof.tex}. + +\section{History} + +This section lists the principal evolutions of the package, in reverse +chronological order. +\begin{description} +\item[Version 2.0] + A complete rewrite of the code using the \LaTeX3 programming environment. + The incompatible changes from the user's point of view are the following: + \begin{itemize} + \item Proof statements are now writtten in lowercase ({i.e.} \cs{Infer} is + now written \cs{infer} etc.) but the syntax is otherwise unchanged. + The old uppercase commands still work but produce a deprecation warning, + they will be removed in a future version. + \item New styles are now defined using \cs{ebproofnewstyle} and + \cs{ebproofnewrulestyle}. The previous method using PGF styles does not + work anymore (because PGF is not used anymore). + \end{itemize} + The new commands and options are the following: + \begin{itemize} + \item The statement \cs{rewrite} generalizes \cs{Alter}, + \item The option \opt{label axis} controls vertical alignment of labels. + \end{itemize} +\item[Version 1.1] + A bugfix release. + In \opt{template} options, one now uses \cs{inserttext} instead of \lit{\#1} + for the text arguments, which improves robustness. +\item[Version 1.0] + The first public release. +\end{description} + \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebproof.doc.tlpobj new/tlpkg/tlpobj/ebproof.doc.tlpobj --- old/tlpkg/tlpobj/ebproof.doc.tlpobj 2016-04-14 18:59:04.000000000 +0200 +++ new/tlpkg/tlpobj/ebproof.doc.tlpobj 2017-05-18 02:22:02.000000000 +0200 @@ -1,9 +1,9 @@ name ebproof.doc category Package -revision 36595 +revision 44392 shortdesc doc files of ebproof relocated 1 -docfiles size=55 - RELOC/doc/latex/ebproof/README +docfiles size=63 + RELOC/doc/latex/ebproof/README.md RELOC/doc/latex/ebproof/ebproof.pdf RELOC/doc/latex/ebproof/ebproof.tex ++++++ ebproof.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ebproof/ebproof.sty new/tex/latex/ebproof/ebproof.sty --- old/tex/latex/ebproof/ebproof.sty 2015-03-22 22:22:17.000000000 +0100 +++ new/tex/latex/ebproof/ebproof.sty 2017-05-17 23:51:34.000000000 +0200 @@ -1,8 +1,8 @@ % The ebproof package - Formal proofs in the style of sequent calculus %% ebproof.sty -%% Copyright 2015 Emmanuel Beffara <manu(a)beffara.org> -% +%% Copyright 2017 Emmanuel Beffara <manu(a)beffara.org> + % 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. @@ -10,543 +10,758 @@ % 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 Emmanuel Beffara. -% + % This work consists of the files ebproof.sty and ebproof.tex. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ebproof}[2015/03/13 v1.1 EB's proof trees] +\RequirePackage{expl3} +\RequirePackage{xparse} +\ProvidesExplPackage{ebproof}{2017/05/17}{2.0}{EB's proof trees} -% The |pgfkeys| package is used for the parameters in proof construction. -\RequirePackage{pgfkeys} +%% Parameters -%%% Registers and internal parameters +%%% Declaration of the parameters -\newif\ifebproof@updown \ebproof@updownfalse -\newif\ifebproof@center \ebproof@centertrue +\keys_define:nn { ebproof } { -%%% Parameters +% general shape -\def\ebproofset#1{\pgfqkeys{/ebproof}{#1}} +center .bool_set:N = \l_ebproof_center_bool, + +proof~style .choice: , +proof~style / upwards .code:n = \bool_set_false:N \l_ebproof_updown_bool, +proof~style / downwards .code:n = \bool_set_true:N \l_ebproof_updown_bool, -\ebproofset{ -% -% general shape -% -center/.is if=ebproof@center, -proof style/.is choice, -proof style/upwards/.code={\ebproof@updownfalse}, -proof style/downwards/.code={\ebproof@updowntrue}, -% % spacing -% -separation/.initial=1.5em, -rule margin/.initial=.7ex, -% + +separation .dim_set:N = \l_ebproof_separation_dim, +rule~margin .dim_set:N = \l_ebproof_rule_margin_dim, + % shape of inference lines -% -rule thickness/.initial=.4pt, -rule separation/.initial=2pt, -rule dash length/.initial=.2em, -rule dash space/.initial=.3em, -rule code/.initial=, -% + +rule~thickness .dim_set:N = \l_ebproof_rule_thickness_dim, +rule~separation .dim_set:N = \l_ebproof_rule_separation_dim, +rule~dash~length .dim_set:N = \l_ebproof_rule_dash_length_dim, +rule~dash~space .dim_set:N = \l_ebproof_rule_dash_space_dim, +rule~code .tl_set:N = \l_ebproof_rule_code_tl, + +rule~style .choice:, + % templates -% -template/.initial=$\inserttext$, -left template/.initial=$\inserttext\mathrel{}$, -right template/.initial=$\mathrel{}\inserttext$, -% + +template .tl_set:N = \l_ebproof_template_tl, +left~template .tl_set:N = \l_ebproof_left_template_tl, +right~template .tl_set:N = \l_ebproof_right_template_tl, + % labels -% -left label/.initial=, -right label/.initial=, -left label template/.initial=\inserttext, -right label template/.initial=\inserttext, -label separation/.initial=0.5em, + +left~label .tl_set:N = \l_ebproof_left_label_tl, +right~label .tl_set:N = \l_ebproof_right_label_tl, +left~label~template .tl_set:N = \l_ebproof_left_label_template_tl, +right~label~template .tl_set:N = \l_ebproof_right_label_template_tl, +label~separation .dim_set:N = \l_ebproof_label_separation_dim, +label~axis .dim_set:N = \l_ebproof_label_axis_dim, + } -% Rule styles - -\pgfqkeys{/ebproof/rule style}{ -.is choice, -.search also=/ebproof, -simple/.style={/ebproof/rule code={% - \hrule height \pgfkeysvalueof{/ebproof/rule thickness}\relax - }}, -% -no rule/.style={/ebproof/rule code=}, -% -double/.style={/ebproof/rule code={% - \hrule height \pgfkeysvalueof{/ebproof/rule thickness} - \kern\pgfkeysvalueof{/ebproof/rule separation}% - \hrule height \pgfkeysvalueof{/ebproof/rule thickness} - }}, -% -dashed/.style={/ebproof/rule code={% - \hbox to \hsize{% - \@tempdima=\pgfkeysvalueof{/ebproof/rule dash space}% - \divide\@tempdima2% - \kern-\@tempdima% - \cleaders\hbox{% - \kern\@tempdima% - \vrule - height \pgfkeysvalueof{/ebproof/rule thickness} - width \pgfkeysvalueof{/ebproof/rule dash length}% - \kern\@tempdima - }\hfill - \kern-\@tempdima - }% - }}, -% -simple % use the 'simple' rule style by default +%%% Rule styles + +\NewDocumentCommand \ebproofnewrulestyle { mm } { + \keys_define:nn { ebproof } { + rule~style / #1 .meta:nn = { ebproof } { #2 } + } } -%%% Storage +\ebproofnewrulestyle { simple } { + rule~code = { \tex_hrule:D height \l_ebproof_rule_thickness_dim } +} + +\ebproofnewrulestyle { no~rule } { + rule~code = +} + +\ebproofnewrulestyle { double } { + rule~code = { + \tex_hrule:D height \l_ebproof_rule_thickness_dim + \skip_vertical:N \l_ebproof_rule_separation_dim + \tex_hrule:D height \l_ebproof_rule_thickness_dim + } +} + +\ebproofnewrulestyle { dashed } { + rule~code = { + \hbox_to_wd:nn { \tex_hsize:D } { + \dim_set:Nn \l_tmpa_dim { \l_ebproof_rule_dash_space_dim / 2 } + \skip_horizontal:n { -\l_tmpa_dim } + \tex_cleaders:D \hbox:n { + \skip_horizontal:N \l_tmpa_dim + \tex_vrule:D + height \l_ebproof_rule_thickness_dim + width \l_ebproof_rule_dash_length_dim + \skip_horizontal:N \l_tmpa_dim + }\tex_hfill:D + \skip_horizontal:n { -\l_tmpa_dim } + } + } +} + +%%% Default values + +\keys_set:nn { ebproof } { + center = true, + proof~style = upwards, + separation = 1.5em, + rule~margin = .7ex, + rule~thickness = .4pt, + rule~separation = 2pt, + rule~dash~length = .2em, + rule~dash~space = .3em, + rule~style = simple, + template = $\inserttext$, + left~template = $\inserttext\mathrel{}$, + right~template = $\mathrel{}\inserttext$, + left~label = , + right~label = , + left~label~template = \inserttext, + right~label~template = \inserttext, + label~separation = 0.5em, + label~axis = 0.5ex +} + +%%% Defining style macros + +\NewDocumentCommand \ebproofnewstyle { mm } { + \keys_define:nn { ebproof } { #1 .meta:n = { #2 } } +} + + +%% Proof trees + +% Proof trees are represented as a data structure that consists of a box and a +% set of marks, which are vertical positions in the box (as distances from the +% left edge). Arbitrary marks can be defined, the folowing are used for +% alignment: +% - left : the left of the conclusion +% - right : the right of the conclusion +% - axis : the vertical axis of the conclusion + + +%%% Registers -% Proof trees are represented as a data structure that consists of the -% following data: -% -% - box : the tree itself, as a box, with the base line on that of -% the conclusion -% - left : the distance from the left of the box to the left of the -% conclusion -% - right : the distance from the right of the box to the right of the -% conclusion -% - axis : the distance from the left of the box to the vertical axis -% of the conclusion -% % TeX does not actually provide data structures, so we have to encode things. -% First we provide local allocators, for temporary allocation of registers in -% a group. Dimensions are initialized to 0pt. +% We provide an allocator for "registers" holding boxes with attributes. Such +% a register consists in a box register and a property list for marks, which +% maps mark names to values as explicit dimensions with units. + +% Create a new register. + +\cs_new:Nn \ebproof_new:N { + \box_new:N #1 + \prop_new:c { l_ebproof_marks_ \__int_value:w #1 _prop } +} -\def\ebproof@localdimen#1{% - \advance\count11\@ne% \count11 is the number of the last allocated \dimen - \expandafter\dimendef\csname#1\endcsname=\count11% - \csname#1\endcsname=0pt\relax} +% Clear a register. -% For boxes, the allocator must be used as -% -% \ebproof@localbox{NAME}=\hbox{...} +\cs_new:Nn \ebproof_clear:N { + \hbox_set:Nn #1 {} + % Using \box_clear:N instead would not work because trying to push this box + % on the stack would not actually append any box. + \prop_clear:c { l_ebproof_marks_ \__int_value:w #1 _prop } + \ebproof_set_mark:Nnn #1 { left } { 0pt } + \ebproof_set_mark:Nnn #1 { right } { 0pt } + \ebproof_set_mark:Nnn #1 { axis } { 0pt } +} + + +%%% Mark operations + +% Set the value of a mark. The third argument is a dimension expression. + +\dim_new:N \l_ebproof_transit_dim + +\cs_new:Nn \ebproof_set_mark:Nnn { + \dim_set:Nn \l_ebproof_transit_dim { #3 } + \prop_put:cnV { l_ebproof_marks_ \__int_value:w #1 _prop } { #2 } + \l_ebproof_transit_dim +} + +% Get the value of a mark. This is expandable and can be used in expressions. + +\cs_new:Nn \ebproof_mark:Nn { + \prop_item:cn { l_ebproof_marks_ \__int_value:w #1 _prop } { #2 } +} + +% Shift the marks by a specified amount, without modifying the box. + +\cs_new:Nn \ebproof_shift_x:Nn { + \prop_map_inline:cn { l_ebproof_marks_ \__int_value:w #1 _prop } { + \ebproof_set_mark:Nnn #1 { ##1 } { ##2 + #2 } + } +} + +% Move the left and right marks of the first tree so that they are at least as +% far from the axis as they are in the second tree. For instance if the marks +% are set as +% 1: L---A-------R +% 2: L-------A---R +% then the marks of the first tree are then set as +% 1: L-------A-------R +% The contents of the tree are unchanged. + +\cs_new:Nn \ebproof_enlarge_conclusion:NN { + \dim_set:Nn \l_tmpa_dim { \ebproof_mark:Nn #1 {axis} + + \ebproof_mark:Nn #2 {left} - \ebproof_mark:Nn #2 {axis} } + \dim_compare:nNnT { \l_tmpa_dim } < { \ebproof_mark:Nn #1 {left} } { + \ebproof_set_mark:Nnn #1 {left} { \l_tmpa_dim } } + \dim_set:Nn \l_tmpa_dim { \ebproof_mark:Nn #1 {axis} + + \ebproof_mark:Nn #2 {right} - \ebproof_mark:Nn #2 {axis} } + \dim_compare:nNnT { \l_tmpa_dim } > { \ebproof_mark:Nn #1 {right} } { + \ebproof_set_mark:Nnn #1 {right} { \l_tmpa_dim } } +} + + +%%% Building blocks + +% Make a tree with explicit material in horizontal mode. Set the left and +% right marks to extremal positions and set the axis in the middle. + +\cs_new:Nn \ebproof_make_simple:Nn { + \hbox_set:Nn #1 { #2 } + \ebproof_set_mark:Nnn #1 { left } { 0pt } + \ebproof_set_mark:Nnn #1 { axis } { \box_wd:N #1 / 2 } + \ebproof_set_mark:Nnn #1 { right } { \box_wd:N #1 } +} + +% Make a tree with explicit material in horizontal mode, split in two parts. +% Set the left and right marks to extremal positions and set the axis between +% the two parts. + +\cs_new:Nn \ebproof_make_split:Nnn { + \ebproof_set_mark:Nnn #1 { left } { 0pt } + \hbox_set:Nn #1 { #2 } + \ebproof_set_mark:Nnn #1 { axis } { \box_wd:N #1 } + \hbox_set:Nn #1 { \hbox_unpack:N #1 #3 } + \ebproof_set_mark:Nnn #1 { right } { \box_wd:N #1 } +} + +% Make a tree with explicit material in vertical mode, using an explicit width +% and axis. + +\cs_new:Nn \ebproof_make_vertical:Nnnn { + \ebproof_set_mark:Nnn #1 { left } { 0pt } + \ebproof_set_mark:Nnn #1 { axis } { #2 } + \ebproof_set_mark:Nnn #1 { right } { #3 } + \vbox_set:Nn #1 { + \dim_set:Nn \tex_hsize:D { \ebproof_mark:Nn #1 {right} } + #4 + } + \box_set_wd:Nn #1 { \ebproof_mark:Nn #1 {right} } +} + +%%% Assembling boxes + +% Extend a tree box. The marks are shifted so that alignment is preserved. The +% arguments are dimensions for the left, top, right and bottom sides +% respectively. + +\cs_new:Nn \ebproof_extend:Nnnnn { + \dim_compare:nNnF { #2 } = { 0pt } { + \hbox_set:Nn #1 { + \skip_horizontal:n { #2 } + \box_use:N #1 + } + \ebproof_shift_x:Nn #1 { #2 } + } + \box_set_ht:Nn #1 { \box_ht:N #1 + #3 } + \box_set_wd:Nn #1 { \box_wd:N #1 + #4 } + \box_set_dp:Nn #1 { \box_dp:N #1 + #5 } +} + +% Append the contents of the second tree to the first one on the right, with +% matching baselines. The marks of both trees are preserved. The middle +% argument specifies the space to insert between boxes. + +\cs_new:Nn \ebproof_append_right:NnN { + \hbox_set:Nn #1 { + \box_use:N #1 + \dim_compare:nNnF { #2 } = { 0pt } { \skip_horizontal:n { #2 } } + \box_use:N #3 + } +} + +% Append the contents of the second tree to the first one on the left, with +% matching baselines. The marks of the first tree are shifted accordingly. The +% middle argument specifies the space to insert between boxes. + +\cs_new:Nn \ebproof_append_left:NnN { + \ebproof_shift_x:Nn #1 { \box_wd:N #3 + #2 } + \hbox_set:Nn #1 { + \box_use:N #3 + \dim_compare:nNnF { #2 } = { 0pt } { \skip_horizontal:n { #2 } } + \box_use:N #1 + } +} + +% Shift of two trees to the right so that the axes match. The marks of the one +% that is shifted are updated accordingly. + +\cs_new:Nn \ebproof_align:NN { + \dim_set:Nn \l_tmpa_dim + { \ebproof_mark:Nn #2 {axis} - \ebproof_mark:Nn #1 {axis} } + \dim_compare:nNnTF \l_tmpa_dim < { 0pt } { + \ebproof_extend:Nnnnn #2 { -\l_tmpa_dim } { 0pt } { 0pt } { 0pt } + } { + \ebproof_extend:Nnnnn #1 { \l_tmpa_dim } { 0pt } { 0pt } { 0pt } + } +} + +% Append the contents of the second tree above the first one, with matching +% axes. The marks of the first tree are preserved. + +\cs_new:Nn \ebproof_append_above:NN { + \ebproof_align:NN #1 #2 + \vbox_set:Nn #1 { + \box_use:N #2 + \tex_prevdepth:D -1000pt + \box_use:N #1 + } +} + +% Append the contents of the second tree below the first one, with matching +% axes. The marks of the first tree are preserved. + +\cs_new:Nn \ebproof_append_below:NN { + \ebproof_align:NN #1 #2 + \vbox_set_top:Nn #1 { + \box_use:N #1 + \tex_prevdepth:D -1000pt + \box_use:N #2 + } +} + +% Shift the material in a tree vertically so that the height and depth are +% equal (like TeX's \vcenter but around the baseline). + +\cs_new:Nn \ebproof_vcenter:N { + \dim_set:Nn \l_tmpa_dim { ( \box_ht:N #1 - \box_dp:N #1 ) / 2 } + \box_set_eq:NN \l_tmpa_box #1 + \hbox_set:Nn #1 + { \box_move_down:nn { \l_tmpa_dim } { \box_use:N \l_tmpa_box } } +} + + +%% Making inferences % -% in order to set the value of the box. +% The following commands use the parameters defined at the beginning of the +% package for actually building proof trees using the commands defined above. + +% Append the contents of the second tree above or below the first one, +% depending on current settings. Axes are aligned and the marks of the first +% tree are preserved. + +\cs_new:Nn \ebproof_append_vertical:NN { + \bool_if:NTF \l_ebproof_updown_bool + { \ebproof_append_below:NN #1 #2 } + { \ebproof_append_above:NN #1 #2 } +} -\def\ebproof@localbox#1{% - \advance\count14\@ne% \count14 is the number of the last allocated \box - \expandafter\chardef\csname#1\endcsname\count14% - \setbox\csname#1\endcsname} - -% From this we deduce an allocator for data structures. This allocator -% receives a base name |A| and defines the registers |\A@box|, |\A@left|, -% |\A@right| and |\A@axis|. The macro is used like |\ebproof@localbox|, by -% providing a value for the box. - -\def\ebproof@alloc#1{% - \ebproof@localdimen{#1@left}% - \ebproof@localdimen{#1@right}% - \ebproof@localdimen{#1@axis}% - \ebproof@localbox{#1@box}} - -% Logically, such structures are stored on a stack. However, TeX does not -% provide data structures, so we encode them using what we actually have. A -% stack for boxes is implemented using a global hbox |\ebproof@box@stack| that -% contains all the boxes successively, and the |\lastbox| primitive allows us -% to pop elements from there. A macro |\ebproof@stack| is used to store the -% dimensions textually: the empty stack is an empty macro, and a non-empty -% stack is represented as |{left}{right}{axis}{tail}|. We maintain a counter -% |\ebproof@level| with the number of elements on the stack, for consistency -% checks. - -\newcount\ebproof@level -\newbox\ebproof@box@stack -\newbox\ebproof@box@temp +% Make a box containing an inference rule with labels, using the current +% settings. The width and axis position are taken as those of the conclusion +% of another tree box. The third argument is used as a temporary register for +% building labels. + +\cs_new:Nn \ebproof_make_rule_for:NNN { + + % Build the rule. + + \ebproof_make_vertical:Nnnn #1 + { \ebproof_mark:Nn #2 {axis} - \ebproof_mark:Nn #2 {left} } + { \ebproof_mark:Nn #2 {right} - \ebproof_mark:Nn #2 {left} } + { + \skip_vertical:N \l_ebproof_rule_margin_dim + \tl_if_empty:NF { \l_ebproof_rule_code_tl } { + \tl_use:N \l_ebproof_rule_code_tl + \skip_vertical:N \l_ebproof_rule_margin_dim + } + } + \ebproof_vcenter:N #1 + + % Append the left label + + \tl_if_blank:VF \l_ebproof_left_label_tl { + \ebproof_make_simple:Nn #3 { + \box_move_down:nn { \l_ebproof_label_axis_dim } { \hbox:n { + \cs_set_eq:NN \inserttext \l_ebproof_left_label_tl + \tl_use:N \l_ebproof_left_label_template_tl + } } + } + \box_set_ht:Nn #3 { 0pt } + \box_set_dp:Nn #3 { 0pt } + \ebproof_append_left:NnN + \l_ebproof_c_box \l_ebproof_label_separation_dim \l_ebproof_d_box + } + + % Append the right label + + \tl_if_blank:VF \l_ebproof_right_label_tl { + \ebproof_make_simple:Nn #3 { + \box_move_down:nn { \l_ebproof_label_axis_dim } { \hbox:n { + \cs_set_eq:NN \inserttext \l_ebproof_right_label_tl + \tl_use:N \l_ebproof_right_label_template_tl + } } + } + \box_set_ht:Nn #3 { 0pt } + \box_set_dp:Nn #3 { 0pt } + \ebproof_append_right:NnN + \l_ebproof_c_box \l_ebproof_label_separation_dim \l_ebproof_d_box + } + +} + + +%% Stack-based interface + +%%% The stack + +% Logically, box structures are stored on a stack. However, TeX does not +% provide data structures for that and the grouping mechanism is not flexible +% enough, so we encode them using what we actually have. A stack for boxes is +% implemented using a global hbox |\g_ebproof_stack_box| that contains all the +% boxes successively. A sequence |\g_ebproof_stack_seq| is used to store the +% dimensions property lists textually. We maintain a counter +% |\g_ebproof_level_int| with the number of elements on the stack, for +% consistency checks. + +\int_new:N \g_ebproof_level_int +\box_new:N \g_ebproof_stack_box +\seq_new:N \g_ebproof_stack_seq % Clear the stack. -\def\ebproof@clear{% - \global\ebproof@level=0% - \global\setbox\ebproof@box@stack=\box\voidb@x% - \gdef\ebproof@stack{}} - -% Push an allocated structure (by name) on the stack. - -\def\ebproof@push#1{% - \global\advance\ebproof@level1\relax - \global\setbox\ebproof@box@stack=\hbox{% - \unhbox\ebproof@box@stack\copy\csname#1@box\endcsname}% - \xdef\ebproof@stack{% - {\the\csname#1@left\endcsname}% - {\the\csname#1@right\endcsname}% - {\the\csname#1@axis\endcsname}% - {\ebproof@stack}}} - -% Allocate a structure and pop its value from the top of the stack. - -\def\ebproof@pop#1{% - \ifnum\ebproof@level>0\relax - \global\advance\ebproof@level-1\relax - \global\setbox\ebproof@box@stack=\hbox{% - \unhbox\ebproof@box@stack - \global\setbox\ebproof@box@temp=\lastbox}% - \ebproof@alloc{#1}=\box\ebproof@box@temp% - \begingroup\def\pop##1##2##3##4{\endgroup% - \csname#1@left\endcsname=##1\relax - \csname#1@right\endcsname=##2\relax - \csname#1@axis\endcsname=##3\relax - \gdef\ebproof@stack{##4}}% - \expandafter\pop\ebproof@stack - \else - \PackageError{ebproof}{% - Missing premiss in a proof tree}{}% - \ebproof@alloc{#1}=\box\voidb@x% - \fi} - - -%%% Making boxes - -% Push a box with the axis in the middle. - -\def\ebproof@pushsimple#1{% - \begingroup - \ebproof@alloc{A}=\hbox{#1}% - \A@axis=.5\wd\A@box - \ebproof@push{A}% - \endgroup} - -% Push a box made of two halves, with the axis between the halves. - -\def\ebproof@pushsplit#1#2{% - \begingroup - \ebproof@alloc{A}=\hbox{#1}% - \A@axis=\wd\A@box - \setbox\A@box=\hbox{\unhbox\A@box#2}% - \ebproof@push{A}% - \endgroup} - -% Join horizontally the two elements at the top of the stack. - -\def\ebproof@joinh{% - \begingroup - \ebproof@pop{A}% - \ebproof@pop{B}% - \ebproof@alloc{C}=\hbox{% - \box\B@box - \kern\pgfkeysvalueof{/ebproof/separation}% - \box\A@box}% - \C@left=\B@left - \C@right=\A@right - \C@axis=\wd\C@box - \advance\C@axis\B@left - \advance\C@axis-\A@right - \divide\C@axis2\relax - \ebproof@push{C}% - \endgroup} - -% An $n$-ary version of the horizontal join. - -\def\ebproof@joinh@multi#1{% - \begingroup - \countdef\c=1 - \c=#1\relax% - \ifnum\c=0 - \ebproof@alloc{X}=\hbox{}% - \ebproof@push{X}% - \else - \ebproof@joinh@loop - \fi - \endgroup} -\def\ebproof@joinh@loop{% - \ifnum\c>1 - \ebproof@joinh - \advance\c-1 - \expandafter\ebproof@joinh@loop - \fi} - -% Append the last element to the right of the previous one, without changing -% its alignment. - -\def\ebproof@joinright{% - \begingroup - \ebproof@pop{A}% - \ebproof@pop{B}% - \ebproof@alloc{C}=\hbox{% - \box\B@box - \kern\pgfkeysvalueof{/ebproof/separation}% - \copy\A@box}% - \C@left=\B@left - \C@right=\B@right - \advance\C@right\wd\A@box - \advance\C@right\pgfkeysvalueof{/ebproof/separation}% - \ebproof@push{C}% - \endgroup} +\cs_new:Nn \ebproof_clear_stack: { + \int_gset:Nn \g_ebproof_level_int { 0 } + \hbox_gset:Nn \g_ebproof_stack_box { } + \seq_gclear:N \g_ebproof_stack_seq +} -% Join vertically the two elements at the top of the stack, with a horizontal -% rule of the appropriate size. +% Push the contents of a register on the stack. -\def\ebproof@joinv{% - \begingroup - \ebproof@pop{A}% - \ebproof@pop{B}% - % - \ebproof@alloc{C}=\box\voidb@x% - \ebproof@localdimen{A@shift}% - \ebproof@localdimen{B@shift}% - \ebproof@localdimen{R@shift}% - \ebproof@localdimen{R@raise}% - \ebproof@localdimen{R@width}% - \ebproof@localdimen{C@width}% - \ebproof@localdimen{tmp}% - % - % The placement of the boxes and the axis of the result - \ifdim\A@axis>\B@axis - \A@shift=0pt% - \B@shift=\A@axis - \advance\B@shift-\B@axis - \C@axis=\A@axis - \else - \A@shift=\B@axis - \advance\A@shift-\A@axis - \B@shift=0pt% - \C@axis=\B@axis - \fi - % The paddings of the result - \C@left=\A@left - \advance\C@left\A@shift - \C@right=\A@right - \tmp=\wd\B@box - \advance\tmp\B@shift - \advance\tmp-\wd\A@box - \advance\tmp-\A@shift - \ifdim\tmp>0pt% - \C@width=\wd\B@box - \advance\C@width\B@shift - \advance\C@right\tmp - \else - \C@width=\wd\A@box - \advance\C@width\A@shift - \fi - % The position of the rule - \R@shift=\A@left - \advance\R@shift\A@shift - \tmp=\B@left - \advance\tmp\B@shift - \ifdim\R@shift>\tmp - \R@shift=\tmp - \fi - % The width of the rule - \R@width=\wd\A@box - \advance\R@width\A@shift - \advance\R@width-\A@right - \tmp=\wd\B@box - \advance\tmp\B@shift - \advance\tmp-\B@right - \ifdim\tmp>\R@width - \R@width=\tmp - \fi - \advance\R@width-\R@shift - % Make the rule box - \ebproof@localbox{R@box}=\vbox{% - \hsize=\R@width - \hrule width \R@width height 0pt\relax - \kern\pgfkeysvalueof{/ebproof/rule margin}% - \pgfkeysgetvalue{/ebproof/rule code}{\@rulecode}% - \ifx\@rulecode\@empty\else - \@rulecode - \unskip% so that only one margin is inserted if no rule is drawn - \kern\pgfkeysvalueof{/ebproof/rule margin}% - \fi - }% - % Make the label boxes - \ebproof@localbox{LEFT}=\hbox{% - \def\inserttext{\pgfkeysvalueof{/ebproof/left label}}% - \pgfkeysvalueof{/ebproof/left label template}}% - \ebproof@localbox{RIGHT}=\hbox{% - \def\inserttext{\pgfkeysvalueof{/ebproof/right label}}% - \pgfkeysvalueof{/ebproof/right label template}}% - % Shift things if the left box is wider than |\R@shift| - \ifvoid\LEFT\else - \tmp=\wd\LEFT - \advance\tmp\pgfkeysvalueof{/ebproof/label separation} - \ifdim\tmp>\R@shift - \advance\tmp-\R@shift - \advance\A@shift\tmp - \advance\B@shift\tmp - \advance\C@left\tmp - \advance\C@axis\tmp - \advance\C@width\tmp - \R@shift=0pt\relax - \else - \advance\R@shift-\tmp - \fi - \fi - % Compute how the rule box must be shifted so that labels are aligned - \ebproof@localbox{RC@box}=\hbox{$\vcenter{\copy\R@box}$}% - \R@raise=\ht\R@box - \advance\R@raise-\ht\RC@box - % Make the complete rule box - \setbox\RC@box=\hbox{% - \ifvoid\LEFT\else - \box\LEFT - \kern\pgfkeysvalueof{/ebproof/label separation} - \fi - \box\RC@box - \ifvoid\RIGHT\else - \kern\pgfkeysvalueof{/ebproof/label separation} - \box\RIGHT - \fi} - % Adapt the dimensions on the right if the total rule width is too large - \tmp=\wd\RC@box - \advance\tmp\R@shift - \ifdim\tmp>\C@width - \advance\tmp-\C@width - \advance\C@right\tmp - \fi - % Cancel the labels' height and depth - \setbox\RC@box=\hbox{\raise\R@raise\box\RC@box} - \ht\RC@box=\ht\R@box - \dp\RC@box=\dp\R@box - % Make the box - \ifebproof@updown - \setbox\C@box=\vtop{% - \moveright\A@shift\box\A@box - \hrule height 0pt - \moveright\R@shift\box\RC@box% - \hrule height 0pt - \moveright\B@shift\box\B@box}% - \else - \setbox\C@box=\vbox{% - \moveright\B@shift\box\B@box - \hrule height 0pt - \moveright\R@shift\box\RC@box% - \hrule height 0pt - \moveright\A@shift\box\A@box}% - \fi - \ebproof@push{C}% - \endgroup} - -%%% Modifying boxes - -% Alter a proof with a command that does not affect the size. Typically useful -% with |\color| commands. - -\def\ebproof@alter#1{% - \begingroup - \ebproof@pop{A}% - \setbox\A@box=\hbox{{#1\box\A@box}}% - \ebproof@push{A}% - \endgroup} +\cs_new:Nn \ebproof_push:N { + \int_gincr:N \g_ebproof_level_int + \hbox_gset:Nn \g_ebproof_stack_box + { \hbox_unpack:N \g_ebproof_stack_box \box_use:N #1 } + \seq_gput_left:Nv \g_ebproof_stack_seq + { l_ebproof_marks_ \__int_value:w #1 _prop } +} -% Insert |\left| and |\right| delimiters without changing the alignment +% Pop the value from the top of the stack into a register. -\def\ebproof@delims#1#2{% - \begingroup - \ebproof@pop{TREE}% - \ebproof@localbox{@SHIFTED}=% - \hbox{$\vcenter{\copy\TREE@box}$}% - \ebproof@localbox{@LEFT}=% - \hbox{$#1\vrule height \ht\@SHIFTED depth \dp\@SHIFTED width 0pt\right.$}% - \ebproof@localbox{@RIGHT}=% - \hbox{$\left.\vrule height \ht\@SHIFTED depth \dp\@SHIFTED width 0pt#2$}% - \ebproof@localdimen{dy} - \dy=\dp\@SHIFTED - \advance\dy-\dp\TREE@box - \ebproof@alloc{A}=% - \hbox{\raise\dy\hbox{\copy\@LEFT\box\@SHIFTED\copy\@RIGHT}}% - \A@left=\wd\@LEFT \advance\A@left\TREE@left - \A@right=\wd\@RIGHT \advance\A@right\TREE@right - \A@axis=\wd\@LEFT \advance\A@axis\TREE@axis - \ebproof@push{A}% - \endgroup} +\cs_new:Nn \ebproof_pop:N { + \int_compare:nNnTF { \g_ebproof_level_int } > { 0 } { + \int_gdecr:N \g_ebproof_level_int + \hbox_gset:Nn \g_ebproof_stack_box { + \hbox_unpack:N \g_ebproof_stack_box + \box_gset_to_last:N \g_tmpa_box + } + \box_set_eq_clear:NN #1 \g_tmpa_box + \seq_gpop_left:NN \g_ebproof_stack_seq \l_tmpa_tl + \tl_set_eq:cN { l_ebproof_marks_ \__int_value:w #1 _prop } \l_tmpa_tl + } { + \PackageError{ebproof}{Missing~premiss~in~a~proof~tree}{} + \ebproof_clear:N #1 + } +} + +%%% Assembling trees + +\ebproof_new:N \l_ebproof_a_box +\ebproof_new:N \l_ebproof_b_box +\ebproof_new:N \l_ebproof_c_box +\ebproof_new:N \l_ebproof_d_box + +% Join horizontally a number of elements at the top of the stack. If several +% trees are joined, use the left mark of the left tree, the right mark of the +% right tree and set the axis in the middle of these marks. + +\cs_new:Nn \ebproof_join_horizontal:n { + \int_case:nnF { #1 } { + { 0 } { + \group_begin: + \ebproof_clear:N \l_ebproof_a_box + \ebproof_push:N \l_ebproof_a_box + \group_end: + } + { 1 } { } + } { + \group_begin: + \ebproof_pop:N \l_ebproof_a_box + \prg_replicate:nn { #1 - 1 } { + \ebproof_pop:N \l_ebproof_b_box + \ebproof_append_left:NnN + \l_ebproof_a_box \l_ebproof_separation_dim \l_ebproof_b_box + } + \ebproof_set_mark:Nnn \l_ebproof_a_box { left } + { \ebproof_mark:Nn \l_ebproof_b_box { left } } + \ebproof_set_mark:Nnn \l_ebproof_a_box { axis } + { ( \ebproof_mark:Nn \l_ebproof_a_box { left } + + \ebproof_mark:Nn \l_ebproof_a_box { right } ) / 2 } + \ebproof_push:N \l_ebproof_a_box + \group_end: + } +} + +% Join vertically the two elements at the top of the stack, with a horizontal +% rule of the appropriate size. + +\cs_new:Nn \ebproof_join_vertical: { + \group_begin: + \ebproof_pop:N \l_ebproof_a_box + \ebproof_pop:N \l_ebproof_b_box + \ebproof_enlarge_conclusion:NN \l_ebproof_b_box \l_ebproof_a_box + \ebproof_make_rule_for:NNN \l_ebproof_c_box \l_ebproof_b_box + \l_ebproof_d_box + \ebproof_append_vertical:NN \l_ebproof_a_box \l_ebproof_c_box + \ebproof_append_vertical:NN \l_ebproof_a_box \l_ebproof_b_box + \ebproof_push:N \l_ebproof_a_box + \group_end: +} %%% High-level commands % Push a box with default formatting, using explicit alignment if the code % contains a |&| character -\def\ebproof@hypo@parse#1&#2&#3\ebproof@hypo@stop{ - {\def\ARG{#3}\ifx\ARG\@empty - \aftergroup\iftrue\@gobble\fi - \else\aftergroup\iffalse\@gobble\fi\fi}% - % The above code has produced \iftrue or \iffalse here. - \ebproof@pushsimple% - {\def\inserttext{#1}\pgfkeysvalueof{/ebproof/template}}% - \else - \ebproof@pushsplit - {\def\inserttext{#1}\pgfkeysvalueof{/ebproof/left template}}% - {\def\inserttext{#2}\pgfkeysvalueof{/ebproof/right template}}% - \fi} - -\newcommand\ebproof@hypo[2][]{% - {\ebproofset{#1}\ebproof@hypo@parse#2&&\ebproof@hypo@stop}} - -% Build a n-ary rule - -\def\ebproof@infer{% - \@ifnextchar[{\ebproof@infer@}{\ebproof@infer@[]}} -\def\ebproof@infer@[#1]#2{% - \@ifnextchar[% - {\ebproof@infer@with@label{#1}{#2}}% - {\ebproof@infer@@{#1}{#2}}} -\def\ebproof@infer@with@label#1#2[#3]{% - \ebproof@infer@@{#1,right label={#3}}{#2}} -\def\ebproof@infer@@#1#2#3{{% - \pgfqkeys{/ebproof/rule style}{.search also=/ebproof,#1}% - \ebproof@joinh@multi{#2}% - \ebproof@hypo{#3}% - \ebproof@joinv}} - -% Ellipsis with vertical dots - -\def\ebproof@ellipsis#1#2{{% - \ebproofset{rule code=}% - \ebproof@pushsplit{}{% - \setbox0=\vbox{\kern1.2ex\hbox{\ignorespaces#1}\hrule height 0pt\kern1.2ex}% - \vbox to\ht0{\xleaders\vbox to .8ex{\vss\hbox{.}\vss}\vfill}% - \rlap{ \box0}}% - \ebproof@joinv - \ebproof@hypo{#2}% - \ebproof@joinv}} +\cs_new:Npn \ebproof_statement_parse:w #1&#2&#3\ebproof_statement_stop: { + \tl_if_empty:nTF { #3 } { + \ebproof_make_simple:Nn \l_ebproof_a_box + { \cs_set:Npn \inserttext { #1 } \tl_use:N \l_ebproof_template_tl } + } { + \ebproof_make_split:Nnn \l_ebproof_a_box + { \cs_set:Npn \inserttext { #1 } \tl_use:N \l_ebproof_left_template_tl } + { \cs_set:Npn \inserttext { #2 } \tl_use:N \l_ebproof_right_template_tl } + } + \ebproof_push:N \l_ebproof_a_box +} + +\cs_new:Nn \ebproof_push_statement:n { + \ebproof_statement_parse:w #1&& \ebproof_statement_stop: +} + + +%% Document interface + +%%% Functions to define statements + +% The |\g_ebproof_stack_seq| variable contains the list of all defined +% statements. For each statement |X|, there is a document command |\ebproofX| +% and the alias |\X| is defined when entering a |prooftree| environment. + +\seq_new:N \g_ebproof_statements_seq + +% Install the aliases for statements, saving the original value of the control +% sequences. + +\cs_new:Nn \ebproof_setup_statements: { + \seq_map_inline:Nn \g_ebproof_statements_seq { + \cs_set_eq:cc { ebproof_saved_ ##1 } { ##1 } + \cs_set_eq:cc { ##1 } { ebproof ##1 } + } +} + +% Restore the saved meanings of the control sequences. This is useful when +% interpreting user-provided code in statement arguments. The meanings are +% automatically restored when leaving a |prooftree| environment because of +% grouping. + +\cs_new:Nn \ebproof_restore_statements: { + \seq_map_inline:Nn \g_ebproof_statements_seq { + \cs_set_eq:cc { ##1 } { ebproof_saved_ ##1 } + } +} + +% Define a new statement. The first argument is the name, the second one is an +% argument specifier as used by |xparse| and the third one is the body of the +% command. + +\cs_new:Nn \ebproof_new_statement:nnn { + \exp_args:Nc \NewDocumentCommand { ebproof#1 }{ #2 } { #3 } + \seq_put_right:Nn \g_ebproof_statements_seq { #1 } +} + +% Define a deprecated statement. The syntax is the same as above except that +% an extra argument in third position indicates what should be used instead. +% The effect is the same except that a warning message is issued the first +% time the statement is used. + +\cs_new:Nn \ebproof_new_deprecated_statement:nnnn { + \cs_new:cpn { ebproof_#1_warning: } { + \PackageWarning { ebproof } { \token_to_str:c{#1}~is~deprecated,~#3 } + \cs_gset:cn { ebproof_#1_warning: } { } + } + \ebproof_new_statement:nnn { #1 } { #2 } + { \use:c { ebproof_#1_warning: } #4 } +} + + +%%% Basic commands + +\ebproof_new_statement:nnn { set } { m } { + \keys_set:nn { ebproof } { #1 } +} + +\ebproof_new_statement:nnn { hypo } { O{} m } { + \group_begin: + \ebproof_restore_statements: + \keys_set:nn { ebproof } { #1 } + \ebproof_push_statement:n { #2 } + \group_end: +} + +\ebproof_new_statement:nnn { infer } { O{} m O{} m } { + \group_begin: + \ebproof_restore_statements: + \keys_set_known:nnN { ebproof / rule~style } { #1 } \l_tmpa_tl + \keys_set:nV { ebproof } \l_tmpa_tl + \tl_set:Nn \l_ebproof_right_label_tl { #3 } + \ebproof_join_horizontal:n { #2 } + \ebproof_push_statement:n { #4 } + \ebproof_join_vertical: + \group_end: +} + +\ebproof_new_statement:nnn { ellipsis } { m m } { + \group_begin: + \ebproof_restore_statements: + \tl_clear:N \l_ebproof_rule_code_tl + \ebproof_make_split:Nnn \l_ebproof_a_box { } { + \vbox_set:Nn \l_tmpa_box { + \skip_vertical:n { 1.2ex } + \hbox:n { \tex_ignorespaces:D #1 } + \skip_vertical:n { 1.2ex } + } + \vbox_to_ht:nn { \box_ht:N \l_tmpa_box } { + \tex_xleaders:D \vbox_to_ht:nn { .8ex } + { \tex_vss:D \hbox:n { . } \tex_vss:D } + \tex_vfill:D + } + \hbox_overlap_right:n { ~ \box_use:N \l_tmpa_box } + } + \ebproof_push:N \l_ebproof_a_box + \ebproof_join_vertical: + \ebproof_push_statement:n {#2} + \ebproof_join_vertical: + \group_end: +} + + +%%% Modifying trees + +% Rewrite the box at the top of the stack while preserving its dimensions an +% marks. The code is typeset in horizontal mode, with control sequences to +% access the original box and its marks: +% - \treebox is a box register with the original material +% - \treemark{NAME} provides the value of a given mark + +\ebproof_new_statement:nnn { rewrite } { m } { + \group_begin: + \ebproof_restore_statements: + \ebproof_pop:N \l_ebproof_a_box + \box_set_eq:NN \l_tmpa_box \l_ebproof_a_box + \hbox_set:Nn \l_tmpb_box { + \cs_set_eq:NN \treebox \l_tmpa_box + \cs_set:Npn \treemark { \ebproof_mark:Nn \l_ebproof_a_box } + { #1 } + } + \box_set_wd:Nn \l_tmpb_box { \box_wd:N \l_ebproof_a_box } + \box_set_ht:Nn \l_tmpb_box { \box_ht:N \l_ebproof_a_box } + \box_set_dp:Nn \l_tmpb_box { \box_dp:N \l_ebproof_a_box } + \box_set_eq:NN \l_ebproof_a_box \l_tmpb_box + \ebproof_push:N \l_ebproof_a_box + \group_end: +} + +% Insert |\left| and |\right| delimiters without changing the alignment + +\ebproof_new_statement:nnn { delims } { m m } { + \group_begin: + \ebproof_restore_statements: + \ebproof_pop:N \l_ebproof_a_box + \hbox_set:Nn \l_tmpa_box + { $ \tex_vcenter:D { \box_use:N \l_ebproof_a_box } $ } + \dim_set:Nn \l_tmpa_dim + { \box_ht:N \l_tmpa_box - \box_ht:N \l_ebproof_a_box } + \hbox_set:Nn \l_ebproof_a_box { + $ #1 \tex_vrule:D + height \box_ht:N \l_tmpa_box depth \box_dp:N \l_tmpa_box width 0pt + \tex_right:D . $ + } + \ebproof_shift_x:Nn \l_ebproof_a_box { \box_wd:N \l_ebproof_a_box } + \hbox_set:Nn \l_ebproof_a_box { + \hbox_unpack:N \l_ebproof_a_box + $ \tex_left:D . \box_use:N \l_tmpa_box #2 $ + } + \hbox_set:Nn \l_ebproof_a_box + { \box_move_down:nn { \l_tmpa_dim } { \box_use:N \l_ebproof_a_box } } + \ebproof_push:N \l_ebproof_a_box + \group_end: +} + + +%%% Deprecated statements + +% These statements were defined in versions 1.x of the package, they are +% preserved for temporary upwards compatibility and will be removed in a +% future version. + +\ebproof_new_deprecated_statement:nnnn { Alter } { m } + { use~\token_to_str:c{rewrite}~instead } { \ebproofrewrite{ #1 \box\treebox } } +\ebproof_new_deprecated_statement:nnnn { Delims } { } + { use~\token_to_str:c{delims}~instead } { \ebproofdelims } +\ebproof_new_deprecated_statement:nnnn { Ellipsis } { } + { use~\token_to_str:c{ellipsis}~instead } { \ebproofellipsis } +\ebproof_new_deprecated_statement:nnnn { Hypo } { } + { use~\token_to_str:c{hypo}~instead } { \ebproofhypo } +\ebproof_new_deprecated_statement:nnnn { Infer } { } + { use~\token_to_str:c{infer}~instead } { \ebproofinfer } + %%% Environment interface -\ebproof@clear +\ebproof_clear_stack: + +\tl_new:N \l_ebproof_start_level_tl + +\NewDocumentEnvironment { prooftree } { s O{} } { + \keys_set_known:nnN { ebproof / proof~style } { #2 } \l_tmpa_tl + \keys_set:nV { ebproof } \l_tmpa_tl + \tl_set:Nx \l_ebproof_start_level_tl { \int_use:N \g_ebproof_level_int } + \vbox_set:Nw \l_tmpa_box + \ebproof_setup_statements: +} { + \vbox_set_end: + \ebproof_pop:N \l_ebproof_a_box + \int_compare:nNnF { \g_ebproof_level_int } = { \tl_use:N \l_ebproof_start_level_tl } { + \PackageError{ebproof}{Malformed~proof~tree}{ + Some~hypotheses~were~declared~but~not~used~in~this~tree.} + } + \IfBooleanTF { #1 } { + \[ \box_use:N \l_ebproof_a_box \] + \ignorespacesafterend + } { + \hbox_unpack:N \c_empty_box + \bool_if:NTF \l_ebproof_center_bool { + \hbox:n { $ \tex_vcenter:D { \box_use:N \l_ebproof_a_box } $ } + } { + \box_use:N \l_ebproof_a_box + } + } +} -\def\ebproof@begin{% - \edef\ebproof@start@level{\the\ebproof@level}% - \setbox1=\vbox\bgroup - \let\Hypo=\ebproof@hypo - \let\Infer=\ebproof@infer - \let\Ellipsis=\ebproof@ellipsis - \let\Alter=\ebproof@alter - \let\Delims=\ebproof@delims} -\def\ebproof@end{% - \egroup - \ebproof@pop{X}% - \ifnum\ebproof@level=\ebproof@start@level\else - \PackageError{ebproof}{Malformed proof tree}{% - Some hypotheses were declared but not used in this tree.}% - \fi - \ifebproof@center - \hbox{$\vcenter{\hbox{\box\X@box}}$}% - \else - \box\X@box - \fi - \global\setbox\ebproof@box@temp=\box1} - -\newenvironment{prooftree}[1][]{% - \pgfqkeys{/ebproof/proof style}{.search also=/ebproof,#1}% - \leavevmode\ebproof@begin -}{% - \ebproof@end} - -\newenvironment{prooftree*}[1][]{% - \center - \pgfqkeys{/ebproof/proof style}{.search also=/ebproof,#1}% - \leavevmode\ebproof@begin -}{% - \ebproof@end - \endcenter} +% A trick for the starred version: +\cs_new:cpn { prooftree* } { \prooftree* } +\cs_new:cpn { endprooftree* } { \endprooftree } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebproof.tlpobj new/tlpkg/tlpobj/ebproof.tlpobj --- old/tlpkg/tlpobj/ebproof.tlpobj 2016-04-14 18:59:04.000000000 +0200 +++ new/tlpkg/tlpobj/ebproof.tlpobj 2017-05-18 02:22:02.000000000 +0200 @@ -1,6 +1,6 @@ name ebproof category Package -revision 36595 +revision 44392 shortdesc Formal proofs in the style of sequent calculus relocated 1 longdesc This package provides commands to typeset proof trees in the @@ -9,12 +9,12 @@ longdesc alignment of successive formulas on an arbitrary point. Various longdesc options allow complete control over spacing, styles of longdesc inference rules, placement of labels, etc. The package requires -longdesc pgfkeys (from the PGF/TikZ bundle) for the option system. -runfiles size=4 +longdesc expl3 and xparse. +runfiles size=6 RELOC/tex/latex/ebproof/ebproof.sty catalogue-also bussproofs catalogue-ctan /macros/latex/contrib/ebproof -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-05-17 18:37:56 +0200 catalogue-license lppl1.3 catalogue-topics maths proof -catalogue-version 1.1 +catalogue-version 2.0 ++++++ ebsthesis.doc.tar.xz ++++++ ++++++ ebsthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebsthesis.tlpobj new/tlpkg/tlpobj/ebsthesis.tlpobj --- old/tlpkg/tlpobj/ebsthesis.tlpobj 2016-04-14 18:59:04.000000000 +0200 +++ new/tlpkg/tlpobj/ebsthesis.tlpobj 2017-04-14 17:39:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=6 RELOC/tex/latex/ebsthesis/ebsthesis.cls catalogue-ctan /macros/latex/contrib/ebsthesis -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.0 ++++++ ec.doc.tar.xz ++++++ ++++++ ec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ec.tlpobj new/tlpkg/tlpobj/ec.tlpobj --- old/tlpkg/tlpobj/ec.tlpobj 2016-04-14 18:59:04.000000000 +0200 +++ new/tlpkg/tlpobj/ec.tlpobj 2017-04-14 17:39:05.000000000 +0200 @@ -1251,7 +1251,7 @@ RELOC/fonts/tfm/jknappen/ec/tcvt3583.tfm catalogue-also eco catalogue-ctan /fonts/ec -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-serif font-sans font-proportional font-mono font-cm catalogue-version 1.0 ++++++ ecc.doc.tar.xz ++++++ ++++++ ecc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecc.tlpobj new/tlpkg/tlpobj/ecc.tlpobj --- old/tlpkg/tlpobj/ecc.tlpobj 2016-04-14 18:59:08.000000000 +0200 +++ new/tlpkg/tlpobj/ecc.tlpobj 2017-04-14 17:39:06.000000000 +0200 @@ -74,6 +74,6 @@ RELOC/fonts/tfm/public/ecc/toti10.tfm catalogue-also ccfonts catalogue-ctan /fonts/ecc -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-t1enc ++++++ ecclesiastic.doc.tar.xz ++++++ ++++++ ecclesiastic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecclesiastic.tlpobj new/tlpkg/tlpobj/ecclesiastic.tlpobj --- old/tlpkg/tlpobj/ecclesiastic.tlpobj 2016-04-14 18:59:08.000000000 +0200 +++ new/tlpkg/tlpobj/ecclesiastic.tlpobj 2017-04-14 17:39:06.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/ecclesiastic/ecclesiastic.sty catalogue-ctan /macros/latex/contrib/ecclesiastic -catalogue-date 2015-08-21 17:57:17 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics multilingual-addon catalogue-version 0.3 ++++++ ecltree.doc.tar.xz ++++++ ++++++ ecltree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecltree.tlpobj new/tlpkg/tlpobj/ecltree.tlpobj --- old/tlpkg/tlpobj/ecltree.tlpobj 2016-04-14 18:59:08.000000000 +0200 +++ new/tlpkg/tlpobj/ecltree.tlpobj 2017-04-14 17:39:07.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/ecltree/ecltree.sty catalogue-also epic eepic catalogue-ctan /macros/latex/contrib/eclbip -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.1a ++++++ eco.doc.tar.xz ++++++ ++++++ eco.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eco.tlpobj new/tlpkg/tlpobj/eco.tlpobj --- old/tlpkg/tlpobj/eco.tlpobj 2016-04-14 18:59:08.000000000 +0200 +++ new/tlpkg/tlpobj/eco.tlpobj 2017-04-14 17:39:07.000000000 +0200 @@ -510,7 +510,7 @@ RELOC/tex/latex/eco/T1cmovt.fd RELOC/tex/latex/eco/eco.sty catalogue-ctan /fonts/eco -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-virtual catalogue-version 1.3 ++++++ ecobiblatex.doc.tar.xz ++++++ ++++++ ecobiblatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecobiblatex.tlpobj new/tlpkg/tlpobj/ecobiblatex.tlpobj --- old/tlpkg/tlpobj/ecobiblatex.tlpobj 2016-04-14 18:59:10.000000000 +0200 +++ new/tlpkg/tlpobj/ecobiblatex.tlpobj 2017-04-14 17:39:07.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/ecobiblatex/ecobiblatex.bbx RELOC/tex/latex/ecobiblatex/ecobiblatex.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/ecobiblatex -catalogue-date 2016-01-04 06:20:16 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex catalogue-version 1.0 ++++++ econometrics.doc.tar.xz ++++++ ++++++ econometrics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/econometrics.tlpobj new/tlpkg/tlpobj/econometrics.tlpobj --- old/tlpkg/tlpobj/econometrics.tlpobj 2016-04-14 18:59:11.000000000 +0200 +++ new/tlpkg/tlpobj/econometrics.tlpobj 2017-04-14 17:39:08.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=2 RELOC/tex/latex/econometrics/econometrics.sty catalogue-ctan /macros/latex/contrib/econometrics -catalogue-date 2016-01-20 05:05:00 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics statistics catalogue-version 1.0 ++++++ economic.doc.tar.xz ++++++ ++++++ economic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/economic.tlpobj new/tlpkg/tlpobj/economic.tlpobj --- old/tlpkg/tlpobj/economic.tlpobj 2016-04-14 18:59:11.000000000 +0200 +++ new/tlpkg/tlpobj/economic.tlpobj 2017-04-14 17:39:08.000000000 +0200 @@ -45,6 +45,6 @@ RELOC/tex/latex/economic/regstud.cls RELOC/tex/latex/economic/worlddev.cls catalogue-ctan /biblio/bibtex/contrib/economic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty ++++++ ecv.doc.tar.xz ++++++ ++++++ ecv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecv.tlpobj new/tlpkg/tlpobj/ecv.tlpobj --- old/tlpkg/tlpobj/ecv.tlpobj 2016-04-14 18:59:12.000000000 +0200 +++ new/tlpkg/tlpobj/ecv.tlpobj 2017-04-14 17:39:08.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/ecv/ecvNLS.sty catalogue-also curve europecv catalogue-ctan /macros/latex/contrib/ecv -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 class catalogue-version 0.3 ++++++ ed.doc.tar.xz ++++++ ++++++ ed.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ed.tlpobj new/tlpkg/tlpobj/ed.tlpobj --- old/tlpkg/tlpobj/ed.tlpobj 2016-04-14 18:59:13.000000000 +0200 +++ new/tlpkg/tlpobj/ed.tlpobj 2017-04-14 17:39:08.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/ed/ed.sty catalogue-ctan /macros/latex/contrib/ed -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-30 10:23:22 +0200 catalogue-license lppl1 catalogue-topics editorial catalogue-version 1.8 ++++++ edfnotes.doc.tar.xz ++++++ ++++++ edfnotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edfnotes.tlpobj new/tlpkg/tlpobj/edfnotes.tlpobj --- old/tlpkg/tlpobj/edfnotes.tlpobj 2016-04-14 18:59:13.000000000 +0200 +++ new/tlpkg/tlpobj/edfnotes.tlpobj 2017-04-14 17:39:08.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=11 RELOC/tex/latex/edfnotes/edfnotes.sty catalogue-ctan /macros/latex/contrib/edfnotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics crit-ed footnote catalogue-version 0.6b ++++++ edmac.doc.tar.xz ++++++ ++++++ edmac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edmac.tlpobj new/tlpkg/tlpobj/edmac.tlpobj --- old/tlpkg/tlpobj/edmac.tlpobj 2016-04-14 18:59:13.000000000 +0200 +++ new/tlpkg/tlpobj/edmac.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/edmac/tabmac.tex catalogue-also ledmac ednotes manyfoot lineno poemscol catalogue-ctan /macros/plain/contrib/edmac -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics crit-ed catalogue-version 3.17 ++++++ edmargin.doc.tar.xz ++++++ ++++++ edmargin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edmargin.tlpobj new/tlpkg/tlpobj/edmargin.tlpobj --- old/tlpkg/tlpobj/edmargin.tlpobj 2016-04-14 18:59:14.000000000 +0200 +++ new/tlpkg/tlpobj/edmargin.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=6 RELOC/tex/latex/edmargin/edmargin.sty catalogue-ctan /macros/latex/contrib/edmargin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics crit-ed notes catalogue-version 1.2 ++++++ ednotes.doc.tar.xz ++++++ ++++++ ednotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ednotes.tlpobj new/tlpkg/tlpobj/ednotes.tlpobj --- old/tlpkg/tlpobj/ednotes.tlpobj 2016-04-14 18:59:14.000000000 +0200 +++ new/tlpkg/tlpobj/ednotes.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/ednotes/mfparxsp.sty catalogue-also edmac ledmac manyfoot lineno poemscol catalogue-ctan /macros/latex/contrib/ednotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics crit-ed catalogue-version 1.3a ++++++ eemeir.doc.tar.xz ++++++ ++++++ eemeir.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eemeir.tlpobj new/tlpkg/tlpobj/eemeir.tlpobj --- old/tlpkg/tlpobj/eemeir.tlpobj 2016-04-14 18:59:15.000000000 +0200 +++ new/tlpkg/tlpobj/eemeir.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/eemeir/eemeir.sty catalogue-also he-she gender catalogue-ctan /macros/latex/contrib/eemeir -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics linguistic typesetting catalogue-version 1.1b ++++++ eepic.doc.tar.xz ++++++ ++++++ eepic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eepic.tlpobj new/tlpkg/tlpobj/eepic.tlpobj --- old/tlpkg/tlpobj/eepic.tlpobj 2016-04-14 18:59:15.000000000 +0200 +++ new/tlpkg/tlpobj/eepic.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/eepic/eepicemu.sty RELOC/tex/latex/eepic/epic.sty catalogue-ctan /macros/latex/contrib/eepic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-in-tex catalogue-version 1.1e ++++++ efbox.doc.tar.xz ++++++ ++++++ efbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/efbox.tlpobj new/tlpkg/tlpobj/efbox.tlpobj --- old/tlpkg/tlpobj/efbox.tlpobj 2016-04-14 18:59:15.000000000 +0200 +++ new/tlpkg/tlpobj/efbox.tlpobj 2017-04-14 17:39:09.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/efbox/efbox.sty catalogue-ctan /macros/latex/contrib/efbox -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 1.0 ++++++ egameps.doc.tar.xz ++++++ ++++++ egameps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/egameps.tlpobj new/tlpkg/tlpobj/egameps.tlpobj --- old/tlpkg/tlpobj/egameps.tlpobj 2016-04-14 18:59:15.000000000 +0200 +++ new/tlpkg/tlpobj/egameps.tlpobj 2017-04-14 17:39:10.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=11 RELOC/tex/latex/egameps/egameps.sty catalogue-ctan /macros/latex/contrib/egameps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games graphics-in-tex catalogue-version 1.1 ++++++ egplot.doc.tar.xz ++++++ ++++++ egplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/egplot.tlpobj new/tlpkg/tlpobj/egplot.tlpobj --- old/tlpkg/tlpobj/egplot.tlpobj 2016-04-14 18:59:16.000000000 +0200 +++ new/tlpkg/tlpobj/egplot.tlpobj 2017-04-14 17:39:10.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/egplot/egplot.sty catalogue-ctan /macros/latex/contrib/egplot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-inline catalogue-version 1.02a ++++++ eiad-ltx.doc.tar.xz ++++++ ++++++ eiad-ltx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eiad-ltx.tlpobj new/tlpkg/tlpobj/eiad-ltx.tlpobj --- old/tlpkg/tlpobj/eiad-ltx.tlpobj 2016-04-14 18:59:17.000000000 +0200 +++ new/tlpkg/tlpobj/eiad-ltx.tlpobj 2017-04-14 17:39:10.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/fonts/source/public/eiad-ltx/Fr10.mf RELOC/tex/latex/eiad-ltx/eiad.sty catalogue-ctan /macros/latex/contrib/eiad -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 irish-gaelic catalogue-version 1.0 ++++++ eiad.doc.tar.xz ++++++ ++++++ eiad.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eiad.tlpobj new/tlpkg/tlpobj/eiad.tlpobj --- old/tlpkg/tlpobj/eiad.tlpobj 2016-04-14 18:59:16.000000000 +0200 +++ new/tlpkg/tlpobj/eiad.tlpobj 2017-04-14 17:39:10.000000000 +0200 @@ -82,6 +82,6 @@ RELOC/tex/latex/eiad/OT1eiadss.fd RELOC/tex/latex/eiad/OT1eiadtt.fd catalogue-ctan /fonts/eiad -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font irish-gaelic ++++++ eijkhout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eijkhout.tlpobj new/tlpkg/tlpobj/eijkhout.tlpobj --- old/tlpkg/tlpobj/eijkhout.tlpobj 2016-04-14 18:59:17.000000000 +0200 +++ new/tlpkg/tlpobj/eijkhout.tlpobj 2017-04-14 17:39:10.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/generic/eijkhout/DB_process.tex RELOC/tex/generic/eijkhout/repeat.tex catalogue-ctan /macros/generic/eijkhout -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license collection catalogue-topics collection ++++++ einfuehrung.doc.tar.xz ++++++ ++++++ einfuehrung2.doc.tar.xz ++++++ ++++++ ejpecp.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ejpecp/README new/doc/latex/ejpecp/README --- old/doc/latex/ejpecp/README 2016-04-07 22:54:11.000000000 +0200 +++ new/doc/latex/ejpecp/README 2016-11-25 19:28:42.000000000 +0100 @@ -51,6 +51,8 @@ http:/mirror.ctan.org/macros/latex/contrib/ejpecp/ CHANGELOG + 2016/09/06 v1.5 + hypertexnames=false configuration for hyperref package 2016/04/06 v1.4 Abstract baselineskip correction - paragraph ending inserted at the end of abstract 2016/02/23 v1.3 Binary files old/doc/latex/ejpecp/ejpecp.pdf and new/doc/latex/ejpecp/ejpecp.pdf differ Binary files old/doc/latex/ejpecp/sample.pdf and new/doc/latex/ejpecp/sample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ejpecp/sample.tex new/doc/latex/ejpecp/sample.tex --- old/doc/latex/ejpecp/sample.tex 2016-04-07 22:54:11.000000000 +0200 +++ new/doc/latex/ejpecp/sample.tex 2016-11-25 19:28:42.000000000 +0100 @@ -51,7 +51,7 @@ \SHORTTITLE{Introduction to the \emph{ejpecp} Class} -\TITLE{Introduction to the \emph{ejpecp} Class Version 1.4\thanks{Supported +\TITLE{Introduction to the \emph{ejpecp} Class Version 1.5\thanks{Supported by the Institute of Mathematical Statistics (IMS) and the Bernoulli Society.}\ \thanks{Current maintainer of class file is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ejpecp.doc.tlpobj new/tlpkg/tlpobj/ejpecp.doc.tlpobj --- old/tlpkg/tlpobj/ejpecp.doc.tlpobj 2016-04-14 18:59:22.000000000 +0200 +++ new/tlpkg/tlpobj/ejpecp.doc.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -1,6 +1,6 @@ name ejpecp.doc category Package -revision 40331 +revision 42003 shortdesc doc files of ejpecp relocated 1 docfiles size=86 ++++++ ejpecp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ejpecp/ejpecp.cls new/tex/latex/ejpecp/ejpecp.cls --- old/tex/latex/ejpecp/ejpecp.cls 2016-04-07 22:54:11.000000000 +0200 +++ new/tex/latex/ejpecp/ejpecp.cls 2016-11-25 19:33:47.000000000 +0100 @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ejpecp} - [2016/04/06 v1.4 .dtx ejpecp file] + [2016/09/06 v1.5 .dtx ejpecp file] \ClassInfo{ejpecp}{Copyright (c) 2016 Eimantas GUMBAKIS, VTeX, Lithuania for EJP-ECP.} \ClassInfo{ejpecp}{Copyright (c), 2011-2015 BURDZY and CHAFAI for EJP-ECP.} %% We declare and handle our class options @@ -95,6 +95,7 @@ \fi \hypersetup{pdfborder=0 0 0} \hypersetup{pdfstartview={FitH}} +\hypersetup{hypertexnames=false} %%%% Macros et Environments %% General macros \newcommand{\@TITLE}{FIXME!} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ejpecp.tlpobj new/tlpkg/tlpobj/ejpecp.tlpobj --- old/tlpkg/tlpobj/ejpecp.tlpobj 2016-04-14 18:59:23.000000000 +0200 +++ new/tlpkg/tlpobj/ejpecp.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -1,6 +1,6 @@ name ejpecp category Package -revision 40331 +revision 42003 shortdesc Class for EJP and ECP relocated 1 longdesc The class is designed for typesetting articles for the @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/ejpecp/ejpecp.cls catalogue-ctan /macros/latex/contrib/ejpecp -catalogue-date 2016-04-06 19:39:54 +0200 +catalogue-date 2016-09-06 13:18:13 +0200 catalogue-license lppl1.2 catalogue-topics journalpub class -catalogue-version 1.4 +catalogue-version 1.5 ++++++ ekaia.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/README new/doc/latex/ekaia/README --- old/doc/latex/ekaia/README 2014-12-30 18:13:24.000000000 +0100 +++ new/doc/latex/ekaia/README 2016-11-26 01:09:05.000000000 +0100 @@ -1,7 +1,7 @@ -The ekaia package v1.00 +The ekaia package v1.04 ============================= -Copyright (C) 2014, Edorta Ibarra & the Ekaia Journal (UPV/EHU) +Copyright (C) 2014-2016, Edorta Ibarra & the Ekaia Journal (UPV/EHU) --------------------------------------------------------------- Description @@ -34,7 +34,8 @@ Commands -------- -\izenburua Prints the document title accordint to the Ekaia journal style +\izenburua Prints the document title in Basque accordint to the Ekaia journal style +\azpiizenburua Prints the document title in English accordint to the Ekaia journal style \datak Prints the reception and acceptation dates of the submited article Binary files old/doc/latex/ekaia/ekaia.pdf and new/doc/latex/ekaia/ekaia.pdf differ Binary files old/doc/latex/ekaia/ekaia_EUS.pdf and new/doc/latex/ekaia/ekaia_EUS.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/ekaia_EUS.tex new/doc/latex/ekaia/ekaia_EUS.tex --- old/doc/latex/ekaia/ekaia_EUS.tex 2014-12-30 18:13:24.000000000 +0100 +++ new/doc/latex/ekaia/ekaia_EUS.tex 2016-11-26 01:09:05.000000000 +0100 @@ -1,12 +1,12 @@ %% -%% This is file `ekaia_[EUS].tex', +%% This is file `ekaia_EUS.tex', %% generated with the docstrip utility. %% %% The original source files were: %% %% ekaia.dtx (with options: `basque') %% -%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU) +%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU) %% ------------------------------------------------------------------- %% %% This file may be distributed and/or modified under the @@ -59,9 +59,9 @@ \begin{document} \title{\textsf{ekaia} paketea\thanks{Fitxategi honek (\textsf{ekaia.dtx}) - 1.02. bertsioa du. Azken aldiz errebisatua: 14-12-26.}} - \author{Edorta Ibarra eta Ekaia Aldizkaria (UPV/EHU)\\\texttt{ekaia(a)ehu.es}} - \date{2014-12-26} + 1.04. bertsioa du. Azken aldiz errebisatua: 16-11-25.}} + \author{Edorta Ibarra eta Ekaia Aldizkaria (UPV/EHU)\\\texttt{ekaia(a)ehu.eus}} + \date{2016-11-25} \renewcommand{\contentsname}{Aurkibidea} \renewcommand{\refname}{Bibliografia} \renewcommand\thesection{\arabic{section}.} @@ -127,7 +127,9 @@ artikuluak prestatzeko: \begin{itemize} - \item \verb|\izenburua{}|: Artikuluaren izenburua sortzeko erabiltzen da + \item \verb|\izenburua{}|: Artikuluaren izenburua euskaraz sortzeko erabiltzen da + komando hori. + \item \verb|\azpiizenburua{}|: Artikuluaren izenburua ingelesez sortzeko erabiltzen da komando hori. \item \verb|\datak{}{}|: bidalpen- eta onarpen-datak inprimatzen ditu komando ho\-rrek, hurrenez hurren. @@ -140,11 +142,11 @@ eta kontakturako informazioa) sortzeko erabiltzen da ingurune hori. \item \texttt{laburpena}: Artikuluaren laburpena euskaraz sortzeko erabiltzen da ingurune hori. - \item \texttt{hitz-gakoak}: Artikuluaren hitz-gakoak euskaraz sortzeko erabiltzen + \item \texttt{hitz-gakoak}: Artikuluaren hitz gakoak euskaraz sortzeko erabiltzen da ingurune hori. \item \texttt{abstract}: Artikuluaren laburpena ingelesez sortzeko erabiltzen da ingurune hori. - \item \texttt{keywords}: Artikuluaren hitz-gakoak ingelesez sortzeko erabiltzen + \item \texttt{keywords}: Artikuluaren hitz gakoak ingelesez sortzeko erabiltzen da ingurune hori. \end{itemize} @@ -161,6 +163,9 @@ \verb|\izenburua{\LaTeX{}: euskarazko dokumentu|\\ \verb|zientifiko-teknikoen ediziorako baliabideak}|\\ \verb| |\\ + \verb|\azpiizenburua{\LaTeX{}: resources for the edition|\\ + \verb|of scientific and technical documents in Basque}|\\ + \verb| |\\ \verb|\begin{autoreak}|\\ \verb|\textit{Edorta Ibarra$^1$, Jose Ramon Etxebarria$^2$}|\\ \verb|\linebreak|\\ @@ -242,6 +247,8 @@ ez publikoa. \item \textbf{v1.02. bertsioa (14/12/26).} Lehen bertsio publikoa. + \item \textbf{v1.04. bertsioa (16/11/04).} \verb|azpiizenburua| komandoa + gehitu da izenburua ingelesez sortzeko. Errore txikiak zuzenduta. \end{itemize} \subsection{Inplementazioa} @@ -325,6 +332,12 @@ \end{flushleft} } +\newcommand{\azpiizenburua}[1]{ +\begin{flushleft} +\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11} +\end{flushleft} +} + \newcommand{\datak}[2]{ \begin{flushleft} Jasoa:~{#1} @@ -355,7 +368,7 @@ \newenvironment{hitz-gakoak}{ \setlength{\parindent}{0pt} -\textbf{Hitz-gakoak:}~ +\textbf{Hitz gakoak:}~ }{\setlength{\parindent}{0.8cm}\\ } \newenvironment{keywords}{ @@ -365,4 +378,4 @@ \endinput %% -%% End of file `ekaia_[EUS].tex'. +%% End of file `ekaia_EUS.tex'. Binary files old/doc/latex/ekaia/ekaia_example.pdf and new/doc/latex/ekaia/ekaia_example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/ekaia_example.tex new/doc/latex/ekaia/ekaia_example.tex --- old/doc/latex/ekaia/ekaia_example.tex 2014-12-30 18:13:24.000000000 +0100 +++ new/doc/latex/ekaia/ekaia_example.tex 2016-11-26 01:09:05.000000000 +0100 @@ -6,7 +6,7 @@ %% %% ekaia.dtx (with options: `example') %% -%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU) +%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU) %% ------------------------------------------------------------------- %% %% This file may be distributed and/or modified under the @@ -59,13 +59,14 @@ \begin{document} \izenburua{Ekaia Aldizkariko egileentzako gidalerroak} + \azpiizenburua{Ekaia: Guidelines for authors} \begin{autoreak} \textit{Edorta Ibarra Basabe$^1$, Ekaiako Erredakzio Batzordea} \linebreak $^1$Ekaia Aldizkariko kidea. \linebreak - ekaia(a)ehu.es + ekaia(a)ehu.eus \linebreak \end{autoreak} @@ -268,6 +269,12 @@ \end{flushleft} } +\newcommand{\azpiizenburua}[1]{ +\begin{flushleft} +\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11} +\end{flushleft} +} + \newcommand{\datak}[2]{ \begin{flushleft} Jasoa:~{#1} @@ -298,7 +305,7 @@ \newenvironment{hitz-gakoak}{ \setlength{\parindent}{0pt} -\textbf{Hitz-gakoak:}~ +\textbf{Hitz gakoak:}~ }{\setlength{\parindent}{0.8cm}\\ } \newenvironment{keywords}{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ekaia.doc.tlpobj new/tlpkg/tlpobj/ekaia.doc.tlpobj --- old/tlpkg/tlpobj/ekaia.doc.tlpobj 2016-04-14 18:59:23.000000000 +0200 +++ new/tlpkg/tlpobj/ekaia.doc.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -1,9 +1,9 @@ name ekaia.doc category Package -revision 35927 +revision 42578 shortdesc doc files of ekaia relocated 1 -docfiles size=136 +docfiles size=140 RELOC/doc/latex/ekaia/README RELOC/doc/latex/ekaia/ekaia.pdf RELOC/doc/latex/ekaia/ekaia_EUS.pdf ++++++ ekaia.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ekaia/ekaia.sty new/tex/latex/ekaia/ekaia.sty --- old/tex/latex/ekaia/ekaia.sty 2014-12-30 18:13:24.000000000 +0100 +++ new/tex/latex/ekaia/ekaia.sty 2016-11-26 01:09:05.000000000 +0100 @@ -6,7 +6,7 @@ %% %% ekaia.dtx (with options: `package') %% -%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU) +%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU) %% ------------------------------------------------------------------- %% %% This file may be distributed and/or modified under the @@ -38,7 +38,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{ekaia} - [2014/07/20 v1.00 ekaia Package] + [2016/11/25 v1.04 ekaia Package] %% \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 @@ -132,6 +132,12 @@ \end{flushleft} } +\newcommand{\azpiizenburua}[1]{ +\begin{flushleft} +\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11} +\end{flushleft} +} + \newcommand{\datak}[2]{ \begin{flushleft} Jasoa:~{#1} @@ -162,7 +168,7 @@ \newenvironment{hitz-gakoak}{ \setlength{\parindent}{0pt} -\textbf{Hitz-gakoak:}~ +\textbf{Hitz gakoak:}~ }{\setlength{\parindent}{0.8cm}\\ } \newenvironment{keywords}{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ekaia.tlpobj new/tlpkg/tlpobj/ekaia.tlpobj --- old/tlpkg/tlpobj/ekaia.tlpobj 2016-04-14 18:59:23.000000000 +0200 +++ new/tlpkg/tlpobj/ekaia.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -1,6 +1,6 @@ name ekaia category Package -revision 35927 +revision 42578 shortdesc Article format for publishing the Basque Country Science and Technology Journal "Ekaia" relocated 1 longdesc The package provides the article format for publishing the @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/ekaia/ekaia.sty catalogue-ctan /macros/latex/contrib/ekaia -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-25 17:19:00 +0100 catalogue-license lppl1.2 catalogue-topics journalpub -catalogue-version 1.02 +catalogue-version 1.04 ++++++ elbioimp.doc.tar.xz ++++++ ++++++ elbioimp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elbioimp.tlpobj new/tlpkg/tlpobj/elbioimp.tlpobj --- old/tlpkg/tlpobj/elbioimp.tlpobj 2016-04-14 18:59:23.000000000 +0200 +++ new/tlpkg/tlpobj/elbioimp.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/elbioimp/elbioimp.cls catalogue-ctan /macros/latex/contrib/elbioimp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub class catalogue-version 1.2 ++++++ electrum.doc.tar.xz ++++++ ++++++ electrum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/electrum.tlpobj new/tlpkg/tlpobj/electrum.tlpobj --- old/tlpkg/tlpobj/electrum.tlpobj 2016-04-14 18:59:24.000000000 +0200 +++ new/tlpkg/tlpobj/electrum.tlpobj 2017-04-14 17:39:12.000000000 +0200 @@ -292,7 +292,7 @@ RELOC/tex/latex/electrum/ts1yesjw.fd RELOC/tex/latex/electrum/ts1yesw.fd catalogue-ctan /fonts/electrumadf -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-type1 catalogue-version 1.005-b ++++++ eledform.doc.tar.xz ++++++ ++++++ eledform.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eledform.tlpobj new/tlpkg/tlpobj/eledform.tlpobj --- old/tlpkg/tlpobj/eledform.tlpobj 2016-04-14 18:59:26.000000000 +0200 +++ new/tlpkg/tlpobj/eledform.tlpobj 2017-04-14 17:39:13.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/eledform/eledform.sty catalogue-ctan /macros/latex/contrib/eledform -catalogue-date 2015-08-13 14:25:03 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics crit-ed catalogue-version 1.1a ++++++ eledmac.doc.tar.xz ++++++ ++++++ eledmac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eledmac.tlpobj new/tlpkg/tlpobj/eledmac.tlpobj --- old/tlpkg/tlpobj/eledmac.tlpobj 2016-04-14 18:59:29.000000000 +0200 +++ new/tlpkg/tlpobj/eledmac.tlpobj 2017-04-14 17:39:14.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/eledmac/eledpar.sty catalogue-also ednotes poemscol ledmac catalogue-ctan /macros/latex/contrib/eledmac -catalogue-date 2015-10-14 20:57:29 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics crit-ed catalogue-version 1.24.11 ++++++ elements.doc.tar.xz ++++++ ++++++ elements.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elements.tlpobj new/tlpkg/tlpobj/elements.tlpobj --- old/tlpkg/tlpobj/elements.tlpobj 2016-05-16 00:51:43.000000000 +0200 +++ new/tlpkg/tlpobj/elements.tlpobj 2017-04-14 17:39:14.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/elements/elements_names_german.def RELOC/tex/latex/elements/elements_names_spanish.def catalogue-ctan /macros/latex/contrib/elements -catalogue-date 2016-05-15 15:17:58 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chemistry catalogue-version 0.2 ++++++ ellipse.doc.tar.xz ++++++ ++++++ ellipse.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ellipse.tlpobj new/tlpkg/tlpobj/ellipse.tlpobj --- old/tlpkg/tlpobj/ellipse.tlpobj 2016-04-14 18:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/ellipse.tlpobj 2017-04-14 17:39:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/ellipse/ellipse.sty catalogue-ctan /graphics/ellipse -catalogue-date 2015-12-09 05:49:08 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics catalogue-version 1.0 ++++++ ellipsis.doc.tar.xz ++++++ ++++++ ellipsis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ellipsis.tlpobj new/tlpkg/tlpobj/ellipsis.tlpobj --- old/tlpkg/tlpobj/ellipsis.tlpobj 2016-04-14 18:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/ellipsis.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/ellipsis/ellipsis.sty catalogue-also lips catalogue-ctan /macros/latex/contrib/ellipsis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting ++++++ elmath.doc.tar.xz ++++++ ++++++ elmath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elmath.tlpobj new/tlpkg/tlpobj/elmath.tlpobj --- old/tlpkg/tlpobj/elmath.tlpobj 2016-04-14 18:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/elmath.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/elmath/elmath.sty catalogue-ctan /macros/latex/contrib/elmath -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics greek maths catalogue-version 1.2 ++++++ elocalloc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elocalloc/README new/doc/latex/elocalloc/README --- old/doc/latex/elocalloc/README 2015-05-11 23:08:51.000000000 +0200 +++ new/doc/latex/elocalloc/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -elocalloc package - -Local allocation macros, with names taken from etex.sty -but with implementation based on the LaTeX 2015 allocation macros. - -To produce typeset documentation: -pdflatex elocalloc.dtx - -To extract the elocalloc.sty package: -tex elocalloc.ins - -David Carlisle -LPPL licenced (status: maintained) - -Please report any issues at - -https://github.com/davidcarlisle/dpctex/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elocalloc/README.txt new/doc/latex/elocalloc/README.txt --- old/doc/latex/elocalloc/README.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/elocalloc/README.txt 2016-12-16 00:01:03.000000000 +0100 @@ -0,0 +1,17 @@ +elocalloc package + +Local allocation macros, with names taken from etex.sty +but with implementation based on the LaTeX 2015 allocation macros. + +To produce typeset documentation: +pdflatex elocalloc.dtx + +To extract the elocalloc.sty package: +tex elocalloc.ins + +David Carlisle +LPPL licenced (status: maintained) + +Please report any issues at + +https://github.com/davidcarlisle/dpctex/issues Binary files old/doc/latex/elocalloc/elocalloc.pdf and new/doc/latex/elocalloc/elocalloc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elocalloc.doc.tlpobj new/tlpkg/tlpobj/elocalloc.doc.tlpobj --- old/tlpkg/tlpobj/elocalloc.doc.tlpobj 2016-04-14 18:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/elocalloc.doc.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -1,8 +1,8 @@ name elocalloc.doc category Package -revision 37644 +revision 42712 shortdesc doc files of elocalloc relocated 1 docfiles size=39 - RELOC/doc/latex/elocalloc/README + RELOC/doc/latex/elocalloc/README.txt RELOC/doc/latex/elocalloc/elocalloc.pdf ++++++ elocalloc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elocalloc/elocalloc.sty new/tex/latex/elocalloc/elocalloc.sty --- old/tex/latex/elocalloc/elocalloc.sty 2015-06-23 17:54:21.000000000 +0200 +++ new/tex/latex/elocalloc/elocalloc.sty 2016-12-16 00:01:04.000000000 +0100 @@ -7,13 +7,13 @@ %% elocalloc.dtx (with options: `package') %% %% Source File: textcase.dtx -%% Copyright 2015 David Carlisle +%% Copyright 2015-2016 David Carlisle %% %% This file may be distributed under the terms of the LPPL. %% See README for details. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{elocalloc} - [2015/06/21 v0.02 local allocation for LaTeX 2015+ (DPC)] + [2016/12/15 v0.03 local allocation for LaTeX 2015+ (DPC)] \ifx\e@alloc\@undefined \RequirePackage{etex} \expandafter\endinput @@ -37,7 +37,7 @@ \def\locmuskip{\eloc@lloc{\count 13}\e@alloc@top\muskipdef\muskip} \def\locbox {\eloc@lloc{\count 14}\float@count\e@alloc@chardef\box} \def\loctoks {\eloc@lloc{\count 15}\e@alloc@top\toksdef\toks} -\def\locmarks {\eloc@lloc{\count256}\e@alloc@topt\e@alloc@chardef\marks} +\def\locmarks {\eloc@lloc{\count256}\e@alloc@top\e@alloc@chardef\marks} \endinput %% %% End of file `elocalloc.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elocalloc.tlpobj new/tlpkg/tlpobj/elocalloc.tlpobj --- old/tlpkg/tlpobj/elocalloc.tlpobj 2016-04-14 18:59:30.000000000 +0200 +++ new/tlpkg/tlpobj/elocalloc.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -1,6 +1,6 @@ name elocalloc category Package -revision 37644 +revision 42712 shortdesc Local allocation macros for LaTeX 2015 relocated 1 longdesc Local allocation macros, with names taken from etex.sty but @@ -9,7 +9,7 @@ RELOC/tex/latex/elocalloc/elocalloc.sty catalogue-also etex-pkg catalogue-ctan /macros/latex/contrib/elocalloc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-12-15 10:25:53 +0100 catalogue-license lppl catalogue-topics macro-supp -catalogue-version 0.02 +catalogue-version 0.03 ++++++ elpres.doc.tar.xz ++++++ ++++++ elpres.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elpres.tlpobj new/tlpkg/tlpobj/elpres.tlpobj --- old/tlpkg/tlpobj/elpres.tlpobj 2016-04-14 18:59:31.000000000 +0200 +++ new/tlpkg/tlpobj/elpres.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/elpres/elpres.cls catalogue-ctan /macros/latex/contrib/elpres -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation class catalogue-version 0.3 ++++++ elsarticle.doc.tar.xz ++++++ ++++++ elsarticle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elsarticle.tlpobj new/tlpkg/tlpobj/elsarticle.tlpobj --- old/tlpkg/tlpobj/elsarticle.tlpobj 2016-04-14 18:59:32.000000000 +0200 +++ new/tlpkg/tlpobj/elsarticle.tlpobj 2017-04-14 17:39:15.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/bibtex/bst/elsarticle/elsarticle-num.bst RELOC/tex/latex/elsarticle/elsarticle.cls catalogue-ctan /macros/latex/contrib/elsarticle -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics journalpub class catalogue-version 1.20 ++++++ elteikthesis.doc.tar.xz ++++++ ++++++ elteikthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elteikthesis.tlpobj new/tlpkg/tlpobj/elteikthesis.tlpobj --- old/tlpkg/tlpobj/elteikthesis.tlpobj 2016-04-14 18:59:35.000000000 +0200 +++ new/tlpkg/tlpobj/elteikthesis.tlpobj 2017-04-14 17:39:17.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/elteikthesis/elteikthesis.cls catalogue-ctan /macros/latex/contrib/elteikthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics dissertation hungarian class catalogue-version 1.2 ++++++ eltex.doc.tar.xz ++++++ ++++++ eltex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eltex.tlpobj new/tlpkg/tlpobj/eltex.tlpobj --- old/tlpkg/tlpobj/eltex.tlpobj 2016-04-14 18:59:36.000000000 +0200 +++ new/tlpkg/tlpobj/eltex.tlpobj 2017-04-14 17:39:17.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/eltex/eltex7.tex catalogue-also circuit-macros circuitikz catalogue-ctan /macros/latex/contrib/eltex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram-circ catalogue-version 2.0 ++++++ elvish.doc.tar.xz ++++++ ++++++ elvish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elvish.tlpobj new/tlpkg/tlpobj/elvish.tlpobj --- old/tlpkg/tlpobj/elvish.tlpobj 2016-04-14 18:59:36.000000000 +0200 +++ new/tlpkg/tlpobj/elvish.tlpobj 2017-04-14 17:39:17.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/fonts/tfm/public/elvish/teng10.tfm catalogue-also tengwar catalogue-ctan /fonts/elvish -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-invented ++++++ elzcards.doc.tar.xz ++++++ ++++++ elzcards.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elzcards.tlpobj new/tlpkg/tlpobj/elzcards.tlpobj --- old/tlpkg/tlpobj/elzcards.tlpobj 2016-04-14 18:59:36.000000000 +0200 +++ new/tlpkg/tlpobj/elzcards.tlpobj 2017-04-14 17:39:17.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=4 RELOC/tex/latex/elzcards/elzcards.sty catalogue-ctan /macros/latex/contrib/elzcards -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics card-gen catalogue-version 1.20 ++++++ emarks.doc.tar.xz ++++++ ++++++ emarks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emarks.tlpobj new/tlpkg/tlpobj/emarks.tlpobj --- old/tlpkg/tlpobj/emarks.tlpobj 2016-04-14 18:59:37.000000000 +0200 +++ new/tlpkg/tlpobj/emarks.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=1 RELOC/tex/latex/emarks/emarks.sty catalogue-ctan /macros/latex/contrib/emarks -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting catalogue-version 1.0 ++++++ embedall.doc.tar.xz ++++++ ++++++ embedall.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embedall.tlpobj new/tlpkg/tlpobj/embedall.tlpobj --- old/tlpkg/tlpobj/embedall.tlpobj 2016-04-14 18:59:38.000000000 +0200 +++ new/tlpkg/tlpobj/embedall.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/embedall/embedall.sty catalogue-ctan /macros/latex/contrib/embedall -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics pdf-feat archival catalogue-version 1.0 ++++++ embrac.doc.tar.xz ++++++ ++++++ embrac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.tlpobj new/tlpkg/tlpobj/embrac.tlpobj --- old/tlpkg/tlpobj/embrac.tlpobj 2016-04-14 18:59:38.000000000 +0200 +++ new/tlpkg/tlpobj/embrac.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=4 RELOC/tex/latex/embrac/embrac.sty catalogue-ctan /macros/latex/contrib/embrac -catalogue-date 2016-01-09 15:46:24 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics typesetting expl3 catalogue-version 0.6d ++++++ esami.doc.tar.xz -> emf.doc.tar.xz ++++++ ++++ 4238 lines of diff (skipped) ++++++ esami.doc.tar.xz -> emf.tar.xz ++++++ ++++ 3499 lines of diff (skipped) ++++++ emisa.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/emisa/README.md new/doc/latex/emisa/README.md --- old/doc/latex/emisa/README.md 2016-04-07 22:52:37.000000000 +0200 +++ new/doc/latex/emisa/README.md 2016-11-25 19:28:44.000000000 +0100 @@ -5,7 +5,7 @@ Enterprise Modelling and Information Systems Architectures - An International Journal (EMISA) (c) 2015, 2016 -Version: 2.1 +Version: 2.1.1 Maintainer: Stefan Strecker and Martin Sievers Email: stefan.strecker(a)fernuni-hagen.de martin.sievers(a)schoenerpublizieren.de @@ -27,12 +27,15 @@ ``` ## Changelog +### 2.1.1 to 2.1 -### 2.1 to 2.01 +* Fixed a bug introduced with version 2.1. Undefined macro \ifempty was changed to \ifdefvoid + +### 2.1 to 2.0.1 * Fixed a bug introduced by incompatible changes of latest biblatex packages (>3.3) -### 2.01 to 2.0 +### 2.0.1 to 2.0 * Set uniquelist option to false in order to change the cite output * Changed maxcitenames=3 to maxcitenames=2 Binary files old/doc/latex/emisa/emisa.pdf and new/doc/latex/emisa/emisa.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/emisa/manifest.txt new/doc/latex/emisa/manifest.txt --- old/doc/latex/emisa/manifest.txt 2016-04-07 22:52:37.000000000 +0200 +++ new/doc/latex/emisa/manifest.txt 2016-11-25 19:28:44.000000000 +0100 @@ -24,7 +24,7 @@ used in the LaTeX Project Public License, are to be interpreted in the case of this work. -March 31, 2016 (version 2.1) +July, 18th 2016 (version 2.1.1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emisa.doc.tlpobj new/tlpkg/tlpobj/emisa.doc.tlpobj --- old/tlpkg/tlpobj/emisa.doc.tlpobj 2016-04-14 18:59:38.000000000 +0200 +++ new/tlpkg/tlpobj/emisa.doc.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -1,6 +1,6 @@ name emisa.doc category Package -revision 40326 +revision 41731 shortdesc doc files of emisa relocated 1 docfiles size=109 ++++++ emisa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.bbx new/tex/latex/emisa/emisa.bbx --- old/tex/latex/emisa/emisa.bbx 2016-04-07 22:52:37.000000000 +0200 +++ new/tex/latex/emisa/emisa.bbx 2016-11-25 19:33:47.000000000 +0100 @@ -10,7 +10,7 @@ %% See there for more information. %% ------------------------------------------------------------------------ %% -\ProvidesFile{emisa.bbx}[2016/03/31 2.1 EMISA bibliography style] +\ProvidesFile{emisa.bbx}[2016/07/18 2.1.1 EMISA bibliography style] \RequireBibliographyStyle{authoryear} \newcommand*{\bibitemlabel}[1]{% \normalfont #1} @@ -127,14 +127,14 @@ \newbibmacro*{name:family-giveninit}[4]{% \usebibmacro{name:delim}{#2#3#1}% \usebibmacro{name:hook}{#2#3#1}% - \ifempty{#3}{}{% + \ifdefvoid{#3}{}{% \mkbibnameprefix{#3}%\isdot \ifprefchar% replaces \ifpunctmark{'}% {}% {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% \mkbibnamefamily{#1}\addhighpenspace% - \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}% - \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot}% + \ifdefvoid{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}% + \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot}% }% }% {% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.cbx new/tex/latex/emisa/emisa.cbx --- old/tex/latex/emisa/emisa.cbx 2016-04-07 22:52:37.000000000 +0200 +++ new/tex/latex/emisa/emisa.cbx 2016-11-25 19:33:47.000000000 +0100 @@ -10,7 +10,7 @@ %% See there for more information. %% ------------------------------------------------------------------------ %% -\ProvidesFile{emisa.cbx}[2016/03/31 2.1 EMISA citation style] +\ProvidesFile{emisa.cbx}[2016/07/18 2.1.1 EMISA citation style] \RequireCitationStyle{authoryear-comp} \renewcommand*{\nameyeardelim}{\addspace} \DeclareRangeChars*{f} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.cls new/tex/latex/emisa/emisa.cls --- old/tex/latex/emisa/emisa.cls 2016-04-07 22:52:37.000000000 +0200 +++ new/tex/latex/emisa/emisa.cls 2016-11-25 19:33:47.000000000 +0100 @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{emisa}% -[2016/03/31 2.1 LaTeX class EMISA] +[2016/07/18 2.1.1 LaTeX class EMISA] \def\@clearglobaloption#1{% \def\@tempa{#1}% \def\@tempb{\@gobble}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emisa.tlpobj new/tlpkg/tlpobj/emisa.tlpobj --- old/tlpkg/tlpobj/emisa.tlpobj 2016-04-14 18:59:39.000000000 +0200 +++ new/tlpkg/tlpobj/emisa.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -1,6 +1,6 @@ name emisa category Package -revision 40326 +revision 41731 shortdesc A LaTeX package for preparing manuscripts for the journal EMISA relocated 1 longdesc The EMISA LaTeX package is provided for preparing manuscripts @@ -13,7 +13,7 @@ RELOC/tex/latex/emisa/emisa.cbx RELOC/tex/latex/emisa/emisa.cls catalogue-ctan /macros/latex/contrib/emisa -catalogue-date 2016-04-13 06:31:06 +0200 +catalogue-date 2016-07-19 08:55:14 +0200 catalogue-license lppl1.3 catalogue-topics publisher class -catalogue-version 2.1 +catalogue-version 2.1.1 ++++++ emp.doc.tar.xz ++++++ ++++++ emp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emp.tlpobj new/tlpkg/tlpobj/emp.tlpobj --- old/tlpkg/tlpobj/emp.tlpobj 2016-04-14 18:59:39.000000000 +0200 +++ new/tlpkg/tlpobj/emp.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/tex/latex/emp/emp.sty catalogue-also metatex catalogue-ctan /macros/latex/contrib/emp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-inline ++++++ emptypage.doc.tar.xz ++++++ ++++++ emptypage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emptypage.tlpobj new/tlpkg/tlpobj/emptypage.tlpobj --- old/tlpkg/tlpobj/emptypage.tlpobj 2016-04-14 18:59:39.000000000 +0200 +++ new/tlpkg/tlpobj/emptypage.tlpobj 2017-04-14 17:39:18.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/emptypage/emptypage.sty catalogue-ctan /macros/latex/contrib/emptypage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics layout catalogue-version 1.2 ++++++ emulateapj.doc.tar.xz ++++++ ++++++ emulateapj.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emulateapj.tlpobj new/tlpkg/tlpobj/emulateapj.tlpobj --- old/tlpkg/tlpobj/emulateapj.tlpobj 2016-04-14 18:59:39.000000000 +0200 +++ new/tlpkg/tlpobj/emulateapj.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=16 RELOC/tex/latex/emulateapj/emulateapj.cls catalogue-ctan /macros/latex/contrib/emulateapj -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub astronomy class ++++++ enctex.doc.tar.xz ++++++ ++++++ enctex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enctex.tlpobj new/tlpkg/tlpobj/enctex.tlpobj --- old/tlpkg/tlpobj/enctex.tlpobj 2016-04-14 18:59:40.000000000 +0200 +++ new/tlpkg/tlpobj/enctex.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -49,6 +49,6 @@ RELOC/tex/generic/enctex/utf8unkn.tex RELOC/tex/generic/enctex/utf8warn.tex catalogue-ctan /systems/enctex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics engine ++++++ encxvlna.doc.tar.xz ++++++ ++++++ encxvlna.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/encxvlna.tlpobj new/tlpkg/tlpobj/encxvlna.tlpobj --- old/tlpkg/tlpobj/encxvlna.tlpobj 2016-04-14 18:59:40.000000000 +0200 +++ new/tlpkg/tlpobj/encxvlna.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/encxvlna/encxvlna.sty RELOC/tex/plain/encxvlna/encxvlna.tex catalogue-ctan /macros/generic/encxvlna -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting czech slovak catalogue-version 1.1 ++++++ endfloat.doc.tar.xz ++++++ ++++++ endfloat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endfloat.tlpobj new/tlpkg/tlpobj/endfloat.tlpobj --- old/tlpkg/tlpobj/endfloat.tlpobj 2016-04-14 18:59:40.000000000 +0200 +++ new/tlpkg/tlpobj/endfloat.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/endfloat/efxmpl.cfg RELOC/tex/latex/endfloat/endfloat.sty catalogue-ctan /macros/latex/contrib/endfloat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics float catalogue-version 2.5d ++++++ endheads.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endheads/README.md new/doc/latex/endheads/README.md --- old/doc/latex/endheads/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/endheads/README.md 2017-04-10 03:16:45.000000000 +0200 @@ -0,0 +1,7 @@ +Readme for endheads + +Endheads makes running headers of the form ``Notes to pp.~xx--yy'' for +users of endnotes.sty. It also enables one to reset the endnotes counter +by chapter. endheads requires fancyhdr, endnotes, and ifthen. Endheads will also work for memoir class, but in that case it won't require fancyhdr. + +This material is subject to the LATEX Project Public License 1.3c. \ No newline at end of file Binary files old/doc/latex/endheads/endheads.pdf and new/doc/latex/endheads/endheads.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endheads.doc.tlpobj new/tlpkg/tlpobj/endheads.doc.tlpobj --- old/tlpkg/tlpobj/endheads.doc.tlpobj 2016-04-14 18:59:41.000000000 +0200 +++ new/tlpkg/tlpobj/endheads.doc.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -1,7 +1,8 @@ name endheads.doc category Package -revision 31921 +revision 43750 shortdesc doc files of endheads relocated 1 -docfiles size=61 +docfiles size=57 + RELOC/doc/latex/endheads/README.md RELOC/doc/latex/endheads/endheads.pdf ++++++ endheads.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/endheads/endheads.sty new/tex/latex/endheads/endheads.sty --- old/tex/latex/endheads/endheads.sty 2013-10-17 00:59:06.000000000 +0200 +++ new/tex/latex/endheads/endheads.sty 2017-04-10 03:16:45.000000000 +0200 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{endheads} - [2013/10/14 v1.55 endheads file] + [2017/4/6 v1.6 endheads file] \providecommand*{\ifrefundefined}[1]{% \expandafter\ifx\csname r@#1\endcsname\relax \expandafter\@firstoftwo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endheads.tlpobj new/tlpkg/tlpobj/endheads.tlpobj --- old/tlpkg/tlpobj/endheads.tlpobj 2016-04-14 18:59:41.000000000 +0200 +++ new/tlpkg/tlpobj/endheads.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -1,6 +1,6 @@ name endheads category Package -revision 31921 +revision 43750 shortdesc Running headers of the form "Notes to pp.xx-yy" relocated 1 longdesc Endheads provides running headers of the form "Notes to pp. xx- @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/endheads/endheads.sty catalogue-ctan /macros/latex/contrib/endheads -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-08 06:57:54 +0200 catalogue-license lppl catalogue-topics endnote page-hf -catalogue-version 1.5 +catalogue-version 1.6 ++++++ endiagram.doc.tar.xz ++++++ ++++++ endiagram.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endiagram.tlpobj new/tlpkg/tlpobj/endiagram.tlpobj --- old/tlpkg/tlpobj/endiagram.tlpobj 2016-04-14 18:59:41.000000000 +0200 +++ new/tlpkg/tlpobj/endiagram.tlpobj 2017-04-14 17:39:19.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=17 RELOC/tex/latex/endiagram/endiagram.sty catalogue-ctan /macros/latex/contrib/endiagram -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chemistry expl3 catalogue-version 0.1d ++++++ endnotes.doc.tar.xz ++++++ ++++++ endnotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endnotes.tlpobj new/tlpkg/tlpobj/endnotes.tlpobj --- old/tlpkg/tlpobj/endnotes.tlpobj 2016-04-14 18:59:41.000000000 +0200 +++ new/tlpkg/tlpobj/endnotes.tlpobj 2017-04-14 17:39:20.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/endnotes/endnotes.sty catalogue-also fnpara footmisc footnpag catalogue-ctan /macros/latex/contrib/endnotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics endnote ++++++ engpron.doc.tar.xz ++++++ ++++++ engpron.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engpron.tlpobj new/tlpkg/tlpobj/engpron.tlpobj --- old/tlpkg/tlpobj/engpron.tlpobj 2016-04-14 18:59:43.000000000 +0200 +++ new/tlpkg/tlpobj/engpron.tlpobj 2017-04-14 17:39:20.000000000 +0200 @@ -3,7 +3,7 @@ revision 16558 shortdesc Helps to type the pronunciation of English words relocated 1 -longdesc This package provides macros beginning with the 'PS' character, +longdesc This package provides macros beginning with the PS character, longdesc made active, which enable us to write the British or American longdesc English pronunciation as one can find it in the 'English longdesc Pronouncing Dictionary' by Daniel Jones. There is an option to @@ -12,7 +12,7 @@ RELOC/tex/latex/engpron/engpron-tools.sty RELOC/tex/latex/engpron/engpron.sty catalogue-ctan /macros/latex/contrib/engpron -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics phonetic linguistic catalogue-version 2 ++++++ engrec.doc.tar.xz ++++++ ++++++ engrec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engrec.tlpobj new/tlpkg/tlpobj/engrec.tlpobj --- old/tlpkg/tlpobj/engrec.tlpobj 2016-04-14 18:59:43.000000000 +0200 +++ new/tlpkg/tlpobj/engrec.tlpobj 2017-04-14 17:39:20.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/engrec/engrec.sty catalogue-also greekctr catalogue-ctan /macros/latex/contrib/engrec -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list list-enum greek catalogue-version 1.1 ++++++ engtlc.doc.tar.xz ++++++ ++++++ engtlc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engtlc.tlpobj new/tlpkg/tlpobj/engtlc.tlpobj --- old/tlpkg/tlpobj/engtlc.tlpobj 2016-04-14 18:59:44.000000000 +0200 +++ new/tlpkg/tlpobj/engtlc.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/engtlc/engtlc.sty catalogue-ctan /macros/latex/contrib/engtlc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics engineering catalogue-version 3.2 ++++++ enigma.doc.tar.xz ++++++ ++++++ enigma.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enigma.tlpobj new/tlpkg/tlpobj/enigma.tlpobj --- old/tlpkg/tlpobj/enigma.tlpobj 2016-04-14 18:59:44.000000000 +0200 +++ new/tlpkg/tlpobj/enigma.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/enigma/enigma.sty RELOC/tex/plain/enigma/enigma.tex catalogue-ctan /macros/luatex/generic/enigma -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics security luatex catalogue-version 0.1 ++++++ enotez.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/README new/doc/latex/enotez/README --- old/doc/latex/enotez/README 2016-01-09 23:30:22.000000000 +0100 +++ new/doc/latex/enotez/README 2017-04-24 23:26:18.000000000 +0200 @@ -1,15 +1,15 @@ -------------------------------------------------------------------------- -the ENOTEZ package v0.8b +the ENOTEZ package v0.9a Endnotes for LaTeX2e -2016/01/07 +2017/04/24 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/enotez/ 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 Binary files old/doc/latex/enotez/enotez_en.pdf and new/doc/latex/enotez/enotez_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_en.tex new/doc/latex/enotez/enotez_en.tex --- old/doc/latex/enotez/enotez_en.tex 2015-07-29 22:45:10.000000000 +0200 +++ new/doc/latex/enotez/enotez_en.tex 2017-04-24 23:26:18.000000000 +0200 @@ -12,7 +12,7 @@ % Web: http://www.mychemistry.eu/forums/forum/enotez/ % E-Mail: contact(a)mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2015 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 @@ -41,7 +41,7 @@ info = {Endnotes for \LaTeXe} , authors = Clemens Niederberger , email = contact(a)mychemistry.eu , - url = http://www.mychemistry.eu/forums/forum/enotez/ , + url = https://bitbucket.org/cgnieder/enotez/ , pre-output = \setfnpct{dont-mess-around} , add-cmds = { @endnotemark, @@ -69,7 +69,7 @@ index-setup = { othercode = \footnotesize , level = \addsec , - noclearpage + % noclearpage } , makeindex-setup = { columns = 3 , @@ -128,23 +128,28 @@ \begin{commands} \command{endnote}[\oarg{mark}\marg{text}] Add an endnote in the text. + \command{endnotemark}[\oarg{mark}] + \sinceversion{0.9}Add an endnotemark. + \command{endnotetext}[\marg{text}] + \sinceversion{0.9}Add text to an endnote placed with \cs{endnotemark}. \end{commands} \begin{example} This is some text.\endnote{With an endnote.} \end{example} There's not really much more to it. It is possible to add a custom mark by using the optional argument but that shouldn't be needed too often. -\cs{endnote} works fine inside tables, minipages, floats and -captions\footnote{This has been tested with the standard classes, - \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the - \pkg*{caption} package. If you're using another package that redefines - \cs*{caption} or are using another class it might not work. Before you - place a note in a caption you should re-think the idea anyway.}. Endnotes +% \cs{endnote} works fine inside tables, minipages, floats and +% captions\footnote{This has been tested with the standard classes, +% \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the +% \pkg*{caption} package. If you're using another package that redefines +% \cs*{caption} or are using another class it might not work. Before you +% place a note in a caption you should re-think the idea anyway.}. +Endnotes can also be nested. -Since this functionality seemed making a pair -\cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by -\enotez. +% Since this functionality seemed making a pair +% \cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by +% \enotez. \begin{example} This is some text.\endnote{With another endnote.\endnote{This is a nested\endnote{And another level deeper\ldots} endnote!}} @@ -157,32 +162,32 @@ contains the current mark which is preceded by \cs{enmarkstyle}. Both of these commands can be redefined of course to adapt to custom settings. This can also be done using options, see section~\ref{sec:options}. The mark of -the endnote that has been set last is stored in \cs{theendnote} and in +the endnote that has been set last is stored in % \cs{theendnote} and in \verbcode+\(a)currentlabel+.\sinceversion{0.6} -This could be used to define a command which writes a mark: -\begin{example} - % we cannot use \newcommand -- the command starts with \end... - \makeatletter - \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}} - \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}} - \makeatother - Text\endnotemark -\end{example} -Please note that this definition \emph{does not} step the endnote counter but -either refers to the last number (no optional argument) or uses the one -provided in the optional argument. - -\makeatletter -\def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}} -\def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}} -\makeatother +% This could be used to define a command which writes a mark: +% \begin{example} +% % we cannot use \newcommand -- the command starts with \end... +% \makeatletter +% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}} +% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}} +% \makeatother +% Text\endnotemark +% \end{example} +% Please note that this definition \emph{does not} step the endnote counter but +% either refers to the last number (no optional argument) or uses the one +% provided in the optional argument. + +% \makeatletter +% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}} +% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}} +% \makeatother Endnotes can also be labelled and later be referred to: \begin{example} The next endnote\endnote{This endnote gets a label.}\label{en:test} has - the number~\ref{en:test}. We can use this with the previous definition - of \cs{endnotemark}\endnotemark[\ref{en:test}]. + the number~\ref{en:test}. Let's now test + \cs{endnotemark}\endnotemark[\ref{en:test}]. \end{example} \subsection{Printing the Notes} @@ -515,4 +520,3 @@ \printendnotes[addsec] \end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_split_example.tex new/doc/latex/enotez/enotez_split_example.tex --- old/doc/latex/enotez/enotez_split_example.tex 2015-07-29 22:45:10.000000000 +0200 +++ new/doc/latex/enotez/enotez_split_example.tex 2016-11-25 19:28:45.000000000 +0100 @@ -1,8 +1,8 @@ -\documentclass{scrartcl} +\documentclass{article} +% \documentclass{scrartcl} % \documentclass{memoir} -% \documentclass{article} \usepackage[english]{babel} -\usepackage{caption} +% \usepackage{caption} \usepackage[T1]{fontenc} \usepackage{libertine} @@ -14,21 +14,18 @@ split=section, list-style=section, reset, + backref % customize the titles in between, e.g.: % split-sectioning=addsec, % split-title=\par\noindent<name> <ref>: } \usepackage{fnpct} -% \AdaptNote\endnote\multendnote \usepackage{mwe} \usepackage[colorlinks]{hyperref} \begin{document} -\makeatletter -% \texttt{\meaning\@@makecaption} -\makeatother \tableofcontents @@ -38,10 +35,14 @@ Text\multendnote{\kant[5];\kant[6]}. \begin{figure}[htp] - \centering - \includegraphics[width=.4\linewidth]{example-image-a} - \caption[caption]{Some text\endnote{An endnote with a nested endnote\endnote{\kant[7]} - inside a figure caption.}.} + \centering + \includegraphics[width=.4\linewidth]{example-image-a} + % \addtocounter{endnote}{-1} % <<< need this in memoir class and with + % `caption' package when using an endnote + % inside a caption + \caption[caption]{Some text\endnotemark.} + \endnotetext{An endnote with a nested endnote\endnote{\kant[7]} inside a + figure caption.} \end{figure} \appendix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.doc.tlpobj new/tlpkg/tlpobj/enotez.doc.tlpobj --- old/tlpkg/tlpobj/enotez.doc.tlpobj 2016-04-14 18:59:44.000000000 +0200 +++ new/tlpkg/tlpobj/enotez.doc.tlpobj 2017-04-25 02:07:20.000000000 +0200 @@ -1,9 +1,9 @@ name enotez.doc category Package -revision 39335 +revision 44024 shortdesc doc files of enotez relocated 1 -docfiles size=122 +docfiles size=121 RELOC/doc/latex/enotez/README RELOC/doc/latex/enotez/enotez_en.pdf RELOC/doc/latex/enotez/enotez_en.tex ++++++ enotez.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/enotez/enotez.sty new/tex/latex/enotez/enotez.sty --- old/tex/latex/enotez/enotez.sty 2016-01-09 23:30:22.000000000 +0100 +++ new/tex/latex/enotez/enotez.sty 2017-04-24 23:26:18.000000000 +0200 @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/enotez/ % 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 @@ -31,36 +31,21 @@ \RequirePackage{ expl3 , xparse , l3keys2e , xtemplate , etoolbox , xpatch , scrlfile } \ProvidesExplPackage {enotez} - {2016/01/07} - {0.8b} + {2017/04/24} + {0.9a} {Endnotes for LaTeX2e} % -------------------------------------------------------------------------- -% check expl3 version: -\@ifpackagelater { expl3 } { 2012/11/21 } - { } - { - \PackageError {enotez} { Support~package~expl3~too~old } - { - You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~ - 'l3packages'.\MessageBreak - Loading~enotez~will~abort! - } - \tex_endinput:D - } - -% -------------------------------------------------------------------------- % messages -\msg_new:nnnn {enotez} { captions } - { Endnotes~might~not~work~in~captions. } - { - Endnotes~might~not~work~inside~captions.~You~might~try~to~use~the~caption~ - package~if~you~encounter~problems~but~that's~not~a~promise~that~things~ - will~work~then. - } - +% \msg_new:nnnn {enotez} {captions} +% { Endnotes~might~not~work~in~captions. } +% { +% Endnotes~might~not~work~inside~captions.~You~might~try~to~use~the~caption~ +% package~if~you~encounter~problems~but~that's~not~a~promise~that~things~ +% will~work~then. +% } -\msg_new:nnnn {enotez} { deprecated } +\msg_new:nnnn {enotez} {deprecated} { The~#1~`#2'~is~deprecated.~Use~`#3'~instead~\msg_line_context:. } { The~#1~`#2'~you~used~\msg_line_context: \c_space_tl is~deprecated~and~has~ @@ -69,15 +54,14 @@ } \cs_new:Npn \enotez_option_deprecated:nn #1#2 - { \msg_warning:nnnnn {enotez} { deprecated } { option } {#1} {#2} } + { \msg_warning:nnnnn {enotez} {deprecated} {option} {#1} {#2} } \cs_new:Npn \enotez_command_deprecated:NN #1#2 { - \msg_warning:nnnnn {enotez} { deprecated } { command } + \msg_warning:nnnnn {enotez} {deprecated} {command} { \token_to_str:N #1 } { \token_to_str:N #2 } } - % -------------------------------------------------------------------------- % variants of kernel functions \cs_generate_variant:Nn \tl_if_eq:nnTF { Vn , nx } @@ -92,28 +76,30 @@ \bool_new:N \l__enotez_hyperfootnotes_bool \bool_new:N \l__enotez_hyperbackref_bool \bool_new:N \l__enotez_split_bool -\bool_new:N \l__enotez_caption_patched_bool -\bool_new:N \l__enotez_koma_patched_bool -\bool_new:N \l__enotez_memoir_patched_bool +% \bool_new:N \l__enotez_caption_patched_bool +% \bool_new:N \l__enotez_koma_patched_bool +% \bool_new:N \l__enotez_memoir_patched_bool +\bool_new:N \l__enotez_disable_bool \tl_new:N \l__enotez_tmpa_tl \tl_new:N \l__enotez_tmpb_tl \tl_new:N \l__enotez_tmpc_tl +\tl_new:N \l__enotez_change_tl \tl_new:N \l__enotez_totoc_tl \tl_new:N \l__enotez_list_name_tl -\tl_set:Nn \l__enotez_list_name_tl { Notes } +\tl_set:Nn \l__enotez_list_name_tl {Notes} \tl_new:N \l__enotez_endnote_text_tl \tl_new:N \l__enotez_endnote_mark_tl \tl_new:N \l__enotez_list_instance_tl -\tl_set:Nn \l__enotez_list_instance_tl { plain } +\tl_set:Nn \l__enotez_list_instance_tl {plain} \tl_new:N \l__enotez_split_tl \tl_new:N \l__enotez_splitted_list_sectioning_tl \tl_new:N \l__enotez_splitted_title_tl -\tl_set:Nn \l__enotez_splitted_title_tl { Notes~for~<name>~<ref> } +\tl_set:Nn \l__enotez_splitted_title_tl {Notes~for~<name>~<ref>} \tl_new:N \l__enotez_section_tl -\tl_set:Nn \l__enotez_section_tl { section } +\tl_set:Nn \l__enotez_section_tl {section} \tl_new:N \l__enotez_chapter_tl -\tl_set:Nn \l__enotez_chapter_tl { chapter } +\tl_set:Nn \l__enotez_chapter_tl {chapter} \tl_new:N \g__enotez_actual_sectioning_tl \tl_new:N \l__enotez_list_splitted_title_tl \tl_new:N \g__enotez_list_next_preamble_tl @@ -133,6 +119,7 @@ \int_zero:N \g__enotez_endnote_id_int \int_new:N \g__enotez_endnote_mark_int \int_zero:N \g__enotez_endnote_mark_int +\newcounter {endnote} \int_new:N \g__enotez_list_printed_int \int_zero:N \g__enotez_list_printed_int \int_new:N \l__enotez_tmpa_int @@ -144,32 +131,10 @@ \prop_new:N \g__enotez_endnote_sect_id_prop \prop_new:N \g__enotez_endnote_man_prop +\cs_new_protected:Npn \enotez_nobreak: { \tex_penalty:D \c_ten_thousand } + % -------------------------------------------------------------------------- % options: -\cs_new_eq:NN \enotez_counter_format:n \int_to_arabic:n -\cs_generate_variant:Nn \enotez_counter_format:n { V } - -\cs_new_eq:NN \__enotez_int_to_arabic:n \int_to_arabic:n -\cs_new_eq:NN \__enotez_int_to_roman:n \int_to_roman:n -\cs_new_eq:NN \__enotez_int_to_Roman:n \int_to_Roman:n -\cs_new_eq:NN \__enotez_int_to_alph:n \int_to_alph:n -\cs_new_eq:NN \__enotez_int_to_Alph:n \int_to_Alph:n -\cs_new:Npn \__enotez_int_to_symbols:n #1 - { - \int_to_symbols:nnn {#1} { 9 } - { - { 1 } { \mode_if_math:TF { * } { \textasteriskcentered } } - { 2 } { \mode_if_math:TF { \dagger } { \textdagger } } - { 3 } { \mode_if_math:TF { \ddagger } { \textdaggerdbl } } - { 4 } { \mode_if_math:TF { \mathsection } { \textsection } } - { 5 } { \mode_if_math:TF { \mathparagraph } { \textparagraph } } - { 6 } { \mode_if_math:TF { \| } { \textbardbl } } - { 7 } { \mode_if_math:TF { ** } { \textasteriskcentered\textasteriskcentered } } - { 8 } { \mode_if_math:TF { \dagger\dagger } { \textdagger\textdagger } } - { 9 } { \mode_if_math:TF { \ddagger\ddagger } { \textdaggerdbl\textdaggerdbl } } - } - } - \keys_define:nn {enotez} { backref .bool_set:N = \l__enotez_hyperbackref_bool , @@ -177,12 +142,13 @@ list-name .tl_set:N = \l__enotez_list_name_tl , reset .bool_set:N = \l__enotez_reset_bool , % TODO: add symbols and other possible formats, use cntformats? - counter-format .choices:nn = - { arabic , alph , Alph , roman , Roman , symbols } - { - \cs_set_eq:Nc \enotez_counter_format:n - { __enotez_int_to_ \l_keys_choice_tl :n } - } , + counter-format .choice: , + counter-format / arabic .code:n = \cs_set:Npn \theendnote {\arabic{endnote}} , + counter-format / alph .code:n = \cs_set:Npn \theendnote {\alph{endnote}} , + counter-format / Alph .code:n = \cs_set:Npn \theendnote {\Alph{endnote}} , + counter-format / roman .code:n = \cs_set:Npn \theendnote {\roman{endnote}} , + counter-format / Roman .code:n = \cs_set:Npn \theendnote {\Roman{endnote}} , + counter-format / symbols .code:n = \cs_set:Npn \theendnote {\fnsymbol{endnote}} , mark-format .code:n = \cs_set:Npn \enmarkstyle {#1} , mark-cs .code:n = \cs_set:Npn \enotezwritemark {#1} , totoc .choices:nn = @@ -222,19 +188,20 @@ % typeset the actual mark: % #1: id % #2: mark -\cs_new:Npn \enotez_write_mark:nn #1#2 +\cs_new_protected:Npn \enotez_write_mark:nn #1#2 { \bool_if:NTF \l__enotez_hyperfootnotes_bool { - \enotezwritemark { \hyperlink { enz.#1 } { \enmarkstyle #2 } } + \enotezwritemark { \hyperlink {enz.#1} { \enmarkstyle #2 } } \bool_if:NT \l__enotez_hyperbackref_bool { - \box_move_up:nn { 1em } - { \hbox:n { \hypertarget { enz.#1.backref } { } } } + \box_move_up:nn {1em} + { \hbox:n { \hypertarget {enz.#1.backref} { } } } } } { \enotezwritemark { \enmarkstyle #2 } } } +\cs_generate_variant:Nn \enotez_write_mark:nn {x} % the internal endnote: \cs_new_protected:Npn \enotez_endnote:nn #1#2 @@ -248,24 +215,33 @@ \int_gincr:N \g__enotez_endnote_id_int \quark_if_no_value:nTF {#1} { - \int_gincr:N \g__enotez_endnote_mark_int - \cs_gset:cpx { @currentlabel } - { \enotez_counter_format:V \g__enotez_endnote_mark_int } - \cs_gset_eq:NN \theendnote \@currentlabel - \enotez_write_mark:nn + \stepcounter {endnote}% problem with option `reset' + % \show \theendnote + \cs_gset:cpx {@currentlabel} {\theendnote} + \enotez_write_mark:xn { \int_use:N \g__enotez_endnote_id_int } - { \enotez_counter_format:V \g__enotez_endnote_mark_int } + { \theendnote } } { - \cs_gset:cpx { @currentlabel } {#1} - \cs_gset_eq:NN \theendnote \@currentlabel - \enotez_write_mark:nn { \int_use:N \g__enotez_endnote_id_int } {#1} + \cs_gset:cpn {@currentlabel} {#1} + % \cs_gset_eq:NN \theendnote \@currentlabel + \enotez_write_mark:xn { \int_use:N \g__enotez_endnote_id_int } {#1} + } + \bool_if:NT \l__enotez_disable_bool + { + \int_gdecr:N \g__enotez_endnote_id_int + \addtocounter {endnote} {-1} } } +\cs_new_protected:Npn \enotez_disable: + { \bool_set_true:N \l__enotez_disable_bool } + +\NewDocumentCommand \enotezdisable {} { \enotez_disable: } + \cs_new_protected:Npn \enotez_endnote_text:nn #1#2 { - \tl_set:Nn \l__enotez_tmpa_tl { chapter } + \tl_set:Nn \l__enotez_tmpa_tl {chapter} \quark_if_no_value:nTF {#1} { \bool_if:nTF @@ -277,7 +253,8 @@ { \enotez_save_note:xxxxxnn { \int_use:N \g__enotez_endnote_id_int } - { \int_use:N \g__enotez_endnote_mark_int } + { \theendnote } + % { \int_use:N \g__enotez_endnote_mark_int } { \int_use:N \g__enotez_list_printed_int } { \thechapter } { \int_eval:n { \value{chapter} } } @@ -287,7 +264,8 @@ { \enotez_save_note:xxxxxnn { \int_use:N \g__enotez_endnote_id_int } - { \int_use:N \g__enotez_endnote_mark_int } + { \theendnote } + % { \int_use:N \g__enotez_endnote_mark_int } { \int_use:N \g__enotez_list_printed_int } { \thesection } { \int_eval:n { \value{section} } } @@ -326,95 +304,6 @@ } % -------------------------------------------------------------------------- -% in some cases caption making commands need to be patched. preparations: -\cs_new:Npn \__enotez_tmp_endnote:nn {} - -\cs_new_protected:Npn \enotez_caption_endnote:nn #1#2 - { - \quark_if_no_value:nTF {#1} - { - \enotez_write_mark:nn - { \int_use:N \g__enotez_endnote_id_int } - { \enotez_counter_format:V \g__enotez_endnote_mark_int } - } - { \enotez_write_mark:nn { \int_use:N \g__enotez_endnote_id_int } {#1} } - } - -\cs_new_protected:Npn \enotez@koma@disable - { \cs_set_eq:NN \enotez_endnote:nn \enotez_caption_endnote:nn } - -\cs_new_protected:Npn \enotez@memoir@disable - { - \cs_set_eq:NN \__enotez_tmp_endnote:nn \enotez_endnote:nn - \cs_set_eq:NN \enotez_endnote:nn \enotez_caption_endnote:nn - } - -\cs_new_protected:Npn \enotez@memoir@enable - { \cs_set_eq:NN \enotez_endnote:nn \__enotez_tmp_endnote:nn } - -\cs_new_protected:Npn \enotez@caption@disable - { - \xpatchcmd \caption@@make - { \caption@@@make } - { \enotez@koma@disable\caption@@@make } - { \bool_set_true:N \l__enotez_caption_patched_bool } - { \bool_set_false:N \l__enotez_caption_patched_bool } - } - -% if we're in a KOMA class, \@@makecaption needs to be patched: -\cs_if_free:NF \KOMAClassName - { - \xpatchcmd \@@makecaption - { \setlength{\@tempdima}{\cap@width} } - { \enotez@koma@disable\setlength{\@tempdima}{\cap@width} } - { \bool_set_true:N \l__enotez_koma_patched_bool } - { \bool_set_false:N \l__enotez_koma_patched_bool } - \AfterPackage+ { caption } { \enotez@caption@disable } - } - -% if we're in memoir, \@makecaption needs to be patched: -% TODO: fails when caption has been loaded, needs to be reworked -\AfterClass+ { memoir } - { - \AtEndPreamble - { - \cs_if_exist:cF { ver(a)caption.sty } - { - \xpatchcmd \@makecaption - { \let\@contfnote\footnote } - { \enotez@memoir@disable\let\@contfnote\footnote } - { \bool_set_true:N \l__enotez_memoir_patched_bool } - { \bool_set_false:N \l__enotez_memoir_patched_bool } - \xpatchcmd \@makecaption - { \let\footnote\@contfnote } - { \enotez@memoir@enable\let\footnote\@contfnote } - { \bool_set_true:N \l__enotez_memoir_patched_bool } - { \bool_set_false:N \l__enotez_memoir_patched_bool } - } - } - } - -\AtBeginDocument - { - \bool_if:nT - { \cs_if_exist_p:c { ver(a)caption.sty } && !\l__enotez_caption_patched_bool } - { \AfterPackage+ { caption } { \enotez@caption@disable } } - \bool_if:nT - { - ( \cs_if_exist_p:c { ver(a)memoir.cls } && !\l__enotez_memoir_patched_bool ) - || - ( - !\cs_if_exist_p:c { ver(a)memoir.cls } && - \cs_if_exist_p:c { ver(a)caption.sty } && - !\l__enotez_caption_patched_bool - ) - || - ( \cs_if_exist_p:N \KOMAClassName && !\l__enotez_koma_patched_bool ) - } - { \msg_warning:nn {enotez} { captions } } - } - -% -------------------------------------------------------------------------- % save the notes to the aux file: % #1: global id % #2: mark @@ -439,8 +328,6 @@ } % a try to check if a rerun is necessary: -\tl_new:N \l__enotez_change_tl - \AtEndDocument { \cs_set_protected:Npn \enotez@note #1#2#3#4#5#6#7 @@ -459,6 +346,7 @@ % disable compatibility with `fnpct' \cs_new_protected:Npn \endnote { + \enotez_nobreak: \peek_meaning_ignore_spaces:NTF [ { \enotez_endnote_aux:w } { \enotez_endnote:nn { \q_no_value } } @@ -467,25 +355,25 @@ \cs_new:Npn \enotez_endnote_aux:w [#1]#2 { \enotez_endnote:nn {#1} {#2} } -% \cs_new_protected:Npn \endnotemark -% { -% \peek_meaning_ignore_spaces:NTF [ -% { \enotez_endnote_mark_aux:w } -% { \enotez_endnote_mark:n { \q_no_value } } -% } +\cs_new_protected:Npn \endnotemark + { + \peek_meaning_ignore_spaces:NTF [ + { \enotez_endnote_mark_aux:w } + { \enotez_endnote_mark:n { \q_no_value } } + } -% \cs_new:Npn \enotez_endnote_mark_aux:w [#1] -% { \enotez_endnote_mark:n {#1} } +\cs_new:Npn \enotez_endnote_mark_aux:w [#1] + { \enotez_endnote_mark:n {#1} } -% \cs_new_protected:Npn \endnotetext -% { -% \peek_meaning_ignore_spaces:NTF [ -% { \enotez_endnote_text_aux:w } -% { \enotez_endnote_text:nn { \q_no_value } } -% } +\cs_new_protected:Npn \endnotetext + { + \peek_meaning_ignore_spaces:NTF [ + { \enotez_endnote_text_aux:w } + { \enotez_endnote_text:nn { \q_no_value } } + } -% \cs_new:Npn \enotez_endnote_text_aux:w [#1]#2 -% { \enotez_endnote_text:nn {#1} {#2} } +\cs_new:Npn \enotez_endnote_text_aux:w [#1]#2 + { \enotez_endnote_text:nn {#1} {#2} } % -------------------------------------------------------------------------- % the list of notes @@ -498,9 +386,9 @@ % \cs_new:Npn \enotezsplitlistheading % { \use:c { \l__enotez_splitted_list_sectioning_tl } } -\DeclareObjectType { enotez-list } { 1 } +\DeclareObjectType {enotez-list} {1} -\DeclareTemplateInterface { enotez-list } { paragraph } { 1 } +\DeclareTemplateInterface {enotez-list} {paragraph} {1} { heading : function 1 = \enotezlistheading{#1} , format : tokenlist = \footnotesize , @@ -509,7 +397,7 @@ notes-sep : length = .5\baselineskip , } -\DeclareTemplateCode { enotez-list } { paragraph } { 1 } +\DeclareTemplateCode {enotez-list} {paragraph} {1} { heading = \enotez_list_heading:n , format = \l__enotez_list_format_tl , @@ -522,7 +410,7 @@ \bool_if:NT \l__enotez_totoc_bool { \bool_if:NT \l__enotez_hyperref_bool { \phantomsection } - \addcontentsline { toc } { \l__enotez_totoc_tl } { \l__enotez_list_name_tl } + \addcontentsline {toc} { \l__enotez_totoc_tl } { \l__enotez_list_name_tl } } \enotez_list_heading:n { \l__enotez_list_name_tl } \enotez_list_preamble: @@ -562,7 +450,7 @@ \enotez_list_postamble: } -\DeclareTemplateInterface { enotez-list } { list } { 1 } +\DeclareTemplateInterface {enotez-list} {list} {1} { heading : function 1 = \enotezlistheading{#1} , format : tokenlist = \footnotesize , @@ -571,7 +459,7 @@ list-type : tokenlist = description , } -\DeclareTemplateCode { enotez-list } { list } { 1 } +\DeclareTemplateCode {enotez-list} {list} {1} { heading = \enotez_list_heading:n , format = \l__enotez_list_format_tl , @@ -629,36 +517,36 @@ } % some default styles: -\DeclareInstance { enotez-list } { plain } { paragraph } { } -\DeclareInstance { enotez-list } { description } { list } { } -\DeclareInstance { enotez-list } { itemize } { list } { list-type = itemize } +\DeclareInstance {enotez-list} {plain} {paragraph } { } +\DeclareInstance {enotez-list} {description} {list} { } +\DeclareInstance {enotez-list} {itemize} {list} { list-type = itemize } % -------------------------------------------------------------------------- % write the mark in the lists: \cs_new_protected:Npn \enotez_write_list_number:n #1 { \bool_if:NT \l__enotez_hyperfootnotes_bool - { \box_move_up:nn { 1em } { \hbox:n { \hypertarget { enz.#1 } { } } } } + { \box_move_up:nn {1em} { \hbox:n { \hypertarget {enz.#1} { } } } } \tl_use:N \l__enotez_list_number_format_tl - \tl_if_eq:nxTF { a } + \tl_if_eq:nxTF {a} { \prop_item:Nn \g__enotez_endnote_man_prop {#1} } { \bool_if:nTF { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool } { \exp_args:Nnx - \hyperlink { enz.#1.backref } - { \enotez_counter_format:V \l__enotez_endnote_mark_tl } + \hyperlink {enz.#1.backref} + { \exp_not:V \l__enotez_endnote_mark_tl } } - { \enotez_counter_format:V \l__enotez_endnote_mark_tl } + { \prop_item:Nn \g__enotez_endnote_mark_prop {#1} } } { \bool_if:nTF { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool } { \exp_args:Nnx - \hyperlink { enz.#1.backref } - { \tl_use:N \l__enotez_endnote_mark_tl } + \hyperlink {enz.#1.backref} + { \exp_not:V \l__enotez_endnote_mark_tl } } { \tl_use:N \l__enotez_endnote_mark_tl } } @@ -679,23 +567,31 @@ \bool_if:NTF \l__enotez_split_bool { \bool_set_true:N \l__enotez_print_note_bool - \prop_gpop:NnN \g__enotez_endnote_mark_prop - {#2} - \l__enotez_endnote_mark_tl - \prop_gpop:NnN \g__enotez_endnote_text_prop - {#2} - \l__enotez_endnote_text_tl + \tl_set:Nx \l__enotez_endnote_mark_tl + { \prop_item:Nn \g__enotez_endnote_mark_prop {#2} } + \tl_set:Nx \l__enotez_endnote_text_tl + { \prop_item:Nn \g__enotez_endnote_text_prop {#2} } + % \prop_gpop:NnN \g__enotez_endnote_mark_prop + % {#2} + % \l__enotez_endnote_mark_tl + % \prop_gpop:NnN \g__enotez_endnote_text_prop + % {#2} + % \l__enotez_endnote_text_tl } { \int_compare:nTF { \l__enotez_tmpa_tl = \g__enotez_list_printed_int } { \bool_set_true:N \l__enotez_print_note_bool - \prop_gpop:NnN \g__enotez_endnote_mark_prop - {#2} - \l__enotez_endnote_mark_tl - \prop_gpop:NnN \g__enotez_endnote_text_prop - {#2} - \l__enotez_endnote_text_tl + \tl_set:Nx \l__enotez_endnote_mark_tl + { \prop_item:Nn \g__enotez_endnote_mark_prop {#2} } + \tl_set:Nx \l__enotez_endnote_text_tl + { \prop_item:Nn \g__enotez_endnote_text_prop {#2} } + % \prop_gpop:NnN \g__enotez_endnote_mark_prop + % {#2} + % \l__enotez_endnote_mark_tl + % \prop_gpop:NnN \g__enotez_endnote_text_prop + % {#2} + % \l__enotez_endnote_text_tl \prop_gremove:Nn \g__enotez_endnote_split_prop {#2} } { \bool_set_false:N \l__enotez_print_note_bool } @@ -803,18 +699,31 @@ % internal printendnotes: \cs_new_protected:Npn \enotez_print_endnotes:nn #1#2 { - \tl_if_blank:nTF {#2} - { \UseInstance { enotez-list } { \l__enotez_list_instance_tl } } - { \UseInstance { enotez-list } {#2} } - {#1} - \bool_if:NF \l__enotez_split_bool - { - \bool_if:NT \l__enotez_reset_bool - { \int_gzero:N \g__enotez_endnote_mark_int } - \int_gincr:N \g__enotez_list_printed_int + \enotez_if_endnotes:T + { + \tl_if_blank:nTF {#2} + { \UseInstance {enotez-list} { \l__enotez_list_instance_tl } } + { \UseInstance {enotez-list} {#2} } + {#1} + \bool_if:NF \l__enotez_split_bool + { + \bool_if:NT \l__enotez_reset_bool + { + \setcounter {endnote} {0} + % \int_gzero:N \g__enotez_endnote_mark_int + } + \int_gincr:N \g__enotez_list_printed_int + } } } +\prg_new_conditional:Npnn \enotez_if_endnotes: {p,T,F,TF} + { + \int_compare:nTF { \value {endnote} > 0 } + { \prg_return_true: } + { \prg_return_false: } + } + % the user command: \NewDocumentCommand \printendnotes { so } { @@ -883,16 +792,16 @@ \cs_new_protected:Npn \enotez_set_every_postamble:n #1 { \tl_gset:Nn \g__enotez_list_every_postamble_tl {#1} } -\NewDocumentCommand \AtNextEndnotesList { +m } +\NewDocumentCommand \AtNextEndnotesList {+m} { \enotez_set_next_preamble:n {#1} } -\NewDocumentCommand \AtEveryEndnotesList { +m } +\NewDocumentCommand \AtEveryEndnotesList {+m} { \enotez_set_every_preamble:n {#1} } -\NewDocumentCommand \AfterNextEndnotesList { +m } +\NewDocumentCommand \AfterNextEndnotesList {+m} { \enotez_set_next_postamble:n {#1} } -\NewDocumentCommand \AfterEveryEndnotesList { +m } +\NewDocumentCommand \AfterEveryEndnotesList {+m} { \enotez_set_every_postamble:n {#1} } % -------------------------------------------------------------------------- @@ -921,10 +830,10 @@ \cs_new_protected:Npn \enotez_set_every_split_postamble:n #1 { \tl_gset:Nn \g__enotez_split_list_postamble_tl {#1} } -\NewDocumentCommand \AtEveryListSplit { +m } +\NewDocumentCommand \AtEveryListSplit {+m} { \enotez_set_every_split_preamble:n {#1} } -\NewDocumentCommand \AfterEveryListSplit { +m } +\NewDocumentCommand \AfterEveryListSplit {+m} { \enotez_set_every_split_postamble:n {#1} } \cs_new:Npn \EnotezCurrentSplitTitle {} @@ -937,13 +846,16 @@ { \bool_if:NT \l__enotez_split_bool { - \tl_if_eq:VnTF \l__enotez_split_tl { section } + \tl_if_eq:VnTF \l__enotez_split_tl {section} { \tl_put_left:Nn \section { \int_gincr:N \g__enotez_list_printed_int \bool_if:NT \l__enotez_reset_bool - { \int_gzero:N \g__enotez_endnote_mark_int } + { + \setcounter {endnote} {0} + % \int_gzero:N \g__enotez_endnote_mark_int + } } } { @@ -951,11 +863,14 @@ { \int_gincr:N \g__enotez_list_printed_int \bool_if:NT \l__enotez_reset_bool - { \int_gzero:N \g__enotez_endnote_mark_int } + { + \setcounter {endnote} {0} + % \int_gzero:N \g__enotez_endnote_mark_int + } } } } - \@ifpackageloaded { hyperref } + \@ifpackageloaded {hyperref} { \bool_set_true:N \l__enotez_hyperref_bool \ifHy@hyperfootnotes @@ -972,60 +887,60 @@ % -------------------------------------------------------------------------- % the setup command: -\NewDocumentCommand \setenotez { +m } - { \keys_set:nn {enotez} {#1} \ignorespaces } +\NewDocumentCommand \setenotez {m} + { \keys_set:nn {enotez} {#1} } % -------------------------------------------------------------------------- % language support -\RequirePackage { translations } -\DeclareTranslationFallback { enotez-title } { Notes } -\DeclareTranslation { Catalan } { enotez-title } { Notes } -\DeclareTranslation { Croatian } { enotez-title } { Bilje\v{s}ke } -\DeclareTranslation { English } { enotez-title } { Notes } -\DeclareTranslation { French } { enotez-title } { Remarques } -\DeclareTranslation { German } { enotez-title } { Anmerkungen } -\DeclareTranslation { Hungarian } { enotez-title } { Megjegyz\'{e}sek } -\DeclareTranslation { Italian } { enotez-title } { Note } -\DeclareTranslation { Spanish } { enotez-title } { Notas } -\DeclareTranslation { Turkish } { enotez-title } { Notlar } - -\DeclareTranslationFallback { enotez-splitted-title } { Notes~for~<name>~<ref> } -\DeclareTranslation { Catalan } { enotez-splitted-title } { Notes~del~<name>~<ref> } -\DeclareTranslation { Croatian } { enotez-splitted-title } { Bilje\v{s}ke~uz~<name>~<ref> } -\DeclareTranslation { English } { enotez-splitted-title } { Notes~for~<name>~<ref> } -\DeclareTranslation { French } { enotez-splitted-title } { Remarques~aux~<name>~<ref> } -\DeclareTranslation { German } { enotez-splitted-title } { Anmerkungen~zu~<name>~<ref> } -\DeclareTranslation { Hungarian } { enotez-splitted-title } { Megjegyz\'{e}sek~a~<ref>.~<name> } -\DeclareTranslation { Italian } { enotez-splitted-title } { Note~per~il~<name>~<ref> } -\DeclareTranslation { Spanish } { enotez-splitted-title } { Notas~del~<name>~<ref> } -\DeclareTranslation { Turkish } { enotez-splitted-title } { <name>~<ref>~notlar } - -\DeclareTranslationFallback { enotez-section } { section } -\DeclareTranslation { Catalan } { enotez-section } { secci\'{o} } -\DeclareTranslation { Croatian } { enotez-section } { odjeljak } -\DeclareTranslation { English } { enotez-section } { section } -\DeclareTranslation { French } { enotez-section } { section } -\DeclareTranslation { German } { enotez-section } { Abschnitt } -\DeclareTranslation { Hungarian } { enotez-section } { szakasz } -\DeclareTranslation { Italian } { enotez-section } { sezione } -\DeclareTranslation { Spanish } { enotez-section } { secci\'{o}n } -\DeclareTranslation { Turkish } { enotez-section } { B\"{o}l\"{u}m } - -\DeclareTranslationFallback { enotez-chapter } { chapter } -\DeclareTranslation { Catalan } { enotez-chapter } { cap\'{\i}tol } -\DeclareTranslation { Croatian } { enotez-chapter } { poglavlje } -\DeclareTranslation { English } { enotez-chapter } { chapter } -\DeclareTranslation { French } { enotez-chapter } { chapitre } -\DeclareTranslation { German } { enotez-chapter } { Kapitel } -\DeclareTranslation { Hungarian } { enotez-chapter } { fejezet } -\DeclareTranslation { Italian } { enotez-chapter } { capitolo } -\DeclareTranslation { Spanish } { enotez-chapter } { cap\'{\i}tulo } -\DeclareTranslation { Turkish } { enotez-chapter } { B\"{o}l\"{u}m } - -\tl_set:Nn \l__enotez_splitted_title_tl { \GetTranslation { enotez-splitted-title } } -\tl_set:Nn \l__enotez_list_name_tl { \GetTranslation { enotez-title } } -\tl_set:Nn \l__enotez_section_tl { \GetTranslation { enotez-section } } -\tl_set:Nn \l__enotez_chapter_tl { \GetTranslation { enotez-chapter } } +\RequirePackage {translations} +\DeclareTranslationFallback {enotez-title} {Notes} +\DeclareTranslation {Catalan} {enotez-title} {Notes} +\DeclareTranslation {Croatian} {enotez-title} {Bilje\v{s}ke} +\DeclareTranslation {English} {enotez-title} {Notes} +\DeclareTranslation {French} {enotez-title} {Remarques} +\DeclareTranslation {German} {enotez-title} {Anmerkungen} +\DeclareTranslation {Hungarian} {enotez-title} {Megjegyz\'{e}sek} +\DeclareTranslation {Italian} {enotez-title} {Note} +\DeclareTranslation {Spanish} {enotez-title} {Notas} +\DeclareTranslation {Turkish} {enotez-title} {Notlar} + +\DeclareTranslationFallback {enotez-splitted-title} {Notes~for~<name>~<ref>} +\DeclareTranslation {Catalan} {enotez-splitted-title} {Notes~del~<name>~<ref>} +\DeclareTranslation {Croatian} {enotez-splitted-title} {Bilje\v{s}ke~uz~<name>~<ref>} +\DeclareTranslation {English} {enotez-splitted-title} {Notes~for~<name>~<ref>} +\DeclareTranslation {French} {enotez-splitted-title} {Remarques~aux~<name>~<ref>} +\DeclareTranslation {German} {enotez-splitted-title} {Anmerkungen~zu~<name>~<ref>} +\DeclareTranslation {Hungarian} {enotez-splitted-title} {Megjegyz\'{e}sek~a~<ref>.~<name>} +\DeclareTranslation {Italian} {enotez-splitted-title} {Note~per~il~<name>~<ref>} +\DeclareTranslation {Spanish} {enotez-splitted-title} {Notas~del~<name>~<ref>} +\DeclareTranslation {Turkish} {enotez-splitted-title} {<name>~<ref>~notlar} + +\DeclareTranslationFallback {enotez-section} {section} +\DeclareTranslation {Catalan} {enotez-section} {secci\'{o}} +\DeclareTranslation {Croatian} {enotez-section} {odjeljak} +\DeclareTranslation {English} {enotez-section} {section} +\DeclareTranslation {French} {enotez-section} {section} +\DeclareTranslation {German} {enotez-section} {Abschnitt} +\DeclareTranslation {Hungarian} {enotez-section} {szakasz} +\DeclareTranslation {Italian} {enotez-section} {sezione} +\DeclareTranslation {Spanish} {enotez-section} {secci\'{o}n} +\DeclareTranslation {Turkish} {enotez-section} {B\"{o}l\"{u}m} + +\DeclareTranslationFallback {enotez-chapter} {chapter} +\DeclareTranslation {Catalan} {enotez-chapter} {cap\'{\i}tol} +\DeclareTranslation {Croatian} {enotez-chapter} {poglavlje} +\DeclareTranslation {English} {enotez-chapter} {chapter} +\DeclareTranslation {French} {enotez-chapter} {chapitre} +\DeclareTranslation {German} {enotez-chapter} {Kapitel} +\DeclareTranslation {Hungarian} {enotez-chapter} {fejezet} +\DeclareTranslation {Italian} {enotez-chapter} {capitolo} +\DeclareTranslation {Spanish} {enotez-chapter} {cap\'{\i}tulo} +\DeclareTranslation {Turkish} {enotez-chapter} {B\"{o}l\"{u}m} + +\tl_set:Nn \l__enotez_splitted_title_tl { \GetTranslation {enotez-splitted-title} } +\tl_set:Nn \l__enotez_list_name_tl { \GetTranslation {enotez-title} } +\tl_set:Nn \l__enotez_section_tl { \GetTranslation {enotez-section} } +\tl_set:Nn \l__enotez_chapter_tl { \GetTranslation {enotez-chapter} } \tex_endinput:D % -------------------------------------------------------------------------- @@ -1066,6 +981,9 @@ - new command \NewSplitTitleTag 2015/07/29 v0.8a - adapt to deprecated choice selection in keys 2016/01/07 v0.8b - \prop_get:Nn => \prop_item:Nn +2016/11/08 v0.9 - fix issues #6, #7, and #8 + - remove caption patching and add \endnotemark and \endnotetext +2017/04/24 v0.9a - fix wrong format of number in list % -------------------------------------------------------------------------- % TODO: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.tlpobj new/tlpkg/tlpobj/enotez.tlpobj --- old/tlpkg/tlpobj/enotez.tlpobj 2016-04-14 18:59:45.000000000 +0200 +++ new/tlpkg/tlpobj/enotez.tlpobj 2017-04-25 02:07:20.000000000 +0200 @@ -1,6 +1,6 @@ name enotez category Package -revision 39335 +revision 44024 shortdesc Support for end-notes relocated 1 longdesc The package allows nested endnotes, supports hyperref and @@ -11,7 +11,7 @@ RELOC/tex/latex/enotez/enotez.sty catalogue-also endnote endnotes catalogue-ctan /macros/latex/contrib/enotez -catalogue-date 2016-01-09 15:32:41 +0100 +catalogue-date 2017-04-24 19:51:11 +0200 catalogue-license lppl1.3 catalogue-topics endnote expl3 -catalogue-version 0.8b +catalogue-version 0.9a ++++++ enumitem-zref.doc.tar.xz ++++++ ++++++ enumitem-zref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem-zref.tlpobj new/tlpkg/tlpobj/enumitem-zref.tlpobj --- old/tlpkg/tlpobj/enumitem-zref.tlpobj 2016-04-14 18:59:46.000000000 +0200 +++ new/tlpkg/tlpobj/enumitem-zref.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=7 RELOC/tex/latex/enumitem-zref/enumitem-zref.sty catalogue-ctan /macros/latex/contrib/enumitem-zref -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 list catalogue-version 1.8 ++++++ enumitem.doc.tar.xz ++++++ ++++++ enumitem.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem.tlpobj new/tlpkg/tlpobj/enumitem.tlpobj --- old/tlpkg/tlpobj/enumitem.tlpobj 2016-04-14 18:59:45.000000000 +0200 +++ new/tlpkg/tlpobj/enumitem.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=11 RELOC/tex/latex/enumitem/enumitem.sty catalogue-ctan /macros/latex/contrib/enumitem -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list catalogue-version 3.5.2 ++++++ envbig.doc.tar.xz ++++++ ++++++ envbig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/envbig.tlpobj new/tlpkg/tlpobj/envbig.tlpobj --- old/tlpkg/tlpobj/envbig.tlpobj 2016-04-14 18:59:46.000000000 +0200 +++ new/tlpkg/tlpobj/envbig.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=1 RELOC/tex/latex/envbig/envbig.sty catalogue-ctan /macros/latex/contrib/envbig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter ++++++ environ.doc.tar.xz ++++++ ++++++ environ.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/environ.tlpobj new/tlpkg/tlpobj/environ.tlpobj --- old/tlpkg/tlpobj/environ.tlpobj 2016-04-14 18:59:46.000000000 +0200 +++ new/tlpkg/tlpobj/environ.tlpobj 2017-04-14 17:39:21.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/environ/environ.sty catalogue-ctan /macros/latex/contrib/environ -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 0.3 ++++++ envlab.doc.tar.xz ++++++ ++++++ envlab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/envlab.tlpobj new/tlpkg/tlpobj/envlab.tlpobj --- old/tlpkg/tlpobj/envlab.tlpobj 2016-04-14 18:59:47.000000000 +0200 +++ new/tlpkg/tlpobj/envlab.tlpobj 2017-04-14 17:39:22.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/envlab/envlab.sty catalogue-also akletter dinbrief formlett catalogue-ctan /macros/latex/contrib/envlab -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter barcode class catalogue-version 1.2 ++++++ epigrafica.doc.tar.xz ++++++ ++++++ epigrafica.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigrafica.tlpobj new/tlpkg/tlpobj/epigrafica.tlpobj --- old/tlpkg/tlpobj/epigrafica.tlpobj 2016-04-14 18:59:47.000000000 +0200 +++ new/tlpkg/tlpobj/epigrafica.tlpobj 2017-04-14 17:39:22.000000000 +0200 @@ -68,7 +68,7 @@ RELOC/tex/latex/epigrafica/lgrepigrafica.fd RELOC/tex/latex/epigrafica/ot1epigrafica.fd catalogue-ctan /fonts/greek/epigrafica -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-greek font-sans catalogue-version 1.01 ++++++ epigram.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigram.tlpobj new/tlpkg/tlpobj/epigram.tlpobj --- old/tlpkg/tlpobj/epigram.tlpobj 2016-04-14 18:59:47.000000000 +0200 +++ new/tlpkg/tlpobj/epigram.tlpobj 2017-04-14 17:39:22.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/generic/epigram/epigram.tex catalogue-ctan /macros/generic/misc/epigram.tex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics epigram ++++++ epigraph.doc.tar.xz ++++++ ++++++ epigraph.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigraph.tlpobj new/tlpkg/tlpobj/epigraph.tlpobj --- old/tlpkg/tlpobj/epigraph.tlpobj 2016-04-14 18:59:47.000000000 +0200 +++ new/tlpkg/tlpobj/epigraph.tlpobj 2017-04-14 17:39:22.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/epigraph/epigraph.sty catalogue-ctan /macros/latex/contrib/epigraph -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics epigram catalogue-version 1.5c ++++++ epiolmec.doc.tar.xz ++++++ ++++++ epiolmec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epiolmec.tlpobj new/tlpkg/tlpobj/epiolmec.tlpobj --- old/tlpkg/tlpobj/epiolmec.tlpobj 2016-04-14 18:59:48.000000000 +0200 +++ new/tlpkg/tlpobj/epiolmec.tlpobj 2017-04-14 17:39:22.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/fonts/type1/public/epiolmec/Epi-Olmec.pfb RELOC/tex/latex/epiolmec/epiolmec.sty catalogue-ctan /language/epiolmec -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-type1 font-archaic ++++++ eplain.doc.tar.xz ++++++ ++++++ eplain.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eplain.tlpobj new/tlpkg/tlpobj/eplain.tlpobj --- old/tlpkg/tlpobj/eplain.tlpobj 2016-05-16 00:51:45.000000000 +0200 +++ new/tlpkg/tlpobj/eplain.tlpobj 2017-04-14 17:39:23.000000000 +0200 @@ -11,6 +11,13 @@ longdesc graphics), color, autopict (a package instance of the LaTeX longdesc picture code), psfrag, and url. depend pdftex +depend babel +depend cm +depend eplain +depend hyphen-base +depend knuth-lib +depend latex-fonts +depend plain depend eplain.ARCH execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,cm,eplain,hyphen-base,knuth-lib,latex-fonts,plain runfiles size=50 @@ -20,7 +27,7 @@ texmf-dist/tex/eplain/eplain.ini texmf-dist/tex/eplain/eplain.tex catalogue-ctan /macros/eplain -catalogue-date 2016-05-15 08:13:42 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics plain-ext format catalogue-version 3.8 ++++++ epsdice.doc.tar.xz ++++++ ++++++ epsdice.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsdice.tlpobj new/tlpkg/tlpobj/epsdice.tlpobj --- old/tlpkg/tlpobj/epsdice.tlpobj 2016-04-14 18:59:50.000000000 +0200 +++ new/tlpkg/tlpobj/epsdice.tlpobj 2017-04-14 17:39:23.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/epsdice/epsdice.sty catalogue-also dice catalogue-ctan /macros/latex/contrib/epsdice -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 2.1 ++++++ epsf-dvipdfmx.doc.tar.xz ++++++ ++++++ epsf-dvipdfmx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj new/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj --- old/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj 2016-04-14 18:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj 2017-04-14 17:39:24.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/plain/epsf-dvipdfmx/epsf-dvipdfmx.tex catalogue-ctan /macros/plain/contrib/epsf-dvipdfmx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-epspdf catalogue-version 2014 ++++++ epsf.doc.tar.xz ++++++ ++++++ epsf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsf.tlpobj new/tlpkg/tlpobj/epsf.tlpobj --- old/tlpkg/tlpobj/epsf.tlpobj 2016-04-14 18:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/epsf.tlpobj 2017-04-14 17:39:24.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/generic/epsf/epsf.tex catalogue-also epsfx catalogue-ctan /macros/generic/epsf -catalogue-date 2016-02-05 09:55:11 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-incl catalogue-version 2.7.4 ++++++ epsincl.doc.tar.xz ++++++ ++++++ epsincl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsincl.tlpobj new/tlpkg/tlpobj/epsincl.tlpobj --- old/tlpkg/tlpobj/epsincl.tlpobj 2016-04-14 18:59:51.000000000 +0200 +++ new/tlpkg/tlpobj/epsincl.tlpobj 2017-04-14 17:39:24.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/metapost/epsincl/epsincl.mp catalogue-ctan /graphics/metapost/contrib/macros/epsincl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-prep catalogue-version 0.2 ++++++ epslatex-fr.doc.tar.xz ++++++ ++++++ epspdf.doc.tar.xz ++++++ ++++++ epspdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdf.tlpobj new/tlpkg/tlpobj/epspdf.tlpobj --- old/tlpkg/tlpobj/epspdf.tlpobj 2016-05-07 03:15:40.000000000 +0200 +++ new/tlpkg/tlpobj/epspdf.tlpobj 2017-04-14 17:39:25.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/scripts/epspdf/epspdftk.tcl catalogue-also epstopdf catalogue-ctan /support/epspdf -catalogue-date 2016-05-06 15:41:09 +0200 +catalogue-date 2016-08-10 05:02:09 +0200 catalogue-license gpl catalogue-topics graphics-epspdf catalogue-version 0.6.3 ++++++ epspdfconversion.doc.tar.xz ++++++ ++++++ epspdfconversion.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdfconversion.tlpobj new/tlpkg/tlpobj/epspdfconversion.tlpobj --- old/tlpkg/tlpobj/epspdfconversion.tlpobj 2016-04-14 18:59:54.000000000 +0200 +++ new/tlpkg/tlpobj/epspdfconversion.tlpobj 2017-04-14 17:39:25.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/epspdfconversion/epspdfconversion.sty catalogue-ctan /macros/latex/contrib/epspdfconversion -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-epspdf callback catalogue-version 0.61 ++++++ epstopdf.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/epstopdf.1 new/texmf-dist/doc/man/man1/epstopdf.1 --- old/texmf-dist/doc/man/man1/epstopdf.1 2014-01-17 23:34:12.000000000 +0100 +++ new/texmf-dist/doc/man/man1/epstopdf.1 2017-01-09 00:01:04.000000000 +0100 @@ -1,9 +1,9 @@ -.TH EPSTOPDF 1 "17 January 2014" -.\" $Id: epstopdf.1 32701 2014-01-17 18:09:54Z karl $ +.TH EPSTOPDF 1 "7 January 2017" +.\" $Id: epstopdf.1 41288 2016-05-29 16:50:38Z karl $ .SH NAME epstopdf, repstopdf \- convert an EPS file to PDF .SH SYNOPSIS -\fBepstopdf\fP [\fIoptions\fP] [\fIepsfile\fP] +\fBepstopdf\fP [\fIoptions\fP] [\fIepsfile\fP [\fIpdffile\fP.pdf]] .SH DESCRIPTION By default, \fBepstopdf\fP converts the input PostScript file to PDF, using Ghostscript. @@ -14,6 +14,11 @@ BoundingBox. Thus, the result needs no cropping, and the PDF MediaBox is correct. .PP +By default, the output name is the input name with any extension +replaced by \fB.pdf\fP. An output name ending with .pdf can also be given +as a second argument on the command line, or the \fB--outfile\fP +(\fB-o\fP) option can be used with any name. +.PP PJL commands at the start of a file are removed. DOS EPS binary files (TN 5002) are supported. .PP @@ -22,8 +27,7 @@ .SH OPTIONS Options may start with either "\fB-\fP" or "\fB--\fP", and may be unambiguously abbreviated. It is best to use the full option name in -scripts, though, to avoid possible collisions with new options in the -future. +scripts to avoid possible collisions with new options in the future. .PP General script options: .IP "\fB--help\fP @@ -36,21 +40,21 @@ otherwise, the default is to construct the output file name by replacing any extension in the input file with `.pdf'. .IP "\fB--\fP[\fBno\fP]\fBdebug\fP" -write debugging info (default: off). +write debugging info (default: false). .IP "\fB--\fP[\fBno\fP]\fBexact\fP" -scan ExactBoundingBox (default: off). +scan ExactBoundingBox (default: false). .IP "\fB--\fP[\fBno\fP]\fBfilter\fP" read standard input and (unless \fB--outfile\fP is given) write standard -output (default: off). +output (default: false). .IP "\fB--\fP[\fBno\fP]\fBgs\fP" -run Ghostscript (default: on). With \fB--nogs\fP, output (to standard +run Ghostscript (default: true). With \fB--nogs\fP, output (to standard output by default) the PostScript that would normally be converted; that is, the input PostScript as modified by \fBepstopdf\fP. .IP "\fB--\fP[\fBno\fP]\fBhires\fP" -scan HiresBoundingBox (default: off). +scan HiresBoundingBox (default: false). .IP "\fB--restricted\fP=\fIval\fP" -turn on restricted mode (default: [on for repstopdf, else off]); -this forbids the use of \fB--gscmd\fP and \fB--gsopt\fP and imposes +turn on restricted mode (default: [true for repstopdf, else false]); +this forbids the use of \fB--gscmd\fP and other options and imposes restrictions on the input and output file names according to the values of openin_any and openout_any (see the Web2c manual, http://tug.org/web2c). .PP @@ -58,26 +62,30 @@ .IP "\fB--gscmd\fP=\fIval\fP" pipe output to \fIval\fP (default: [\fBgswin32c\fP on Windows, else \fBgs\fP]) .IP "\fB--gsopt\fP=\fIval\fP" -include \fIval\fP as one argument in the gs command (can be repeated), +include \fIval\fP as one argument in the gs command (can be repeated). .IP "\fB--gsopts\fP=\fIval\fP" -split \fIval\fP at whitespace, include each resulting word as an -argument in the gs command (can be repeated) +split \fIval\fP at whitespace and include each resulting word as an +argument in the gs command (can be repeated). .IP "\fB--autorotate\fP=\fIval\fP" set AutoRotatePages (default: None); recognized \fIval\fP choices: None, All, PageByPage. For EPS files, PageByPage is equivalent to All. .IP "\fB--\fP[\fBno\fP]\fBcompress\fP" -use compression in the output (default: on). +use compression in the output (default: true); if turned off, passes +.IR -dUseFlateCompression=false . .IP "\fB--device\fP=\fIdev\fP" -use -sDEVICE=\fIdev\fP (default: pdfwrite); not all devices are allowed -in restricted mode. +use -sDEVICE=\fIdev\fP (default: pdfwrite); not allowed in restricted mode. .IP "\fB--\fP[\fBno\fP]\fBembed\fP" -embed fonts (default: on). +embed fonts (default: true); passes +.I -dMaxSubsetPct=100 -dSubsetFonts=true -dEmbedAllFonts=true. +.IP "\fB--\fP[\fBno\fP]\fBgray\fP" +grayscale output (default: false); passes +.I -sColorConversionStrategy=Gray -dProcessColorModel=/DeviceGray. .IP "\fB--pdfsettings\fP=\fIval\fP" use -dPDFSETTINGS=/\fIval\fP (default is `prepress' if \fB--embed\fP, else empty); recognized \fIval\fP choices: screen, ebook, printer, prepress, default. .IP "\fB--\fP[\fBno\fP]\fBquiet\fP" -use -q, a.k.a. -dQUIET (default: off). +use -q, a.k.a. -dQUIET (default: false). .IP "\fB--res\fP=\fIdpi, dpi\fPx\fIdpi\fP" set image resolution (default: [use gs default]); ignored if \fB--debug\fP is set. @@ -97,13 +105,14 @@ and is necessary if an option or its value contains whitespace. .PP In restricted mode, options are limited to those with names and values -known to be safe; some options taking booleans, integers or fixed +known to be safe. Some options taking booleans, integers or fixed names are allowed, those taking general strings are not. .SH EXAMPLES -Examples all equivalently converting `test.eps' to `test.pdf': +These examples all equivalently convert `test.eps' to `test.pdf': .nf epstopdf test.eps +epstopdf test.eps test.pdf cat test.eps | epstopdf --filter >test.pdf cat test.eps | epstopdf -f -o=test.pdf .fi @@ -113,7 +122,7 @@ epstopdf --hires test.eps .fi .PP -Example for producing \fBepstopdf\fP's attempt at corrected PostScript: +Example for \fBepstopdf\fP's attempt at correcting PostScript: .nf $program --nogs test.ps >testcorr.ps .fi Binary files old/texmf-dist/doc/man/man1/epstopdf.man1.pdf and new/texmf-dist/doc/man/man1/epstopdf.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/repstopdf.man1.pdf and new/texmf-dist/doc/man/man1/repstopdf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epstopdf.doc.tlpobj new/tlpkg/tlpobj/epstopdf.doc.tlpobj --- old/tlpkg/tlpobj/epstopdf.doc.tlpobj 2016-04-14 18:59:54.000000000 +0200 +++ new/tlpkg/tlpobj/epstopdf.doc.tlpobj 2017-04-14 17:39:25.000000000 +0200 @@ -1,6 +1,6 @@ name epstopdf.doc category Package -revision 36139 +revision 42905 shortdesc doc files of epstopdf docfiles size=10 texmf-dist/doc/man/man1/epstopdf.1 ++++++ epstopdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/epstopdf/epstopdf.pl new/texmf-dist/scripts/epstopdf/epstopdf.pl --- old/texmf-dist/scripts/epstopdf/epstopdf.pl 2015-01-25 01:05:46.000000000 +0100 +++ new/texmf-dist/scripts/epstopdf/epstopdf.pl 2017-01-09 00:01:08.000000000 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $ +# $Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $ # (Copyright lines below.) # # Redistribution and use in source and binary forms, with or without @@ -34,9 +34,21 @@ # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe), # # emacs-page -my $ver = "2.23"; - -# History +# +my $ver = "2.26"; +# 2017/01/07 v2.26 (Norbert Preining, Karl Berry) +# * allow cmdline of infile outfile.pdf. +# * explicitly allow -o as abbreviation for --outfile, +# to guard against future --options. (Also --output.) +# 2016/06/30 v2.25 (Norbert Preining, Karl Berry) +# * don't set (default) device until after restricted check. +# * a few more debugging lines. +# 2016/05/29 v2.24 (Karl Berry) +# * new option --gray; patch from William Bader, +# tex-k mail 9 Feb 2016 19:37:08. +# * disallow --device completely in restricted mode, +# to avoid maintenance of device list. +# tex-live mail 10 Feb 2016 10:36:26. # 2015/01/22 v2.23 (Karl Berry) # * use # instead of = to placate msys; report from KUROKI Yusuke, # tex-k mail 20 Jan 2015 12:40:16. @@ -171,9 +183,9 @@ ### emacs-page ### program identification my $program = "epstopdf"; -my $ident = '($Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $)' . " $ver"; +my $ident = '($Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $)' . " $ver"; my $copyright = <<END_COPYRIGHT ; -Copyright 2009-2014 Karl Berry et al. +Copyright 2009-2017 Karl Berry et al. Copyright 2002-2009 Gerben Wierda et al. Copyright 1998-2001 Sebastian Rahtz et al. License RBSD: Revised BSD <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5> @@ -199,10 +211,11 @@ $::opt_autorotate = "None"; $::opt_compress = 1; $::opt_debug = 0; -$::opt_device= $default_device; +$::opt_device = ""; $::opt_embed = 1; $::opt_exact = 0; $::opt_filter = 0; +$::opt_gray = 0; $::opt_gs = 1; $::opt_gscmd = ""; @::opt_gsopt = (); @@ -315,36 +328,20 @@ # In any case not suitable for restricted: # -dDOPS -### restricted devices -# More or less copied from ghostscript's configure: -# BMP_DEVS, JPEG_DEVS, PNG_DEVS, TIFF_DEVS, PCX_DEVS, PBM_DEVS -# PS_DEVS (without text devices) -my @restricted_devlist = ($default_device); -my @restricted_devlist_ext = qw[ - bmpmono bmpgray bmpsep1 bmpsep8 bmp16 bmp256 bmp16m bmp32b - jpeg jpeggray jpegcmyk - pbm pbmraw pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw - pkm pkmraw pksm pksmraw pam pamcmyk4 pamcmyk32 plan plang - planm planc plank - pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pcx2up - png16 png16m png256 png48 pngalpha pnggray pngmono - psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb - tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw - tiffpack tiffgray tiffsep tiffsep1 tiffscaled tiffscaled8 tiffscaled24 - svg svgwrite -]; -push (@restricted_devlist, @restricted_devlist_ext); -my %restricted_devlist = ( map {$_, 1} @restricted_devlist ); - ### usage my @bool = ("false", "true"); my $resmsg = $::opt_res ? $::opt_res : "[use gs default]"; my $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]"; -my $defgsopts = "-q -dNOPAUSE -sDEVICE=pdfwrite"; + my $usage = <<"END_OF_USAGE"; -${title}Usage: $program [OPTION]... [EPSFILE] +${title}Usage: $program [OPTION]... [EPSFILE [PDFFILE.pdf]] + +Convert an EPS file to PDF (or other formats), by default using Ghostscript. -Convert EPS to PDF (or other formats), by default using Ghostscript. +By default, the output name is the input name with any extension +replaced by ".pdf". An output name ending with .pdf can also be given +as a second argument on the command line, or the --outfile (-o) option +can be used with any name. The resulting output is guaranteed to start at the 0,0 coordinate, and sets a page size exactly corresponding to the BoundingBox. Thus, the @@ -357,7 +354,7 @@ --help display this help and exit --version display version information and exit - --outfile=FILE write result to FILE (default based on input name) + -o, --outfile=FILE write result to FILE (default based on input name) --restricted use restricted mode (default: $bool[$restricted]) --(no)debug output debugging info (default: $bool[$::opt_debug]) @@ -374,8 +371,9 @@ recognized VAL choices: None, All, PageByPage; for EPS files, PageByPage is equivalent to All. --(no)compress use compression (default: $bool[$::opt_compress]) - --device=DEV use -sDEVICE=DEV (default: $::opt_device) + --device=DEV use -sDEVICE=DEV (default: $default_device) --(no)embed embed fonts (default: $bool[$::opt_embed]) + --(no)gray grayscale output (default: $bool[$::opt_gray]) --pdfsettings=VAL use -dPDFSETTINGS=/VAL (default is prepress if --embed, else empty); recognized VAL choices: screen, ebook, printer, prepress, default. @@ -386,6 +384,7 @@ Examples all equivalently converting test.eps to test.pdf: \$ $program test.eps + \$ $program test.eps test.pdf \$ cat test.eps | $program --filter >test.pdf \$ cat test.eps | $program -f -o=test.pdf @@ -401,21 +400,20 @@ More about the options for Ghostscript: Additional options to be used with gs can be specified with either or both of the two cumulative options --gsopts and --gsopt. - --gsopts takes a single string of options, which is split at whitespace, - each resulting word then added to the gs command line individually. + --gsopts takes a single string of options, which is split at whitespace + and each resulting word then added to the gs command line individually. --gsopt adds its argument as a single option to the gs command line. It can be used multiple times to specify options separately, and is necessary if an option or its value contains whitespace. In restricted mode, options are limited to those with names and values - known to be safe; some options taking booleans, integers or fixed + known to be safe. Some options taking booleans, integers or fixed names are allowed, those taking general strings are not. All options to epstopdf may start with either - or --, and may be unambiguously abbreviated. It is best to use the full option name in -scripts, though, to avoid possible collisions with new options in the -future. +scripts to avoid possible collisions with new options in the future. -When reporting bugs, please include an input file and command line +When reporting bugs, please include an input file and all command line options so the problem can be reproduced. Report bugs to: tex-k\(a)tug.org @@ -431,6 +429,7 @@ "device=s", "embed!", "exact!", + "gray!", "filter!", "gs!", "gscmd=s", # \ref{val_gscmd} @@ -438,7 +437,7 @@ "gsopts=s" => \&gsopts, # \ref{val_gsopts} "help|h", "hires!", - "outfile=s", # \ref{openout_any} + "outfile|output|o=s", # \ref{openout_any} "pdfsettings=s", "quiet", "res=s", @@ -457,7 +456,7 @@ sub debug { print STDERR "* @_\n" if $::opt_debug; } sub warning { print STDERR "==> Warning: @_\n"; } sub error { die "$title!!! Error: @_\n"; } -sub errorUsage { die "Error: @_ (try --help for more information)\n"; } +sub errorUsage { die "$program: Error: @_ (try --help for more information)\n"; } sub warnerr { $restricted ? error(@_) : warning(@_); } ### debug messages @@ -490,13 +489,13 @@ ### help, version options. if ($::opt_help) { print $usage; - exit (0); + exit 0; } if ($::opt_version) { print $title; print $copyright; - exit (0); + exit 0; } ### get input filename (\ref{openin_any} for validation) @@ -506,16 +505,29 @@ errorUsage "Input file cannot be used with filter option"; debug "Filtering: will read standard input"; } else { + # not filtering. @ARGV > 0 or errorUsage "Input filename missing"; - @ARGV < 2 or errorUsage "Unknown option or too many input files"; + # allow infile outfile.pdf. + if (@ARGV == 2) { + if ($::opt_outfile) { + errorUsage ("Multiple output specifications: second arg=$ARGV[1]," + . " --outfile=$::opt_outfile"); + } + if ($ARGV[1] !~ m/\.pdf$/i) { + errorUsage "Output file argument requires .pdf extension: $ARGV[1]"; + } + # seems we can use it. + $::opt_outfile = $ARGV[1]; + debug "Output filename from argv:", $::opt_outfile; + } + @ARGV > 2 and errorUsage "Too many arguments: @ARGV"; + $InputFilename = $ARGV[0]; - #-r $InputFilename or error "\"$InputFilename\" not readable"; debug "Input filename:", $InputFilename; } ### emacs-page -### start building GS command line for the pipe -### take --safer and --gsopts into account +### building the gs invocation. ### option gscmd if ($::opt_gscmd) { @@ -534,12 +546,17 @@ push @GS, '-dNOPAUSE'; push @GS, '-dBATCH'; -if ($::opt_device and $restricted and - not $restricted_devlist{$::opt_device}) { - error "Option forbidden in restricted mode: --device=$::opt_device"; - $::opt_device = ''; +### option device +if ($::opt_device) { + if ($restricted) { + error "Option forbidden in restricted mode: --device"; + } else { + debug "Switching from $default_device to $::opt_device"; + } +} else { + $::opt_device = $default_device; } -$::opt_device = $default_device unless $::opt_device; + push @GS, "-sDEVICE=$::opt_device"; ### option outfile @@ -582,16 +599,18 @@ -dEmbedAllFonts=true ] if $::opt_embed; - push @GS, '-dUseFlateCompression=false' unless $::opt_compress; +push @GS, qw(-sColorConversionStrategy=Gray -dProcessColorModel=/DeviceGray) + if $::opt_gray; + if ($::opt_res and not $::opt_res =~ /^(\d+(x\d+)?)$/) { warnerr "Invalid resolution: $opt_res"; $::opt_res = ''; } push @GS, "-r$::opt_res" if $::opt_res; -$resmsg= $::opt_res ? $::opt_res : "[use gs default]"; +$resmsg = $::opt_res ? $::opt_res : "[use gs default]"; # \label{val_autorotate} if ($::opt_autorotate and @@ -651,8 +670,10 @@ debug "Ghostscript command:", $GS; debug "Compression:", ($::opt_compress) ? "on" : "off"; debug "Embedding:", ($::opt_embed) ? "on" : "off"; - debug "Rotation:", $rotmsg; + debug "Grayscale:", ($::opt_gray) ? "on" : "off"; + debug "PDFSettings:", $::opt_pdfsettings; debug "Resolution:", $resmsg; + debug "Rotation:", $rotmsg; } ### emacs-page diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epstopdf.tlpobj new/tlpkg/tlpobj/epstopdf.tlpobj --- old/tlpkg/tlpobj/epstopdf.tlpobj 2016-04-14 18:59:54.000000000 +0200 +++ new/tlpkg/tlpobj/epstopdf.tlpobj 2017-04-14 17:39:25.000000000 +0200 @@ -1,7 +1,7 @@ name epstopdf category Package -revision 36139 -shortdesc Convert EPS to 'encapsulated' PDF using Ghostscript +revision 42905 +shortdesc Convert EPS to PDF using Ghostscript longdesc Epstopdf is a Perl script that converts an EPS file to an longdesc 'encapsulated' PDF file (a single page file whose media box is longdesc the same as the original EPS's bounding box). The resulting @@ -19,7 +19,7 @@ texmf-dist/scripts/epstopdf/epstopdf.pl catalogue-also epstopdf-pkg catalogue-ctan /support/epstopdf -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2017-01-08 10:43:15 +0100 catalogue-license other-free catalogue-topics graphics-epspdf -catalogue-version 2.23 +catalogue-version 2.26 ++++++ eqell.doc.tar.xz ++++++ ++++++ eqell.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqell.tlpobj new/tlpkg/tlpobj/eqell.tlpobj --- old/tlpkg/tlpobj/eqell.tlpobj 2016-04-14 18:59:55.000000000 +0200 +++ new/tlpkg/tlpobj/eqell.tlpobj 2017-04-14 17:39:26.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=1 RELOC/tex/latex/eqell/eqell.sty catalogue-ctan /macros/latex/contrib/eqell -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics typesetting ++++++ eqlist.doc.tar.xz ++++++ ++++++ eqlist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqlist.tlpobj new/tlpkg/tlpobj/eqlist.tlpobj --- old/tlpkg/tlpobj/eqlist.tlpobj 2016-04-14 18:59:55.000000000 +0200 +++ new/tlpkg/tlpobj/eqlist.tlpobj 2017-04-14 17:39:26.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/eqlist/eqlist.sty catalogue-ctan /macros/latex/contrib/eqlist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list list-descr catalogue-version 2.1 ++++++ eqname.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqname.tlpobj new/tlpkg/tlpobj/eqname.tlpobj --- old/tlpkg/tlpobj/eqname.tlpobj 2016-04-14 18:59:55.000000000 +0200 +++ new/tlpkg/tlpobj/eqname.tlpobj 2017-04-14 17:39:26.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/eqname/eqname.sty catalogue-ctan /macros/latex/contrib/gene/eqname -catalogue-date 2015-08-04 21:08:04 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics maths

1 0

commit texlive-specs-g 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-g for openSUSE:Factory checked in at 2017-06-25 19:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-g (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-g.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-g" Sun Jun 25 19:21:44 2017 rev:26 rq:504797 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.changes 2017-06-08 14:54:31.662792833 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-g.new/texlive-specs-g.changes 2017-06-25 19:25:02.299645254 +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: ---- devnag.doc.tar.xz dtxgallery.doc.tar.xz dtxgallery.source.tar.xz dtxgen.doc.tar.xz dtxgen.tar.xz dtxtut.doc.tar.xz duerer-latex.doc.tar.xz duerer-latex.tar.xz duerer.doc.tar.xz duerer.tar.xz duotenzor.doc.tar.xz duotenzor.tar.xz dutchcal.doc.tar.xz dutchcal.tar.xz dvdcoll.doc.tar.xz dvdcoll.tar.xz dvgloss.doc.tar.xz dvgloss.tar.xz dviasm.doc.tar.xz dviasm.tar.xz dvicopy.doc.tar.xz dvidvi.doc.tar.xz dviincl.doc.tar.xz dviincl.tar.xz dviljk.doc.tar.xz dvipdfmx-def.doc.tar.xz dvipdfmx-def.tar.xz dvipdfmx.doc.tar.xz dvipdfmx.tar.xz dvipng.doc.tar.xz dvipos.doc.tar.xz dvips.doc.tar.xz dvips.tar.xz dvips_config.dif dvipsconfig.tar.xz dvisvgm-def.doc.tar.xz dvisvgm-def.tar.xz dvisvgm.doc.tar.xz dynamicnumber.doc.tar.xz dynamicnumber.tar.xz dynblocks.doc.tar.xz dynblocks.tar.xz dyntree.doc.tar.xz dyntree.tar.xz e-french.doc.tar.xz e-french.tar.xz ean.doc.tar.xz ean.tar.xz ean13isbn.doc.tar.xz ean13isbn.tar.xz easy.doc.tar.xz easy.tar.xz New: ---- datatool.doc.tar.xz datatool.tar.xz dateiliste.doc.tar.xz dateiliste.tar.xz datenumber.doc.tar.xz datenumber.tar.xz datetime.doc.tar.xz datetime.tar.xz datetime2-bahasai.doc.tar.xz datetime2-bahasai.tar.xz datetime2-basque.doc.tar.xz datetime2-basque.tar.xz datetime2-breton.doc.tar.xz datetime2-breton.tar.xz datetime2-bulgarian.doc.tar.xz datetime2-bulgarian.tar.xz datetime2-catalan.doc.tar.xz datetime2-catalan.tar.xz datetime2-croatian.doc.tar.xz datetime2-croatian.tar.xz datetime2-czech.doc.tar.xz datetime2-czech.tar.xz datetime2-danish.doc.tar.xz datetime2-danish.tar.xz datetime2-dutch.doc.tar.xz datetime2-dutch.tar.xz datetime2-en-fulltext.doc.tar.xz datetime2-en-fulltext.tar.xz datetime2-english.doc.tar.xz datetime2-english.tar.xz datetime2-esperanto.doc.tar.xz datetime2-esperanto.tar.xz datetime2-estonian.doc.tar.xz datetime2-estonian.tar.xz datetime2-finnish.doc.tar.xz datetime2-finnish.tar.xz datetime2-french.doc.tar.xz datetime2-french.tar.xz datetime2-galician.doc.tar.xz datetime2-galician.tar.xz datetime2-german.doc.tar.xz datetime2-german.tar.xz datetime2-greek.doc.tar.xz datetime2-greek.tar.xz datetime2-hebrew.doc.tar.xz datetime2-hebrew.tar.xz datetime2-icelandic.doc.tar.xz datetime2-icelandic.tar.xz datetime2-irish.doc.tar.xz datetime2-irish.tar.xz datetime2-it-fulltext.doc.tar.xz datetime2-it-fulltext.tar.xz datetime2-italian.doc.tar.xz datetime2-italian.tar.xz datetime2-latin.doc.tar.xz datetime2-latin.tar.xz datetime2-lsorbian.doc.tar.xz datetime2-lsorbian.tar.xz datetime2.doc.tar.xz datetime2.tar.xz delimset.doc.tar.xz delimset.tar.xz diffcoeff.doc.tar.xz diffcoeff.tar.xz docsurvey.doc.tar.xz draftfigure.doc.tar.xz draftfigure.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-g.spec ++++++ ++++ 29510 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-g.new/texlive-specs-g.spec ++++++ datetime2-magyar.doc.tar.xz ++++++ ++++++ datetime2-magyar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-magyar.tlpobj new/tlpkg/tlpobj/datetime2-magyar.tlpobj --- old/tlpkg/tlpobj/datetime2-magyar.tlpobj 2016-04-14 18:55:29.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-magyar.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-magyar/datetime2-magyar-utf8.ldf RELOC/tex/latex/datetime2-magyar/datetime2-magyar.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-magyar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-norsk.doc.tar.xz ++++++ ++++++ datetime2-norsk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-norsk.tlpobj new/tlpkg/tlpobj/datetime2-norsk.tlpobj --- old/tlpkg/tlpobj/datetime2-norsk.tlpobj 2016-04-14 18:55:29.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-norsk.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-norsk/datetime2-norsk-utf8.ldf RELOC/tex/latex/datetime2-norsk/datetime2-norsk.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-norsk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-polish.doc.tar.xz ++++++ ++++++ datetime2-polish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-polish.tlpobj new/tlpkg/tlpobj/datetime2-polish.tlpobj --- old/tlpkg/tlpobj/datetime2-polish.tlpobj 2016-04-14 18:55:29.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-polish.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-polish/datetime2-polish-utf8.ldf RELOC/tex/latex/datetime2-polish/datetime2-polish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-polish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-portuges.doc.tar.xz ++++++ ++++++ datetime2-portuges.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-portuges.tlpobj new/tlpkg/tlpobj/datetime2-portuges.tlpobj --- old/tlpkg/tlpobj/datetime2-portuges.tlpobj 2016-04-14 18:55:30.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-portuges.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-portuges/datetime2-portuges-utf8.ldf RELOC/tex/latex/datetime2-portuges/datetime2-portuges.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-portuges -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-romanian.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-romanian/README new/doc/latex/datetime2-romanian/README --- old/doc/latex/datetime2-romanian/README 2015-03-31 23:57:53.000000000 +0200 +++ new/doc/latex/datetime2-romanian/README 2017-04-11 00:03:09.000000000 +0200 @@ -1,14 +1,12 @@ Romanian Language Module for datetime2 Package Author: Nicola L. C. Talbot (inactive) + Paul A. Patience <pap(a)papatience.com> Licence: LPPL Required Packages: datetime2, tracklang -This module is unmaintained. If you want to volunteer to take over -the maintenance contact me at www.dickimaw-books.com/contact.html - Example usage: \documentclass{article} Binary files old/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.pdf and new/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.tex new/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.tex --- old/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.tex 2017-04-11 00:03:09.000000000 +0200 @@ -0,0 +1,9 @@ +% arara: lualatex +\documentclass{article} + +\usepackage{fontspec} +\usepackage{polyglossia} +\setdefaultlanguage{romanian} +\setotherlanguage{english} + +\input{datetime2-romanian-test} Binary files old/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.pdf and new/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.tex new/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.tex --- old/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.tex 2017-04-11 00:03:09.000000000 +0200 @@ -0,0 +1,8 @@ +% arara: pdflatex +\documentclass[english,romanian]{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[english,main=romanian]{babel} + +\input{datetime2-romanian-test} Binary files old/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.pdf and new/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.tex new/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.tex --- old/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.tex 2017-04-11 00:03:09.000000000 +0200 @@ -0,0 +1,9 @@ +% arara: xelatex +\documentclass{article} + +\usepackage{fontspec} +\usepackage{polyglossia} +\setdefaultlanguage{romanian} +\setotherlanguage{english} + +\input{datetime2-romanian-test} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-romanian/datetime2-romanian-test.tex new/doc/latex/datetime2-romanian/datetime2-romanian-test.tex --- old/doc/latex/datetime2-romanian/datetime2-romanian-test.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/datetime2-romanian/datetime2-romanian-test.tex 2017-04-11 00:03:09.000000000 +0200 @@ -0,0 +1,30 @@ +\usepackage[en-GB,en-US]{datetime2} + +\newcommand*{\teststyle}[1]{% + \DTMsetstyle{#1} + \texttt{#1}:\par + \DTMnow\par + \DTMNow\par +} + +\newcommand*{\testall}[1]{% + \DTMlangsetup*{#1} + \texttt{#1}:\par + \teststyle{default} + \teststyle{iso} + \teststyle{english} + \teststyle{en-GB} + \teststyle{en-GB-numeric} + \teststyle{en-US} + \teststyle{en-US-numeric} + \teststyle{romanian} + \teststyle{romanian-numeric} +} + +\begin{document} + +\testall{showdayofmonth=true,abbr=false} +\testall{showdayofmonth=false} +\testall{abbr=true} + +\end{document} Binary files old/doc/latex/datetime2-romanian/datetime2-romanian.pdf and new/doc/latex/datetime2-romanian/datetime2-romanian.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-romanian.doc.tlpobj new/tlpkg/tlpobj/datetime2-romanian.doc.tlpobj --- old/tlpkg/tlpobj/datetime2-romanian.doc.tlpobj 2016-04-14 18:55:30.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-romanian.doc.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -1,8 +1,15 @@ name datetime2-romanian.doc category Package -revision 36692 +revision 43743 shortdesc doc files of datetime2-romanian relocated 1 -docfiles size=22 +docfiles size=37 RELOC/doc/latex/datetime2-romanian/README + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.pdf + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-luatex.tex + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.pdf + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-pdftex.tex + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.pdf + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test-xetex.tex + RELOC/doc/latex/datetime2-romanian/datetime2-romanian-test.tex RELOC/doc/latex/datetime2-romanian/datetime2-romanian.pdf ++++++ datetime2-romanian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-romanian/datetime2-romanian-ascii.ldf new/tex/latex/datetime2-romanian/datetime2-romanian-ascii.ldf --- old/tex/latex/datetime2-romanian/datetime2-romanian-ascii.ldf 2015-03-31 23:57:53.000000000 +0200 +++ new/tex/latex/datetime2-romanian/datetime2-romanian-ascii.ldf 2017-04-11 00:03:09.000000000 +0200 @@ -8,16 +8,19 @@ %% %% datetime2-romanian.dtx %% Copyright 2015 Nicola Talbot +%% Copyright 2017 Paul A. Patience <pap(a)papatience.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 of (at your option) any later version. +%% 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 `inactive'. +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Paul A. Patience. %% %% This work consists of the files datetime2-romanian.dtx and %% datetime2-romanian.ins and the derived files @@ -39,7 +42,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{romanian-ascii}[2015/03/31 v1.0] +\ProvidesDateTimeModule{romanian-ascii}[2017/04/08 v1.01] \newcommand*{\DTMromanianordinal}[1]{% \number#1 } @@ -99,6 +102,62 @@ Decembrie% \fi } +\newcommand*{\DTMromanianshortmonthname}[1]{% + \ifcase#1 + \or + ian.% + \or + feb.% + \or + mart.% + \or + apr.% + \or + mai% + \or + iun.% + \or + iul.% + \or + aug.% + \or + sept.% + \or + oct.% + \or + nov.% + \or + dec.% + \fi +} +\newcommand*{\DTMromanianshortMonthname}[1]{% + \ifcase#1 + \or + Ian.% + \or + Feb.% + \or + Mart.% + \or + Apr.% + \or + Mai% + \or + Iun.% + \or + Iul.% + \or + Aug.% + \or + Sept.% + \or + Oct.% + \or + Nov.% + \or + Dec.% + \fi +} \newcommand*{\DTMromanianweekdayname}[1]{% \ifcase#1 luni% @@ -133,6 +192,40 @@ Duminic\protect\u a% \fi } +\newcommand*{\DTMromanianshortweekdayname}[1]{% + \ifcase#1 + lun.% + \or + mar.% + \or + mie.% + \or + joi% + \or + vin.% + \or + s\protect\^am.% + \or + dum.% + \fi +} +\newcommand*{\DTMromanianshortWeekdayname}[1]{% + \ifcase#1 + Lun.% + \or + Mar.% + \or + Mie.% + \or + Joi% + \or + Vin.% + \or + S\protect\^am.% + \or + Dum.% + \fi +} \endinput %% %% End of file `datetime2-romanian-ascii.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-romanian/datetime2-romanian-utf8.ldf new/tex/latex/datetime2-romanian/datetime2-romanian-utf8.ldf --- old/tex/latex/datetime2-romanian/datetime2-romanian-utf8.ldf 2015-03-31 23:57:53.000000000 +0200 +++ new/tex/latex/datetime2-romanian/datetime2-romanian-utf8.ldf 2017-04-11 00:03:09.000000000 +0200 @@ -8,16 +8,19 @@ %% %% datetime2-romanian.dtx %% Copyright 2015 Nicola Talbot +%% Copyright 2017 Paul A. Patience <pap(a)papatience.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 of (at your option) any later version. +%% 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 `inactive'. +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Paul A. Patience. %% %% This work consists of the files datetime2-romanian.dtx and %% datetime2-romanian.ins and the derived files @@ -39,7 +42,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{romanian-utf8}[2015/03/31 v1.0] +\ProvidesDateTimeModule{romanian-utf8}[2017/04/08 v1.01] \newcommand*{\DTMromanianordinal}[1]{% \number#1 } @@ -99,11 +102,67 @@ Decembrie% \fi } +\newcommand*{\DTMromanianshortmonthname}[1]{% + \ifcase#1 + \or + ian.% + \or + feb.% + \or + mart.% + \or + apr.% + \or + mai% + \or + iun.% + \or + iul.% + \or + aug.% + \or + sept.% + \or + oct.% + \or + nov.% + \or + dec.% + \fi +} +\newcommand*{\DTMromanianshortMonthname}[1]{% + \ifcase#1 + \or + Ian.% + \or + Feb.% + \or + Mart.% + \or + Apr.% + \or + Mai% + \or + Iun.% + \or + Iul.% + \or + Aug.% + \or + Sept.% + \or + Oct.% + \or + Nov.% + \or + Dec.% + \fi +} \newcommand*{\DTMromanianweekdayname}[1]{% \ifcase#1 luni% \or - marţi% + marți% \or miercuri% \or @@ -120,7 +179,7 @@ \ifcase#1 Luni% \or - Marţi% + Marți% \or Miercuri% \or @@ -133,6 +192,40 @@ Duminică% \fi } +\newcommand*{\DTMromanianshortweekdayname}[1]{% + \ifcase#1 + lun.% + \or + mar.% + \or + mie.% + \or + joi% + \or + vin.% + \or + sâm.% + \or + dum.% + \fi +} +\newcommand*{\DTMromanianshortWeekdayname}[1]{% + \ifcase#1 + Lun.% + \or + Mar.% + \or + Mie.% + \or + Joi% + \or + Vin.% + \or + Sâm.% + \or + Dum.% + \fi +} \endinput %% %% End of file `datetime2-romanian-utf8.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-romanian/datetime2-romanian.ldf new/tex/latex/datetime2-romanian/datetime2-romanian.ldf --- old/tex/latex/datetime2-romanian/datetime2-romanian.ldf 2015-03-31 23:57:53.000000000 +0200 +++ new/tex/latex/datetime2-romanian/datetime2-romanian.ldf 2017-04-11 00:03:09.000000000 +0200 @@ -8,16 +8,19 @@ %% %% datetime2-romanian.dtx %% Copyright 2015 Nicola Talbot +%% Copyright 2017 Paul A. Patience <pap(a)papatience.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 of (at your option) any later version. +%% 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 `inactive'. +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Paul A. Patience. %% %% This work consists of the files datetime2-romanian.dtx and %% datetime2-romanian.ins and the derived files @@ -39,7 +42,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{romanian}[2015/03/31 v1.0] +\ProvidesDateTimeModule{romanian}[2017/04/08 v1.01] \RequirePackage{ifxetex,ifluatex} \ifxetex \RequireDateTimeModule{romanian-utf8} @@ -50,6 +53,7 @@ \RequireDateTimeModule{romanian-ascii} \fi \fi +\newcommand*{\DTMromaniandowdaysep}{\space} \newcommand*{\DTMromaniandaymonthsep}{% \DTMtexorpdfstring{\protect~}{\space}% } @@ -58,12 +62,15 @@ \newcommand*{\DTMromaniantimezonesep}{\space} \newcommand*{\DTMromaniandatesep}{.} \newcommand*{\DTMromaniantimesep}{:} +\DTMdefkey{romanian}{dowdaysep}{\renewcommand*{\DTMromaniandowdaysep}{#1}} \DTMdefkey{romanian}{daymonthsep}{\renewcommand*{\DTMromaniandaymonthsep}{#1}} \DTMdefkey{romanian}{monthyearsep}{\renewcommand*{\DTMromanianmonthyearsep}{#1}} \DTMdefkey{romanian}{datetimesep}{\renewcommand*{\DTMromaniandatetimesep}{#1}} \DTMdefkey{romanian}{timezonesep}{\renewcommand*{\DTMromaniantimezonesep}{#1}} \DTMdefkey{romanian}{datesep}{\renewcommand*{\DTMromaniandatesep}{#1}} \DTMdefkey{romanian}{timesep}{\renewcommand*{\DTMromaniantimesep}{#1}} +\DTMdefboolkey{romanian}{abbr}[true]{} +\DTMsetbool{romanian}{abbr}{false} \DTMdefboolkey{romanian}{mapzone}[true]{} \DTMsetbool{romanian}{mapzone}{true} \DTMdefboolkey{romanian}{showdayofmonth}[true]{} @@ -74,36 +81,101 @@ {romanian}% label {% date style \renewcommand*\DTMdisplaydate[4]{% - \DTMifbool{romanian}{showdayofmonth} - {\DTMromanianordinal{##3}\DTMromaniandaymonthsep}% - {}% - \DTMromanianmonthname{##2}% - \DTMifbool{romanian}{showyear}% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortweekdayname{##4}}% + {\DTMromanianweekdayname{##4}}% + \DTMromaniandowdaysep + \fi + \fi + \DTMifbool{romanian}{showdayofmonth}% {% - \DTMromanianmonthyearsep - \number##1 + \DTMromanianordinal{##3}% + \DTMromaniandaymonthsep }% {}% - }% - \renewcommand*\DTMDisplaydate[4]{% - \DTMifbool{romanian}{showdayofmonth} - {% - \DTMromanianordinal{##3}\DTMromaniandaymonthsep - \DTMromanianmonthname{##2}% - }% - {% - \DTMromanianMonthname{##2}% - }% + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortmonthname{##2}}% + {\DTMromanianmonthname{##2}}% \DTMifbool{romanian}{showyear}% {% \DTMromanianmonthyearsep - \number##1 + \number##1 % space intended }% {}% }% + \renewcommand*\DTMDisplaydate[4]{% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortWeekdayname{##4}}% + {\DTMromanianWeekdayname{##4}}% + \DTMromaniandowdaysep + \DTMifbool{romanian}{showdayofmonth}% + {% + \DTMromanianordinal{##3}% + \DTMromaniandaymonthsep + }% + {}% + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortmonthname{##2}}% + {\DTMromanianmonthname{##2}}% + \DTMifbool{romanian}{showyear}% + {% + \DTMromanianmonthyearsep + \number##1 % space intended + }% + {}% + \else + \DTMifbool{romanian}{showdayofmonth} + {% + \DTMromanianordinal{##3}% + \DTMromaniandaymonthsep + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortmonthname{##2}}% + {\DTMromanianmonthname{##2}}% + }% + {% + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortMonthname{##2}}% + {\DTMromanianMonthname{##2}}% + }% + \DTMifbool{romanian}{showyear}% + {% + \DTMromanianmonthyearsep + \number##1 % space intended + }% + {}% + \fi + \else + \DTMifbool{romanian}{showdayofmonth} + {% + \DTMromanianordinal{##3}% + \DTMromaniandaymonthsep + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortmonthname{##2}}% + {\DTMromanianmonthname{##2}}% + }% + {% + \DTMifbool{romanian}{abbr}% + {\DTMromanianshortMonthname{##2}}% + {\DTMromanianMonthname{##2}}% + }% + \DTMifbool{romanian}{showyear}% + {% + \DTMromanianmonthyearsep + \number##1 % space intended + }% + {}% + \fi + }% }% - {% time style (use default) - \DTMsettimestyle{default}% + {% time style (ignores seconds) + \renewcommand*\DTMdisplaytime[3]{% + \number##1 + \DTMromaniantimesep\DTMtwodigits{##2}% + }% }% {% zone style \DTMresetzones diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-romanian.tlpobj new/tlpkg/tlpobj/datetime2-romanian.tlpobj --- old/tlpkg/tlpobj/datetime2-romanian.tlpobj 2016-04-14 18:55:30.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-romanian.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -1,18 +1,16 @@ name datetime2-romanian category Package -revision 36692 +revision 43743 shortdesc Romanian language module for the datetime2 package relocated 1 longdesc This module provides the "romanian" style that can be set using -longdesc \DTMsetstyle provided by datetime2.sty. This package is -longdesc currently unmaintained. Please see the README for the procedure -longdesc to follow if you want to take over the maintenance. -runfiles size=4 +longdesc \DTMsetstyle provided by datetime2.sty. +runfiles size=5 RELOC/tex/latex/datetime2-romanian/datetime2-romanian-ascii.ldf RELOC/tex/latex/datetime2-romanian/datetime2-romanian-utf8.ldf RELOC/tex/latex/datetime2-romanian/datetime2-romanian.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-romanian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-08 18:57:01 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual -catalogue-version 1.0 +catalogue-version 1.01 ++++++ datetime2-russian.doc.tar.xz ++++++ ++++++ datetime2-russian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-russian.tlpobj new/tlpkg/tlpobj/datetime2-russian.tlpobj --- old/tlpkg/tlpobj/datetime2-russian.tlpobj 2016-04-14 18:55:30.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-russian.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-russian/datetime2-russian-utf8.ldf RELOC/tex/latex/datetime2-russian/datetime2-russian.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-russian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-samin.doc.tar.xz ++++++ ++++++ datetime2-samin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-samin.tlpobj new/tlpkg/tlpobj/datetime2-samin.tlpobj --- old/tlpkg/tlpobj/datetime2-samin.tlpobj 2016-04-14 18:55:30.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-samin.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-samin/datetime2-samin-utf8.ldf RELOC/tex/latex/datetime2-samin/datetime2-samin.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-samin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-scottish.doc.tar.xz ++++++ ++++++ datetime2-scottish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-scottish.tlpobj new/tlpkg/tlpobj/datetime2-scottish.tlpobj --- old/tlpkg/tlpobj/datetime2-scottish.tlpobj 2016-04-14 18:55:31.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-scottish.tlpobj 2017-04-14 17:37:41.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf RELOC/tex/latex/datetime2-scottish/datetime2-scottish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-scottish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-serbian.doc.tar.xz ++++++ ++++++ datetime2-serbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-serbian.tlpobj new/tlpkg/tlpobj/datetime2-serbian.tlpobj --- old/tlpkg/tlpobj/datetime2-serbian.tlpobj 2016-04-14 18:55:31.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-serbian.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-serbian/datetime2-serbian-utf8.ldf RELOC/tex/latex/datetime2-serbian/datetime2-serbian.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-serbian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-slovak.doc.tar.xz ++++++ ++++++ datetime2-slovak.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovak.tlpobj new/tlpkg/tlpobj/datetime2-slovak.tlpobj --- old/tlpkg/tlpobj/datetime2-slovak.tlpobj 2016-04-14 18:55:31.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-slovak.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf RELOC/tex/latex/datetime2-slovak/datetime2-slovak.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovak -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-slovene.doc.tar.xz ++++++ ++++++ datetime2-slovene.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovene.tlpobj new/tlpkg/tlpobj/datetime2-slovene.tlpobj --- old/tlpkg/tlpobj/datetime2-slovene.tlpobj 2016-04-14 18:55:31.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-slovene.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf RELOC/tex/latex/datetime2-slovene/datetime2-slovene.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovene -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-spanish.doc.tar.xz ++++++ ++++++ datetime2-spanish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-spanish.tlpobj new/tlpkg/tlpobj/datetime2-spanish.tlpobj --- old/tlpkg/tlpobj/datetime2-spanish.tlpobj 2016-04-14 18:55:31.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-spanish.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-spanish/datetime2-spanish-utf8.ldf RELOC/tex/latex/datetime2-spanish/datetime2-spanish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-spanish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-swedish.doc.tar.xz ++++++ ++++++ datetime2-swedish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-swedish.tlpobj new/tlpkg/tlpobj/datetime2-swedish.tlpobj --- old/tlpkg/tlpobj/datetime2-swedish.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-swedish.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-swedish/datetime2-swedish-utf8.ldf RELOC/tex/latex/datetime2-swedish/datetime2-swedish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-swedish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-turkish.doc.tar.xz ++++++ ++++++ datetime2-turkish.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-turkish.tlpobj new/tlpkg/tlpobj/datetime2-turkish.tlpobj --- old/tlpkg/tlpobj/datetime2-turkish.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-turkish.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf RELOC/tex/latex/datetime2-turkish/datetime2-turkish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-turkish -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-ukrainian.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-ukrainian/README new/doc/latex/datetime2-ukrainian/README --- old/doc/latex/datetime2-ukrainian/README 2015-04-01 22:44:19.000000000 +0200 +++ new/doc/latex/datetime2-ukrainian/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -Ukrainian Language Module for datetime2 Package - -Author: Nicola L. C. Talbot (inactive) - -Licence: LPPL - -Required Packages: datetime2, tracklang - -This module is unmaintained. If you want to volunteer to take over -the maintenance contact me at www.dickimaw-books.com/contact.html - -Example usage: - -\documentclass{article} -\usepackage[ukrainian]{datetime2} -\begin{document} -\today -\end{document} - -\documentclass[ukrainian]{article} -\usepackage{babel} -\usepackage[useregional]{datetime2} -\begin{document} -\today -\end{document} - -\documentclass{article} -\usepackage{polyglossia} -\setmainlanguage{ukrainian} -\usepackage[ukrainian]{datetime2} -\begin{document} -\today -\end{document} - -INSTALLATION -============ - -xelatex datetime2-ukrainian.ins - -Move all *.ldf files to -TEXMF/tex/latex/datetime2-contrib/datetime2-ukrainian/ - -Documentation: - -xelatex datetime2-ukrainian.dtx -makeindex -s gind.ist datetime2-ukrainian.idx -makeindex -s gglo.ist -o datetime2-ukrainian.gls datetime2-ukrainian.glo -xelatex datetime2-ukrainian.dtx -xelatex datetime2-ukrainian.dtx - -Move datetime2-ukrainian.pdf and README to -TEXMF/doc/latex/datetime2-contrib/datetime2-ukrainian/ - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 for the details of that -license. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-ukrainian/README.md new/doc/latex/datetime2-ukrainian/README.md --- old/doc/latex/datetime2-ukrainian/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/datetime2-ukrainian/README.md 2017-06-11 23:45:58.000000000 +0200 @@ -0,0 +1,56 @@ +Ukrainian Language Module for datetime2 Package + +Author: Nicola L. C. Talbot (inactive) + Sergiy M. Ponomarenko + +Licence: LPPL + +Required Packages: datetime2, tracklang + +This module is unmaintained. If you want to volunteer to take over +the maintenance contact me at www.dickimaw-books.com/contact.html + +Example usage: + +\documentclass{article} +\usepackage[ukrainian]{datetime2} +\begin{document} +\today +\end{document} + +\documentclass[ukrainian]{article} +\usepackage{babel} +\usepackage[useregional]{datetime2} +\begin{document} +\today +\end{document} + +\documentclass{article} +\usepackage{polyglossia} +\setmainlanguage{ukrainian} +\usepackage[ukrainian]{datetime2} +\begin{document} +\today +\end{document} + +INSTALLATION +============ + +xelatex datetime2-ukrainian.ins + +Move all *.ldf files to +TEXMF/tex/latex/datetime2-contrib/datetime2-ukrainian/ + +Documentation: + +xelatex datetime2-ukrainian.dtx +xelatex datetime2-ukrainian.dtx +xelatex datetime2-ukrainian.dtx + +Move datetime2-ukrainian.pdf and README to +TEXMF/doc/latex/datetime2-contrib/datetime2-ukrainian/ + +This material is subject to the LaTeX Project Public License. +See http://www.ctan.org/license/lppl1.3 for the details of that +license. + Binary files old/doc/latex/datetime2-ukrainian/datetime2-ukrainian.pdf and new/doc/latex/datetime2-ukrainian/datetime2-ukrainian.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-ukrainian.doc.tlpobj new/tlpkg/tlpobj/datetime2-ukrainian.doc.tlpobj --- old/tlpkg/tlpobj/datetime2-ukrainian.doc.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-ukrainian.doc.tlpobj 2017-06-12 02:21:23.000000000 +0200 @@ -1,8 +1,8 @@ name datetime2-ukrainian.doc category Package -revision 36700 +revision 44562 shortdesc doc files of datetime2-ukrainian relocated 1 -docfiles size=22 - RELOC/doc/latex/datetime2-ukrainian/README +docfiles size=19 + RELOC/doc/latex/datetime2-ukrainian/README.md RELOC/doc/latex/datetime2-ukrainian/datetime2-ukrainian.pdf ++++++ datetime2-ukrainian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-ukrainian/datetime2-ukrainian-ascii.ldf new/tex/latex/datetime2-ukrainian/datetime2-ukrainian-ascii.ldf --- old/tex/latex/datetime2-ukrainian/datetime2-ukrainian-ascii.ldf 2015-04-01 22:44:19.000000000 +0200 +++ new/tex/latex/datetime2-ukrainian/datetime2-ukrainian-ascii.ldf 2017-06-11 23:45:58.000000000 +0200 @@ -24,6 +24,7 @@ %% datetime2-ukrainian-utf8.ldf, datetime2-ukrainian-ascii.ldf and %% datetime2-ukrainian.ldf. %% + %% \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 @@ -123,6 +124,132 @@ \protect\cyrya \fi } +\newcommand*{\DTMukrainianshortmonthname}[1]{% + \ifcase#1 + \or + \protect\cyrs\protect\cyrii\protect\cyrch. + \or + \protect\cyrl\protect\cyryu\protect\cyrt. + \or + \protect\cyrb\protect\cyre\protect\cyrr. + \or + \protect\cyrk\protect\cyrv\protect\cyrii\protect\cyrt. + \or + \protect\cyrt\protect\cyrr\protect\cyra\protect\cyrv. + \or + \protect\cyrch\protect\cyre\protect\cyrr\protect\cyrv. + \or + \protect\cyrl\protect\cyri\protect\cyrp. + \or + \protect\cyrs\protect\cyre\protect\cyrr\protect\cyrp. + \or + \protect\cyrv\protect\cyre\protect\cyrr. + \or + \protect\cyrzh\protect\cyro\protect\cyrv\protect\cyrt. + \or + \protect\cyrl\protect\cyri\protect\cyrs\protect\cyrt\protect\cyro + \protect\cyrp. + \or + \protect\cyrg\protect\cyrr\protect\cyru\protect\cyrd. + \fi +} +\newcommand*{\DTMukrainianshortMonthname}[1]{% + \ifcase#1 + \or + \protect\CYRS\protect\cyrii\protect\cyrch. + \or + \protect\CYRL\protect\cyryu\protect\cyrt. + \or + \protect\CYRB\protect\cyre\protect\cyrr. + \or + \protect\CYRK\protect\cyrv\protect\cyrii\protect\cyrt. + \or + \protect\CYRT\protect\cyrr\protect\cyra\protect\cyrv. + \or + \protect\CYRCH\protect\cyre\protect\cyrr\protect\cyrv. + \or + \protect\CYRL\protect\cyri\protect\cyrp. + \or + \protect\CYRS\protect\cyre\protect\cyrr\protect\cyrp. + \or + \protect\CYRV\protect\cyre\protect\cyrr. + \or + \protect\CYRZH\protect\cyro\protect\cyrv\protect\cyrt. + \or + \protect\CYRL\protect\cyri\protect\cyrs\protect\cyrt\protect\cyro + \protect\cyrp. + \or + \protect\CYRG\protect\cyrr\protect\cyru\protect\cyrd. + \fi +} +\newcommand*{\DTMukrainianweekdayname}[1]{% + \ifcase#1 + \protect\cyrp\protect\cyro\protect\cyrn\protect\cyre\protect\cyrd\protect\cyrii\protect\cyrl\protect\cyro\protect\cyrk% + \or + \protect\cyrv\protect\cyrii\protect\cyrv\protect\cyrt\protect\cyro\protect\cyrr\protect\cyro\protect\cyrk% + \or + \protect\cyrs\protect\cyre\protect\cyrr\protect\cyre\protect\cyrd\protect\cyra% + \or + \protect\cyrch\protect\cyre\protect\cyrt\protect\cyrv\protect\cyre\protect\cyrr% + \or + \protect\cyrp'\protect\cyrya\protect\cyrt\protect\cyrn\protect\cyri\protect\cyrc\protect\cyrya% + \or + \protect\cyrs\protect\cyru\protect\cyrb\protect\cyro\protect\cyrt\protect\cyra% + \or + \protect\cyrn\protect\cyre\protect\cyrd\protect\cyrii\protect\cyrl\protect\cyrya% + \fi +} +\newcommand*{\DTMukrainianWeekdayname}[1]{% + \ifcase#1 + \protect\CYRP\protect\cyro\protect\cyrn\protect\cyre\protect\cyrd\protect\cyrii\protect\cyrl\protect\cyro\protect\cyrk% + \or + \protect\CYRV\protect\cyrii\protect\cyrv\protect\cyrt\protect\cyro\protect\cyrr\protect\cyro\protect\cyrk% + \or + \protect\CYRS\protect\cyre\protect\cyrr\protect\cyre\protect\cyrd\protect\cyra% + \or + \protect\CYRCH\protect\cyre\protect\cyrt\protect\cyrv\protect\cyre\protect\cyrr% + \or + \protect\CYRP'\protect\cyrya\protect\cyrt\protect\cyrn\protect\cyri\protect\cyrc\protect\cyrya% + \or + \protect\CYRS\protect\cyru\protect\cyrb\protect\cyro\protect\cyrt\protect\cyra% + \or + \protect\CYRN\protect\cyre\protect\cyrd\protect\cyrii\protect\cyrl\protect\cyrya% + \fi +} +\newcommand*{\DTMukrainianshortweekdayname}[1]{% + \ifcase#1 + \protect\cyrp\protect\cyrn.% + \or + \protect\cyrv\protect\cyrt.% + \or + \protect\cyrs\protect\cyrr.% + \or + \protect\cyrch\protect\cyrt% + \or + \protect\cyrp\protect\cyrt.% + \or + \protect\cyrs\protect\cyrb.% + \or + \protect\cyrn\protect\cyrd.% + \fi +} +\newcommand*{\DTMukrainianshortWeekdayname}[1]{% + \ifcase#1 + \protect\CYRP\protect\cyrn.% + \or + \protect\CYRV\protect\cyrt.% + \or + \protect\CYRS\protect\cyrr.% + \or + \protect\CYRCH\protect\cyrt.% + \or + \protect\CYRP\protect\cyrt.% + \or + \protect\CYRS\protect\cyrb.% + \or + \protect\CYRN\protect\cyrd.% + \fi +} \endinput %% %% End of file `datetime2-ukrainian-ascii.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-ukrainian/datetime2-ukrainian-utf8.ldf new/tex/latex/datetime2-ukrainian/datetime2-ukrainian-utf8.ldf --- old/tex/latex/datetime2-ukrainian/datetime2-ukrainian-utf8.ldf 2015-04-01 22:44:19.000000000 +0200 +++ new/tex/latex/datetime2-ukrainian/datetime2-ukrainian-utf8.ldf 2017-06-11 23:45:58.000000000 +0200 @@ -24,6 +24,7 @@ %% datetime2-ukrainian-utf8.ldf, datetime2-ukrainian-ascii.ldf and %% datetime2-ukrainian.ldf. %% + %% \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 @@ -39,7 +40,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{ukrainian-utf8}[2015/04/01 v1.0] +\ProvidesDateTimeModule{ukrainian-utf8}[2017/06/111 v1.1] \newcommand*{\DTMukrainianordinal}[1]{% \number#1 } @@ -103,6 +104,130 @@ Грудня% \fi } +\newcommand*{\DTMukrainianshortmonthname}[1]{% + \ifcase#1 + \or + січ.% + \or + лют.% + \or + бер.% + \or + квіт.% + \or + трав% + \or + черв.% + \or + лип.% + \or + серп.% + \or + вер.% + \or + жовт.% + \or + листоп.% + \or + груд.% + \fi +} +\newcommand*{\DTMukrainianshortMonthname}[1]{% + \ifcase#1 + \or + Січ.% + \or + Лют.% + \or + Бер.% + \or + Квіт.% + \or + Трав% + \or + Черв.% + \or + Лип.% + \or + Серп.% + \or + Вер.% + \or + Жовт.% + \or + Листоп.% + \or + Груд.% + \fi +} +\newcommand*{\DTMukrainianweekdayname}[1]{% + \ifcase#1 + понеділок% + \or + вівторок% + \or + середа% + \or + четвер% + \or + п'ятниця% + \or + субота% + \or + неділя% + \fi +} +\newcommand*{\DTMukrainianWeekdayname}[1]{% + \ifcase#1 + Понеділок% + \or + Вівторок% + \or + Середа% + \or + Четвер% + \or + П'ятниця% + \or + Субота% + \or + Неділя% + \fi +} +\newcommand*{\DTMukrainianshortweekdayname}[1]{% + \ifcase#1 + пн.% + \or + вт.% + \or + ср.% + \or + чт% + \or + пт.% + \or + сб.% + \or + нд.% + \fi +} +\newcommand*{\DTMukrainianshortWeekdayname}[1]{% + \ifcase#1 + Пн.% + \or + Вт.% + \or + Ср.% + \or + Чт% + \or + Пт.% + \or + Сб.% + \or + Нд.% + \fi +} \endinput %% %% End of file `datetime2-ukrainian-utf8.ldf'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-ukrainian/datetime2-ukrainian.ldf new/tex/latex/datetime2-ukrainian/datetime2-ukrainian.ldf --- old/tex/latex/datetime2-ukrainian/datetime2-ukrainian.ldf 2015-04-01 22:44:19.000000000 +0200 +++ new/tex/latex/datetime2-ukrainian/datetime2-ukrainian.ldf 2017-06-11 23:45:58.000000000 +0200 @@ -24,6 +24,7 @@ %% datetime2-ukrainian-utf8.ldf, datetime2-ukrainian-ascii.ldf and %% datetime2-ukrainian.ldf. %% + %% \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 @@ -39,7 +40,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{ukrainian}[2015/04/01 v1.0] +\ProvidesDateTimeModule{ukrainian}[2017/06/11 v1.1] \RequirePackage{ifxetex,ifluatex} \ifxetex \RequireDateTimeModule{ukrainian-utf8} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-ukrainian.tlpobj new/tlpkg/tlpobj/datetime2-ukrainian.tlpobj --- old/tlpkg/tlpobj/datetime2-ukrainian.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-ukrainian.tlpobj 2017-06-12 02:21:23.000000000 +0200 @@ -1,18 +1,16 @@ name datetime2-ukrainian category Package -revision 36700 +revision 44562 shortdesc Ukrainian language module for the datetime2 package relocated 1 longdesc This module provides the "ukrainian" style that can be set -longdesc using \DTMsetstyle provided by datetime2.sty. This package is -longdesc currently unmaintained. Please see the README for the procedure -longdesc to follow if you want to take over the maintenance. -runfiles size=5 +longdesc using \DTMsetstyle provided by datetime2.sty. +runfiles size=7 RELOC/tex/latex/datetime2-ukrainian/datetime2-ukrainian-ascii.ldf RELOC/tex/latex/datetime2-ukrainian/datetime2-ukrainian-utf8.ldf RELOC/tex/latex/datetime2-ukrainian/datetime2-ukrainian.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-ukrainian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-06-11 17:18:11 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual -catalogue-version 1.0 +catalogue-version 1.1 ++++++ datetime2-usorbian.doc.tar.xz ++++++ ++++++ datetime2-usorbian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-usorbian.tlpobj new/tlpkg/tlpobj/datetime2-usorbian.tlpobj --- old/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-usorbian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ datetime2-welsh.doc.tar.xz ++++++ ++++++ datetime2-welsh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-welsh.tlpobj new/tlpkg/tlpobj/datetime2-welsh.tlpobj --- old/tlpkg/tlpobj/datetime2-welsh.tlpobj 2016-04-14 18:55:32.000000000 +0200 +++ new/tlpkg/tlpobj/datetime2-welsh.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf RELOC/tex/latex/datetime2-welsh/datetime2-welsh.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-welsh -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual catalogue-version 1.0 ++++++ dblfloatfix.doc.tar.xz ++++++ ++++++ dblfloatfix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dblfloatfix.tlpobj new/tlpkg/tlpobj/dblfloatfix.tlpobj --- old/tlpkg/tlpobj/dblfloatfix.tlpobj 2016-04-14 18:55:33.000000000 +0200 +++ new/tlpkg/tlpobj/dblfloatfix.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/dblfloatfix/dblfloatfix.sty catalogue-ctan /macros/latex/contrib/dblfloatfix -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics float catalogue-version 1.0a ++++++ dccpaper.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/README new/doc/latex/dccpaper/README --- old/doc/latex/dccpaper/README 2015-06-23 20:19:20.000000000 +0200 +++ new/doc/latex/dccpaper/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC -=================================================================== - -The dccpaper bundle consists of two very similar classes. - -ijdc-v9.cls corresponds to the template used by the `International -Journal of Digital Curation`_, beginning with volume 9. - -idcc.cls corresponds to the template used for the `International Digital -Curation Conference`_, beginning with IDCC15. - -As the classes are so similar, their common features are abstracted out -into dccpaper-base.tex, which should be installed in the runtime tex -directory, rather than with the documentation. - -The classes are suitable for submissions to the respective review -boards, but can also be used to produce the final camera-ready papers. - -Installation ------------- - -Managed way -~~~~~~~~~~~ - -The latest stable release of the dccpaper bundle has been packaged for -TeX Live and MiKTeX. If you are running TeX Live and have ``tlmgr`` -installed, you can install the bundle simply by running -``tlmgr install dccpaper``. If you are running MiKTeX, you can install -the bundle by running ``mpm --install=dccpaper``. Both ``tlmgr`` and -``mpm`` have GUI versions that you might find friendlier. - -Automated way -~~~~~~~~~~~~~ - -A makefile is provided which you can use with the Make utility: - -- Running ``make`` generates the derived files - - - README - - dccpaper.pdf - - ijdc-v9.cls - - idcc.cls - - dccpaper-base.tex - - dccpaper-apacite.bib - - dccpaper-biblatex.bib - -- Running ``make inst`` installs the files in the user's TeX tree. -- Running ``make install`` installs the files in the local TeX tree. - -Manual way -~~~~~~~~~~ - -1. Compile dccpaper.dtx just as you would a normal LaTeX file. Bear in - mind the documentation requires the Biblatex package and the Biber - tool rather than regular BibTeX. As well as the usual PDF (or DVI) - and auxiliary files, several others are generated. -2. Rename README.txt to README (if you like). -3. Move the files to your TeX tree as follows: - - - ``source/latex/dccpaper``: dccpaper.dtx, dccpaper.ins - - ``tex/latex/dccpaper``: ijdc-v9.cls, idcc.cls, dccpaper-base.tex, - dccpaper-by.eps, dccpaper-by.pdf - - ``doc/latex/dccpaper``: dccpaper.pdf, dccpaper-apacite.bib, - dccpaper-biblatex.bib, README - -4. You may then have to update your installation's file name database - before TeX and friends can see the files. - -Licence -------- - -Copyright 2015 Digital Curation Centre, University of Edinburgh. - -This work consists of the image files dccpaper-by.eps and -dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile. - -The text files contained in this work may be distributed and/or modified -under the conditions of the `LaTeX Project Public License (LPPL)`_, -either version 1.3c of this license or (at your option) any later -version. - -The image files distributed with this bundle derive from the file -`by.eps`_ distributed by Creative Commons. The image is a trademark of -Creative Commons and is subject to the `Creative Commons trademark -policy`_. - -This work is "maintained" (as per LPPL maintenance status) by `Alex -Ball`_. - -.. _International Journal of Digital Curation: http://www.ijdc.net/index.php/ijdc -.. _International Digital Curation Conference: http://www.dcc.ac.uk/events/international-digital-curation-conference-idcc -.. _LaTeX Project Public License (LPPL): http://www.latex-project.org/lppl.txt -.. _by.eps: http://mirrors.creativecommons.org/presskit/buttons/88x31/eps/by.eps -.. _Creative Commons trademark policy: http://creativecommons.org/policies -.. _Alex Ball: http://alexball.me.uk/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/README.md new/doc/latex/dccpaper/README.md --- old/doc/latex/dccpaper/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dccpaper/README.md 2016-11-25 19:28:35.000000000 +0100 @@ -0,0 +1,85 @@ +# The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC + +The dccpaper bundle consists of two very similar classes. + +ijdc-v9.cls corresponds to the template used by the [International +Journal of Digital Curation], beginning with volume 9. + +idcc.cls corresponds to the template used for the [International Digital +Curation Conference], beginning with IDCC15. + +As the classes are so similar, their common features are abstracted out +into dccpaper-base.sty; please do not attempt to use this package +independently of the above classes. + +The classes are suitable for submissions to the respective review +boards, but can also be used to produce the final camera-ready papers. + +## Installation + +### Managed way + +The latest stable release of the dccpaper bundle has been packaged for +TeX Live and MiKTeX. If you are running TeX Live and have `tlmgr` +installed, you can install the bundle simply by running +`tlmgr install dccpaper`. If you are running MiKTeX, you can install the +bundle by running `mpm --install=dccpaper`. Both `tlmgr` and `mpm` have +GUI versions that you might find friendlier. + +### Automated way + +A makefile is provided which you can use with the Make utility: + + * Running `make` generates the derived files + - README.md + - dccpaper.pdf + - ijdc-v9.cls + - idcc.cls + - dccpaper-base.sty + - dccpaper-apacite.bib + - dccpaper-biblatex.bib + * Running `make inst` installs the files in the user's TeX tree. + * Running `make install` installs the files in the local TeX tree. + +### Manual way + + 1. Compile dccpaper.dtx just as you would a normal LaTeX file. Bear in + mind the documentation requires the Biblatex package and the Biber + tool rather than regular BibTeX. As well as the usual PDF (or DVI) + and auxiliary files, several others are generated. + 2. Move the files to your TeX tree as follows: + - `source/latex/dccpaper`: dccpaper.dtx, dccpaper.ins + - `tex/latex/dccpaper`: ijdc-v9.cls, idcc.cls, dccpaper-base.sty, + dccpaper-by.eps, dccpaper-by.pdf + - `doc/latex/dccpaper`: dccpaper.pdf, dccpaper-apacite.bib, + dccpaper-biblatex.bib, README.md + + 3. You may then have to update your installation's file name database + before TeX and friends can see the files. + +## Licence + +Copyright 2016 Digital Curation Centre, University of Edinburgh. + +This work consists of the image files dccpaper-by.eps and +dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile. + +The text files contained in this work may be distributed and/or modified +under the conditions of the [LaTeX Project Public License (LPPL)], +either version 1.3c of this license or (at your option) any later +version. + +The image files distributed with this bundle derive from the file +[by.eps] distributed by Creative Commons. The image is a trademark of +Creative Commons and is subject to the [Creative Commons trademark +policy]. + +This work is "maintained" (as per LPPL maintenance status) by [Alex +Ball]. + +[International Journal of Digital Curation]: http://www.ijdc.net/index.php/ijdc +[International Digital Curation Conference]: http://www.dcc.ac.uk/events/international-digital-curation-conference-idcc +[LaTeX Project Public License (LPPL)]: http://www.latex-project.org/lppl.txt +[by.eps]: http://mirrors.creativecommons.org/presskit/buttons/88x31/eps/by.eps +[Creative Commons trademark policy]: http://creativecommons.org/policies +[Alex Ball]: http://alexball.me.uk/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/README.txt new/doc/latex/dccpaper/README.txt --- old/doc/latex/dccpaper/README.txt 2015-06-23 20:19:20.000000000 +0200 +++ new/doc/latex/dccpaper/README.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC -=================================================================== - -The dccpaper bundle consists of two very similar classes. - -ijdc-v9.cls corresponds to the template used by the `International -Journal of Digital Curation`_, beginning with volume 9. - -idcc.cls corresponds to the template used for the `International Digital -Curation Conference`_, beginning with IDCC15. - -As the classes are so similar, their common features are abstracted out -into dccpaper-base.tex, which should be installed in the runtime tex -directory, rather than with the documentation. - -The classes are suitable for submissions to the respective review -boards, but can also be used to produce the final camera-ready papers. - -Installation ------------- - -Managed way -~~~~~~~~~~~ - -The latest stable release of the dccpaper bundle has been packaged for -TeX Live and MiKTeX. If you are running TeX Live and have ``tlmgr`` -installed, you can install the bundle simply by running -``tlmgr install dccpaper``. If you are running MiKTeX, you can install -the bundle by running ``mpm --install=dccpaper``. Both ``tlmgr`` and -``mpm`` have GUI versions that you might find friendlier. - -Automated way -~~~~~~~~~~~~~ - -A makefile is provided which you can use with the Make utility: - -- Running ``make`` generates the derived files - - - README - - dccpaper.pdf - - ijdc-v9.cls - - idcc.cls - - dccpaper-base.tex - - dccpaper-apacite.bib - - dccpaper-biblatex.bib - -- Running ``make inst`` installs the files in the user's TeX tree. -- Running ``make install`` installs the files in the local TeX tree. - -Manual way -~~~~~~~~~~ - -1. Compile dccpaper.dtx just as you would a normal LaTeX file. Bear in - mind the documentation requires the Biblatex package and the Biber - tool rather than regular BibTeX. As well as the usual PDF (or DVI) - and auxiliary files, several others are generated. -2. Rename README.txt to README (if you like). -3. Move the files to your TeX tree as follows: - - - ``source/latex/dccpaper``: dccpaper.dtx, dccpaper.ins - - ``tex/latex/dccpaper``: ijdc-v9.cls, idcc.cls, dccpaper-base.tex, - dccpaper-by.eps, dccpaper-by.pdf - - ``doc/latex/dccpaper``: dccpaper.pdf, dccpaper-apacite.bib, - dccpaper-biblatex.bib, README - -4. You may then have to update your installation's file name database - before TeX and friends can see the files. - -Licence -------- - -Copyright 2015 Digital Curation Centre, University of Edinburgh. - -This work consists of the image files dccpaper-by.eps and -dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile. - -The text files contained in this work may be distributed and/or modified -under the conditions of the `LaTeX Project Public License (LPPL)`_, -either version 1.3c of this license or (at your option) any later -version. - -The image files distributed with this bundle derive from the file -`by.eps`_ distributed by Creative Commons. The image is a trademark of -Creative Commons and is subject to the `Creative Commons trademark -policy`_. - -This work is "maintained" (as per LPPL maintenance status) by `Alex -Ball`_. - -.. _International Journal of Digital Curation: http://www.ijdc.net/index.php/ijdc -.. _International Digital Curation Conference: http://www.dcc.ac.uk/events/international-digital-curation-conference-idcc -.. _LaTeX Project Public License (LPPL): http://www.latex-project.org/lppl.txt -.. _by.eps: http://mirrors.creativecommons.org/presskit/buttons/88x31/eps/by.eps -.. _Creative Commons trademark policy: http://creativecommons.org/policies -.. _Alex Ball: http://alexball.me.uk/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/dccpaper-base.doc new/doc/latex/dccpaper/dccpaper-base.doc --- old/doc/latex/dccpaper/dccpaper-base.doc 2015-06-23 20:19:20.000000000 +0200 +++ new/doc/latex/dccpaper/dccpaper-base.doc 2016-11-25 19:28:35.000000000 +0100 @@ -1,7 +1,7 @@ -\ProvidesFile{dccpaper-base.doc}[2015/06/23 automatically generated with makedoc.sty] +\ProvidesFile{dccpaper-base.doc}[2016/08/06 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% -%% This is file `dccpaper-base.tex', +%% This is file `dccpaper-base.sty', %% generated with the docstrip utility. %% %% The original source files were: @@ -16,19 +16,13 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/06/22 v1.4.1} -\ProvidesFile{dccpaper-base.tex} +\def\Version{2016/08/05 v1.5} +\ProvidesPackage{dccpaper-base.sty} [\Version\space Common class code for IJDC and IDCC papers.] \end{lstlisting} -The \textsf{dccpaper} classes are deliberately very similar. This file -contains the common code. All the classes are based on the \textsf{article} -class, and use A4 paper. - -\begin{lstlisting}[firstnumber=last] -\LoadClass[a4paper,12pt,twoside]{article} - -\end{lstlisting} +The \textsf{dccpaper} classes are deliberately very similar. This package +contains the common code. We use British English orthography. @@ -1365,6 +1359,6 @@ %% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% <info(a)dcc.ac.uk> %% -%% End of file `dccpaper-base.tex'. +%% End of file `dccpaper-base.sty'. \end{lstlisting} Binary files old/doc/latex/dccpaper/dccpaper.pdf and new/doc/latex/dccpaper/dccpaper.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/idcc.doc new/doc/latex/dccpaper/idcc.doc --- old/doc/latex/dccpaper/idcc.doc 2015-06-23 20:19:20.000000000 +0200 +++ new/doc/latex/dccpaper/idcc.doc 2016-11-25 19:28:35.000000000 +0100 @@ -1,4 +1,4 @@ -\ProvidesFile{idcc.doc}[2015/06/23 automatically generated with makedoc.sty] +\ProvidesFile{idcc.doc}[2016/08/06 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% %% This is file `idcc.cls', @@ -16,7 +16,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/06/22 v1.4.1} +\def\Version{2016/08/05 v1.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{idcc} [\Version\space Class for submissions to the International Digital Curation Conference.] @@ -78,6 +78,12 @@ 2016 in Amsterdam. URL: \url{http://www.dcc.ac.uk/events/idcc16/}} \def\dccp@subject{11th \dccp@publ@long, 2016} } +\DeclareOption{17}{% + \def\dccp@publ@short{IDCC17} + \def\dccp@publ@msg{The 12th \dccp@publ@long\ takes place on 20--23 February + 2017 in Edinburgh. URL: \url{http://www.dcc.ac.uk/events/idcc17/}} + \def\dccp@subject{12th \dccp@publ@long, 2017} +} \ProcessOptions\relax \end{lstlisting} @@ -107,10 +113,17 @@ \end{lstlisting} +The class is based on the \textsf{article} class, and uses A4 paper. + +\begin{lstlisting}[firstnumber=last] +\LoadClass[a4paper,12pt,twoside]{article} + +\end{lstlisting} + The rest of the formatting happens in the following file. \begin{lstlisting}[firstnumber=last] -\input{dccpaper-base} +\usepackage{dccpaper-base} %% %% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% <info(a)dcc.ac.uk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/ijdc-v9.doc new/doc/latex/dccpaper/ijdc-v9.doc --- old/doc/latex/dccpaper/ijdc-v9.doc 2015-06-23 20:19:20.000000000 +0200 +++ new/doc/latex/dccpaper/ijdc-v9.doc 2016-11-25 19:28:35.000000000 +0100 @@ -1,4 +1,4 @@ -\ProvidesFile{ijdc-v9.doc}[2015/06/23 automatically generated with makedoc.sty] +\ProvidesFile{ijdc-v9.doc}[2016/08/06 automatically generated with makedoc.sty] \begin{lstlisting}[firstnumber=1] %% %% This is file `ijdc-v9.cls', @@ -16,7 +16,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2015/06/22 v1.4.1} +\def\Version{2016/08/05 v1.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ijdc-v9} [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.] @@ -50,7 +50,7 @@ \end{lstlisting} These definitions are used to fill out the headers and footers. They include -some details that are defined in \textsf{dccpaper-base.tex} and provided by +some details that are defined in \textsf{dccpaper-base.sty} and provided by the user: |\thedate|, |\thevolume|, |\theissue|, |\thelastpage|, |\thedoi|. \begin{lstlisting}[firstnumber=last] @@ -80,10 +80,17 @@ \end{lstlisting} +The class is based on the \textsf{article} class, and uses A4 paper. + +\begin{lstlisting}[firstnumber=last] +\LoadClass[a4paper,12pt,twoside]{article} + +\end{lstlisting} + The rest of the formatting happens in the following file. \begin{lstlisting}[firstnumber=last] -\input{dccpaper-base} +\usepackage{dccpaper-base} %% %% Copyright (C) 2015 Digital Curation Centre, University of Edinburgh %% <info(a)dcc.ac.uk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dccpaper.doc.tlpobj new/tlpkg/tlpobj/dccpaper.doc.tlpobj --- old/tlpkg/tlpobj/dccpaper.doc.tlpobj 2016-04-14 18:55:33.000000000 +0200 +++ new/tlpkg/tlpobj/dccpaper.doc.tlpobj 2017-04-14 17:37:42.000000000 +0200 @@ -1,11 +1,10 @@ name dccpaper.doc category Package -revision 37647 +revision 41804 shortdesc doc files of dccpaper relocated 1 -docfiles size=116 - RELOC/doc/latex/dccpaper/README - RELOC/doc/latex/dccpaper/README.txt +docfiles size=115 + RELOC/doc/latex/dccpaper/README.md RELOC/doc/latex/dccpaper/dccpaper-apacite.bib RELOC/doc/latex/dccpaper/dccpaper-base.doc RELOC/doc/latex/dccpaper/dccpaper-biblatex.bib ++++++ dccpaper.tar.xz ++++++ ++++ 2514 lines of diff (skipped) ++++++ dcpic.doc.tar.xz ++++++ ++++++ dcpic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dcpic.tlpobj new/tlpkg/tlpobj/dcpic.tlpobj --- old/tlpkg/tlpobj/dcpic.tlpobj 2016-04-14 18:55:34.000000000 +0200 +++ new/tlpkg/tlpobj/dcpic.tlpobj 2017-04-14 17:37:43.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/generic/dcpic/dcpic.sty RELOC/tex/generic/dcpic/europroc.cls catalogue-ctan /macros/generic/diagrams/dcpic -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-comm catalogue-version 5.0.0 ++++++ de-macro.doc.tar.xz ++++++ ++++++ de-macro.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/de-macro.tlpobj new/tlpkg/tlpobj/de-macro.tlpobj --- old/tlpkg/tlpobj/de-macro.tlpobj 2016-04-14 18:55:34.000000000 +0200 +++ new/tlpkg/tlpobj/de-macro.tlpobj 2017-04-14 17:37:43.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=9 texmf-dist/scripts/de-macro/de-macro catalogue-ctan /support/de-macro -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics macro-supp catalogue-version 1.3 ++++++ decimal.doc.tar.xz ++++++ ++++++ decimal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/decimal.tlpobj new/tlpkg/tlpobj/decimal.tlpobj --- old/tlpkg/tlpobj/decimal.tlpobj 2016-04-14 18:55:35.000000000 +0200 +++ new/tlpkg/tlpobj/decimal.tlpobj 2017-04-14 17:37:43.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/decimal/decimal.sty catalogue-ctan /macros/latex/contrib/decimal -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics typesetting ++++++ decorule.doc.tar.xz ++++++ ++++++ decorule.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/decorule.tlpobj new/tlpkg/tlpobj/decorule.tlpobj --- old/tlpkg/tlpobj/decorule.tlpobj 2016-04-14 18:55:35.000000000 +0200 +++ new/tlpkg/tlpobj/decorule.tlpobj 2017-04-14 17:37:43.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/decorule/decorule.sty catalogue-also swrule catalogue-ctan /macros/latex/contrib/decorule -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-weight decoration catalogue-version 0.6 ++++++ dehyph-exptl.doc.tar.xz ++++++ ++++ 1724 lines of diff (skipped) ++++++ dehyph-exptl.tar.xz ++++++ ++++ 117444 lines of diff (skipped) ++++++ dejavu.doc.tar.xz ++++++ ++++++ dejavu.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-g/dejavu.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-g.new/dejavu.tar.xz differ: char 26, line 1 ++++++ delim.doc.tar.xz ++++++ ++++++ delim.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/delim.tlpobj new/tlpkg/tlpobj/delim.tlpobj --- old/tlpkg/tlpobj/delim.tlpobj 2016-04-14 18:56:00.000000000 +0200 +++ new/tlpkg/tlpobj/delim.tlpobj 2017-04-14 17:37:53.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/delim/delim.sty catalogue-also delimseasy catalogue-ctan /macros/latex/contrib/delim -catalogue-date 2015-12-04 08:23:41 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics maths catalogue-version 1.0 ++++++ delimseasy.doc.tar.xz ++++++ ++++++ delimseasy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/delimseasy.tlpobj new/tlpkg/tlpobj/delimseasy.tlpobj --- old/tlpkg/tlpobj/delimseasy.tlpobj 2016-04-14 18:56:01.000000000 +0200 +++ new/tlpkg/tlpobj/delimseasy.tlpobj 2017-04-14 17:37:53.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/delimseasy/delimseasy.sty catalogue-also delim catalogue-ctan /macros/latex/contrib/delimseasy -catalogue-date 2016-02-05 19:30:59 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths catalogue-version 2.0 ++++++ delimtxt.doc.tar.xz ++++++ ++++++ delimtxt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/delimtxt.tlpobj new/tlpkg/tlpobj/delimtxt.tlpobj --- old/tlpkg/tlpobj/delimtxt.tlpobj 2016-04-14 18:56:01.000000000 +0200 +++ new/tlpkg/tlpobj/delimtxt.tlpobj 2017-04-14 17:37:53.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=2 RELOC/tex/latex/delimtxt/delimtxt.sty catalogue-ctan /macros/latex/exptl/delimtxt -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 ++++++ denisbdoc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/README.md new/doc/latex/denisbdoc/README.md --- old/doc/latex/denisbdoc/README.md 2016-04-04 23:15:04.000000000 +0200 +++ new/doc/latex/denisbdoc/README.md 2017-01-03 01:01:07.000000000 +0100 @@ -1,12 +1,14 @@ -denisbdoc - A personal package for documenting classes and packages, version 0.2 -================================================================================ +denisbdoc - A personal package for documenting classes and packages, v. 0.7 +=========================================================================== -This (quick 'n dirty) package is just for documenting the classes I've written. +**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes +I've written.** -Installation ------------- +The class is supplied in `.dtx` format. If you want to unpack the `.dtx` +yourself, running: -The package is supplied in `dtx` format. If you want to unpack the `.dtx` -yourself, running `tex denisbdoc.dtx` will extract the package. + tex denisbdoc.dtx + +will extract the package. This package is currently not documented. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/denisbdoc-chng.xdy new/doc/latex/denisbdoc/denisbdoc-chng.xdy --- old/doc/latex/denisbdoc/denisbdoc-chng.xdy 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/denisbdoc/denisbdoc-chng.xdy 2016-12-12 00:01:11.000000000 +0100 @@ -0,0 +1,23 @@ +(define-crossref-class "hyperindexformat") +(markup-crossref-list :class "hyperindexformat" :open + "\hyperindexformat{" :sep "; " :close "}{}") + +(markup-locref :open "\hyperpage{" :close "}") + +(markup-locref-list :sep ", ") +(markup-locclass-list :open "\hspace*{\fill}\nobreakspace" :close "" ) + +(define-attributes (("gobble" "default"))) +(markup-locref :open "\makeatletter\@gobble{" :close "}\makeatother" :attr "gobble") + + +(markup-index :open "~n +\clearpage +\phantomsection +\begin{theindex} + \small + \providecommand*\lettergroupDefault[1]{} + \providecommand*\lettergroup[1]{} + ~n" + :close "~n~n\end{theindex}~n" +:tree) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/denisbdoc.xdy new/doc/latex/denisbdoc/denisbdoc.xdy --- old/doc/latex/denisbdoc/denisbdoc.xdy 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/denisbdoc/denisbdoc.xdy 2016-11-25 19:28:35.000000000 +0100 @@ -0,0 +1,36 @@ +;; (define-attributes ("example")) +;; (define-attributes ("definition")) +(define-attributes (("default" "definition" "example"))) +(define-attributes ("textsf")) +(markup-locref :open "\hyperpage{" :close "}" :attr "default") +(markup-locref :open "\textbf{\hyperpage{" :close "}}" :attr "definition") +(markup-locref :open "\textit{\hyperpage{" :close "}}" :attr "textit") +(markup-locref :open "\textsf{\hyperpage{" :close "}}" :attr "textsf") +(markup-locref :open "\emph{\hyperpage{" :close "}}" :attr "example") + +(markup-crossref-list :class "see" :open "\seelink{" :sep "; " :close "}{}") + +(define-crossref-class "hyperindexformat") +(markup-crossref-list :class "hyperindexformat" :open + "\hyperindexformat{" :sep "; " :close "}{}") + +;; (merge-to "definition" "default" :drop) + +(markup-locref :open "\hyperpage{" :close "}") +(markup-locref :open "\hyperpage{" :close "}" :attr "hyperpage") + +(markup-keyword-list :open "\targetindexentry{" :close "}" ) +(markup-keyword-list :open "\targetindexentryi{" :close "}" :depth 1) +(markup-keyword-list :open "\targetindexentryii{" :close "}" :depth 2) + +(markup-index :open "~n +\begin{theindex} + \providecommand*\lettergroupDefault[1]{} + \providecommand*\lettergroup[1]{% + \belowpdfbookmark{#1}{\csuse{DBD@index@symbolic@name}:#1}% + \par\indexheading{#1}{\csuse{DBD@index@symbolic@name}}\par + \nopagebreak + } + ~n" + :close "~n~n\end{theindex}~n" +:tree) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.doc.tlpobj new/tlpkg/tlpobj/denisbdoc.doc.tlpobj --- old/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2016-04-14 18:56:01.000000000 +0200 +++ new/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2017-04-14 17:37:53.000000000 +0200 @@ -1,7 +1,9 @@ name denisbdoc.doc category Package -revision 40234 +revision 42829 shortdesc doc files of denisbdoc relocated 1 -docfiles size=1 +docfiles size=3 RELOC/doc/latex/denisbdoc/README.md + RELOC/doc/latex/denisbdoc/denisbdoc-chng.xdy + RELOC/doc/latex/denisbdoc/denisbdoc.xdy ++++++ denisbdoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/denisbdoc/denisbdoc.sty new/tex/latex/denisbdoc/denisbdoc.sty --- old/tex/latex/denisbdoc/denisbdoc.sty 2016-04-04 23:15:04.000000000 +0200 +++ new/tex/latex/denisbdoc/denisbdoc.sty 2017-01-03 01:01:17.000000000 +0100 @@ -5,9 +5,8 @@ %% The original source files were: %% %% denisbdoc.dtx (with options: `package') -%% ----------------------------------------------------------------------- %% ----------------------------------------------------------------------------- -%% denisbdoc --- A personal dirty package for documenting packages, version 0.2 +%% denisbdoc --- A personal dirty package for documenting packages, version 0.7 %% %% Maintained by Denis Bitouz'e %% E-mail: denis.bitouze(a)lmpa.univ-littoral.fr @@ -16,7 +15,7 @@ %% ----------------------------------------------------------------------------- %% \RequirePackage{expl3,l3keys2e,xparse} -\ProvidesExplPackage {denisbdoc} {2016/04/04} {0.2} +\ProvidesExplPackage {denisbdoc} {2017/01/01} {0.7} {A personal package for documenting packages} \@ifpackagelater { expl3 } { 2012/11/21 } { } @@ -29,8 +28,15 @@ } \tex_endinput:D } +\keys_define:nn { denisbdoc } +{ + yad .bool_gset:N = \g__denisbdoc_yad_bool, + gzt .bool_gset:N = \g__denisbdoc_gzt_bool, + nwejm .bool_gset:N = \g__denisbdoc_nwejm_bool, +} +\ProcessKeysOptions { denisbdoc } \PassOptionsToPackage{obeyspaces}{url} -\pdftex_if_engine:TF +\sys_if_engine_pdftex:TF { \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} @@ -38,24 +44,24 @@ \RequirePackage{fontspec} } \RequirePackage{xpatch}% -\AtEndPreamble{\RequirePackage{morewrites}}% +\AtEndPreamble{% + \RequirePackage{mweights}% +}% \RequirePackage{parskip}% \RequirePackage{fixfoot}% +\RequirePackage{marginnote} \RequirePackage[inline]{enumitem}% \RequirePackage{afterpage}% -\RequirePackage{tabulary}% \RequirePackage{calc}% -\RequirePackage{subcaption}% \RequirePackage{siunitx}% -\RequirePackage[nottoc,notindex]{tocbibind}% -\RequirePackage{varioref}% \RequirePackage{booktabs}% +\RequirePackage{multirow}% \RequirePackage[xr]{zref}% -\RequirePackage[multiple% ,bottom -]{footmisc}% +\RequirePackage[multiple]{footmisc}% \RequirePackage{rotating}% \RequirePackage{pdflscape}% \RequirePackage{xspace}% +\RequirePackage{accsupp} \RequirePackage{hologo}% \RequirePackage{xifthen}% \RequirePackage{refcount}% @@ -63,45 +69,53 @@ \RequirePackage{ifpdf}% \RequirePackage{amssymb}% \RequirePackage{tocvsec2}% +\RequirePackage{ltxcmds}% \RequirePackage{csquotes}% \RequirePackage{tikz}% -\RequirePackage[xindy]{imakeidx} -\RequirePackage{scrlfile} -\BeforePackage{doc}{\let\oldmaketitle\maketitle} -\AfterPackage{doc}{\let\maketitle\oldmaketitle} +\RequirePackage{translator}% \let\EUR\relax -\@ifpackageloaded{tcolorbox}{% -}{% - \RequirePackage{tcolorbox}% -}% -\ExplSyntaxOff -\ifpdf -\tcbuselibrary{listingsutf8} -\else -\tcbuselibrary{listings} -\RequirePackage{fontawesome}% -\lstMakeShortInline[style=dbtex]^^c3^^97 -\fi -\tcbuselibrary{% - documentation,theorems,breakable,skins% -} -\usetikzlibrary{trees,backgrounds,fit,calc,positioning} -\RequirePackage{attachfile2} -\ExplSyntaxOn \RequirePackage{comment}% \RequirePackage{path}% \RequirePackage{textcase}% +\RequirePackage{fontawesome}% \@ifpackageloaded{biblatex}{% +\AtEndPreamble{% + \bool_if:nT {\g__denisbdoc_yad_bool} {% + % \defbibheading{bibintoc}[\bibname]{\chapter*{#1}}% + % % \defbibheading{subbibintoc}[\bibname]{\section*{#1}}% + % \defbibheading{YAD@localbibs@heading}[\translate{lbl-localbibname}]{% + % % \YAD@setsecnumdepth{none}% + % \section*{#1}% + % % \YAD@setsecnumdepth{\YAD@secnumdepth}% + % }% + \let\__denisbdoc_printbibliography_ORI\printbibliography% + \renewcommand{\printbibliography}[1][]{% + \pagestyle{biblio}% + \__denisbdoc_printbibliography_ORI[heading=bibintoc,#1]% + \pagestyle{ordinary}% + }% + }{% + }% +}% }{% \RequirePackage[backend=biber,style=authortitle,autopunct=false,useprefix=true,backref,dashed=false]{biblatex}% }% +\RequirePackage{morewrites}% \RequirePackage{babel}% \RequirePackage[nodayofweek]{datetime}% +\RequirePackage{subcaption}% +\RequirePackage{tocbibind}% +\RequirePackage[xindy]{imakeidx} +\RequirePackage{varioref}% +\@ifpackageloaded{tcolorbox}{% +}{% + \RequirePackage{tcolorbox}% +}% \@ifpackageloaded{hyperref}{% }{% - \RequirePackage{hyperref}% + \RequirePackage[hyperfootnotes=false,hyperindex=false]{hyperref}% }% -\@ifpackageloaded{nameref}{% +\RequirePackage{attachfile2} \@ifpackageloaded{nameref}{% }{% \RequirePackage{nameref}% }% @@ -115,35 +129,164 @@ }% \@ifpackageloaded{glossaries}{% }{% - \RequirePackage[nowarn]{glossaries}% - \makeglossaries - \setglossarystyle{indexhypergroup} - \setacronymstyle{long-sc-short} + % \RequirePackage{glossaries}% + \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}% + \makeglossaries% + \setglossarystyle{indexhypergroup}% + \setabbreviationstyle[acronym]{long-short-sc}% + \newcommand*{\formatfont}[1]{\textsc{#1}}% + \glssetcategoryattribute{format}{glossnamefont}{formatfont}% + \glssetcategoryattribute{format}{font}{formatfont}% + \renewcommand*{\glsxtrregularfont}[1]{% + \glshasattribute{\glslabel}{font}% + {\csuse{\glsgetattribute{\glslabel}{font}}{#1}}% + {#1}% + }% }% \@ifpackageloaded{cleveref}{% }{% \RequirePackage{cleveref}% }% -\ifundef{\inpenc@prehook}{% +\def\hdpindex#1#2{% + \csname\ifx\\#1\\relax\else#1\fi\endcsname{% + \hyperpage{#2}% + }% +} +\let\HDorg@wrglossary\@wrglossary +\def\@wrglossary#1{% + \let\HDorg@encapchar\encapchar + \def\encapchar##1\encapchar##2\@nil{% + \HDorg@encapchar + hdpindex{##1}% + }% + \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% +} +\renewcommand{\acrpluralsuffix}{} +\ltx(a)iffilelater{frenchb.ldf}{2016/03/20}{% }{% - \inpenc@prehook=\expandafter{\the\inpenc@prehook - \xdef\saved@percent@catcode{\the\catcode`\%}% - \catcode`\%14\relax + \DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse% + \ifFB@active@punct\noautospace@beforeFDP\shorthandoff{;:!?}\fi% + \ifFB@xetex@punct\XeTeXinterchartokenstate=0 \fi% + \ifFB@luatex@punct\FB@addDPspace=0 \FB@addGUILspace=0 \fi% }% - \inpenc@posthook=\expandafter{\the\inpenc@posthook - \catcode`\%\saved@percent@catcode\relax +} +\ExplSyntaxOff +\ifpdf +\tcbuselibrary{listingsutf8} +\else +\tcbuselibrary{listings} +\pdftex_if_engine:TF + { + \lstMakeShortInline[style=dbtex]| + }{ + \lstMakeShortInline[style=dbtex]^^c3^^97 + } +\fi +\tcbuselibrary{% + documentation,theorems,breakable,skins,xparse% +} +\tcbset{% + commandshell/.style={% + colback=black, + colupper=white, + colframe=yellow!75!black, + breakable, + listing only, + listing options={style=tcblatex,language=bash,escapeinside={(*@}{@*)}}, + every listing line={% + \textcolor{red}{% + \small\ttfamily\bfseries% + \BeginAccSupp{method=plain,ActualText={}} + \$ + \EndAccSupp{}% + } + }, + } +} +\tcbset{doc marginnote={if odd page or oneside={flushright upper}{flushright upper}}} +\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} +\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{} +\reversemarginpar +\DeclareTotalTCBox{\commandshell}{ v } +{ commandshell}{#1} +\newtcblisting{listingshell}[1][]{% + % colback=black, + % colupper=white, + colback=white, + colupper=black, + colframe=yellow!75!black, + breakable, + listing only, + listing options={% + style=tcblatex, + language=bash, + escapeinside={(*@}{@*)}, + upquote=true, + showstringspaces=false + }, + every listing line={% + \textcolor{red}{% + \small\ttfamily\bfseries% + \BeginAccSupp{method=plain,ActualText={}} + \$ + \EndAccSupp{}% + } + }, + #1 +} +\usetikzlibrary{trees,backgrounds,fit,calc,positioning} +\attachfilesetup{color=Hyperlink} +\newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}} +\newcommand{\targetindexentry}[1]{\indexmark{#1}} +\newcounter{targeti} +\newcommand{\targetindexentryi}[1]{\stepcounter{targeti}\hypertarget{\thetargeti:index:#1}{#1}} +\newcounter{targetii} +\newcommand{\targetindexentryii}[1]{\stepcounter{targetii}\hypertarget{\thetargetii:index:#1}{#1}} +\newcommand{\seelink}[1]{\see{\hyperlink{index:#1}{#1}}} +\newcommand{\indexdef}[1]{\index{#1|definition}} +\newcommand{\indexex}[1]{% + \index{#1|example}% + \index{exemple!#1|example}% +} +\newcommand{\indexsee}[2]{\index{#1|see{#2}}} +\xpretocmd{\printindex}{\def\DBD@index@symbolic@name{#1}}{}{} +\xpatchcmd{\indexprologue}{#2}{% + #2 + \par\bigskip + \csuse{DBD@indexnavigation@\csuse{DBD@index@symbolic@name}}% +}{}{}% +\newif\if@DBD@no@first@letter@ +\@DBD@no@first@letter@false +\newcommand*{\indexheading}[2]{% + \hypertarget{#2:#1}{\textbf{#1}}% + \protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}% +} +\newcommand*{\DBD@indexgroup}[2]{% + \csgappto{DBD@indexnavigation@#2}{% + \if@DBD@no@first@letter@ + \,\textbar\,% + % \\ + \else + \noindent + \@DBD@no@first@letter@true + \fi + \hyperlink{#2:#1}{\textbf{#1}}% }% -}% +} \DeclareUrlCommand\urldirectory{\urlstyle{tt}} \ExplSyntaxOn -\tl_const:Nn \c__denisbdoc_template_string_tl {canevas} -\tl_const:Nn \c__denisbdoc_sample_string_tl {specimens} +\tl_const:Nn \c__denisbdoc_examples_path_tl {../exemples} +\tl_const:Nn \c__denisbdoc_template_string_tl {\c__denisbdoc_examples_path_tl/canevas} +\tl_const:Nn \c__denisbdoc_sample_string_tl {\c__denisbdoc_examples_path_tl/specimen} \tl_const:Nn \c__denisbdoc_flattemplate_string_tl {\c__denisbdoc_template_string_tl/a-plat} \tl_const:Nn \c__denisbdoc_flatsample_string_tl {\c__denisbdoc_sample_string_tl/a-plat} \tl_const:Nn \c__denisbdoc_treetemplate_string_tl {\c__denisbdoc_template_string_tl/en-arborescence} \tl_const:Nn \c__denisbdoc_treesample_string_tl {\c__denisbdoc_sample_string_tl/en-arborescence} +\tl_const:Nn \c__denisbdoc_template_sample_zip_string_tl {canevas-specimen.zip} +\tl_const:Nn \c__denisbdoc_these_aux_string_tl {these.aux} +\tl_const:Nn \c__denisbdoc_these_snippets_directory_tl {extraits-these} \tl_const:Nn \c__denisbdoc_unixtldirectory_string_tl {/usr/local/} -\tl_const:Nn \c__denisbdoc_tlversion_string_tl {2014} +\tl_const:Nn \c__denisbdoc_tlversion_string_tl {2016} \tl_const:Nn \c__denisbdoc_wintldirectory_string_tl {c:/} \tl_const:Nn \c__denisbdoc_tldistdirectory_string_tl {texlive/\tlversion/texmf-dist/} \tl_const:Nn \c__denisbdoc_miktexdistdirectory_string_tl {[TODO]} @@ -183,7 +326,8 @@ appendix,lstlistoflistings,graphicpath,loadglsentries,hypersetup,detect-all,SetWatermarkColor,% @pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,% norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,% - norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*% + norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*,% + pdfobjcompresslevel,chaptermark% },% morekeywords=[1]{% Environments' names tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,% @@ -201,10 +345,14 @@ {% % S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros) moretexcs={% - makeglossaries,printglossaries,printglossary,newglossaryentry,gls,Gls,GLS,glspl,Glspl,GLSpl,newacronym,% - glsuseri,glsuserii,glsuseriii,glsuseriv,glsuserv,glsuservi,glsshortpluralkey,glslongpluralkey,loadglsentries,% - glsadd,glstextformat,glsnamefont,glossarypreamble,glossarypostamble,acrshort,acrshort*,acrlong,acrfull,% - Acrshort,ACRshort,Acrlong,ACRlong,Acrfull,ACRfull,acrshortpl,Acrshortpl,acrlongpl,Acrlongpl,acrfullpl,Acrfullpl,% + makeglossaries,printglossaries,printglossary,newglossaryentry,gls,Gls,GLS,glspl,Glspl,% + GLSpl,newacronym,% + glsuseri,glsuserii,glsuseriii,glsuseriv,glsuserv,glsuservi,glsshortpluralkey,glslongpluralkey,% + loadglsentries,% + glsadd,glstextformat,glsnamefont,glossarypreamble,glossarypostamble,acrshort,acrshort*,% + acrlong,acrfull,% + Acrshort,ACRshort,Acrlong,ACRlong,Acrfull,ACRfull,acrshortpl,Acrshortpl,acrlongpl,Acrlongpl,% + acrfullpl,Acrfullpl,% Acrlong*,acronymtype,printacronyms,printsymbols% },% % Environments' names @@ -213,7 +361,7 @@ % Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% first,firstplural,plural,sort,nonumberlist,name,acronym,acronyms,symbols,% - user1,user2,user3,user4,user5,user6,hyper,style,xindy,toc,% + user1,user2,user3,user4,user5,user6,hyper,style,xindy,toc,title,% useri,userii,useriii,useriv,userv,uservi% },% % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur @@ -257,11 +405,11 @@ % Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements morekeywords=[2]{% % title, - heading% + heading,refsegment% },% % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur morekeywords=[3]{% - bibintoc,skipbib% + bibintoc,skipbib,chapter% },% sensitive% }[keywords,tex,comments]% @@ -374,10 +522,10 @@ author,title,subtitle,academicfield,speciality,date,supervisor,cosupervisor,comonitor,% referee,guest,examiner,committeepresident,pres,institute,coinstitute,company,doctoralschool,% laboratory,dedication,frontepigraph,keywords,subject,expression,tableofcontents,submissiondate,% - maketitle,makedisclaimer,makekeywords,makelaboratory,makeabstract,makededications,makefrontepigraphs,% + maketitle,makedisclaimer,makekeywords,makelaboratory,makeabstract,makededications,% + makefrontepigraphs,makebackcover,ordernumber,chapter*,disclaimer,newglssymbol,yadsetup,% + comue,% % acknowledgements,frenchabstract,foreword,preface,caution, - makebackcover,ordernumber,chapter*,% - disclaimer,newglssymbol,yadsetup% },% % Environments' names morekeywords={% @@ -388,14 +536,14 @@ glossaries,otherlanguage% },% morekeywords=[2]{% Keys of key-value lists - professor,seniorresearcher,mcf,juniorresearcher,mcf*,% + professor,seniorresearcher,mcf,associateprofessor,juniorresearcher,mcf*,associateprofessor*,% juniorresearcher*,corporation,corps,male,female,% distinction,award,affiliation,sepcorpaffilfrench,affiliationsecondary,sepcorpaffilenglish,% logo,url,nologo,space,mainlanguage,secnumdepth,tocdepth,depth,version,output,logoheight,% address,telephone,fax,email,type,acronym,heading,nowarning,noerror,nofrontcover,role,% hyperfootnotes,hyperindex,plainpages,pdfpagemode,pdfpagelayout,locale,gray,frametitle,% graphicx,adjustbox,setspace,xcolor,datatool,titleps,draftwatermark,babel,datetime,% - bookmark,fncychap,% + bookmark,fncychap,localtocs,localbibs,localbibs*% },% morekeywords=[3]{% Values of key-value lists single,onehalf,double,doctor,yadsymbolstyle,% @@ -403,7 +551,7 @@ none,true,false,UseOutlines,TwoPageRight,UK,FR,dvipsnames,table,% Sonny,Lenny,Glenn,Conny,Rejne,Bjarne,PetersLenny,Bjornstrup,% screen,draft,inprogress,inprogress*,submitted,submitted*,final,paper,paper*,% - fbox,shadowbox,ovalbox,supervisor*,cosupervisor*,comonitor*,% + fbox,shadowbox,ovalbox,supervisor*,cosupervisor*,comonitor*% },% morekeywords=[4]{% Class and packages options warn,nodayofweek,unicode,nostamp,all,numbered,a4paper,leqno,fleqn,10pt,11pt,12pt,% @@ -414,7 +562,10 @@ committeemembers,estimateddefensedate,seniorresearcher,supervisors-in-committee,% supervisors-in-committee-pl,aim,aimand,examiners,examiners-pl,guests,guests-pl,mcf,mcf*,% professor,referees,referees-pl,website,defendedon,supervisedby,thesisdefendedby,thesistitle,% - inprogress,universitydepartment,inprogressfoottext,submittedfoottext + inprogress,universitydepartment,inprogressfoottext,submittedfoottext,% + coinstitute,company,institute,cosupervisor,cosupervisor*,comonitor,% + comonitor*,supervisor,supervisor*,academicfield,doctoralschool,keywords,% + ordernumber,committeepresident,committeepresident*,speciality% },% alsoletter={!-*1234560}% }% @@ -469,7 +620,7 @@ printauthorsdetails,date,title,author,maketitle,item,printbibliography,% vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,% nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,% - DeclareMathOperator,BinaryOperators,dif% + DeclareMathOperator,BinaryOperators,dif,articlesetup% },% % Environments' names morekeywords={% @@ -487,7 +638,8 @@ number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,% abstract,frenchtitle,englishtitle,% title,label,% pictogram,list,help,diameter,textwidth,xshift,yshift,% - affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright% + affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright,% + gradient% },% morekeywords=[3]{% Values of key-value lists true,false,theorem,definition,proof% @@ -510,11 +662,16 @@ \setlength\bibinitsep{1.25\baselineskip} \SetCiteCommand{\autocite} \renewcommand{\ttdefault}{lmtt} -\xapptocmd{\@section}{% +{% + \ttfamily% + \DeclareFontShape{T1}{lmtt}{bx}{it}{<-> ssub * lmtt/b/sl}{}% +} +\xapptocmd{\@chapter}{% \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}% \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}% \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}% \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}% + \addtocontents{dbtablist}{\protect\addvspace{10\p@}}% }{}{} \sisetup{locale=FR,detect-all} \lstdefinestyle{dbtex}{% @@ -556,10 +713,22 @@ breakable, fonttitle=\bfseries, enlarge~top~by=1mm, - separator~sign~dash + separator~sign~dash, + label~separator=- }% }% \tcbset{% + doc~head={% + % boxsep=4pt,arc=4pt,boxrule=0.6pt,% + % frame~style=fill,% + % colframe=red!50!black,% + interior~style={% + fill,% + color=yellow!10!white,% + }% + }% +} +\tcbset{% /tcb/doclang/environment~content=contenu~de~l'environnement, /tcb/doclang/color=~(couleur), /tcb/doclang/colors=Couleurs, @@ -572,7 +741,8 @@ /tcb/color~environment=environment, /tcb/color~key=key, /tcb/color~value=value, - index~format=pgfchapter, + % index~format=pgfchapter, + index~format=off, index~colorize, index~annotate=false, enhanced, @@ -596,11 +766,69 @@ % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} }% }% +\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries +Nouv.~:}~#1} +\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries +\textsc{m.-^^c3^^a0-j.}~:}~#1} \def\disp@com#1{\colDef{\ttfamily#1}} \define@key{Gin}{bylabel}{% \edef\@tempa{{Gin}{page=\zref@extract{#1}{abspage}}}% \expandafter\setkeys\@tempa% }% +\NewDocumentCommand \translateexpression { sm } +{ + \enquote{\foreignlanguage{french}{\translate{#2}}}~ + ou~ + \enquote{\foreignlanguage{english}{\translate{#2}}}% + \IfBooleanF {#1} + { + \selonlangue% + \index{expression!en~fran^^c3^^a7ais!\enquote{\foreignlanguage{french}{\translate{#2}}}}% + \index{expression!en~anglais!\enquote{\foreignlanguage{english}{\translate{#2}}}}% + } +} +\expandafter\AtBeginDocument\expandafter{% + \expandafter\def\expandafter\theindex\expandafter{\theindex}% +} +\expandafter\AtBeginDocument\expandafter{% + \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}% +} +\ExplSyntaxOff +\def\imki@finalmessage#1{}% since you're using latexmk +\def\imki@startidx#1#2{% + \if@filesw + \def\index{\@bsphack + \@ifnextchar [{\@index}{\@index[\imki@jobname]}} + \expandafter\newwrite\csname #1@idxfile\endcsname + \immediate\openout \csname #1@idxfile\endcsname #1.#2\relax + \typeout{Writing index file #1.#2}% + \fi} +\xpatchcmd\imki@makeindex + {\imki@startidx\imki@name} + {\imki@startidx\imki@name\imki@extout} + {}{} +\xpatchcmd\imki@build + {\imki@dokey\imki@title} + {\imki@dokey\imki@title + \imki@dokey\imki@extin + \imki@dokey\imki@extout} + {}{} +\xpatchcmd{\imki@putindex} + {\imki@options} + {\c_space_tl~ -o~ #1.\imki@extin\imki@options} + {}{} +\xpatchcmd{\imki@putindex} + {.idx} + {.\imki@extout} + {}{} +\xpatchcmd{\imki@putindex} + {.ind} + {.\imki@extin} + {}{} +\def\imki@extout{idx}\def\imki@extin{ind} +\define@key{imki}{extout}{\def\imki@extout{#1}} +\define@key{imki}{extin}{\def\imki@extin{#1}} +\ExplSyntaxOn \cs_new_protected:Nn \__denisbdoc_alert:n { \begingroup @@ -612,52 +840,91 @@ { \__denisbdoc_alert:n {#1} }% -\cs_set_eq:NN \__denisbdoc_orig_changes \changes \DeclareDocumentCommand \changes { smmm } { - \__denisbdoc_orig_changes{#2}{#3}{% - \IfBooleanTF {#1} - { - \alert{#4}% - } - { - #4% - } + \IfBooleanTF {#1} + { + \tl_set:Nn \l_tmpa_tl {\alert{#4}} + }{ + \tl_set:Nn \l_tmpa_tl {#4} } + \ifx\@onlypreamble\@notprerr + \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl} + \else + \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble} + \fi +} +\DeclareDocumentCommand \PrintChanges { O{} } { + \indexprologue{#1} + \def\imki@indexlevel{\chapter} + \printindex[\jobname-changes] + \def\imki@indexlevel{\chapter*} +} +\IfLanguageName{french}{% + \DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}% + {^^e2^^80^^9c}{^^e2^^80^^9d} +}{}% +\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://www.ctan.org/pkg/ } } +\cs_new_protected:Npn \__denisbdoc_package_format:nn #1#2 +{ + #2{\sffamily#1} } -\cs_new_protected:Nn \__denisbdoc_package:nnn +\cs_new_protected:Npn \__denisbdoc_package:nnnnnnn #1#2#3#4#5#6#7 { - \texorpdfstring{% - \IfBooleanTF {#1} + \texorpdfstring + { + \bool_if:nTF {#1} + { \__denisbdoc_package_format:nn {#4}{#7} } { - \tl_if_empty:nTF {#2} - {% - \href{http://www.ctan.org/pkg/#3}{\textsf{#3}}% - }{% - \href{#2}{\textsf{#3}}% - }% + \tl_if_blank:nTF {#3} + { + \tl_set:Nx \l_tmpa_tl {\c__denisbdoc_standard_url_tl #4} + \href + { \l_tmpa_tl } + { \__denisbdoc_package_format:nn {#4}{#7} } + } + { + \href + { #3 } + { \__denisbdoc_package_format:nn {#4}{#7} } + } } + \IfBooleanF{#2} { - \textsf{#3}% + \tl_if_empty:nTF {#6} + { + \index{#5!liste!\textsf{#4}} + }{ + \index{#5!liste!\textsf{#4}!#6} + } } - }{% - \textsf{#3} - }% -}% -\NewDocumentCommand{\package}{ s O{} m } { - \__denisbdoc_package:nnn {#1}{#2}{#3} + } + {#4} +} +\NewDocumentCommand{\package}{ s t+ O{} m O{package} O{} O{} } { + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7} } -\NewDocumentCommand{\Package}{ s O{} m } { +\NewDocumentCommand{\Package}{ s t+ O{} m O{package} O{} O{} } { \IfLanguageName{french}{package~}{}% - \__denisbdoc_package:nnn {#1}{#2}{#3} + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7} \IfLanguageName{english}{~package}{}% } -\NewDocumentCommand{\class}{ s O{} m } { - \__denisbdoc_package:nnn {#1}{#2}{#3} -} -\NewDocumentCommand{\Class}{ s O{} m } { - \IfLanguageName{french}{classe~}{}% - \__denisbdoc_package:nnn {#1}{#2}{#3} - \IfLanguageName{english}{~class}{}% +\NewDocumentCommand{\class}{ s t+ O{} m O{} O{} O{} } { + \IfLanguageName{french}{% + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7} + }{}% + \IfLanguageName{english}{% + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7} + }{}% +} +\NewDocumentCommand{\Class}{ s t+ O{} m O{} O{} O{} } { + \IfLanguageName{french}{% + classe~% + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7} + }{}% + \IfLanguageName{english}{% + \__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}~% + class + }{}% } \cs_new_protected:Nn \__denisbdoc_format:n { @@ -699,18 +966,70 @@ \__denisbdoc_file:n {#1}% \IfLanguageName{english}{~directory}{}% }% +\NewDocumentCommand \ie { s } {% + \IfBooleanTF {#1} + { + \IfLanguageName{french}{% + c'est-\`{a}-dire + }{}% + \IfLanguageName{english}{% + id est + }{}% + } + { + \IfLanguageName{french}{% + c.-^^c3^^a0-d + }{}% + \IfLanguageName{english}{% + i.e + }{}% + \(a)ifnextchar.% + { + }{ + .\xspace + }% + } +} \NewDocumentCommand{\program}{ m } { \__denisbdoc_file:n {#1}% } +\NewDocumentCommand{\texstudio}{ } +{ + \program{TeXstudio}\xspace +} +\NewDocumentCommand{\emacs}{ } +{ + \program{Emacs}\xspace +} +\NewDocumentCommand{\texlive}{ } +{ + \href{http://www.tug.org/texlive/}{\TeX{}\c_space_tl{}Live}\xspace +} +\NewDocumentCommand{\miktex}{ } +{ + \href{http://www.tug.org/texlive/}{MiK\TeX}\xspace +} +\NewDocumentCommand{\linux}{ } +{ + Linux\index{Linux}\xspace +} +\NewDocumentCommand{\macos}{ } +{ + Mac OS\index{Mac OS}\xspace +} +\NewDocumentCommand{\windows}{ } +{ + Windows\index{Windows}\xspace +} \cs_new_protected:Nn \__denisbdoc_links:nnn { \cs_if_exist:NTF \faExternalLink {% % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{\faExternalLink} - \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + \texttt{#3}~% \textnormal{(\attachfile{#2#3#1})} }{ % \href{#2#3#1}{\texttt{#3}}~\href{http://mirror.ctan.org/macros/latex/contrib/yathesis/#2#3#1}{} - \texttt{#3}~\textnormal{(\attachfile{#2#3#1})} + \texttt{#3}~% \textnormal{(\attachfile{#2#3#1})} } } \cs_new_protected:Nn \__denisbdoc_etctree: @@ -754,7 +1073,7 @@ \bgroup% \color{magenta} \bfseries \color{blue} - \__denisbdoc_links:nnn {.}{}{\folder/} + \__denisbdoc_links:nnn {../exemples}{}{\folder/} \egroup } \NewDocumentCommand{\directorytree}{ } @@ -777,14 +1096,14 @@ { \hyperref[sec-comm-oblig]{% \textcolor{red!75!black}{ - \pdftex_if_engine:TF - { - % \string! - \ding{52} - }{ + % \pdftex_if_engine:TF + % { + % % \string! + % \ding{52} + % }{ \faLock % \ding{52} - }% + % }% } \ifnum\getpagerefnumber{sec-comm-oblig}=\thepage% \else% @@ -798,44 +1117,48 @@ }% \NewDocumentCommand{\unixtldirectory}{} { - \directory{\c__denisbdoc_unixtldirectory_string_tl} + \directorytree{\c__denisbdoc_unixtldirectory_string_tl} }% \NewDocumentCommand{\tlversion}{} { - \directory{\c__denisbdoc_tlversion_string_tl} + \directorytree{\c__denisbdoc_tlversion_string_tl} }% \NewDocumentCommand{\wintldirectory}{} { - \directory{\c__denisbdoc_wintldirectory_string_tl} + \directorytree{\c__denisbdoc_wintldirectory_string_tl} }% \NewDocumentCommand{\tldistdirectory}{} { - \directory{\c__denisbdoc_tldistdirectory_string_tl} + \directorytree{\c__denisbdoc_tldistdirectory_string_tl} }% \NewDocumentCommand{\miktexdistdirectory}{} { - \directory{\c__denisbdoc_miktexdistdirectory_string_tl} + \directorytree{\c__denisbdoc_miktexdistdirectory_string_tl} }% \NewDocumentCommand{\docdirectory}{} { - \directory{\c__denisbdoc_docdirectory_string_tl} + \directorytree{\c__denisbdoc_docdirectory_string_tl} }% \NewDocumentCommand{\texdirectory}{} { - \directory{\c__denisbdoc_texdirectory_string_tl} + \directorytree{\c__denisbdoc_texdirectory_string_tl} }% \NewDocumentCommand{\sourcedirectory}{} { - \directory{\c__denisbdoc_sourcedirectory_string_tl} + \directorytree{\c__denisbdoc_sourcedirectory_string_tl} }% \NewDocumentCommand{\jobdirectory}{} { - \directory{\c__denisbdoc_jobdirectory_string_tl} + \directorytree{\c__denisbdoc_jobdirectory_string_tl} }% \NewDocumentCommand{\jobdocdirectory}{} { - \directory{\c__denisbdoc_jobdocdirectory_string_tl} + \directorytree{\c__denisbdoc_jobdocdirectory_string_tl} }% +\NewDocumentCommand{\version}{ m } +{ + Version~\texttt{#1} +} \NewDocumentCommand{\pdf}{} { \textsc{pdf} @@ -849,14 +1172,81 @@ \c__denisbdoc_aside_string_tl{}~#2~\c__denisbdoc_aside_string_tl } } -\zexternaldocument{\c__denisbdoc_treesample_string_tl/these}% -\cs_new_protected:Nn \__denisbdoc_screenshot:nn -{ - \fbox{\includegraphics[bylabel=#2,width=#1\linewidth-2\fboxsep-2\fboxrule]{\c__denisbdoc_treesample_string_tl/these}}% -} -\NewDocumentCommand \screenshot { O{.45} m } {% - \__denisbdoc_screenshot:nn {#1}{#2} +\bool_if:nT {\g__denisbdoc_yad_bool} {% + % + \zexternaldocument{\c__denisbdoc_flatsample_string_tl/these}% + \bool_new:N \g__denisbdoc_these_aux_exists% + \msg_new:nnn{denisbdoc}{File~ `\c__denisbdoc_these_aux_string_tl'~ needed}{% + File~ `\c__denisbdoc_these_aux_string_tl'~ needed~ (otherwise~ this~ document~ will~ + be~ incomplete)!~ Please~ go~ to~ `\c__denisbdoc_flatsample_string_tl'~ + directory~ and~ run~ first:\\\\ + + \ \ latexmk~ -g~ -pdf~ -jobname=these~ -pdflatex="pdflatex~ \%O~ \string\ \\ + \ \ '\string\RequirePackage\{etoolbox\}~ \string\ \\ + \ \ \string\AtEndPreamble\{\string\RequirePackage\{yathesis-demo\}\}~ \string\ \\ + \ \ \string\input\{\%S\}'"~ these.tex + \\\\ + Afterwards,~ recompile~ this~ document.% + }% + \file_if_exist:nTF {\c__denisbdoc_flatsample_string_tl/\c__denisbdoc_these_aux_string_tl} { \bool_gset_true:N + \g__denisbdoc_these_aux_exists }{ + % \bool_gset_false:N \g__denisbdoc_these_aux_exists + \msg_warning:nn{denisbdoc}{File~ `\c__denisbdoc_these_aux_string_tl'~ needed} + \AfterEndPreamble{% + \begin{dbwarning}{Documentation~incompl^^c3^^a8te~!}{documentation-incomplete} + La~ pr^^c3^^a9sente~ documentation~ est~ incompl^^c3^^a8te~ car~ le~ + \File{\c__denisbdoc_these_aux_string_tl}~ est~ absent~ du~ + \Folder{\c__denisbdoc_flatsample_string_tl}.~ Pour~ r^^c3^^a9gler~ le~ probl^^c3^^a8me,~ + rendez-vous~ dans~ ce~ dossier~ et~ compilez~ le~ \File{these.tex}~ au~ + moyen~ de~ la~ commande~ suivante\footnote{Sur~ une~ seule~ ligne.}~ : + \par\medskip + + \lstinline[language=bash,upquote=true,commentstyle=,stringstyle=,showstringspaces=false]+latexmk~-g~ -norc~ -r~ ./latexmkrc~-jobname=these-pdflatex="pdflatex~\%O~'\\RequirePackage\{etoolbox\}\\AtEndPreamble\{\\RequirePackage\{yathesis-demo\}\}\\input\{\%S\}'"~these+ + \end{dbwarning} + } + } + % + \msg_new:nnn{denisbdoc}{File~ `\c__denisbdoc_template_sample_zip_string_tl'~ needed}{% + File~ `canevas-specimen.zip'~ needed~ (otherwise~ this~ document~ will~ be~ + incomplete)!~ Please~ get~ this~ file~ from~ the~ orignal~ yathesis'~ + documentation~ and~ save~ it~ in~ `../exemples/'~ folder.~ Afterwards,~ + recompile~ this~ document.% + }% + \file_if_exist:nTF {../\c__denisbdoc_template_sample_zip_string_tl} {}{ + \msg_warning:nn{denisbdoc}{File~ `\c__denisbdoc_template_sample_zip_string_tl'~ needed} + \AfterEndPreamble{% + \begin{dbwarning}{Documentation~incompl^^c3^^a8te~!}{} + La~ version~ ^^c3^^a9lectronique~ (\pdf{})~ de~ la~ pr^^c3^^a9sente~ documentation~ + est~ incompl^^c3^^a8te~ :~ normalement,~ les~ canevas~ et~ sp^^c3^^a9cimens~ y~ sont~ + int^^c3^^a9gr^^c3^^a9s~ par~ le~ biais~ de~ l'archive~ \gls{zip}~ + \file{\c__denisbdoc_template_sample_zip_string_tl}~ (alors~ accessible~ par~ + simple~ clic)~ mais~ ce~ n'est~ pas~ le~ cas~ ici,~ ce~ fichier~ ^^c3^^a9tant~ + absent~ du~ dossier~ parent.~ % \Folder{\c__denisbdoc_examples_path_tl}.~ + Pour~ r^^c3^^a9gler~ le~ probl^^c3^^a8me,~ acc^^c3^^a9dez~ ^^c3^^a0~ ce~ fichier~ attach^^c3^^a9~ ^^c3^^a0~ la~ + version~ ^^c3^^a9lectronique~ originale~ de~ la~ documentation~ de~ + \yatcl{}\footnote{Disponible~ ^^c3^^a0~ l'adresse~ + \url{http://ctan.org/pkg/yathesis},~ si~ besoin~ est.}~ et~ placez-le~ + dans~ le~ \Folder{\c__denisbdoc_examples_path_tl}. + \end{dbwarning} + } + } + % + \cs_new_protected:Nn \__denisbdoc_screenshot:nn + { + \bool_if:NTF {\g__denisbdoc_these_aux_exists} { + \fbox{\includegraphics[bylabel=#2,width=#1\linewidth-2\fboxsep-2\fboxrule]{\c__denisbdoc_flatsample_string_tl/these}}% + }{% + \begin{dbwarning}{Copie~d'^^c3^^a9cran~manquante~!}{} + Il~ devrait~ ici~ y~ avoir~ une~ copie\c_space_tl ~ d'^^c3^^a9cran.~ Cf.~ + \vref{wa-documentation-incomplete}~ pour~ plus~ de~ d^^c3^^a9tails. + \end{dbwarning} + } + } + \NewDocumentCommand \screenshot { O{.45} m } {% + \__denisbdoc_screenshot:nn {#1}{#2} + } } +\pdfsuppresswarningpagegroup=1 \cs_new_protected:Nn \__denisbdoc_meta:nn { \bgroup% @@ -879,19 +1269,32 @@ codes,% #1% } -\NewTCBInputListing{\preamblesample}{ O{these.tex} m m }{% +\NewTCBInputListing{\preamblesampleold}{ O{these.tex} m m }{% samples, drop~lifted~shadow, listing~file={\c__denisbdoc_treesample_string_tl/#1}, listing~options={rangebeginprefix=\\,rangeendsuffix=\},#2}, #3, }% -\NewTCBInputListing{\bodysample}{ O{these.tex} m m }{% +\NewTCBInputListing{\preamblesample}{ m m m }{% + samples, + drop~lifted~shadow, + listing~file={\c__denisbdoc_these_snippets_directory_tl/#1}, + listing~options={#2}, + #3, +}% +\NewTCBInputListing{\bodysampleold}{ O{these.tex} m m }{% samples, listing~file={\c__denisbdoc_treesample_string_tl/#1}, listing~options={rangebeginprefix=\\,rangeendsuffix=\},#2}, #3, }% +\NewTCBInputListing{\bodysample}{ m m m }{% + samples, + listing~file={\c__denisbdoc_these_snippets_directory_tl/#1}, + listing~options={#2}, + #3, +}% \tl_new:N \g__denisbdoc_number_within_tl \tl_set:Nn \g__denisbdoc_number_within_tl {chapter} \@ifclassloaded{gztarticle}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}% @@ -914,9 +1317,15 @@ \newtcbtheorem[list~inside=dbfaqlist,number~within=\g__denisbdoc_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% colback=lightgray!5!white, colframe=lightgray!75!black, - fontupper=\slshape, + fontupper=\itshape, dbtcb }{faq} +\newtcbtheorem[list~inside=dbtabularlist,number~within=\g__denisbdoc_number_within_tl,crefname={tableau}{tableaux}]{dbtab}{Tableau}{% + colback=purple!5!white, + colframe=purple!75!black, + fontupper=\itshape, + dbtcb +}{tab} \NewDocumentCommand{\menuentry}{ O{} m } { \group_begin: % to segregate local changes to keys and font @@ -967,15 +1376,19 @@ \tl_const:Nn \c__denisbdoc_thesis_master_file_string_tl {these} \NewDocumentCommand \yat { } {% - \textsl{\texttt{\c__denisbdoc_yat_class_name_tl}}\xspace + \textsl{\textsf{\c__denisbdoc_yat_class_name_tl}} } \NewDocumentCommand \yatpa { } {% - \Package{\yat}\xspace + \Package+{\c__denisbdoc_yat_class_name_tl}[\itshape][]\xspace } \NewDocumentCommand \yatcl { } {% - \Class{\yat}\xspace + \texorpdfstring{\class+{\c__denisbdoc_yat_class_name_tl}[][][\itshape]\xspace}{yathesis} +} +\NewDocumentCommand \yatCl { } +{% + \texorpdfstring{\Class+{\c__denisbdoc_yat_class_name_tl}[][][\itshape]\xspace}{classe yathesis} } \NewDocumentCommand \configurationdirectory { } {% @@ -1029,7 +1442,7 @@ } \NewDocumentCommand \gztauthorcl { } {% - \Class{\textsl{\texttt{\c__denisbdoc_gztauthor_class_name_tl}}} + \Class+[http://ctan.org/pkg/gzt]{\gztauthor} } \tl_const:Nn \c__denisbdoc_nwejm_class_name_tl {nwejm} \tl_const:Nn \c__denisbdoc_nwejmauthor_class_name_tl {nwejmart} @@ -1044,18 +1457,24 @@ } \ProvideDocumentCommand \nwejmcl { } {% - \Class{\textsl{\texttt{\c__denisbdoc_nwejm_class_name_tl}}} + \Class{\c__denisbdoc_nwejm_class_name_tl} } \NewDocumentCommand \nwejmauthor { } {% - \textsl{\texttt{\c__denisbdoc_nwejmauthor_class_name_tl}} + \class[\c__denisbdoc_standard_url_tl\c__denisbdoc_nwejm_class_name_tl]{\c__denisbdoc_nwejmauthor_class_name_tl} } \NewDocumentCommand \nwejmauthorcl { } {% - \Class{\textsl{\texttt{\c__denisbdoc_nwejmauthor_class_name_tl}}} + \Class[\c__denisbdoc_standard_url_tl\c__denisbdoc_nwejm_class_name_tl]{\c__denisbdoc_nwejmauthor_class_name_tl} +} +\pdfstringdefDisableCommands{% + \let\textcolor\@gobble + \def\yatcl{yathesis} + \def\yatCl{classe~yathesis} + \def\program#1{#1} } \ExplSyntaxOff -%% Copyright (C) 2015, 2016 by +%% Copyright (C) 2015, 2016, 2017 by %% Denis Bitouz'e <denis.bitouze(a)lmpa.univ-littoral.fr> %% %% It may be distributed and/or modified under the conditions of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.tlpobj new/tlpkg/tlpobj/denisbdoc.tlpobj --- old/tlpkg/tlpobj/denisbdoc.tlpobj 2016-04-14 18:56:01.000000000 +0200 +++ new/tlpkg/tlpobj/denisbdoc.tlpobj 2017-04-14 17:37:53.000000000 +0200 @@ -1,13 +1,13 @@ name denisbdoc category Package -revision 40234 +revision 42829 shortdesc A personal dirty package for documenting packages relocated 1 longdesc A personal dirty package for documenting packages. -runfiles size=9 +runfiles size=13 RELOC/tex/latex/denisbdoc/denisbdoc.sty catalogue-ctan /macros/latex/contrib/denisbdoc -catalogue-date 2016-04-04 20:56:25 +0200 +catalogue-date 2017-01-01 22:02:36 +0100 catalogue-license lppl1.3 catalogue-topics doc-supp -catalogue-version 0.2 +catalogue-version 0.7 ++++++ detex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/detex.1 new/texmf-dist/doc/man/man1/detex.1 --- old/texmf-dist/doc/man/man1/detex.1 2006-01-03 01:00:18.000000000 +0100 +++ new/texmf-dist/doc/man/man1/detex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DETEX 1L "12 August 1993" "Purdue University" +.TH DETEX 1 "12 August 1993" "Purdue University" .SH NAME detex \- a filter to strip \fITeX\fP commands from a .tex file. .SH SYNOPSIS Binary files old/texmf-dist/doc/man/man1/detex.man1.pdf and new/texmf-dist/doc/man/man1/detex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/detex.doc.tlpobj new/tlpkg/tlpobj/detex.doc.tlpobj --- old/tlpkg/tlpobj/detex.doc.tlpobj 2016-04-27 03:16:41.000000000 +0200 +++ new/tlpkg/tlpobj/detex.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,7 +1,7 @@ name detex.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of detex -docfiles size=7 +docfiles size=3 texmf-dist/doc/man/man1/detex.1 texmf-dist/doc/man/man1/detex.man1.pdf ++++++ dhua.doc.tar.xz ++++++ ++++++ dhua.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dhua.tlpobj new/tlpkg/tlpobj/dhua.tlpobj --- old/tlpkg/tlpobj/dhua.tlpobj 2016-04-14 18:56:05.000000000 +0200 +++ new/tlpkg/tlpobj/dhua.tlpobj 2017-04-14 17:37:55.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/dhua/dhua.cfg RELOC/tex/latex/dhua/dhua.sty catalogue-ctan /macros/latex/contrib/dhua -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics shortcut german catalogue-version 0.11 ++++++ diadia.doc.tar.xz ++++++ ++++++ diadia.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diadia.tlpobj new/tlpkg/tlpobj/diadia.tlpobj --- old/tlpkg/tlpobj/diadia.tlpobj 2016-04-14 18:56:05.000000000 +0200 +++ new/tlpkg/tlpobj/diadia.tlpobj 2017-04-14 17:37:55.000000000 +0200 @@ -21,7 +21,7 @@ texmf-dist/tex/latex/diadia/diadia.cfg texmf-dist/tex/latex/diadia/diadia.sty catalogue-ctan /macros/latex/contrib/diadia -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 catalogue-version 1.1 ++++++ diagbox.doc.tar.xz ++++++ Binary files old/doc/latex/diagbox/diagbox.pdf and new/doc/latex/diagbox/diagbox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.doc.tlpobj new/tlpkg/tlpobj/diagbox.doc.tlpobj --- old/tlpkg/tlpobj/diagbox.doc.tlpobj 2016-04-14 18:56:06.000000000 +0200 +++ new/tlpkg/tlpobj/diagbox.doc.tlpobj 2017-04-14 17:37:55.000000000 +0200 @@ -1,8 +1,8 @@ name diagbox.doc category Package -revision 39862 +revision 42843 shortdesc doc files of diagbox relocated 1 -docfiles size=54 +docfiles size=70 RELOC/doc/latex/diagbox/README RELOC/doc/latex/diagbox/diagbox.pdf ++++++ diagbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/diagbox/diagbox.sty new/tex/latex/diagbox/diagbox.sty --- old/tex/latex/diagbox/diagbox.sty 2016-02-25 23:37:50.000000000 +0100 +++ new/tex/latex/diagbox/diagbox.sty 2017-01-03 01:01:17.000000000 +0100 @@ -20,11 +20,12 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{diagbox} - [2016/02/24 v2.1 Making table heads with diagonal lines] + [2016/12/28 v2.2 Making table heads with diagonal lines] \RequirePackage{keyval} \RequirePackage{pict2e} -\PassOptionsToPackage{nomessages}{fp} \RequirePackage{fp} +\FPmessagesfalse +\RequirePackage{calc} \RequirePackage{array} \newbox\diagbox@boxa \newbox\diagbox@boxb @@ -48,32 +49,32 @@ \PackageWarning{diagbox}% {You should not set width/innerwidth option more than once.}% \fi - \setlength{\diagbox@wd}{\dimexpr#1\relax}} + \setlength{\diagbox@wd}{#1}} \define@key{diagbox}{height}{% - \begingroup - \def\line{\normalbaselineskip}% - \edef\x{\noexpand\setlength{\diagbox@ht}{\the\dimexpr#1\relax}}% - \expandafter\endgroup\x} + \let\diagbox@save@line\line + \def\line{\normalbaselineskip}% + \setlength{\diagbox@ht}{#1}% + \let\line\diagbox@save@line} \define@key{diagbox}{innerleftsep}{% - \setlength{\diagbox@insepl}{\dimexpr#1\relax}} + \setlength{\diagbox@insepl}{#1}} \define@key{diagbox}{innerrightsep}{% - \setlength{\diagbox@insepr}{\dimexpr#1\relax}} + \setlength{\diagbox@insepr}{#1}} \define@key{diagbox}{innerwidth}{% \unless\ifdim\diagbox@wd=\z@ \PackageWarning{diagbox}% {You should not set width/innerwidth option more than once.}% \fi - \setlength{\diagbox@wd}{\dimexpr#1+\diagbox@insepl+\diagbox@insepr\relax}} + \setlength{\diagbox@wd}{#1+\diagbox@insepl+\diagbox@insepr}} \define@key{diagbox}{outerleftsep}{% - \setlength{\diagbox@outsepl}{\dimexpr#1\relax}} + \setlength{\diagbox@outsepl}{#1}} \define@key{diagbox}{outerrightsep}{% - \setlength{\diagbox@outsepr}{\dimexpr#1\relax}} + \setlength{\diagbox@outsepr}{#1}} \define@key{diagbox}{leftsep}{% - \setlength{\diagbox@insepl}{\dimexpr#1\relax}% - \setlength{\diagbox@outsepl}{-\dimexpr#1\relax}} + \setlength{\diagbox@insepl}{#1}% + \setlength{\diagbox@outsepl}{-(#1)}} \define@key{diagbox}{rightsep}{% - \setlength{\diagbox@insepr}{\dimexpr#1\relax}% - \setlength{\diagbox@outsepr}{-\dimexpr#1\relax}} + \setlength{\diagbox@insepr}{#1}% + \setlength{\diagbox@outsepr}{-(#1)}} \define@key{diagbox}{trim}{% \@tfor\@reserveda:=#1\do{% \ifcsname diagbox@insep\@reserveda\endcsname @@ -93,7 +94,8 @@ \let\diagbox@dir@NE\relax \let\diagbox@dir@NW\relax \define@key{diagbox}{linewidth}{% - \linethickness{\dimexpr#1\relax}} + \setlength{\@tempskipa}{#1}% + \linethickness{\@tempskipa}} \define@key{diagbox}{linecolor}{% \def\diagbox@setlinecolor{\color{#1}}} \let\diagbox@setlinecolor\empty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.tlpobj new/tlpkg/tlpobj/diagbox.tlpobj --- old/tlpkg/tlpobj/diagbox.tlpobj 2016-04-14 18:56:06.000000000 +0200 +++ new/tlpkg/tlpobj/diagbox.tlpobj 2017-04-14 17:37:55.000000000 +0200 @@ -1,6 +1,6 @@ name diagbox category Package -revision 39862 +revision 42843 shortdesc Table heads with diagonal lines relocated 1 longdesc The package's principal command, \diagbox, takes two arguments @@ -8,11 +8,13 @@ longdesc optional argument with which the direction the slash will go, longdesc the box dimensions, etc., may be controlled. The package also longdesc provides \slashbox and \backslashbox commands for compatibility -longdesc with the slashbox package, which it supersedes. +longdesc with the slashbox package, which it supersedes. diagbox depends +longdesc on e-TeX as well as the packages array, calc, fp, keyval, and +longdesc pict2e. runfiles size=3 RELOC/tex/latex/diagbox/diagbox.sty catalogue-ctan /macros/latex/contrib/diagbox -catalogue-date 2016-02-25 07:04:50 +0100 +catalogue-date 2016-12-28 11:22:52 +0100 catalogue-license lppl1.3 catalogue-topics table -catalogue-version 2.1 +catalogue-version 2.2 ++++++ diagmac2.doc.tar.xz ++++++ ++++++ diagmac2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagmac2.tlpobj new/tlpkg/tlpobj/diagmac2.tlpobj --- old/tlpkg/tlpobj/diagmac2.tlpobj 2016-04-14 18:56:06.000000000 +0200 +++ new/tlpkg/tlpobj/diagmac2.tlpobj 2017-04-14 17:37:56.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=11 RELOC/tex/latex/diagmac2/diagmac2.sty catalogue-ctan /macros/latex/contrib/diagmac2 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram-comm graphics-in-tex catalogue-version 2.1 ++++++ diagnose.doc.tar.xz ++++++ ++++++ diagnose.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagnose.tlpobj new/tlpkg/tlpobj/diagnose.tlpobj --- old/tlpkg/tlpobj/diagnose.tlpobj 2016-04-14 18:56:06.000000000 +0200 +++ new/tlpkg/tlpobj/diagnose.tlpobj 2017-04-14 17:37:56.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/diagnose/diagnose.sty catalogue-ctan /macros/latex/contrib/diagnose -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics install-mgmt catalogue-version 0.2 ++++++ dialogl.doc.tar.xz ++++++ ++++++ dialogl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dialogl.tlpobj new/tlpkg/tlpobj/dialogl.tlpobj --- old/tlpkg/tlpobj/dialogl.tlpobj 2016-04-14 18:56:07.000000000 +0200 +++ new/tlpkg/tlpobj/dialogl.tlpobj 2017-04-14 17:37:56.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/dialogl/listout.tex RELOC/tex/latex/dialogl/menus.sty catalogue-ctan /macros/latex/contrib/dialogl -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 ++++++ dice.doc.tar.xz ++++++ ++++++ dice.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dice.tlpobj new/tlpkg/tlpobj/dice.tlpobj --- old/tlpkg/tlpobj/dice.tlpobj 2016-04-14 18:56:07.000000000 +0200 +++ new/tlpkg/tlpobj/dice.tlpobj 2017-04-14 17:37:56.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/fonts/tfm/public/dice/dice3d.tfm catalogue-also epsdice catalogue-ctan /fonts/dice -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 font font-mf ++++++ dichokey.doc.tar.xz ++++++ ++++++ dichokey.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dichokey.tlpobj new/tlpkg/tlpobj/dichokey.tlpobj --- old/tlpkg/tlpobj/dichokey.tlpobj 2016-04-14 18:56:08.000000000 +0200 +++ new/tlpkg/tlpobj/dichokey.tlpobj 2017-04-14 17:37:56.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=2 RELOC/tex/latex/dichokey/dichokey.sty catalogue-ctan /macros/latex/contrib/dichokey -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics biology ++++++ dickimaw.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-g/dickimaw.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-g.new/dickimaw.doc.tar.xz differ: char 27, line 1 ++++++ dictsym.doc.tar.xz ++++++ ++++++ dictsym.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dictsym.tlpobj new/tlpkg/tlpobj/dictsym.tlpobj --- old/tlpkg/tlpobj/dictsym.tlpobj 2016-04-14 18:56:14.000000000 +0200 +++ new/tlpkg/tlpobj/dictsym.tlpobj 2017-04-14 17:37:59.000000000 +0200 @@ -17,6 +17,6 @@ RELOC/fonts/type1/public/dictsym/dictsym.pfm RELOC/tex/latex/dictsym/dictsym.sty catalogue-ctan /fonts/dictsym -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 linguistic ++++++ dvicopy.doc.tar.xz -> diffcoeff.doc.tar.xz ++++++ ++++ 1965 lines of diff (skipped) ++++++ dviasm.doc.tar.xz -> diffcoeff.tar.xz ++++++ ++++ 1753 lines of diff (skipped) ++++++ digiconfigs.doc.tar.xz ++++++ ++++++ digiconfigs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/digiconfigs.tlpobj new/tlpkg/tlpobj/digiconfigs.tlpobj --- old/tlpkg/tlpobj/digiconfigs.tlpobj 2016-04-14 18:56:14.000000000 +0200 +++ new/tlpkg/tlpobj/digiconfigs.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/digiconfigs/digiconfigs.sty catalogue-ctan /macros/latex/contrib/digiconfigs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram catalogue-version 0.5 ++++++ din1505.doc.tar.xz ++++++ ++++++ din1505.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/din1505.tlpobj new/tlpkg/tlpobj/din1505.tlpobj --- old/tlpkg/tlpobj/din1505.tlpobj 2016-04-14 18:56:14.000000000 +0200 +++ new/tlpkg/tlpobj/din1505.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/bibtex/bst/din1505/unsrtdin.bst catalogue-also dinat catalogue-ctan /biblio/bibtex/contrib/german/din1505 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics bibtex-sty ++++++ dinat.doc.tar.xz ++++++ ++++++ dinat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dinat.tlpobj new/tlpkg/tlpobj/dinat.tlpobj --- old/tlpkg/tlpobj/dinat.tlpobj 2016-04-14 18:56:15.000000000 +0200 +++ new/tlpkg/tlpobj/dinat.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/bibtex/bst/dinat/dinat.bst catalogue-also din1505 catalogue-ctan /biblio/bibtex/contrib/german/dinat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics bibtex-sty catalogue-version 2.5 ++++++ dinbrief.doc.tar.xz ++++++ ++++++ dinbrief.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dinbrief.tlpobj new/tlpkg/tlpobj/dinbrief.tlpobj --- old/tlpkg/tlpobj/dinbrief.tlpobj 2016-04-14 18:56:15.000000000 +0200 +++ new/tlpkg/tlpobj/dinbrief.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/tex/latex/dinbrief/dinbrief.sty catalogue-also akletter envlab formlett g-brief catalogue-ctan /macros/latex/contrib/dinbrief -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics std-conform letter class ++++++ dingbat.doc.tar.xz ++++++ ++++++ dingbat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dingbat.tlpobj new/tlpkg/tlpobj/dingbat.tlpobj --- old/tlpkg/tlpobj/dingbat.tlpobj 2016-04-14 18:56:16.000000000 +0200 +++ new/tlpkg/tlpobj/dingbat.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/dingbat/uark.fd RELOC/tex/latex/dingbat/udingbat.fd catalogue-ctan /fonts/dingbat -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-symbol catalogue-version 1.0 ++++++ directory.doc.tar.xz ++++++ ++++++ directory.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/directory.tlpobj new/tlpkg/tlpobj/directory.tlpobj --- old/tlpkg/tlpobj/directory.tlpobj 2016-04-14 18:56:16.000000000 +0200 +++ new/tlpkg/tlpobj/directory.tlpobj 2017-04-14 17:38:00.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/bibtex/bst/directory/phone.bst RELOC/tex/latex/directory/directory.sty catalogue-ctan /biblio/bibtex/contrib/directory -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics addr-list catalogue-version 1.20 ++++++ dirtree.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dirtree.doc.tlpobj new/tlpkg/tlpobj/dirtree.doc.tlpobj --- old/tlpkg/tlpobj/dirtree.doc.tlpobj 2016-04-14 18:56:16.000000000 +0200 +++ new/tlpkg/tlpobj/dirtree.doc.tlpobj 2017-04-14 17:38:01.000000000 +0200 @@ -1,6 +1,6 @@ name dirtree.doc category Package -revision 28524 +revision 42428 shortdesc doc files of dirtree relocated 1 docfiles size=37 ++++++ dirtree.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dirtree.tlpobj new/tlpkg/tlpobj/dirtree.tlpobj --- old/tlpkg/tlpobj/dirtree.tlpobj 2016-04-14 18:56:16.000000000 +0200 +++ new/tlpkg/tlpobj/dirtree.tlpobj 2017-04-14 17:38:01.000000000 +0200 @@ -1,6 +1,6 @@ name dirtree category Package -revision 28524 +revision 42428 shortdesc Display trees in the style of windows explorer relocated 1 longdesc This package is designed to emulate the way windows explorer @@ -11,7 +11,7 @@ RELOC/tex/generic/dirtree/dirtree.sty RELOC/tex/generic/dirtree/dirtree.tex catalogue-ctan /macros/generic/dirtree -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 0.32 ++++++ dirtytalk.doc.tar.xz ++++++ ++++++ dirtytalk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dirtytalk.tlpobj new/tlpkg/tlpobj/dirtytalk.tlpobj --- old/tlpkg/tlpobj/dirtytalk.tlpobj 2016-04-14 18:56:17.000000000 +0200 +++ new/tlpkg/tlpobj/dirtytalk.tlpobj 2017-04-14 17:38:01.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/dirtytalk/dirtytalk.sty catalogue-ctan /macros/latex/contrib/dirtytalk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics quote-marks catalogue-version 1.0 ++++++ disser.doc.tar.xz ++++++ ++++ 9032 lines of diff (skipped) ++++++ disser.tar.xz ++++++ ++++ 4894 lines of diff (skipped) ++++++ dithesis.doc.tar.xz ++++++ ++++++ dithesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dithesis.tlpobj new/tlpkg/tlpobj/dithesis.tlpobj --- old/tlpkg/tlpobj/dithesis.tlpobj 2016-04-14 18:56:18.000000000 +0200 +++ new/tlpkg/tlpobj/dithesis.tlpobj 2017-04-14 17:38:02.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=5 RELOC/tex/latex/dithesis/dithesis.cls catalogue-ctan /macros/latex/contrib/dithesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation greek catalogue-version 0.2 ++++++ dk-bib.doc.tar.xz ++++++ ++++++ dk-bib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dk-bib.tlpobj new/tlpkg/tlpobj/dk-bib.tlpobj --- old/tlpkg/tlpobj/dk-bib.tlpobj 2016-04-14 18:56:18.000000000 +0200 +++ new/tlpkg/tlpobj/dk-bib.tlpobj 2017-04-14 17:38:02.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/dk-bib/dk-apali.sty RELOC/tex/latex/dk-bib/dk-bib.sty catalogue-ctan /biblio/bibtex/contrib/dk-bib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics bibtex-sty danish catalogue-version 0.6 ++++++ dlfltxb.doc.tar.xz ++++++ ++++++ dlfltxb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dlfltxb.tlpobj new/tlpkg/tlpobj/dlfltxb.tlpobj --- old/tlpkg/tlpobj/dlfltxb.tlpobj 2016-04-14 18:56:19.000000000 +0200 +++ new/tlpkg/tlpobj/dlfltxb.tlpobj 2017-04-14 17:38:02.000000000 +0200 @@ -7,14 +7,14 @@ longdesc author's book "Introduktion til LaTeX" (in Danish), or longdesc presented in the book as code tips. The bundle comprises: longdesc dlfltxbcodetips: various macros helpful in typesetting -longdesc mathematics; dlfltxbmarkup: provides a macros used throughout -longdesc the book, for registering macro names, packages etc. in the -longdesc text, in the margin and in the index, all by using categorised -longdesc keys (note, a configuration file may be used; a sample is -longdesc included in the distribution); dlfltxbtocconfig: macros for the -longdesc two tables of contents that the book has; dlfltxbmisc: various -longdesc macros for typesetting LaTeX arguments, and the macro used in -longdesc the bibliography that can wrap a URL up into a bibtex entry. +longdesc mathematics; dlfltxbmarkup: provides macros used throughout, +longdesc for registering macro names, packages etc. in the text, in the +longdesc margin and in the index, all by using categorised keys (note, a +longdesc configuration file may be used; a sample is included in the +longdesc distribution); dlfltxbtocconfig: macros for the two tables of +longdesc contents that the book has; dlfltxbmisc: various macros for +longdesc typesetting LaTeX arguments, and the macro used in the +longdesc bibliography that can wrap a URL up into a BibTeX entry. longdesc Interested parties may review the book itself on the web at the longdesc author's institution (it is written in Danish). runfiles size=26 @@ -25,6 +25,6 @@ RELOC/tex/latex/dlfltxb/dlfltxbmisc.sty RELOC/tex/latex/dlfltxb/dlfltxbtocconfig.sty catalogue-ctan /macros/latex/contrib/dlfltxb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics book-ex danish ++++++ dnaseq.doc.tar.xz ++++++ ++++++ dnaseq.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dnaseq.tlpobj new/tlpkg/tlpobj/dnaseq.tlpobj --- old/tlpkg/tlpobj/dnaseq.tlpobj 2016-04-14 18:56:19.000000000 +0200 +++ new/tlpkg/tlpobj/dnaseq.tlpobj 2017-04-14 17:38:03.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/dnaseq/dnaseq.sty catalogue-ctan /macros/latex/contrib/dnaseq -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics molbio catalogue-version 0.01 ++++++ dnp.tar.xz ++++++ ++++++ doc-pictex.doc.tar.xz ++++++ ++++++ docbytex.doc.tar.xz ++++++ ++++++ docbytex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/docbytex.tlpobj new/tlpkg/tlpobj/docbytex.tlpobj --- old/tlpkg/tlpobj/docbytex.tlpobj 2016-04-14 18:56:20.000000000 +0200 +++ new/tlpkg/tlpobj/docbytex.tlpobj 2017-04-14 17:38:03.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=10 RELOC/tex/generic/docbytex/docby.tex catalogue-ctan /macros/generic/docbytex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics program-doc ++++++ doclicense.doc.tar.xz ++++++ ++++++ doclicense.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doclicense.tlpobj new/tlpkg/tlpobj/doclicense.tlpobj --- old/tlpkg/tlpobj/doclicense.tlpobj 2016-04-25 03:14:23.000000000 +0200 +++ new/tlpkg/tlpobj/doclicense.tlpobj 2017-04-14 17:38:03.000000000 +0200 @@ -62,7 +62,7 @@ RELOC/tex/latex/doclicense/license-texts/doclicense-CC-zero-1.0-latex.tex RELOC/tex/latex/doclicense/license-texts/doclicense-CC-zero-1.0-plaintext.tex catalogue-ctan /macros/latex/contrib/doclicense -catalogue-date 2016-04-24 17:18:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics licence-mgmt catalogue-version 1.5.0 ++++++ docmfp.doc.tar.xz ++++++ ++++++ docmfp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/docmfp.tlpobj new/tlpkg/tlpobj/docmfp.tlpobj --- old/tlpkg/tlpobj/docmfp.tlpobj 2016-04-14 18:56:22.000000000 +0200 +++ new/tlpkg/tlpobj/docmfp.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/docmfp/docmfp.sty catalogue-ctan /macros/latex/contrib/docmfp -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-supp catalogue-version 1.2d ++++++ docmute.doc.tar.xz ++++++ ++++++ docmute.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/docmute.tlpobj new/tlpkg/tlpobj/docmute.tlpobj --- old/tlpkg/tlpobj/docmute.tlpobj 2016-04-14 18:56:22.000000000 +0200 +++ new/tlpkg/tlpobj/docmute.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/docmute/docmute.sty catalogue-also combine includex newclude standalone catalogue-ctan /macros/latex/contrib/docmute -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.4 ++++++ doctools.doc.tar.xz ++++++ ++++++ doctools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doctools.tlpobj new/tlpkg/tlpobj/doctools.tlpobj --- old/tlpkg/tlpobj/doctools.tlpobj 2016-04-14 18:56:22.000000000 +0200 +++ new/tlpkg/tlpobj/doctools.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=5 RELOC/tex/latex/doctools/doctools.sty catalogue-ctan /macros/latex/contrib/doctools -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-supp catalogue-version 0.1 ++++++ documentation.doc.tar.xz ++++++ ++++++ documentation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/documentation.tlpobj new/tlpkg/tlpobj/documentation.tlpobj --- old/tlpkg/tlpobj/documentation.tlpobj 2016-04-14 18:56:22.000000000 +0200 +++ new/tlpkg/tlpobj/documentation.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/documentation/documentation.sty catalogue-ctan /macros/latex/contrib/documentation -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 0.1 ++++++ doi.doc.tar.xz ++++++ ++++++ doi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doi.tlpobj new/tlpkg/tlpobj/doi.tlpobj --- old/tlpkg/tlpobj/doi.tlpobj 2016-04-14 18:56:22.000000000 +0200 +++ new/tlpkg/tlpobj/doi.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=1 RELOC/tex/latex/doi/doi.sty catalogue-ctan /macros/latex/contrib/doi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyper ++++++ doipubmed.doc.tar.xz ++++++ ++++++ doipubmed.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doipubmed.tlpobj new/tlpkg/tlpobj/doipubmed.tlpobj --- old/tlpkg/tlpobj/doipubmed.tlpobj 2016-04-14 18:56:23.000000000 +0200 +++ new/tlpkg/tlpobj/doipubmed.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/doipubmed/doipubmed.sty catalogue-ctan /macros/latex/contrib/doipubmed -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cite-supp catalogue-version 1.01 ++++++ dosepsbin.doc.tar.xz ++++++ ++++++ dosepsbin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dosepsbin.tlpobj new/tlpkg/tlpobj/dosepsbin.tlpobj --- old/tlpkg/tlpobj/dosepsbin.tlpobj 2016-04-14 18:56:23.000000000 +0200 +++ new/tlpkg/tlpobj/dosepsbin.tlpobj 2017-04-14 17:38:04.000000000 +0200 @@ -6,7 +6,7 @@ longdesc binary format to support the inclusion of a thumbnail. This longdesc file format, commonly known as DOS EPS format starts with a longdesc binary header that contains the positions of the possible -longdesc sections: Postscript (PS); Windows Metafile Format (WMF); and +longdesc sections: PostScript (PS); Windows Metafile Format (WMF); and longdesc Tag Image File Format (TIFF). The PS section must be present longdesc and either the WMF file or the TIFF file should be given. The longdesc package provides a Perl program that will extract any of the @@ -16,7 +16,7 @@ runfiles size=3 texmf-dist/scripts/dosepsbin/dosepsbin.pl catalogue-ctan /support/dosepsbin -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-05 18:29:32 +0200 catalogue-license artistic catalogue-topics image-supp catalogue-version 1.2 ++++++ dot2texi.doc.tar.xz ++++++ ++++++ dot2texi.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dot2texi.tlpobj new/tlpkg/tlpobj/dot2texi.tlpobj --- old/tlpkg/tlpobj/dot2texi.tlpobj 2016-04-14 18:56:23.000000000 +0200 +++ new/tlpkg/tlpobj/dot2texi.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/dot2texi/dot2texi.sty catalogue-ctan /macros/latex/contrib/dot2texi -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics foreign-import graphics catalogue-version 3.0 ++++++ dotarrow.doc.tar.xz ++++++ ++++++ dotarrow.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dotarrow.tlpobj new/tlpkg/tlpobj/dotarrow.tlpobj --- old/tlpkg/tlpobj/dotarrow.tlpobj 2016-04-14 18:56:24.000000000 +0200 +++ new/tlpkg/tlpobj/dotarrow.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/dotarrow/DotArrow.sty catalogue-ctan /macros/latex/contrib/dotarrow -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-symbol catalogue-version 0.01a ++++++ dotseqn.doc.tar.xz ++++++ ++++++ dotseqn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dotseqn.tlpobj new/tlpkg/tlpobj/dotseqn.tlpobj --- old/tlpkg/tlpobj/dotseqn.tlpobj 2016-04-14 18:56:24.000000000 +0200 +++ new/tlpkg/tlpobj/dotseqn.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/dotseqn/dotseqn.sty catalogue-ctan /macros/latex/contrib/dotseqn -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics maths catalogue-version 1.1 ++++++ dottex.doc.tar.xz ++++++ ++++++ dottex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dottex.tlpobj new/tlpkg/tlpobj/dottex.tlpobj --- old/tlpkg/tlpobj/dottex.tlpobj 2016-04-14 18:56:24.000000000 +0200 +++ new/tlpkg/tlpobj/dottex.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/dottex/dottex.sty catalogue-ctan /macros/latex/contrib/dottex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-inline catalogue-version 0.6 ++++++ doublestroke.doc.tar.xz ++++++ ++++++ doublestroke.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doublestroke.tlpobj new/tlpkg/tlpobj/doublestroke.tlpobj --- old/tlpkg/tlpobj/doublestroke.tlpobj 2016-04-14 18:56:24.000000000 +0200 +++ new/tlpkg/tlpobj/doublestroke.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -39,7 +39,7 @@ RELOC/tex/latex/doublestroke/dsfont.sty catalogue-also bbm bbold mbboard catalogue-ctan /fonts/doublestroke -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-29 06:41:49 +0200 catalogue-license other-free catalogue-topics font font-maths font-type1 font-mf font-bbd catalogue-version 1.111 ++++++ dowith.doc.tar.xz ++++++ ++++++ dowith.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dowith.tlpobj new/tlpkg/tlpobj/dowith.tlpobj --- old/tlpkg/tlpobj/dowith.tlpobj 2016-04-14 18:56:25.000000000 +0200 +++ new/tlpkg/tlpobj/dowith.tlpobj 2017-04-14 17:38:05.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/generic/dowith/dowith.RLS RELOC/tex/generic/dowith/dowith.sty catalogue-ctan /macros/generic/dowith -catalogue-date 2015-11-15 22:40:22 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version r0.32 ++++++ download.doc.tar.xz ++++++ ++++++ download.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/download.tlpobj new/tlpkg/tlpobj/download.tlpobj --- old/tlpkg/tlpobj/download.tlpobj 2016-04-14 18:56:25.000000000 +0200 +++ new/tlpkg/tlpobj/download.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/download/download.sty catalogue-ctan /macros/latex/contrib/download -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics ext-code catalogue-version 1.1 ++++++ dox.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/NEWS new/doc/latex/dox/NEWS --- old/doc/latex/dox/NEWS 2010-12-17 00:57:53.000000000 +0100 +++ new/doc/latex/dox/NEWS 2017-01-28 01:01:04.000000000 +0100 @@ -1,49 +1,43 @@ - WHAT'S NEW IN DOX -Copyright (C) 2009, 2010 Didier Verna +Copyright (C) 2009, 2010, 2017 Didier Verna + +Author: Didier Verna <didier(a)didierverna.net> This file is part of DoX. -DoX may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.1 -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.1 or later is part of all distributions of LaTeX -version 1999/06/01 or later. +DoX 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. + +DoX consists of the files listed in the file `README.md'. -DoX consists of the files listed in the file `README'. +* Version 2.3 +** Support Doc's internal \saved@indexname command +thanks to Falk Hanisch. * Version 2.2 -============= ** New option 'macrolike' to \doxitem allowing to create control sequence based documentation items. - * Version 2.1 -============= ** New lisp functions doxitem[s] to register new documentation environments with AUC-TeX. - * Version 2.0 -============= ** Optional argument to \doxitem idxtype option to change the item's index type - ** Optional argument to \Describe<Item> and the <Item> environment noprint option to avoid marginal printing noindex option to avoid item indexing - ** Extend \DescribeMacro, \DescribeEnv and their corresponding environments with the same features - * Version 1.0 -============= ** First public version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/README new/doc/latex/dox/README --- old/doc/latex/dox/README 2010-12-17 00:57:53.000000000 +0100 +++ new/doc/latex/dox/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ - - ABOUT DOX - - -Copyright (C) 2009, 2010 Didier Verna - -This file is part of DoX. - -DoX may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.1 -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.1 or later is part of all distributions of LaTeX -version 1999/06/01 or later. - -DoX consists of the following files: - -- NEWS -- README (this file) -- dox.dtx -- dox.el -- dox.ins - - -* Description -============= - -The doc package provides LaTeX developers with means to describe the usage and -the definition of new commands and environments. However, there is no simple -way to extend this functionality to other items (options or counters for -instance). DoX is designed to circumvent this limitation, and provides some -improvements over the existing functionality as well. - -DoX homepage: http://www.lrde.epita.fr/~didier/software/latex.php#dox - - -* Installation -============== - -If you are building DoX from the tarball you need to execute the following -steps in order to extract the necessary files: - -[pdf]latex dox.ins -> will create the style file dox.sty -[pdf]latex dox.dtx -> (twice) will create the documentation files dox.pdf or - dox.dvi. Note that dox.pdf is already part of the - distribution. - -After that, you need to install the generated documentation and style file to -a location where LaTeX can find them. For a TDS-compliant layout, the -following locations are suggested: - -[TEXMF]/tex/latex/dox/dox.sty -[TEXMF]/doc/latex/dox/dox.[pdf|dvi] - -If you're an AUC-TeX user, you may also install the file 'dox.el' in a -suitable AUC-TeX style directory. - - - Have fun! - --- -Didier Verna <didier(a)lrde.epita.fr> - -Sientific site: http://www.lrde.epita.fr/~didier -Music (Jazz) site: http://www.didierverna.com - - - - -Local Variables: -mode: outline -End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/README.md new/doc/latex/dox/README.md --- old/doc/latex/dox/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dox/README.md 2017-01-28 01:01:04.000000000 +0100 @@ -0,0 +1,56 @@ +ABOUT DOX +========= + +Copyright (C) 2009, 2010, 2017 Didier Verna + +Author: Didier Verna <didier(a)didierverna.net> + +This file is part of DoX. + +DoX 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. + +DoX consists of the following files: + +- README.md (this file) +- NEWS +- dox.ins +- dox.dtx +- dox.el +- THANKS + + +Description +----------- + +The Doc package provides LaTeX developers with means to describe the usage and +the definition of new commands and environments. However, there is no simple +way to extend this functionality to other items (options or counters for +instance). DoX is designed to circumvent this limitation, and provides some +improvements over the existing functionality as well. Dox also comes with +support for [AUC-TeX](https://www.gnu.org/software/auctex/). + +DoX homepage: http://www.lrde.epita.fr/~didier/software/latex.php#dox + + +Installation +------------ +If you are building DoX from the tarball, you need to execute the following +steps in order to extract the necessary files: + + [pdf]latex dox.ins + [pdf]latex dox.dtx + [pdf]latex dox.dtx + +After that, you need to install the generated documentation and style file to +a location where LaTeX can find them. For a TDS-compliant layout, the +following locations are suggested: + + [TEXMF]/tex/latex/dox/dox.sty + [TEXMF]/doc/latex/dox/dox.[pdf|dvi] + +If you're an AUC-TeX user, you may also install the file `dox.el` in a +suitable AUC-TeX style directory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/THANKS new/doc/latex/dox/THANKS --- old/doc/latex/dox/THANKS 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dox/THANKS 2017-01-28 01:01:04.000000000 +0100 @@ -0,0 +1,31 @@ + THANK YOU! + + +Copyright (C) 2017 Didier Verna + +Author: Didier Verna <didier(a)didierverna.net> + +This file is part of DoX. + +DoX 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. + +DoX consists of the files listed in the file `README.md'. + + +* Contributors + +** The following persons have contributed code, bug reports, localization, +** suggestions etc.: + +Falk Hanisch. + + + + +Local Variables: +mode: outline +End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/dox.el new/doc/latex/dox/dox.el --- old/doc/latex/dox/dox.el 2010-12-17 00:57:53.000000000 +0100 +++ new/doc/latex/dox/dox.el 2017-01-28 01:01:04.000000000 +0100 @@ -1,32 +1,23 @@ ;;; dox.el --- AUC-TeX style file for DoX -;; Copyright (C) 2009, 2010 Didier Verna - -;; Author: Didier Verna <didier(a)lrde.epita.fr> -;; Maintainer: Didier Verna <didier(a)lrde.epita.fr> -;; Created: Fri Sep 11 11:24:16 2009 -;; Last Revision: Sat Sep 19 09:54:43 2009 -;; Keywords: tex abbrev data +;; Copyright (C) 2009, 2010, 2017 Didier Verna +;; Author: Didier Verna <didier(a)didierverna.net> +;; Keywords: tex abbrev data ;; This file is part of DoX. -;; DoX may be distributed and/or modified under the -;; conditions of the LaTeX Project Public License, either version 1.1 -;; 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.1 or later is part of all distributions of LaTeX -;; version 1999/06/01 or later. +;; DoX 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. -;; DoX consists of all files listed in the file `README'. +;; DoX consists of all files listed in the file `README.md'. ;;; Commentary: -;; Contents management by FCM version 0.1. - - ;;; Code: Binary files old/doc/latex/dox/dox.pdf and new/doc/latex/dox/dox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dox/header.inc new/doc/latex/dox/header.inc --- old/doc/latex/dox/header.inc 2010-12-17 00:57:53.000000000 +0100 +++ new/doc/latex/dox/header.inc 2017-01-28 01:01:04.000000000 +0100 @@ -8,19 +8,17 @@ %% -%% Copyright (C) 2009, 2010 Didier Verna +%% Copyright (C) 2009, 2010, 2017 Didier Verna %% This file is part of DoX. -%% DoX may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.1 -%% 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.1 or later is part of all distributions of LaTeX -%% version 1999/06/01 or later. +%% DoX 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. -%% DoX consists of the files listed in the file `README'. +%% DoX consists of the files listed in the file `README.md'. %% \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 @@ -37,7 +35,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{dox}[2010/12/16 v2.2 Extensions to the doc package] +\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package] \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dox.doc.tlpobj new/tlpkg/tlpobj/dox.doc.tlpobj --- old/tlpkg/tlpobj/dox.doc.tlpobj 2016-04-14 18:56:26.000000000 +0200 +++ new/tlpkg/tlpobj/dox.doc.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -1,11 +1,12 @@ name dox.doc category Package -revision 20768 +revision 43060 shortdesc doc files of dox relocated 1 -docfiles size=42 +docfiles size=44 RELOC/doc/latex/dox/NEWS - RELOC/doc/latex/dox/README + RELOC/doc/latex/dox/README.md + RELOC/doc/latex/dox/THANKS RELOC/doc/latex/dox/dox.el RELOC/doc/latex/dox/dox.pdf RELOC/doc/latex/dox/header.inc ++++++ dox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dox/dox.sty new/tex/latex/dox/dox.sty --- old/tex/latex/dox/dox.sty 2010-12-17 00:57:53.000000000 +0100 +++ new/tex/latex/dox/dox.sty 2017-01-28 01:01:06.000000000 +0100 @@ -8,19 +8,17 @@ %% -%% Copyright (C) 2009, 2010 Didier Verna +%% Copyright (C) 2009, 2010, 2017 Didier Verna %% This file is part of DoX. -%% DoX may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.1 -%% 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.1 or later is part of all distributions of LaTeX -%% version 1999/06/01 or later. +%% DoX 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. -%% DoX consists of the files listed in the file `README'. +%% DoX consists of the files listed in the file `README.md'. %% \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 @@ -38,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{dox}[2010/12/16 v2.2 Extensions to the doc package] +\ProvidesPackage{dox}[2017/01/26 v2.3 Extensions to the doc package] \RequirePackage{kvoptions} \SetupKeyvalOptions{family=dox,prefix=dox@} @@ -53,6 +51,7 @@ \topsep\MacroTopsep% \trivlist% \edef\saved@macroname{\string#2}% + \@nameuse{@Save#1IndexName}{\saved@macroname}% \def\makelabel##1{\llap{##1}}% \if@inlabel% \let\@tempa\@empty% @@ -106,6 +105,10 @@ \MakePrivateLetters% \@@doxdescribe{#1}} +\def\@doxsavemacrolikeindexname#1{% + \edef\saved@indexname{\expandafter\@gobble#1}} +\def\@doxsaveindexname#1{\let\saved@indexname#1} + \def\@doxcreatespecialmainindex#1#2#3{% \expandafter\def\csname SpecialMain#1Index\endcsname##1{% \@bsphack% @@ -162,10 +165,12 @@ \def\SpecialMainMacroIndex#1{% \SpecialMainIndex{#1}\nobreak% \DoNotIndex{#1}} +\let\@SaveMacroIndexName\@doxsavemacrolikeindexname \@doxcreateenv{Macro}{macro} \@doxcreatedescribe{Env} \@doxcreateenv{Env}{environment} +\let\@SaveEnvIndexName\@doxsaveindexname \newcommand\doxitem[4][]{% \@nameuse{dox@macrolike\dox@macrolikedefault}% @@ -200,8 +205,13 @@ \fi \expandafter\@doxexpr\expandafter{\dox@idxtype}{#4}% \@doxcreatedescribe{#2} - \@doxcreateenv{#2}{#3}} - + \@doxcreateenv{#2}{#3} + \ifdox@macrolike + \expandafter\let\csname @Save#2IndexName\endcsname% + \@doxsavemacrolikeindexname% + \else + \expandafter\let\csname @Save#2IndexName\endcsname\@doxsaveindexname% + \fi} \ProcessKeyvalOptions* \ifdox@noprint \def\dox@noprintdefault{true} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dox.tlpobj new/tlpkg/tlpobj/dox.tlpobj --- old/tlpkg/tlpobj/dox.tlpobj 2016-04-14 18:56:26.000000000 +0200 +++ new/tlpkg/tlpobj/dox.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -1,6 +1,6 @@ name dox category Package -revision 20768 +revision 43060 shortdesc Extend the doc package relocated 1 longdesc The doc package provides LaTeX developers with means to @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/dox/dox.sty catalogue-ctan /macros/latex/contrib/dox -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2017-01-26 22:13:30 +0100 +catalogue-license lppl1.3 catalogue-topics doc-supp -catalogue-version 2.2 +catalogue-version 2.3 ++++++ dozenal.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/dozenal/CHANGES new/doc/fonts/dozenal/CHANGES --- old/doc/fonts/dozenal/CHANGES 2015-06-29 02:14:57.000000000 +0200 +++ new/doc/fonts/dozenal/CHANGES 2016-12-01 00:01:02.000000000 +0100 @@ -1,3 +1,8 @@ +For version 7.0, added the "\doman" and "\Doman" macros for +dozenal-style Roman numerals. Also reorganized the +documentation. Submitted to CTAN on 25 Nov 1200 (29 Nov +2016). + For version 6.0, added the "\doznumtowords" macro, which will take a counter and output it in dozenal words. Which words it uses can be customized; I have made no attempt to Binary files old/doc/fonts/dozenal/dozenal.pdf and new/doc/fonts/dozenal/dozenal.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dozenal.doc.tlpobj new/tlpkg/tlpobj/dozenal.doc.tlpobj --- old/tlpkg/tlpobj/dozenal.doc.tlpobj 2016-04-14 18:56:26.000000000 +0200 +++ new/tlpkg/tlpobj/dozenal.doc.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -1,6 +1,6 @@ name dozenal.doc category Package -revision 37698 +revision 42608 shortdesc doc files of dozenal relocated 1 docfiles size=83 ++++++ dozenal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dozenal/dozenal.sty new/tex/latex/dozenal/dozenal.sty --- old/tex/latex/dozenal/dozenal.sty 2015-06-29 02:14:57.000000000 +0200 +++ new/tex/latex/dozenal/dozenal.sty 2016-12-01 00:01:04.000000000 +0100 @@ -25,7 +25,7 @@ %% This work consists of the files listed in dozenalfilelist.txt. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dozenal}[2015/01/29 v6.0 support for dozenal fonts] +\ProvidesPackage{dozenal}[2015/01/29 v7.0 support for dozenal fonts] \RequirePackage{fixltx2e} \RequirePackage{xstring} \RequirePackage{ifpdf} @@ -130,6 +130,131 @@ \doz@multiplier=1% \doz@total=0% }% +\newcount\doz@modulus% +\def\doz@modulo#1#2{% +\doz@modulus=#1% +\divide\doz@modulus by#2% +\multiply\doz@modulus by#2% +\multiply\doz@modulus by-1% +\advance\doz@modulus by#1\relax% +}% +\newcount\doz@quotient% +\def\doz@quot#1#2{% +\doz@quotient=#1% +\divide\doz@quotient by#2% +}% +\newcount\doz@romct% +\newif\ifdoz@domancaps% +\def\doz@doman#1{% +\doz@romct=#1% +\doz@quot{\doz@romct}{1728}% +\loop\ifnum\doz@quotient>0% +\ifdoz@domancaps M\else m\fi% +\advance\doz@quotient by-1% +\advance\doz@romct by-1728% +\repeat +\ifnum\doz@romct>1440 +\ifnum\doz@romct<1584 +\ifdoz@domancaps CCM\else ccm\fi% +\advance\doz@romct by-1440 +\else%\ifnum\doz@romct>1583 +\ifdoz@domancaps CM\else cm\fi% +\advance\doz@romct by-1584 +\fi +\fi +\ifnum\doz@romct>575% +\ifnum\doz@romct<719 +\ifdoz@domancaps CCD\else ccd\fi% +\advance\doz@romct by-576 +\else +\ifnum\doz@romct<864% +\ifdoz@domancaps CD\else cd\fi% +\advance\doz@romct by-720% +\fi +\fi +\else +\ifnum\doz@romct>719 +\ifdoz@domancaps D\else d\fi% +\advance\doz@romct by-719% +\fi +\fi +\doz@quot{\doz@romct}{144}% +\loop\ifnum\doz@quotient>0% +\ifdoz@domancaps C\else c\fi% +\advance\doz@quotient by-1% +\advance\doz@romct by-144% +\repeat +\ifnum\doz@romct>119 +\ifnum\doz@romct<132 +\ifdoz@domancaps XXC\else xxc\fi% +\advance\doz@romct by-120 +\else +\ifdoz@domancaps XC\else xc\fi% +\advance\doz@romct by-132 +\fi +\fi +\ifnum\doz@romct>71 +\ifdoz@domancaps L\else l\fi% +\advance\doz@romct by-72 +\fi +\ifnum\doz@romct>47% +\ifnum\doz@romct>59% +\ifdoz@domancaps XL\else xl\fi% +\advance\doz@romct by-60% +\else +\ifdoz@domancaps XXL\else xxl\fi% +\advance\doz@romct by-48% +\fi +\fi +\doz@quot{\doz@romct}{12}% +\loop\ifnum\doz@quotient>0% +\ifdoz@domancaps X\else x\fi% +\advance\doz@quotient by-1% +\advance\doz@romct by-12% +\repeat +\doz@modulo{\doz@romct}{12}% +\ifnum\doz@modulus=10 +\ifdoz@domancaps IIX\else iix\fi% +\advance\doz@romct by-10 +\fi +\ifnum\doz@modulus=11 +\ifdoz@domancaps IX\else ix\fi% +\advance\doz@romct by-11 +\fi +\ifnum\doz@romct>5 +\ifdoz@domancaps V\else v\fi% +\advance\doz@romct by-6 +\fi +\ifnum\doz@romct>3% +\ifnum\doz@romct=4% +\ifdoz@domancaps IIV\else iiv\fi% +\advance\doz@romct by-4% +\else +\ifnum\doz@romct=5% +\ifdoz@domancaps IV\else iv\fi% +\advance\doz@romct by-5% +\fi +\ifnum\doz@romct=6% +\ifdoz@domancaps V\else v\fi% +\advance\doz@romct by-6 +\fi +\fi +\fi +\doz@quot{\doz@romct}{1}% +\loop\ifnum\doz@quotient>0% +\ifdoz@domancaps I\else i\fi% +\advance\doz@quotient by-1% +\advance\doz@romct by-1% +\repeat +} +\protected\def\doman#1{% +\doz@domancapsfalse% +\doz@doman{#1}% +}% +\protected\def\Doman#1{% +\doz@domancapstrue% +\doz@doman{#1}% +}% \@ifundefined{nocounters}{% \@ifundefined{c@page}{}{% \renewcommand\thepage{\basexii{\value{page}}{\x}{\e}}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dozenal.tlpobj new/tlpkg/tlpobj/dozenal.tlpobj --- old/tlpkg/tlpobj/dozenal.tlpobj 2016-04-14 18:56:26.000000000 +0200 +++ new/tlpkg/tlpobj/dozenal.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -1,6 +1,6 @@ name dozenal category Package -revision 37698 +revision 42608 shortdesc Typeset documents using base twelve numbering (also called "dozenal") relocated 1 longdesc The package supports typesetting documents whose counters are @@ -14,7 +14,7 @@ longdesc Britain). The fonts were designed to blend well with the longdesc Computer Modern fonts, and are available both as Metafont longdesc source and in Adobe Type 1 format. -runfiles size=168 +runfiles size=169 RELOC/fonts/afm/public/dozenal/dozchars10.afm RELOC/fonts/afm/public/dozenal/dozchars12.afm RELOC/fonts/afm/public/dozenal/dozchars17.afm @@ -127,7 +127,7 @@ RELOC/fonts/type1/public/dozenal/dozchsl9.pfb RELOC/tex/latex/dozenal/dozenal.sty catalogue-ctan /fonts/dozenal -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-30 08:27:35 +0100 catalogue-license lppl1.3 catalogue-topics font font-specialist font-mf font-type1 -catalogue-version 6.0 +catalogue-version 7.0 ++++++ dpfloat.doc.tar.xz ++++++ ++++++ dpfloat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dpfloat.tlpobj new/tlpkg/tlpobj/dpfloat.tlpobj --- old/tlpkg/tlpobj/dpfloat.tlpobj 2016-04-14 18:56:27.000000000 +0200 +++ new/tlpkg/tlpobj/dpfloat.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/dpfloat/dpfloat.sty catalogue-ctan /macros/latex/contrib/dpfloat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics float ++++++ dprogress.doc.tar.xz ++++++ ++++++ dprogress.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dprogress.tlpobj new/tlpkg/tlpobj/dprogress.tlpobj --- old/tlpkg/tlpobj/dprogress.tlpobj 2016-04-14 18:56:27.000000000 +0200 +++ new/tlpkg/tlpobj/dprogress.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/dprogress/dprogress.sty catalogue-ctan /macros/latex/contrib/dprogress -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.1 ++++++ drac.doc.tar.xz ++++++ ++++++ drac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drac.tlpobj new/tlpkg/tlpobj/drac.tlpobj --- old/tlpkg/tlpobj/drac.tlpobj 2016-04-14 18:56:28.000000000 +0200 +++ new/tlpkg/tlpobj/drac.tlpobj 2017-04-14 17:38:06.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/drac/drac.sty catalogue-ctan /macros/latex/contrib/drac -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 ++++++ draftcopy.doc.tar.xz ++++++ ++++++ draftcopy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftcopy.tlpobj new/tlpkg/tlpobj/draftcopy.tlpobj --- old/tlpkg/tlpobj/draftcopy.tlpobj 2016-04-14 18:56:28.000000000 +0200 +++ new/tlpkg/tlpobj/draftcopy.tlpobj 2017-04-14 17:38:07.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/draftcopy/draftcopy.cfg RELOC/tex/latex/draftcopy/draftcopy.sty catalogue-ctan /macros/latex/contrib/draftcopy -catalogue-date 2015-08-09 10:51:45 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics editorial catalogue-version 2.16 ++++++ draftwatermark.doc.tar.xz ++++++ ++++++ draftwatermark.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftwatermark.tlpobj new/tlpkg/tlpobj/draftwatermark.tlpobj --- old/tlpkg/tlpobj/draftwatermark.tlpobj 2016-04-14 18:56:28.000000000 +0200 +++ new/tlpkg/tlpobj/draftwatermark.tlpobj 2017-04-14 17:38:07.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/draftwatermark/draftwatermark.sty catalogue-also eso-pic catalogue-ctan /macros/latex/contrib/draftwatermark -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.2 ++++++ dramatist.doc.tar.xz ++++++ ++++++ dramatist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dramatist.tlpobj new/tlpkg/tlpobj/dramatist.tlpobj --- old/tlpkg/tlpobj/dramatist.tlpobj 2016-04-14 18:56:28.000000000 +0200 +++ new/tlpkg/tlpobj/dramatist.tlpobj 2017-04-14 17:38:07.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/dramatist/dramatist.sty catalogue-also sides catalogue-ctan /macros/latex/contrib/dramatist -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 catalogue-version 1.2e ++++++ dratex.doc.tar.xz ++++++ ++++++ dratex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dratex.tlpobj new/tlpkg/tlpobj/dratex.tlpobj --- old/tlpkg/tlpobj/dratex.tlpobj 2016-04-14 18:56:29.000000000 +0200 +++ new/tlpkg/tlpobj/dratex.tlpobj 2017-04-14 17:38:07.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/generic/dratex/TeXProject.sty RELOC/tex/generic/dratex/wotree.sty catalogue-ctan /graphics/dratex -catalogue-date 2016-04-01 09:14:01 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex ++++++ drawmatrix.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/drawmatrix/README.md new/doc/latex/drawmatrix/README.md --- old/doc/latex/drawmatrix/README.md 2015-12-01 00:00:12.000000000 +0100 +++ new/doc/latex/drawmatrix/README.md 2017-06-06 01:10:52.000000000 +0200 @@ -1,6 +1,8 @@ drawmatrix ========== +[![Build Status](https://travis-ci.org/elmar-peise/drawmatrix.svg?branch=master)](ht… + drawmatrix provides macros to visually represent matrices. Various options allow to change the visualizations, e.g., drawing rectangular, triangular, or banded matrices. Binary files old/doc/latex/drawmatrix/drawmatrix.pdf and new/doc/latex/drawmatrix/drawmatrix.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drawmatrix.doc.tlpobj new/tlpkg/tlpobj/drawmatrix.doc.tlpobj --- old/tlpkg/tlpobj/drawmatrix.doc.tlpobj 2016-04-14 18:56:29.000000000 +0200 +++ new/tlpkg/tlpobj/drawmatrix.doc.tlpobj 2017-06-06 02:21:52.000000000 +0200 @@ -1,8 +1,8 @@ name drawmatrix.doc category Package -revision 38980 +revision 44471 shortdesc doc files of drawmatrix relocated 1 -docfiles size=70 +docfiles size=78 RELOC/doc/latex/drawmatrix/README.md RELOC/doc/latex/drawmatrix/drawmatrix.pdf ++++++ drawmatrix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/drawmatrix/drawmatrix.sty new/tex/latex/drawmatrix/drawmatrix.sty --- old/tex/latex/drawmatrix/drawmatrix.sty 2015-12-01 00:00:12.000000000 +0100 +++ new/tex/latex/drawmatrix/drawmatrix.sty 2017-06-06 01:10:52.000000000 +0200 @@ -8,19 +8,23 @@ %% %% This is a generated file. %% -%% Copyright (C) 2015 by Elmar Peise +%% Copyright (C) 2017 by Elmar Peise %% %% This package is distributed under the MIT license. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{drawmatrix}[2015/11/26 v1.1.0 drawmatrix package] +\ProvidesPackage{drawmatrix}[2017/06/05 v1.5.0 drawmatrix package] \RequirePackage{tikz} \newif\ifdrawmatrix@externalize \pgfkeys{ drawmatrix/.is family, drawmatrix/.cd, picture/.style={}, + path/.style={}, baseline/.style={picture/.append style={baseline=(drawmatrix #1)}}, + scale/.style={path/.append style={scale=#1}}, + x/.style={path/.append style={x=#1}}, + y/.style={path/.append style={y=#1}}, baseline=label.base, bbox/.style={}, bbox style/.style={bbox/.append style={#1}}, @@ -41,121 +45,225 @@ banded/.style={lower banded, upper banded}, lower/.style={upper bandwidth=0}, upper/.style={lower bandwidth=0}, - diag/.style={lower, upper}, - externalize/.is if=drawmatrix@externalize, - externalize=true, + diag/.style={bandwidth=0}, + label text/.initial, label/.style={}, label pos/.style={label/.append style={at=(drawmatrix #1)}}, label pos=bbox.center, label anchor/.style={label/.append style={anchor=#1}}, label anchor=mid, + label base/.initial, + label outer/.style={}, + label base anchor/.style={label outer/.append style={ + anchor=#1, at=(drawmatrix label.#1) + }}, + label base anchor=base west, + exponent/.style={ + label base/.expanded=\pgfkeysvalueof{/drawmatrix/label text}, + label text/.append=^{#1} + }, drawmatrix/.style={}, .unknown/.code={% - \let\@currname\pgfkeyscurrentname% - \let\@currval\pgfkeyscurrentvalue% + \let\dm@currname\pgfkeyscurrentname% + \let\dm@currval\pgfkeyscurrentvalue% \ifx#1\pgfkeysnovalue\pgfkeysalso{ - drawmatrix/.append style/.expand once={\@currname} + drawmatrix/.append style/.expand once={\dm@currname} }\else\pgfkeysalso{ drawmatrix/.append style/.expand twice={% - \expandafter\@currname\expandafter=\@currval% + \expandafter\dm@currname\expandafter=\dm@currval% } }\fi% }, every picture/.style={}, every bbox/.style={ name=drawmatrix bbox, - inner sep=0, + inner sep=0 }, every drawmatrix/.style={ fill=white, - draw=gray, + draw=gray }, every label/.style={ name=drawmatrix label, outer sep=0, + inner sep=0 + }, + every node/.style={ + name=drawmatrix matrix, + outer sep=0, inner sep=0, - } -} -\newcommand\drawmatrixset[1]{\pgfqkeys{/drawmatrix}{#1}} -\newcommand\drawmatrix[2][]{{% - \ifmmode\def\@labeltext{$#2$}\else\def\@labeltext{#2}\fi% - \drawmatrixset{#1}% - \ifdrawmatrix@externalize\else% - \ifx\tikz@library@external@loaded\undefined\else% - \tikzset{external/export=false}% - \fi% - \fi% - \pgfqkeys{/drawmatrix}{ - height/.get=\@height, - width/.get=\@width, - lower bandwidth/.get=\@lowerbandwidth, - upper bandwidth/.get=\@upperbandwidth, - offset height/.get=\@offsetheight, - offset width/.get=\@offsetwidth, - bbox height/.get=\@bboxheight, - bbox width/.get=\@bboxwidth, - }% - \pgfmathsetmacro\@height{\@height + 0.0}% - \pgfmathsetmacro\@width{\@width + 0.0}% - \pgfmathsetmacro\@minsize{min(\@width, \@height)}% - \pgfmathsetmacro\(a)zero{0.0}% - \expandafter\ifx\@lowerbandwidth\pgfkeysnovalue% - \edef\@lowerbandwidth{\@minsize}% - \fi% - \expandafter\ifx\@upperbandwidth\pgfkeysnovalue% - \edef\@upperbandwidth{\@minsize}% - \fi% - \pgfmathsetmacro\@lowerbandwidth{min(\@minsize, \@lowerbandwidth)}% - \pgfmathsetmacro\@upperbandwidth{min(\@minsize, \@upperbandwidth)}% - \expandafter\ifx\@bboxheight\pgfkeysnovalue% - \pgfmathsetmacro\@bboxheight{\@height + \@offsetheight}% - \fi% - \expandafter\ifx\@bboxwidth\pgfkeysnovalue% - \pgfmathsetmacro\@bboxwidth{\@width + \@offsetwidth}% + anchor=north west, + at=(drawmatrix north west) + }, + externalize/.is if=drawmatrix@externalize, + externalize=true, + pre code/.code={}, + post setup code/.code={}, + pre coordinate code/.code={}, + post coordinate code/.code={}, + pre draw code/.code={}, + post draw code/.code={}, + pre label code/.code={}, + post label code/.code={}, + post code/.code={}, + setup label code/.code={ + \ifmmode\edef\dm@labeltext{$\dm@labeltext$}\fi% + \expandafter\ifx\dm@labelbase\pgfkeysnovalue\else% + \let\dm@labeltextouter\dm@labeltext% + \edef\dm@labelbase{% + \ifmmode$\dm@labelbase$\else\dm@labelbase\fi% + }% + \def\dm@labeltext{\phantom{\dm@labelbase}}% \fi% - \begin{tikzpicture}[/drawmatrix/every picture, /drawmatrix/picture] + }, + externalization code/.code={ + \ifdrawmatrix@externalize\else% + \ifx\tikz@library@external@loaded\undefined\else% + \tikzset{external/export=false}% + \fi% + \fi% + }, + setup sizes code/.code={ + \path[/drawmatrix/path] (\dm@width, \dm@height); + \pgfgetlastxy\dm@width\dm@height + \path[/drawmatrix/path] (\dm@offsetwidth, \dm@offsetheight); + \pgfgetlastxy\dm@offsetwidth\dm@offsetheight + \pgfmathsetlengthmacro\dm@minsize{min(\dm@width, \dm@height)} + \pgfmathsetlengthmacro\dm(a)zero{0.0} + \expandafter\ifx\dm@lowerbandwidth\pgfkeysnovalue + \def\dm@lowerbandwidth{\dm@minsize} + \else + \path[/drawmatrix/path] (\dm@lowerbandwidth, 0); + \pgfgetlastxy\dm@lowerbandwidth\dm@zero + \fi + \expandafter\ifx\dm@upperbandwidth\pgfkeysnovalue + \def\dm@upperbandwidth{\dm@minsize} + \else + \path[/drawmatrix/path] (0, \dm@upperbandwidth); + \pgfgetlastxy\dm@zero\dm@upperbandwidth + \fi + \pgfmathsetlengthmacro\dm@lowerbandwidth{ + min(\dm@minsize, \dm@lowerbandwidth) + } + \pgfmathsetlengthmacro\dm@upperbandwidth{ + min(\dm@minsize, \dm@upperbandwidth) + } + \expandafter\ifx\dm@bboxheight\pgfkeysnovalue + \pgfmathsetlengthmacro\dm@bboxheight{ + \dm@height + \dm@offsetheight + } + \else + \path[/drawmatrix/path] (0, \dm@bboxheight); + \pgfgetlastxy\dm@zero\dm@bboxheight + \fi + \expandafter\ifx\dm@bboxwidth\pgfkeysnovalue + \pgfmathsetlengthmacro\dm@bboxwidth{ + \dm@width + \dm@offsetwidth + } + \else + \path[/drawmatrix/path] (\dm@bboxwidth, 0); + \pgfgetlastxy\dm@bboxwidth\dm@zero + \fi + }, + bbox code/.code={ + \pgfresetboundingbox \node[/drawmatrix/every bbox, /drawmatrix/bbox, - minimum height=\@bboxheight cm, - minimum width=\@bboxwidth cm] {}; + minimum height=\dm@bboxheight, + minimum width=\dm@bboxwidth] {}; + }, + coordinate code/.code={ \path (drawmatrix bbox.north west) - ++(\@offsetwidth, -\@offsetheight) + ++(\dm@offsetwidth, -\dm@offsetheight) ++(.5\pgflinewidth, -.5\pgflinewidth) coordinate (drawmatrix north west) - ++(\@width, 0) - +(-\@minsize + \@upperbandwidth, 0) + ++(\dm@width, 0) + +(-\dm@minsize + \dm@upperbandwidth, 0) coordinate (drawmatrix north) - +(0, -\@minsize + \@upperbandwidth) + +(0, -\dm@minsize + \dm@upperbandwidth) coordinate (drawmatrix east) - ++(0, -\@height) + ++(0, -\dm@height) coordinate (drawmatrix south east) - ++(-\@width, 0) - +(\@minsize - \@lowerbandwidth, 0) + ++(-\dm@width, 0) + +(\dm@minsize - \dm@lowerbandwidth, 0) coordinate (drawmatrix south) - +(0, \@minsize - \@lowerbandwidth) + +(0, \dm@minsize - \dm@lowerbandwidth) coordinate (drawmatrix west); + }, + node code/.code={ + \node[/drawmatrix/every node, + minimum height=\dm@height, + minimum width=\dm@width] {}; + }, + draw code/.code={ \filldraw[/drawmatrix/every drawmatrix, /drawmatrix/drawmatrix] (drawmatrix north west) - \ifx\@upperbandwidth\@zero - \ifx\@width\@minsize\else -- (drawmatrix north) \fi - \ifx\@height\@minsize\else -- (drawmatrix east) \fi + \ifx\dm@upperbandwidth\dm@zero + \ifx\dm@width\dm@minsize\else -- (drawmatrix north) \fi + \ifx\dm@height\dm@minsize\else -- (drawmatrix east) \fi \else -- (drawmatrix north) - \ifx\@upperbandwidth\@minsize\else -- (drawmatrix east) \fi + \ifx\dm@upperbandwidth\dm@minsize\else + -- (drawmatrix east) + \fi \fi -- (drawmatrix south east) - \ifx\@lowerbandwidth\@zero - \ifx\@width\@minsize\else -- (drawmatrix south) \fi - \ifx\@height\@minsize\else -- (drawmatrix west) \fi + \ifx\dm@lowerbandwidth\dm@zero + \ifx\dm@width\dm@minsize\else -- (drawmatrix south) \fi + \ifx\dm@height\dm@minsize\else -- (drawmatrix west) \fi \else -- (drawmatrix south) - \ifx\@lowerbandwidth\@minsize\else -- (drawmatrix west) \fi + \ifx\dm@lowerbandwidth\dm@minsize\else + -- (drawmatrix west) + \fi \fi -- cycle; - \node[minimum height=\@height cm, minimum width=\@width cm, - anchor=north west] at (drawmatrix north west) - (drawmatrix matrix) {}; - \node[/drawmatrix/every label, /drawmatrix/label] {\@labeltext}; + }, + label code/.code={ + \node[/drawmatrix/every label, /drawmatrix/label] + {\dm@labeltext}; + \expandafter\ifx\dm@labelbase\pgfkeysnovalue\else + \node[/drawmatrix/every label, /drawmatrix/label, + /drawmatrix/label outer] {\dm@labeltextouter}; + \fi + } +} +\newcommand\drawmatrixset[1]{\pgfqkeys{/drawmatrix}{#1}} +\newcommand\drawmatrix[2][]{{% + \drawmatrixset{ + label text={#2}, + #1, + label text/.get=\dm@labeltext, + height/.get=\dm@height, + width/.get=\dm@width, + lower bandwidth/.get=\dm@lowerbandwidth, + upper bandwidth/.get=\dm@upperbandwidth, + offset height/.get=\dm@offsetheight, + offset width/.get=\dm@offsetwidth, + bbox height/.get=\dm@bboxheight, + bbox width/.get=\dm@bboxwidth, + label base/.get=\dm@labelbase, + pre code, + setup label code, + externalization code + }% + \begin{tikzpicture}[/drawmatrix/every picture, /drawmatrix/picture] + \drawmatrixset{ + setup sizes code, + post setup code, + bbox code, + pre coordinate code, + coordinate code, + post coordinate code, + node code, + pre draw code, + draw code, + post draw code, + pre label code, + label code, + post label code + } \end{tikzpicture}% + \drawmatrixset{post code}% }} \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drawmatrix.tlpobj new/tlpkg/tlpobj/drawmatrix.tlpobj --- old/tlpkg/tlpobj/drawmatrix.tlpobj 2016-04-14 18:56:29.000000000 +0200 +++ new/tlpkg/tlpobj/drawmatrix.tlpobj 2017-06-06 02:21:53.000000000 +0200 @@ -1,15 +1,15 @@ name drawmatrix category Package -revision 38980 +revision 44471 shortdesc Draw visual representations of matrices in LaTeX relocated 1 longdesc The package provides macros to visually represent matrices. longdesc Various options allow to change the visualizations, e.g., longdesc drawing rectangular, triangular, or banded matrices. -runfiles size=2 +runfiles size=3 RELOC/tex/latex/drawmatrix/drawmatrix.sty catalogue-ctan /macros/latex/contrib/drawmatrix -catalogue-date 2016-02-02 05:57:37 +0100 -catalogue-license other-free +catalogue-date 2017-06-05 22:45:20 +0200 +catalogue-license mit catalogue-topics matrix -catalogue-version 1.1.0 +catalogue-version 1.5.0 ++++++ drawstack.doc.tar.xz ++++++ ++++++ drawstack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drawstack.tlpobj new/tlpkg/tlpobj/drawstack.tlpobj --- old/tlpkg/tlpobj/drawstack.tlpobj 2016-04-14 18:56:29.000000000 +0200 +++ new/tlpkg/tlpobj/drawstack.tlpobj 2017-04-14 17:38:07.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=2 RELOC/tex/latex/drawstack/drawstack.sty catalogue-ctan /macros/latex/contrib/drawstack -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics comp-sci graphics-use ++++++ drm.doc.tar.xz ++++++ ++++++ drm.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-g/drm.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-g.new/drm.tar.xz differ: char 26, line 1 ++++++ droid.doc.tar.xz ++++++ ++++++ droid.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droid.tlpobj new/tlpkg/tlpobj/droid.tlpobj --- old/tlpkg/tlpobj/droid.tlpobj 2016-04-14 18:56:57.000000000 +0200 +++ new/tlpkg/tlpobj/droid.tlpobj 2017-04-14 17:38:19.000000000 +0200 @@ -546,7 +546,7 @@ RELOC/tex/latex/droid/x2fdr.fd RELOC/tex/latex/droid/x2fds.fd catalogue-ctan /fonts/droid -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-sans font-mono font-supp font-ttf font-type1 catalogue-version 2.1 ++++++ droit-fr.doc.tar.xz ++++++ ++++++ droit-fr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droit-fr.tlpobj new/tlpkg/tlpobj/droit-fr.tlpobj --- old/tlpkg/tlpobj/droit-fr.tlpobj 2016-04-14 18:57:03.000000000 +0200 +++ new/tlpkg/tlpobj/droit-fr.tlpobj 2017-04-14 17:38:21.000000000 +0200 @@ -5,15 +5,15 @@ relocated 1 longdesc The bundle provides a toolkit intended for students writing a longdesc thesis in French law. It features: a LaTeX document class; a -longdesc bibliographic style for Biblatex package; a practical example +longdesc bibliographic style for BibLaTeX package; a practical example longdesc of french thesis document; and documentation. The class assumes -longdesc use of biber and biblatex. +longdesc use of biber and BibLaTeX. runfiles size=10 RELOC/tex/latex/droit-fr/droit-fr.bbx RELOC/tex/latex/droit-fr/droit-fr.cbx RELOC/tex/latex/droit-fr/droit-fr.cls catalogue-ctan /macros/latex/contrib/droit-fr -catalogue-date 2016-02-20 20:07:35 +0100 +catalogue-date 2016-07-05 18:29:32 +0200 catalogue-license lppl1.3 catalogue-topics dissertation legal biblatex french class catalogue-version 1.2 ++++++ drs.doc.tar.xz ++++++ ++++++ drs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drs.tlpobj new/tlpkg/tlpobj/drs.tlpobj --- old/tlpkg/tlpobj/drs.tlpobj 2016-04-14 18:57:04.000000000 +0200 +++ new/tlpkg/tlpobj/drs.tlpobj 2017-04-14 17:38:21.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=3 RELOC/tex/latex/drs/drs.sty catalogue-ctan /macros/latex/contrib/drs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics linguistic catalogue-version 1.1b ++++++ drv.doc.tar.xz ++++++ ++++++ drv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/drv.tlpobj new/tlpkg/tlpobj/drv.tlpobj --- old/tlpkg/tlpobj/drv.tlpobj 2016-04-14 18:57:04.000000000 +0200 +++ new/tlpkg/tlpobj/drv.tlpobj 2017-04-14 17:38:21.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=21 RELOC/metapost/drv/drv.mp catalogue-ctan /graphics/metapost/contrib/macros/drv -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 0.97 ++++++ dsptricks.doc.tar.xz ++++++ ++++++ dsptricks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dsptricks.tlpobj new/tlpkg/tlpobj/dsptricks.tlpobj --- old/tlpkg/tlpobj/dsptricks.tlpobj 2016-04-14 18:57:04.000000000 +0200 +++ new/tlpkg/tlpobj/dsptricks.tlpobj 2017-04-14 17:38:22.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/dsptricks/dspfunctions.sty RELOC/tex/latex/dsptricks/dsptricks.sty catalogue-ctan /graphics/pstricks/contrib/dsptricks -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pstricks catalogue-version 1.0 ++++++ dtk.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dtk/README.md new/doc/latex/dtk/README.md --- old/doc/latex/dtk/README.md 2016-03-11 00:22:57.000000000 +0100 +++ new/doc/latex/dtk/README.md 2017-06-07 23:24:40.000000000 +0200 @@ -2,4 +2,4 @@ LaTeX class for the journal »Die TeXnische Komödie« (new implementation). -Rolf Niepraschk, Rolf.Niepraschk(a)gmx.de +Rolf Niepraschk <Rolf.Niepraschk(a)gmx.de> and Herbert Voss <Herbert(a)dante.de> Binary files old/doc/latex/dtk/doc/beispiel.pdf and new/doc/latex/dtk/doc/beispiel.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dtk/doc/beispiel.tex new/doc/latex/dtk/doc/beispiel.tex --- old/doc/latex/dtk/doc/beispiel.tex 2016-03-11 00:22:57.000000000 +0100 +++ new/doc/latex/dtk/doc/beispiel.tex 2017-04-11 00:03:23.000000000 +0200 @@ -11,14 +11,14 @@ \begin{document} \title{Die \texttt{dtk}-Klasse, Version \DTKversion -- \DTKversiondate} -\Author{Herbert}{Voß} - {Wasgenstraße~21\\ +\Author{Mustermann}{Max}% + {Dorfstraße~1\\ 14129 Berlin\\ - \Email{herbert(a)dante.de}} -\Author{Rolf}{Niepraschk}% - {Persiusstr.~12\\ + \Email{Max.Mustermann(a)xyz.de}} +\Author{Peter}{Silie}% + {Hauptstr.~2\\ 10245~Berlin\\ - \Email{Rolf.Niepraschk(a)gmx.de}} + \Email{Peter.Silie(a)abc.de}} \maketitle \section{Makros} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dtk/doc/dtk-extern-test.tex new/doc/latex/dtk/doc/dtk-extern-test.tex --- old/doc/latex/dtk/doc/dtk-extern-test.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dtk/doc/dtk-extern-test.tex 2017-06-07 23:24:40.000000000 +0200 @@ -0,0 +1,226 @@ +\documentclass[ngerman]{dtk} +\ifluatex\else + \usepackage[utf8]{inputenc} +\fi + +\usepackage{dtk-extern} +\makeatletter +\edef\dtkFileversion{\@nameuse{ver@dtk-extern}} +\makeatother +\begin{document} +\title[Externe Dokumente erzeugen]{\dtkFileversion~-- Externe Dokumente aus \LaTeX\ heraus definieren und das Ergebnis einbinden, } +\Author{Herbert}{Voß}{\Email{herbert(a)dante.de}} +\maketitle + +\section{Syntax} + +\begin{verbatim} +\usepackage{dtk-extern} +\end{verbatim} + +Das Paket wird standardmäßig bei Verwendung der Klasse \texttt{dtk} geladen. +Externe \LaTeX-, \ConTeXt-, \ldots\ Dokumente lassen sich mit der folgenden +Umgebung erzeugen: + + + +\begin{verbatim} +\begin{externalDocument}[<optionale Argumente>]{<externer Dateiname ohne .tex>} +... +Quellcode +... +\end{externalDocument} +\end{verbatim} + +Das Hauptdocument \emph{muss} mit der Option \texttt{-shell-escape} aufgerufen werden. + + +\section{Beispiele} + +\begin{minipage}{.3\linewidth} +\begin{externalDocument}[grfOptions={width=0.5\linewidth},compiler=pdflatex,force,cleanup]{Roemer1} +\documentclass{standalone} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{libertine} +\usepackage[linguistics]{forest} +\forestapplylibrarydefaults{linguistics, edges} +\begin{document} +\begin{forest} +[VP + [DP] + [V’ + [V] + [DP] + ] +] +\end{forest} +\end{document} +\end{externalDocument} +\end{minipage} +\begin{minipage}{.3\linewidth} +\begin{lstlisting} +\begin{forest} +[VP + [DP] + [V’ + [V] + [DP] + ] +] +\end{forest} +\end{lstlisting} +\end{minipage} \quad oder \quad +\begin{minipage}{.2\linewidth} +\begin{lstlisting} +\Forest*{ +[VP + [DP] + [V’ + [V] + [DP] + ] +] +} +\end{lstlisting} +\end{minipage} + + +\begin{minipage}{0.35\textwidth} +\begin{externalDocument}[grfOptions={width=\linewidth},compiler=xelatex, + crop,cleanup,force]{Senger3} +\documentclass{article} +\usepackage{tikz} +\usepackage[hks,pantone,xcolor]{xespotcolor} +\pagestyle{empty} +\begin{document} +\SetPageColorSpace{HKS} +\definecolor{HYellow}{spotcolor}{HKS05N,0.5} +\definecolor{HRed}{spotcolor}{HKS14N,0.5} +\definecolor{HBlue}{spotcolor}{HKS38N,0.5} +\begin{tikzpicture}[scale=0.7,fill opacity=0.7] + \fill[HYellow] ( 90:1.2) circle (2); + \fill[HRed] (210:1.2) circle (2); + \fill[HBlue] (330:1.2) circle (2); + \node at ( 90:2) {Typography}; +\node at ( 210:2) {Design}; +\node at ( 330:2) {Coding}; +\node {\LaTeX}; +\end{tikzpicture} +\end{document} +\end{externalDocument} +\end{minipage} +\hfill +\begin{minipage}{0.64\textwidth} +\begin{lstlisting} +\SetPageColorSpace{HKS} +\definecolor{HYellow}{spotcolor}{HKS05N,0.5} +\definecolor{HRed}{spotcolor}{HKS14N,0.5} +\definecolor{HBlue}{spotcolor}{HKS38N,0.5} +\begin{tikzpicture}[scale=0.7,fill opacity=0.7] +\fill[HYellow]( 90:1.2) circle (2); +\fill[HRed] (210:1.2) circle (2); +\fill[HBlue] (330:1.2) circle (2); +\node at ( 90:2) {Typography}; +\node at ( 210:2) {Design}; +\node at ( 330:2) {Coding}; +\node {\LaTeX}; +\end{tikzpicture} +\end{lstlisting} +\end{minipage} + + +\section{Optionale Argumente} + + +\begin{verbatim} + code=false,% show Source Code + crop=false,% erzeugte PDF "croppen" + compiler=pdflatex,% zu verwendener Compiler + grfOptions={},% Optionen der einzubindenden Grafik + lstOptions={},% Optionen für das Listing + includegraphic=true,% Grafik einbinden oder User überlassen + runs=1,% Anzahl Compiler-Durchläufe + runsequence={},% Im Moment nicht aktiv + biber=false,% Biber laufen lassen? + force=false,% Compiler, auch wenn PDF existiert? + frame=false,% keinen Rahmen um Abbildung + float=false,% nicht als Gleitumgebung + caption=,% keine Caption + label=,% kein Label + pages=1,% welche Seiten auszugeben sind + docType=latex,% LaTeX example Code +\end{verbatim} + +\begin{externalDocument}[ + grfOptions={width=0.48\linewidth}, + pages={1,3}, + frame,compiler=pdflatex, +% crop, + force,runs=2,code,docType=latex, + frame, + lstOptions={columns=fixed}]{Schubert-A} +%StartVisiblePreamble +\documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrbook} +\DeclareNewSectionCommand[ + style=section, + level=4, + beforeskip=-3.25ex plus -1ex minus -.2ex, + afterskip=1.5ex plus .2ex, + font=\normalsize, + indent=0pt, + counterwithin=subsubsection +]{subsubsubsection} +\RedeclareSectionCommand[ + level=5, + toclevel=5, + tocindent=13em, + tocnumwidth=5.9em, + counterwithin=subsubsubsection +]{paragraph} +\RedeclareSectionCommand[ + level=6, + toclevel=6, + tocindent=15em, + tocnumwidth=6.8em +]{subparagraph} +\setcounter{secnumdepth}{\subsubsubsectionnumdepth} +\setcounter{tocdepth}{\subsubsubsectiontocdepth} +%StopVisiblePreamble +\usepackage[ngerman]{babel} +\usepackage[utf8]{inputenc} +\usepackage{libertine} +\usepackage{blindtext} +\begin{document} +\tableofcontents +\chapter{Einführung} +\section{Ein Abschnitt} +\subsection{Ein Unterabschnitt} +\subsubsection{Ein Unter-Unterabschnitt} +\subsubsubsection{Ein Unter-Unter-Unterabschnitt} +\paragraph{Der normale Paragraph} +\blindtext +\subparagraph{Der normale Unterparagraph} +\blindtext +\blinddocument +\end{document} +\end{externalDocument} + + +\section{Ausgabe des Quellcodes} +Die Ausgabe des Quellcodes erzeugt im Allgemeinen partiell. Die beiden Marker + +\begin{verbatim} +[...] +%StartVisiblePreamble +[... auszugebene Präambelteil] +%StopVisiblePreamble +[...] +\end{verbatim} + +begrenzen den Teil der ausgegeben werden soll. Aus dem Textkörper wird alles +zwischen \verb|\begin{document}| und \verb|\end{document}| ausgegeben. + +\end{document} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtk.doc.tlpobj new/tlpkg/tlpobj/dtk.doc.tlpobj --- old/tlpkg/tlpobj/dtk.doc.tlpobj 2016-05-09 03:15:37.000000000 +0200 +++ new/tlpkg/tlpobj/dtk.doc.tlpobj 2017-06-08 02:21:38.000000000 +0200 @@ -1,13 +1,14 @@ name dtk.doc category Package -revision 40958 +revision 44524 shortdesc doc files of dtk relocated 1 -docfiles size=30 +docfiles size=31 RELOC/doc/latex/dtk/README.md RELOC/doc/latex/dtk/doc/beispiel.bib RELOC/doc/latex/dtk/doc/beispiel.pdf RELOC/doc/latex/dtk/doc/beispiel.tex + RELOC/doc/latex/dtk/doc/dtk-extern-test.tex RELOC/doc/latex/dtk/dtk-ruecken.tex RELOC/doc/latex/dtk/dtk.nolig RELOC/doc/latex/dtk/dtk.xdy ++++++ dtk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-extern.sty new/tex/latex/dtk/dtk-extern.sty --- old/tex/latex/dtk/dtk-extern.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/dtk/dtk-extern.sty 2017-06-07 23:24:40.000000000 +0200 @@ -0,0 +1,155 @@ +%% This is file `dtk-extern.sty', +%% +%% LaTeX package for ``Die TeXnische Komoedie''. +%% +%% Copyright (C) 2016- +%% Rolf Niepraschk, Herbert Voss +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% 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. + +\ProvidesFile{dtk-extern}% + [2017/06/04 v0.06: dtk package for running external documents (HV)] + +\RequirePackage{shellesc,filecontents,xkeyval,graphicx} + +\newcounter{dtk@extern@runs} +\define@key{dtk}{compiler}[pdflatex]{\def\dtk@extern@compiler{#1}} +\define@key{dtk}{runsequence}[]{\def\dtk@extern@runsequence{#1}} +\define@key{dtk}{runs}[1]{\setcounter{dtk@extern@runs}{#1}} +\define@key{dtk}{grfOptions}[]{\def\dtk@extern@grfOptions{#1}} +\define@key{dtk}{lstOptions}[]{\def\dtk@extern@lstOptions{#1}} +\define@key{dtk}{docType}[latex]{\def\dtk@extern@docType{#1}} +\define@key{dtk}{caption}[]{\def\dtk@extern@caption{#1}} +\define@key{dtk}{label}[]{\def\dtk@extern@label{#1}} +\define@key{dtk}{pages}[1]{\def\dtk@extern@pages{#1}} +\define@boolkey{dtk}[dtk@extern@]{code}[true]{} +\define@boolkey{dtk}[dtk@extern@]{force}[true]{} +\define@boolkey{dtk}[dtk@extern@]{crop}[true]{} +\define@boolkey{dtk}[dtk@extern@]{biber}[true]{} +\define@boolkey{dtk}[dtk@extern@]{includegraphic}[true]{} +\define@boolkey{dtk}[dtk@extern@]{frame}[true]{} +\define@boolkey{dtk}[dtk@extern@]{float}[true]{} +\define@boolkey{dtk}[dtk@extern@]{cleanup}[true]{} + +\def\ResetKeys{% + \setkeys{dtk}{ + code=false,% show Code + crop=false,% erzeugte PDF "croppen" + compiler=pdflatex,% zu verwendener Compiler + grfOptions={},% Optionen der einzubindenden Grafik + lstOptions={},% Optionen für das Listing + includegraphic=true,% Grafik einbinden oder User überlassen + runs=1,% Anzahl Compiler-Durchläufe + runsequence={},% Im Moment nicht aktiv + biber=false,% Biber laufen lassen? + force=false,% Compiler, auch wenn PDF existiert? + frame=false,% keinen Rahmen um Abbildung + float=false,% nicht als Gleitumgebung + caption=,% keine Caption + label=,% kein Label + pages=1,% welche Seiten auszugeben sind + docType=latex,% LaTeX example Code + cleanup=false,% Hilfsdateien nicht löschen + } +} +\ResetKeys + +{\catcode`\%=12 + \gdef\perCent{%} + \gdef\DoubleperCent{%%} +} + +\newcommand\ExampleType[5]{% + \@namedef{#1@initText}{linerange=#2-#3,includerangemarker=false}% text + \@namedef{#1@initPreamble}{linerange=#4-#5,includerangemarker=false}% code +} + +\ExampleType{latex}% #1 + {begin\string{document\string}}% #2 + {end\string{document\string}}% #3 + {\perCent StartVisiblePreamble}% #4 + {\perCent StopVisiblePreamble}% #5 + +\ExampleType{context} + {\string\starttext} + {\string\stoptext} + {\perCent StartVisiblePreamble} + {\perCent StopVisiblePreamble} + +%% +%% [#1]: Optionen #2: Dateiname +%% +\newenvironment{ErstelleGrafik}[2][] + {\global\setkeys{dtk}{#1}% \begin + \gdef\dtk@extern@dateiname{#2}% + \begingroup + \(a)nameuse{filecontents*}{#2.tex} + } + {\@nameuse{endfilecontents*}% \end + \endgroup + \loop\ifnum\thedtk@extern@runs>0 + \typeout{Run: \thedtk@extern@runs\space \dtk@extern@compiler\space\dtk@extern@dateiname}% + \ShellEscape{\dtk@extern@compiler\space\dtk@extern@dateiname}% + \addtocounter{dtk@extern@runs}{-1}% + \repeat + \ifdtk@extern@code + \expandafter\edef\expandafter\dtk@lst@options@preamble\expandafter{% + \@nameuse{\dtk@extern@docType @initPreamble}, + \dtk@extern@lstOptions, + backgroundcolor=\noexpand\color{black!12}}% + \expandafter\lstinputlisting\expandafter[\dtk@lst@options@preamble]{\dtk@extern@dateiname} +% + \expandafter\edef\expandafter\dtk@lst@options@text\expandafter{% + \@nameuse{\dtk@extern@docType @initText}, + \dtk@extern@lstOptions, + backgroundcolor=\noexpand\color{black!8}}% + \typeout{\dtk@lst@options@text} + \expandafter\lstinputlisting\expandafter[\dtk@lst@options@text]{\dtk@extern@dateiname} + \fi + \expandafter\IfFileExists\expandafter{\dtk@extern@dateiname.pdf}% + {\ifdtk@extern@force + \ifdtk@extern@biber + \ShellEscape{biber \dtk@extern@dateiname}% NAch biber nochmal latex + \ShellEscape{\dtk@extern@compiler\space\dtk@extern@dateiname}% + \fi + \ifdtk@extern@crop + \ShellEscape{pdfcrop \dtk@extern@dateiname}% + \ShellEscape{mv \dtk@extern@dateiname-crop.pdf \dtk@extern@dateiname.pdf}% + \fi + \fi + }{} + \ifdtk@extern@includegraphic + \ifdtk@extern@float\begin{figure}[!htb]\centering\fi + \ifdtk@extern@frame + \expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk@extern@pages\do{% + \fbox{\expandafter\includegraphics\expandafter[\dtk@extern@grfOptions,page=\next]{\dtk@extern@dateiname}}% + \hspace{5pt}}\hspace*{-5pt} +% \fbox{\expandafter\includegraphics\expandafter[\dtk@extern@grfOptions]{\dtk@extern@dateiname}}% + \else + \expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk@extern@pages\do{% + \expandafter\includegraphics\expandafter[\dtk@extern@grfOptions,page=\next]{\dtk@extern@dateiname}% + \hspace{5pt}}\hspace*{-5pt} +% \expandafter\includegraphics\expandafter[\dtk@extern@grfOptions]{\dtk@extern@dateiname}% + \fi + \ifx\dtk@extern@caption\@empty\else\caption{\dtk@extern@caption}\fi + \ifx\dtk@extern@label\@empty\else\label{\dtk@extern@label}\fi + \ifdtk@extern@float\end{figure}\fi + \fi + \ifdtk@extern@cleanup + \ShellEscape{rm \dtk@extern@dateiname.log}% + \ShellEscape{rm \dtk@extern@dateiname.aux}% + \ShellEscape{rm \dtk@extern@dateiname.toc}% +% \ShellEscape{rm \dtk@extern@dateiname.log}% + \fi + \global\ResetKeys} +% +\let\externalDocument\ErstelleGrafik +\let\endexternalDocument\endErstelleGrafik +%% +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-full.clo new/tex/latex/dtk/dtk-full.clo --- old/tex/latex/dtk/dtk-full.clo 2016-05-09 00:29:51.000000000 +0200 +++ new/tex/latex/dtk/dtk-full.clo 2017-06-07 23:24:40.000000000 +0200 @@ -14,7 +14,7 @@ %% version 2005/12/01 or later. \ProvidesFile{dtk-full.clo}% - [2016/04/12 v0.1f dtk class options for full mode (RN)] + [2017/05/30 v0.1i dtk class options for full mode (RN)] \@ifclasslater{scrbook}{2015/09/29}{}{% \ClassError{dtk2}{% @@ -25,16 +25,10 @@ } \RequirePackage{xcolor,multicol,graphicx,tabularx} -\ifx\pdfvariable\undefined % altes LuaTeX oder kein LuaTeX - \usepackage[showzone=false]{datetime2} -\else - \RequirePackage{luatex85} - \let\SAVE@pdfcreationdate=\pdfcreationdate - \edef\pdfcreationdate{\pdfcreationdate} - % v1.4 ist inkompatibel mit LuaTeX 0.95/luatex85 - \usepackage[showzone=false]{datetime2} - \let\pdfcreationdate=\SAVE@pdfcreationdate -\fi +\edef\pdfcreationdate{\pdfcreationdate} +% weil datetime2 inkompatible zu LuaTeX 0.95/luatex85, +% standardmäßig ungünstige Defionition in luatex85 +\usepackage[showzone=false]{datetime2} \newcommand*\AutorenListenName{Autoren/Organisatoren} % auch »Stichwortverzeichnis«? \newcommand*\DTK@fancyJournalname{% @@ -61,14 +55,6 @@ \edef\DTKcorrVersion{\noexpand\normalfont \noexpand\fcolorbox{black}{DTK@marker}{Korrekturversion: \DTMnow}}% \overfullrule=5pt % - \RequirePackage[pagewise]{lineno}% - \linenumbers - \linenumbersep=.8ex % - \def\linenumberfont{\normalfont\footnotesize\ttfamily}% - \def\thelinenumber{% - \fboxsep=.3ex % - \fcolorbox{black}{DTK@marker}{\@arabic{\c@page}-\@arabic{\c@linenumber}}% - }% \fi \@ifundefined{@LN}{\let\@LN=\@gobbletwo}{}% @@ -149,7 +135,9 @@ \newcommand*\DTK@addbibresource[2][]{}% \newcommand*\ORIG@printbibliography{} \let\ORIG@printbibliography=\printbibliography - \renewcommand*\printbibliography[1][]{\DTK@bib@true}% + \renewcommand*\printbibliography[1][]{\ORIG@printbibliography[heading=dtk]% + \global\let\bbx@lasthash=\relax + } \RequirePackage[split,protected]{splitidx} \makeindex \newindex[\AutorenListenName]{autoren}% \newcommand*\AutorenListe{% @@ -160,16 +148,22 @@ \printindex[autoren]% \endgroup }% + \RequirePackage{trimspaces} \newcommand\DTK@Author@list[3]{% TODO: Auch "!" und "|" maskieren? \begingroup + \setbox\DTK@tempbox\hbox{\trim@spaces{#3}}% \def\Email##1{\escape@atsign##1\relax}% herausziehen?! \def\escape@atsign##1@##2\relax{% \noexpand\Email\string{##1\string"@##2\string}% - } + }% \makeatletter - \scantokens{\protected@edef\x{% - \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}% - \x + \ifdim\wd\DTK@tempbox>\z@ + \scantokens{\protected@edef\x{% + \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}% + \x + \else + \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}% + \fi \endgroup }% \let\DTK@Author=\DTK@Author@list @@ -204,7 +198,6 @@ \let\documentclass=\DTK@documentclass \let\usepackage=\DTK@usepackage \let\addbibresource=\DTK@addbibresource - \DTK@bib@false \c@footnote=\z@ \c@lstlisting=\z@ \c@figure=\z@ @@ -214,7 +207,6 @@ \ifDTKrecord\endgroup\expandafter\endinput\fi \DTK@embedded@begindocumenthook\ignorespaces }{% - \ifDTK@bib@\ORIG@printbibliography[heading=dtk]\fi \DTK@embedded@enddocumenthook\endinput }% \refsection[DTK\the\c@refsection]% @@ -299,6 +291,38 @@ }]{dtk-title-content} \DeclareNewPageStyleByLayers{dtk-title}{dtk-title-content} +\ifDTK@korr@% === Positionsnummern am linken Rand === + \newcommand*\formatPosNumber[1]{% + \fboxsep=.2em % + \fbox{\ifnum\arabic{page}<10 0\fi\arabic{page}-\ifnum#1<10 0\fi\@arabic{#1}}% + } + \newcommand\makePosNumbers[2]{% + \settoheight\DTK@tempdimc{\formatPosNumber{9}}% + \DTK@tempdimc=1.5\DTK@tempdimc + \DTK@tempdimd=0pt % + \DTK@tempdimb=#2 % + \@tempcnta=0 % + \@whiledim \dimexpr\DTK@tempdimd+.5\DTK@tempdimc < \textheight\do{% + \advance\@tempcnta 1 % + \DTK@tempdimb=\dimexpr\DTK@tempdimb-\DTK@tempdimc + \DTK@tempdimd=\dimexpr\DTK@tempdimd+\DTK@tempdimc + \put(#1,\DTK@tempdimb){\formatPosNumber{\@tempcnta}}% + }% + } + \DeclareNewLayer[textarea,background,mode=picture,contents={% + \begingroup + \ttfamily\scriptsize\itshape + \settowidth\DTK@tempdimc{\formatPosNumber{99}}% + \DTK@tempdima=\dimexpr-.5\textwidth-\DTK@tempdimc-.8em % + \putC{% + \makePosNumbers{\DTK(a)tempdima}{.5\textheight}% + }% + \endgroup + }]{dtk-line-positions} + \AddLayersToPageStyle{scrheadings}{dtk-line-positions} + \AddLayersToPageStyle{plain.scrheadings}{dtk-line-positions} +\fi + \deftriplepagestyle{dtk-toc}% {}{\DTK@toc@head}{}% {}{\hfill\normalsize\DTKcorrVersion\hfill\null}{} @@ -400,23 +424,6 @@ } \newcommand\rolllabel[1]{\hspace\labelsep \textbf{#1}\hfill} -\RequirePackage{shellesc,filecontents} -%% [#1]: Optionen für \includegraphics [#2]: Compiler #3: Dateiname -%% -\def\ErstelleGrafik{\@ifnextchar[{\ErstelleGrafik@i}{\ErstelleGrafik@i[]}} -\def\ErstelleGrafik@i[#1]{\@ifnextchar[{\ErstelleGrafik@ii[#1]}{% - \ErstelleGrafik@ii[#1][xelatex]}}% -\def\ErstelleGrafik@ii[#1][#2]#3{% - \gdef\DTK@dateiname{#3}% - \gdef\DTK@grafikOptionen{#1}% - \ifx\relax#2\relax\gdef\DTK@compiler{xelatex}\else\gdef\DTK@compiler{#2}\fi - \(a)nameuse{filecontents*}{#3.tex}}% -\def\endErstelleGrafik{% - \@nameuse{endfilecontents*}% - \ShellEscape{\DTK@compiler\space\DTK@dateiname}% - \expandafter\includegraphics\expandafter[\DTK@grafikOptionen]{\DTK@dateiname}% -} - \providecommand*\InfoTeX{???} \newcommand*\MitarbeiterListe{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-logos.sty new/tex/latex/dtk/dtk-logos.sty --- old/tex/latex/dtk/dtk-logos.sty 2016-03-11 00:22:57.000000000 +0100 +++ new/tex/latex/dtk/dtk-logos.sty 2017-06-07 23:24:40.000000000 +0200 @@ -4,7 +4,7 @@ %% %% LaTeX Class for ``Die TeXnische Komoedie''. %% -%% Copyright (C) 2015- +%% Copyright (C) 2017 %% Herbert Voss %% %% It may be distributed and/or modified under the @@ -18,7 +18,7 @@ % $Id: deLogos.sty 188 2015-10-08 20:06:29Z herbert $ % % ------------------------------------- -\ProvidesPackage{dtk-logos}[2015/10/21 Dante Edition: Logos (hv)] +\ProvidesPackage{dtk-logos}[2017/06/07 v. 1.01 Dante Edition: Logos (hv)] % \RequirePackage{hologo,dantelogo} % @@ -85,6 +85,8 @@ \def\PiC{\hologo{PiC}} \def\PiCTeX{\hologo{PiCTeX}} \def\plainTeX{\hologo{plainTeX}} +\def\PostScript{PostScript} +\let\PS\PostScript \def\SageTeX{\hologo{SageTeX}} \def\SLiTeX{\hologo{SLiTeX}} \def\teTeX{\hologo{teTeX}} @@ -118,5 +120,11 @@ \let\biblatex\BibLaTeX \def\CTAN{\texttt{CTAN}\xspace} +\iffalse +\newfontfamily\LinWikipedia{LinLibertine_R_G}[Extension=.ttf, + Path=/usr/local/texlive/texmf-local/fonts/opentype/libertine/] +\def\WikipediA{{\LinWikipedia\char"E02F\textsc{ikipediA}}} % dezimal +\let\wikipedia\WikipediA +\fi \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-new-engines.clo new/tex/latex/dtk/dtk-new-engines.clo --- old/tex/latex/dtk/dtk-new-engines.clo 2016-03-11 00:22:57.000000000 +0100 +++ new/tex/latex/dtk/dtk-new-engines.clo 2016-12-12 00:01:12.000000000 +0100 @@ -2,7 +2,7 @@ %% %% LaTeX Class for ``Die TeXnische Komoedie''. %% -%% Copyright (C) 2015- +%% Copyright (C) 2015- %% Rolf Niepraschk, Herbert Voss %% %% It may be distributed and/or modified under the @@ -14,13 +14,28 @@ %% version 2005/12/01 or later. \ProvidesFile{dtk-new-engines.clo}% - [2015/10/30 v0.1f dtk class options for LuaTeX and XeTeX (RN)] + [2016/05/17 v0.1f dtk class options for LuaTeX and XeTeX (RN)] \typeout{NEW-ENGINE} \RequirePackage{fontspec} \RequirePackage{unicode-math} +\ifluatex + \RequirePackage[ngerman,noftligs]{selnolig} + \InputIfFileExists{dtk.nolig}{% + \typeout{*************************************^^J% + * File `dtk.nolig' used.^^J% + *************************************}% + }{} +\fi + +\RequirePackage{newunicodechar} +\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' +\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE' +\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN' +\newunicodechar{^^^^20ac}{\DTK@euro}% 'EURO SIGN' + \InputIfFileExists{dtk-fonts.cfg}{% \typeout{*************************************^^J% * File `dtk-fonts.cfg' used.^^J% @@ -37,18 +52,4 @@ %\def\DTKttFontName{DejaVu Mono}% } -\ifluatex - \RequirePackage[ngerman,noftligs]{selnolig} - \InputIfFileExists{dtk.nolig}{% - \typeout{*************************************^^J% - * File `dtk.nolig' used.^^J% - *************************************}% - }{} -\fi - -\RequirePackage{newunicodechar} -\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' -\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE' -\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN' - \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-old-engines.clo new/tex/latex/dtk/dtk-old-engines.clo --- old/tex/latex/dtk/dtk-old-engines.clo 2016-03-11 00:22:57.000000000 +0100 +++ new/tex/latex/dtk/dtk-old-engines.clo 2016-12-12 00:01:12.000000000 +0100 @@ -3,7 +3,7 @@ %% %% LaTeX Class for ``Die TeXnische Komoedie''. %% -%% Copyright (C) 2015- +%% Copyright (C) 2015- %% Rolf Niepraschk, Herbert Voss %% %% It may be distributed and/or modified under the @@ -15,13 +15,14 @@ %% version 2005/12/01 or later. \ProvidesFile{dtk-old-engines.clo}% - [2015/10/30 v0.1d dtk class options for pdfTeX/TeX+dvips (RN)] + [2016/05/11 v0.1e dtk class options for pdfTeX/TeX+dvips (RN)] \typeout{OLD-ENGINE} \RequirePackage[utf8]{inputenc} \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} +\DeclareUnicodeCharacter{20AC}{\DTK@euro} \InputIfFileExists{dtk-fonts.cfg}{% \typeout{*************************************^^J% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-url.sty new/tex/latex/dtk/dtk-url.sty --- old/tex/latex/dtk/dtk-url.sty 2016-05-09 00:29:51.000000000 +0200 +++ new/tex/latex/dtk/dtk-url.sty 2016-12-12 00:01:12.000000000 +0100 @@ -98,7 +98,7 @@ }% \x \DTK@UrlWrite{\DTK@UrlType}{\DTK@Raw}% - \pdfextension startlink attr{% + \pdfstartlink attr{% /H/I% /C[1 0 0]% red /Border[1 0 0]% @@ -113,7 +113,7 @@ >>% }% #1% - \pdfextension endlink + \pdfendlink }% % Implement writing of file \DTK@UrlFile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.bbx new/tex/latex/dtk/dtk.bbx --- old/tex/latex/dtk/dtk.bbx 2016-05-09 00:29:51.000000000 +0200 +++ new/tex/latex/dtk/dtk.bbx 2016-12-12 00:01:12.000000000 +0100 @@ -18,8 +18,8 @@ \DeclareBibliographyOption{dashed}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{pagetracker}% - \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} - {\renewbibmacro*{bbx:savehash}{}}} + \newbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} + {\newbibmacro*{bbx:savehash}{}}} \ExecuteBibliographyOptions { @@ -199,4 +199,4 @@ %% %% -\endinput \ No newline at end of file +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.cls new/tex/latex/dtk/dtk.cls --- old/tex/latex/dtk/dtk.cls 2016-05-09 00:29:51.000000000 +0200 +++ new/tex/latex/dtk/dtk.cls 2017-06-07 23:24:40.000000000 +0200 @@ -21,11 +21,11 @@ \HyphSubstIfExists{german-x-latest}{% \HyphSubstLet{german}{german-x-latest}}{} -\def\DTKversion{2.04} -\def\DTKversiondate{2016/05/08} -\ProvidesClass{dtk}[\DTKversiondate\ v\DTKversion\ dtk documentclass (RN)] +\def\DTKversion{2.07a} +\def\DTKversiondate{2017/06/07} +\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)] -\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex} +\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85} \newcommand*\DTK@engine{} \ifluatex @@ -49,10 +49,14 @@ \RequirePackage{xkeyval} \newif\ifDTK@Author@ \DTK@Author@true -\newif\ifDTK@bib@ \DTK@bib@false \newif\ifDTKcolor \DTKcolorfalse % "@" ? \newif\ifDTK@korr@ \DTK@korr@false +\newlength\DTK@tempdima +\newlength\DTK@tempdimb +\newlength\DTK@tempdimc +\newlength\DTK@tempdimd + \newcommand*\journalname{Die \protect\TeX{}nische Kom\"odie} \newcommand*\DTKyear{} \edef\DTKyear{\the\year} @@ -86,6 +90,8 @@ \newcommand*\DTK@tempb{} \newcommand*\DTK@tempc{} +\newsavebox\DTK@tempbox + \PassOptionsToPackage{hyphens}{url} \RequirePackage{dtk-url} @@ -101,6 +107,8 @@ \RequirePackage{scrhack}% Andere Pakete KOMA-Script-freundlich machen +\RequirePackage{dtk-extern} + % http://www.komascript.de/release3.18 \ifstr{\KOMAScriptVersion}{2015/07/02 v3.18 KOMA-Script}{% \ifx\par@update\default@par@update\else @@ -172,11 +180,49 @@ \input{dtk-new-engines.clo}% LuaTeX oder XeTeX \fi -\RequirePackage[autostyle=true,babel=once,german=guillemets,maxlevel=3]{csquotes}% +\RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}% \MakeAutoQuote{»}{«} \defineshorthand{"`}{\openautoquote}% \defineshorthand{"'}{\closeautoquote}% +\iftrue + \newcommand*\EURO@scale@to@rm[2]{% + \begingroup + \fontsize{10}{0}\usefont{\encodingdefault}{\rmdefault}{m}{n}% + #1% + \xdef\eurosym@@Scale{% + \strip@pt + \dimexpr 1pt * \@tempdima / \dimexpr#2pt\relax }% + \ClassInfo{dtk}{The eurosym family is scaled by \eurosym@@Scale}% + \endgroup + } + \EURO@scale@to@rm{\setbox0\hbox{C}\@tempdima=\ht0}{6.92}% matchuppercase + % Extrakt aus "eurosym.sty" + \DeclareFontFamily{U}{DTK@eurosym}{} + \DeclareFontShape{U}{DTK@eurosym}{m}{n}{ <-> s*[\eurosym@@Scale] feymr10 }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/m/n }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{sl}{ <-> s*[\eurosym@@Scale] feymo10 }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/m/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{ol}{ <-> s*[\eurosym@@Scale] feyml10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{n}{ <-> s*[\eurosym@@Scale] feybr10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{sl}{ <-> s*[\eurosym@@Scale] feybo10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{ol}{ <-> s*[\eurosym@@Scale] feybl10 }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{n}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{sl}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{ol}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/ol }{} + \DeclareRobustCommand\DTK@euro{{\fontencoding{U}\fontfamily{DTK@eurosym}\selectfont{}e}} +\else + % Sobald das Paket Skalierung unterstützt + \RequirePackage[right,scaled]{eurosym} +%%%\DeclareRobustCommand\DTK(a)euro{\scalebox{0.9}{\officialeuro}} +\fi + +\let\texteuro=\DTK@euro + \ifxetex\else \RequirePackage[% ,protrusion=true @@ -197,6 +243,7 @@ ,backend=biber ]{biblatex} +\let\ORIGprintbibliography\printbibliography \g@addto@macro\bibsetup{\RaggedRight} %\RequirePackage{etex} % ??? @@ -207,6 +254,8 @@ \ifx\relax#1\relax\gdef\@@title{#2}\else\gdef\@@title{#1}\fi% } +\let\DTK@thispagestyle=\thispagestyle + \newcommand\DTK@maketitle[1][]{% \begingroup \dimen0=\textheight @@ -222,6 +271,7 @@ \usekomafont{author}\lineskip 0.75em % \begin{tabular}[t]{@{}c@{}}\@author\end{tabular}\par \endgroup + \DTK(a)thispagestyle{plain.scrheadings}% \@thanks \global\let\@thanks=\@empty \global\let\@title=\@empty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtk.tlpobj new/tlpkg/tlpobj/dtk.tlpobj --- old/tlpkg/tlpobj/dtk.tlpobj 2016-05-09 03:15:37.000000000 +0200 +++ new/tlpkg/tlpobj/dtk.tlpobj 2017-06-08 02:21:38.000000000 +0200 @@ -1,6 +1,6 @@ name dtk category Package -revision 40958 +revision 44524 shortdesc Document class for the journal of DANTE relocated 1 longdesc The bundle provides a class and style file for typesetting "Die @@ -8,8 +8,9 @@ longdesc Users Group DANTE e.V. The arrangement means that the class may longdesc be used by article writers to typeset a single article, as well longdesc as to produce the complete journal. -runfiles size=17 +runfiles size=19 RELOC/tex/latex/dtk/dtk-author.clo + RELOC/tex/latex/dtk/dtk-extern.sty RELOC/tex/latex/dtk/dtk-full.clo RELOC/tex/latex/dtk/dtk-logos.sty RELOC/tex/latex/dtk/dtk-new-engines.clo @@ -19,7 +20,7 @@ RELOC/tex/latex/dtk/dtk.cbx RELOC/tex/latex/dtk/dtk.cls catalogue-ctan /usergrps/dante/dtk -catalogue-date 2016-05-08 17:04:29 +0200 +catalogue-date 2017-06-07 13:48:59 +0200 catalogue-license lppl1.3 catalogue-topics journalpub class -catalogue-version 2.04 +catalogue-version 2.07a ++++++ dtl.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/dt2dv.man1.pdf and new/texmf-dist/doc/man/man1/dt2dv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/dv2dt.man1.pdf and new/texmf-dist/doc/man/man1/dv2dt.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtl.doc.tlpobj new/tlpkg/tlpobj/dtl.doc.tlpobj --- old/tlpkg/tlpobj/dtl.doc.tlpobj 2016-04-27 03:16:42.000000000 +0200 +++ new/tlpkg/tlpobj/dtl.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,8 +1,8 @@ name dtl.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of dtl -docfiles size=21 +docfiles size=12 texmf-dist/doc/man/man1/dt2dv.1 texmf-dist/doc/man/man1/dt2dv.man1.pdf texmf-dist/doc/man/man1/dv2dt.1

1 0

commit texlive-specs-f 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-f for openSUSE:Factory checked in at 2017-06-25 19:21:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-f (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-f.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-f" Sun Jun 25 19:21:39 2017 rev:27 rq:504796 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.changes 2017-06-08 14:54:25.983594375 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-f.new/texlive-specs-f.changes 2017-06-25 19:24:35.375448780 +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: ---- context-lilypond.doc.tar.xz context-lilypond.tar.xz datatool.doc.tar.xz datatool.tar.xz dateiliste.doc.tar.xz dateiliste.tar.xz datenumber.doc.tar.xz datenumber.tar.xz datetime.doc.tar.xz datetime.tar.xz datetime2-bahasai.doc.tar.xz datetime2-bahasai.tar.xz datetime2-basque.doc.tar.xz datetime2-basque.tar.xz datetime2-breton.doc.tar.xz datetime2-breton.tar.xz datetime2-bulgarian.doc.tar.xz datetime2-bulgarian.tar.xz datetime2-catalan.doc.tar.xz datetime2-catalan.tar.xz datetime2-croatian.doc.tar.xz datetime2-croatian.tar.xz datetime2-czech.doc.tar.xz datetime2-czech.tar.xz datetime2-danish.doc.tar.xz datetime2-danish.tar.xz datetime2-dutch.doc.tar.xz datetime2-dutch.tar.xz datetime2-en-fulltext.doc.tar.xz datetime2-en-fulltext.tar.xz datetime2-english.doc.tar.xz datetime2-english.tar.xz datetime2-esperanto.doc.tar.xz datetime2-esperanto.tar.xz datetime2-estonian.doc.tar.xz datetime2-estonian.tar.xz datetime2-finnish.doc.tar.xz datetime2-finnish.tar.xz datetime2-french.doc.tar.xz datetime2-french.tar.xz datetime2-galician.doc.tar.xz datetime2-galician.tar.xz datetime2-german.doc.tar.xz datetime2-german.tar.xz datetime2-greek.doc.tar.xz datetime2-greek.tar.xz datetime2-hebrew.doc.tar.xz datetime2-hebrew.tar.xz datetime2-icelandic.doc.tar.xz datetime2-icelandic.tar.xz datetime2-irish.doc.tar.xz datetime2-irish.tar.xz datetime2-it-fulltext.doc.tar.xz datetime2-it-fulltext.tar.xz datetime2-italian.doc.tar.xz datetime2-italian.tar.xz datetime2-latin.doc.tar.xz datetime2-latin.tar.xz datetime2-lsorbian.doc.tar.xz datetime2-lsorbian.tar.xz datetime2.doc.tar.xz datetime2.tar.xz New: ---- concmath-fonts.doc.tar.xz concmath-fonts.tar.xz concprog.doc.tar.xz concprog.tar.xz concrete.doc.tar.xz concrete.tar.xz confproc.doc.tar.xz confproc.tar.xz constants.doc.tar.xz constants.tar.xz conteq.doc.tar.xz conteq.tar.xz context-account.doc.tar.xz context-account.tar.xz context-algorithmic.tar.xz context-animation.doc.tar.xz context-animation.tar.xz context-annotation.doc.tar.xz context-annotation.tar.xz context-bnf.doc.tar.xz context-bnf.tar.xz context-chromato.doc.tar.xz context-chromato.tar.xz context-cmscbf.doc.tar.xz context-cmscbf.tar.xz context-cmttbf.doc.tar.xz context-cmttbf.tar.xz context-construction-plan.doc.tar.xz context-construction-plan.tar.xz context-cyrillicnumbers.doc.tar.xz context-cyrillicnumbers.tar.xz context-degrade.doc.tar.xz context-degrade.tar.xz context-fancybreak.doc.tar.xz context-fancybreak.tar.xz context-filter.doc.tar.xz context-filter.tar.xz context-french.doc.tar.xz context-french.tar.xz context-fullpage.doc.tar.xz context-fullpage.tar.xz context-gantt.doc.tar.xz context-gantt.tar.xz context-gnuplot.doc.tar.xz context-gnuplot.tar.xz context-inifile.doc.tar.xz context-inifile.tar.xz context-layout.doc.tar.xz context-layout.tar.xz context-letter.doc.tar.xz context-letter.tar.xz context.doc.tar.xz context.tar.xz context_fourier-map.dif conv-xkv.doc.tar.xz conv-xkv.tar.xz cooking-units.doc.tar.xz cooking-units.tar.xz cormorantgaramond.doc.tar.xz cormorantgaramond.tar.xz correctmathalign.doc.tar.xz correctmathalign.tar.xz cquthesis.doc.tar.xz cquthesis.tar.xz css-colors.doc.tar.xz css-colors.tar.xz cstypo.doc.tar.xz cstypo.tar.xz currency.doc.tar.xz currency.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-f.spec ++++++ ++++ 25349 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-f.new/texlive-specs-f.spec ++++++ context-lilypond.doc.tar.xz -> context-bnf.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/bnf/NEWS new/doc/context/third/bnf/NEWS --- old/doc/context/third/bnf/NEWS 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/context/third/bnf/NEWS 2016-11-25 19:27:21.000000000 +0100 @@ -0,0 +1,28 @@ + + + BNF Module News + + + +VERSION 0.3 + + Nothing more than a clean-up of the project tree. Although the autotools + setup was working OK it was more confusing than helpful. People tend to + install these kinds of things in a much more ad hoc manner anyway. + + + +VERSION 0.2 + + + Total rewrite of the logic. Much easier to specify grammars, as the need for + commas and full-stops has been lifted. Furthermore, there is now an + alternative way of specifying non-terminals, using '-pairs instead. The + output is a lot nicer now as well, albeit not as compact as before. + + + +VERSION 0.1 + + + Initial release, nothing much to report here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/bnf/README new/doc/context/third/bnf/README --- old/doc/context/third/bnf/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/context/third/bnf/README 2016-11-25 19:27:21.000000000 +0100 @@ -0,0 +1,39 @@ + + + BNF Module README + + +INTRODUCTION + + + The t-bnf module implements a way to easily write BNF grammars in CONTEXT. + Let's look at an example BNF grammar in a document: + + \starttext + + Here's a \BNF\ grammar. Enjoy. + + \placebnfgrammar + [here] + [bnf:test] + {A test of the \BNF\ module} + {\startbnfgrammar[] + <S>: a<S>b + <S>: $\epsilon$ + \stopbnfgrammar} + + Which will match the language $L = \{\,a^nb^n \mid n \geq 0\,\}$. + + \stoptext + + You may try to generate module documenation embedded in t-bnf.tex with texexec + as well: + + % texexec --interface=en --module --pdf t-bnf.tex + + If you have any issues with creating the documentation this may be a result + of lacking the proper language format. You can look up the proper + information for generating these formats in minstall.pdf at PRAGMA-ADEs site + (http://www.pragma-ade.com/). + + Enjoy! Binary files old/doc/context/third/bnf/t-bnf.pdf and new/doc/context/third/bnf/t-bnf.pdf differ Binary files old/doc/context/third/lilypond/demo.pdf and new/doc/context/third/lilypond/demo.pdf differ Binary files old/doc/context/third/lilypond/t-lilypond.pdf and new/doc/context/third/lilypond/t-lilypond.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-bnf.doc.tlpobj new/tlpkg/tlpobj/context-bnf.doc.tlpobj --- old/tlpkg/tlpobj/context-bnf.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/context-bnf.doc.tlpobj 2017-04-14 17:36:59.000000000 +0200 @@ -0,0 +1,9 @@ +name context-bnf.doc +category ConTeXt +revision 23167 +shortdesc doc files of context-bnf +relocated 1 +docfiles size=71 + RELOC/doc/context/third/bnf/NEWS + RELOC/doc/context/third/bnf/README + RELOC/doc/context/third/bnf/t-bnf.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-lilypond.doc.tlpobj new/tlpkg/tlpobj/context-lilypond.doc.tlpobj --- old/tlpkg/tlpobj/context-lilypond.doc.tlpobj 2016-04-14 18:54:15.000000000 +0200 +++ new/tlpkg/tlpobj/context-lilypond.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name context-lilypond.doc -category ConTeXt -revision 23167 -shortdesc doc files of context-lilypond -relocated 1 -docfiles size=50 - RELOC/doc/context/third/lilypond/demo.pdf - RELOC/doc/context/third/lilypond/t-lilypond.pdf ++++++ context-lilypond.doc.tar.xz -> context-bnf.tar.xz ++++++ Binary files old/doc/context/third/lilypond/demo.pdf and new/doc/context/third/lilypond/demo.pdf differ Binary files old/doc/context/third/lilypond/t-lilypond.pdf and new/doc/context/third/lilypond/t-lilypond.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/context/third/bnf/t-bnf.tex new/tex/context/third/bnf/t-bnf.tex --- old/tex/context/third/bnf/t-bnf.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/context/third/bnf/t-bnf.tex 2016-11-25 19:33:30.000000000 +0100 @@ -0,0 +1,195 @@ +%D \module +%D [ file=t-bnf, +%D version=2004.6.23, +%D title=\CONTEXT\ BNF Grammar Module, +%D subtitle=Grammars, +%D author={Nikolai Weibull}, +%D date=\currentdate, +%D copyright={Nikolai Weibull}] +%C +%C This module is NOT part of the \CONTEXT\ macro||package. +%C This module is free software; you can redistribute it and/or modify +%C it under the terms of the GNU General Public License as published by +%C the Free Software Foundation; either version 2 of the License, or +%C (at your option) any later version. +%C +%C This module is distributed in the hope that it will be useful, +%C but WITHOUT ANY WARRANTY; without even the implied warranty of +%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%C GNU General Public License for more details. +%C +%C You should have received a copy of the GNU General Public License +%C along with this program; if not, write to the Free Software +%C Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +\writestatus{loading}{BNF Macros / Initialization} + +\unprotect + +%M \usemodule[bnf] +%D We define a new system variable for our settings: + +\definesystemvariable{bnf} + +%D We need some constants for the multi||lingual interface, + +\startconstants english dutch + terminalstart: terminalstart terminalstart + terminalstop: terminalstop terminalstop + nonterminalstart: nonterminalstart nonterminalstart + nonterminalstop: nonterminalstop nonterminalstop + is: is worden +\stopconstants + +%D and while we're at it, lets define some variables. + +\startvariables english dutch + bnfgrammar: bnfgrammar bnfspraakleer + bnfgrammars: bnfgrammars bnfspraakleer +\stopvariables + +%D Finally, we want the commands to be multi||lingually accessible, so we set +%D that up as well: + +\startcommands english dutch + setupbnfgrammar: setupbnfgrammar stelbnfspraakleer + startbnfgrammar: startbnfgrammar startbnfspraakleer + stopbnfgrammar: stopbnfgrammar startbnfspraakleer +\stopcommands + +%D \macros +%D {startbnfgrammar, stopbnfgrammar} +%D +%D Now to the interesting parts, those that are actually useful to the outside +%D world. First we have the \type{\startbnfgrammar} and \type{\stopbnfgrammar} +%D pairs, which are of course used to delimit \BNF\ grammars. We would like to +%D define \type{\startbnfgrammar} as \type{\def\startbnfgrammar[#1]}, but a bug +%D in \CONTEXT\ prevents us from doing this, as the first character in the +%D grammar may be active, for example \type{<}, but while checking for the +%D presence of \type{[}, it gets ruined. A way around it is of course to +%D require that the user pass an empty \type{[]} pair, and we will use this +%D method at the moment. + +\def\complexstartbnfgrammar[#1]% + {\endgraf\nobreak\medskip + \begingroup + \setupbnfgrammar[#1]% + \chardef\bnfsinglequote=`' + \defineactivecharacter : {\@@bnfis} + \defineactivecharacter | {\@@bnfoption} + \defineactivecharacter " % + {\thinspace\bgroup\@@bnfterminalstart\setupinlineverbatim% + \defineactivecharacter " {\@@bnfterminalstop\egroup\thinspace}} + \defineactivecharacter ' % + {\thinspace\bgroup\@@bnfterminalstart\setupinlineverbatim% + \defineactivecharacter ' {\@@bnfterminalstop\egroup\thinspace}} + \catcode`<=13 + \let\par=\bnfgrammarline + \obeylines} + +\def\stopbnfgrammar{\medbreak\checknextindentation[\@@bnfindentnext]} + +\definecomplexorsimpleempty\startbnfgrammar + +%D \macros +%D {<>,bnfgrammarrule} +%D +%D We need a couple more macros to deal with the interior of a \BNF\ grammar. +%D \type{\<>} is used for non||terminals, and \type{\bnfgrammarrule} is used +%D later on in \type{\bnfgrammarswitch} for continuing a line. + +\def\<#1>{\leavevmode\hbox{\@@bnfnonterminalstart#1\/\@@bnfnonterminalstop}} + +\bgroup + \catcode`<=13 + \global\let<=\< + \gdef\bnfgrammarrule<#1>{\endgraf\indent\<#1>} +\egroup + +%D \macros +%D {bnfgrammarline, bnfgrammarswitch, bnfgrammarcont} +%D +%D These macros deal with the ending of a line in a grammar. +%D \type{\bnfgrammarline} is called whenever a new line begins, and invokes +%D \type{\bnfgrammarswitch} to determine what to do next. If the next token is +%D \type{\<}, we will call upon \type{\bnfgrammarrule} to deal with the new +%D rule. If it is \type{\stopbnfgrammar}, we end the top||level group, and let +%D it process \type{\stopbnfgrammar} afterwards. Otherwise we invoke +%D \type{\bnfgrammarcont}, which will end the line and add some indentation to +%D the continuing line. + +\def\bnfgrammarline{\futurelet\next\bnfgrammarswitch} +\def\bnfgrammarswitch% + {\ifx\next\< + \let\next=\bnfgrammarrule + \else\ifx\next\stopbnfgrammar + \let\next=\endgroup + \else + \let\next=\bnfgrammarcont + \fi\fi + \next} +\def\bnfgrammarcont{\hfil\break\indent\qquad} + +%D \macros +%D {setupbnfgrammar} +%D +%D We want to allow our users to change the way the \BNF\ grammars are typeset, +%D so we define a setup command for them to use. +%D +%D It allows you to define the start and stop sequence for terminals and +%D non||terminals, as well as colons (lhs / rhs separator) and vertical bars +%D (alternative), and commas. This has been multi||lingualized above, so +%D choose your language. + +\def\dosetupbnfgrammar[#1]% + {\getparameters[\??bnf][#1]} + +\def\setupbnfgrammar% + {\dosingleargument\dosetupbnfgrammar} + +\setupbnfgrammar + [\c!terminalstart=\tttf, + \c!terminalstop=, + \c!nonterminalstart=\mathematics{\langle}, + \c!nonterminalstop=\mathematics{\rangle}, + \c!is={ \mathematics{\longrightarrow}}, + \c!option=\mathematics{\vert}, + \c!indentnext=\v!no] + +%D \macros +%D {BNF} +%D +%D We also define a useful abbreviation to be used for header texts and labels. + +\logo[BNF]{bnf} + +%D And we use it here: + +\setupheadtext[\s!en][\v!bnfgrammar=\BNF\ Grammar] +\setupheadtext[\s!en][\v!bnfgrammars=\BNF\ Grammars] +\setuplabeltext[\s!en][\v!bnfgrammar=\BNF\ Grammar ] + +%D Finally we define a float to be use with \BNF\ grammars, so that we can +%D finish off with something like this: +%D +%D \startbuffer +%D \placebnfgrammar +%D [][] +%D {An example of a placed grammar.} +%D {\startbnfgrammar[] +%D <exp>: <num> | <num> "+" <num> +%D <num>: "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" +%D \stopbnfgrammar} +%D \stopbuffer +%D +%D \typebuffer +%D +%D \getbuffer +%D +%D which looks kind of nice. + +\definefloat + [\v!bnfgrammar] + [\v!bnfgrammars] + +\protect \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-bnf.tlpobj new/tlpkg/tlpobj/context-bnf.tlpobj --- old/tlpkg/tlpobj/context-bnf.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/context-bnf.tlpobj 2017-04-14 17:36:59.000000000 +0200 @@ -0,0 +1,19 @@ +name context-bnf +category ConTeXt +revision 23167 +shortdesc A BNF module for ConTeXt +relocated 1 +longdesc The module provides a simple way to write good-looking BNF- +longdesc style grammars in ConTeXt. Grammars are written using the BNF +longdesc syntax right in your ConTeXt documents, so there is a clear +longdesc separation between content and layout. This allows the user to +longdesc decide exactly how the grammar is to be displayed, while also +longdesc allowing the gist of the grammar to be understood from simply +longdesc looking at the source ConTeXt document. +depend context +runfiles size=2 + RELOC/tex/context/third/bnf/t-bnf.tex +catalogue-ctan /macros/context/contrib/context-bnf +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license gpl +catalogue-topics formal-spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-lilypond.doc.tlpobj new/tlpkg/tlpobj/context-lilypond.doc.tlpobj --- old/tlpkg/tlpobj/context-lilypond.doc.tlpobj 2016-04-14 18:54:15.000000000 +0200 +++ new/tlpkg/tlpobj/context-lilypond.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name context-lilypond.doc -category ConTeXt -revision 23167 -shortdesc doc files of context-lilypond -relocated 1 -docfiles size=50 - RELOC/doc/context/third/lilypond/demo.pdf - RELOC/doc/context/third/lilypond/t-lilypond.pdf ++++++ context-lettrine.doc.tar.xz ++++++ ++++++ context-lettrine.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-lettrine.tlpobj new/tlpkg/tlpobj/context-lettrine.tlpobj --- old/tlpkg/tlpobj/context-lettrine.tlpobj 2016-04-14 18:54:15.000000000 +0200 +++ new/tlpkg/tlpobj/context-lettrine.tlpobj 2017-04-14 17:37:00.000000000 +0200 @@ -9,6 +9,6 @@ RELOC/tex/context/interface/third/lettrine.xml RELOC/tex/context/third/lettrine/t-lettrine.tex catalogue-ctan /macros/context/contrib/context-lettrine -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics lettrine ++++++ context-mathsets.doc.tar.xz ++++++ ++++++ context-mathsets.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-mathsets.tlpobj new/tlpkg/tlpobj/context-mathsets.tlpobj --- old/tlpkg/tlpobj/context-mathsets.tlpobj 2016-04-14 18:54:15.000000000 +0200 +++ new/tlpkg/tlpobj/context-mathsets.tlpobj 2017-04-14 17:37:01.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/context/interface/third/t-mathsets.xml RELOC/tex/context/third/mathsets/t-mathsets.tex catalogue-ctan /macros/context/contrib/context-mathsets -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics maths ++++++ context-notes-zh-cn.doc.tar.xz ++++++ ++++++ context-rst.doc.tar.xz ++++++ ++++++ context-rst.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-rst.tlpobj new/tlpkg/tlpobj/context-rst.tlpobj --- old/tlpkg/tlpobj/context-rst.tlpobj 2016-04-14 18:54:16.000000000 +0200 +++ new/tlpkg/tlpobj/context-rst.tlpobj 2017-04-14 17:37:01.000000000 +0200 @@ -6,7 +6,7 @@ longdesc The package provides a converter and module for typesetting longdesc reStructuredText with ConTeXt. The module uses several lua longdesc scripts in doing its work. Documentation is supplied in rst, -longdesc which seems to be readable as text, but... +longdesc which seems to be readable as text, but .... depend context runfiles size=42 RELOC/scripts/context/lua/third/rst/mtx-t-rst.lua @@ -18,7 +18,7 @@ RELOC/tex/context/third/rst/rst_setups.lua RELOC/tex/context/third/rst/t-rst.mkiv catalogue-ctan /macros/context/contrib/context-rst -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics foreign-import catalogue-version 0.6c ++++++ context-ruby.doc.tar.xz ++++++ ++++++ context-ruby.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-ruby.tlpobj new/tlpkg/tlpobj/context-ruby.tlpobj --- old/tlpkg/tlpobj/context-ruby.tlpobj 2016-04-14 18:54:16.000000000 +0200 +++ new/tlpkg/tlpobj/context-ruby.tlpobj 2017-04-14 17:37:01.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/context/third/ruby/t-ruby.mkiv RELOC/tex/context/third/ruby/t-ruby.mkvi catalogue-ctan /macros/context/contrib/context-ruby -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics notes ++++++ context-simplefonts.doc.tar.xz ++++++ ++++++ context-simplefonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-simplefonts.tlpobj new/tlpkg/tlpobj/context-simplefonts.tlpobj --- old/tlpkg/tlpobj/context-simplefonts.tlpobj 2016-04-14 18:54:16.000000000 +0200 +++ new/tlpkg/tlpobj/context-simplefonts.tlpobj 2017-04-14 17:37:01.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/context/third/simplefonts/t-simplefonts.mkii RELOC/tex/context/third/simplefonts/t-simplefonts.mkiv catalogue-ctan /macros/context/contrib/context-simplefonts -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 context ++++++ context-simpleslides.doc.tar.xz ++++++ ++++++ context-simpleslides.tar.xz ++++++ ++++++ context-title.doc.tar.xz ++++++ ++++++ context-title.tar.xz ++++++ ++++++ context-transliterator.doc.tar.xz ++++++ ++++++ context-transliterator.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-transliterator.tlpobj new/tlpkg/tlpobj/context-transliterator.tlpobj --- old/tlpkg/tlpobj/context-transliterator.tlpobj 2016-04-14 18:54:19.000000000 +0200 +++ new/tlpkg/tlpobj/context-transliterator.tlpobj 2017-04-14 17:37:02.000000000 +0200 @@ -32,6 +32,6 @@ RELOC/tex/context/third/transliterator/transliterator.run RELOC/tex/context/third/transliterator/transliterator.tuc catalogue-ctan /macros/context/contrib/context-transliterator -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics enc-juggle ++++++ context-typearea.doc.tar.xz ++++++ ++++++ context-typearea.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-typearea.tlpobj new/tlpkg/tlpobj/context-typearea.tlpobj --- old/tlpkg/tlpobj/context-typearea.tlpobj 2016-04-14 18:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/context-typearea.tlpobj 2017-04-14 17:37:02.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/context/third/typearea/t-typearea.tex catalogue-ctan /macros/context/contrib/context-typearea -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics geometry context ++++++ context-typescripts.doc.tar.xz ++++++ ++++++ context-typescripts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-typescripts.tlpobj new/tlpkg/tlpobj/context-typescripts.tlpobj --- old/tlpkg/tlpobj/context-typescripts.tlpobj 2016-04-14 18:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/context-typescripts.tlpobj 2017-04-14 17:37:02.000000000 +0200 @@ -75,6 +75,6 @@ RELOC/tex/context/third/typescripts/type-vollkorn.mkii RELOC/tex/context/third/typescripts/type-vollkorn.mkiv catalogue-ctan /macros/context/contrib/context-typescripts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font-use context ++++++ context-vim.doc.tar.xz ++++++ ++++++ context-vim.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-vim.tlpobj new/tlpkg/tlpobj/context-vim.tlpobj --- old/tlpkg/tlpobj/context-vim.tlpobj 2016-04-14 18:54:20.000000000 +0200 +++ new/tlpkg/tlpobj/context-vim.tlpobj 2017-04-14 17:37:03.000000000 +0200 @@ -22,6 +22,6 @@ RELOC/tex/context/third/vim/t-vim.tex catalogue-also context-filter catalogue-ctan /macros/context/contrib/context-vim -catalogue-date 2015-08-03 06:08:41 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics synt-hlt ext-code context ++++++ context-visualcounter.doc.tar.xz ++++++ ++++++ context-visualcounter.tar.xz ++++++ ++++++ context-lilypond.doc.tar.xz -> context.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-f/context-lilypond.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new/context.doc.tar.xz differ: char 25, line 1 ++++++ context-lilypond.doc.tar.xz -> context.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-f/context-lilypond.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new/context.tar.xz differ: char 25, line 1 ++++++ context_fourier-map.dif ++++++ --- texmf-dist/fonts/map/pdftex/context/fourier.map +++ texmf-dist/fonts/map/pdftex/context/fourier.map 2007-05-24 09:05:32.000000000 +0000 @@ -0,0 +1,26 @@ +fourier-alt Fourier-Alternate-Roman <fourier-alt.pfb +fourier-alt-black Fourier-Alternate-Black <fourier-alt-black.pfb +fourier-alt-bold Fourier-Alternate-Bold <fourier-alt-bold.pfb +fourier-alt-bold-sl Fourier-Alternate-Bold ".167 SlantFont" <fourier-alt-bold.pfb +fourier-alt-boldita Fourier-Alternate-BoldItalic <fourier-alt-boldita.pfb +fourier-alt-ita Fourier-Alternate-Italic <fourier-alt-ita.pfb +fourier-alt-semi Fourier-Alternate-SemiBold <fourier-alt-semi.pfb +fourier-alt-semi-sl Fourier-Alternate-SemiBold ".167 SlantFont" <fourier-alt-semi.pfb +fourier-alt-semiita Fourier-Alternate-SemItalic <fourier-alt-semiita.pfb +fourier-alt-sl Fourier-Alternate-Roman ".167 SlantFont" <fourier-alt.pfb +fourier-bb Fourier-Math-BlackBoard <fourier-bb.pfb +fourier-mcl Fourier-Math-Cal <fourier-mcl.pfb +fourier-mex Fourier-Math-Extension <fourier-mex.pfb +fourier-ml Fourier-Math-Letters <fourier-ml.pfb +fourier-mlb Fourier-Math-Letters-Bold <fourier-mlb.pfb +fourier-mlit Fourier-Math-Letters-Italic <fourier-mlit.pfb +fourier-mlitb Fourier-Math-Letters-Bold-Italic <fourier-mlitb.pfb +fourier-ms Fourier-Math-Symbols <fourier-ms.pfb +fourier-orns fourier-orns <fourier-orns.pfb +fut10 Archaic-Futharc <fut10.pfb +futb8r Utopia-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc <putb8a.pfb +futbi8r Utopia-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc <putbi8a.pfb +futbo8r Utopia-Bold ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <putb8a.pfb +futr8r Utopia-Regular "TeXBase1Encoding ReEncodeFont" <8r.enc <putr8a.pfb +futri8r Utopia-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc <putri8a.pfb +futro8r Utopia-Regular ".167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc <putr8a.pfb ++++++ continue.doc.tar.xz ++++++ ++++++ continue.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/continue.tlpobj new/tlpkg/tlpobj/continue.tlpobj --- old/tlpkg/tlpobj/continue.tlpobj 2016-04-14 18:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/continue.tlpobj 2017-04-14 17:37:03.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/continue/continue.sty catalogue-also fwlw turnthepage catalogue-ctan /macros/latex/contrib/continue -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout page-hf catalogue-version 0.1 ++++++ contour.doc.tar.xz ++++++ ++++++ contour.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/contour.tlpobj new/tlpkg/tlpobj/contour.tlpobj --- old/tlpkg/tlpobj/contour.tlpobj 2016-04-14 18:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/contour.tlpobj 2017-04-14 17:37:03.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/contour/pdftex.cnt RELOC/tex/latex/contour/vtex.cnt catalogue-ctan /macros/latex/contrib/contour -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics decoration colour catalogue-version 2.14 ++++++ contracard.doc.tar.xz ++++++ ++++++ contracard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/contracard.tlpobj new/tlpkg/tlpobj/contracard.tlpobj --- old/tlpkg/tlpobj/contracard.tlpobj 2016-04-14 18:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/contracard.tlpobj 2017-04-14 17:37:03.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/contracard/contracard.cls catalogue-ctan /macros/latex/contrib/contracard -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics music catalogue-version 1.0.1 ++++++ convbkmk.doc.tar.xz ++++++ ++++++ convbkmk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/convbkmk.tlpobj new/tlpkg/tlpobj/convbkmk.tlpobj --- old/tlpkg/tlpobj/convbkmk.tlpobj 2016-04-14 18:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/convbkmk.tlpobj 2017-04-14 17:37:04.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=4 texmf-dist/scripts/convbkmk/convbkmk.rb catalogue-ctan /support/convbkmk -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics pdfprocess catalogue-version 0.10a ++++++ cooking.doc.tar.xz ++++++ ++++++ cooking.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cooking.tlpobj new/tlpkg/tlpobj/cooking.tlpobj --- old/tlpkg/tlpobj/cooking.tlpobj 2016-04-14 18:54:22.000000000 +0200 +++ new/tlpkg/tlpobj/cooking.tlpobj 2017-04-14 17:37:04.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/cooking/cooking.sty catalogue-also cuisine catalogue-ctan /macros/latex/contrib/cooking -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics cooking catalogue-version 0.9b ++++++ cookingsymbols.doc.tar.xz ++++++ ++++++ cookingsymbols.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cookingsymbols.tlpobj new/tlpkg/tlpobj/cookingsymbols.tlpobj --- old/tlpkg/tlpobj/cookingsymbols.tlpobj 2016-04-14 18:54:23.000000000 +0200 +++ new/tlpkg/tlpobj/cookingsymbols.tlpobj 2017-04-14 17:37:04.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/fonts/tfm/public/cookingsymbols/cookingsymbols.tfm RELOC/tex/latex/cookingsymbols/cookingsymbols.sty catalogue-ctan /macros/latex/contrib/cookingsymbols -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-symbol cooking catalogue-version 1.1 ++++++ cool.doc.tar.xz ++++++ ++++++ cool.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cool.tlpobj new/tlpkg/tlpobj/cool.tlpobj --- old/tlpkg/tlpobj/cool.tlpobj 2016-04-14 18:54:23.000000000 +0200 +++ new/tlpkg/tlpobj/cool.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=19 RELOC/tex/latex/cool/cool.sty catalogue-ctan /macros/latex/contrib/cool -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics maths struc-mkup catalogue-version 1.35 ++++++ coollist.doc.tar.xz ++++++ ++++++ coollist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coollist.tlpobj new/tlpkg/tlpobj/coollist.tlpobj --- old/tlpkg/tlpobj/coollist.tlpobj 2016-04-14 18:54:24.000000000 +0200 +++ new/tlpkg/tlpobj/coollist.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/coollist/coollist.sty catalogue-ctan /macros/latex/contrib/coollist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics data-manip catalogue-version 1.4 ++++++ coolstr.doc.tar.xz ++++++ ++++++ coolstr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coolstr.tlpobj new/tlpkg/tlpobj/coolstr.tlpobj --- old/tlpkg/tlpobj/coolstr.tlpobj 2016-04-14 18:54:24.000000000 +0200 +++ new/tlpkg/tlpobj/coolstr.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/coolstr/coolstr.sty catalogue-ctan /macros/latex/contrib/coolstr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lgpl catalogue-topics string catalogue-version 2.2 ++++++ coolthms.doc.tar.xz ++++++ ++++++ coolthms.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coolthms.tlpobj new/tlpkg/tlpobj/coolthms.tlpobj --- old/tlpkg/tlpobj/coolthms.tlpobj 2016-04-14 18:54:24.000000000 +0200 +++ new/tlpkg/tlpobj/coolthms.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/coolthms/coolthms.sty catalogue-ctan /macros/latex/contrib/coolthms -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 label-ref catalogue-version 1.2 ++++++ cooltooltips.doc.tar.xz ++++++ ++++++ cooltooltips.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cooltooltips.tlpobj new/tlpkg/tlpobj/cooltooltips.tlpobj --- old/tlpkg/tlpobj/cooltooltips.tlpobj 2016-04-14 18:54:24.000000000 +0200 +++ new/tlpkg/tlpobj/cooltooltips.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/cooltooltips/cooltooltips.sty catalogue-ctan /macros/latex/contrib/cooltooltips -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 1.0 ++++++ coordsys.doc.tar.xz ++++++ ++++++ coordsys.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coordsys.tlpobj new/tlpkg/tlpobj/coordsys.tlpobj --- old/tlpkg/tlpobj/coordsys.tlpobj 2016-04-14 18:54:25.000000000 +0200 +++ new/tlpkg/tlpobj/coordsys.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/coordsys/logsys.sty catalogue-also logsys catalogue-ctan /macros/latex/contrib/coordsys -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 catalogue-version 1.4 ++++++ copyedit.doc.tar.xz ++++++ ++++++ copyedit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/copyedit.tlpobj new/tlpkg/tlpobj/copyedit.tlpobj --- old/tlpkg/tlpobj/copyedit.tlpobj 2016-04-14 18:54:25.000000000 +0200 +++ new/tlpkg/tlpobj/copyedit.tlpobj 2017-04-14 17:37:05.000000000 +0200 @@ -18,7 +18,7 @@ runfiles size=3 RELOC/tex/latex/copyedit/copyedit.sty catalogue-ctan /macros/latex/contrib/copyedit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics english catalogue-version 1.6 ++++++ copyrightbox.doc.tar.xz ++++++ ++++++ copyrightbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/copyrightbox.tlpobj new/tlpkg/tlpobj/copyrightbox.tlpobj --- old/tlpkg/tlpobj/copyrightbox.tlpobj 2016-04-14 18:54:27.000000000 +0200 +++ new/tlpkg/tlpobj/copyrightbox.tlpobj 2017-04-14 17:37:06.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/copyrightbox/copyrightbox.sty catalogue-ctan /macros/latex/contrib/copyrightbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting catalogue-version 0.1 ++++++ coseoul.doc.tar.xz ++++++ ++++++ coseoul.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coseoul.tlpobj new/tlpkg/tlpobj/coseoul.tlpobj --- old/tlpkg/tlpobj/coseoul.tlpobj 2016-04-14 18:54:27.000000000 +0200 +++ new/tlpkg/tlpobj/coseoul.tlpobj 2017-04-14 17:37:13.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/coseoul/coseoul.sty catalogue-ctan /macros/latex/contrib/coseoul -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics headings catalogue-version 1.1 ++++++ countriesofeurope.doc.tar.xz ++++++ ++++++ countriesofeurope.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/countriesofeurope.tlpobj new/tlpkg/tlpobj/countriesofeurope.tlpobj --- old/tlpkg/tlpobj/countriesofeurope.tlpobj 2016-04-14 18:54:27.000000000 +0200 +++ new/tlpkg/tlpobj/countriesofeurope.tlpobj 2017-04-14 17:37:13.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/fonts/type1/public/countriesofeurope/CountriesOfEurope.pfb RELOC/tex/latex/countriesofeurope/CountriesOfEurope.sty catalogue-ctan /fonts/countriesofeurope -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-type1 font-novelty catalogue-version 0.21 ++++++ counttexruns.doc.tar.xz ++++++ ++++++ counttexruns.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/counttexruns.tlpobj new/tlpkg/tlpobj/counttexruns.tlpobj --- old/tlpkg/tlpobj/counttexruns.tlpobj 2016-04-14 18:54:27.000000000 +0200 +++ new/tlpkg/tlpobj/counttexruns.tlpobj 2017-04-14 17:37:13.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/counttexruns/counttexruns.sty catalogue-ctan /macros/latex/contrib/counttexruns -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics compilation catalogue-version 1.00a ++++++ courier-scaled.doc.tar.xz ++++++ ++++++ courier-scaled.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/courier-scaled.tlpobj new/tlpkg/tlpobj/courier-scaled.tlpobj --- old/tlpkg/tlpobj/courier-scaled.tlpobj 2016-04-14 18:54:28.000000000 +0200 +++ new/tlpkg/tlpobj/courier-scaled.tlpobj 2017-04-14 17:37:14.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/tex/latex/courier-scaled/ts1pcrs.fd RELOC/tex/latex/courier-scaled/xl2pcrs.fd catalogue-ctan /fonts/psfonts/courier-scaled -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-use ++++++ courier.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/courier.tlpobj new/tlpkg/tlpobj/courier.tlpobj --- old/tlpkg/tlpobj/courier.tlpobj 2016-04-14 18:54:27.000000000 +0200 +++ new/tlpkg/tlpobj/courier.tlpobj 2017-04-14 17:37:13.000000000 +0200 @@ -132,6 +132,6 @@ RELOC/tex/latex/courier/ts1ucr.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 ++++++ courseoutline.doc.tar.xz ++++++ ++++++ courseoutline.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/courseoutline.tlpobj new/tlpkg/tlpobj/courseoutline.tlpobj --- old/tlpkg/tlpobj/courseoutline.tlpobj 2016-04-14 18:54:28.000000000 +0200 +++ new/tlpkg/tlpobj/courseoutline.tlpobj 2017-04-14 17:37:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/courseoutline/courseoutline.cls catalogue-ctan /macros/latex/contrib/courseoutline -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics teaching catalogue-version 1.0 ++++++ coursepaper.doc.tar.xz ++++++ ++++++ coursepaper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coursepaper.tlpobj new/tlpkg/tlpobj/coursepaper.tlpobj --- old/tlpkg/tlpobj/coursepaper.tlpobj 2016-04-14 18:54:29.000000000 +0200 +++ new/tlpkg/tlpobj/coursepaper.tlpobj 2017-04-14 17:37:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=4 RELOC/tex/latex/coursepaper/coursepaper.cls catalogue-ctan /macros/latex/contrib/coursepaper -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics essay catalogue-version 2.0 ++++++ coverpage.doc.tar.xz ++++++ ++++++ coverpage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coverpage.tlpobj new/tlpkg/tlpobj/coverpage.tlpobj --- old/tlpkg/tlpobj/coverpage.tlpobj 2016-04-14 18:54:29.000000000 +0200 +++ new/tlpkg/tlpobj/coverpage.tlpobj 2017-04-14 17:37:14.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/coverpage/CoverPage.cfg RELOC/tex/latex/coverpage/CoverPage.sty catalogue-ctan /macros/latex/contrib/coverpage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics journalpub catalogue-version 1.01 ++++++ covington.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/README new/doc/latex/covington/README --- old/doc/latex/covington/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/covington/README 2017-06-06 23:51:35.000000000 +0200 @@ -0,0 +1,89 @@ +========================================================================= +The covington package + +LaTeX macros for Linguistics + +Copyright 1991--2017 Michael A. Covington + Robin Fairbairns + Juergen Spitzmueller + +Current Maintainer: Juergen Spitzmueller +E-mail: juergen (at) spitzmueller (dot) org + +Released under the LaTeX Project Public License v1.3 or later +See http://www.latex-project.org/lppl.txt +========================================================================= + +== PURPOSE == + +This package, initially a collection of Michael Covington's private macros, provides +numerous minor LaTeX enhancements for linguistics, including multiple accents on the +same letter, interlinear glosses (word-by-word translations), Discourse Represenation +Structures, and example numbering. + +The package works both with LaTeX 2.09 and LaTeX 2e. + +== CONTENTS == + +The package consists of the following files: + +* covington.sty: the actual package +* covington.tex: the documentation +* README (this file) + +== CHANGES == + +* Version 1.4 (2017-05-23): + + - Introduce a new macro \twodias that supersedes the rather odd \twoacc + (which is kept for backwards compatibility). + + - Introduce macro \SetDiaOffset for more convenient setting of vertical + distance in stacked diacritics. + + - LaTeX 2.09 is no longer officially supported (it might continue to work, + but is not tested). + + - Documentation file converted to un*x line endings. + +* Version 1.3 (2017-04-05): + + - Gloss variants \xgll and \xglll that work inside macros (such as footnotes) + but require explicit gloss line end markers (\xgle). + + - Provide way to globally alter indentation and vertical distance of reflists + (new lengths \reflistindent, \reflistparsep and \reflistitemsep). + +* Version 1.2 (2016-08-26): + + - New length \examplenumbersep to adjust (increase) the horizontal space + between example number and example text. + + - Add some more info about bibliography generation. + +* Version 1.1a (2016-07-07): + + - Fix encoding problem in documentation and some typos. No change in functionality. + +* Version 1.1 (2016-07-06): + + - The package now uses NFSS font commands if available (fallback for LaTeX 2.09 + is still provided). + + - Work around clash with classes/packages that define their own example and + examples environments (most notably the beamer class) as well as execise + environments. The covington package no longer blindly attempts to define + these environments. By default, it does not define them if they are already + defined (covington's own environments, however, are still available via aliases). + By means of a new package option, a redefinition can also be forced. + + - New length \twoaccsep allows for the adjustment of the distance between stacked + accents. + + - Update manual. + + - New maintainer: J. Spitzmueller. + + - License has been changed to LPPL (in agreement with M. Covington). + + - Introduce version numbers. Arbitrarily, we start with 1.1. Binary files old/doc/latex/covington/covington.pdf and new/doc/latex/covington/covington.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/covington.tex new/doc/latex/covington/covington.tex --- old/doc/latex/covington/covington.tex 2006-01-09 01:49:07.000000000 +0100 +++ new/doc/latex/covington/covington.tex 2017-06-06 23:51:35.000000000 +0200 @@ -1,129 +1,215 @@ -% File: covington.tex (in LaTeX2e) -% Documentation for covington.sty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File covington.tex +%% +%% Documentation of covington +%% +%% This file is part of the covington LaTeX package +%% +%% Original author: +%% ================ +%% Michael A. Covington +%% Artificial Intelligence Programs +%% The University of Georgia +%% Athens, Georgia 30602-7415 USA +%% mcovingt(a)aisun1.ai.uga.edu +%% +%% Current maintainer: +%% =================== +%% Juergen Spitzmueller <juergen(a)spitzmueller.org> +%% +%% 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/covington +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\documentclass[english]{article} + +\usepackage[libertine]{newtxmath} +\usepackage[osf]{libertine} +\usepackage[scaled=0.75]{beramono} +\usepackage[T1]{fontenc} +\usepackage[latin9]{inputenc} -\documentclass{article} \usepackage{covington} -\title{\bf Typing Linguistics with {\tt covington.sty}} -\author{Michael A. Covington \\ - \small Artificial Intelligence Center \\ - \small The University of Georgia \\ - \small Athens, Georgia 30602 \sc u.s.a.\\ - mcovingt(a)ai.uga.edu\\ - http://www.ai.uga.edu/$\sim$mc} -\date{2001 March 27} -\begin{document} -\maketitle -{\footnotesize \tableofcontents} -\typeout{Run LaTeX twice to get a correct table of contents.} +\usepackage{url} +\usepackage[bookmarks=true, + bookmarksnumbered=false, + bookmarksopen=false, + breaklinks=false, + pdfborder={0 0 0}, + backref=false, + colorlinks=false +]{hyperref} +\hypersetup{% + pdftitle={The covington manual}, + pdfauthor={J�rgen Spitzm�ller}, + pdfkeywords={latex,linguistics} +} -\section*{New in This Version} -\begin{itemize} -\item It is no longer necessary to type \verb"\it" to get proper italic type in feature structures. -\item Instructions have been rewritten with \LaTeXe\ users in mind. -\end{itemize} +\usepackage{microtype} -\section*{New in Preceding Versions} -\begin{itemize} -\item Multiple accents on a single letter (e.g., \emph{\acm{a}}) are supported. -\item This package is now called {\tt covington} (with the o) -and is compatible with \LaTeXe\ and NFSS as well as \LaTeX\ 2.09. -\item The vertical placement of labeled feature structures has -been changed -so that the category labels line up regardless of the size of -the structures. -\end{itemize} - -\section*{Introduction} -This file, {\tt covington.tex}, is the documentation for the -March 2001 version of {\tt covington.sty}, which is a \LaTeX\ style -option for typing many of the special notations common in linguistics. - -{\footnotesize -In em\TeX\ under MS-DOS, {\tt covington.sty} is called {\tt covingto.sty}. -The missing $n$ has no effect.} - -To use {\tt covington.sty}, you should have a copy of it in either your -current directory or the directory where \LaTeX\ styles are kept on your -system. - -Then, under \LaTeXe, -include the command -\verb"\usepackage{covington}" -after your \verb"\documentclass" command. - -{\footnotesize -In \LaTeX\ 2.09, -include {\tt covington} among the optional parameters of -\verb"\documentstyle", like this: \hfill\\ -{\tt -\verb"\documentstyle[12pt,"\underline{covington}\verb"]{article}" -}\hfill\\ -Note the spelling {\tt covington} (9 letters). -} +% Tweak the TOC (make it more compact) +\usepackage{tocloft} +\setlength{\cftbeforesecskip}{0pt} +\renewcommand{\cfttoctitlefont}{\normalsize\bfseries} +\renewcommand{\cftsecfont}{\footnotesize} +\renewcommand{\cftsecpagefont}{\footnotesize} + +\usepackage{babel} + +\usepackage{listings} +\lstset{language={[LaTeX]TeX}, + basicstyle={\small\ttfamily}, + frame=single} + +% markup +\newcommand*\jmacro[1]{\textbf{\texttt{#1}}} +\newcommand*\jenv[1]{\textbf{\texttt{#1}}} +\newcommand*\jcsmacro[1]{\jmacro{\textbackslash{#1}}} +\newcommand*\joption[1]{\textbf{\texttt{#1}}} +\newcommand*\jfmacro[1]{\texttt{#1}} +\newcommand*\jfenv[1]{\texttt{#1}} +\newcommand*\jfcsmacro[1]{\jfmacro{\textbackslash{#1}}} + +% Strings +\newcommand*{\cvt}{\textsf{covington}} + +% +% Titling +% +\def\pversion{Version 1.4} +\def\pdate{May 23, 2017} + +\title{\textbf{The \cvt\ Package\\Macros for Linguistics}} +\author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer. + Please report issues via \protect\url{https://github.com/jspitz/covington}}} + +\date{\pversion, \pdate} -In what follows I presume that you know how to use \LaTeX\ and have -access to the \LaTeX\ manual. Note that {\tt covington.sty} does not +\begin{document} + +\maketitle + +\begin{abstract} +\noindent This package, initially a collection of Michael A. Covington's private macros, provides +numerous minor \LaTeX\ enhancements for linguistics, including multiple diacritics on the +same letter, interlinear glosses (word-by-word translations), Discourse Representation Structures, +and example numbering. +\end{abstract} + +\tableofcontents + + +\section{Introduction} + +This file is the documentation for \MakeLowercase{\pversion} +of \cvt\ (\pdate), which is a \LaTeX\ package providing macros +for typing some special notations common in linguistics.% +\footnote{The package has a long history. It started off as a collection of private macros back in the +\LaTeX\ 2.09 days and was initially released as \texttt{covingtn.sty} (following the old 8.3 \textsc{fat} +file name limit). In em\TeX\ under \textsc{ms-dos}, the file was distributed as \texttt{covingto.sty}. +Eventually, it has been renamed to \cvt\ and adapted to \LaTeXe. Its \LaTeX\ 2.09 traces +are however still visible, and the style might actually still work with \LaTeX\ 2.09 (which is however not guaranteed).} + +To use \cvt\ with \LaTeXe, load the package as usual by adding the command +\lstinline"\usepackage{covington}" to your document preamble. +The package has the following option: +\begin{description} + \item{\joption{force}:} Force the redefinition of environments that have already been + defined by other packages or the class. + + This applies to the \jenv{example}, \jenv{examples} and \jenv{exercise} environments, + which are by default not touched if they are already defined before \cvt\ is loaded. + See sec.~\ref{sec:ex}, \ref{sec:exs} and \ref{sec:exercises} for details. +\end{description} +% +In what follows we presume that you know how to use \LaTeX\ and have +access to \LaTeX\ manuals. Note that \cvt\ does not provide any special fonts or character sets. However, it can be used in combination with other style sheets that do. -If you are using {\tt covington.sty} and {\tt uga.sty} (UGa thesis style) -together, you should mention {\tt uga} before {\tt covington}. +If you are using \cvt\ and \texttt{uga.sty} (UGa thesis style) +together, you should load \texttt{uga} before \cvt. -\section{Accents} +\section{Stacked diacritics}\label{sec:accents} -\LaTeX\ provides a generous range of accents that can be placed on any +\LaTeX\ provides a generous range of diacritics that can be placed on or below any letter, such as: \begin{flushleft} \`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x} \end{flushleft} which are typed, respectively, as: -\begin{verbatim} +\begin{lstlisting} \`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x} -\end{verbatim} -\LaTeX also provides the foreign characters +\end{lstlisting} +\LaTeX\ also provides support for many non-\textsc{ascii} characters, such as% +\footnote{Please refer to \cite{pakin} for a comprehensive list of special characters and symbols.}: \begin{flushleft}\obeyspaces \i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !` \end{flushleft} -which are typed as: -\begin{verbatim} +via the macros: +\begin{lstlisting} \i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !` -\end{verbatim} - -But by itself, \LaTeX\ doesn't give you a convenient way to put two -accents on the same letter. To fill this gap, {\tt covington.sty} provides +\end{lstlisting} +% +Out of the box, however, \LaTeX\ doesn't give you a convenient way to put \emph{two} +diacritical marks on the same letter. To fill this gap, \cvt\ provides the following macros: \begin{flushleft} -\verb,\twoacc[...|...], \quad to combine any 2 accents, e.g., - \verb.\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt] -\verb,\acm{...}, \quad for acute over macron, e.g., \verb.\acm{a}. = \acm{a}\\ -\verb,\grm{...}, \quad for grave over macron, e.g., \verb.\grm{a}. = \grm{a}\\ -\verb,\cim{...}, \quad for circumflex over macron, e.g., \verb.\cim{a}. = \cim{a} -\end{flushleft} -The first of these is the general case and the latter three are special -cases that occur often in transcribing Greek. Now you can type + \jcsmacro{twodias\{<upper diac.>\}\{<lower diac.>\}\{<char>\}}\\to combine any two diacritics, e.\,g., + \lstinline[moretexcs={twodias}].\twodias{\~}{\=}{a}. = \twodias{\~}{\=}{a}\\[6pt] + \jcsmacro{acm\{\ldots\}} \quad for acute over macron, e.\,g., \lstinline[moretexcs={acm}].\acm{a}. = \acm{a}\\ + \jcsmacro{grm\{\ldots\}} \quad for grave over macron, e.\,g., \lstinline[moretexcs={grm}].\grm{a}. = \grm{a}\\ + \jcsmacro{cim\{\ldots\}} \quad for circumflex over macron, e.\,g., \lstinline[moretexcs={cim}].\cim{a}. = \cim{a} +\end{flushleft} +The first of these is the general case\footnote{% + Alternatively, there's also the old syntax \jcsmacro{twoacc[<upper diac.>|<char with lower diacr.>],} + e.\,g. \jfcsmacro{twoacc[\textbackslash\textasciitilde|\textbackslash=\{a\}]} to the same effect, which is however discouraged + due to its rather odd form.} and the latter three are special +cases that are often used in Greek transcription. Now you can type \emph{Koin\acm{e}} with both accents in place. -Note the peculiar syntax of \verb.\twoacc. --- its arguments are in -square brackets, not curly brackets, and are separated by \verb.|.. -The first argument is the upper accent (only) and the second argument -is the letter with the lower accent indicated. +The vertical distance between the two diacritics can be adjusted via the macro \jcsmacro{SetDiaOffset\{<length>\}} +which lets you increase or decrease the vertical space that is currently in effect. +If you'd use \verb"\SetDiaOffset{-0.25ex}", the above examples would come out as + +\SetDiaOffset{-.25ex} +\begin{flushleft} + \jcsmacro{twodias\{<upper diac.>\}\{<lower diac.>\}\{<char>\}}\\to combine any two diacritics, e.\,g., + \lstinline[moretexcs={twodias}].\twodias{\~}{\=}{a}. = \twodias{\~}{\=}{a}\\[6pt] + \jcsmacro{acm\{\ldots\}} \quad for acute over macron, e.\,g., \lstinline[moretexcs={acm}].\acm{a}. = \acm{a}\\ + \jcsmacro{grm\{\ldots\}} \quad for grave over macron, e.\,g., \lstinline[moretexcs={grm}].\grm{a}. = \grm{a}\\ + \jcsmacro{cim\{\ldots\}} \quad for circumflex over macron, e.\,g., \lstinline[moretexcs={cim}].\cim{a}. = \cim{a} +\end{flushleft} +with a slightly better matching distance for the font used here. -Note also that not all accents work in the {\tt tabbing} environment. -Use {\tt tabular} or see the \LaTeX\ manual for workarounds. +Note that not all accent macros work in the \jfenv{tabbing} environment. +Use the \jfenv{Tabbing} package or refer to \cite{pakin} for alternative solutions. \section{Example numbers} Linguistics papers often include numbered examples. -The macro \verb"\exampleno" generates a new example number and can be +The macro \jcsmacro{exampleno} generates a new example number and can be used anywhere you want the number to appear. For example, to display a sentence with a number at the extreme right, do this: -\begin{verbatim} +\begin{lstlisting}[moretexcs={exampleno}] \begin{flushleft} This is a sentence. \hfill (\exampleno) \end{flushleft} -\end{verbatim} +\end{lstlisting} Here's what you get: \begin{flushleft} This is a sentence. \hfill (\exampleno) @@ -131,41 +217,56 @@ The example counter is actually the same as \LaTeX's equation counter, so that if you use equations and numbered examples in the same paper, you get a single continuous series of numbers. If you want to -access the number without changing it, use \verb"\theequation". +access the number without changing it, use \jfcsmacro{theequation}. -Also, you can use \verb"\label" and \verb"\ref" with example numbers in -exactly the same way as with equation numbers. See the \LaTeX\ manual for -details. This applies to the {\tt example} and {\tt examples} -environments, described next, as well as to \verb"\exampleno" itself. +Also, you can use \jfcsmacro{label} and \jfcsmacro{ref} with example numbers in +exactly the same way as with equation numbers. Refer to your \LaTeX\ manual for +details. This applies to the \jenv{example} and \jenv{examples} +environments, described next, as well as to \jcsmacro{exampleno} itself. -\section{The {\tt example} environment} +\section{The \jenv{example} environment}\label{sec:ex} -The {\tt example} environment displays a single example +The \jenv{example} environment (alias \jenv{covexample}) displays a single example with a generated example number to the left of it. If you type -\begin{verbatim} +\begin{lstlisting} \begin{example} This is a sentence. \end{example} -\end{verbatim} +\end{lstlisting} +or +\begin{lstlisting} +\begin{covexample} +This is a sentence. +\end{covexample} +\end{lstlisting} you get: \begin{example} This is a sentence. \end{example} -The {\tt example} environment is a lot like {\tt flushleft}. The example -can be of any length; it can consist of many lines (separated by \verb"\\"), -or even whole paragraphs. - -One way to number sub--examples is to use {\tt itemize} or {\tt -enumerate} within an example, like this: -\begin{verbatim} +The example can be of any length; it can consist of many lines (separated by \verb"\\"), or even whole paragraphs. + +If you need more space between the example number and the text, you can increase it by means of +the length \jcsmacro{examplenumbersep} (which is preset to \texttt{0pt}). Doing \lstinline|\setlength\examplenumbersep{1em}|, +for instance, will increase the space by 1\,em. + +Note that, as of version 1.1, \cvt\ checks if there is already an \jenv{example} environment defined +(e.\,g., by the class). If so, \cvt\ does not +define its own one. However, there is always the alias environment \jenv{covexample} which can be used in order to +produce \texttt{covington's} example. If you use the package option \joption{force}, \cvt\ will override +existing \jenv{example} environments. In any case, the package will issue a warning if \jenv{example} is already defined +(this is the case, for instance, if you use \cvt\ with the \texttt{beamer} class). + +One way to number sub-examples is to use \jfenv{itemize} or \jfenv{enumerate} +within an example, like this: +\begin{lstlisting} \begin{example} \begin{itemize} \item[(a)] This is the first sentence. \item[(b)] This is the second sentence. \end{itemize} \end{example} -\end{verbatim} +\end{lstlisting} This prints as: \begin{example} \begin{itemize} @@ -173,76 +274,100 @@ \item[(b)] This is the second sentence. \end{itemize} \end{example} -However, the {\tt examples} environment, described next, is usually more +However, the \jenv{examples} environment, described next, is usually more convenient. -\section{The {\tt examples} environment} +\section{The \jenv{examples} environment}\label{sec:exs} To display a series of examples together, each with its own example -number, use {\tt examples} instead of {\tt example}. The only +number, use \jenv{examples} (or \jenv{covexamples}) instead of \jenv{example} or \jenv{covexample}. The only difference is that there can be more than one example, and each of them -has to be introduced by \verb"\item", like this: -\begin{verbatim} +has to be introduced by \jfcsmacro{item}, like this: +\begin{lstlisting} \begin{examples} \item This is the first sentence. \item This is the second sentence. \end{examples} -\end{verbatim} +\end{lstlisting} +or, respectively: +\begin{lstlisting} +\begin{covexamples} +\item This is the first sentence. +\item This is the second sentence. +\end{covexamples} +\end{lstlisting} This prints as: \begin{examples} \item This is the first sentence. \item This is the second sentence. \end{examples} +As for \jenv{example}, \cvt\ checks if there is already an \jenv{examples} environment defined, +and if this is the case, \cvt\ does not define its own one. The alias environment \jenv{covexamples} +is always available as a fallback. If you use the package option \joption{force}, \cvt\ will override +existing \jenv{examples} environments. The package will issue a warning if \jenv{examples} is already defined +(this is the case, for instance, if you use \cvt\ with the \texttt{beamer} class), telling you +how it has dealt with the situation. -\section{Glossing sentences word--by--word} +\section{Glossing sentences word-by-word}\label{sec:gloss} -To gloss a sentence is to annotate it word--by--word. Most commonly, a -sentence in a foreign language is followed by a word--for--word +To gloss a sentence is to annotate it word-by-word. Most commonly, a +sentence in a foreign language is followed by a word-for-word translation (with the words lined up vertically) and then a smooth translation (not lined up), like this:% \footnote{The macros for handling glosses are adapted with permission -from {\tt gloss.tex}, by Marcel R. van der Goot.} +from \texttt{gloss.tex}, by Marcel R. van der Goot.} \gll Dit is een Nederlands voorbeeld. This is a Dutch example. \glt `This is an example in Dutch.' \glend That particular example would be typed as: -\begin{verbatim} +\begin{lstlisting}[moretexcs={gll,glt,glend}] \gll Dit is een Nederlands voorbeeld. This is a Dutch example. \glt `This is an example in Dutch.' \glend -\end{verbatim} +\end{lstlisting} Notice that the words do not have to be typed lining up; instead, \TeX\ counts them. If the words in the two languages do not correspond -one--to--one, you can use curly brackets to show the intended grouping. +one-to-one, you can use curly brackets to group words. For example, to print \gll Dit is een voorbeeldje in het Nederlands. This is a {little example} in {} Dutch. \glt `This is a little example in Dutch.' \glend you would type: -\begin{verbatim} +\begin{lstlisting}[moretexcs={gll,glt,glend}] \gll Dit is een voorbeeldje in het Nederlands. This is a {little example} in {} Dutch. \glt `This is a little example in Dutch.' \glend -\end{verbatim} -All together, {\tt covington.sty} gives you five macros for dealing with +\end{lstlisting} +Note that \cvt\ locally activates the end of line in glosses in order to identify the different lines of the gloss (via category code change). This does not work inside macros (e.\,g., if the gloss is in a footnote). To work around this, a special version of the \jcsmacro{gll} macro is provided that does without the character activation: \jcsmacro{xgll}. This can also be used in macro arguments; however, the end of each gloss line needs to be explicitly specified by the \jcsmacro{xgle} macro in this case. If you want to put the above gloss in a footnote, thus, you would type: +\begin{lstlisting}[moretexcs={xgll,xgle,glt,glend}] +\xgll Dit is een voorbeeldje in het Nederlands.\xgle + This is a {little example} in {} Dutch.\xgle +\glt `This is a little example in Dutch.' +\glend +\end{lstlisting} +% +All together, \cvt\ provides eight macros for dealing with glosses: \begin{itemize} -\item \verb"\gll" introduces two lines of words vertically aligned, and -activates an environment very similar to {\tt flushleft}. -\item \verb"\glll" is like \verb"gll" except that it introduces {\em -three} lines of lined--up words (useful for cited forms, morphology, +\item \jcsmacro{gll} introduces two lines of words vertically aligned, and +activates an environment very similar to \jfenv{flushleft}. The two lines are separated by a normal line break (carriage return). +\item \jcsmacro{glll} is like \jcsmacro{gll} except that it introduces +\emph{three} lines of lined-up words (useful for cited forms, morphology, and translation). -\item \verb"\glt" ends the set of lined--up lines and introduces a line +\item \jcsmacro{xgll} is similar to \jcsmacro{gll} except that it does not make the line ending active. It thus works inside macros such as footnotes but requires explicit gloss line termination via \jcsmacro{xgle}. +\item \jcsmacro{xglll} is similar to \jcsmacro{glll} except that it does not make the line ending active. It thus works inside macros such as footnotes but requires explicit gloss line termination via \jcsmacro{xgle}. +\item \jcsmacro{xgle} is a gloss line ending marker to be used with \jcsmacro{xgll} and \jcsmacro{xglll}. +\item \jcsmacro{glt} ends the set of lined-up lines and introduces a line (or more) of translation. -\item \verb"\gln" is like \verb"\glt" but does not start a new line +\item \jcsmacro{gln} is like \jcsmacro{glt} but does not start a new line (useful when no translation follows but you want to put a number on the right). -\item \verb"\glend" ends the special {\tt flushleft}--like environment. +\item \jcsmacro{glend} ends the special \jfenv{flushleft}-like environment. \end{itemize} Here are several examples. First, a sentence with three lines aligned, instead of just two: @@ -252,13 +377,13 @@ \glt `This is another example.' \glend This is typed as: -\begin{verbatim} +\begin{lstlisting}[moretexcs={glll,glt,glend}] \glll Hoc est aliud exemplum. n.sg.nom 3.sg n.sg.nom n.sg.nom This is another example. \glt `This is another example.' \glend -\end{verbatim} +\end{lstlisting} Next, an example with a gloss but no translation, with an example number at the right: \gll Hoc habet numerum. @@ -266,13 +391,13 @@ \gln \hfill (\exampleno) \glend That one was typed as: -\begin{verbatim} +\begin{lstlisting}[moretexcs={gll,gln,glend,exampleno}] \gll Hoc habet numerum. This has number \gln \hfill (\exampleno) \glend -\end{verbatim} -Finally we'll put a glossed sentence inside the {\tt example} +\end{lstlisting} +Finally we'll put a glossed sentence inside the \texttt{example} environment, which is a very common way of using it: \begin{example} \gll Hoc habet numerum praepositum. @@ -281,147 +406,185 @@ \glend \end{example} This last example was, of course, typed as: -\begin{verbatim} +\begin{lstlisting}[moretexcs={gll,glt,glend}] \begin{example} \gll Hoc habet numerum praepositum. This has number preposed \glt `This one has a number in front of it.' \glend \end{example} -\end{verbatim} -Notice that every glossed sentence begins with either \verb"\gll" or -\verb"\glll", then contains either \verb"\glt" or \verb"\gln", and ends -with \verb"\glend". Layout is critical in the part preceding -\verb"\glt" or \verb"\gln", and fairly free afterward. +\end{lstlisting} +Notice that every glossed sentence begins with either \jcsmacro{gll} or +\jcsmacro{glll}, then contains either \jcsmacro{glt} or \jcsmacro{gln}, and ends +with \jcsmacro{glend}. Layout is critical in the part preceding +\jcsmacro{glt} or \jcsmacro{gln}, and fairly free afterward. \section{Phrase structure rules} -To print the phrase structure rule \psr{S}{NP~VP} you can type -\verb"\psr{S}{NP~VP}", and likewise for other phrase structure rules. +To print phrase structure rules such as \psr{S}{NP~VP} you can use \texttt{covington's} macro +\lstinline[moretexcs={psr}]"\psr{<constituent>}{<sub-constituents>}" (for the given example, +\lstinline[moretexcs={psr}]"\psr{S}{NP~VP}"). \section{Feature structures} -To print a feature structure such as: +To print a feature structure such as \begin{flushleft} -%\fs{\it case:nom \\ \it person:P} -\fs{case:nom} +\fs{case:nom \\ person:P} \end{flushleft} you can type: -\begin{verbatim} +\begin{lstlisting}[moretexcs={fs}] \fs{case:nom \\ person:P} -\end{verbatim} +\end{lstlisting} The feature structure can appear anywhere --- in continuous text, in a -displayed environment such as {\tt flushleft}, or inside a -phrase--structure rule, or even inside another feature structure. +displayed environment such as \jfenv{flushleft}, or inside a +phrase-structure rule, or even inside another feature structure. To put a category label at the top of the feature structure, like this, \begin{flushleft} \lfs{N}{case:nom \\ person:P} \end{flushleft} here's what you type: -\begin{verbatim} +\begin{lstlisting}[moretexcs={lfs}] \lfs{N}{case:nom \\ person:P} -\end{verbatim} -And here is an example of a PS--rule made of labeled feature structures: +\end{lstlisting} +And here is an example of a \textsc{ps}-rule made of labeled feature structures: \begin{flushleft} \psr{\lfs{S}{tense:T}} {\lfs{NP}{case:nom \\ number:N} \lfs{VP}{tense:T \\ number:N} } \end{flushleft} -which was of course typed as: -\begin{verbatim} +which was obviously coded as: +\begin{lstlisting}[moretexcs={lfs,psr}] \psr{\lfs{S}{tense:T}} {\lfs{NP}{case:nom \\ number:N} \lfs{VP}{tense:T \\ number:N} } -\end{verbatim} +\end{lstlisting} -\section{Discourse representation structures} +\section{Discourse Representation Structures} -Several macros in {\tt covington.sty} facilitate display of discourse -repsesentation structures (DRSes) in the box notation originally used by -Hans Kamp. The simplest is \verb"\drs", which takes two arguments: -a list of discourse variables joined by \verb"~", and a list of DRS +Several macros in \cvt\ facilitate display of discourse +Representation Structures (\textsc{drs}es) in the box notation introduced by +Hans Kamp. The simplest one is \jcsmacro{drs}, which takes two arguments: +a list of discourse variables joined by \verb"~", and a list of \textsc{drs} conditions separated by \verb"\\". Nesting is permitted. Note that the -\verb"\drs" macro itself does not give you a displayed environment; you -must use {\tt flushleft} or the like to display the DRS. +\jcsmacro{drs} macro itself does not give you a displayed environment; you +must use \jfenv{flushleft} or the like to display the \textsc{drs}. Here are some examples: -\begin{verbatim} -\drs{X}{donkey(X)\\green(X)} -\end{verbatim} + +\begin{minipage}{.5\textwidth} +\begin{lstlisting}[moretexcs={drs}] +\begin{flushleft} + \drs{X}{donkey(X)\\green(X)} +\end{flushleft} +\end{lstlisting} +\end{minipage}\hfill +\begin{minipage}{.4\textwidth} \begin{flushleft} \drs{X}{donkey(X)\\green(X)} \end{flushleft} -\begin{verbatim} -\drs{X} -{named(X,`Pedro') \\ -\drs{Y}{donkey(Y)\\owns(X,Y)}~~ - {\large $\Rightarrow$}~ - \drs{~}{feeds(X,Y)} -} -\end{verbatim} +\end{minipage} + +\medskip + +\begin{minipage}{.5\textwidth} +\begin{lstlisting}[moretexcs={drs}] \begin{flushleft} -\drs{X} -{named(X,`Pedro') \\ -\drs{Y}{donkey(Y)\\owns(X,Y)}~~ - {\large $\Rightarrow$}~ - \drs{~}{feeds(X,Y)} -} + \drs{X} + {named(X,`Pedro') \\ + \drs{Y}{donkey(Y)\\owns(X,Y)}~~ + {\large $\Rightarrow$}~ + \drs{~}{feeds(X,Y)} + } +\end{flushleft} +\end{lstlisting} +\end{minipage}\hfill +\begin{minipage}{.4\textwidth} + \begin{flushleft} + \drs{X} + {named(X,`Pedro') \\ + \drs{Y}{donkey(Y)\\owns(X,Y)}~~ + {\large $\Rightarrow$}~ + \drs{~}{feeds(X,Y)} + } + \end{flushleft} +\end{minipage} + +\medskip + +\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, as in: + +\begin{lstlisting}[moretexcs={sdrs}] +\begin{flushleft} + \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)} +\end{flushleft} +\end{lstlisting} +which prints as: + +\begin{flushleft} + \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)} \end{flushleft} -To display a sentence above the DRS, use \verb"\sdrs", like this: -\begin{verbatim} -\sdrs{A donkey is green.}{X}{donkey(X)\\green(X)} -\end{verbatim} -\begin{flushleft} -\sdrs{A donkey is green.}{X}{donkey(X)\\green(X)} -\end{flushleft} -Some DRS connectives are also provided (normally for forming -DRSes that are to be nested within other DRSes). -The macro \verb"\negdrs" forms a DRS preceded by a negation symbol: -\begin{verbatim} + +Some \textsc{drs} connectives are also provided (normally for forming +\textsc{drs}es that are to be nested within other \textsc{drs}es). +The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol: +\begin{lstlisting}[moretexcs={negdrs}] \negdrs{X}{donkey(X)\\green(X)} -\end{verbatim} +\end{lstlisting} \begin{flushleft} \negdrs{X}{donkey(X)\\green(X)} \end{flushleft} -Finally, \verb"\ifdrs" forms a pair of DRSes joined by a big arrow, +Finally, \jcsmacro{ifdrs} forms a pair of \textsc{drs}es joined by a big arrow, like this: -\begin{verbatim} +\begin{lstlisting}[moretexcs={ifdrs}] \ifdrs{X}{donkey(X)\\hungry(X)} {~}{feeds(Pedro,X)} -\end{verbatim} +\end{lstlisting} \begin{flushleft} \ifdrs{X}{donkey(X)\\hungry(X)} {~}{feeds(Pedro,X)} \end{flushleft} -If you have an ``if''--structure appearing among ordinary predicates -inside a DRS, you may prefer to use \verb"\alifdrs", which is just like -\verb"\ifdrs" but shifted slightly to the left for better alignment. +If you have an ``if''-structure appearing among ordinary predicates +inside a \textsc{drs}, you may prefer to use \jcsmacro{alifdrs}, which is just like +\jcsmacro{ifdrs} but shifted slightly to the left for better alignment. -\section{Exercises} +\section{Exercises}\label{sec:exercises} -The {\tt exercise} environment generates an exercise numbered according +The \jenv{exercise} environment (alias \jenv{covexercise}) generates an exercise numbered according to chapter, section, and subsection (suitable for use in a large book; -in this example, the subsection number is going to come out as 0). +in this example, the subsection number is going to come out as 0). Here is an example: \begin{exercise}[Project] Prove that the above assertion is true. \end{exercise} -This was typed as -\begin{verbatim} +This was coded as +\begin{lstlisting} \begin{exercise}[Project] Prove that the above assertion is true. \end{exercise} -\end{verbatim} -and the argument \verb"[Project]" is optional (actually, any word could -go there). - -\section{Reference Lists} - -To type an LSA--style hanging--indented reference list, use the {\tt -reflist} environment. ({\em Note:\/} {\tt reflist} is not presently -integrated with Bib\TeX\ in any way.) For example, -\begin{verbatim} +\end{lstlisting} +The argument (\verb"[Project]" in the example) is optional. + +Note that, as of version 1.1, \cvt\ checks if there is already an \jenv{exercise} environment +defined (e.\,g., by the class). If so, \cvt\ does not define its own one. However, there is always +the alias environment \jenv{covexercise} which can be used in order to produce \texttt{covington's} exercise. +If you use the package option \joption{force}, \cvt\ will override existing \jenv{exercise} +environments. In any case, the package will issue a warning if \jenv{exercise} is already defined. + +\section{Reference Lists}\label{sec:reflists} + +To type a simple \textsc{lsa}-style hanging-indented reference list, you can use the \jenv{reflist} +environment. (\emph{Note:} \jenv{reflist} is not integrated with Bib\TeX\ in any way.% +\footnote{For Bib\TeX, there are several options: the \textsc{lsa} style, as used in the journal \emph{Language}, +can be obtained by means of the style files \texttt{lsalike.bst} +(\url{http://www.icsi.berkeley.edu/ftp/pub/speech/jurafsky/lsalike.bst}) or \texttt{language.bst} +(\url{http://ron.artstein.org/resources/language.bst}); the latter uses \texttt{natbib}. +The so-called \emph{Unified Style Sheet for Linguistics}, as proposed by the \textsc{cel}x\textsc{j} +(\emph{Committee of Editors of Linguistics Journals}), which slightly differs from the \textsc{lsa} style, +is followed by the style file \texttt{unified.bst} (available at \url{http://celxj.org/downloads/unified.bst}). +A \texttt{biblatex} style file for the unified style is available at +\url{https://github.com/semprag/biblatex-sp-unified}.}) For example, +\begin{lstlisting} \begin{reflist} Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987. Computational complexity and natural language. Cambridge, @@ -431,9 +594,9 @@ Massachusetts: MIT Press. Covington, Michael. 1993. Natural language processing for Prolog -programmers. Englewood Cliffs, New Jersey: Prentice--Hall. +programmers. Englewood Cliffs, New Jersey: Prentice-Hall. \end{reflist} -\end{verbatim} +\end{lstlisting} prints as: \begin{reflist} Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987. @@ -443,9 +606,17 @@ Chomsky, Noam. 1965. Aspects of the theory of syntax. Cambridge, Massachusetts: MIT Press. -Covington, Michael A. 1993. Natural--language processing for Prolog -programmers. Englewood Cliffs, New Jersey: Prentice--Hall. +Covington, Michael A. 1993. Natural language processing for Prolog +programmers. Englewood Cliffs, New Jersey: Prentice-Hall. \end{reflist} +By default, the references have a hanging indentation of 3\,em. This can +be globally changed by altering the length \jcsmacro{reflistindent}. +Doing \lstinline|\setlength\reflistindent{1.5em}|, for instance, +will shorten the indentation by half. Likewise, the length \jcsmacro{reflistitemsep} +(6\,pt by default) and \jcsmacro{reflistparsep} (ca. 4\,pt by default) can be adjusted +to alter the vertical separation (\jfcsmacro{itemsep} and \jfcsmacro{parsep}, for that +matter) of reference entries. + Notice that within the reference list, ``French spacing'' is in effect --- that is, spaces after periods are no wider than normal spaces. Thus you do not have to do anything special to avoid excessive space after @@ -454,31 +625,120 @@ \section{Displayed sentences} -The macro \verb"\sentence" displays an italicized sentence (it is a -combination of {\tt flushleft} and \verb"\em"). If you type -\begin{verbatim} +The macro \jcsmacro{sentence} displays an italicized sentence (it is a +combination of \jfenv{flushleft} and \jfmacro{itshape}). If you type +\begin{lstlisting}[moretexcs={sentence}] \sentence{This is a sentence.} -\end{verbatim} +\end{lstlisting} you get: \sentence{This is a sentence.} \section{Big curly brackets (disjunctions)} -Last of all, the 2--argument macro \verb"\either" expresses alternatives -within a sentence or PS--rule: +Last of all, the two-argument macro \jcsmacro{either} expresses alternatives +within a sentence or \textsc{ps}-rule: \begin{flushleft} -\verb"the \either{big}{large} dog" $=$ the \either{big}{large} dog \\ +\lstinline[moretexcs={either}]"the \either{big}{large} dog" $=$ the \either{big}{large} dog \\ \end{flushleft} \begin{flushleft} -\verb"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E} +\lstinline[moretexcs={either,psr}]"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E} \end{flushleft} -That's all there is. -Suggestions for improving {\tt covington.sty} are welcome, and bug -reports are actively solicited. Please note, however, that this is free -software, and the author makes no commitment to do any further work on +That's all there is for now. +Suggestions for improving \cvt\ are welcome, and bug +reports are actively solicited (via \url{https://github.com/jspitz/covington}). Please note, however, that this is free +software, and the authors make no commitment to do any further work on it. +\section{Release history} + +\subsection*{1.4 (2017 May 23)} + +\begin{itemize} + \item Introduce a new macro \jcsmacro{twodias} that supersedes the rather odd \jcsmacro{twoacc} + (which is kept for backwards compatibility). See sec.~\ref{sec:accents} for details. + \item Introduce macro \jcsmacro{SetDiaOffset} for more convenient setting of vertical distance + in stacked diacritics. See sec.~\ref{sec:accents} for details. + \item \LaTeX\ 2.09 is no longer officially supported (it might continue to work, but is not + tested). +\end{itemize} + +\subsection*{1.3 (2017 April 5)} + +\begin{itemize} + \item Gloss variants \jcsmacro{xgll} and \jcsmacro{xglll} that work + inside macros (such as footnotes) but require explicit gloss + line end markers (\jcsmacro{xgle}). See sec.~\ref{sec:gloss} for details. + \item New lengths \jcsmacro{reflistindent}, \jcsmacro{reflistparsep} and + \jcsmacro{reflistitemsep} to globally adjust the indentation or vertical + space, respectively, of reflist items. + See sec.~\ref{sec:reflists} for details. +\end{itemize} + +\subsection*{1.2 (2016 August 26)} + +\begin{itemize} + \item New length \jcsmacro{examplenumbersep} to adjust (increase) the horizontal space + between example number and example text. See sec.~\ref{sec:ex} for details. + \item Add some more info about bibliography generation. +\end{itemize} + +\subsection*{1.1a (2016 July 7)} + +\begin{itemize} + \item Fix encoding problem in documentation and some typos. No change in functionality. +\end{itemize} + +\subsection*{1.1 (2016 July 6)} + +\begin{itemize} + \item The package now uses \textsc{nfss} font commands if available (fallback for \LaTeX\ 2.09 is still provided). + \item Work around clash with classes\slash packages that define their own \jenv{example} and + \jenv{examples} environments (most notably the \texttt{beamer} class) as well as \jenv{execise} environments. + The \cvt\ package no longer blindly attempts to define these environments. By default, it does not + define them if they are already defined (\texttt{covington's} own environments, however, are still available via aliases). + By means of a new package option, a redefinition can also be forced. See sec.~\ref{sec:ex} and \ref{sec:exs} for details. + \item New length \jcsmacro{twoaccsep} allows for the adjustment of the distance between stacked accents (see sec.~\ref{sec:accents}). + \item Update manual. + \item New maintainer: J. Spitzm\"uller. + \item License has been changed to \textsc{lppl} (in agreement with M. Covington) + \item Introduce version numbers. Arbitrarily, we start with 1.1. +\end{itemize} + +\subsection*{2014 May 16} + +\begin{itemize} + \item Patches by Robin Fairbairns: + \begin{itemize} + \item Setting of \jfcsmacro{textfloatsep} uses \jfcsmacro{setlength} rather than \jfcsmacro{renewcommand} + \item Style file converted to un*x line endings + \end{itemize} +\end{itemize} + +\subsection*{2001 March 27} + +\begin{itemize} + \item It is no longer necessary to type \jfcsmacro{it} to get proper italic type in feature structures. + \item Instructions have been rewritten with \LaTeXe\ users in mind. +\end{itemize} + +\subsection*{Older versions} + +\begin{itemize} + \item Multiple accents on a single letter (e.\,g., \emph{\acm{a}}) are supported. + \item This package is now called \cvt\ (with the o) + and is compatible with \LaTeXe\ and \textsc{nfss} as well as \LaTeX\ 2.09. + \item The vertical placement of labeled feature structures has + been changed + so that the category labels line up regardless of the size of + the structures. +\end{itemize} + +\begin{thebibliography}{99} + \bibitem{pakin} Pakin, Scott. The Comprehensive \LaTeX\ Symbol List. + 30 November 2015. \url{http://www.ctan.org/pkg/comprehensive}. +\end{thebibliography} + \end{document} Binary files old/doc/latex/covington/covingtonGerm.pdf and new/doc/latex/covington/covingtonGerm.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/covingtonGerm.tex new/doc/latex/covington/covingtonGerm.tex --- old/doc/latex/covington/covingtonGerm.tex 2010-04-08 00:55:02.000000000 +0200 +++ new/doc/latex/covington/covingtonGerm.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,491 +0,0 @@ -% File: covington.tex (in LaTeX2e) -% Documentation in German for covington.sty - -\documentclass{article} -\usepackage[ngerman]{babel} -\usepackage[latin1]{inputenc} -\setlength{\parindent}{0pt} -\setlength{\parskip}{1ex plus 0.2ex minus 0.1ex} -\usepackage{covington} -\title{\bf Linguistisch editieren mit {\tt covington.sty}} -\author{Michael A. Covington\footnote{Deutsche ?bersetzung von Robert Galow -(Friedrich-Schiller-Universit?t Jena).}\\ - \small Artificial Intelligence Center \\ - \small The University of Georgia \\ - \small Athens, Georgia 30602 \sc u.s.a.\\ - mcovingt(a)ai.uga.edu\\ - http://www.ai.uga.edu/$\sim$mc} - -\date{29.03.2007} - - -\begin{document} -\maketitle -{\footnotesize \tableofcontents} -\typeout{Run LaTeX twice to get a correct table of contents.} - -\section*{Neues in dieser Version} -\begin{itemize} -\item Merkmalsstrukturen erfordern nicht l?nger den Befehl \verb"\it", um kursive Schrift anzeigen zu lassen. -\item Die vorliegende Dokumentation wurde f?r \LaTeXe\ Benutzer redigiert. -\end{itemize} - -\section*{Neues in ?lteren Versionen} -\begin{itemize} -\item Mehrere Akzente ?ber einem einzigen Graphem (Bsp.: \emph{\acm{a}}) werden unterst?tzt. -\item Dieses Paket wurde in {\tt covington} (mit \textit{o}) umbenannt und ist sowohl mit \LaTeXe\ und NFSS -als auch \LaTeX\ 2.09. kompatibel. -\item Die vertikale Anordnung beschrifteter Merkmalsstrukturen wurde derart ver?ndert, dass die -Kategoriebezeichnungen nun unabh?ngig von der Gr??e der Strukturdarstellung angeordnet werden. -\end{itemize} - -\section*{Einf?hrung} -Die Datei {\tt covington.tex} ist die Dokumentation der Version {\tt covington.sty} vom M?rz 2001. -Mit dieser \LaTeX\ Style-Option wird es nun m?glich spezielle und f?r die Linguistik typische Anmerkungen -sowie Strukturen darzustellen. - -{\footnotesize -In em\TeX\ unter MS-DOS finden Sie {\tt covington.sty} mit der Bezeichnung {\tt covingto.sty}. -Das fehlende $n$ hat keinerlei Auswirkungen.} - -Um {\tt covington.sty} nutzen zu k?nnen, sollten Sie entweder ?ber eine Kopie in ihrem aktuellen Ordner oder im \LaTeX\- Verzeichnis verf?gen, in dem ihre \LaTeX\ Style-Files gespeichert werden. - -Unter \LaTeXe\ -f?gen Sie nach \verb"\documentclass" -den Befehl\\ \verb"\usepackage{covington}" hinzu. - -{\footnotesize -Bei \LaTeX\ 2.09 f?gen Sie {\tt covington} unmittelbar in den \verb"\documentstyle" Befehl mit ein. -Das Ergebnis: \hfill\\ -{\tt -\verb"\documentstyle[12pt,"\underline{covington}\verb"]{article}" -}\hfill\\ -Beachten Sie die richtige Schreibweise {\tt covington} (9 Buchstaben). -} - -F?r diese Dokumentation wird vorausgesetzt, dass Sie wissen, wie Sie korrekt mit \LaTeX\ umgehen und dass -Sie ?ber eine \LaTeX-Anleitung verf?gen. {\tt covington.sty} bietet Ihnen keine speziellen Fonts -oder Grapheme, kann jedoch mit anderen passenden Stildateien verwendet werden. - -Falls Sie {\tt covington.sty} und {\tt uga.sty} (UGa thesis style) -zusammen nutzen, sollten Sie {\tt uga} vor {\tt covington} erw?hnen. - - -\section{Akzente} - -\LaTeX\ bietet eine gro?z?gige Auswahl von Akzenten, die ?ber jedem beliebigen Graphem platziert werden -k?nnen. -Beispiele: -\begin{flushleft} -\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x} -\end{flushleft} -Die Eingabe erfolgt so: -\begin{verbatim} -\`{x} \'{x} \^{x} \"{x} \~{x} \={x} \H{x} \t{xx} \c{x} \d{x} \b{x} -\end{verbatim} - -\LaTeX\ erm?glicht nat?rlich auch diese Grapheme: -\begin{flushleft}\obeyspaces -\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !` -\end{flushleft} -Die Eingabe daf?r: -\begin{verbatim} -\i \j \ae \AE \oe \OE \aa \AA \o \O \l \L \ss ?` !` -\end{verbatim} - -\LaTeX\ bietet leider keine bequeme M?glichkeit zwei Akzente ?ber dem selben -Graphem zu realisieren. Abhilfe schafft hier {\tt covington.sty} mit den folgenden -Makros: -\begin{flushleft} -\verb,\twoacc[...|...], \quad um 2 beliebige Akzente zu kombinieren. Bsp.: - \verb.\twoacc[\~|\={a}]. = \twoacc[\~|\={a}]\\[6pt] -\verb,\acm{...}, \quad f?r einen Akut ?ber dem L?ngsstrich,Bsp.: \verb.\acm{a}. = \acm{a}\\ -\verb,\grm{...}, \quad f?r einen Gravis ?ber dem L?ngsstrich, Bsp.: \verb.\grm{a}. = \grm{a}\\ -\verb,\cim{...}, \quad f?r Zirkumflex ?ber dem L?ngsstrich, Bsp.: \verb.\cim{a}. = \cim{a} -\end{flushleft} -Der erste der obigen Beispiele ist der allgemeine Fall, die anderen drei sind spezielle. Diese -entstehen oft beim Transkribieren aus dem Griechischen. Nun k?nnen sie mit beiden Akzenten an selber Stelle -\emph{Koin\acm{e}} schreiben. - -Beachten sie die spezielle Syntax von \verb.\twoacc. --- dessen Argumente werden in eckigen, aber nicht -geschwungenen Klammern gefasst. Die Argumente werden durch \verb.|. getrennt. -Das erste Argument ist der obere Akzent (nur), das zweite das Graphem mit dem niedrigen Akzent. - -Bitte beachten Sie, dass Akzente nicht in der {\tt tabbing} Umgebung funktionieren. -Nutzen Sie {\tt tabular} oder ihre \LaTeX\ Anleitung f?r L?sungsvorschl?ge. - -\section{Makros f?r nummerierte Satzbeispiele} - -Linguistische Aufs?tze beinhalten oft nummerierte Beispiele. -Das Makro \verb"\exampleno" generiert eine neue Beispielnummer und kann an beliebiger Stelle genutzt werden. -Um beispielsweise einen Satz mit einer rechtsb?ndigen Beispielnummer zu erhalten, geben Sie ein: -\begin{verbatim} -\begin{flushleft} -Das ist ein Satz. \hfill (\exampleno) -\end{flushleft} -\end{verbatim} -Das Resultat sieht so aus: -\begin{flushleft} -Das ist ein Satz. \hfill (\exampleno) -\end{flushleft} -Der Beispielz?hler funktioniert im Prinzip wie die \LaTeX-Nummerierung von Gleichungen. -Sollten Sie also Gleichungen UND nummerierte Beispiele im selben Dokument nutzen, -erhalten Sie eine fortlaufende Nummerierung von Beispielen. Um auf die -Nummer zuzugreifen, ohne sie zu ?ndern, nutzen Sie \verb"\theequation". - -Sie k?nnen auch \verb"\label" und \verb"\ref" jeweils f?r Beispielnummern als auch f?r -die Gleichungsnummerierung nutzen. Sehen Sie dazu in Ihren \LaTeX\ Unterlagen nach. -Die dargestellte Situation trifft auch f?r die {\tt example} und {\tt examples} -Umgebungen zu, die als n?chstes beschrieben werden sollen, aber auch f?r \verb"\exampleno" selbst. - -\section{Nummerierte Beispiele mit der {\tt example}-Umgebung} - -Die {\tt example}-Umgebung stellt ein einziges Beispiel mit einer linksb?ndig -generierten Beispielnummer dar. - -Wenn Sie Nachfolgendes eingeben, -\begin{verbatim} -\begin{example} -This is a sentence. -\end{example} -\end{verbatim} -erhalten Sie als Resultat: -\begin{example} -Das ist ein Beispiel. -\end{example} -Die {\tt example}-Umgebung ?hnelt stark {\tt flushleft}. Dabei kann das Beispiel -beliebiger L?nge sein und sowohl mehreren Zeilen (getrennt durch \verb"\\") -oder sogar ganzen Abs?tzen bestehen. - -Eine M?glichkeit innerhalb untergeordneter Beispiele zu nummerieren, bietet {\tt itemize} oder {\tt -enumerate}. - -Beispiel: -\begin{verbatim} -\begin{example} -\begin{itemize} -\item[(a)] Das ist der erste Satz. -\item[(b)] Das ist der zweite Satz. -\end{itemize} -\end{example} -\end{verbatim} -Das Resultat: -\begin{example} -\begin{itemize} -\item[(a)] Das ist der erste Satz. -\item[(b)] Das ist der zweite Satz. -\end{itemize} -\end{example} -Die im n?chsten Punkt beschriebene {\tt examples}-Umgebung ist ?blicher. - -\section{Nummerierte Beispiele mit der {\tt examples}-Umgebung} - -Um mehrere Beispiele mit jeweiliger Nummerierung zusammen anzeigen zu lassen, -nutzen Sie {\tt examples} anstelle von {\tt example}. Der einzige Unterschied besteht darin, -dass mehrere Beispiele angezeigt werden k?nnen, implementiert mit \verb"\item". - -Ein Beispiel: -\begin{verbatim} -\begin{examples} -\item Das ist der erste Satz. -\item Das ist der zweite Satz. -\end{examples} -\end{verbatim} -Das Resultat: -\begin{examples} -\item Das ist der erste Satz. -\item Das ist der zweite Satz. -\end{examples} - - -\section{S?tze glossieren und interlineares ?bersetzen} - -Einen Satz zu glossieren meint, ihn Lexem f?r Lexem zu "`erl?utern"'. In der Regel werden bei -interlinearen ?bersetzungen zun?chst S?tze der Ausgangssprache Wort f?r Wort, also unter Verzicht auf -syntaktisch-grammatikalische Regeln, in vertikaler Anordnung ?bersetzt. Danach folgt die philologische -?bersetzung, die Lexeme nach syntaktischen und grammatischen Regeln der Zielsprache gliedert, -Satzglieder also korrekt anordnet. - -Ein Beispiel:% -\footnote{Die Makros zum Umgang mit Glossen wurden mit Erlaubnis von Marcel R. van der Goot von {\tt gloss.tex} angepasst.} -\gll Dit is een Nederlands voorbeeld. - Das ist ein niederl?ndisches Beispiel. -\glt `Das ist ein Beispiel auf Niederl?ndisch.' -\glend -Dieses spezielle Beispiel wird so eingegeben: -\begin{verbatim} -\gll Dit is een Nederlands voorbeeld. - Das ist ein niederl?ndisches Beispiel. -\glt `Das ist ein Beispiel auf Niederl?ndisch.' -\glend -\end{verbatim} -Da \TeX\ Lexeme z?hlt, m?ssen Sie diese nicht in einer Zeile entsprechend ihrer Anzahl ordnen. Wenn also -Lexeme von Ausgangs- und Zielsprache nicht korrespondieren, k?nnen Sie zur Veranschaulichung der -intendierten Reihenfolge geschweifte Klammern nutzen. -M?chten Sie beispielsweise folgende S?tze darstellen -\gll Dit is een voorbeeldje in het Nederlands. - Das ist ein {kleines Beispiel} auf {} Niederl?ndisch. -\glt `Das ist ein kleines Beispiel auf Niederl?ndisch.' -\glend -schreiben Sie: -\begin{verbatim} -\gll Dit is een voorbeeldje in het Nederlands. - Das ist ein {kleines Beispiel} auf {} Niederl?ndisch. -\glt `Das ist ein kleines Beispiel auf Niederl?ndisch.' -\glend -\end{verbatim} -Insgesamt bietet Ihnen {\tt covington.sty} f?nf Makros zum Umgang mit Glossen: -\begin{itemize} -\item \verb"\gll" stellt zwei Zeilen vertikal zueinander angeordneter W?rter dar. Die damit verbundene -Umgebung ?hnelt {\tt flushleft}. -\item \verb"\glll" entspricht \verb"gll", nur gibt es -{\em drei} Zeilen angeordneter W?rter (N?tzlich f?r Zitate, Morphologisches, -und ?bersetzungen). -\item \verb"\glt" beendet Zeilen mit aufeinander angeordneter W?rter und f?hrt eine Zeile -(oder mehr) mit der ?bersetzung auf. -\item \verb"\gln" entspricht \verb"\glt" , beginnt aber keine neue Zeile -(n?tzlich, wenn keine ?bersetzung folgt, daf?r aber eine rechtsb?ndige Beispielnummerierung). -\item \verb"\glend" beendet die \verb"\gll" Umgebung. -\end{itemize} -Hier sind weitere Beispiele. Erstens, einen Satz mit drei Zeilen in vertikaler Anordnung: -\glll Hoc est aliud exemplum. - n.sg.nom 3.sg n.sg.nom n.sg.nom - Das ist ein anderes Beispiel. -\glt `Das ist ein anderes Beispiel.' -\glend -Die Eingabe muss sein: -\begin{verbatim} -\glll Hoc est aliud exemplum. - n.sg.nom 3.sg n.sg.nom n.sg.nom - Das ist ein anderes Beispiel. -\glt `Das ist ein anderes Beispiel.' -\glend -\end{verbatim} -Jetzt ein Beispiel mit einer Glosse ohne philologische ?bersetzung. Auf der rechten Seite setzen wir -au?erdem eine Beispielnummer: -\gll Hoc habet numerum. - Das hat Nummer. -\gln \hfill (\exampleno) -\glend -Die Eingabe muss sein: -\begin{verbatim} -\gll Hoc habet numerum. - Das hat Nummer -\gln \hfill (\exampleno) -\glend -\end{verbatim} -Hier noch eine sehr g?ngige Methode: Wir f?gen einen glossierten Satz in die {\tt example} -Umgebung ein: -\begin{example} -\gll Hoc habet numerum praepositum. - Das hat Nummer davor -\glt `Dieses hat eine Nummer davor.' -\glend -\end{example} -Die Eingabe muss sein: -\begin{verbatim} -\begin{example} -\gll Hoc habet numerum praepositum. - Das hat Nummer davor -\glt `Dieses hat eine Nummer davor.' -\glend -\end{example} -\end{verbatim} -Bitte merken Sie sich, dass jeder glossierte Satz entweder mit \verb"\gll" oder -\verb"\glll" beginnt, dann entweder \verb"\glt" oder \verb"\gln" enth?lt, und schlie?lich mit -\verb"\glend" endet. Das Layout im Arbeitsschritt vor -\verb"\glt" oder \verb"\gln" ist an feste Kriterien gebunden, danach aber wesentlich freier gestaltbar. - -\section{Satzstruktur-Regeln darstellen} - -Um die Satzstruktur-Regel \psr{S}{NP~VP} darzustellen, k?nnen Sie -\verb"\psr{S}{NP~VP}" eingeben. -Das gilt nat?rlich auch f?r alle anderen Satzstruktur-Regeln. - -\section{Repr?sentation von Merkmalsstrukturen} - -Um eine Merkmalsstrukur wie die nachfolgende zu erhalten, -\begin{flushleft} -%\fs{\it Kasus:nom \\ \it Persona:P} -\fs{Kasus:nom} -\end{flushleft} -k?nnen Sie eingeben: -\begin{verbatim} -\fs{Kasus:nom \\ Persona:P} -\end{verbatim} - -Merkmalstrukturen k?nnen ?berall integriert werden -- in Flie?texte, in spezielle -Umgebungen wie {\tt flushleft}, in den Zusammenhang syntaktischer Regeln oder -sogar in andere Merkmalstrukturen. - -Um Kategorienamen einer Merkmalstruktur ?ber diesselbe zu setzen, wie in -dem nachfolgenden Beispiel zu sehen ist, -\begin{flushleft} -\lfs{N}{Kasus:nom \\ Persona:P} -\end{flushleft} -geben Sie Folgendes ein: -\begin{verbatim} -\lfs{N}{Kasus:nom \\ Persona:P} -\end{verbatim} -Hier noch ein Beispiel f?r eine Satzstrukturdarstellung mit Kategoriebezeichnung ?ber der jeweiligen -Merkmalsstruktur: -\begin{flushleft} -\psr{\lfs{S}{Tempus:T}} - {\lfs{NP}{Kasus:nom \\ Nummerus:N} - \lfs{VP}{Tempus:T \\ Nummerus:N}} -\end{flushleft} -Die Eingabe daf?r ist: -\begin{verbatim} -\psr{\lfs{S}{Tempus:T}} - {\lfs{NP}{Kasus:nom \\ Nummerus:N} - \lfs{VP}{Tempus:T \\ Nummerus:N}} -\end{verbatim} - - -\section{Discourse Representation Structures nach H.Kamp setzen} - -Verschiedene Makros in {\tt covington.sty} erleichtern Diskurs Structures -(Kurz DRS von \emph{Discourse representation structure}. Wir wollen uns im -Folgenden auf die Verwendung -dieser g?ngigen Abk?rzung festlegen). Konkret sind die K?stchen-Bezeichnungen von Hans Kamp gemeint. -Das einfachste Makro ist \verb"\drs", welches zwei Argumente verlangt: -Ein Verzeichnis der Diskursvariablen verbunden mit \verb"~", und ein -Verzeichnis von DRS-Bedingungen -getrennt durch \verb"\\". Verschachtelung ist dabei erlaubt. Beachten Sie jedoch, dass Ihnen das -\verb"\drs" Makro an sich keine entfaltete Umgebung bietet. Sie m?ssen {\tt -flushleft} oder ?hnliches nutzen, -um eine DRS anzeigen zu lassen. -Hier sind einige Beispiele: -\begin{verbatim} -\drs{X}{Esel(X)\\gr?n(X)} -\end{verbatim} -\begin{flushleft} -\drs{X}{Esel(X)\\gr?n(X)} -\end{flushleft} -\begin{verbatim} -\drs{X} -{named(X,`Pedro') \\ -\drs{Y}{Esel(Y)\\besitzt(X,Y)}~~ - {\large $\Rightarrow$}~ - \drs{~}{f?ttert(X,Y)} -} -\end{verbatim} -\begin{flushleft} -\drs{X} -{named(X,`Pedro') \\ -\drs{Y}{Esel(Y)\\besitzt(X,Y)}~~ - {\large $\Rightarrow$}~ - \drs{~}{f?ttert(X,Y)} -} -\end{flushleft} -Um einen Satz oberhalb der DRS-Box zu platzieren, verwenden Sie \verb"\sdrs" wie im n?chsten Beispiel: -\begin{verbatim} -\sdrs{Ein Esel ist gr?n.}{X}{Esel(X)\\gr?n(X)} -\end{verbatim} -\begin{flushleft} -\sdrs{Ein Esel ist gr?n.}{X}{Esel(X)\\gr?n(X)} -\end{flushleft} -Au?erdem werden Ihnen DRS-Verbindungen angeboten, die normalerweise zur Repr?sentation von einer DRS in -einer anderen vorgesehen sind. -Das Makro \verb"\negdrs" generiert eine DRS, vor der ein Negationssymbol steht: -\begin{verbatim} -\negdrs{X}{Esel(X)\\gr?n(X)} -\end{verbatim} -\begin{flushleft} -\negdrs{X}{Esel(X)\\gr?n(X)} -\end{flushleft} -Als letztes ist \verb"\ifdrs" zu erw?hnen. Dabei handelt es sich um die Verbindung zweier DRS durch einen -gro?en Pfeil. -Beispiel: -\begin{verbatim} -\ifdrs{X}{Esel(X)\\hungrig(X)} - {~}{f?ttert(Pedro,X)} -\end{verbatim} -\begin{flushleft} -\ifdrs{X}{Esel(X)\\hungrig(X)} - {~}{f?ttert(Pedro,X)} -\end{flushleft} -Bei Verbindungen von gew?hnlichen Pr?dikaten und Konditionals?tzen innerhalb -einer DRS ist die Benutzung von \verb"\alifdrs" zu empfehlen. \verb"\alifdrs" ist -\verb"\ifdrs" sehr ?hnlich, wird aber zwecks besserer Anordnung etwas weiter nach links ger?ckt. - -\section{?bungsbeispiele} - -Die {\tt exercise}-Umgebung generiert eine nach Kapitel, Absatz und -Unterabschnitt nummerierte ?bung. Diese Option eignet sich beispielsweise f?r in B?chern auftretende ?bungen. -Im folgenden Beispiel wird der Unterabschnitt als 0 angezeigt: -\begin{exercise}[Projekt] -Beweisen Sie die Richtigkeit der oben gestellten Hypothese. -\end{exercise} -Die notwendige Eingabe: -\begin{verbatim} -\begin{exercise}[Projekt] -Beweisen Sie die Richtigkeit der oben gestellten Hypothese. -\end{exercise} -\end{verbatim} -Das Argument \verb"[Projekt]" kann optional verwendet werden und ist durch jedes beliebige Lexem ersetzbar. - -\section{Literaturverweise nach LSA-Muster} - -Um Bibliographien im LSA-Stil zu verfassen, nutzen Sie bitte die {\tt -reflist}-Umgebung. ({\em Anmerkung:\/} {\tt reflist} ist derzeit noch nicht -in Bib\TeX\ integriert.) Beispielsweise sehen die kommenden Nachweise in der Ausgabe wie folgt aus: - -\begin{verbatim} -\begin{reflist} -Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987. -Computational complexity and natural language. Cambridge, -Massachusetts: MIT Press. - -Chomsky, Noam. 1965. Aspects of the theory of syntax. Cambridge, -Massachusetts: MIT Press. - -Covington, Michael. 1993. Natural language processing for Prolog -programmers. Englewood Cliffs, New Jersey: Prentice--Hall. -\end{reflist} -\end{verbatim} -\begin{reflist} -Barton, G. Edward; Berwick, Robert C.; and Ristad, Eric Sven. 1987. -Computational complexity and natural language. Cambridge, -Massachusetts: MIT Press. - -Chomsky, Noam. 1965. Aspects of the theory of syntax. Cambridge, -Massachusetts: MIT Press. - -Covington, Michael A. 1993. Natural language processing for Prolog -programmers. Englewood Cliffs, New Jersey: Prentice--Hall. -\end{reflist} -Beachten Sie, dass innerhalb dieser Bibliographien ``French spacing'' angewandt wird. -Das bedeutet: Die Leerstellen nach Punkten sind nicht gr??er als das konventionelle Leerzeichen. Sie m?ssen -also nichts gegen ?bergro?e Abst?nde nach Namen unternehmen. - - -\section{Das Makro {\tt sentence}} - -Das Makro \verb"\sentence" hilft bei der Ausgabe von kursiven S?tzen, und ist eine -Kombination von {\tt flushleft} und \verb"\em"). Bei der Eingabe von -\begin{verbatim} -\sentence{Das ist ein Satz.} -\end{verbatim} -ist das Resultat: -\sentence{Das ist ein Satz.} - - -\section{Geschwungene Klammern und Disjunktionen mit {\tt either}} - -Zu guter Letzt: Das 2-Argumente-Makro \verb"\either" repr?sentiert Alternativen -innerhalb eines Satzes oder einer Satzstruktur: -\begin{flushleft} -\verb"the \either{schwer}{gro?e} dog" $=$ the \either{schwer}{gro?} dog \\ -\end{flushleft} -\begin{flushleft} -\verb"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E} -\end{flushleft} - -Mehr gibt es nicht zu sagen. -Vorschl?ge zur Verbesserung von {\tt covington.sty} sind willkommen und auf Bug-Reports wird gern -eingegangen. Bitte beachten Sie, dass es sich um kostenlose Software handelt und der Autor nicht zu -weiterer Arbeit an der Software verpflichtet ist. - -\end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.doc.tlpobj new/tlpkg/tlpobj/covington.doc.tlpobj --- old/tlpkg/tlpobj/covington.doc.tlpobj 2016-04-14 18:54:29.000000000 +0200 +++ new/tlpkg/tlpobj/covington.doc.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,10 +1,9 @@ name covington.doc category Package -revision 34064 +revision 44501 shortdesc doc files of covington relocated 1 -docfiles size=119 +docfiles size=136 + RELOC/doc/latex/covington/README RELOC/doc/latex/covington/covington.pdf RELOC/doc/latex/covington/covington.tex - RELOC/doc/latex/covington/covingtonGerm.pdf - RELOC/doc/latex/covington/covingtonGerm.tex ++++++ covington.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/covington/covington.sty new/tex/latex/covington/covington.sty --- old/tex/latex/covington/covington.sty 2014-05-16 23:10:46.000000000 +0200 +++ new/tex/latex/covington/covington.sty 2017-06-06 23:51:35.000000000 +0200 @@ -1,21 +1,71 @@ -%%% File covington.sty -%%% -%%% Michael A. Covington -%%% Artificial Intelligence Programs -%%% The University of Georgia -%%% Athens, Georgia 30602-7415 USA -%%% mcovingt(a)aisun1.ai.uga.edu +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% File covington.sty +%% +%% LaTeX macros for Linguistics +%% +%% Original author: +%% ================ +%% Michael A. Covington +%% Artificial Intelligence Programs +%% The University of Georgia +%% Athens, Georgia 30602-7415 USA +%% mcovingt(a)aisun1.ai.uga.edu +%% +%% Contributors: +%% ============= +%% Robin Fairbairns <rf10(a)cl.cam.ac.uk> 2014-05-16: patched setting of \textfloatsep +%% to use \setlength rather than \renewcommand; also converted to un*x line endings +%% +%% Current maintainer: +%% =================== +%% Juergen Spitzmueller <juergen(a)spitzmueller.org> +%% +%% 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/covington +%% +%% See covington.tex for documentation. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%% -%%% You may copy and distribute this file freely. -%%% (If you modify it, please change its name and add your own comments.) +%%% Metadata %%% -%%% See covington.tex for documentation. -%% -%% Robin Fairbairns: patched setting of \textfloatsep to use -%% \setlength rather than \renewcommand; also converted to un*x line endings -\typeout{* covington.sty : Covington's linguistic macros, 2001 March 27 *} -%% patched 2014-05-16 (rf10(a)cl.cam.ac.uk) +\def\filedate{2017/05/23} +\def\fileversion{1.4} +\def\filename{covington.sty} + +% Force redefinition of environments? +\newif\ifforceredef\forceredeffalse + +\@ifundefined{ProvidesPackage}{% +\typeout{* covington.sty : Covington's linguistic macros, \fileversion\ \filedate *} +}{% +\ProvidesPackage{covington} + [\filedate\space v\fileversion\space Covington's linguistic macros] +\DeclareOption{force}{\forceredeftrue} +\ProcessOptions +} + +% Macro to issue warnings +\newcommand\cov@warning[1]{% + \@ifundefined{PackageWarning}{% + \typeout{* covington warning : #1 *} + }{% + \PackageWarning{covington}{#1}% + } +} %%% %%% Preferences about how text is laid out @@ -31,20 +81,35 @@ % This is adapted from the \diatop macro in wsuipa.sty, which was % originally designed by Jean-Pierre Paillet. +% Length to adjust accent distance +% Introduced 2016-07-06 JSP. +\newlength\twoaccsep +\setlength{\twoaccsep}{-0.8ex} +\newcommand*\SetDiaOffset[1]{\addtolength{\twoaccsep}{#1}} + \def\twoacc[#1|#2]{\leavevmode{\setbox1=\hbox{{#1{}}}% \setbox2=\hbox{{#2{}}}% \dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi% - \dimen1=\ht2\advance\dimen1by-0.8ex% + \dimen1=\ht2\advance\dimen1by\twoaccsep% \setbox1=\hbox to1\dimen0{\hss#1\hss}% \rlap{\raise1\dimen1\box1}% \hbox to1\dimen0{\hss#2\hss}}}% % Example of usage: \twoacc[\^|\={a}] -% Special cases: -\def\acm#1{\twoacc[\'|\={#1}]} % acute over macron -\def\grm#1{\twoacc[\`|\={#1}]} % grave over macron -\def\cim#1{\twoacc[\^|\={#1}]} % circumflex over macron +% 2017-05-21: Introduce a less odd syntax: \twodias{\^}{\=}{a} +\newcommand*\twodias[3]{\leavevmode{\setbox1=\hbox{{#1{}}}% + \setbox2=\hbox{{#2{#3}}}% + \dimen0=\ifdim\wd1>\wd2\wd1\else\wd2\fi% + \dimen1=\ht2\advance\dimen1by\twoaccsep% + \setbox1=\hbox to1\dimen0{\hss#1\hss}% + \rlap{\raise1\dimen1\box1}% + \hbox to1\dimen0{\hss#2{#3}\hss}}} + +% Special cases: +\def\acm#1{\twodias{\'}{\=}{#1}} % acute over macron +\def\grm#1{\twodias{\`}{\=}{#1}} % grave over macron +\def\cim#1{\twodias{\^}{\=}{#1}} % circumflex over macron %%% %%% Example numbering @@ -88,8 +153,29 @@ % \item[(b)] This is the second example. % \end{itemize} % \end{example} - -\newenvironment{example}{\begin{examples}\item}{\end{examples}} +% +% New in 1.1 (2016-07-06): +% We provide a covexample environment and only (re)define +% example if it does not yet exist or if redefinition is +% forced by the "force" option. This prevents clashes +% with packages/classes that roll their own example environment +% (such as beamer). + +\newenvironment{covexample}{\begin{covexamples}\item}{\end{covexamples}} + +\@ifundefined{example}{% + \newenvironment{example}{\begin{covexample}}{\end{covexample}} +}{% +\ifforceredef + \renewenvironment{example}{\begin{covexample}}{\end{covexample}} + \cov@warning{The example environment was already defined. Redefining it.} +\else + \cov@warning{The example environment was already defined.^^J + Covington does not touch it.^^J + Use covexample if you want to access covington's^^J + version, or use the force package option.} +\fi +} %%% %%% The 'examples' environment @@ -105,13 +191,25 @@ % % Thanks to Darrel Hankerson of Auburn University, and numerous others % across the net, for help with this macro. +% +% New in 1.1 (2016-07-06): +% We provide a covexamples environment and only (re)define +% examples if it does not yet exist or if redefinition is +% forced by the "force" option. This prevents clashes +% with packages/classes that roll their own examples environment +% (such as beamer). \newcounter{equationsave} % used in trick with equation number -\newenvironment{examples}% % define "example" environment +\newlength\examplenumbersep +\setlength\examplenumbersep{0pt} + +\newenvironment{covexamples}% % define "example" environment {% \begin{list}{(\theequation)}% {% +\addtolength{\labelwidth}{\examplenumbersep}% +\addtolength{\leftmargin}{\examplenumbersep}% \setcounter{equationsave}{\arabic{equation}}% \usecounter{equation}% % sets it to zero, unwantedly \setcounter{equation}{\arabic{equationsave}}% % restores previous value @@ -121,11 +219,25 @@ \raggedright}% % text is flushleft, not justified {\end{list}} +\@ifundefined{examples}{% + \newenvironment{examples}{\begin{covexamples}}{\end{covexamples}} +}{% +\ifforceredef + \renewenvironment{examples}{\begin{covexamples}}{\end{covexamples}} + \cov@warning{The examples environment was already defined. Redefining it.} +\else + \cov@warning{The examples environment was already defined.^^J + Covington does not touch it.^^J + Use covexamples if you want to access covington's^^J + version, or use the force package option.} +\fi +} + %%% %%% Sentences with word-by-word glosses %%% -% See covingtn.tex for full documentation. Some examples: +% See covington.tex for full documentation. Some examples: % % Displayed sentence with gloss and translation: % @@ -166,15 +278,15 @@ % baselinestretch. \@ifundefined{new@fontshape}% - {\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}} - {\def\@selfnt{\selectfont}} + {\def\cov@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}} + {\def\cov@selfnt{\selectfont}} % Thanks to Hans-Peter Kolb for this macro. \def\gll % Introduces 2-line text-and-gloss. {\begin{flushleft} \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing \def\baselinestretch{1}% -\@selfnt% +\cov@selfnt% \vskip-\baselineskip% \bgroup \catcode`\^^M=12 @@ -185,13 +297,40 @@ {\begin{flushleft} \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing \def\baselinestretch{1}% -\@selfnt% +\cov@selfnt% \vskip-\baselineskip% \bgroup \catcode`\^^M=12 \threesent } + +% The following two \x.. versions introduce special forms of glossing +% macros that do not activate the newline char. The latter does not +% work inside arguments (see http://tex.stackexchange.com/questions/169740) +% Inspired by this post of David Carlisle to the mentioned stackexchange thread: +% http://tex.stackexchange.com/a/169744/19291 +% These macros require the gloss lines to be ended explicitly with \xgle +\def\xgll % Introduces 2-line text-and-gloss. + {\begin{flushleft} +\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing +\def\baselinestretch{1}% +\cov@selfnt% +\vskip-\baselineskip% + \bgroup + \ignorespaces\xtwosent + } + +\def\xglll % Introduces 3-line text-and-gloss. + {\begin{flushleft} +\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing +\def\baselinestretch{1}% +\cov@selfnt% +\vskip-\baselineskip% + \bgroup + \ignorespaces\xthreesent + } + \def\glt{{\hskip -\glossglue}\unhbox\gline\smallskip\newline} % \newline was \\ % Introduces translation. % Required even if no translation follows. @@ -222,9 +361,18 @@ \glossglue = 5pt plus 2pt minus 1pt % allow stretch/shrink between words \newif\ifnotdone -\let\eachwordone=\it -\let\eachwordtwo=\rm -\let\eachwordthree=\rm +% Add semantic markup (with latex 2.09 backwards support) +\@ifundefined{selectfont}{% + \def\cov@emphasized{\it}% + \def\cov@normalfont{\rm}% +}{% + \def\cov@emphasized{\normalfont\itshape}% + \def\cov@normalfont{\normalfont\rmfamily}% +} + +\let\eachwordone=\cov@emphasized +\let\eachwordtwo=\cov@normalfont +\let\eachwordthree=\cov@normalfont \def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box {\setbox#2=\vbox{\unvbox#2% @@ -298,6 +446,63 @@ } } % restore \catcode`\^^M +% An explicit gloss line ending (for \xgll and \xglll variants= +\gdef\xgle{} +% Special versions of \getwords, \donewords, \twosent and \threesent for the \x.. +% variants of gloss introducers (using \xgle as separator instead of active newline) +\gdef\xgetwords(#1,#2)#3 #4\xgle% #1=linebox, #2=\each, #3=1st word, #4=remainder + {\setbox#1=\vbox{\hbox{#2\strut#3 }% adds space + \unvbox#1% + }% + \def\more{#4}% + \ifx\more\empty\let\more=\xdonewords + \else\let\more=\xgetwords + \fi + \more(#1,#2)#4\xgle% + } + +\gdef\xdonewords(#1,#2)\xgle{}% + +\gdef\xtwosent#1\xgle#2\xgle% #1 = first line, #2 = second line + {\xgetwords(\lineone,\eachwordone)#1 \xgle% + \xgetwords(\linetwo,\eachwordtwo)#2 \xgle% + \loop\lastword{\eachwordone}{\lineone}{\wordone}% + \lastword{\eachwordtwo}{\linetwo}{\wordtwo}% + \global\setbox\gline=\hbox{\unhbox\gline + \hskip\glossglue + \vtop{\box\wordone % vtop was vbox + \nointerlineskip + \box\wordtwo + }% + }% + \testdone + \ifnotdone + \repeat + \egroup % matches \bgroup in \gloss + } + +\gdef\xthreesent#1\xgle#2\xgle#3\xgle% #1 = first line, #2 = second line, #3 = third + {\xgetwords(\lineone,\eachwordone)#1 \xgle% + \xgetwords(\linetwo,\eachwordtwo)#2 \xgle% + \xgetwords(\linethree,\eachwordthree)#3 \xgle% + \loop\lastword{\eachwordone}{\lineone}{\wordone}% + \lastword{\eachwordtwo}{\linetwo}{\wordtwo}% + \lastword{\eachwordthree}{\linethree}{\wordthree}% + \global\setbox\gline=\hbox{\unhbox\gline + \hskip\glossglue + \vtop{\box\wordone % vtop was vbox + \nointerlineskip + \box\wordtwo + \nointerlineskip + \box\wordthree + }% + }% + \testdone + \ifnotdone + \repeat + \egroup % matches \bgroup in \gloss + } + %\def\gloss % raw TeX macro for 2 aligned lines % {\bgroup % \catcode`\^^M=12 @@ -311,7 +516,7 @@ % \psr To print S -> NP VP, use: \psr{S}{NP~VP} -\newcommand{\psr}[2]{\mbox{\it #1 $\rightarrow$ #2}} +\newcommand{\psr}[2]{\mbox{\cov@emphasized #1 $\rightarrow$ #2}} %%% @@ -329,9 +534,8 @@ % Modified 2001 Mar 27 so that italics are used without the user typing \it. \newcommand{\fs}[1] { - \mbox{\small + \mbox{\small\cov@emphasized $ - \it \left[ \!\! \begin{array}{l} @@ -345,15 +549,14 @@ % Modified 1990 Dec 5 so that features are left aligned. \newcommand{\lfs}[2] { - \mbox{$ - \it + \mbox{\cov@emphasized + $ \!\! \begin{array}[t]{c} #1 \\ \mbox{\small% $ - \it \left[ \!\! \begin{array}{l} @@ -411,7 +614,7 @@ \newcommand{\drs}[2] { { - \it + \cov@emphasized \begin{tabular}{|l|} \hline ~ \vspace{-2ex} \\ @@ -430,7 +633,7 @@ \newcommand{\sdrs}[3] {\begin{tabular}{l} -\mbox{\it #1} \\ +\mbox{\cov@emphasized #1} \\ ~ \\ \drs{#2}{#3} \end{tabular}} @@ -458,9 +661,15 @@ % exercise Environment for exercises, numbered by subsection. % Optional argument for describing the exercise % ("Project" or the like). +% +% New in 1.1 (2016-07-06): +% We provide a covexercise environment and only (re)define +% example if it does not yet exist or if redefinition is +% forced by the "force" option. This prevents clashes +% with packages/classes that roll their own exercise environment. -% \bx Abbreviation for \begin{exercise} -% \ex Abbreviation for \end{exercise} +% \bx Abbreviation for \begin{covexercise} +% \ex Abbreviation for \end{covexercise} % reflist Environment for hanging-indented list % (suitable for LSA-style reference list). @@ -472,31 +681,52 @@ % large curly brackets. Good for alternatives % within sentences or PS-rules. -\newtheorem{exercise}{Exercise}[subsection] +\newtheorem{covexercise}{Exercise}[subsection] % Exercise numbering resets to 0 not only at the start of % a subsection, but also at the start of a section or chapter % even if it is not divided into subsections. -\@addtoreset{exercise}{section} -\@addtoreset{exercise}{chapter} +\@addtoreset{covexercise}{section} +\@addtoreset{covexercise}{chapter} -\newcommand{\bx}{\begin{exercise}} -\newcommand{\ex}{\end{exercise}} +\newcommand{\bx}{\begin{covexercise}} +\newcommand{\ex}{\end{covexercise}} + +\@ifundefined{exercise}{% + \newenvironment{exercise}{\begin{covexercise}}{\end{covexercise}} +}{% +\ifforceredef + \renewenvironment{exercise}{\begin{covexercise}}{\end{covexercise}} + \cov@warning{The exercise environment was already defined. Redefining it.} +\else + \cov@warning{The exercise environment was already defined.^^J + Covington does not touch it.^^J + Use covexercise if you want to access covington's^^J + version, or use the force package option.} +\fi +} +\newlength\reflistindent +\setlength\reflistindent{3em} +\newlength\reflistitemsep +\setlength\reflistitemsep{6pt} +\newlength\reflistparsep +\setlength\reflistparsep{\parsep} \@ifundefined{reflist}{ \newenvironment{reflist}{\begin{list}{}% {\setlength{\labelwidth}{0pt} \setlength{\labelsep}{0pt} - \setlength{\leftmargin}{3em} - \setlength{\itemindent}{-3em} - \setlength{\listparindent}{-3em} - \setlength{\itemsep}{6pt}}\item}{\end{list}} + \setlength{\leftmargin}{\reflistindent} + \setlength{\itemindent}{-\reflistindent} + \setlength{\listparindent}{-\reflistindent} + \setlength{\itemsep}{\reflistitemsep} + \setlength{\parsep}{\reflistparsep}}\item}{\end{list}} } % Modified 1992 Nov 8 to skip defining reflist if reflist is already % defined. Permits using uga.sty with covingtn.sty. \newcommand{\sentence}[1] - {\begin{flushleft}{\it #1}\end{flushleft}} + {\begin{flushleft}{\cov@emphasized #1}\end{flushleft}} \newcommand{\either}[2] { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.tlpobj new/tlpkg/tlpobj/covington.tlpobj --- old/tlpkg/tlpobj/covington.tlpobj 2016-04-14 18:54:29.000000000 +0200 +++ new/tlpkg/tlpobj/covington.tlpobj 2017-06-07 02:21:37.000000000 +0200 @@ -1,16 +1,17 @@ name covington category Package -revision 34064 +revision 44501 shortdesc Linguistic support relocated 1 longdesc Numerous minor LaTeX enhancements for linguistics, including -longdesc multiple accents on the same letter, interline glosses (word-by- -longdesc word translations), Discourse Representation Structures, and -longdesc example numbering. -runfiles size=4 +longdesc multiple accents on the same letter, interline glosses +longdesc (word-by-word translations), Discourse Representation +longdesc Structures, and example numbering. +runfiles size=6 RELOC/tex/latex/covington/covington.sty catalogue-also gb4e catalogue-ctan /macros/latex/contrib/covington -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license pd +catalogue-date 2017-05-25 12:40:59 +0200 +catalogue-license lppl1.3 catalogue-topics linguistic +catalogue-version 1.4 ++++++ cprotect.doc.tar.xz ++++++ ++++++ cprotect.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cprotect.tlpobj new/tlpkg/tlpobj/cprotect.tlpobj --- old/tlpkg/tlpobj/cprotect.tlpobj 2016-04-14 18:54:30.000000000 +0200 +++ new/tlpkg/tlpobj/cprotect.tlpobj 2017-04-14 17:37:14.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/cprotect/cprotect.sty catalogue-ctan /macros/latex/contrib/cprotect -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics verbatim catalogue-version 1.0e ++++++ crbox.doc.tar.xz ++++++ ++++++ crbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crbox.tlpobj new/tlpkg/tlpobj/crbox.tlpobj --- old/tlpkg/tlpobj/crbox.tlpobj 2016-04-14 18:54:30.000000000 +0200 +++ new/tlpkg/tlpobj/crbox.tlpobj 2017-04-14 17:37:15.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/crbox/crbox.sty catalogue-ctan /macros/latex/contrib/crbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing typesetting decoration catalogue-version 0.1 ++++++ crimson.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/crimson/README new/doc/fonts/crimson/README --- old/doc/fonts/crimson/README 2016-02-20 00:37:24.000000000 +0100 +++ new/doc/fonts/crimson/README 2017-03-17 23:01:03.000000000 +0100 @@ -1,5 +1,5 @@ This is the README for the crimson package, -version 2016-02-19. +version 2017-03-16. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Crimson Text family of fonts, designed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.doc.tlpobj new/tlpkg/tlpobj/crimson.doc.tlpobj --- old/tlpkg/tlpobj/crimson.doc.tlpobj 2016-04-14 18:54:30.000000000 +0200 +++ new/tlpkg/tlpobj/crimson.doc.tlpobj 2017-04-14 17:37:15.000000000 +0200 @@ -1,6 +1,6 @@ name crimson.doc category Package -revision 39782 +revision 43525 shortdesc doc files of crimson relocated 1 docfiles size=12 ++++++ crimson.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/crimson/crimson.sty new/tex/latex/crimson/crimson.sty --- old/tex/latex/crimson/crimson.sty 2016-02-20 00:37:24.000000000 +0100 +++ new/tex/latex/crimson/crimson.sty 2017-03-17 23:01:05.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesPackage{crimson}[% - 2016/02/06 (Bob Tennent) Supports crimson fonts for all LaTeX engines. ] + 2017/03/16 (Bob Tennent) Supports crimson fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -12,10 +12,10 @@ \crimson@otffalse \fi\fi -\newcommand*{\crimson@scale}{1} +\newcommand*{\Crimson@scale}{1} \RequirePackage{xkeyval} -\DeclareOptionX{scaled}{\renewcommand*{\crimson@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\crimson@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\Crimson@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\Crimson@scale}{#1}} \newif\ifcrimson@semibold \crimson@semiboldfalse @@ -49,7 +49,7 @@ \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , - Scale = \crimson@scale, + Scale = \Crimson@scale, Extension = .otf , } \setmainfont diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.tlpobj new/tlpkg/tlpobj/crimson.tlpobj --- old/tlpkg/tlpobj/crimson.tlpobj 2016-04-14 18:54:30.000000000 +0200 +++ new/tlpkg/tlpobj/crimson.tlpobj 2017-04-14 17:37:15.000000000 +0200 @@ -1,6 +1,6 @@ name crimson category Package -revision 39782 +revision 43525 shortdesc Crimson fonts with LaTeX support relocated 1 longdesc This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX @@ -113,6 +113,6 @@ RELOC/tex/latex/crimson/TS1Crimson-TLF.fd RELOC/tex/latex/crimson/crimson.sty catalogue-ctan /fonts/crimson -catalogue-date 2016-02-19 15:20:28 +0100 +catalogue-date 2017-03-17 08:10:17 +0100 catalogue-license ofl catalogue-topics font-serif font-otf font-type1 ++++++ crop.doc.tar.xz ++++++ ++++++ crop.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crop.tlpobj new/tlpkg/tlpobj/crop.tlpobj --- old/tlpkg/tlpobj/crop.tlpobj 2016-04-14 18:54:32.000000000 +0200 +++ new/tlpkg/tlpobj/crop.tlpobj 2017-04-14 17:37:16.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/crop/crop.sty catalogue-also zwpagelayout catalogue-ctan /macros/latex/contrib/crop -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics layout-page catalogue-version 1.5 ++++++ crossreference.doc.tar.xz ++++++ ++++++ crossreference.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossreference.tlpobj new/tlpkg/tlpobj/crossreference.tlpobj --- old/tlpkg/tlpobj/crossreference.tlpobj 2016-04-14 18:54:32.000000000 +0200 +++ new/tlpkg/tlpobj/crossreference.tlpobj 2017-04-14 17:37:16.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/crossreference/crossreference.sty catalogue-ctan /macros/latex/contrib/crossreference -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 ++++++ crossrefware.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bbl2bib.1 new/texmf-dist/doc/man/man1/bbl2bib.1 --- old/texmf-dist/doc/man/man1/bbl2bib.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/bbl2bib.1 2017-04-24 00:08:21.000000000 +0200 @@ -0,0 +1,202 @@ +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "bbl2bib 1" +.TH bbl2bib 1 "2017-04-23" "" "CROSSREF LIBRARY" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +bbl2bib.pl \- convert thebibliography environment to a bib file +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +bbl2bib.pl [\fB\-o\fR \fIoutput\fR] \fIfile\fR +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fB\-o\fR \fIoutput\fR" 4 +.IX Item "-o output" +Output file. If this option is not used, the name for the +output file is formed by changing the extension to \f(CW\*(C`.bib\*(C'\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +The script tries to reconstruct a \f(CW\*(C`bib\*(C'\fR file from the corresponding +\&\f(CW\*(C`thebibliography\*(C'\fR environment. One can argue that this operation is +akin to reconstructing a cow from the steak. The way the script does +it is searching for the entry in the \s-1MR\s0 database, and +creating the corresponding BibTeX fields. +.PP +The script reads a TeX or Bbl file and extracts from it the +\&\f(CW\*(C`thebibliography\*(C'\fR environment. For each bibitem it creates a plain +text bibliography entry, and then tries to match it in +the database. +=head1 \s-1INPUT FILE\s0 +.PP +We assume some structure of the input file: +.IP "1." 4 +The bibliography is contained between the lines +.Sp +.Vb 1 +\& \ebegin{thebibliography}... +.Ve +.Sp +and +.Sp +.Vb 1 +\& \eend{thebibliography} +.Ve +.IP "2." 4 +Each bibliography item starts from the line +.Sp +.Vb 1 +\& \ebibitem[...]{....} +.Ve +.SH "EXAMPLES" +.IX Header "EXAMPLES" +.Vb 3 +\& bbl2bib \-o \- file.tex > result.bib +\& bbl2bib \-o result.bib file.bbl +\& bbl2bib file.tex +.Ve +.SH "AUTHOR" +.IX Header "AUTHOR" +Boris Veytsman +.SH "COPYRIGHT AND LICENSE" +.IX Header "COPYRIGHT AND LICENSE" +Copyright (C) 2014\-2017 Boris Veytsman +.PP +This is free software. You may redistribute copies of it under the +terms of the \s-1GNU\s0 General Public License +<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO WARRANTY,\s0 to the +extent permitted by law. Binary files old/texmf-dist/doc/man/man1/bbl2bib.man1.pdf and new/texmf-dist/doc/man/man1/bbl2bib.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bibdoiadd.1 new/texmf-dist/doc/man/man1/bibdoiadd.1 --- old/texmf-dist/doc/man/man1/bibdoiadd.1 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/doc/man/man1/bibdoiadd.1 2017-04-24 00:08:21.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "bibdoiadd 1" -.TH bibdoiadd 1 "2016-02-14" "" "CROSSREF LIBRARY" +.TH bibdoiadd 1 "2017-04-09" "" "CROSSREF LIBRARY" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,13 +142,18 @@ bibdoiadd.pl \- add DOI numbers to papers in a given bib file .SH "SYNOPSIS" .IX Header "SYNOPSIS" -bibdoiadd [\fB\-c\fR \fIconfig_file\fR] [\fB\-f\fR] [\fB\-o\fR \fIoutput\fR] \fIbib_file\fR +bibdoiadd [\fB\-c\fR \fIconfig_file\fR] [\fB\-e\fR 1|0] [\fB\-f\fR] [\fB\-o\fR \fIoutput\fR] \fIbib_file\fR .SH "OPTIONS" .IX Header "OPTIONS" .IP "\fB\-c\fR \fIconfig_file\fR" 4 .IX Item "-c config_file" Configuration file. If this file is absent, some defaults are used. See below for its format. +.IP "\fB\-e\fR" 4 +.IX Item "-e" +If 1 (default), add empty doi if a doi cannot be found. This prevents +repeated searches for the same entries if you add new entries to the +file. Calling \f(CW\*(C`\-e 0\*(C'\fR suppresses this behavior. .IP "\fB\-f\fR" 4 .IX Item "-f" Force checking doi number even if one is present @@ -151,7 +165,7 @@ .IX Header "DESCRIPTION" The script reads a BibTeX file. It checks whether the entries have DOIs. If now, tries to contact http://www.crossref.org to get the -corresponding \s-1DOI\s0. The result is a BibTeX file with the fields +corresponding \s-1DOI. \s0 The result is a BibTeX file with the fields \&\f(CW\*(C`doi=...\*(C'\fR added. .PP The name of the output file is either set by the \fB\-o\fR option or @@ -175,23 +189,23 @@ \& $field = value ; .Ve .PP -The important parameters are \f(CW$mode\fR (\f(CW\*(Aqfree\*(Aq\fR or \f(CW\*(Aqpaid\*(Aq\fR, +The important parameters are \f(CW$mode\fR (\f(CW\*(Aqfree\*(Aq\fR or \f(CW\*(Aqpaid\*(Aq\fR), \&\f(CW$email\fR (for free users) and \f(CW$username\fR & \f(CW$password\fR for paid members. .SH "EXAMPLES" .IX Header "EXAMPLES" .Vb 2 -\& bibdoiadd \-c bibdoiadd.cfg citations.bib > result.bib -\& bibdoiadd \-c bibdoiadd.cfg citations.bib \-o result.bib +\& bibdoiadd \-c bibdoiadd.cfg \-o \- citations.bib > result.bib +\& bibdoiadd \-c bibdoiadd.cfg \-o result.bib citations.bib .Ve .SH "AUTHOR" .IX Header "AUTHOR" Boris Veytsman .SH "COPYRIGHT AND LICENSE" .IX Header "COPYRIGHT AND LICENSE" -Copyright (C) 2014\-2016 Boris Veytsman +Copyright (C) 2014\-2017 Boris Veytsman .PP This is free software. You may redistribute copies of it under the terms of the \s-1GNU\s0 General Public License -<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO\s0 \s-1WARRANTY\s0, to the +<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO WARRANTY,\s0 to the extent permitted by law. Binary files old/texmf-dist/doc/man/man1/bibdoiadd.man1.pdf and new/texmf-dist/doc/man/man1/bibdoiadd.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bibmradd.1 new/texmf-dist/doc/man/man1/bibmradd.1 --- old/texmf-dist/doc/man/man1/bibmradd.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/bibmradd.1 2017-04-17 00:25:15.000000000 +0200 @@ -0,0 +1,182 @@ +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "bibmradd 1" +.TH bibmradd 1 "2017-04-03" "" "CROSSREF LIBRARY" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +bibmradd.pl \- add MR numbers to papers in a given bib file +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +bibmradd [\-d] [\fB\-f\fR] [\fB\-e\fR 1|0] [\fB\-o\fR \fIoutput\fR] \fIbib_file\fR +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fB\-d\fR" 4 +.IX Item "-d" +Debug mode +.IP "\fB\-e\fR" 4 +.IX Item "-e" +If 1 (default), add an empty mrnumber if a mr cannot be found. This +prevents repeated searches for the same entries if you add new entries +to the file. Calling \f(CW\*(C`\-e 0\*(C'\fR suppresses this behavior. +.IP "\fB\-f\fR" 4 +.IX Item "-f" +Force searching for \s-1MR\s0 numbers even if the entry already has one. +.IP "\fB\-o\fR \fIoutput\fR" 4 +.IX Item "-o output" +Output file. If this option is not used, the name for the +output file is formed by adding \f(CW\*(C`_mr\*(C'\fR to the input file +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +The script reads a BibTeX file. It checks whether the entries have +mrnumberss. If not, tries to contact internet to get the numbers. The +result is a BibTeX file with the fields +\&\f(CW\*(C`mrnumber=...\*(C'\fR added. +.PP +The name of the output file is either set by the \fB\-o\fR option or +is derived by adding the suffix \f(CW\*(C`_mr\*(C'\fR to the output file. +.SH "AUTHOR" +.IX Header "AUTHOR" +Boris Veytsman +.SH "COPYRIGHT AND LICENSE" +.IX Header "COPYRIGHT AND LICENSE" +Copyright (C) 2014\-2017 Boris Veytsman +.PP +This is free software. You may redistribute copies of it under the +terms of the \s-1GNU\s0 General Public License +<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO WARRANTY,\s0 to the +extent permitted by law. Binary files old/texmf-dist/doc/man/man1/bibmradd.man1.pdf and new/texmf-dist/doc/man/man1/bibmradd.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bibzbladd.1 new/texmf-dist/doc/man/man1/bibzbladd.1 --- old/texmf-dist/doc/man/man1/bibzbladd.1 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/doc/man/man1/bibzbladd.1 2017-04-24 00:08:21.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "bibzbladd 1" -.TH bibzbladd 1 "2016-02-14" "" "CROSSREF LIBRARY" +.TH bibzbladd 1 "2017-04-02" "" "CROSSREF LIBRARY" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,9 +142,17 @@ bibzbladd.pl \- add Zbl numbers to papers in a given bib file .SH "SYNOPSIS" .IX Header "SYNOPSIS" -bibzbladd [\fB\-f\fR] [\fB\-o\fR \fIoutput\fR] \fIbib_file\fR +bibzbladd [\-d] [\fB\-f\fR] [\fB\-e\fR 1|0] [\fB\-o\fR \fIoutput\fR] \fIbib_file\fR .SH "OPTIONS" .IX Header "OPTIONS" +.IP "\fB\-d\fR" 4 +.IX Item "-d" +Debug mode +.IP "\fB\-e\fR" 4 +.IX Item "-e" +If 1 (default), add an empty zblnumber if a zbl cannot be found. This +prevents repeated searches for the same entries if you add new entries +to the file. Calling \f(CW\*(C`\-e 0\*(C'\fR suppresses this behavior. .IP "\fB\-f\fR" 4 .IX Item "-f" Force searching for Zbl numbers even if the entry already has one. @@ -157,9 +174,9 @@ Boris Veytsman .SH "COPYRIGHT AND LICENSE" .IX Header "COPYRIGHT AND LICENSE" -Copyright (C) 2014\-2016 Boris Veytsman +Copyright (C) 2014\-2017 Boris Veytsman .PP This is free software. You may redistribute copies of it under the terms of the \s-1GNU\s0 General Public License -<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO\s0 \s-1WARRANTY\s0, to the +<http://www.gnu.org/licenses/gpl.html>. There is \s-1NO WARRANTY,\s0 to the extent permitted by law. Binary files old/texmf-dist/doc/man/man1/bibzbladd.man1.pdf and new/texmf-dist/doc/man/man1/bibzbladd.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf and new/texmf-dist/doc/man/man1/ltx2crossrefxml.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/crossrefware/Makefile new/texmf-dist/doc/support/crossrefware/Makefile --- old/texmf-dist/doc/support/crossrefware/Makefile 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/doc/support/crossrefware/Makefile 2017-04-17 00:25:15.000000000 +0200 @@ -1,7 +1,9 @@ SCRIPTS = \ ltx2crossrefxml.pl \ bibdoiadd.pl \ - bibzbladd.pl + bibzbladd.pl \ + bibmradd.pl \ + bbl2bib.pl MAN1 = ${SCRIPTS:%.pl=%.1} @@ -20,7 +22,8 @@ clean: - $(RM) *.aux *.toc *.log *.tex *.idx *.ilg *.ind *.out *.zip *.tgz + $(RM) *.aux *.toc *.log *.tex *.idx *.ilg *.ind *.out *.zip *.tgz \ + *~ distclean: clean $(RM) *.pdf *.1 *.3 @@ -37,5 +40,5 @@ pod2latex -modify -full -prefile head.ltx -out $@ $+ archive: all clean - cd ..; tar -czvf crossrefware.tgz crossref --exclude CVS \ - --exclude test --exclude *.bib \ No newline at end of file + cd ..; tar -czvf crossrefware.tgz --exclude 'CVS' \ + --exclude 'test' --exclude *.bib crossref diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/crossrefware/README new/texmf-dist/doc/support/crossrefware/README --- old/texmf-dist/doc/support/crossrefware/README 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/doc/support/crossrefware/README 2017-04-24 00:08:21.000000000 +0200 @@ -1,11 +1,16 @@ Crossrefware Bundle - version 2.0 + version 2.1a -Scripts useful for working with crossref.org and Zentralblatt MATH. +Scripts useful for working with Crossref, MathSciNet and Zentralblatt MATH. + +This work was commissioned by The Saint Lois University and The +Princeton University (Mathematics Department) bibdoiadd.pl - add DOI numbers to papers in a given bib file bibzbladd.pl - add Zbl numbers to papers in a given bib file +bibmradd.pl - add MR numbers to papers in a given bib file +bbl2bib.pl - convert `thebibliography' environment to a bib file ltx2crossrefxml.pl - a tool for creation of XML files for submitting to crossref.org The scripts use bibtexperllibs libraries from CTAN @@ -21,6 +26,13 @@ Changes: + Version 2.1a: Bug in bbl2bib corrected + + Version 2.1: New options to add empty doi and zbl when doi or zbl + are not found to prevent repeated searches. + Added bibmradd.pl + Added bbl2bib.pl + Version 2.0: Moved to BibTeX::Parser suite. Now we use new Zbmath interface. Now we use bibtexperllibs libraries Binary files old/texmf-dist/doc/support/crossrefware/crossrefware.pdf and new/texmf-dist/doc/support/crossrefware/crossrefware.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/crossrefware/head.ltx new/texmf-dist/doc/support/crossrefware/head.ltx --- old/texmf-dist/doc/support/crossrefware/head.ltx 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/doc/support/crossrefware/head.ltx 2017-04-17 00:25:15.000000000 +0200 @@ -1,18 +1,39 @@ \documentclass{article} \usepackage{makeidx} -\usepackage{librecaslon} +\usepackage[osf]{mathpazo} \usepackage[hidelinks]{hyperref} \makeindex \begin{document} -\title{Crossrefware documentation} -\author{Boris Veytsman} +\sloppy +\title{Crossrefware documentation\thanks{This work was commissioned by + The Saint Lois University and The Princeton University (Mathematics + Department)}} +\author{Boris Veytsman\thanks{borisv(a)lk.net, boris(a)varphi.com}} \maketitle \tableofcontents -These scripts can be used to submit files to Crossref, check and add -doi numbers and ZbMath numbers to papers. +\section{Introduction} +These scripts can be used to submit files to Crossref, check and add +doi numbers, MathSciNet numbers and ZbMath numbers to papers, and to +convert `bbl' files to `bib' files. I am grateful to Josko Plazonic from Princeton Math Dept whose (unpublished) Python script was an inspiration for this suite. +The script \path{ltx2crossrefxml} is used to extract the information +from a \LaTeX\ file and generate an XML file suitable for submission +to Crossref (the organization that keeps DOI numbering system). + +Several scripts, \path{bibdoiadd}, \path{bibmradd} and \path{bibmradd} +take a \path{bib} file, and add to each entry a DOI, MR or ZBL number +correspondingly, if they can find this entry in the corresponding +database. + +Script \path{bbl2bib} tries to reconstruct a \path{bib} file from the +corresponding \path{thebibliography} environment. One can argue that +this operation is akin to reconstructing a cow from the steak. The +way the script does it is searching for the entry in the MR database, +and creating the corresponding Bib\TeX\ fields. + +Below are manual pages for these scripts. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossrefware.doc.tlpobj new/tlpkg/tlpobj/crossrefware.doc.tlpobj --- old/tlpkg/tlpobj/crossrefware.doc.tlpobj 2016-04-14 18:54:32.000000000 +0200 +++ new/tlpkg/tlpobj/crossrefware.doc.tlpobj 2017-04-24 02:07:06.000000000 +0200 @@ -1,10 +1,14 @@ name crossrefware.doc category Package -revision 39727 +revision 43993 shortdesc doc files of crossrefware -docfiles size=59 +docfiles size=58 + texmf-dist/doc/man/man1/bbl2bib.1 + texmf-dist/doc/man/man1/bbl2bib.man1.pdf texmf-dist/doc/man/man1/bibdoiadd.1 texmf-dist/doc/man/man1/bibdoiadd.man1.pdf + texmf-dist/doc/man/man1/bibmradd.1 + texmf-dist/doc/man/man1/bibmradd.man1.pdf texmf-dist/doc/man/man1/bibzbladd.1 texmf-dist/doc/man/man1/bibzbladd.man1.pdf texmf-dist/doc/man/man1/ltx2crossrefxml.1 ++++++ crossrefware.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/crossrefware/bbl2bib.pl new/texmf-dist/scripts/crossrefware/bbl2bib.pl --- old/texmf-dist/scripts/crossrefware/bbl2bib.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/scripts/crossrefware/bbl2bib.pl 2017-04-24 00:08:21.000000000 +0200 @@ -0,0 +1,259 @@ +#!/usr/bin/env perl + +=pod + +=head1 NAME + +bbl2bib.pl - convert thebibliography environment to a bib file + +=head1 SYNOPSIS + +bbl2bib.pl [B<-o> I<output>] I<file> + +=head1 OPTIONS + +=over 4 + + + +=item B<-o> I<output> + +Output file. If this option is not used, the name for the +output file is formed by changing the extension to C<.bib> + + +=back + +=head1 DESCRIPTION + +The script tries to reconstruct a C<bib> file from the corresponding +C<thebibliography> environment. One can argue that this operation is +akin to reconstructing a cow from the steak. The way the script does +it is searching for the entry in the MR database, and +creating the corresponding BibTeX fields. + +The script reads a TeX or Bbl file and extracts from it the +C<thebibliography> environment. For each bibitem it creates a plain +text bibliography entry, and then tries to match it in +the database. +=head1 INPUT FILE + +We assume some structure of the input file: + +=over 4 + +=item 1. + +The bibliography is contained between the lines + + \begin{thebibliography}... + +and + + \end{thebibliography} + +=item 2. + +Each bibliography item starts from the line + + \bibitem[...]{....} + +=back + + + +=head1 EXAMPLES + + bbl2bib -o - file.tex > result.bib + bbl2bib -o result.bib file.bbl + bbl2bib file.tex + +=head1 AUTHOR + +Boris Veytsman + +=head1 COPYRIGHT AND LICENSE + +Copyright (C) 2014-2017 Boris Veytsman + +This is free software. You may redistribute copies of it under the +terms of the GNU General Public License +L<http://www.gnu.org/licenses/gpl.html>. There is NO WARRANTY, to the +extent permitted by law. + +=cut + +use strict; +BEGIN { + # find files relative to our installed location within TeX Live + chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root + if (length($TLMaster)) { + unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs"; + } +} +use IO::File; +use BibTeX::Parser; +use FileHandle; +use LaTeX::ToUnicode qw (convert); +use Getopt::Std; +use URI::Escape; +use LWP::Simple; + +my $USAGE="USAGE: $0 [-o output] file\n"; +my $VERSION = <<END; +bbl2bib v2.1a +This is free software. You may redistribute copies of it under the +terms of the GNU General Public License +http://www.gnu.org/licenses/gpl.html. There is NO WARRANTY, to the +extent permitted by law. +$USAGE +END +our %opts; +getopts('c:o:s:hV',\%opts) or die $USAGE; + +if ($opts{h} || $opts{V}){ + print $VERSION; + exit 0; +} + +################################################################ +# Defaults and parameters +################################################################ + +my $inputfile = shift; + +my $outputfile = $inputfile; + +$outputfile =~ s/\.([^\.]*)$/.bib/; + +if (exists $opts{o}) { + $outputfile = $opts{o}; +} + + + +my $input= IO::File->new($inputfile) or + die "Cannot find Bbl or TeX file $inputfile\n$USAGE\n"; +my $output = IO::File->new("> $outputfile") or + die "Cannot write to $outputfile\n$USAGE\n"; + +my $userAgent = LWP::UserAgent->new; + + +# Bibitem is a hash with the entries 'key', 'text', 'mr', +# 'zbl' +my $bibitem; + +while (<$input>) { + if (!(/\\begin\{thebibliography\}/../\\end\{thebibliography\}/) || + /\\begin\{thebibliography\}/ || /\\end\{thebibliography\}/) { + next; + } + if (/\\bibitem(\[[^\]]*\])?\{([^\}]*)\}/) { + ProcessBibitem($bibitem); + $bibitem = undef; + $bibitem->{key}=$2; + $bibitem->{text}=""; + } + if (!/^\s*$/) { + $bibitem -> {text} .= $_; + } +} +ProcessBibitem($bibitem); + + +exit 0; + +sub ProcessBibitem { + my $bibitem = shift; + my $key = $bibitem->{key}; + my $text=$bibitem->{text}; + if (!length($text) || $text =~ /^\s+$/s) { + return; + } + + my $printtext = $text; + $printtext =~ s/^(.)/% $1/mg; + print $output "$printtext"; + $text =~ s/\n/ /mg; + $text =~ s/\\bibitem(\[[^\]]*\])?\{[^\}]*\}//; + + # Arxiv entry? + if ($text =~ s/\\arxiv\{([^\}]+)\}\.?//) { + $bibitem->{arxiv}=$1; + } + + # Mr number exists? + if ($text =~ s/\\mr\{([^\}]+)\}\.?//) { + $bibitem->{mr}=$1; + } + + # zbl number exists? + if ($text =~ s/\\zbl\{([^\}]+)\}\.?//) { + $bibitem->{zbl}=$1; + } + + # doi number exists? + if ($text =~ s/\\doi\{([^\}]+)\}\.?//) { + $bibitem->{doi}=$1; + } + + $bibitem->{bib} = SearchMref($bibitem); + PrintBibitem($bibitem); + return; +} + + +sub SearchMref { + my $bibitem = shift; + my $mirror = "http://www.ams.org/mathscinet-mref"; + my $string=uri_escape_utf8($bibitem->{text}); + my $response = $userAgent->get("$mirror?ref=$string&dataType=bibtex") -> + decoded_content(); + if ($response =~ /<pre>(.*)<\/pre>/s) { + my $bib= $1; + my $fh = new FileHandle; + open $fh, "<", \$bib; + my $parser = new BibTeX::Parser($fh); + my $entry = $parser->next; + if (ref($entry) && $entry->parse_ok()) { + $entry->key($bibitem->{key}); + return ($entry); + } + } +} + + + + +sub PrintBibitem { + print $output "\n"; + my $bibitem = shift; + if (!ref($bibitem->{bib})) { + return; + } + my $entry=$bibitem->{bib}; + if ($bibitem->{mr} && ! $entry->field('mrnumber')) { + $entry->field('mrnumber', $bibitem->{mr}); + } + if ($entry->field('mrnumber')) { + my $mr=$entry->field('mrnumber'); + while (length($mr)<7) { + $mr = "0$mr"; + } + $mr=$entry->field('mrnumber', $mr); + } + if ($bibitem->{zbl} && ! $entry->field('zblnumber')) { + $entry->field('zblnumber', $bibitem->{zbl}); + } + if ($bibitem->{doi} && ! $entry->field('doi')) { + $entry->field('doi', $bibitem->{doi}); + } + if ($bibitem->{arxiv} && ! $entry->field('arxiv')) { + $entry->field('arxiv', $bibitem->{arxiv}); + } + + print $output $entry->to_string(), "\n\n"; +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/crossrefware/bibdoiadd.pl new/texmf-dist/scripts/crossrefware/bibdoiadd.pl --- old/texmf-dist/scripts/crossrefware/bibdoiadd.pl 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/scripts/crossrefware/bibdoiadd.pl 2017-04-17 00:25:15.000000000 +0200 @@ -8,7 +8,7 @@ =head1 SYNOPSIS -bibdoiadd [B<-c> I<config_file>] [B<-f>] [B<-o> I<output>] I<bib_file> +bibdoiadd [B<-c> I<config_file>] [B<-e> 1|0] [B<-f>] [B<-o> I<output>] I<bib_file> =head1 OPTIONS @@ -19,6 +19,12 @@ Configuration file. If this file is absent, some defaults are used. See below for its format. +=item B<-e> + +If 1 (default), add empty doi if a doi cannot be found. This prevents +repeated searches for the same entries if you add new entries to the +file. Calling C<-e 0> suppresses this behavior. + =item B<-f> Force checking doi number even if one is present @@ -59,15 +65,15 @@ $field = value ; -The important parameters are C<$mode> (C<'free'> or C<'paid'>, +The important parameters are C<$mode> (C<'free'> or C<'paid'>), C<$email> (for free users) and C<$username> & C<$password> for paid members. =head1 EXAMPLES - bibdoiadd -c bibdoiadd.cfg citations.bib > result.bib - bibdoiadd -c bibdoiadd.cfg citations.bib -o result.bib + bibdoiadd -c bibdoiadd.cfg -o - citations.bib > result.bib + bibdoiadd -c bibdoiadd.cfg -o result.bib citations.bib =head1 AUTHOR @@ -75,7 +81,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2014-2016 Boris Veytsman +Copyright (C) 2014-2017 Boris Veytsman This is free software. You may redistribute copies of it under the terms of the GNU General Public License @@ -99,17 +105,17 @@ use URI::Escape; use LWP::Simple; -my $USAGE="USAGE: $0 [-c config] [-f] [-o output] file\n"; +my $USAGE="USAGE: $0 [-c config] [-e 1|0] [-f] [-o output] file\n"; my $VERSION = <<END; -bibdoiadd v2.0 +bibdoiadd v2.1 This is free software. You may redistribute copies of it under the terms of the GNU General Public License http://www.gnu.org/licenses/gpl.html. There is NO WARRANTY, to the extent permitted by law. $USAGE END -my %opts; -getopts('fc:o:hV',\%opts) or die $USAGE; +our %opts; +getopts('fe:c:o:hV',\%opts) or die $USAGE; if ($opts{h} || $opts{V}){ print $VERSION; @@ -126,12 +132,15 @@ $outputfile =~ s/\.([^\.]*)$/_doi.$1/; -if ($opts{o}) { +if (exists $opts{o}) { $outputfile = $opts{o}; } my $forceSearch=$opts{f}; - +my $forceEmpty = 1; +if (exists $opts{e}) { + $forceEmpty = $opts{e}; +} our $mode='free'; our $email; @@ -196,7 +205,7 @@ my $doi = GetDoi($prefix, $entry); - if (length($doi)) { + if (length($doi) || $forceEmpty) { $entry->field('doi',$doi); } print $output $entry->to_string(), "\n\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/crossrefware/bibmradd.pl new/texmf-dist/scripts/crossrefware/bibmradd.pl --- old/texmf-dist/scripts/crossrefware/bibmradd.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/scripts/crossrefware/bibmradd.pl 2017-04-17 00:25:15.000000000 +0200 @@ -0,0 +1,210 @@ +#!/usr/bin/env perl + +=pod + +=head1 NAME + +bibmradd.pl - add MR numbers to papers in a given bib file + +=head1 SYNOPSIS + +bibmradd [-d] [B<-f>] [B<-e> 1|0] [B<-o> I<output>] I<bib_file> + +=head1 OPTIONS + +=over 4 + +=item B<-d> + +Debug mode + +=item B<-e> + +If 1 (default), add an empty mrnumber if a mr cannot be found. This +prevents repeated searches for the same entries if you add new entries +to the file. Calling C<-e 0> suppresses this behavior. + + +=item B<-f> + +Force searching for MR numbers even if the entry already has one. + +=item B<-o> I<output> + +Output file. If this option is not used, the name for the +output file is formed by adding C<_mr> to the input file + +=back + +=head1 DESCRIPTION + +The script reads a BibTeX file. It checks whether the entries have +mrnumberss. If not, tries to contact internet to get the numbers. The +result is a BibTeX file with the fields +C<mrnumber=...> added. + +The name of the output file is either set by the B<-o> option or +is derived by adding the suffix C<_mr> to the output file. + +=head1 AUTHOR + +Boris Veytsman + +=head1 COPYRIGHT AND LICENSE + +Copyright (C) 2014-2017 Boris Veytsman + +This is free software. You may redistribute copies of it under the +terms of the GNU General Public License +L<http://www.gnu.org/licenses/gpl.html>. There is NO WARRANTY, to the +extent permitted by law. + +=cut + +use strict; +BEGIN { + # find files relative to our installed location within TeX Live + chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root + if (length($TLMaster)) { + unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs"; + } +} +use IO::File; +use BibTeX::Parser; +use Getopt::Std; +use URI::Escape; +use LWP::UserAgent; +$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME}=0; + +my $USAGE="USAGE: $0 [-d] [-e 1|0] [-f] [-o output] file\n"; +my $VERSION = <<END; +bibmradd v2.1 +This is free software. You may redistribute copies of it under the +terms of the GNU General Public License +http://www.gnu.org/licenses/gpl.html. There is NO WARRANTY, to the +extent permitted by law. +$USAGE +END +my %opts; +getopts('de:fo:hV',\%opts) or die $USAGE; + +if ($opts{h} || $opts{V}){ + print $VERSION; + exit 0; +} + +################################################################ +# Defaults and parameters +################################################################ + +my $inputfile = shift; + +my $outputfile = $inputfile; + +$outputfile =~ s/\.([^\.]*)$/_mr.$1/; + +if ($opts{o}) { + $outputfile = $opts{o}; +} + +my $forceSearch=$opts{f}; + +my $forceEmpty = 1; +if (exists $opts{e}) { + $forceEmpty = $opts{e}; +} + +my $debug = $opts{d}; + +my $input= IO::File->new($inputfile) or + die "Cannot find BibTeX file $inputfile\n$USAGE\n"; +my $output = IO::File->new("> $outputfile") or + die "Cannot write to $outputfile\n$USAGE\n"; + +my $parser=new BibTeX::Parser($input); + + + +# Creating the HTTP parameters +my $mirror = + "http://www.ams.org/mathscinet-mref"; +my $userAgent = LWP::UserAgent->new; + +while (my $entry = $parser->next ) { + if (!$entry->parse_ok()) { + print STDERR "Cannot understand entry: "; + $entry->print(*STDERR); + print STDERR "Skipping this entry\n"; + next; + } + if ($entry->has('mrnumber') && !$forceSearch) { + print $output $entry->raw_bibtex(), "\n\n"; + if ($debug) { + print STDERR "DEBUG: entry ", $entry->key(), + " has mrnumber ", $entry->field('mrnumber'), + " and no forced search is requested\n"; + } + next; + } + + + # Now we have an entry with no MR. Let us get to work. + if ($debug) { + print STDERR "DEBUG: Searching for mr number for entry ", + $entry->key, "\n"; + } + my $mr = GetMr($entry, $userAgent, $mirror); + if (length($mr) || $forceEmpty) { + $entry->field('mrnumber', $mr); + } + print $output $entry->to_string(), "\n\n"; + +} + +$input->close(); +$output->close(); +exit 0; + +############################################################### +# Getting one MR +############################################################### + +sub GetMr { + my $entry=shift; + my $userAgent=shift; + my $mirror=shift; + + my @query; + + my $string=uri_escape_utf8($entry->to_string()); + + if ($debug) { + print STDERR "DEBUG: query: $mirror?ref=$string&dataType=bibtex\n" ; + } + + + my $response = $userAgent->get("$mirror?ref=$string&dataType=bibtex"); + if ($debug) { + print STDERR "DEBUG: response: ", + $response->decoded_content, "\n"; + } + + if ($response->decoded_content =~ /MRNUMBER\s*=\s*{(.*)}/m) { + my $mr=$1; + # Somehow mref deletes leading zeros. They are needed! + while (length($mr)<7) { + $mr = "0$mr"; + } + if ($debug) { + print STDERR "DEBUG: got MR: $mr\n", + } + return $mr; + } else { + if ($debug) { + print STDERR "DEBUG: Did not get MR\n", + } + return (""); + } + +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/crossrefware/bibzbladd.pl new/texmf-dist/scripts/crossrefware/bibzbladd.pl --- old/texmf-dist/scripts/crossrefware/bibzbladd.pl 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/scripts/crossrefware/bibzbladd.pl 2017-04-17 00:25:15.000000000 +0200 @@ -8,12 +8,23 @@ =head1 SYNOPSIS -bibzbladd [B<-f>] [B<-o> I<output>] I<bib_file> +bibzbladd [-d] [B<-f>] [B<-e> 1|0] [B<-o> I<output>] I<bib_file> =head1 OPTIONS =over 4 +=item B<-d> + +Debug mode + +=item B<-e> + +If 1 (default), add an empty zblnumber if a zbl cannot be found. This +prevents repeated searches for the same entries if you add new entries +to the file. Calling C<-e 0> suppresses this behavior. + + =item B<-f> Force searching for Zbl numbers even if the entry already has one. @@ -41,7 +52,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2014-2016 Boris Veytsman +Copyright (C) 2014-2017 Boris Veytsman This is free software. You may redistribute copies of it under the terms of the GNU General Public License @@ -63,10 +74,11 @@ use Getopt::Std; use URI::Escape; use LWP::UserAgent; +$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME}=0; -my $USAGE="USAGE: $0 [-f] [-o output] file\n"; +my $USAGE="USAGE: $0 [-d] [-e 1|0] [-f] [-o output] file\n"; my $VERSION = <<END; -bibzbladd v2.0 +bibzbladd v2.1 This is free software. You may redistribute copies of it under the terms of the GNU General Public License http://www.gnu.org/licenses/gpl.html. There is NO WARRANTY, to the @@ -74,7 +86,7 @@ $USAGE END my %opts; -getopts('fo:hV',\%opts) or die $USAGE; +getopts('de:fo:hV',\%opts) or die $USAGE; if ($opts{h} || $opts{V}){ print $VERSION; @@ -97,6 +109,13 @@ my $forceSearch=$opts{f}; +my $forceEmpty = 1; +if (exists $opts{e}) { + $forceEmpty = $opts{e}; +} + +my $debug = $opts{d}; + my $input= IO::File->new($inputfile) or die "Cannot find BibTeX file $inputfile\n$USAGE\n"; my $output = IO::File->new("> $outputfile") or @@ -118,19 +137,24 @@ print STDERR "Skipping this entry\n"; next; } - if (!($entry->type() eq 'ARTICLE')) { - print $output $entry->raw_bibtex(), "\n\n"; - next; - } if ($entry->has('zblnumber') && !$forceSearch) { print $output $entry->raw_bibtex(), "\n\n"; + if ($debug) { + print STDERR "DEBUG: entry ", $entry->key(), + " has zblnumber ", $entry->field('zblnumber'), + " and no forced search is requested\n"; + } next; } # Now we have an entry with no Zbl. Let us get to work. + if ($debug) { + print STDERR "DEBUG: Searching for zbl number for entry ", + $entry->key, "\n"; + } my $zbl = GetZbl($entry, $userAgent, $mirror); - if (length($zbl)) { + if (length($zbl) || $forceEmpty) { $entry->field('zblnumber',$zbl); } print $output $entry->to_string(), "\n\n"; @@ -154,12 +178,26 @@ my $string=uri_escape_utf8($entry->to_string()); + if ($debug) { + print STDERR "DEBUG: query: $mirror?bibtex=$string\n" ; + } my $response = $userAgent->get("$mirror?bibtex=$string"); + if ($debug) { + print STDERR "DEBUG: response: ", + $response->decoded_content, "\n"; + } + if ($response->decoded_content =~ /^\s*"zbl_id":\s*"(.*)",\s*$/m) { + if ($debug) { + print STDERR "DEBUG: got zbl: $1\n", + } return $1; } else { + if ($debug) { + print STDERR "DEBUG: Did not get zbl\n", + } return (""); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/crossrefware/bibdoiadd.cfg new/texmf-dist/tex/latex/crossrefware/bibdoiadd.cfg --- old/texmf-dist/tex/latex/crossrefware/bibdoiadd.cfg 2016-02-15 23:07:53.000000000 +0100 +++ new/texmf-dist/tex/latex/crossrefware/bibdoiadd.cfg 2017-04-17 00:25:15.000000000 +0200 @@ -1,7 +1,8 @@ -$mode = 'paid'; # Other option is 'free' +#$mode = 'paid'; # Other option is 'free' +$mode = 'free'; # Other option is 'paid' $email = 'user(a)company.domain'; -$username = 'XXXXXX'; # For paid users -$password = 'XXXXXX'; # For paid users +#$username = 'XXXXXX'; # For paid users +#$password = 'XXXXXX'; # For paid users diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossrefware.tlpobj new/tlpkg/tlpobj/crossrefware.tlpobj --- old/tlpkg/tlpobj/crossrefware.tlpobj 2016-04-14 18:54:32.000000000 +0200 +++ new/tlpkg/tlpobj/crossrefware.tlpobj 2017-04-24 02:07:06.000000000 +0200 @@ -1,6 +1,6 @@ name crossrefware category Package -revision 39727 +revision 43993 shortdesc Scripts for working with crossref.org longdesc This bundle contains the following scripts: bibdoiadd.pl: add longdesc DOI numbers to papers in a given bib file, bibzbladd.pl: add @@ -8,14 +8,16 @@ longdesc a tool for the creation of XML files for submitting to the longdesc parent site depend crossrefware.ARCH -runfiles size=8 +runfiles size=13 + texmf-dist/scripts/crossrefware/bbl2bib.pl texmf-dist/scripts/crossrefware/bibdoiadd.pl + texmf-dist/scripts/crossrefware/bibmradd.pl texmf-dist/scripts/crossrefware/bibzbladd.pl texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl texmf-dist/tex/latex/crossrefware/bibdoiadd.cfg texmf-dist/tex/latex/crossrefware/ltx2crossrefxml.cfg catalogue-ctan /support/crossrefware -catalogue-date 2016-02-15 06:00:08 +0100 +catalogue-date 2017-04-23 19:41:28 +0200 catalogue-license gpl catalogue-topics bibtex-util -catalogue-version 2.0 +catalogue-version 2.1a ++++++ crossword.doc.tar.xz ++++++ ++++++ crossword.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossword.tlpobj new/tlpkg/tlpobj/crossword.tlpobj --- old/tlpkg/tlpobj/crossword.tlpobj 2016-04-14 18:54:33.000000000 +0200 +++ new/tlpkg/tlpobj/crossword.tlpobj 2017-04-14 17:37:16.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/crossword/cwpuzzle.sty catalogue-also crosswrd catalogue-ctan /macros/latex/contrib/gene/crossword -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics games cwpuzzle catalogue-version 1.9 ++++++ crosswrd.doc.tar.xz ++++++ ++++++ crosswrd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crosswrd.tlpobj new/tlpkg/tlpobj/crosswrd.tlpobj --- old/tlpkg/tlpobj/crosswrd.tlpobj 2016-04-14 18:54:33.000000000 +0200 +++ new/tlpkg/tlpobj/crosswrd.tlpobj 2017-04-14 17:37:16.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/crosswrd/crosswrd.sty catalogue-ctan /macros/latex/contrib/crosswrd -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics games cwpuzzle catalogue-version 3.0 ++++++ cryptocode.doc.tar.xz ++++++ ++++++ cryptocode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cryptocode.tlpobj new/tlpkg/tlpobj/cryptocode.tlpobj --- old/tlpkg/tlpobj/cryptocode.tlpobj 2016-04-14 18:54:34.000000000 +0200 +++ new/tlpkg/tlpobj/cryptocode.tlpobj 2017-04-14 17:37:17.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=17 RELOC/tex/latex/cryptocode/cryptocode.sty catalogue-ctan /macros/latex/contrib/cryptocode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pseudocode catalogue-version 0.1 ++++++ cryst.doc.tar.xz ++++++ ++++++ cryst.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cryst.tlpobj new/tlpkg/tlpobj/cryst.tlpobj --- old/tlpkg/tlpobj/cryst.tlpobj 2016-04-14 18:54:34.000000000 +0200 +++ new/tlpkg/tlpobj/cryst.tlpobj 2017-04-14 17:37:17.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/fonts/tfm/public/cryst/cryst.tfm RELOC/fonts/type1/public/cryst/cryst.pfb catalogue-ctan /fonts/cryst -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-type1 font-mf font-symbol ++++++ cs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/type1/public/cs/README new/fonts/type1/public/cs/README --- old/fonts/type1/public/cs/README 2006-01-10 00:35:48.000000000 +0100 +++ new/fonts/type1/public/cs/README 2016-11-25 19:32:18.000000000 +0100 @@ -1,29 +1,29 @@ CSfonty ve formatu pfb - ========================================================== - verze 1.0-alfa, duben 1998 Petr Olsak + ========================================================== + verze 1.0-alfa, duben 1998 Petr Olsak -CSfonty ve formatu pfb (Type1) byly pripraveny timto zpusobem: -- popisy zakladnich znaku jsou cerpany z BaKoMa Computer Modern fontu, - T1FMT-V2.0 Copyright (c) 1993,1994, Basil K. Malyshev. -- akcenty jsou cerpany z vystupu programu Metapost pri zpracovani - Metafontovych zdroju CSfontu a mnohdy rucne upraveny. Soubor csaccents.mf - byl pro tyto ucely modifikovan (napriklad odstraneno filldraw a nahrazeno - fill s obvodovou cestou, kterou bylo nutne Metafontem napocitat). -- akcenty jsou k zakladovym znakum pripojeny programem t1accent, viz - ftp://math.feld.cvut.cz/pub/olsak/t1accent/ -- tato prvni verze fontu cerpa akcenty pro kazdou variantu rezu z cs*10.mf - a akcenty jsou pro jine velikosti tehoz rezu zvetsovany geometricky. Neni - to idealni, ale snazil jsem se najit nejmensi koeficient typu - "mnozstvi prace / celkovy efekt". Program t1accent bohuzel zdaleka neni a - nikdy nebude Meta-t1accent. -- konfiguracni soubory pro generovani CSfontu pomoci t1accent jsou v baliku - pro ilustraci prilozeny (viz soubory s priponou *.tab). -- AFM soubory k fontum nejsou distribuovany. Muzete si je vytvorit stazenim - souboru ftp://ftp.muni.cz/pub/tex/CTAN/dviware/dvitops/printafm.ps a - pouzitim povelu: echo /Nazev-Fontu printafm | gs printafm.ps > metrika.afm - ovsem takova metrika nebude obsahovat informace o kerningovych parech a - ligaturach, ktere jsou bezne obsazeny v tfm metrikach. + CSfonty ve formatu pfb (Type1) byly pripraveny timto zpusobem: +- popisy zakladnich znaku jsou cerpany z BaKoMa Computer Modern fontu, + T1FMT-V2.0 Copyright (c) 1993,1994, Basil K. Malyshev. +- akcenty jsou cerpany z vystupu programu Metapost pri zpracovani + Metafontovych zdroju CSfontu a mnohdy rucne upraveny. Soubor csaccents.mf + byl pro tyto ucely modifikovan (napriklad odstraneno filldraw a nahrazeno + fill s obvodovou cestou, kterou bylo nutne Metafontem napocitat). +- akcenty jsou k zakladovym znakum pripojeny programem t1accent, viz + ftp://math.feld.cvut.cz/pub/olsak/t1accent/ +- tato prvni verze fontu cerpa akcenty pro kazdou variantu rezu z cs*10.mf + a akcenty jsou pro jine velikosti tehoz rezu zvetsovany geometricky. Neni + to idealni, ale snazil jsem se najit nejmensi koeficient typu + "mnozstvi prace / celkovy efekt". Program t1accent bohuzel zdaleka neni a + nikdy nebude Meta-t1accent. +- konfiguracni soubory pro generovani CSfontu pomoci t1accent jsou v baliku + pro ilustraci prilozeny (viz soubory s priponou *.tab). +- AFM soubory k fontum nejsou distribuovany. Muzete si je vytvorit stazenim + souboru ftp://ftp.muni.cz/pub/tex/CTAN/dviware/dvitops/printafm.ps a + pouzitim povelu: echo /Nazev-Fontu printafm | gs printafm.ps > metrika.afm + ovsem takova metrika nebude obsahovat informace o kerningovych parech a + ligaturach, ktere jsou bezne obsazeny v tfm metrikach. CSfonty ve formatu pfb jsou verejne siritelne podle stejnych podminek, jako jsou sireny BaKoMa fonty. Podrobneji viz soubor ../cm/BaKoMa-CM.Fonts @@ -37,35 +37,50 @@ GhostScriptu a konecne v Acroreaderu po zavedeni fontu do dokumentu pdfTeXem. -Poznamka: protoze tento balik ma pro zarazeni do volne sirenych -distribuci nevyhovujici licenci, bude potreba prevest Type1 -implementaci CSfontu s vyuzitim jineho vychoziho baliku (bluesky?). -Kdo to udela? - INSTALACE --------- -1. Instalujte BaKoMa fonty z ftp://ftp.muni.cz/pub/tex/CTAN/fonts/... - Tento krok neni nutny, ale pokud chcete mit sadu CM+CS.pfb uplnou, je - tento krok zadouci. Mate-li pdfTeX a navic instalovanou knihovnu - cspdftexlib.tar z CSTeXu, BaKoMa fonty uz mate instalovany. -2. Zkopirujte cs*.pfb soubory do texmf/fonts/type1/public/cs/. -3. Pridejte obsah souboru csfont-d.map do souboru psfonts.map, ktery najdete - nekde v podadresarich texmf/dvips/*. Tento krok nedelejte, pokud - nechcete vzdy pouzivat pfb alternativu fontu ve vystupech programu dvips - a nechcete se vzdat cesty zarazovani fontu jako bitmap generovanych - z puvodnich lety overenych Metafontovych zdroju. Protoze je tento balik - pfb fontu oznaceny jako alfa, je tato opatrnost opodstatnena. -4. Umistete csfont-e.map a vsechny *.enc soubory do texmf/pdftex/config/ a - misto radku "map +cs.map" v pdftex.cfg napiste "map +csfont-e.map". - Tim si urcite polepsite, protoze puvodni reseni pdfTeXu a CSfontu vedlo - pres DC fonty, ktere nepokryvaly matematickou sadu znaku z pocatku - tabulky a mely jine tvary akcentu. -5. Provedte MakeTeXls-R nebo mktexlsr pro aktualizaci databaze souboru. -6. Instalujte pfb fonty do Ghostscriptu. To vyzaduje vlozeni obsahu souboru - csfont-g.map do ghostscript/Fontmap a dale: - cd /usr/local/ghostscript/fonts - ln -s /usr/local/share/texmf/fonts/type1 tex - Konkretni cesty mohou vypadat na Vasi instalaci mirne jinak. - +1. Instalujte BaKoMa fonty z ftp://ftp.muni.cz/pub/tex/CTAN/fonts/... + Tento krok neni nutny, ale pokud chcete mit sadu CM+CS.pfb uplnou, je + tento krok zadouci. Mate-li pdfTeX a navic instalovanou knihovnu + cspdftexlib.tar z CSTeXu, BaKoMa fonty uz mate instalovany. +2. Zkopirujte cs*.pfb soubory do texmf/fonts/type1/public/cs/. +3. Pridejte obsah souboru csfont-d.map do souboru psfonts.map, ktery najdete + nekde v podadresarich texmf/dvips/*. Tento krok nedelejte, pokud + nechcete vzdy pouzivat pfb alternativu fontu ve vystupech programu dvips + a nechcete se vzdat cesty zarazovani fontu jako bitmap generovanych + z puvodnich lety overenych Metafontovych zdroju. Protoze je tento balik + pfb fontu oznaceny jako alfa, je tato opatrnost opodstatnena. +4. Umistete csfont-e.map a vsechny *.enc soubory do texmf/pdftex/config/ a + misto radku "map +cs.map" v pdftex.cfg napiste "map +csfont-e.map". + Tim si urcite polepsite, protoze puvodni reseni pdfTeXu a CSfontu vedlo + pres DC fonty, ktere nepokryvaly matematickou sadu znaku z pocatku + tabulky a mely jine tvary akcentu. +5. Provedte MakeTeXls-R nebo mktexlsr pro aktualizaci databaze souboru. +6. Instalujte pfb fonty do Ghostscriptu. To vyzaduje vlozeni obsahu souboru + csfont-g.map do ghostscript/Fontmap a dale: + cd /usr/local/ghostscript/fonts + ln -s /usr/local/share/texmf/fonts/type1 tex + Konkretni cesty mohou vypadat na Vasi instalaci mirne jinak. + +Korekce balicku v cervnu 2016 (po 17 letech): +--------------------------------------------- + +* názvy glyphu nekterych fontu korigovany, aby se mohly spravne vykopirovat z PDF + prohlizece pomoci copy-paste. Presne bylo provedeno toto: + + for font in csbxti10 csti8 csti9 csti10 csu10 csitt10 csfi10 csti7 csti12; do + test ! -f $font.pfb.orig && cp -a $font.pfb $font.pfb.orig + t1disasm $font.pfb.orig | sed 's/dollar/sterling/g' | t1asm - $font.pfb + done + for font in cscsc10 csr5; do + test ! -f $font.pfb.orig && cp -a $font.pfb $font.pfb.orig + t1disasm $font.pfb.orig | sed 's/suppress/polishlcross/g' | t1asm - $font.pfb + done + +* do balicku csplain pridan soubor glyphtounicode-cs.tex obsahujici korekce dalsich + specifickych nazvu glyphu, napriklad csqutedblright (prave ceske uvozovky). + Po zavedeni tohoto souboru do pdfTeXoveho dokumentu a pri pouziti csfontu + by se mely i tyto znaky chovat spravne pri copy-paste. Jine fonty (napr. + lm-fonty) tuto pomucku nepotrebuji. Binary files old/fonts/type1/public/cs/csbxti10.pfb and new/fonts/type1/public/cs/csbxti10.pfb differ Binary files old/fonts/type1/public/cs/cscsc10.pfb and new/fonts/type1/public/cs/cscsc10.pfb differ Binary files old/fonts/type1/public/cs/csfi10.pfb and new/fonts/type1/public/cs/csfi10.pfb differ Binary files old/fonts/type1/public/cs/csitt10.pfb and new/fonts/type1/public/cs/csitt10.pfb differ Binary files old/fonts/type1/public/cs/csr5.pfb and new/fonts/type1/public/cs/csr5.pfb differ Binary files old/fonts/type1/public/cs/csti10.pfb and new/fonts/type1/public/cs/csti10.pfb differ Binary files old/fonts/type1/public/cs/csti12.pfb and new/fonts/type1/public/cs/csti12.pfb differ Binary files old/fonts/type1/public/cs/csti7.pfb and new/fonts/type1/public/cs/csti7.pfb differ Binary files old/fonts/type1/public/cs/csti8.pfb and new/fonts/type1/public/cs/csti8.pfb differ Binary files old/fonts/type1/public/cs/csti9.pfb and new/fonts/type1/public/cs/csti9.pfb differ Binary files old/fonts/type1/public/cs/csu10.pfb and new/fonts/type1/public/cs/csu10.pfb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cs.tlpobj new/tlpkg/tlpobj/cs.tlpobj --- old/tlpkg/tlpobj/cs.tlpobj 2016-04-28 03:16:05.000000000 +0200 +++ new/tlpkg/tlpobj/cs.tlpobj 2017-04-14 17:37:17.000000000 +0200 @@ -1,6 +1,6 @@ name cs category Package -revision 40785 +revision 41553 catalogue csfonts shortdesc Czech/Slovak-tuned Computer Modern fonts relocated 1 @@ -9,7 +9,7 @@ depend cmexb execute addMap cs-charter.map execute addMap csfonts.map -runfiles size=918 +runfiles size=919 RELOC/fonts/enc/dvips/cs/xl2.enc RELOC/fonts/enc/dvips/cs/xl2f.enc RELOC/fonts/enc/dvips/cs/xt2.enc @@ -411,6 +411,6 @@ RELOC/fonts/vf/cs/cs-charter/bchr8z.vf RELOC/fonts/vf/cs/cs-charter/bchri8z.vf catalogue-ctan /macros/cstex/base/csfonts.tar.gz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics czech slovak font font-mf ++++++ csbulletin.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/README new/doc/latex/csbulletin/README --- old/doc/latex/csbulletin/README 2008-08-09 01:04:29.000000000 +0200 +++ new/doc/latex/csbulletin/README 2017-02-21 02:01:05.000000000 +0100 @@ -1,5 +1,5 @@ ============================================================================= -Package: csbulletin Version 1.0 5 August 2008 +Package: csbulletin Version 1.1 18 February 2016 ============================================================================= The package provides the class for articles for the CSTUG Bulletin Binary files old/doc/latex/csbulletin/csbulletin.pdf and new/doc/latex/csbulletin/csbulletin.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/csbulletin.tex new/doc/latex/csbulletin/csbulletin.tex --- old/doc/latex/csbulletin/csbulletin.tex 2008-08-09 01:04:29.000000000 +0200 +++ new/doc/latex/csbulletin/csbulletin.tex 2017-02-21 02:01:05.000000000 +0100 @@ -1,4 +1,4 @@ -%% $Id: csbulletin.tex 30 2008-08-05 20:03:02Z zw $ +%% $Id$ \input utf8-t1 % text is in UTF8, requires encTeX % for ISO-8859-2: %& --translate-file=il2-t1.tcx % for CP-1250: %& --translate-file=cp1250t1.tcx @@ -6,13 +6,12 @@ \documentclass{csbulletin} % No optional packages needed % Macros -\DeclareRobustCommand\version{\unskip~v.\,1.0} +\DeclareRobustCommand\version{\unskip~v.\,1.1} \let\pkg\textsc -% Hack for hyperref -\mubytein 0 \usepackage[pdftitle=LaTeX\ Class\ for\ CSTUG\ Bulletin, pdfauthor=Zdenek\ Wagner, pdfkeywords=CSTUG\ Bulletin,bookmarks=false]{hyperref} +\usepackage{encxvlna} % section numbering \setcounter{secnumdepth}{2} @@ -50,12 +49,6 @@ instrukce pro autory. \section{Použité balíčky} -Prosím, uvědomte si, že celý Zpravodaj se zpracovává pdflatexem jako jeden dokument. Používejte -proto pouze balíčky, které skutečně v dokumentu potřebujete. Dávejte přednost vlastnímu -jednoduchému makru před komplikovaným balíčkem, který může způsobit kolizi s balíčky potřebnými pro -jiné články. Tím nechceme autory odrazovat od používání balíčků v nezbytných případech, jen je -vhodné, aby autoři uvážili, zda nelze problém řešit jednoduššími prostředky. - Třída \pkg{csbulletin} nějaké balíčky načítá automaticky. Jejich seznam je uveden v následujících podsekcích. @@ -91,10 +84,6 @@ \item \pkg{fancyvrb} \item \pkg{verbatim} - -\item \pkg{encxvlna} je program \pkg{vlna} implementovaný v enc\TeX u. Jeho účelem je doplnění -vlnek za neslabičné předložky přímo při \TeX ování. Balíček bude načten pouze v případě, že máte -enc\TeX\ aktivován. \end{itemize} \subsection{Babel}\label{babel} @@ -136,22 +125,13 @@ nepřehledné. Číslování zapnete vložením kladné hodnoty do čítače \texttt{secnumdepth}. V tomto manuálu je před \verb;\begin{document}; použit příkaz \verb;\setcounter{secnumdepth}{2};. -\section{Návěští} -V třídě \pkg{csbulletin} jsou předefinována makra \cmd{label}, \cmd{ref} a \cmd{pageref} tak, aby -jejich názvy byly pro každý článek unikátní. Nemusíte se proto bát kolize s články jiných autorů. - \section{Tabulky a obrázky} -Článek ve Zpravodaji nezačíná vždy na nové stránce. Nekoncipujte tudíž stránky absolutně. Všechny +Všechny tabulky a obrázky musí být v plovoucích prostředích. Musí mít název v makru \cmd{caption} a případně symbolický název definovaný v makru \cmd{label}. -\section{Reference} -Styl pro Zpravodaj zatím není připraven pro použití \BibTeX{}u, ale v budoucích verzích se s tím -počítá. Pravděpodobně bude pro potřeby Zpravodaje upraven balíček \pkg{chapterbib}. - \section{Chyby} -Třída \pkg{csbulletin} nemá žádné známé zjevné chyby. Jisté konflikty i se způsobem řešení jsou -zmíněny v dokumentaci balíčku \pkg{encxvlna} a nejsou zcela dořešeny kolize při použití v OS/2. V +Třída \pkg{csbulletin} nemá žádné známé zjevné chyby. V každém případě je třeba si uvědomit, že třída samotná pracuje na hranicích možností \LaTeX{}u. Použití různých balíčků může vést k dalším problémům. Redakce se bude snažit o vyřešení všech nahlášených potíží. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.doc.tlpobj new/tlpkg/tlpobj/csbulletin.doc.tlpobj --- old/tlpkg/tlpobj/csbulletin.doc.tlpobj 2016-04-14 18:54:37.000000000 +0200 +++ new/tlpkg/tlpobj/csbulletin.doc.tlpobj 2017-04-14 17:37:18.000000000 +0200 @@ -1,9 +1,9 @@ name csbulletin.doc category Package -revision 15878 +revision 43277 shortdesc doc files of csbulletin relocated 1 -docfiles size=70 +docfiles size=72 RELOC/doc/latex/csbulletin/LICENSE.txt RELOC/doc/latex/csbulletin/README RELOC/doc/latex/csbulletin/csbulletin.pdf ++++++ csbulletin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulacronym.sty new/tex/latex/csbulletin/csbulacronym.sty --- old/tex/latex/csbulletin/csbulacronym.sty 2008-08-09 01:04:29.000000000 +0200 +++ new/tex/latex/csbulletin/csbulacronym.sty 2017-02-21 02:01:07.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesPackage{csbulacronym}[2008/04/27 Acronyms for CSTUG bulletin] -\PackageInfo{csbulacronym}{$Id: csbulacronym.sty 16 2008-04-27 18:17:54Z zw $} +\PackageInfo{csbulacronym}{$Id$} %==================================================== TeX logos \DeclareRobustCommand\CS[1]{\def\next{#1}\leavevmode{$\cal C$}\kern-.3em @@ -8,6 +8,8 @@ \DeclareRobustCommand\CSTeX{\leavevmode{$\cal C$}\kern-.3em \lower .67ex\hbox{$\cal S$}\kern-.145em\TeX} \let\cstex\CSTeX +\DeclareRobustCommand\csplain{\leavevmode{$\cal C$}\kern-.3em + \lower .67ex\hbox{$\cal S$}\kern-.145emplain} \DeclareRobustCommand\CSLaTeX{\leavevmode{$\cal C$}\kern-.3em \lower .67ex\hbox{$\cal S$}\LaTeX} \let\cslatex\CSLaTeX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulletin.cls new/tex/latex/csbulletin/csbulletin.cls --- old/tex/latex/csbulletin/csbulletin.cls 2008-08-09 01:04:29.000000000 +0200 +++ new/tex/latex/csbulletin/csbulletin.cls 2017-02-21 02:01:07.000000000 +0100 @@ -1,5 +1,15 @@ -\ProvidesClass{csbulletin}[2008/08/05 CSTUG Bulletin class] -\ClassInfo{csbulletin}{$Id: csbulletin.cls 29 2008-08-05 19:36:49Z zw $} +\ProvidesClass{csbulletin}[2017/02/10 CSTUG Bulletin class] +\ClassInfo{csbulletin}{$Id$} + +% Switch + +\newif\ifcsbul@nomargins +\newif\ifcsbul@web +\newif\ifcsbul@color + +% Empty macro for later use + +\def\NovyClanek{} % Language attributes @@ -30,9 +40,28 @@ \DeclareOption{executivepaper}{} \DeclareOption{landscape}{} +% Always at the new page + +\DeclareOption{newpage}{\let\NovyClanek\clearpage} + +% No margins (special use) + +\DeclareOption{nomargins}{\csbul@nomarginstrue} + +% Color + +\DeclareOption{web}{\PassOptionsToPackage{web}{csbulobalka}\csbul@webtrue} +\DeclareOption{color}{\PassOptionsToPackage{color}{csbulobalka}\csbul@colortrue} +\DeclareOption{twocolor}{\PassOptionsToPackage{twocolor}{csbulobalka}\csbul@colortrue} +\DeclareOption{custom}{\PassOptionsToPackage{custom}{csbulobalka}\csbul@colortrue} + % Pass all global options to the "article" class \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} + +% No margins if the first page given +%\IfFileExists{\jobname.FirstPage}{\ExecuteOptions{nomargins}}{} + \ProcessOptions \LoadClass[twoside]{article} @@ -48,8 +77,10 @@ % To be deleted soon \newif\if@html +\ifpdf \IfFileExists{microtype.sty}{\RequirePackage [protrusion=false,expansion=true,stretch=8,shrink=24,step=4]{microtype}}{} +\fi \IfFileExists{array.sty}{\RequirePackage{array}}{} @@ -62,7 +93,7 @@ \IfFileExists{SpecChar.sty}{\RequirePackage{SpecChar}\AddSpecial\-}{} -\IfFileExists{csbulobalka.sty}{\RequirePackage{csbulobalka}}{} +\IfFileExists{csbulobalka.sty}{\RequirePackage{csbulobalka}[2017/02/17]}{} \ifx\mubytein\undefined \newcount\mubytein @@ -70,18 +101,22 @@ \newcount\mubytelog \else \IfFileExists{csbulutf8.sty}{\RequirePackage{csbulutf8}}{} - \IfFileExists{encxvlna.sty}{\RequirePackage{encxvlna}}{} \fi % The next macros must be here, otherwise the PDF mode may report strange errors \newtoks\cislo \newtoks\rok +\newtoks\doisufix\doisufix{\the\rok-\the\cislo/\thepage} \newtoks\naklad \newtoks\@uzaverka \newtoks\pristi@uzaverka \newtoks\obalka +% Default + +\obalka{Anton\'{\i}n Strejc}%' + % \uzaverka DD.MM.RRRR<space or end-of-line> \def\uzaverka #1.#2.#3 {\begingroup @@ -165,12 +200,12 @@ % Newlines for titles and toc -\DeclareRobustCommand\nl{\protect\p@nl} -\def\p@nl{\unskip\\\ignorespaces} -\DeclareRobustCommand\ln{\protect\p@ln} -\let\p@ln\relax -\DeclareRobustCommand\toc@nl{\let\p@nl\relax - \def\p@ln{\unskip\\\ignorespaces}} +\DeclareRobustCommand\TitleNewline{\\} +\DeclareRobustCommand\TocNewline{\space} +\AtBeginDocument{\addtocontents{toc}{\csbul@newlinedefs}} +\DeclareRobustCommand\csbul@newlinedefs{% + \let\TitleNewline\space + \let\TocNewline\\} %=========================================== Sizes etc. @@ -252,15 +287,16 @@ \newenvironment{summary}{\ifhmode \par \fi \begin{otherlanguage*}{english} \setcounter{secnumdepth}{-1}\section{Summary: - \zw@englishtitle}}{\ifhmode \par \fi\end{otherlanguage*}} + \zw@englishtitle}}{\ifhmode \par + \fi\end{otherlanguage*}\aftergroup\zw@summaryOK} \renewcommand\@seccntformat[1]{\@nameuse{the#1}.\hspace{.5em}} -\newcommand\StartPage[1][1]{\clearpage\setcounter{page}{#1}} +\newcommand\StartPage[1][1]{\clearpage\setcounter{page}{#1}\zw@summaryOK} \renewenvironment{abstract}{\narrower \small \noindent \ignorespaces}{\ifhmode \par \fi} -\def\keywords:{\ifhmode \par \fi \smallskip \noindent\textbf{Key words:} \ignorespaces} +\def\keywords:{\ifhmode \par \fi \medskip \noindent\textbf{Keywords:} \ignorespaces} % ===================================================== New layout @@ -269,8 +305,6 @@ \paperwidth 148mm \paperheight 210mm -\pdfpagewidth\paperwidth -\pdfpageheight\paperheight \headheight \z@ \headsep \z@ \textwidth 27cc @@ -289,6 +323,11 @@ \advance\evensidemargin -1in \parskip \z@ +\AtBeginDocument{\ifpdf + \pdfpagewidth\paperwidth \pdfpageheight\paperheight +\else + \special{papersize=\the\paperwidth,\the\paperheight}\fi} + \newdimen\zw@bul@dim \zw@bul@dim=148mm \advance\zw@bul@dim -1in @@ -299,8 +338,30 @@ \def\@oddfoot{\hfill \textrm{\thepage}}% \def\@evenfoot{\textrm{\thepage}\hfill}} +\def\ps@csbuldoi{% + \def\@oddhead{}\let\@evenhead\@oddhead + \def\@oddfoot{{\doiprefix \doi}\hfill \textrm{\thepage}}% + \def\@evenfoot{\textrm{\thepage}\hfill{\doiprefix \doi}}} + +\def\doiprefix{\footnotesize \textsc{doi:}\space} + +\def\ps@ODD{% + \def\@oddhead{}\let\@evenhead\@oddhead + \def\@oddfoot{\hfill \textrm{\thepage}}\let\@evenfoot\@oddfoot} + \pagestyle{csbul} +\ifcsbul@nomargins + \oddsidemargin -1in + \evensidemargin -1in + \topmargin -1in + \pagestyle{empty} +\fi + +% Dirty hax +\def\ps@odd{\ps@csbul \let\@evenfoot\@oddfoot} +\def\ps@even{\ps@csbul \let\@oddfoot\@evenfoot} + % ============================================ for use with minitoc @@ -341,8 +402,9 @@ \let\pdf@title\relax \let\signature\podpis -\def\csbul@podepis{\ifx\p@dpis\relax \else - \ifhmode \par \else \textwidth\lastskip \fi +\def\csbul@podepis{\zw@nosummaryerror + \ifx\p@dpis\relax \else + \ifhmode \par \fi \nobreak\medskip \begin{flushright}\clubpenalty\@M \widowpenalty\@M \interlinepenalty\@M \itshape\p@dpis @@ -353,8 +415,20 @@ \AtEndDocument{\csbul@podepis} +% Dirty hacking... +\def\Podpis#1{\ifhmode \par \fi \nobreak \medskip + \begin{flushright}\clubpenalty\@M \widowpenalty\@M \interlinepenalty\@M + \itshape#1 + \end{flushright}} + +\def\zw@nosummaryerror{\ClassWarningNoLine{csbulletin}{English summary is misssing!}} +\def\zw@summaryOK{\let\zw@nosummaryerror\relax} + \def\titlepenalty{-100} +% DOI removal +\def\nodoi{\def\doi{}\let\doiprefix\doi} + \renewcommand\maketitle[1][\z@]{% \vskip 3cc\vskip 0pt plus 5cc\penalty\titlepenalty \vskip 0pt plus-5cc\vskip-\topskip @@ -378,22 +452,72 @@ \hfill\ifautkn@wn\box\authb@x\fi \vrule height 17pt width 0pt}}% \nobreak\vglue 2cc plus 6dd minus 3dd \relax - \ClanekToc + \thispagestyle{csbuldoi}\ClanekToc \@afterindentfalse \@afterheading} \def\ClanekToc{% + \ifx\zw@englishtitle\undefined + \ClassWarningNoLine{csbulletin}{English title not given, it must precede \protect\maketitle!}% + \let\zw@englishtitle\t@tle + \fi \begingroup \let\footnote\@gobble \ifautkn@wn \def\PutAuthor{\protect\cl@nek{\auth@r}} - \addcontentsline{toc}{clanek}{\protect\cl@nek{\auth@r}{\t@tle}}% + \addcontentsline{toc}{clanek}{\protect\cl@nek[\auth@r]{\t@tle}{\zw@englishtitle}}% \ifx\pdf@title\relax \def\pdf@title{\protect\cl@nek{\auth@r}{\t@tle}}\fi \else \def\PutAuthor{} - \addcontentsline{toc}{clanek}{\t@tle}% + \addcontentsline{toc}{clanek}{\protect\cl@nek{\t@tle}{\zw@englishtitle}}% \ifx\pdf@title\relax \def\pdf@title{\t@tle}\fi \fi \secdef\@chapter\@schapter{\t@tle}% for minitoc \endgroup} + +\newwrite\csbul@info +\def\csbul@start@page#1{\begingroup + \let\@input\@gobble\@starttoc{toc}\endgroup + \setcounter{page}{#1}} + +% Default fake DOI +\def\doi{10.5300/xxxx-x/zzz} + +% PDF clanek (include PDF, directory = optional argument, name without .pdf) + +\def\PDFclanek{\bgroup \catcode`\-12 \catcode`\_12 \csbul@PDFclanek} +\newcommand*\csbul@PDFclanek[2][]{\egroup\clearpage + \ifcat$#1$ + \def\csbul@fn{#2} + \immediate\write\@auxout{\string\CSBULpdf{#2}} + \else + \def\csbul@fn{#1/#2} + \immediate\write\@auxout{\string\CSBULpdf[#1]{#2}} + \fi + \immediate\openout\csbul@info\csbul@fn.info + \immediate\write\csbul@info{\noexpand\csbul@start@page{\thepage}} + \immediate\write\csbul(a)info{\noexpand\def\noexpand\doi{10.5300/\the\doisufix}} + \immediate\write\csbul@info{\ifcsbul@web\noexpand\csbul@webtrue\fi} + \immediate\write\csbul@info{\ifcsbul@color\noexpand\csbul@colortrue\fi} + \immediate\closeout\csbul@info + \addtocontents{toc}{\protect\@input{\csbul@fn.toc}} + \if@csbul@pdfinclude@ \csbul@PDF@clanek \fi} + +\def\csbul@PDF@clanek{\setcounter{section}{1} + \pdfximage{\csbul@fn.pdf}\edef\csbul@Npages{\the\pdflastximagepages} + \loop + \thispagestyle{empty} + \vbox to 0mm{\hsize \linewidth \vskip -\topmargin \vskip -\topskip \vskip -1in + \parindent \z@ + \hbox to \hsize{% + \ifodd\c@page \hskip -\oddsidemargin \else \hskip -\evensidemargin\fi \hskip -1in + \includegraphics[page=\number\c@section]{\csbul@fn.pdf}\hss}\vss}\clearpage + \ifnum\value{section}<\csbul@Npages + \stepcounter{section} + \repeat} + +\newif\if@csbul@pdfinclude@ + +\newcommand*\CSBULpdf[2][]{\global\@csbul@pdfinclude@true} + % % Index % @@ -408,59 +532,7 @@ \def\printindex{% \@input@{\bul@indexname.ind}% \immediate\closeout\@indexfile}% -% -% Counters to reset -% -\def\csbul@zerocounters{% -\setcounter{part}\z@ -\setcounter{section}\z@ -\setcounter{subsection}\z@ -\setcounter{subsubsection}\z@ -\setcounter{paragraph}\z@ -\setcounter{subparagraph}\z@ -\setcounter{equation}\z@ -\setcounter{figure}\z@ -\setcounter{table}\z@ -\setcounter{footnote}\z@ -\setcounter{mpfootnote}\z@ -\setcounter{secnumdepth}{-2}} - -\def\csbul@prefix{} % default for single article -\def\csbul@redef#1 {\expandafter\let\csname csbul@#1\expandafter\endcsname\csname #1\endcsname - \expandafter\def\csname #1\endcsname##1{\csname csbul@#1\endcsname{\csbul@prefix##1}}} -\csbul@redef label -\csbul@redef pageref -\csbul@redef ref - -% Make the prefix - -\newcount\csbul@tempcnt - -\def\csbul@makeprefix{\global\advance\csbul@tempcnt\@ne - \edef\csbul@prefix{CSBUL@@\number\csbul@tempcnt}} - -% Input - -\newcommand\Clanek[2][]{\csbul@makeprefix - \begingroup - \csbul@zerocounters - \renewcommand\documentclass[2][CSBUL]{}% - \renewcommand\usepackage[2][CSBUL]{}% - \let\input\CSBULinput - \renewenvironment{document}{\let\document\@notprerr\setmubytevalues}{\csbul@podepis}% ??? - \ifcat$#1$% - \def\csbul@fn{#2}% - \else - \def\csbul@fn{#1/#2}\graphicspath{{#1/}}\def\csbul@input@path{#1/}% - \fi - \csbul@saved@input{\csbul@fn} - \endgroup} - -% Input path -\def\csbul@input@path{} -\def\CSBULinput#1{\csbul@saved@input{\csbul@input@path #1}} -\let\csbul@saved@input\input %============================================= TUGboat -- obsah @@ -501,3 +573,5 @@ \AtBeginDocument{\pdfpageheight 210mm \pdfpagewidth 148mm \relax} \AtBeginDocument{\edef\setmubytevalues{\noexpand\mubytein\the\mubytein \noexpand\mubyteout\the\mubyteout \noexpand\mubytelog\the\mubytelog \relax}} + +\(a)input{\jobname.info} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.tlpobj new/tlpkg/tlpobj/csbulletin.tlpobj --- old/tlpkg/tlpobj/csbulletin.tlpobj 2016-04-14 18:54:37.000000000 +0200 +++ new/tlpkg/tlpobj/csbulletin.tlpobj 2017-04-14 17:37:18.000000000 +0200 @@ -1,17 +1,17 @@ name csbulletin category Package -revision 15878 +revision 43277 shortdesc LaTeX class for articles submitted to the CSTUG Bulletin (Zpravodaj) relocated 1 longdesc The package provides the class for articles for the CSTUG longdesc Bulletin (Zpravodaj Ceskoslovenskeho sdruzeni uzivatelu TeXu). longdesc You can see the structure of a document by looking to the longdesc source file of the manual. -runfiles size=5 +runfiles size=6 RELOC/tex/latex/csbulletin/csbulacronym.sty RELOC/tex/latex/csbulletin/csbulletin.cls catalogue-ctan /macros/latex/contrib/csbulletin -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2017-02-19 10:04:06 +0100 +catalogue-license lppl1.3 catalogue-topics journalpub -catalogue-version 1.0 +catalogue-version 1.1 ++++++ cslatex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cslatex.tlpobj new/tlpkg/tlpobj/cslatex.tlpobj --- old/tlpkg/tlpobj/cslatex.tlpobj 2016-05-03 03:17:08.000000000 +0200 +++ new/tlpkg/tlpobj/cslatex.tlpobj 2017-04-14 17:37:18.000000000 +0200 @@ -3,6 +3,12 @@ revision 40855 shortdesc LaTeX support for Czech/Slovak typesetting depend latex +depend cm +depend cslatex +depend csplain +depend hyphen-base +depend latex-fonts +depend tex-ini-files depend cslatex.ARCH execute AddFormat name=cslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,cslatex,csplain,hyphen-base,latex-fonts,latex execute AddFormat name=pdfcslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,cslatex,csplain,hyphen-base,latex-fonts,latex,tex-ini-files @@ -46,6 +52,6 @@ texmf-dist/tex/cslatex/cspsfonts/xl2ptm.fd texmf-dist/tex/cslatex/cspsfonts/xl2pzc.fd catalogue-ctan /macros/cstex/base/cslatex.tar.gz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license gpl catalogue-topics czech slovak format ++++++ csplain.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/csplain.ini new/texmf-dist/tex/csplain/base/csplain.ini --- old/texmf-dist/tex/csplain/base/csplain.ini 2016-06-07 01:01:45.000000000 +0200 +++ new/texmf-dist/tex/csplain/base/csplain.ini 2016-11-25 19:33:31.000000000 +0100 @@ -262,6 +262,11 @@ Jun. 2016: * ff-mac + fontfiles: \ffdecl: first modifiers then basic selectors. * cs-baskerx, cs-heuristica, cs-kurier, cs-iwona, ki-math, pazo-math added +* plaina4: \ifx\pdfhorigin added (bug when XeTeX is used fixed) +* glyphtounicode-cs.tex added + + Jul. 2016: +* etex-mac.tex: \endpinput -> \endinput, typo corrected COPYRIGHT ========= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/etex-mac.tex new/texmf-dist/tex/csplain/base/etex-mac.tex --- old/texmf-dist/tex/csplain/base/etex-mac.tex 2016-01-26 23:51:34.000000000 +0100 +++ new/texmf-dist/tex/csplain/base/etex-mac.tex 2016-11-25 19:33:31.000000000 +0100 @@ -12,7 +12,7 @@ \ifx\loccount\undefined \else \errmessage{etex.src macro package detected, don't use etex-mac} - \endpinput \fi + \endinput \fi \chardef\tmp=\catcode`@ \catcode`@=11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/plaina4.tex new/texmf-dist/tex/csplain/base/plaina4.tex --- old/texmf-dist/tex/csplain/base/plaina4.tex 2016-04-25 23:50:26.000000000 +0200 +++ new/texmf-dist/tex/csplain/base/plaina4.tex 2016-11-25 19:33:31.000000000 +0100 @@ -14,11 +14,12 @@ \gdef\m@g{\mag\count@ \hsize=159.2truemm \vsize=239.2truemm \dimen\footins8truein \ifx\pdfpagewidth\undefined\else % added by P. O. Nov 2012 - \recount@true\pdfpagewidth % \recont@true added by P. O Apr. 2016 - \recount@true\pdfpageheight % because media size is distribution-dependent - \recount@true\pdfhorigin - \recount@true\pdfvorigin - \fi + \recount@true\pdfpagewidth % \recont@true added by P. O. Apr. 2016 + \recount@true\pdfpageheight % because media size is distribution-dependent + \ifx\pdfhorigin\undefined\else % corrected by P. O. Jun. 2016 + \recount@true\pdfhorigin + \recount@true\pdfvorigin + \fi\fi } \gdef\recount@true#1{#1=\expandafter\recount@trueA\the#1truept\relax} {\catcode`p=12 \gdef\recount@trueA#1p#2{#1}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/xeplain.ini new/texmf-dist/tex/csplain/base/xeplain.ini --- old/texmf-dist/tex/csplain/base/xeplain.ini 2013-11-27 00:20:04.000000000 +0100 +++ new/texmf-dist/tex/csplain/base/xeplain.ini 2016-11-25 19:33:31.000000000 +0100 @@ -35,6 +35,7 @@ %% Next base macros: \input plaina4 % \hsize and \vsize for A4 + \pdfpagewidth=210mm \pdfpageheight=297mm \def\font#1 {} % ignore \font\tenbi=csbxti10 \input csfontsm % macros: \sizespec, \resizefont, \resizeall, \tenbi, \bi \let\font=\orifont diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex new/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex --- old/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex 2016-11-25 19:33:31.000000000 +0100 @@ -0,0 +1,21 @@ +% glyphtounicode-cs.tex +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% P. Olsak, inspired by Pali Rohar + +% Use \input glyphtounicode-cs +% in your pdfTeX document if you want to have working characters mentioned +% below when copy-pasting from PDF output or when finding string in the PDF +% output. This file is special only for csfonts in T1 (*.pfb) format. Other +% fonts (like lmfonts, for example) need not to use it. + +% Note that this file works in pdfTeX only. Other glyph names listed in the +% glyphtounicode.tex file need not to be declared because the contents of +% this file is hardcoded in typical PDF viewers. + +\pdfgentounicode=1 +\pdfglyphtounicode{csquotedblright}{201C} +\pdfglyphtounicode{althyphen}{002D} +\pdfglyphtounicode{polishlcross}{0337} +\pdfglyphtounicode{suppress}{0337} + +% end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/lmfonts.tex new/texmf-dist/tex/csplain/fonts/lmfonts.tex --- old/texmf-dist/tex/csplain/fonts/lmfonts.tex 2016-06-07 01:01:45.000000000 +0200 +++ new/texmf-dist/tex/csplain/fonts/lmfonts.tex 2017-05-14 01:04:42.000000000 +0200 @@ -1,6 +1,6 @@ % lmfonts.tex: loads Latin Modern fonts by plainTeX macros %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Petr Olsak, 2012, 2016 +% Petr Olsak, 2012, 2016, 2017 \ifx\ffdecl\undefined \input ff-mac \fi @@ -31,7 +31,7 @@ \ismacro\fotenc{U}\iftrue \font\tenrm = "[lmroman10-regular]:\fontfeatures" \sizespec \font\tenbf = "[lmroman10-bold]:\fontfeatures" \sizespec - \font\tenit = "[lmroman10-bold]:\fontfeatures" \sizespec + \font\tenit = "[lmroman10-italic]:\fontfeatures" \sizespec \font\tenbi = "[lmroman10-bolditalic]:\fontfeatures" \sizespec \font\tentt = "[lmmono10-regular]:\fontfeatures" \sizespec \font\tenrmc= "[lmromancaps10-regular]:\fontfeatures" \sizespec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/opmac.tex new/texmf-dist/tex/csplain/opmac/opmac.tex --- old/texmf-dist/tex/csplain/opmac/opmac.tex 2016-06-07 01:01:45.000000000 +0200 +++ new/texmf-dist/tex/csplain/opmac/opmac.tex 2016-11-25 19:33:31.000000000 +0100 @@ -1613,9 +1613,10 @@ \def\magscale[#1]{\mag=#1\def\trueunit{true}% \ifdim\pgwidth=0pt \else \truedimen\pgwidth \truedimen\pgheight \fi \ifx\pdfpagewidth\undefined \else - \truedimen\pdfpagewidth \truedimen\pdfpageheight - \pdfhorigin=1truein \pdfvorigin=1truein % Origin is independent off \mag - \fi} + \truedimen\pdfpagewidth \truedimen\pdfpageheight + \ifx\pdfhorigin\undefined\else + \pdfhorigin=1truein \pdfvorigin=1truein % Origin is independent off \mag + \fi\fi} \def\truedimen#1{\ifx\trueunit\empty \else#1=\expandafter\ignorept\the#1truept \fi} %%%%%%%%%%%%%% XeTeX specific + REF file is read now -- sec 3.26 in opmac-d.pdf @@ -1766,5 +1767,6 @@ \bfshape: \everymath={\boldmath} instead \boldmath directly \tskip corrected Jun. 2016 \thefontsize: \fontdim=#1\ptunit added. + \pdfhvorigin unknown in XeTeX, bug fixed %%%%%%%%%%%%%% End of opmac.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csplain.tlpobj new/tlpkg/tlpobj/csplain.tlpobj --- old/tlpkg/tlpobj/csplain.tlpobj 2016-06-07 17:33:43.000000000 +0200 +++ new/tlpkg/tlpobj/csplain.tlpobj 2017-05-14 02:07:47.000000000 +0200 @@ -1,12 +1,12 @@ name csplain category Package -revision 41300 +revision 44321 shortdesc Plain TeX multilanguage support longdesc CSplain is a small extension of basic Plain TeX macros, the longdesc formats csplain and pdfcsplain can be generated. It supports: longdesc hyphenation of words for 50+ languages, simple and powerfull -longdesc font loading system (various sizes of fonts), tex, pdftex, -longdesc xetex and luatex engines, math fonts simply loaded with full +longdesc font loading system (various sizes of fonts), TeX, pdfTeX, +longdesc XeTeX and LuaTeX engines, math fonts simply loaded with full longdesc amstex-like features, three internal encodings (IL2 for longdesc Czech/Slovak languages, T1 for many languages with latin longdesc alphabet and Unicode in new TeX engines), natural UTF-8 input @@ -18,12 +18,21 @@ longdesc OPmac macros can generate and bibliography without any external longdesc program. depend tex +depend cm +depend cs +depend csplain +depend hyphen-base +depend plain +depend enctex +depend tex-ini-files +depend luatex +depend luatex85 depend csplain.ARCH execute AddFormat name=csplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,csplain,hyphen-base,plain,enctex execute AddFormat name=pdfcsplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,csplain,hyphen-base,plain,enctex,tex-ini-files execute AddFormat name=pdfcsplain engine=xetex options="-etex csplain.ini" fmttriggers=cm,cs,csplain,hyphen-base,plain execute AddFormat name=pdfcsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,csplain,hyphen-base,plain,luatex,tex-ini-files,luatex85 -runfiles size=209 +runfiles size=210 texmf-dist/tex/csplain/base/csenc-k.tex texmf-dist/tex/csplain/base/csenc-p.tex texmf-dist/tex/csplain/base/csenc-u.tex @@ -81,6 +90,7 @@ texmf-dist/tex/csplain/fonts/ecfonts.tex texmf-dist/tex/csplain/fonts/exchars.tex texmf-dist/tex/csplain/fonts/ff-mac.tex + texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex texmf-dist/tex/csplain/fonts/ki-math.tex texmf-dist/tex/csplain/fonts/kp-fonts.tex texmf-dist/tex/csplain/fonts/kp-math.tex @@ -103,6 +113,6 @@ texmf-dist/tex/csplain/opmac/opmac.tex texmf-dist/tex/csplain/opmac/pdfuni.tex catalogue-ctan /macros/cstex/base/csplain.tar.gz -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license other-free catalogue-topics czech slovak format ++++++ csquotes-de.doc.tar.xz ++++++ ++++++ csquotes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/RELEASE.md new/doc/latex/csquotes/RELEASE.md --- old/doc/latex/csquotes/RELEASE.md 2016-02-02 00:01:46.000000000 +0100 +++ new/doc/latex/csquotes/RELEASE.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -# Release notes for version 5.1 - -## Improved block quotation facilities - -The highlight of this release is an extension of the block -quotation facilities. When measuring the length of a quotation, -`\blockquote` and related commands can determine either the word -count or the number of lines. See the pointers in the changelog -for details. - -# Release notes for version 5.0 - -## Backwards compatibility - -This release introduces some changes which are not backwards -compatible out of the box. In order to ease the transition to the -new version, I've implemented a 'version' option which emulates -older versions of `csquotes`. - -It is quite possible that you do not need to set this option at -all, even though you have older documents using `csquotes`. You -only need the 'version' option in older documents if: - - - you are using the `<punct>` argument of `\blockquote` and/or - - you have redefined any of the old - `\mk(pre|mid|fin)(text|block|disp)punct` hooks. - -If these conditions do not apply and you run 5.0 with the default -settings, the output will be similar to 4.4. There is absolutely -no need to set `version=4.4` if you didn't use the old hooks and -the `<punct>` argument of `\blockquote` anyway. - -I've also removed some legacy aliases. This is rather old stuff -from `csquotes` 3.x and even 2.x which has been marked as -depreciated for some time. Setting `version=4.4` will restore -them as well. - -## Punctuation look-ahead - -This release comes with a new punctuation look-ahead feature, -i.e., in addition to the `<punct>` argument of advanced quotation -commands like `\textquote`, these commands can now scan ahead for -trailing punctuation after their last argument and move it around -if desired. - -This is required by quoting conventions such as the US quotation -style which requires that a period or a comma immediately after a -closing quotation mark be moved inside the quotes even if it is -not part of the quoted text. - -The implementation of the look-ahead feature also implies a new -interpretation of the optional `<punct>` argument supported by -certain quotation commands. In previous version, the `<punct>` -argument was intended for terminal punctuation which is NOT part -of the quoted text. Starting with this release, it is intended -for punctuation which IS part of the quoted text (but may need to -be moved around). - -The modified syntax is more intuitive to use because terminal -punctuation which is NOT part of the quoted text is simply placed -after the last argument of the command, i.e.: - - \textquote[citation][.]{quoted text} - -becomes: - - \textquote[citation]{quoted text}. - -All of this is discussed at length in the manual. See the -changelog in the manual for pointers to the relevant sections. - -## Revised quotation hooks - -The old quotation hooks: - - \mkpretextpunct - \mkmidtextpunct - \mkfintextpunct - \mkpreblockpunct - \mkmidblockpunct - \mkfinblockpunct - \mkpredisppunct - \mkmiddisppunct - \mkfindisppunct - -have been removed and are replaced by new hooks: - - \mktextquote - \mkblockquote - \mkbegdispquote - \mkenddispquote - -which are much more powerful while being more intuitive to use. -If you have been using the old hooks in some documents, set -`version=4.4` to emulate the old interface. Binary files old/doc/latex/csquotes/csquotes.pdf and new/doc/latex/csquotes/csquotes.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/csquotes.tex new/doc/latex/csquotes/csquotes.tex --- old/doc/latex/csquotes/csquotes.tex 2016-02-02 00:01:46.000000000 +0100 +++ new/doc/latex/csquotes/csquotes.tex 2017-03-12 01:01:04.000000000 +0100 @@ -18,8 +18,8 @@ url={http://www.ctan.org/pkg/csquotes/}, author={Philipp Lehman, Joseph Wright}, email={joseph.wright(a)morningstar2.co.uk}, - revision={v5.1g}, - date={2016/01/31}} + revision={v5.2b}, + date={2017/03/11}} \hypersetup{% pdftitle={The csquotes Package}, @@ -110,7 +110,7 @@ \subsection{License} -Copyright © 2003--2011 Philipp Lehman, 2015--2016 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} +Copyright © 2003--2011 Philipp Lehman, 2015--2017 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} \subsection{Contributions} @@ -578,7 +578,7 @@ \section{Auxiliary Commands} \label{aux} -When quoting text in a formal way, any changes applied to the quoted material, such as omissions, insertions, or alterations, are typically marked as such by using the ellipsis mark and square brackets or parentheses. Use the following commands to indicate such changes in formal quotations: +When quoting text in a formal way, any changes applied to the quoted material, such as omissions, insertions, or alterations, are typically marked as such by using square brackets or parentheses and, where appropriate, ellipses. Use the following commands to indicate such changes in formal quotations: \begin{ltxsyntax} @@ -606,6 +606,16 @@ \textins*{T}ext %= \textins*{T}ext % \end{ltxcode} % +The deletion of individual letters may be indicated with the following command: + +\cmditem{textdel}{text} + +By default, \cmd{textdel} will output two square brackets. The omitted \prm{text} is not output. + +\begin{ltxcode}[escapechar={\%},escapebegin={\rmfamily}] + text\textdel{s} %= text\textdel{s} % +\end{ltxcode} +% See \secref{cfg:elp} on how to configure the appearance of ellipses and insertions. \end{ltxsyntax} @@ -1010,10 +1020,10 @@ \end{ltxsyntax} -\subsection{Configuring Ellipses} +\subsection{Configuring Auxiliary Commands} \label{cfg:elp} -The appearance of ellipses and insertions formatted with the auxiliary commands from \secref{aux} is controlled by five hooks. When \cmd{textelp} is used with an empty argument (ellipsis only), it will execute \cmd{mktextelp}. When used with a non-empty \prm{text} argument (ellipsis and insertion), the \prm{text} will be passed as an argument to \cmd{mktextelpins}. The starred form will pass the \prm{text} to \cmd{mktextinselp} instead. These are the default definitions: +The appearance of ellipses and insertions formatted with the auxiliary commands from \secref{aux} is controlled by six hooks. When \cmd{textelp} is used with an empty argument (ellipsis only), it will execute \cmd{mktextelp}. When used with a non-empty \prm{text} argument (ellipsis and insertion), the \prm{text} will be passed as an argument to \cmd{mktextelpins}. The starred form will pass the \prm{text} to \cmd{mktextinselp} instead. These are the default definitions: \begin{ltxcode}[showspaces=true] \newcommand{<<\mktextelp>>}{[\textellipsis\unkern]} @@ -1028,6 +1038,12 @@ \newcommand{<<\mktextmod>>}[1]{[#1]} \end{ltxcode} % +The \cmd{textdel} command passes its \prm{text} argument to \cmd{mktextdel} for further processing. This is the default definition (note that the argument is not output): + +\begin{ltxcode}[showspaces=true] +\newcommand{<<\mktextdel>>}[1]{[]} +\end{ltxcode} +% You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly: \begin{ltxcode} @@ -1533,6 +1549,23 @@ \begin{changelog} +\begin{release}{5.2b}{2017-03-11} +\item Added language option \opt{portuguese}\see{opt:opt} +\end{release} + +\begin{release}{5.2a}{2017-02-03} + \item Fix behaviour of \cmd{blockquote} inside \cmd{parbox} and + related constructs +\end{release} + +\begin{release}{5.2}{2016-12-28} + \item Add \cmd{textdel} auxiliary command.\see{aux} +\end{release} + +\begin{release}{5.1h}{2016-07-14} +\item Adapt \cmd{fixligatures} to work correctly with \luatex +\end{release} + \begin{release}{5.1g}{2016-01-31} \item Update for new \acr{TU} Unicode encoding \end{release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.doc.tlpobj new/tlpkg/tlpobj/csquotes.doc.tlpobj --- old/tlpkg/tlpobj/csquotes.doc.tlpobj 2016-04-14 18:54:38.000000000 +0200 +++ new/tlpkg/tlpobj/csquotes.doc.tlpobj 2017-04-14 17:37:18.000000000 +0200 @@ -1,10 +1,9 @@ name csquotes.doc category Package -revision 39538 +revision 43469 shortdesc doc files of csquotes relocated 1 -docfiles size=101 +docfiles size=103 RELOC/doc/latex/csquotes/README.md - RELOC/doc/latex/csquotes/RELEASE.md RELOC/doc/latex/csquotes/csquotes.pdf RELOC/doc/latex/csquotes/csquotes.tex ++++++ csquotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csq-compat.def new/tex/latex/csquotes/csq-compat.def --- old/tex/latex/csquotes/csq-compat.def 2016-02-02 00:01:46.000000000 +0100 +++ new/tex/latex/csquotes/csq-compat.def 2017-03-12 01:01:05.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesFile{csq-compat.def} - [2016/01/31 v5.1g csquotes backwards compatibility (JAW)] + [2017/03/11 v5.2b csquotes backwards compatibility (JAW)] \def\csq@getversion#1{% \expandafter\csq@getversion@i diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.def new/tex/latex/csquotes/csquotes.def --- old/tex/latex/csquotes/csquotes.def 2016-02-02 00:01:46.000000000 +0100 +++ new/tex/latex/csquotes/csquotes.def 2017-03-12 01:01:05.000000000 +0100 @@ -1,5 +1,5 @@ \ProvidesFile{csquotes.def} - [2016/01/31 v5.1g csquotes generic definitions (JAW)] + [2017/03/11 v5.2b csquotes generic definitions (JAW)] % Set defaults @@ -39,6 +39,12 @@ [0.025em] {\quotesinglbase} {\textquoteright} +\DeclareQuoteStyle{czech} + {\quotedblbase} + {\textquotedblleft} + [0.025em] + {\quotesinglbase} + {\fixligatures\textquoteleft} \DeclareQuoteStyle[quotes]{danish} {\quotedblbase} {\textquotedblleft} @@ -129,6 +135,12 @@ {\guillemotright} {\textquotedblleft} {\textquotedblright} +\DeclareQuoteStyle{icelandic} + {\quotedblbase} + {\textquotedblleft} + [0.05em] + {\quotesinglbase} + {\fixligatures\textquoteleft} \DeclareQuoteStyle[quotes]{italian} {\textquotedblleft} {\textquotedblright} @@ -176,6 +188,12 @@ [0.05em] {\textquoteleft} {\textquoteright} +\DeclareQuoteStyle{slovak} + {\quotedblbase} + {\textquotedblleft} + [0.025em] + {\quotesinglbase} + {\fixligatures\textquoteleft} \DeclareQuoteStyle[spanish]{spanish}% verified {\guillemotleft} [\guillemotright] @@ -255,8 +273,10 @@ \DeclareQuoteOption{english} \DeclareQuoteOption{french} \DeclareQuoteOption{german} +\DeclareQuoteOption{icelandic} \DeclareQuoteOption{italian} \DeclareQuoteOption{norwegian} +\DeclareQuoteOption{portuguese} \DeclareQuoteOption{spanish} \DeclareQuoteOption{swedish} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.sty new/tex/latex/csquotes/csquotes.sty --- old/tex/latex/csquotes/csquotes.sty 2016-02-02 00:01:46.000000000 +0100 +++ new/tex/latex/csquotes/csquotes.sty 2017-03-12 01:01:05.000000000 +0100 @@ -1,5 +1,5 @@ % Copyright (c) 2003-2011 Philipp Lehman. -% (c) 2015-2016 Joseph Wright. +% (c) 2015-2017 Joseph Wright. % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{csquotes} - [2016/01/31 v5.1g context-sensitive quotations (JAW)] + [2017/03/11 v5.2b context-sensitive quotations (JAW)] %% Compatibility and requirements @@ -25,7 +25,7 @@ {Outdated 'etoolbox' package} {Upgrade to etoolbox v1.7 (2008/06/28) or later.\MessageBreak I found: '\csuse{ver(a)etoolbox.sty}'.\MessageBreak - This is a fatal error. I'm aborting now.}% + This is a fatal error. I'm aborting now.} \endinput} \@ifpackageloaded{inputenc} @@ -173,7 +173,7 @@ % Grouping control \protected\def\csq@bqgroup{% - \bgroup\leavevmode + \begingroup\leavevmode \csq@glevel\currentgrouplevel \csq@gtype\currentgrouptype} @@ -186,7 +186,7 @@ \else \csq@err@gtype \fi - \egroup} + \endgroup} \AtEndDocument{% \ifnum\csq@qlevel>\z@ @@ -1137,7 +1137,7 @@ \csq@ifnested {\csq@err@nbquote} {\csq@getpunct{% - \ifbool{inner} + \ifboolexpr{ bool {inner} and bool {hmode} } {\csq@bquote@ii} {\ifbool{csdisplay} {\csq@bquote@i} @@ -2217,11 +2217,15 @@ \newrobustcmd*{\textins}{% \@ifstar\mktextmod\mktextins} +\newrobustcmd*{\textdel}{% + \mktextdel} + \newcommand{\mktextelp}{[\textellipsis\unkern]} \newcommand{\mktextelpins}[1]{[\textellipsis\unkern] [#1]} \newcommand{\mktextinselp}[1]{[#1] [\textellipsis\unkern]} \newcommand{\mktextins}[1]{[#1]} \newcommand{\mktextmod}[1]{[#1]} +\newcommand{\mktextdel}[1]{[]} %% Auxiliary commands for some styles @@ -2254,13 +2258,13 @@ \newrobustcmd*{\fixligatures}{% \ifhmode \ifnum\spacefactor>3000 - \relax + \kern0pt \else \ifnum\spacefactor=1007 - \relax + \kern0pt \else \ifnum\spacefactor=1008 - \relax + \kern0pt \fi \fi \fi @@ -2388,10 +2392,6 @@ {\csq@info{Checking for multilingual support..}% \@ifpackageloaded{polyglossia} {\csq@info{... found 'polyglossia' package}% - \csq@warning - {Using preliminary 'polyglossia' interface.\MessageBreak - Some of the multilingual features may not\MessageBreak - work as expected\@gobble}% \def\csq@main@language{\xpg@main@language}% \csq@hook@multilang} {\@ifpackageloaded{babel} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.tlpobj new/tlpkg/tlpobj/csquotes.tlpobj --- old/tlpkg/tlpobj/csquotes.tlpobj 2016-04-14 18:54:39.000000000 +0200 +++ new/tlpkg/tlpobj/csquotes.tlpobj 2017-04-14 17:37:19.000000000 +0200 @@ -1,6 +1,6 @@ name csquotes category Package -revision 39538 +revision 43469 shortdesc Context sensitive quotation facilities relocated 1 longdesc This package provides advanced facilities for inline and @@ -17,13 +17,13 @@ longdesc well as the optional active quotes are freely configurable. The longdesc package is dependent on e-TeX, and requires the author's longdesc etoolbox package. -runfiles size=24 +runfiles size=23 RELOC/tex/latex/csquotes/csq-compat.def RELOC/tex/latex/csquotes/csquotes.cfg RELOC/tex/latex/csquotes/csquotes.def RELOC/tex/latex/csquotes/csquotes.sty catalogue-ctan /macros/latex/contrib/csquotes -catalogue-date 2016-02-01 07:19:50 +0100 +catalogue-date 2017-03-11 21:09:57 +0100 catalogue-license lppl1.3 catalogue-topics quote-marks -catalogue-version 5.1g +catalogue-version 5.2b ++++++ cstex.doc.tar.xz ++++++ ++++++ csvsimple.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/CHANGES new/doc/latex/csvsimple/CHANGES --- old/doc/latex/csvsimple/CHANGES 2014-07-15 00:44:11.000000000 +0200 +++ new/doc/latex/csvsimple/CHANGES 2016-11-25 19:28:30.000000000 +0100 @@ -1,7 +1,7 @@ -%% The LaTeX package csvsimple - version 1.12 (2014/07/14) +%% The LaTeX package csvsimple - version 1.20 (2016/07/01) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2008-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -89,3 +89,16 @@ new key 'csvsorter token' - changed: encircling column entry braces removed for all entries for better siunitx compatibility - documentation revised and extended with siunitx examples + +version 1.20 (2016/07/01): +- implementation changed from \roman to \romannumeral +- write18 replace by \ShellEscape from the shellesc package +- '\csvlinetotablerow' implemented more efficiently +- '\csvloop' made long +- new string comparison macros: + '\ifcsvstrequal', '\ifcsvprostrequal', '\ifcsvstrcmp', '\ifcsvnotstrcmp' +- new filter options: + 'filter ifthen', 'filter test', 'filter expr', 'full filter', + 'filter strcmp', 'filter not strcmp' +- code optimizations +- documentation revised diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/README new/doc/latex/csvsimple/README --- old/doc/latex/csvsimple/README 2014-07-15 00:44:11.000000000 +0200 +++ new/doc/latex/csvsimple/README 2016-11-25 19:28:30.000000000 +0100 @@ -1,7 +1,7 @@ -%% The LaTeX package csvsimple - version 1.12 (2014/07/14) +%% The LaTeX package csvsimple - version 1.20 (2016/07/01) %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2008-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -35,6 +35,7 @@ 'csvsimple-example.pdf' Compiled example 'amountsort.xml' csvsorter configuration file (example) 'catsort.xml' csvsorter configuration file (example) + 'encoding.xml' csvsorter configuration file (example) 'gradesort.xml' csvsorter configuration file (example) 'matriculationsort.xml' csvsorter configuration file (example) 'namesort.xml' csvsorter configuration file (example) Binary files old/doc/latex/csvsimple/csvsimple-example.pdf and new/doc/latex/csvsimple/csvsimple-example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple-example.tex new/doc/latex/csvsimple/csvsimple-example.tex --- old/doc/latex/csvsimple/csvsimple-example.tex 2014-07-15 00:44:11.000000000 +0200 +++ new/doc/latex/csvsimple/csvsimple-example.tex 2016-11-25 19:28:30.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package csvsimple - version 1.12 (2014/07/14) +%% The LaTeX package csvsimple - version 1.20 (2016/07/01) %% csvsimple-example.tex: an example for csvsimple %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2008-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the Binary files old/doc/latex/csvsimple/csvsimple.pdf and new/doc/latex/csvsimple/csvsimple.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple.tex new/doc/latex/csvsimple/csvsimple.tex --- old/doc/latex/csvsimple/csvsimple.tex 2014-07-15 00:44:11.000000000 +0200 +++ new/doc/latex/csvsimple/csvsimple.tex 2016-11-25 19:28:30.000000000 +0100 @@ -1,9 +1,10 @@ % \LaTeX-Main\ -%% The LaTeX package csvsimple - version 1.12 (2014/07/14) +% !TeX encoding=UTF-8 +%% The LaTeX package csvsimple - version 1.20 (2016/07/01) %% csvsimple.tex: Manual %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2008-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -21,17 +22,19 @@ \documentclass[a4paper,11pt]{ltxdoc} \usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} \usepackage[english]{babel} \usepackage{lmodern,parskip,array,ifthen,calc,makeidx} \usepackage{amsmath,amssymb} \usepackage[svgnames,table,hyperref]{xcolor} \usepackage{tikz,siunitx} +\usepackage{varioref} \usepackage[pdftex,bookmarks,raiselinks,pageanchor,hyperindex,colorlinks]{hyperref} \urlstyle{sf} +\usepackage{cleveref} \usepackage[a4paper,left=2.5cm,right=2.5cm,top=1.5cm,bottom=1.5cm, - marginparsep=5mm,marginparwidth=10mm, + marginparsep=3mm,marginparwidth=18mm, headheight=0mm,headsep=0cm, footskip=1.5cm,includeheadfoot]{geometry} \usepackage{fancyhdr} @@ -51,54 +54,64 @@ \setlength{\bibitemsep}{\smallskipamount} \addbibresource{\jobname.bib} -\usepackage[most,documentation]{tcolorbox} \usepackage{longtable,booktabs} \usepackage{csvsimple} +\usepackage{tcolorbox} +\tcbuselibrary{skins,xparse,minted,breakable,documentation,raster} + +\definecolor{Green_Dark}{rgb}{0.078431,0.407843,0.176471} +\definecolor{Blue_Dark}{rgb}{0.090196,0.211765,0.364706} +\definecolor{Blue_Bright}{rgb}{0.858824,0.898039,0.945098} + \tcbset{skin=enhanced, + minted options={fontsize=\footnotesize}, doc head={colback=yellow!10!white,interior style=fill}, doc head key={colback=magenta!5!white,interior style=fill}, color key=DarkViolet, color value=Teal, color color=Teal, - index colorize,index annotate} - -\lstdefinestyle{mydocumentation}{style=tcbdocumentation, - classoffset=0, - texcsstyle=\color{blue}, - % LaTeX and other packages - moretexcs={arrayrulecolor,draw,includegraphics,ifthenelse,isodd,lipsum,path,pgfkeysalso}, - classoffset=1, - moretexcs={% - csvset,csvreader,csvautotabular,csvloop,csvautolongtable,csvstyle, - csvnames,csvheadset,csviffirstrow,csvifoddrow,csvfilteraccept, - csvfilterreject,csvline,thecsvrow,thecsvinputline,csvlinetotablerow, - csvautobooktabular,csvautobooklongtable, + color counter=Orange!85!black, + color length=Orange!85!black, + index colorize, + index annotate, + beforeafter example/.style={ + before skip=4pt plus 2pt minus 1pt, + after skip=8pt plus 4pt minus 2pt + }, + docexample/.style={bicolor, + beforeafter example, + arc is angular,fonttitle=\bfseries, + %fontupper=\tiny\itshape, + fontlower=\footnotesize, + %colframe=Blue_Dark, + %colback=Blue_Bright!75, + colframe=green!25!yellow!50!black, + colback=green!25!yellow!7, + colbacklower=white, +% drop fuzzy shadow, + drop fuzzy shadow=green!25!yellow!50!black, + listing engine=minted, + documentation minted style=colorful, + documentation minted options={fontsize=\footnotesize}, }, - texcsstyle=\color{Definition}\bfseries, - classoffset=2, - keywordstyle=\color{Option}\bfseries, - % option list - morekeywords={% - }, - classoffset=0% restore default - } - -\tcbset{documentation listing style=mydocumentation,% - docexample/.style={enhanced,colframe=Navy!50!ExampleFrame,colback=Navy!5!ExampleBack,fontlower=\footnotesize, - bicolor,colbacklower=ExampleBack!5!white,drop fuzzy shadow}, } - +\renewcommand*{\tcbdocnew}[1]{\textcolor{green!50!black}{\sffamily\bfseries N} #1} +\renewcommand*{\tcbdocupdated}[1]{\textcolor{blue!75!black}{\sffamily\bfseries U} #1} \tcbmakedocSubKey{docCsvKey}{csv} \NewDocumentCommand{\csvsorter}{}{\textsf{\bfseries\color{red!20!black}CSV-Sorter}} -\newtcbinputlisting{\csvlisting}[1]{docexample,listing style=tcbdocumentation,fonttitle=\bfseries, - listing only,title={CSV file \flqq\texttt{\detokenize{#1.csv}}\frqq},listing file=#1.csv} - -\newtcbinputlisting{\xmllisting}[1]{docexample,listing options={style=tcbdocumentation,language=XML}, +%\newtcbinputlisting{\csvlisting}[1]{docexample,listing style=tcbdocumentation,fonttitle=\bfseries, +% listing only,title={CSV file \flqq\texttt{\detokenize{#1.csv}}\frqq},listing file=#1.csv} +\newtcbinputlisting{\csvlisting}[1]{docexample,minted options={fontsize=\footnotesize},minted language=latex, + fonttitle=\bfseries,listing only,title={CSV file \flqq\texttt{\detokenize{#1.csv}}\frqq},listing file=#1.csv} + +%\newtcbinputlisting{\xmllisting}[1]{docexample,listing options={style=tcbdocumentation,language=XML}, +% fonttitle=\bfseries,listing only,title={Configuration file \flqq\texttt{\detokenize{#1.xml}}\frqq},listing file=#1.xml} +\newtcbinputlisting{\xmllisting}[1]{docexample,minted options={fontsize=\footnotesize},minted language=xml, fonttitle=\bfseries,listing only,title={Configuration file \flqq\texttt{\detokenize{#1.xml}}\frqq},listing file=#1.xml} \NewTotalTCBox{\verbbox}{m}{enhanced,on line,size=fbox,frame empty,colback=red!5!white, @@ -111,25 +124,28 @@ pdfkeywords={csv file, comma separated values, key value syntax} } -\def\version{1.12}% -\def\datum{2014/07/14}% +\def\version{1.20}% +\def\datum{2016/07/01}% \makeindex %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} \begin{center} -\vspace*{5mm} -\begin{tcolorbox}[enhanced, - center upper,width=10cm,boxrule=0.4pt, - colback=white,colframe=black!50!yellow,drop fuzzy midday shadow=black!50!yellow] -{\bfseries\LARGE The \texttt{csvsimple} package\par}\medskip -{\large Manual for version \version\ (\datum)\par} -\end{tcolorbox}\bigskip +\begin{tcolorbox}[enhanced,hbox,tikznode,left=8mm,right=8mm,boxrule=0.4pt, + colback=white,colframe=black!50!yellow, + drop lifted shadow=black!50!yellow,arc is angular, + before=\par\vspace*{5mm},after=\par\bigskip] +{\bfseries\LARGE The \texttt{csvsimple} package}\\[3mm] +{\large Manual for version \version\ (\datum)} +\end{tcolorbox} {\large Thomas F.~Sturm% \footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik, Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany; - email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}} } + email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip +\normalsize\url{http://www.ctan.org/pkg/csvsimple}\par +\url{https://github.com/T-F-S/csvsimple} +} \end{center} \bigskip \begin{absquote} @@ -142,6 +158,7 @@ or data base storage. \end{absquote} +\clearpage \tableofcontents \clearpage @@ -149,10 +166,10 @@ The |csvsimple| package is applied to the processing of CSV\footnote{CSV file: file with comma separated values.} files. This processing is controlled by key value assignments according to the -syntax of |pgfkeys| \cite{tantau:2013a}. Sample applications of the package +syntax of |pgfkeys| \cite{tantau:2015a}. Sample applications of the package are tabular lists, serial letters, and charts. -An alternative to |csvsimple| is the |datatool| package \cite{talbot:2014a} +An alternative to |csvsimple| is the |datatool| package \cite{talbot:2016a} which provides considerably more functions and allows sorting of data by \LaTeX. |csvsimple| has a different approach for the user interface and is deliberately restricted to some basic functions with fast @@ -161,16 +178,18 @@ \subsection{Loading the Package} The package |csvsimple| loads the packages -|pgfkeys| \cite{tantau:2013a} and |ifthen| \cite{carlisle:2001b}. +|pgfkeys| \cite{tantau:2015a}, +|etoolbox| \cite{lehmann:2015a}, +and |ifthen| \cite{carlisle:2014c}. |csvsimple| itself is loaded in the usual manner in the preamble: \begin{dispListing} \usepackage{csvsimple} \end{dispListing} Not automatically loaded, but used for many examples are the packages -|longtable| \cite{carlisle:2004a} +|longtable| \cite{carlisle:2014d} and -|booktabs| \cite{fear:2005a}. +|booktabs| \cite{fear:2016a}. \subsection{First Steps} Every line of a processable CSV file has to contain an identical amount of @@ -185,7 +204,7 @@ name,givenname,matriculation,gender,grade Maier,Hans,12345,m,1.0 Huber,Anna,23456,f,2.3 -Wei\ss{}b\"{a}ck,Werner,34567,m,5.0 +Weißbäck,Werner,34567,m,5.0 Bauer,Maria,19202,f,3.3 \end{tcbverbatimwrite} %-- end embedded file -- @@ -330,10 +349,10 @@ a certificate is printed only for students with grade unequal to 5.0. \begin{dispExample} -\csvreader[filter not equal={\grade}{5.0}]% +\csvreader[filter not strcmp={\grade}{5.0}]% {grade.csv}{1=\name,2=\firstname,3=\matnumber,4=\gender,5=\grade}% {\begin{center}\Large\bfseries Certificate in Mathematics\end{center} - \large\ifthenelse{\equal{\gender}{f}}{Ms.}{Mr.} + \large\ifcsvstrcmp{\gender}{f}{Ms.}{Mr.} \firstname~\name, matriculation number \matnumber, has passed the test in mathematics with grade \grade.\par\ldots\par }% @@ -480,7 +499,7 @@ \begin{dispExample} \csvset{grade list/.style= {column names={name=\name,givenname=\firstname,grade=\grade}}, - passed/.style={filter not equal={\grade}{5.0}} } + passed/.style={filter not strcmp={\grade}{5.0}} } The following students passed the test in mathematics: \csvreader[grade list,passed]{grade.csv}{}{\firstname\ \name\ (\grade); }% @@ -498,7 +517,7 @@ to define additional \meta{assignments} of macros to columns. \begin{dispExample} \csvnames{grade list}{name=\name,givenname=\firstname,grade=\grade} -\csvstyle{passed}{filter not equal={\grade}{5.0}} +\csvstyle{passed}{filter not strcmp={\grade}{5.0}} The following students passed the test in mathematics: \csvreader[grade list,passed]{grade.csv}{}{\firstname\ \name\ (\grade); }% @@ -575,11 +594,11 @@ \begin{docCommand}{csvfilteraccept}{} All following consistent data lines will be accepted and processed. This command overwrites all previous filter settings and may be used - inside \refKey{/csv/before filter} to implement + inside \refKey{/csv/full filter} to implement an own filtering rule together with |\csvfilterreject|. \begin{dispExample} \csvreader[autotabular, - before filter=\ifthenelse{\equal{\csvcoliv}{m}}{\csvfilteraccept}{\csvfilterreject} + full filter=\ifcsvstrcmp{\csvcoliv}{m}{\csvfilteraccept}{\csvfilterreject} ]{grade.csv}{}{\csvlinetotablerow}% \end{dispExample} \end{docCommand} @@ -614,14 +633,14 @@ The \LaTeX\ counter |csvinputline| can be addressed directly in the usual way, e.\,g. by |\roman{csvinputline}|. \begin{dispExample} -\csvreader[no head, filter equal={\thecsvinputline}{3}]% +\csvreader[no head, filter test=\ifnumequal{\thecsvinputline}{3}]% {grade.csv}{}% {The line with number \thecsvinputline\ contains: \csvline}% \end{dispExample} \end{docCommand} -\begin{docCommand}{csvlinetotablerow}{} +\begin{docCommand}[doc updated=2016-00-00]{csvlinetotablerow}{} Typesets the current processed data line with |&| between the entries. %Most users will never apply this command. \end{docCommand} @@ -637,28 +656,29 @@ \subsection{Command Definition}%--------%[[ -\begin{docCsvKey}{before reading}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed before the CSV file is processed. +\begin{docCsvKey}{before reading}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed before the CSV file is processed. \end{docCsvKey} -\begin{docCsvKey}{after head}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after the header line is read. +\begin{docCsvKey}{after head}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after the header line is read. \end{docCsvKey} -\begin{docCsvKey}{before filter}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after reading and consistency checking +\begin{docCsvKey}{before filter}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after reading and consistency checking of a data line. They are executed before any filter condition is checked, see \refKey{/csv/filter}. + Also see \refKey{/csv/full filter}. \end{docCsvKey} -\begin{docCsvKey}{late after head}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after reading and disassembling +\begin{docCsvKey}{late after head}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after reading and disassembling of the first accepted data line. They are executed before further processing of this line. \end{docCsvKey} -\begin{docCsvKey}{late after line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after reading and disassembling +\begin{docCsvKey}{late after line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after reading and disassembling of the next accepted data line (after \refKey{/csv/before filter}). They are executed before further processing of this next line. |late after line| overwrites |late after first line| and |late after last line|. @@ -667,55 +687,55 @@ \end{docCsvKey} -\begin{docCsvKey}{late after first line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after reading and disassembling +\begin{docCsvKey}{late after first line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after reading and disassembling of the second accepted data line instead of \refKey{/csv/late after line}. This key has to be set after |late after line|. \end{docCsvKey} -\begin{docCsvKey}{late after last line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after processing of the last +\begin{docCsvKey}{late after last line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after processing of the last accepted data line instead of \refKey{/csv/late after line}. This key has to be set after |late after line|. \end{docCsvKey} -\begin{docCsvKey}{before line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after \refKey{/csv/late after line} +\begin{docCsvKey}{before line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after \refKey{/csv/late after line} and before \refKey{/csv/command}. |before line| overwrites |before first line|. \end{docCsvKey} -\begin{docCsvKey}{before first line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed instead of \refKey{/csv/before line} +\begin{docCsvKey}{before first line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed instead of \refKey{/csv/before line} for the first accepted data line. This key has to be set after |before line|. \end{docCsvKey} -\begin{docCsvKey}{command}{=\meta{macros}}{no default, initially \cs{csvline}} - Sets the \meta{macros} to be executed for every accepted data line. +\begin{docCsvKey}{command}{=\meta{code}}{no default, initially \cs{csvline}} + Sets the \meta{code} to be executed for every accepted data line. They are executed between \refKey{/csv/before line} and \refKey{/csv/after line}. \end{docCsvKey} -\begin{docCsvKey}{after line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed for every accepted data line +\begin{docCsvKey}{after line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed for every accepted data line after \refKey{/csv/command}. |after line| overwrites |after first line|. \end{docCsvKey} -\begin{docCsvKey}{after first line}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed instead of \refKey{/csv/after line} +\begin{docCsvKey}{after first line}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed instead of \refKey{/csv/after line} for the first accepted data line. This key has to be set after |after line|. \end{docCsvKey} -\begin{docCsvKey}{after reading}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after the CSV file is processed. +\begin{docCsvKey}{after reading}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after the CSV file is processed. \end{docCsvKey} @@ -777,7 +797,7 @@ \clearpage -\subsection{Consistency Check and Filtering}% +\subsection{Consistency Check}% \begin{docCsvKey}{check column count}{\colOpt{=true\textbar false}}{default |true|, initially |true|} This key defines, if the number of entries in a data line is checked against @@ -801,8 +821,8 @@ \end{docCsvKey} -\begin{docCsvKey}{on column count error}{=\meta{macros}}{no default, initially empty} - \meta{macros} to be executed for unfeasible data lines. +\begin{docCsvKey}{on column count error}{=\meta{code}}{no default, initially empty} + \meta{code} to be executed for unfeasible data lines. \end{docCsvKey} @@ -811,14 +831,107 @@ \end{docCsvKey} -\begin{docCsvKey}{filter}{=\meta{condition}}{no default} +\clearpage +\subsection{Filtering}% + +\begin{docCsvKey}[][doc new=2016-00-00]{filter test}{=\meta{condition}}{no default} Only data lines which fulfill a logical \meta{condition} are accepted. - For the \meta{condition}, every term from the |ifthen| package \cite{carlisle:2001b} + For the \meta{condition}, every single test normally employed like +\begin{dispListing} +\iftest{some testing}{true}{false} +\end{dispListing} + can be used as +\begin{dispListing} +filter test=\iftest{some testing}, +\end{dispListing} + For |\iftest|, tests from the |etoolbox| package \cite{lehmann:2015a} like + |\ifnumcomp|, |\ifdimgreater|, etc. and from \Fullref{sec:stringtests} can be used. + +\begin{dispExample} +\csvreader[head to column names,tabular=llll, + table head=\toprule & \bfseries Name & \bfseries Matr & \bfseries Grade\\\midrule, + table foot=\bottomrule, + %>> list only matriculation numbers greater than 20000 << + filter test=\ifnumgreater{\matriculation}{20000}, + ]{grade.csv}{}{% + \thecsvrow & \slshape\name, \givenname & \matriculation & \grade} +\end{dispExample} +\end{docCsvKey} + + +\begin{docCsvKey}{filter strcmp}{=\marg{stringA}\marg{stringB}}{style, no default} + Only lines where \meta{stringA} and \meta{stringB} are equal after expansion + are accepted. + The implementation is done with \refCom{ifcsvstrcmp}. +\end{docCsvKey} + + +\begin{docCsvKey}{filter not strcmp}{=\marg{stringA}\marg{stringB}}{style, no default} + Only lines where \meta{stringA} and \meta{stringB} are not equal after expansion + are accepted. + The implementation is done with \refCom{ifcsvnotstrcmp}. +\end{docCsvKey} + + +\begin{docCsvKey}[][doc new=2016-00-00]{filter expr}{=\meta{condition}}{no default} + Only data lines which fulfill a logical \meta{condition} are accepted. + For the \meta{condition}, every boolean expression + from the |etoolbox| package \cite{lehmann:2015a} is feasible. + To preprocess the data line before testing the \meta{condition}, + the option key \refKey{/csv/before filter} can be used. +\begin{dispExample} +\csvreader[head to column names,tabular=llll, + table head=\toprule & \bfseries Name & \bfseries Matr & \bfseries Grade\\\midrule, + table foot=\bottomrule, + %>> list only matriculation numbers greater than 20000 + % and grade less than 4.0 << + filter expr={ test{\ifnumgreater{\matriculation}{20000}} + and test{\ifdimless{\grade pt}{4.0pt}} }, + ]{grade.csv}{}{% + \thecsvrow & \slshape\name, \givenname & \matriculation & \grade} +\end{dispExample} +\end{docCsvKey} + +\clearpage +\begin{docCsvKey}[][doc new=2016-00-00]{filter ifthen}{=\meta{condition}}{no default} + Only data lines which fulfill a logical \meta{condition} are accepted. + For the \meta{condition}, every term from the |ifthen| \cite{carlisle:2014c} package is feasible. To preprocess the data line before testing the \meta{condition}, the option key \refKey{/csv/before filter} can be used. + +\begin{dispExample} +\csvreader[head to column names,tabular=llll, + table head=\toprule & \bfseries Name & \bfseries Matr & \bfseries Grade\\\midrule, + table foot=\bottomrule, + %>> list only female persons << + filter ifthen=\equal{\gender}{f}, + ]{grade.csv}{}{% + \thecsvrow & \slshape\name, \givenname & \matriculation & \grade} +\end{dispExample} + +\end{docCsvKey} + + +\begin{docCsvKey}{filter}{=\meta{condition}}{no default} + Alias for \refKey{/csv/filter ifthen}. +\end{docCsvKey} + +\begin{docCsvKey}{filter equal}{=\marg{stringA}\marg{stringB}}{style, no default} + Only lines where \meta{stringA} and \meta{stringB} are equal after expansion + are accepted. + The implementation is done with the |ifthen| \cite{carlisle:2014c} package. +\end{docCsvKey} + + +\begin{docCsvKey}{filter not equal}{=\marg{stringA}\marg{stringB}}{style, no default} + Only lines where \meta{stringA} and \meta{stringB} are not equal after expansion + are accepted. + The implementation is done with the |ifthen| \cite{carlisle:2014c} package. \end{docCsvKey} + + \begin{docCsvKey}{no filter}{}{no value, initially set} Clears a set filter. \end{docCsvKey} @@ -834,18 +947,30 @@ \end{docCsvKey} -\begin{docCsvKey}{filter equal}{=\marg{string A}\marg{string B}}{style, no default} - Only lines where \meta{string A} and \meta{string B} are equal after expansion - are accepted. -\end{docCsvKey} - -\begin{docCsvKey}{filter not equal}{=\marg{string A}\marg{string B}}{style, no default} - Only lines where \meta{string A} and \meta{string B} are not equal after expansion - are accepted. +\enlargethispage*{2cm} +\begin{docCsvKey}[][doc new=2016-00-00]{full filter}{=\meta{code}}{no default} + Technically, this key is an alias for \refKey{/csv/before filter}. + Philosophically, \refKey{/csv/before filter} computes something before + a filter condition is set, but \refKey{/csv/full filter} should implement + the full filtering. Especially, \refCom{csvfilteraccept} or + \refCom{csvfilterreject} \emph{should} be set inside the \meta{code}. +\begin{dispExample} +\csvreader[head to column names,tabular=llll, + table head=\toprule & \bfseries Name & \bfseries Matr & \bfseries Grade\\\midrule, + table foot=\bottomrule, + %>> list only matriculation numbers greater than 20000 + % and grade less than 4.0 << + full filter=\ifnumgreater{\matriculation}{20000} + {\ifdimless{\grade pt}{4.0pt}{\csvfilteraccept}{\csvfilterreject}} + {\csvfilterreject}, + ]{grade.csv}{}{% + \thecsvrow & \slshape\name, \givenname & \matriculation & \grade} +\end{dispExample} \end{docCsvKey} + %]] @@ -887,26 +1012,26 @@ \end{docCsvKey} -\begin{docCsvKey}{before table}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed before |\begin{tabular}| or before |\begin{longtable}| +\begin{docCsvKey}{before table}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed before |\begin{tabular}| or before |\begin{longtable}| or before |\begin{tabbing}|, respectively. \end{docCsvKey} -\begin{docCsvKey}{table head}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after |\begin{tabular}| or after |\begin{longtable}| +\begin{docCsvKey}{table head}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after |\begin{tabular}| or after |\begin{longtable}| or after |\begin{tabbing}|, respectively. \end{docCsvKey} -\begin{docCsvKey}{table foot}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed before |\end{tabular}| or before |\end{longtable}| +\begin{docCsvKey}{table foot}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed before |\end{tabular}| or before |\end{longtable}| or before |\end{tabbing}|, respectively. \end{docCsvKey} -\begin{docCsvKey}{after table}{=\meta{macros}}{no default, initially empty} - Sets the \meta{macros} to be executed after |\end{tabular}| or after |\end{longtable}| +\begin{docCsvKey}{after table}{=\meta{code}}{no default, initially empty} + Sets the \meta{code} to be executed after |\end{tabular}| or after |\end{longtable}| or after |\end{tabbing}|, respectively. \end{docCsvKey} @@ -1038,7 +1163,7 @@ name;givenname;matriculation;gender;grade Maier;Hans;12345;m;1.0 Huber;Anna;23456;f;2.3 - Wei\ss{}b\"{a}ck;Werner;34567;m;5.0 + Weißbäck;Werner;34567;m;5.0 \end{tcbverbatimwrite} \csvautobooktabular[separator=semicolon]{testsemi.csv} @@ -1052,7 +1177,7 @@ name|givenname|matriculation|gender|grade Maier|Hans|12345|m|1.0 Huber|Anna|23456|f|2.3 - Wei\ss{}b\"{a}ck|Werner|34567|m|5.0 + Weißbäck|Werner|34567|m|5.0 \end{tcbverbatimwrite} \csvautobooktabular[separator=pipe]{pipe.csv} @@ -1178,26 +1303,26 @@ If \csvsorter\ was completely installed following its documentation, there is nothing to change here. If the |csvsorter.jar| file is inside the same directory as the \LaTeX\ source file, you may configure:% preferrably inside the preamble: - \begin{dispListing} - \csvset{csvsorter command=java -jar csvsorter.jar} - \end{dispListing} +\begin{dispListing} +\csvset{csvsorter command=java -jar csvsorter.jar} +\end{dispListing} \end{docCsvKey} \begin{docCsvKey}{csvsorter configpath}{=\meta{path}}{no default, initially |.|} Sorting with \csvsorter\ is done using XML configuration files. If these files are not stored inside the same directory as the \LaTeX\ source file, a \meta{path} to access them can be configured: - \begin{dispListing} - \csvset{csvsorter configpath=xmlfiles} - \end{dispListing} +\begin{dispListing} +\csvset{csvsorter configpath=xmlfiles} +\end{dispListing} Here, the configuration files would be stored in a subdirectory named |xmlfiles|. \end{docCsvKey} \begin{docCsvKey}{csvsorter log}{=\meta{file name}}{no default, initially |csvsorter.log|} Sets the log file of \csvsorter\ to the given \meta{file name}. - \begin{dispListing} - \csvset{csvsorter log=outdir/csvsorter.log} - \end{dispListing} +\begin{dispListing} +\csvset{csvsorter log=outdir/csvsorter.log} +\end{dispListing} Here, the log file is written to a subdirectory named |outdir|. \end{docCsvKey} @@ -1205,9 +1330,9 @@ \begin{docCsvKey}{csvsorter token}{=\meta{file name}}{no default, initially |\textbackslash jobname.csvtoken|} Sets \meta{file name} as token file. This is an auxiliary file which communicates the success of \csvsorter\ to |csvsimple|. - \begin{dispListing} - \csvset{csvsorter log=outdir/\jobname.csvtoken} - \end{dispListing} +\begin{dispListing} +\csvset{csvsorter log=outdir/\jobname.csvtoken} +\end{dispListing} Here, the token file is written to a subdirectory named |outdir|. \end{docCsvKey} @@ -1307,6 +1432,51 @@ \end{docCsvKey} +\clearpage +\section{String Tests}\label{sec:stringtests}% + +The following string tests are complementing the string tests +from the |etoolbox| \cite{lehmann:2015a} package. They all do the same, i.e., +comparing expanded strings for equality. +\begin{itemize} +\item\refCom{ifcsvstrcmp} is the most efficient method, because it uses + native compiler string comparison (if available). +\item\refCom{ifcsvstrequal} does not rely on a compiler. It also is the + fallback implementation for \refCom{ifcsvstrcmp}, if there is no + native comparison method. +\item\refCom{ifcsvprostrequal} is possibly more failsafe than the other two + string tests. It may be used, if strings contain dirty things like |\textbf{A}|. +\end{itemize} +\medskip + +\begin{docCommand}[doc new=2016-00-00]{ifcsvstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}} + Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise. + The comparison is done using |\pdfstrcmp|, if compilation is done with pdf\LaTeX. + The comparison is done using |\pdf@strcmp|, if the package |pdftexcmds| is + loaded and compilation is done with lua\LaTeX\ or Xe\LaTeX. + Otherwise, \refCom{ifcsvstrcmp} is identical to \refCom{ifcsvstrequal}. + This command cannot be used inside the preamble. +\end{docCommand} + + +\begin{docCommand}[doc new=2016-00-00]{ifcsvnotstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}} + Compares two strings and executes \meta{true} if they are \emph{not} equal, and \meta{false} otherwise. + The implementation uses \refCom{ifcsvstrcmp}. +\end{docCommand} + + +\begin{docCommand}[doc new=2016-00-00]{ifcsvstrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}} + Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise. + The strings are expanded with |\edef| in the test. +\end{docCommand} + +\begin{docCommand}[doc new=2016-00-00]{ifcsvprostrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}} + Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise. + The strings are expanded with |\protected@edef| in the test, i.e. parts of the + strings which are protected stay unexpanded. +\end{docCommand} + + \clearpage \section{Examples}% @@ -1321,8 +1491,8 @@ name,givenname,gender,degree,street,zip,location,bonus Maier,Hans,m,,Am Bachweg 17,10010,Hopfingen,20 % next line with a comma in curly braces -Huber,Erna,f,Dr.,{Moosstra\ss{}e 32, Hinterschlag},10020,\"{O}rtingstetten,30 -Wei\ss{}b\"{a}ck,Werner,m,Prof. Dr.,Brauallee 10,10030,Klingenbach,40 +Huber,Erna,f,Dr.,{Moosstraße 32, Hinterschlag},10020,Örtingstetten,30 +Weißbäck,Werner,m,Prof. Dr.,Brauallee 10,10030,Klingenbach,40 % this line is ignored % Siebener , Franz,m, , Blaumeisenweg 12 , 10040 , Pardauz , 50 % preceding and trailing spaces in entries are removed % @@ -1348,13 +1518,13 @@ \begin{dispExample} % this example requires the tcolorbox package -\newcommand{\ifmale}[2]{\ifthenelse{\equal{\gender}{m}}{#1}{#2}} +\newcommand{\ifmale}[2]{\ifcsvstrcmp{\gender}{m}{#1}{#2}} \csvreader[head to column names]{address.csv}{}{% \begin{tcolorbox}[colframe=DarkGray,colback=White,arc=0mm,width=(\linewidth-2pt)/2, equal height group=letter,before=,after=\hfill,fonttitle=\bfseries, adjusted title={Letter to \name}] - \ifthenelse{\equal{\degree}{}}{\ifmale{Mr.}{Ms.}}{\degree}~\givenname~\name\\ + \ifcsvstrcmp{\degree}{}{\ifmale{Mr.}{Ms.}}{\degree}~\givenname~\name\\ \street\\\zip~\location \tcblower {\itshape Dear \ifmale{Sir}{Madam},}\\ @@ -1373,9 +1543,9 @@ \begin{tcbverbatimwrite}{data.csv} land,group,amount Bayern,A,1700 -Baden-W\"{u}rttemberg,A,2300 +Baden-Württemberg,A,2300 Sachsen,B,1520 -Th\"{u}ringen,A,1900 +Thüringen,A,1900 Hessen,B,2100 \end{tcbverbatimwrite} %-- end embedded file -- @@ -1564,10 +1734,10 @@ \csvlisting{data_numbers} -The |siunitx| \cite{wright:2013a} package provides a new column type |S| +The |siunitx| \cite{wright:2016a} package provides a new column type |S| which can align material using a number of different strategies. The following example demonstrates the application with CSV reading. -The package documentation \cite{wright:2013a} contains a huge amount +The package documentation \cite{wright:2016a} contains a huge amount of formatting options. \begin{dispExample} @@ -1583,6 +1753,32 @@ \end{dispExample} \clearpage +Special care is needed, if the \emph{first} column is to be formatted with +the column type |S|. The number detection of |siunitx| is disturbed by +the line reading code of |csvsimple| which actually is present at the +first column. To avoid this problem, the content of the first column +could be formatted not by the table format definition, but by using a +suitable |\tablenum| formatting directly, see |siunitx| \cite{wright:2016a}. + +Another and very nifty workaround suggested by Enrico Gregorio is to +add an invisible dummy column with |c@{}| as first column: + + +\begin{dispExample} +% \usepackage{siunitx,array,booktabs} +\csvloop{ + file=data_numbers.csv, + head to column names, + before reading=\centering\sisetup{table-number-alignment=center}, + tabular={c(a){}S[table-format=2.2e1]S}, + table head= & \textbf{Cats} & \textbf{Dogs}\\\midrule, + command= & \cats & \dogs, + table foot=\bottomrule} +\end{dispExample} + + + +\clearpage Now, the preceding table shall be sorted by the \emph{cats} values. If the \csvsorter\ program is properly installed, see Subsection~\ref{sec:Sorting} on page~\pageref{sec:Sorting}, @@ -1617,9 +1813,9 @@ %-- file embedded for simplicity -- \begin{tcbverbatimwrite}{data_headless.csv} Bayern,A,1700 -Baden-W\"{u}rttemberg,A,2300 +Baden-Württemberg,A,2300 Sachsen,B,1520 -Th\"{u}ringen,A,1900 +Thüringen,A,1900 Hessen,B,2100 \end{tcbverbatimwrite} %-- end embedded file -- @@ -1668,7 +1864,7 @@ \clearpage \subsection{Imported CSV data}\label{importeddata}% -If data is important from other applications, there is not always a choice +If data is imported from other applications, there is not always a choice to format in comma separated values with curly brackets. Consider the following example data file: @@ -1678,7 +1874,7 @@ "name";"address";"email" "Frank Smith";"Yellow Road 123, Brimblsby";"frank.smith(a)organization.org" "Mary May";"Blue Alley 2a, London";"mmay(a)maybe.uk" -"Hans Meier";"Hauptstrasse 32, Berlin";"hans.meier(a)corporation.de" +"Hans Meier";"Hauptstraße 32, Berlin";"hans.meier(a)corporation.de" \end{tcbverbatimwrite} %-- end embedded file -- @@ -1715,35 +1911,115 @@ \clearpage +\subsection{Encoding}\label{encoding}% +If the CSV file has a different encoding than the \LaTeX\ source file, +then special care is needed. + +\begin{itemize} +\item The most obvious treatment is to change the encoding of the CSV file + or the \LaTeX\ source file to match the other one (every good editor + supports such a conversion). This is the easiest choice, if there a no + good reasons against such a step. E.g., unfortunately, several tools + under Windows need the CSV file to be |cp1252| encoded while + the \LaTeX\ source file may need to be |utf8| encoded. + +\item The |inputenc| package allows to switch the encoding inside the + document, say from |utf8| to |cp1252|. Just be aware that you should only + use pure ASCII for additional texts inside the switched region. +\begin{dispListing} +% !TeX encoding=UTF-8 +% .... +\usepackage[utf8]{inputenc} +% .... +\begin{document} +% .... +\inputencoding{latin1}% only use ASCII from here, e.g. "Uberschrift +\csvreader[%... + ]{data_cp1252.csv}{%... + }{% .... + } +\inputencoding{utf8} +% .... +\end{document} +\end{dispListing} + +\item As a variant to the last method, the encoding switch can be done + using options from |csvsimple|: +\begin{dispListing} +% !TeX encoding=UTF-8 +% .... +\usepackage[utf8]{inputenc} +% .... +\begin{document} +% .... +% only use ASCII from here, e.g. "Uberschrift +\csvreader[%... + before reading=\inputencoding{latin1}, + after reading=\inputencoding{utf8}, + ]{data_cp1252.csv}{%... + }{% .... + } +% .... +\end{document} +\end{dispListing} + +\pagebreak\item +If the \csvsorter\ program is properly installed, +see Subsection~\ref{sec:Sorting} on page~\pageref{sec:Sorting}, +the CSV file can be re-encoded on-the-fly +with the following configuration file for \csvsorter: + +\xmllisting{encoding} + +\begin{dispListing} +% !TeX encoding=UTF-8 +% .... +\usepackage[utf8]{inputenc} +% .... +\begin{document} +% .... +\csvreader[%... + sort by=encoding.xml, + ]{data_cp1252.csv}{%... + }{% .... + } +% .... +\end{document} +\end{dispListing} + + +\end{itemize} + + + + +\clearpage % Actually, it is not a good idea to include the references like this! % Do not follow this bad example ... \begin{tcbverbatimwrite}{\jobname.bib} -@manual{tantau:2013a, +@manual{tantau:2015a, author = {Till Tantau}, title = {The TikZ and PGF Packages}, - subtitle = {Manual for version 3.0.0}, - url = {http://sourceforge.net/projects/pgf/}, - date = {2013-12-20}, + subtitle = {Manual for version 3.0.1a}, + url = {http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf}, + date = {2015-08-29}, } - -@manual{carlisle:2001b, +@manual{carlisle:2014c, author = {David Carlisle}, title = {The ifthen package}, - url = {http://mirror.ctan.org/macros/latex/base/}, - Xnote = {}, - day = 26, - month = may, - year = 2001, + url = {http://mirror.ctan.org/macros/latex/base/ifthen.pdf}, + date = {2014-09-29}, language = {english} } -@manual{talbot:2014a, + +@manual{talbot:2016a, author = {Nicola L. C. Talbot}, - title = {User Manual for the datatool bundle version 2.20}, - url = {http://mirror.ctan.org/macros/latex/contrib/datatool/datatool.pdf}, - date = {2014-02-03}, + title = {User Manual for the datatool bundle version 2.25}, + url = {http://mirrors.ctan.org/macros/latex/contrib/datatool/datatool-user.pdf}, + date = {2016-01-18}, } @manual{sturm:2014j, @@ -1755,30 +2031,38 @@ language = {english} } -@manual{carlisle:2004a, +@manual{carlisle:2014d, author = {David Carlisle}, title = {The longtable package}, url = {http://mirror.ctan.org/macros/latex/required/tools/longtable.pdf}, - date = {2004-02-01}, + date = {2014-10-28}, language = {english} } -@manual{fear:2005a, + +@manual{fear:2016a, author = {Simon Fear}, title = {Publication quality tables in \LaTeX}, url = {http://mirror.ctan.org/macros/latex/contrib/booktabs/booktabs.pdf}, - date = {2005-04-15}, + date = {2016-04-29}, language = {english} } -@manual{wright:2013a, +@manual{wright:2016a, author = {Joseph Wright}, title = {siunitx --- A comprehensive (SI) units package}, url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf}, - date = {2013-07-31}, + date = {2016-03-01}, language = {english} } +@manual{lehmann:2015a, + author = {Philipp Lehman and Joseph Wright}, + title = {The etoolbox Package}, + url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/etoolbox.pdf}, + date = {2015-08-02}, +} + \end{tcbverbatimwrite} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/encoding.xml new/doc/latex/csvsimple/encoding.xml --- old/doc/latex/csvsimple/encoding.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/csvsimple/encoding.xml 2016-11-25 19:28:30.000000000 +0100 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<csv> + <noHeader/> + <bracket empty="true"/> + <charset in="windows-1252" out="UTF-8"/> +</csv> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.doc.tlpobj new/tlpkg/tlpobj/csvsimple.doc.tlpobj --- old/tlpkg/tlpobj/csvsimple.doc.tlpobj 2016-04-14 18:54:42.000000000 +0200 +++ new/tlpkg/tlpobj/csvsimple.doc.tlpobj 2017-04-14 17:37:21.000000000 +0200 @@ -1,9 +1,9 @@ name csvsimple.doc category Package -revision 34610 +revision 41597 shortdesc doc files of csvsimple relocated 1 -docfiles size=250 +docfiles size=243 RELOC/doc/latex/csvsimple/CHANGES RELOC/doc/latex/csvsimple/README RELOC/doc/latex/csvsimple/amountsort.xml @@ -12,6 +12,7 @@ RELOC/doc/latex/csvsimple/csvsimple-example.tex RELOC/doc/latex/csvsimple/csvsimple.pdf RELOC/doc/latex/csvsimple/csvsimple.tex + RELOC/doc/latex/csvsimple/encoding.xml RELOC/doc/latex/csvsimple/gradesort.xml RELOC/doc/latex/csvsimple/matriculationsort.xml RELOC/doc/latex/csvsimple/namesort.xml ++++++ csvsimple.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csvsimple/csvsimple.sty new/tex/latex/csvsimple/csvsimple.sty --- old/tex/latex/csvsimple/csvsimple.sty 2014-07-15 00:44:11.000000000 +0200 +++ new/tex/latex/csvsimple/csvsimple.sty 2016-11-25 19:33:46.000000000 +0100 @@ -1,8 +1,8 @@ -%% The LaTeX package csvsimple - version 1.12 (2014/07/14) +%% The LaTeX package csvsimple - version 1.20 (2016/07/01) %% csvsimple.sty: Simple LaTeX CSV file processing %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2008-2014 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -18,9 +18,9 @@ %% This work consists of all files listed in README %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{csvsimple}[2014/07/14 version 1.12 LaTeX CSV file processing] +\ProvidesPackage{csvsimple}[2016/07/01 version 1.20 LaTeX CSV file processing] -\RequirePackage{pgfkeys,ifthen} +\RequirePackage{pgfkeys,ifthen,etoolbox,shellesc} %---- general @@ -35,13 +35,6 @@ \def\csv@empty{} -\def\csv@addto@macro#1#2{% - \begingroup% - \toks@\expandafter{#1#2}% - \xdef#1{\the\toks@}% - \endgroup% - } - \long\def\csviffirstrow#1#2{% \ifnum\c@csvrow=1% \long\def\csviffirstrow@doit{#1}% @@ -60,12 +53,16 @@ \csvifoddrow@doit% } -\def\csv@and{&} - -\def\csvlinetotablerow{% - \setcounter{csvcol}{0}% - \stepcounter{csvcol}\csv@current@col% - \whiledo{\thecsvcol<\csv@columncount}{\csv@and\stepcounter{csvcol}\csv@current@col}% +\def\csv@assemble@csvlinetotablerow{% + \global\c@csvcol 1\relax% + \xdef\csvlinetotablerow{\expandonce{\csname csvcol\romannumeral\c@csvcol\endcsname}}% + \ifnum\c@csvcol<\csv@columncount\relax% + \loop% + \global\advance\c@csvcol 1\relax% + \xappto\csvlinetotablerow{\noexpand&\expandonce{\csname csvcol\romannumeral\c@csvcol\endcsname}}% + \ifnum\c@csvcol<\csv@columncount\relax\repeat% + \fi% + \csvlinetotablerow% } @@ -91,48 +88,48 @@ \def\csv@breakline@kernel#1{% \ifx\csv@termination#1\let\nextcol=\relax\else% \let\nextcol=\csv@breakline% - \stepcounter{csvcol}% + \global\advance\c@csvcol 1\relax% \def\csv@col@body{#1}% \csv@TrimSpaces\csv@col@body% \csv@TrimBraces\csv@col@body% \toks@\expandafter{\csv@col@body}% - \expandafter\xdef\csname csvcol\roman{csvcol}\endcsname{\the\toks@}% + \expandafter\xdef\csname csvcol\romannumeral\c@csvcol\endcsname{\the\toks@}% \fi% \nextcol% - } +} % comma \def\csv@breakline@A#1,{\csv@breakline@kernel{#1}} \def\csv@scanline@A#1{% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \csv@breakline#1,\csv@termination,% - } +} % semi colon \def\csv@breakline@B#1;{\csv@breakline@kernel{#1}} \def\csv@scanline@B#1{% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \csv@breakline#1;\csv@termination;% - } +} % pipe \def\csv@breakline@C#1|{\csv@breakline@kernel{#1}} \def\csv@scanline@C#1{% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \csv@breakline#1|\csv@termination|% - } +} % tab \catcode`\^^I=12 \def\csv@breakline@D#1^^I{\csv@breakline@kernel{#1}} \def\csv@scanline@D#1{% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \csv@breakline#1^^I\csv@termination^^I% - } +} \catcode`\^^I=10 % expands a CSV line and scans content @@ -140,7 +137,7 @@ \toks@\expandafter{#1}% \edef\@csv@scanline{\noexpand\csv@scanline{\the\toks@}}% \@csv@scanline% - } +} { \catcode`\"=12% @@ -155,7 +152,7 @@ \immediate\openout\csv@out=\csv@csvsorter@token% \immediate\write\csv@out{\string\makeatletter\string\csv@error{Call of CSV-Sorter failed! Use '-shell-escape' option or check log file '\csv@csvsorter@log'.}{}}% \immediate\closeout\csv@out% - \immediate\write18{\csv@csvsorter@command\space + \ShellEscape{\csv@csvsorter@command\space -c \csv@passivquotes#1\csv@passivquotes\space -l \csv@passivquotes\csv@csvsorter@log\csv@passivquotes\space -t \csv@passivquotes\csv@csvsorter@token\csv@passivquotes\space @@ -178,24 +175,23 @@ %---- the loop -\def\csv@AtEndLoop{\csv@addto@macro\@endloophook} +\def\csv@AtEndLoop{\gappto\@endloophook} \let\@endloophook\csv@empty -\def\csv@current@col{\csname csvcol\roman{csvcol}\endcsname} +\def\csv@current@col{\csname csvcol\romannumeral\c@csvcol\endcsname} % auto head names \def\set@csv@autohead{% \toks0=\expandafter{\csname\csv@current@col\endcsname}% - \toks1=\expandafter{\csname csvcol\roman{csvcol}\endcsname}% + \toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}% \edef\csv@temp{\noexpand\gdef\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\noexpand\gdef\the\toks0{}}}% \csv@temp% } - % head names and numbers \def\set@csv@head{% \toks0={\gdef##1}% - \toks1=\expandafter{\csname csvcol\roman{csvcol}\endcsname}% + \toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}% \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\csv@current@col}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}% \csv@temp% \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}% @@ -210,12 +206,12 @@ \else\csv@escanline{\csvline}% \fi% \xdef\csv@columncount{\thecsvcol}% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \loop% - \stepcounter{csvcol}% + \global\advance\c@csvcol 1\relax% \csv@opt@headtocolumnames% \set@csv@head% - \ifnum\thecsvcol<\csv@columncount\repeat% + \ifnum\c@csvcol<\csv@columncount\repeat% \toks@=\expandafter{\csv@columnnames}% \edef\csv@processkeys{\noexpand\pgfkeys{/csv head/.cd,\the\toks@}}% \csv@processkeys% @@ -225,18 +221,18 @@ % head numbers for no head \def\set@csv@nohead{% \toks0={\gdef##1}% - \toks1=\expandafter{\csname csvcol\roman{csvcol}\endcsname}% + \toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}% \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}% \csv@temp% } % no head line \def\csv@noheadline{% - \setcounter{csvcol}{0}% + \global\c@csvcol 0\relax% \loop% - \stepcounter{csvcol}% + \global\advance\c@csvcol 1\relax% \set@csv@nohead% - \ifnum\thecsvcol<\csv@columncount\repeat% + \ifnum\c@csvcol<\csv@columncount\repeat% \toks@=\expandafter{\csv@columnnames}% \edef\csv@processkeys{\noexpand\pgfkeys{/csv head/.cd,\the\toks@}}% \csv@processkeys% @@ -261,9 +257,9 @@ % check columns \def\csv@checkcolumncount{% - \ifnum\thecsvcol=\csv@columncount% + \ifnum\c@csvcol=\csv@columncount\relax% \csv@checkfilter% - \else + \else% \csv@columncounterror% \fi% } @@ -288,9 +284,10 @@ \let\csv@par=\par % reads and processes a CSV file -\def\csvloop#1{% +\long\def\csvloop#1{% % reset \global\let\@endloophook\csv@empty% + \global\let\csvlinetotablerow\csv@assemble@csvlinetotablerow% % options \csvset{default,every csv,#1}% \csv@preprocss% @@ -403,13 +400,15 @@ head to column names/true/.code={\global\let\csv@opt@headtocolumnames=\set@csv@autohead},% head to column names/false/.code={\global\let\csv@opt@headtocolumnames=\csv@empty},% column count/.gstore in=\csv@columncount,% - filter/.code={% - \def\temp{#1}\toks@=\expandafter{\temp}% - \xdef\csv@iffilter{\noexpand\ifthenelse{\the\toks@}}}, + filter/.code={\gdef\csv@iffilter{\ifthenelse{#1}}}, + filter ifthen/.code={\gdef\csv@iffilter{\ifthenelse{#1}}}, + filter test/.code={\gdef\csv@iffilter{#1}}, + filter expr/.code={\gdef\csv@iffilter{\ifboolexpr{#1}}}, no filter/.code={\csvfilteraccept}, filter reject all/.code={\csvfilterreject}, filter accept all/.code={\csvfilteraccept}, before filter/.gstore in=\csv@prefiltercommand, + full filter/.gstore in=\csv@prefiltercommand, before first line/.gstore in=\csv@prefirstline, before line/.code={\gdef\csv@preline{#1}\pgfkeysalso{before first line=#1}}, after first line/.gstore in=\csv@postfirstline, @@ -483,8 +482,10 @@ no head/.style={head=false}, no check column count/.style={check column count=false}, warn on column count error/.style={on column count error={\csv@warning{>\thecsvcol< instead of >\csv@columncount< columns for input line >\thecsvinputline< of file >\csv@ppfilename<}}}, - filter equal/.style 2 args={filter=\equal{#1}{#2}}, - filter not equal/.style 2 args={filter=\not\equal{#1}{#2}}, + filter equal/.style 2 args={filter ifthen=\equal{#1}{#2}}, + filter not equal/.style 2 args={filter ifthen=\not\equal{#1}{#2}}, + filter strcmp/.style 2 args={filter test=\ifcsvstrcmp{#1}{#2}}, + filter not strcmp/.style 2 args={filter test=\ifcsvnotstrcmp{#1}{#2}}, tabular/.style={ @table={\csv@pretable\begin{tabular}{#1}\csv@tablehead}{\csv@tablefoot\end{tabular}\csv@posttable}, late after line=\\}, @@ -727,3 +728,51 @@ \def\csvnames#1#2{\csvset{#1/.style={column names={#2}}}} +% string comparison + +\newrobustcmd{\ifcsvstrequal}[2]{% + \begingroup% + \protected@edef\csv@tempa{#1}% + \protected@edef\csv@tempb{#2}% + \edef\csv@tempa{#1}% + \edef\csv@tempb{#2}% + \ifx\csv@tempa\csv@tempb% + \aftergroup\@firstoftwo% + \else% + \aftergroup\@secondoftwo% + \fi% + \endgroup% +}% + +\newrobustcmd{\ifcsvprostrequal}[2]{% + \begingroup% + \protected@edef\csv@tempa{#1}% + \protected@edef\csv@tempb{#2}% + \ifx\csv@tempa\csv@tempb% + \aftergroup\@firstoftwo% + \else% + \aftergroup\@secondoftwo% + \fi% + \endgroup% +}% + +\AtBeginDocument{% + \ifdefined\pdfstrcmp% + \let\csv@strcmp\pdfstrcmp% + \else\ifdefined\pdf@strcmp% + \let\csv@strcmp\pdf@strcmp% + \fi\fi% + \ifdefined\csv@strcmp% + \newrobustcmd{\ifcsvstrcmp}[2]{% + \ifnum\csv@strcmp{#1}{#2}=\z@\relax% + \expandafter\@firstoftwo% + \else% + \expandafter\@secondoftwo% + \fi% + }% + \else% + \let\ifcsvstrcmp\ifcsvstrequal% + \fi% +} + +\newrobustcmd{\ifcsvnotstrcmp}[4]{\ifcsvstrcmp{#1}{#2}{#4}{#3}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.tlpobj new/tlpkg/tlpobj/csvsimple.tlpobj --- old/tlpkg/tlpobj/csvsimple.tlpobj 2016-04-14 18:54:43.000000000 +0200 +++ new/tlpkg/tlpobj/csvsimple.tlpobj 2017-04-14 17:37:21.000000000 +0200 @@ -1,6 +1,6 @@ name csvsimple category Package -revision 34610 +revision 41597 shortdesc Simple CSV file processing relocated 1 longdesc The package provides a simple LaTeX interface for the @@ -9,11 +9,11 @@ longdesc usage. Filtering and table generation is especially supported; longdesc however, this lightweight tool offers no support for data longdesc sorting or data base storage. -runfiles size=6 +runfiles size=7 RELOC/tex/latex/csvsimple/csvsimple.sty catalogue-also csvtools datatool catalogue-ctan /macros/latex/contrib/csvsimple -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-07-01 18:34:08 +0200 catalogue-license lppl1.3 catalogue-topics data-import data-disp csv-support -catalogue-version 1.12 +catalogue-version 1.20 ++++++ ctable.doc.tar.xz ++++++ ++++++ ctable.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctable.tlpobj new/tlpkg/tlpobj/ctable.tlpobj --- old/tlpkg/tlpobj/ctable.tlpobj 2016-04-14 18:54:44.000000000 +0200 +++ new/tlpkg/tlpobj/ctable.tlpobj 2017-04-14 17:37:21.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/ctable/ctable.sty catalogue-ctan /macros/latex/contrib/ctable -catalogue-date 2015-10-18 21:52:16 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics table float catalogue-version 1.31 ++++++ ctablestack.doc.tar.xz ++++++ ++++++ ctablestack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctablestack.tlpobj new/tlpkg/tlpobj/ctablestack.tlpobj --- old/tlpkg/tlpobj/ctablestack.tlpobj 2016-04-14 18:54:44.000000000 +0200 +++ new/tlpkg/tlpobj/ctablestack.tlpobj 2017-04-14 17:37:22.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/luatex/ctablestack/ctablestack.sty catalogue-ctan /macros/luatex/generic/ctablestack -catalogue-date 2015-10-07 06:44:51 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics luatex catalogue-version 1.0 ++++++ ctan_chk.doc.tar.xz ++++++ ++++++ ctanify.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/ctanify/README new/texmf-dist/doc/latex/ctanify/README --- old/texmf-dist/doc/latex/ctanify/README 2016-01-30 01:35:42.000000000 +0100 +++ new/texmf-dist/doc/latex/ctanify/README 2017-01-17 01:01:06.000000000 +0100 @@ -37,7 +37,7 @@ Copyright and License ===================== -Copyright (C) 2016 Scott Pakin +Copyright (C) 2017 Scott Pakin This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license Binary files old/texmf-dist/doc/latex/ctanify/ctanify.pdf and new/texmf-dist/doc/latex/ctanify/ctanify.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctanify.1 new/texmf-dist/doc/man/man1/ctanify.1 --- old/texmf-dist/doc/man/man1/ctanify.1 2016-02-04 00:03:28.000000000 +0100 +++ new/texmf-dist/doc/man/man1/ctanify.1 2017-04-30 22:33:48.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "CTANIFY 1" -.TH CTANIFY 1 "2016-02-01" "v1.8.2" "" +.TH CTANIFY 1 "2017-04-22" "v1.9.1" "" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -151,6 +151,7 @@ [\fB\-\-tdsdir\fR=\fIdirname\fR ...] [\fB\-\-tex\fR=\fImacro_pkg\fR] [\fB\-\-\fR[\fBno\fR]\fBmiscify\fR] +[\fB\-\-\fR[\fBno\fR]\fBtds\fR] \&\fIfilespec\fR[=\fIdirname\fR] ... .PP ctanify @@ -229,6 +230,9 @@ rename \f(CW\*(C`tex/latex/mypackage/mypackage.sty\*(C'\fR to \&\f(CW\*(C`tex/latex/misc/mypackage.sty\*(C'\fR.) This was common practice in the past but is now strongly discouraged. +.IP "\fB\-nos\fR, \fB\-\-no\-tds\fR" 5 +.IX Item "-nos, --no-tds" +Do not embed a .tds.zip file in the generated tarball. .SH "DIAGNOSTICS" .IX Header "DIAGNOSTICS" .ie n .IP """Failed to copy \f(CIfilename\f(CW (No such file or directory)""" 5 @@ -379,7 +383,7 @@ Scott Pakin, \fIscott+ctify(a)pakin.org\fR .SH "COPYRIGHT AND LICENSE" .IX Header "COPYRIGHT AND LICENSE" -Copyright 2016 Scott Pakin +Copyright 2017 Scott Pakin .PP This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version\ 1.3c of this Binary files old/texmf-dist/doc/man/man1/ctanify.man1.pdf and new/texmf-dist/doc/man/man1/ctanify.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanify.doc.tlpobj new/tlpkg/tlpobj/ctanify.doc.tlpobj --- old/tlpkg/tlpobj/ctanify.doc.tlpobj 2016-04-14 18:54:44.000000000 +0200 +++ new/tlpkg/tlpobj/ctanify.doc.tlpobj 2017-05-01 02:06:51.000000000 +0200 @@ -1,8 +1,8 @@ name ctanify.doc category Package -revision 39569 +revision 44129 shortdesc doc files of ctanify -docfiles size=20 +docfiles size=23 texmf-dist/doc/latex/ctanify/README texmf-dist/doc/latex/ctanify/ctanify.pdf texmf-dist/doc/man/man1/ctanify.1 ++++++ ctanify.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ctanify/ctanify new/texmf-dist/scripts/ctanify/ctanify --- old/texmf-dist/scripts/ctanify/ctanify 2016-02-04 00:03:28.000000000 +0100 +++ new/texmf-dist/scripts/ctanify/ctanify 2017-04-30 22:33:48.000000000 +0200 @@ -19,13 +19,14 @@ use strict; # Define some global variables. -our $VERSION = "1.8.2"; # ctanify version number +our $VERSION = "1.9.1"; # ctanify version number my $progname = basename $0; # Name of this program my $pkgname; # Base name of the package to create my $miscify = 0; # 1=replace singletons with misc; 0=don't my $autoinclude = 1; # 1=automatically include files named in .ins my $skipdroppings = 1; # 1=skip "dropping" files (e.g., "README~") my $unixify = 1; # 1=make text files use Unix line endings +my $maketds = 1; # 1=embed a .tds.zip file; 0=don't my @manifest; # List of files to include my %file2tds; # Map from specific filenames to TDS directories my @tdsdirlist; # Contents of the TDS tree @@ -79,7 +80,7 @@ # This script will convert their line endings to Unix style (a single # linefeed character). my %text_ext = - map {($_ => 1)} qw(afm bib bst cls dtx fd ins ltx mf mp sty tex txt); + map {($_ => 1)} qw(afm bib bst cls dtx fd ins ltx md mf mp sty tex txt); # Define a subroutine that returns the size in bytes of a file, # aborting on error. @@ -147,6 +148,7 @@ "a|auto!" => \$autoinclude, "d|tdsdir=s" => \$tdsoutdir, "T|tex=s" => \$texmacros, + "s|tds!" => \$maketds, "V|version" => \$wantversion, "h|help" => \$wanthelp) || pod2usage(-verbose => 0, @@ -338,6 +340,7 @@ else { $zipname = ""; } +$zipname = "" if !$maketds; chdir $prevdir || die "${progname}: Failed to switch to $prevdir ($!)\n"; rmdir $tdsdir || die "${progname}: Failed to remove $tdsdir ($!)\n"; @@ -408,6 +411,7 @@ [B<--tdsdir>=I<dirname> ...] [B<--tex>=I<macro_pkg>] [B<-->[B<no>]B<miscify>] +[B<-->[B<no>]B<tds>] I<filespec>[=I<dirname>] ... ctanify @@ -509,6 +513,10 @@ C<tex/latex/misc/mypackage.sty>.) This was common practice in the past but is now strongly discouraged. +=item B<-nos>, B<--no-tds> + +Do not embed a .tds.zip file in the generated tarball. + =back @@ -691,7 +699,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright 2016 Scott Pakin +Copyright 2017 Scott Pakin This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either S<version 1.3c> of this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanify.tlpobj new/tlpkg/tlpobj/ctanify.tlpobj --- old/tlpkg/tlpobj/ctanify.tlpobj 2016-04-14 18:54:44.000000000 +0200 +++ new/tlpkg/tlpobj/ctanify.tlpobj 2017-05-01 02:06:51.000000000 +0200 @@ -1,21 +1,24 @@ name ctanify category Package -revision 39569 +revision 44129 shortdesc Prepare a package for upload to CTAN longdesc Given a list of filenames, ctanify creates a tarball (a .tar.gz -longdesc file) with the files laid out in CTAN's preferred structure. -longdesc The tarball additionally contains a ZIP (.zip) file with copies -longdesc of all files laid out in the standard TeX Directory Structure -longdesc (TDS), which may be used by those intending to install the -longdesc package, or by those who need to incorporate it in a -longdesc distribution. (The TDS ZIP file will be installed in the CTAN -longdesc install/ tree.) +longdesc file) with the files laid out in CTAN's preferred structure. By +longdesc default this tarball additionally contains a ZIP (.zip) file +longdesc with copies of all files laid out in the standard TeX Directory +longdesc Structure (TDS), which may be used by those intending to +longdesc install the package, or by those who need to incorporate it in +longdesc a distribution. (The TDS ZIP file will be installed in the CTAN +longdesc install/ tree.) Given that CTAN and TeX Live are not fond of +longdesc .tds.zip files for small and/or otherwise straightforward +longdesc packages, ctanify has now been provided with an option that +longdesc prevents the creation and inclusion of such a .tds.zip file. depend ctanify.ARCH runfiles size=6 texmf-dist/scripts/ctanify/ctanify catalogue-also ctanupload catalogue-ctan /support/ctanify -catalogue-date 2016-02-02 06:07:40 +0100 -catalogue-license lppl1.3 +catalogue-date 2017-04-23 06:09:52 +0200 +catalogue-license lppl1.3c catalogue-topics ctan -catalogue-version 1.8.2 +catalogue-version 1.9.1 ++++++ ctanupload.doc.tar.xz ++++++ ++++++ ctanupload.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanupload.tlpobj new/tlpkg/tlpobj/ctanupload.tlpobj --- old/tlpkg/tlpobj/ctanupload.tlpobj 2016-04-14 18:54:45.000000000 +0200 +++ new/tlpkg/tlpobj/ctanupload.tlpobj 2017-04-14 17:37:22.000000000 +0200 @@ -12,7 +12,7 @@ texmf-dist/scripts/ctanupload/ctanupload.pl catalogue-also ctanify catalogue-ctan /support/ctanupload -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics ctan catalogue-version 1.2c ++++++ ctex-faq.doc.tar.xz ++++++ ++++++ ctex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ctex/README.md new/doc/latex/ctex/README.md --- old/doc/latex/ctex/README.md 2016-05-15 00:03:09.000000000 +0200 +++ new/doc/latex/ctex/README.md 2017-02-23 01:01:03.000000000 +0100 @@ -26,7 +26,7 @@ Copyright and Licence --------------------- - Copyright (C) 2003--2016 + Copyright (C) 2003--2017 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- Binary files old/doc/latex/ctex/ctex.pdf and new/doc/latex/ctex/ctex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctex.doc.tlpobj new/tlpkg/tlpobj/ctex.doc.tlpobj --- old/tlpkg/tlpobj/ctex.doc.tlpobj 2016-05-16 00:51:40.000000000 +0200 +++ new/tlpkg/tlpobj/ctex.doc.tlpobj 2017-04-14 17:37:22.000000000 +0200 @@ -1,8 +1,8 @@ name ctex.doc category Package -revision 41156 +revision 43669 shortdesc doc files of ctex relocated 1 -docfiles size=260 +docfiles size=264 RELOC/doc/latex/ctex/README.md RELOC/doc/latex/ctex/ctex.pdf ++++++ ctex.tar.xz ++++++ ++++ 6324 lines of diff (skipped) ++++++ ctib.doc.tar.xz ++++++ ++++++ ctib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctib.tlpobj new/tlpkg/tlpobj/ctib.tlpobj --- old/tlpkg/tlpobj/ctib.tlpobj 2016-04-14 18:54:47.000000000 +0200 +++ new/tlpkg/tlpobj/ctib.tlpobj 2017-04-14 17:37:23.000000000 +0200 @@ -24,6 +24,6 @@ RELOC/tex/latex/ctib/lctctib.fd RELOC/tex/latex/ctib/lctenc.def catalogue-ctan /language/tibetan/ctib -catalogue-date 2015-08-03 08:55:55 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics tibetan ++++++ ctie.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctie.1 new/texmf-dist/doc/man/man1/ctie.1 --- old/texmf-dist/doc/man/man1/ctie.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/ctie.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH CTIE 1 "7 April 2010" "Web2C 2016" +.TH CTIE 1 "7 April 2010" "Web2C 2017" .\"===================================================================== .SH NAME ctie \- merge or apply CWEB change files Binary files old/texmf-dist/doc/man/man1/ctie.man1.pdf and new/texmf-dist/doc/man/man1/ctie.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctie.doc.tlpobj new/tlpkg/tlpobj/ctie.doc.tlpobj --- old/tlpkg/tlpobj/ctie.doc.tlpobj 2016-04-27 03:16:39.000000000 +0200 +++ new/tlpkg/tlpobj/ctie.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,7 +1,7 @@ name ctie.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of ctie -docfiles size=6 +docfiles size=3 texmf-dist/doc/man/man1/ctie.1 texmf-dist/doc/man/man1/ctie.man1.pdf ++++++ cuisine.doc.tar.xz ++++++ ++++++ cuisine.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cuisine.tlpobj new/tlpkg/tlpobj/cuisine.tlpobj --- old/tlpkg/tlpobj/cuisine.tlpobj 2016-04-14 18:54:51.000000000 +0200 +++ new/tlpkg/tlpobj/cuisine.tlpobj 2017-04-14 17:37:25.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/cuisine/cuisine.sty catalogue-also recipe catalogue-ctan /macros/latex/contrib/cuisine -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 0.7 ++++++ currfile.doc.tar.xz ++++++ ++++++ currfile.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/currfile.tlpobj new/tlpkg/tlpobj/currfile.tlpobj --- old/tlpkg/tlpobj/currfile.tlpobj 2016-04-25 03:14:22.000000000 +0200 +++ new/tlpkg/tlpobj/currfile.tlpobj 2017-04-14 17:37:25.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/currfile/currfile-abspath.sty RELOC/tex/latex/currfile/currfile.sty catalogue-ctan /macros/latex/contrib/currfile -catalogue-date 2016-04-23 21:11:00 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-tool catalogue-version 0.7c ++++++ currvita.doc.tar.xz ++++++ ++++++ currvita.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/currvita.tlpobj new/tlpkg/tlpobj/currvita.tlpobj --- old/tlpkg/tlpobj/currvita.tlpobj 2016-04-14 18:54:51.000000000 +0200 +++ new/tlpkg/tlpobj/currvita.tlpobj 2017-04-14 17:37:25.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/currvita/currvita.sty catalogue-also curve cv esieecv europecv vita catalogue-ctan /macros/latex/contrib/currvita -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics cv ++++++ cursolatex.doc.tar.xz ++++++ ++++++ curve.doc.tar.xz ++++++ ++++++ curve.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/curve.tlpobj new/tlpkg/tlpobj/curve.tlpobj --- old/tlpkg/tlpobj/curve.tlpobj 2016-04-14 18:54:57.000000000 +0200 +++ new/tlpkg/tlpobj/curve.tlpobj 2017-04-14 17:37:27.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/tex/latex/curve/curve.cls catalogue-also currvita cv esieecv europecv vita catalogue-ctan /macros/latex/contrib/curve -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics cv class catalogue-version 1.16 ++++++ curve2e.doc.tar.xz ++++++ ++++++ curve2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/curve2e.tlpobj new/tlpkg/tlpobj/curve2e.tlpobj --- old/tlpkg/tlpobj/curve2e.tlpobj 2016-04-14 18:54:57.000000000 +0200 +++ new/tlpkg/tlpobj/curve2e.tlpobj 2017-04-14 17:37:28.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=8 RELOC/tex/latex/curve2e/curve2e.sty catalogue-ctan /macros/latex/contrib/curve2e -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-in-tex graphics-curve catalogue-version 1.60 ++++++ curves.doc.tar.xz ++++++ ++++++ curves.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/curves.tlpobj new/tlpkg/tlpobj/curves.tlpobj --- old/tlpkg/tlpobj/curves.tlpobj 2016-04-14 18:54:58.000000000 +0200 +++ new/tlpkg/tlpobj/curves.tlpobj 2017-04-14 17:37:28.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/curves/curves.sty RELOC/tex/latex/curves/curvesls.sty catalogue-ctan /macros/latex/contrib/curves -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 graphics-curve catalogue-version 1.53 ++++++ custom-bib.doc.tar.xz ++++++ ++++++ custom-bib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/custom-bib.tlpobj new/tlpkg/tlpobj/custom-bib.tlpobj --- old/tlpkg/tlpobj/custom-bib.tlpobj 2016-04-14 18:54:58.000000000 +0200 +++ new/tlpkg/tlpobj/custom-bib.tlpobj 2017-04-14 17:37:28.000000000 +0200 @@ -32,7 +32,7 @@ RELOC/tex/latex/custom-bib/suppjour.mbs RELOC/tex/latex/custom-bib/svenska.mbs catalogue-ctan /macros/latex/contrib/custom-bib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty catalogue-version 4.33 ++++++ cutwin.doc.tar.xz ++++++ ++++++ cutwin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cutwin.tlpobj new/tlpkg/tlpobj/cutwin.tlpobj --- old/tlpkg/tlpobj/cutwin.tlpobj 2016-04-14 18:54:59.000000000 +0200 +++ new/tlpkg/tlpobj/cutwin.tlpobj 2017-04-14 17:37:29.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/cutwin/cutwin.sty catalogue-ctan /macros/latex/contrib/cutwin -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-flow catalogue-version 0.1 ++++++ cv.doc.tar.xz ++++++ ++++++ cv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cv.tlpobj new/tlpkg/tlpobj/cv.tlpobj --- old/tlpkg/tlpobj/cv.tlpobj 2016-04-14 18:54:59.000000000 +0200 +++ new/tlpkg/tlpobj/cv.tlpobj 2017-04-14 17:37:29.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/cv/CV.sty catalogue-also moderncv curve catalogue-ctan /macros/latex/contrib/cv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics cv class ++++++ cv4tw.doc.tar.xz ++++++ ++++++ cv4tw.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cv4tw.tlpobj new/tlpkg/tlpobj/cv4tw.tlpobj --- old/tlpkg/tlpobj/cv4tw.tlpobj 2016-04-14 18:54:59.000000000 +0200 +++ new/tlpkg/tlpobj/cv4tw.tlpobj 2017-04-14 17:37:29.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/cv4tw/cv4tw.cls catalogue-also moderncv curve catalogue-ctan /macros/latex/contrib/cv4tw -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 class catalogue-version 0.2 ++++++ cweb-latex.doc.tar.xz ++++++ ++++++ cweb-latex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cweb-latex.tlpobj new/tlpkg/tlpobj/cweb-latex.tlpobj --- old/tlpkg/tlpobj/cweb-latex.tlpobj 2016-04-14 18:55:00.000000000 +0200 +++ new/tlpkg/tlpobj/cweb-latex.tlpobj 2017-04-14 17:37:29.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/cweb-latex/cwebbase.tex RELOC/tex/latex/cweb-latex/keyvald.sty catalogue-ctan /macros/latex/contrib/cweb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics litprog ++++++ cweb.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/ctangle.man1.pdf and new/texmf-dist/doc/man/man1/ctangle.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/cweave.man1.pdf and new/texmf-dist/doc/man/man1/cweave.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/cweb.1 new/texmf-dist/doc/man/man1/cweb.1 --- old/texmf-dist/doc/man/man1/cweb.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/cweb.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH CWEB 1 "7 April 2010" "Web2C 2016" +.TH CWEB 1 "7 April 2010" "Web2C 2017" .\"===================================================================== .SH NAME ctangle, cweave \- translate CWEB to C and/or TeX Binary files old/texmf-dist/doc/man/man1/cweb.man1.pdf and new/texmf-dist/doc/man/man1/cweb.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cweb.doc.tlpobj new/tlpkg/tlpobj/cweb.doc.tlpobj --- old/tlpkg/tlpobj/cweb.doc.tlpobj 2016-04-27 03:16:39.000000000 +0200 +++ new/tlpkg/tlpobj/cweb.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,8 +1,8 @@ name cweb.doc category Package -revision 40768 +revision 44166 shortdesc doc files of cweb -docfiles size=59 +docfiles size=47 texmf-dist/doc/man/man1/ctangle.1 texmf-dist/doc/man/man1/ctangle.man1.pdf texmf-dist/doc/man/man1/cweave.1 ++++++ cweb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/plain/cweb/cwebmac.tex new/texmf-dist/tex/plain/cweb/cwebmac.tex --- old/texmf-dist/tex/plain/cweb/cwebmac.tex 2016-01-21 00:07:28.000000000 +0100 +++ new/texmf-dist/tex/plain/cweb/cwebmac.tex 2017-01-29 01:01:12.000000000 +0100 @@ -1,8 +1,8 @@ % standard macros for CWEB listings (in addition to plain.tex) -% Version 3.68 --- January 2016 +% Version 3.69 --- February 2016 \ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros -\xdef\fmtversion{\fmtversion+CWEB3.68} -\chardef\cwebversion=3 \chardef\cwebrevision=68 +\xdef\fmtversion{\fmtversion+CWEB3.69} +\chardef\cwebversion=3 \chardef\cwebrevision=69 \newif\ifpdf \ifx\pdf+\pdftrue\fi % Uncomment the following line if you want PDF goodies to be the default @@ -10,7 +10,11 @@ \def\pdflinkcolor{0 0 1} % the RGB values for hyperlink color \newif\ifpdftex \ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse -\else \pdftextrue \pdfoutput=1 \input pdfcolor \let\setcolor\pdfsetcolor \fi\fi +%\else \pdftextrue \pdfoutput=1 \input pdfcolor \let\setcolor\pdfsetcolor \fi\fi +\else \pdftextrue \pdfoutput=1 % changed in 3.69 + \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too + \def\Blue{\pdfliteral{0 0 1 rg 0 0 1 RG}} +\fi\fi \newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi \let\:=\. % preserve a way to get the dot accent @@ -136,7 +140,7 @@ \ifpdftex \ifx\pdfannotlink\undefined\let\pdfannotlink\pdfstartlink\fi% for pdfTeX 0.14 \def\pdflink#1#2{\hbox{\pdfannotlink height\ht\strutbox depth\dp\strutbox - attr{/Border [0 0 0]} goto num #1 \BlueGreen #1\Black\pdfendlink}} + attr{/Border [0 0 0]} goto num #1 \Blue #1\Black\pdfendlink}} % changed 3.69 \else\def\pdflink#1#2{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight depth \thedepth << /Type /Annot /Subtype /Link @@ -166,7 +170,7 @@ \def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A - << /S /URI /URI (#2) >>}\BlueGreen #1\Black \pdfendlink + << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69 \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight \space depth \thedepth\space << /Border [0 0 0] @@ -473,7 +477,7 @@ \def\I{\par\hangindent 2em}\let\*=* \ifacro \def\outsecname{Names of the sections} \let\Xpdf\X % \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 - \ifpdftex \pdfdest name {NOS} fitb % changed in version 3.68 + \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69 \pdfoutline goto name {NOS} count -\secno {\outsecname} \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.% {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cweb.tlpobj new/tlpkg/tlpobj/cweb.tlpobj --- old/tlpkg/tlpobj/cweb.tlpobj 2016-04-27 03:16:40.000000000 +0200 +++ new/tlpkg/tlpobj/cweb.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name cweb category Package -revision 40768 +revision 44166 shortdesc A Web system in C longdesc The Cweb system is a system for Structured Software longdesc Documentation (also known as Literate Programming) in the @@ -19,7 +19,7 @@ texmf-dist/tex/plain/cweb/pdficwebmac.tex texmf-dist/tex/plain/cweb/pdfwebmac.tex catalogue-ctan /web/c_cpp/cweb -catalogue-date 2016-02-25 04:09:01 +0100 +catalogue-date 2017-02-21 20:21:05 +0100 catalogue-license knuth catalogue-topics litprog -catalogue-version 3.64af +catalogue-version 3.64b ++++++ cyber.doc.tar.xz ++++++ ++++++ cyber.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyber.tlpobj new/tlpkg/tlpobj/cyber.tlpobj --- old/tlpkg/tlpobj/cyber.tlpobj 2016-04-14 18:55:05.000000000 +0200 +++ new/tlpkg/tlpobj/cyber.tlpobj 2017-04-14 17:37:31.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/cyber/cyber.sty catalogue-ctan /macros/latex/contrib/cyber -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics doc-supp catalogue-version 2.1 ++++++ cybercic.doc.tar.xz ++++++ ++++++ cybercic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cybercic.tlpobj new/tlpkg/tlpobj/cybercic.tlpobj --- old/tlpkg/tlpobj/cybercic.tlpobj 2016-04-14 18:55:06.000000000 +0200 +++ new/tlpkg/tlpobj/cybercic.tlpobj 2017-04-14 17:37:31.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/cybercic/cybercic.sty catalogue-ctan /macros/latex/contrib/cybercic -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics doc-supp toc-etc catalogue-version 2.1 ++++++ cyklop.doc.tar.xz ++++++ ++++++ cyklop.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyklop.tlpobj new/tlpkg/tlpobj/cyklop.tlpobj --- old/tlpkg/tlpobj/cyklop.tlpobj 2016-04-14 18:55:06.000000000 +0200 +++ new/tlpkg/tlpobj/cyklop.tlpobj 2017-04-14 17:37:31.000000000 +0200 @@ -91,7 +91,7 @@ RELOC/tex/latex/cyklop/t1cyklop.fd RELOC/tex/latex/cyklop/t5cyklop.fd catalogue-ctan /fonts/cyklop -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gfl catalogue-topics font font-sans font-otf font-type1 catalogue-version 0.915 ++++++ cyrillic-bin.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/rubibtex.man1.pdf and new/texmf-dist/doc/man/man1/rubibtex.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/rumakeindex.man1.pdf and new/texmf-dist/doc/man/man1/rumakeindex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj --- old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2016-04-27 03:16:41.000000000 +0200 +++ new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,8 +1,8 @@ name cyrillic-bin.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of cyrillic-bin -docfiles size=12 +docfiles size=6 texmf-dist/doc/man/man1/rubibtex.1 texmf-dist/doc/man/man1/rubibtex.man1.pdf texmf-dist/doc/man/man1/rumakeindex.1 ++++++ cyrillic-bin.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.tlpobj new/tlpkg/tlpobj/cyrillic-bin.tlpobj --- old/tlpkg/tlpobj/cyrillic-bin.tlpobj 2016-04-27 03:16:41.000000000 +0200 +++ new/tlpkg/tlpobj/cyrillic-bin.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name cyrillic-bin category TLCore -revision 40768 +revision 44166 shortdesc Cyrillic bibtex and makeindex. depend cyrillic-bin.ARCH runfiles size=2 ++++++ cyrillic.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic.doc.tlpobj new/tlpkg/tlpobj/cyrillic.doc.tlpobj --- old/tlpkg/tlpobj/cyrillic.doc.tlpobj 2016-04-14 18:55:07.000000000 +0200 +++ new/tlpkg/tlpobj/cyrillic.doc.tlpobj 2017-04-14 17:37:32.000000000 +0200 @@ -1,6 +1,6 @@ name cyrillic.doc category Package -revision 40218 +revision 42428 shortdesc doc files of cyrillic relocated 1 docfiles size=291 ++++++ cyrillic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic.tlpobj new/tlpkg/tlpobj/cyrillic.tlpobj --- old/tlpkg/tlpobj/cyrillic.tlpobj 2016-04-14 18:55:08.000000000 +0200 +++ new/tlpkg/tlpobj/cyrillic.tlpobj 2017-04-14 17:37:32.000000000 +0200 @@ -1,6 +1,6 @@ name cyrillic category Package -revision 40218 +revision 42428 catalogue latex-cyrillic shortdesc Support for Cyrillic fonts in LaTeX relocated 1 @@ -120,6 +120,6 @@ RELOC/tex/latex/cyrillic/x2lcmss.fd RELOC/tex/latex/cyrillic/x2lcmtt.fd catalogue-ctan /macros/latex/required/cyrillic -catalogue-date 2016-02-05 09:28:32 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cyrillic ++++++ cyrplain.tar.xz ++++++ ++++++ dad.doc.tar.xz ++++++ ++++++ dad.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dad.tlpobj new/tlpkg/tlpobj/dad.tlpobj --- old/tlpkg/tlpobj/dad.tlpobj 2016-04-14 18:55:09.000000000 +0200 +++ new/tlpkg/tlpobj/dad.tlpobj 2017-04-14 17:37:32.000000000 +0200 @@ -31,7 +31,7 @@ RELOC/tex/lualatex/dad/T1dad.fd RELOC/tex/lualatex/dad/dad.sty catalogue-ctan /language/arabic/dad -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics arabic luatex font-type1 catalogue-version 1.1 ++++++ dancers.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dancers.tlpobj new/tlpkg/tlpobj/dancers.tlpobj --- old/tlpkg/tlpobj/dancers.tlpobj 2016-04-14 18:55:15.000000000 +0200 +++ new/tlpkg/tlpobj/dancers.tlpobj 2017-04-14 17:37:35.000000000 +0200 @@ -1,7 +1,7 @@ name dancers category Package revision 13293 -shortdesc Font for Conan Doyle'ss "The Dancing Men" +shortdesc Font for Conan Doyle's "The Dancing Men" relocated 1 longdesc The (Sherlock Holmes) book contains a code which uses dancing longdesc men as glyphs. The alphabet as given is not complete, lacking @@ -20,6 +20,6 @@ RELOC/fonts/source/public/dancers/dancers.mf RELOC/fonts/tfm/public/dancers/dancers.tfm catalogue-ctan /fonts/dancers -catalogue-date 2015-12-27 20:31:23 +0100 +catalogue-date 2016-06-30 21:37:14 +0200 catalogue-license other-free catalogue-topics font font-mf font-novelty ++++++ dantelogo.doc.tar.xz ++++++ ++++++ dantelogo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dantelogo.tlpobj new/tlpkg/tlpobj/dantelogo.tlpobj --- old/tlpkg/tlpobj/dantelogo.tlpobj 2016-04-14 18:55:15.000000000 +0200 +++ new/tlpkg/tlpobj/dantelogo.tlpobj 2017-04-14 17:37:35.000000000 +0200 @@ -34,7 +34,7 @@ RELOC/tex/latex/dantelogo/T1DANTE.fd RELOC/tex/latex/dantelogo/dantelogo.sty catalogue-ctan /fonts/dantelogo -catalogue-date 2015-10-09 15:31:36 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-otf font-type1 catalogue-version 0.03 ++++++ dashbox.doc.tar.xz ++++++ ++++++ dashbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashbox.tlpobj new/tlpkg/tlpobj/dashbox.tlpobj --- old/tlpkg/tlpobj/dashbox.tlpobj 2016-04-14 18:55:16.000000000 +0200 +++ new/tlpkg/tlpobj/dashbox.tlpobj 2017-04-14 17:37:35.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/dashbox/dashbox.sty catalogue-ctan /macros/latex/contrib/dashbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics boxing catalogue-version 1.14 ++++++ dashrule.doc.tar.xz ++++++ ++++++ dashrule.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashrule.tlpobj new/tlpkg/tlpobj/dashrule.tlpobj --- old/tlpkg/tlpobj/dashrule.tlpobj 2016-04-14 18:55:16.000000000 +0200 +++ new/tlpkg/tlpobj/dashrule.tlpobj 2017-04-14 17:37:35.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=1 RELOC/tex/latex/dashrule/dashrule.sty catalogue-ctan /macros/latex/contrib/dashrule -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics line-patt catalogue-version 1.3 ++++++ dashundergaps.doc.tar.xz ++++++ ++++++ dashundergaps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashundergaps.tlpobj new/tlpkg/tlpobj/dashundergaps.tlpobj --- old/tlpkg/tlpobj/dashundergaps.tlpobj 2016-04-14 18:55:16.000000000 +0200 +++ new/tlpkg/tlpobj/dashundergaps.tlpobj 2017-04-14 17:37:36.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/dashundergaps/dashundergaps.sty catalogue-ctan /macros/latex/contrib/dashundergaps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics underline line-patt catalogue-version 1.2 ++++++ dataref.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dataref/README new/doc/latex/dataref/README --- old/doc/latex/dataref/README 2013-12-18 23:01:05.000000000 +0100 +++ new/doc/latex/dataref/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -dataref -======= - -Writing scientific texts is a craft. It is the craft of communicating your results to -your colleagues and to the curious world public. Often your conclusions are based -upon facts and numbers that you gathered during your research for the specific -topic. You might have done many experiments and produced lot of data. The -craft of writing is to guide your reader through a narrative that is based upon -that data. But there may be many versions of that data. Perhaps you found a -problem in your experiment, while already writing, that forces you back into the -laboratory. After a while, the moon has done its circle many times, you return -from that dark place and your methodology has improved as significantly as your -data has. But now you have to rewrite that parts of the data, that reference the -old data points. -The dataref is here to help you with managing your data points. It provides -you with macro style keys, that represent symbolic names for your datapints. -You can reference those symbolic names with \dref, use them in calculations -to have always up-to-date percentage values, define projections between sets of -data points and document them. dataref also introduces the notion of assertions -(\drefassert) for your results to ensure that your prosa text references fit the -underlying data. - -Building the documentation -========================== -With latexmk installed: - - make - -or - - make dataref.sty; pdflatex dataref.dtx; pdflatex dataref.dtx; pdflatex dataref.dtx - - -Examples -======== - -Setting symbolic data points - - \drefset{/count}{42} - \drefset{/abc}{23} - -Referencing them with \dref, \drefcalc, \drefassert - - \dref{/count} => 42 - \drefcalc{data("/abc") / data("/count")} => 0.55 - \drefassert{data("/abc") < data("/count")} - -Getting the latest version -========================== - -dataref is hosted at github: https://github.com/stettberger/dataref \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dataref/README.md new/doc/latex/dataref/README.md --- old/doc/latex/dataref/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dataref/README.md 2017-01-07 00:01:04.000000000 +0100 @@ -0,0 +1,51 @@ +dataref +======= + +Writing scientific texts is a craft. It is the craft of communicating your results to +your colleagues and to the curious world public. Often your conclusions are based +upon facts and numbers that you gathered during your research for the specific +topic. You might have done many experiments and produced lot of data. The +craft of writing is to guide your reader through a narrative that is based upon +that data. But there may be many versions of that data. Perhaps you found a +problem in your experiment, while already writing, that forces you back into the +laboratory. After a while, the moon has done its circle many times, you return +from that dark place and your methodology has improved as significantly as your +data has. But now you have to rewrite that parts of the data, that reference the +old data points. +The dataref is here to help you with managing your data points. It provides +you with macro style keys, that represent symbolic names for your datapints. +You can reference those symbolic names with \dref, use them in calculations +to have always up-to-date percentage values, define projections between sets of +data points and document them. dataref also introduces the notion of assertions +(\drefassert) for your results to ensure that your prosa text references fit the +underlying data. + +Building the documentation +========================== +With latexmk installed: + + make + +or + + pdflatex dataref.tex; pdflatex dataref.tex; pdflatex dataref.tex + + +Examples +======== + +Setting symbolic data points + + \drefset{/count}{42} + \drefset{/abc}{23} + +Referencing them with \dref, \drefcalc, \drefassert + + \dref{/count} => 42 + \drefcalc{data("/abc") / data("/count")} => 0.55 + \drefassert{data("/abc") < data("/count")} + +Getting the latest version +========================== + +dataref is hosted at github: https://github.com/stettberger/dataref Binary files old/doc/latex/dataref/dataref-doc.pdf and new/doc/latex/dataref/dataref-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dataref/dataref-doc.tex new/doc/latex/dataref/dataref-doc.tex --- old/doc/latex/dataref/dataref-doc.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/dataref/dataref-doc.tex 2017-01-07 00:01:04.000000000 +0100 @@ -0,0 +1,735 @@ +% Copyright (c) 2013-2017 Christian Dietrich +% +% 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 Christian Dietrich +% +% This work consists of the files dataref.tex and dataref.sty + +\documentclass{ltxdoc} +\usepackage[usagereport]{dataref}[2017/01/06] + +\EnableCrossrefs +\CodelineIndex +\RecordChanges + +\usepackage{verbatim} +\usepackage{listings} +\usepackage{pdfcomment} +\usepackage{siunitx} +\usepackage{xspace} +\usepackage{pgffor} +\usepackage{filecontents} +\usepackage{tikz} +\usetikzlibrary{positioning, arrows} + +\begin{filecontents}{datapoints.tex} +\drefset{/control group/mice race}{Black Six} +\drefset{/control group/mice count}{32} +\drefset{/control group/dead after 24h}{4} +\drefset{/control group/dead after 48h}{7} +\drefset{/control group/recovered}{21} + +\drefset{/med A/mice race}{Black Six} +\drefset{/med A/mice count}{32} +\drefset{/med A/dead after 24h}{6} +\drefset{/med A/dead after 48h}{12} +\drefset{/med A/recovered}{20} + +\drefsethelp{.*/mice race}{The mice race used for experiments heavily + influences the outcome of the results} + +\drefsethelp{.*/(dead after|recovered)}{Of all infected mice, a + certain number died within a specified period of time. A certain + recovered from the infection. The dead categories are cumulative and +include all dead mice before.} +\end{filecontents} +\input{datapoints} +% \OnlyDescription +\drefkeys{prefix=/foo,value=123,save=/foo} +\drefset{/override test}{2} +\begin{document} +\drefsave{/override test}{4} +\drefkeys{prefix=} + +\parskip=1ex +\parindent=0pt + +\CheckSum{0} + + + \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 \~} + + + \changes{v0.6}{2016/11/15}{Units, Unit Scaling, general overhaul} + \changes{v0.4}{2015/04/21}{Remove Spurious Whitespaces} + \changes{v0.1}{2013/12/06}{Initial version} + + \DoNotIndex{\newcommand,\newenvironment} + + \makeatletter + \def\colorfirsttoken#1#2{\bgroup\expandafter\color{#1}\cmd{#2}\egroup} + \def\Macro@Name#1#2\@nnil{\string#1} + +\renewcommand{\meta}[1]{\bgroup\color{green!40!black}$\langle$\textit{#1}$\rangle$\egroup} +\newcommand{\Macro}[2][]{% + \noindent\hspace{-\marginparwidth}% + \hypertarget{\Macro@Name#2\@nnil}{% + \mbox{\colorfirsttoken{blue!50!black}#2}} \hfill\mbox{#1}\par} + \newcommand{\Option}[2][]{% + \noindent\hspace{-\marginparwidth}% + \mbox{\color{red!50!black}#2} \hfill\mbox{#1}\par} + + \newcommand{\option}[1]{% + \bgroup\color{red!50!black}#1\egroup\xspace + } + + \renewcommand{\macro}[1]{% + \hyperlink{\Macro@Name#1\@nnil}{\bgroup\color{blue!50!black}\cmd#1\egroup}\xspace + } + \makeatother + + \colorlet{examplefill}{yellow!80!black} + \definecolor{codebackground}{rgb}{0.9,0.9,1} + \newdimen\examplewidth + \newsavebox{\codebox} + \newenvironment{example}[1][\marginparwidth-12pt] + {\begin{lrbox}{\codebox}\begin{minipage}{#1-2\fboxsep}} + {\end{minipage}\end{lrbox}% + \examplewidth=\wd\codebox% + \addtolength{\examplewidth}{-\marginparwidth+15pt}% + \global\examplewidth=\examplewidth% + \noindent\hspace{-\marginparwidth}\colorbox{examplefill}{\usebox{\codebox}}\hspace{12pt}} + + \newenvironment{codeexample} + {\begin{lrbox}{\codebox}\begin{minipage}{\textwidth-\examplewidth-2\fboxsep}} +{\end{minipage}\end{lrbox}\noindent\colorbox{codebackground}{\usebox{\codebox}}\global\examplewidth=0pt% +\par\vspace{1em}}% + + + \newcommand{\dataref}{\textsc{dataref}\xspace} + \providecommand*{\url}{\texttt} + \GetFileInfo{dataref.sty} + \title{The \textsf{dataref} package} + \author{Christian Dietrich 2013-2016\\ \url{stettberger(a)dokucode.de}\\ + \url{https://github.com/stettberger/dataref}} + \date{\filedate~\fileversion} + + \maketitle + + \section{Introduction} + + Writing scientific texts is a craft. It is the craft of communicating your results to your + colleagues and to the curious world public. Often your conclusions are based upon facts and + numbers that you gathered during your research for the specific topic. You might have done many + experiments and produced lot of data. The craft of writing is to guide your reader through a + narrative that is based upon that data. But there may be many versions of that data. Perhaps you + found a problem in your experiment, while already writing, that forces you back into the + laboratory. After a while, the moon has done its circle many times, you return from that dark + place and your methodology has improved as significantly as your data has. But now you have to + rewrite that parts of the data that reference the old data points. + + The \textsf{dataref} is here to help you with managing your data points. It provides you with + macro style keys that represent symbolic names for your data points. You can reference those + symbolic names with \macro{\dref}, use them in calculations to have always up-to-date percentage + values, define projections between sets of data points and document them. \textsf{dataref} also + introduces the notion of assertions (\macro{\drefassert}) for your results to ensure that your prosa + text references fit the underlying data. + + \section{Usage (or \dref*{/control group/mice count} mice)} + + \begin{example} + From the \dref{/med A/mice count} mice in the experiment, \drefcalc[prefix=/med A]{d(/mice + count)-d(/recovered)} died. + \end{example} + \begin{codeexample} + \verb|\drefset{/med A/mice count}{32}|\\ + \verb|\drefset{/med A/recovered}{20}|\\ + \verb|From the \dref{/med A/mice count} mice in the experiment, |\\ + \verb|\drefcalc[prefix=/med A]{d(/mice count)-d(/recovered)} died.| + \end{codeexample} + + \subsection{Design Principles} + + Before we jump into the description of \dataref, let us look a little bit into the design principles of \dataref. By + understanding the principles, you will be more productive and embedding data into your document will become easier. + + First of all, \dataref is built on top of \textsf{pgfkeys} and \textsf{pgfmath} from the PGF/TiKZ macro packages. While + the former provides a usable user interface to provide options to \dataref, the later is used to perform computation on + your datapoints. If you are interested into these two excellent \TeX{} packages, please look at \texttt{texdoc + pgfmanual} for further information. + + There are two aspects of \dataref: setting datapoints and referencing datapoints. While setting datapoints is kind of + boring, we have a wide variety of options when it comes to referencing. The expansion of datapoints is done in + multiples phases (see Figure~\ref{fig:pipeline}). + + + \begin{figure}[t] + \begin{tikzpicture}[node distance=0.5cm] + \tikzstyle{phase}=[draw,minimum width=1.5cm, fill=green!20!white]; + \tikzstyle{desc}=[align=left, text width=3cm,anchor=#1,draw]; + + + \node[phase](@init){@init}; + \node[phase,right=of @init](@options){@options}; + \node[phase,right=of @options](@get){@get}; + \node[phase,right=of @get](@calc){@calc}; + \node[phase,right=of @calc](@print){@print}; + \node[phase,right=of @print](@set){@set}; + + \draw[>=latex'] + (@init) edge[->] (@options) + (@options) edge[->] (@get) + (@get) edge[->] (@calc) + (@calc) edge[->] (@print) + (@print) edge[->] (@set); + + \draw[ultra thin,shorten <=2pt] (@init) -- ++(75:1cm) + node[desc=south] {Set up a clean working environment.}; + + \draw[ultra thin,shorten <=2pt] (@options) -- ++(-140:1.5cm) + node[desc=north] {Parse the user-defined options and fill up all subsequent phases.}; + + \draw[ultra thin,shorten <=2pt] (@get) -- ++(95:1cm) + node[desc=south] {Load the main datapoint into \macro{\drefresult} and reference it.}; + + \draw[ultra thin,shorten <=2pt] (@calc) -- ++(-140:1.5cm) + node[desc=north] {Perform calculations on the main datapoint, including unit scaling.}; + + \draw[ultra thin,shorten <=2pt] (@print) -- ++(95:1.5cm) + node[desc=south] {Format and insert the result into the document body.}; + + \draw[ultra thin,shorten <=2pt] (@set) -- ++(-140:1.5cm) + node[desc=north] {Save the result as a datapoint or macro.}; + + \end{tikzpicture} + \caption{The \dataref Pipeline}\label{fig:pipeline} + \end{figure} + + The \dataref macros are different regarding the phases they include or omit and in their default settings. In the + following, we will discuss all options and macros you can use to reference your datapoints. By default, the + \macro{\drefresult} is always set to the result of the pipeline. + + \subsection{Setting Datapoints} + + + + \Macro[(@set)]{\drefset\oarg{options}\{\meta{name}\}\{\meta{value}\}} + + +\begin{codeexample} +\begin{verbatim} +\drefset{/med A/mice race}{Black Six} +\drefset{/med A/mice count}{32} +\drefset{/med A/dead after 24h}{6} +\drefset{/med A/dead after 48h}{1} +\end{verbatim} +\end{codeexample} + + + The \macro{\drefset} command is used to define the symbolic datapoints. The name of a datapoint may contain virtually all + characters, including spaces and slashes. It is good practice to use a hierarchy to structure your data point names. + The value might be any string, while the focus of \dataref is on numerical datapoints. The \macro{\drefset} command works + outside the pipeline model (Figure \ref{fig:pipeline}) for performance reasons. It virtually consists only of the + @options and @set stage. + + \Macro[(@set)]{\drefsave[\meta{options}]\{\meta{name}\}\{\meta{value}\}} + + Besides setting the datapoint, \macro{\drefsave} writes it to the \textsc{aux} file and, therefore, makes it available in + the next \LaTeX{} run from the very beginning. The \option{ignoremissing} option is useful to reference the saved keys + at an earlier place in the document. + +\Option[(no default)]{/dref/set=\meta{key}} + +Inserts a \macro{\drefset} to the @set that captures the current result and saves it to the given datapoint. + +\Option[(no default)]{/dref/save=\meta{key}} + +Inserts a \macro{\drefsave} to the @set that captures the current result and saves it to the given datapoint. Since +\macro{\drefsave} is used the result is available from the beginning of the document. + +\Option[(no default)]{/dref/to macro=\meta{macro}} + +The current result is saved to the given macro. + +\begin{example}[2cm] + \dref[set=/foo]{/med A/mice count} \dref{/foo}\\ + \dref[ignoremissing]{/bar} \dref[save=/bar]{/med A/mice count}\\ + \drefcalc*[to macro=\myresult]{3+2} \myresult +\end{example} +\begin{codeexample} +\begin{verbatim} +\dref[set=/foo]{/med A/mice count} \dref{/foo}\\ +\dref[ignoremissing]{/bar} \dref[save=/bar]{/med A/mice count}\\ +\drefcalc*[to macro=\myresult]{3+2} \myresult +\end{verbatim} +\end{codeexample} + + +\Option[(no default, initially "")]{/dref/prefix=\meta{key prefix}} + +On every key retrieval or setting of a datapoint this prefix is added. +It is a value-typed PGF key, so operations like +\texttt{prefix/.append} are possible. + +\Macro{\drefinput[\meta{prefix}]\{\meta{filename}\}} + +Uses \cmd{\input} to read the file. During the processing of this file +\option{prefix} is set to the given value. This is useful to include +several files that resulted from different experiments but include +equal datapoint keys. + + +\subsection{Referencing Datapoints} + + + \Macro[(@options=\{print=default\}, @get, @calc, @print, @set)]{\dref*[\meta{options}]\{\meta{name}\}} + \Macro[(@options=\{print=raw\}, @get, @calc, @print, @set)]{\dref[\meta{options}]\{\meta{name}\}} + + This macro is used to reference a single symbolic data point. The value stored in that datapoint is inserted into the + text. \macro{\dref} additionally marks the data point as used; it will appear in the datagraphy (see + Section~\ref{sec:datagraphy}). The starred variant does not attempt to parse the datapoint as a numerical value, but + outputs the saved string. + +\begin{example} +\dref*{/control group/mice race}\\ +\dref*{/control group/mice count}\\ +\dref[sci,precision=2,zerofill=true]{/med A/recovered} +\end{example} +\begin{codeexample} +\begin{verbatim} +\dref*{/control group/mice race}\\ +\dref*{/control group/mice count}\\ +\dref[sci,precision=2,zerofill=true]{/med A/recovered} +\end{verbatim} +\end{codeexample} + +\Macro[(@get, @print)]{\drefvalueof\{\meta{name}\}} +\Macro[(@get)]{\drefref\{\meta{name}\}} +\vspace{1em} + +\begin{example} +\drefvalueof{/med A/mice race} +\end{example}\begin{codeexample} +\begin{verbatim} +\drefvalueof{/med A/mice race} +\end{verbatim} +\end{codeexample} + + Since \macro{\dref} is not expandable, it cannot be used in all circumstances. Therefore, \macro{\drefvalueof} bypasses + all internal bookkeeping and provides access to the raw datapoint value. \macro{\drefref} can be used to mark the + datapoint as used to let it appear in the datagraphy. + +\Option[(default \textbf{true}, initially \textbf{false})]{/dref/ignoremissing=\meta{true-or-false}} +\Option[(no default, initially \textbf{1.0})]{/dref/defaultvalue=\meta{value}} + +By default, \dataref produces an error if the referenced datapoint is undefined. If ignoremissing is given, the +defaultvalue is used. This key is useful in combination with \macro{\drefsave}. Furthermore, it is possible to extract the +missing keys from the \textsc{aux} file and to retrieve it from a secondary source (e.g. database, wikidata, etc). + +\begin{example} +\dref*[ignoremissing,defaultvalue=undefined]{blah} +\end{example}\begin{codeexample} +\begin{verbatim} +\dref*[ignoremissing,defaultvalue=undefined]{blah} +\end{verbatim} +\end{codeexample} + +\Macro{\drefsethelp\{\meta{pattern}\}\{\meta{text}\}} +\Macro{\drefhelp\{\meta{name}\}} + + \textsf{dataref} comes with a simple method for defining documentation for data points. This help can for example be used to communicate what is the concrete semantics of the data point. This is of special interest when writter and data gatherer are not the same person. \macro{\drefsethelp} takes two arguments: first a regular expression that matches the symbolic data point, second the help text. + +\begin{codeexample} +\begin{verbatim} +\drefsethelp{.*/mice race}{The mice race used for experiments + heavily influences the outcome of the results} +\end{verbatim} +\end{codeexample} + +The documentation for a datapoint is obtained by using the \macro{\drefhelp} macro. It checks all defined documentation +strings (in linear order, first defined, first matched), and prints the first matching help text. With \textbf{LuaTeX}: +only Lua (string.find) regular expressions are supported as patterns. + + \begin{example} + \drefhelp{/med A/mice race} + \end{example}\begin{codeexample} +\begin{verbatim} +\drefhelp{/med A/mice race} +\end{verbatim} + \end{codeexample} + + +\Macro{\drefresult} + +Is set in the @set phase to the result of the currently executed pipeline. + + +\subsection{Calculations and Math Tools} + +\Macro[(@calc, @print, @set)]{\drefcalc[\meta{options}]\{\meta{expression}\}} +\Macro[(@calc, @set)]{\drefcalc*[\meta{options}]\{\meta{expression}\}} +\Macro[(@print)]{\drefformat*[\meta{options}]\{\meta{number}\}} + +The \macro{\drefcalc} is the core function of calculating with data points. It is based on the pgfmath engine, but allows +also the usage of symbolic datapoints within mathematical expressions. Datapoints can either are inserted into the +calculations with the \cmd{d(\meta{path})} or the \cmd{data("\meta{path}")} notation. The starred variant of +\macro{\drefcalc} does not print the result, but only sets the result macros. + +It is important to note, that \macro{\drefcalc} always uses the \textbf{/pgf/fpu} environment. The FPU feature of pgfmath +is used to handle large numbers, which may occur often when handling experiment data points. + +\begin{example} + \drefcalc{(4+7)/12 * 100}\\ + \drefcalc{d(/med A/mice count) * 100}\\ + \drefcalc{data("/med A/mice count") * 100}\\ + \drefcalc*{1+3}\\ + \drefresult +\end{example}\begin{codeexample} +\begin{verbatim} +\drefcalc{(4+7)/12 * 100}\\ +\drefcalc{d(/med A/mice count) * 100}\\ +\drefcalc{data("/med A/mice count") * 100}\\ +\drefcalc*{1+3}\\ +\drefresult +\end{verbatim} +\end{codeexample} + +Since the default printing mechanism of \dataref utilizes PGF, all options from \texttt{/pgf/number format} can be +directly used in the options. \macro{\drefformat} does only the printing. For documentation on the available options, +please consult the PGF manual. + +\begin{example} + \drefcalc[precision=4]{1/3}\\ + \drefcalc[sci]{123456789}\\ + \drefcalc[prefix=/med A/,frac]{d(recovered)/d(mice count)}\\ + \drefformat[fixed zerofill, precision=2]{\drefresult} +\end{example}\begin{codeexample} +\begin{verbatim} +\drefcalc[precision=4]{1/3}\\ +\drefcalc[sci]{123456789}\\ +\drefcalc[prefix=/med A/,frac]{d(recovered)/d(mice count)}\\ +\drefformat[fixed zerofill, precision=2]{\drefresult} +\end{verbatim} +\end{codeexample} + +\subsection{Units and Unit Scaling} + +\dataref allows to give the unit of a datapoint and enforces the correct combination of units when using them in +calculations. \dataref units can be arbitrary combinations of macros and strings, which allows the combination with the +\textsc{SIUnitX} package. + +\Option[(no default)]{/dref/unit=\meta{unit}} + +The unit of a datapoint is loaded in the @get phase, and stored in the @set phase of the \dataref pipeline. + +\drefset[unit=\joule]{/power}{1234} +\drefset[unit=ms]{/duration}{5555} +\begin{codeexample} +\begin{verbatim} +\drefset[unit=ms]{/duration}{5555} +\drefset[unit=\joule]{/power}{1234} +\end{verbatim} +\end{codeexample} + +\Option[(no default, choice)]{/dref/unit/format=\meta{formatting style}} +\Option[(initially \textbf{plain})]{/dref/unit/format default=\meta{formatting style}} + + +If a datapoint with unit is referenced, the unit is printed after the value. The formatting mechanism can be exchanged, +in order to omit the unit, or to use \textsc{SIUnitX} for properly print it. By default, the \texttt{unit/format + default} is set in the @init phase. If you are using \textsc{SIUnitX} in your document, it is safe to set the default +value accordingly. Currently, the values \texttt{false}, \texttt{plain}, and \texttt{siunitx} are valid formatting +styles. + +\drefkeys{unit/format default=siunitx} +\begin{example} + \dref[unit/format=false]{/duration}; \dref{/duration}; + \typeout{\pgfkeysvalueof{/dref/unit/format default}} + \dref{/power} +\end{example}\begin{codeexample} +\begin{verbatim} +\drefkeys{unit/format default=siunitx} +\dref[unit/format=false]{/duration}; \dref{/duration}; +\dref{/power} +\end{verbatim} +\end{codeexample} + +\Option[(no default)]{/dref/unit/new scala=\meta{scala}} + +\dataref allows to define scaled units and conversion between the members of the scala. A scala definition is a list of +units with scaling factors between them. + + +\drefkeys{ + unit/new scala={ + 1/y, 365/d, 24/h, 60/m, 60/s, 1000/ms, 1000/us, 1000/ns + }, + unit/new scala={ + 1/\kilo\joule, 1000/\joule, 1000/\milli\joule, + 1000/\micro\joule, 1000/\nano\joule + } +} + +\begin{codeexample} +\begin{verbatim} +\drefkeys{ + unit/new scala={ + 1/y, 365/d, 24/h, 60/m, 60/s, 1000/ms, 1000/us, 1000/ns + }, + unit/new scala={ + 1/\kilo\joule, 1000/\joule, 1000/\milli\joule, + 1000/\micro\joule, 1000/\nano\joule + } +} +\end{verbatim} +\end{codeexample} + +\Option[(no default)]{/dref/unit/scale to=\meta{unit}} + +With a defined scala, you can scale to any unit on that scala automatically. In the example, we use unit to set the unit +of plain value to nano joule, and scale everything to milli joule. + +\begin{example} +\foreach \a in {1234, 4135413, 213516513245, 24} {% + \drefformat[unit=\nano\joule, unit/scale to=\milli\joule]{\a}\\ +} +\end{example}\begin{codeexample} +\begin{verbatim} +\foreach \x in {1234, 4135413, 213516513245, 24} {% + \drefformat[ + unit=\nano\joule, + unit/scale to=\milli\joule]{\x}\\ +} +\end{verbatim} +\end{codeexample} + +\Option[(default \textbf 50)]{/dref/unit/scale to auto=\meta{optimum number}} + +With \texttt{scale to auto}, the appropriate unit is chosen automatically. The algorithm tries every unit on the scala +and chooses the unit, where the numerical value after scaling is nearest to the \meta{optimum number}. So with a optimum +number of 50, 5000 seconds are scaled to \drefformat[unit=s, unit/scale to auto]{5000} instead of \drefformat[unit=s, +unit/scale to=h]{5000}. + + +\begin{example} +\foreach \a in {1234, 4135413, 213516513245, 24} {% + \drefformat[unit=ms, unit/scale to auto]{\a}\\ +} +\end{example}\begin{codeexample} +\begin{verbatim} +\foreach \x in {1234, 4135413, 213516513245, 24} {% + \drefformat[unit=ms, unit/scale to auto]{\x}\\ +} +\end{verbatim} +\end{codeexample} + + +\subsection{Relating Datapoints} + +\Macro[(@calc, @set)]{\drefrel*[\meta{options}]\{\meta{key or value}\}} +\Macro[(@calc, @print, @set)]{\drefrel[\meta{options}]\{\meta{key or value}\}} + +Often, datapoints are set in relation to each other. This can either be done with \macro{\drefcalc} or, more explictily, +with \macro{\drefrel}. The different options that come along \macro{\drefrel}, add steps to the @calc phase and can, +therefore, be combinated with any other dref macro that includes the @calc phase. + +All operations operate on the current result, which is initially the given key or value from the mandatory argument. + +\begin{example} + \drefrel[percent of=123]{40} +\end{example}\begin{codeexample} +\begin{verbatim} + \drefrel[percent of=123]{40} +\end{verbatim} +\end{codeexample} + +The different relation operations try to have a speaking name, such that the \TeX{} code is easily understandable by the +writer. This explicit notation aims to prevent common mistakes, like confusing denominator and numerator. + +The starred version of \macro\drefrel does not print any number, but only saves the result in \macro\drefresult. Instead of +only taking datapoint keys, \macro\drefrel, as well as the relating operations, take either a key or a bare number as you can +see from the example. + +\Option[(no default)]{/dref/scale by=\meta{key or value}} + +Scales the current value by the given factor, which must be unit less. The resulting unit is untouched. + +\Option[(no default)]{/dref/percent} + +Scales the current value by 100. The unit is not changed. + +\Option[(no default)]{/dref/negate} + +Scales the current value by -1. The resulting unit is untouched. + +\Option[(no default)]{/dref/divide by=\meta{key or value}} + +Divides the current value by the given factor, which must be unit less. The resulting unit is untouched. + + +\Option[(no default)]{/dref/abs} + +Calculate the absolute value. + +\Option[(no default)]{/dref/factor of=\meta{key or value}} +\Option[(no default)]{/dref/percent of=\meta{key or value}} + +The \textbf{factor of} operation gives the portion the current value in relation to the given base value. In easy words: +a division. This macro ensures, that base and current vale have the same unit or are unit less. The result of this +operation is unit less. The \textbf{percent of} operation, furthermore, scales the result with 100 to get a percentage. + +\Option[(no default)]{/dref/increase from=\meta{key or value}} +\Option[(no default)]{/dref/decrease from=\meta{key or value}} +\Option[(no default)]{/dref/increase factor from=\meta{key or value}} +\Option[(no default)]{/dref/decrease factor from=\meta{key or value}} +\Option[(no default)]{/dref/increase percent from=\meta{key or value}} +\Option[(no default)]{/dref/decrease percent from=\meta{key or value}} + +In a situation, where a datapoint is the result of a changed experiment setup, the value normally shows an increased or decrease +numerical value. This family of operations calculates this delta, assuming it is an increase or decrease. The factor +operations scale the result to the base value, and the percent operations give this scaled value as a percentage. + +\begin{example} + \drefrel[increase from=500]{525}\\ + \drefrel[increase factor from=500,fixed]{525}\\ + \drefrel[increase percent from=500]{525}\,\% +\end{example} +\begin{codeexample} +\begin{verbatim} + \drefrel[increase from=500]{525}\\ + \drefrel[increase factor from=500,fixed]{525}\\ + \drefrel[increase percent from=500]{525}\,\% +\end{verbatim} +\end{codeexample} + +\subsection{Helper Utilities} + +\Macro{\drefrow[\meta{options}]\{\meta{comma-separated list}\}\{\meta{key template}\}} +\Macro{\drefrow*\{\meta{comma-separated list}\}\{\meta{template}\}} + + Often different columns in a table have to be obtained from your data + points. Often those rows and columns are similar. Generating parts of + tables within \LaTeX is very tricky, so \dataref provides you + with \macro{\drefrow}. This macro iterates over a comma-separated list + of values and fills out a macro which is interpreted as a symbolic + data point. The entries are seperated with \& and printed. In the + starred variant the resulting text is not interpreted as symbolic + name, but as a macro. + + Both, unstarred and starred variant take a template (a macro body) that is expanded once for every item in the given + list. The first replacement \verb|#1| is list item and the second \verb|#2| is the current index starting from 0. The + unstarred variant interprets the expanded result as a datapoint key and uses \macro\dref to expand it; the optional + parameter is passed through to every invocation of \macro\dref. + The starred variant does not wrap the result into \macro\dref, and, therefore, is more flexible. + + \begin{example} + \begin{tabular}{|c|c|c|}\hline + \drefrow{dead after 24h,dead after 48h,recovered}% + {/control group/#1}\\\hline + \drefrow{dead after 24h,dead after 48h,recovered}% + {/med A/#1}\\\hline + \end{tabular} + \end{example} + \begin{codeexample} +\begin{verbatim} +\begin{tabular}{|c|c|c|}\hline + \drefrow{dead after 24h,dead after 48h,recovered} + {/control group/#1}\\\hline + \drefrow{dead after 24h,dead after 48h,recovered}% + {/med A/#1}\\\hline +\end{tabular} +\end{verbatim} + \end{codeexample} + + + \Macro[(@calc)]{\drefassert\{\meta{expr}\}} + + Sometimes the underlying data changes while you are writing. But what + if your prose text relies on certain characteristics of the data. \macro{\drefassert} uses a pgfmath + expression that evaluates to \verb|true| or \verb|false|. When the + assertion holds (\verb|true|) nothing happens, only a terminal message + is printed. When it does not hold (\verb|false|) the compilation is aborted. + +\begin{example} +\drefassert{data("/control group/mice count") > 30} +Of the more than thirty infected mice... +\end{example}\begin{codeexample} +\begin{verbatim} +\drefassert{data("/control group/mice count") > 30} +Of the more than thirty infected mice... +\end{verbatim} +\end{codeexample} + + \Option[(default \textbf{true})]{/dref/noassert=\meta{true or false}} + + The \textbf{noassert} deescalates all assertion errors to mere warnings. This option can also be given at the + \cmd{\usepackage} invication. + +\Option[(no default, initially \textbf{none}, choice)]{/dref/annotate=\meta{annotation type}} +\Option[(choice item)]{/dref/annotate=none} +\Option[(choice item)]{/dref/annotate=footnote} +\Option[(choice item)]{/dref/annotate=pdfcomment} +\Option[(choice item)]{/dref/annotate=typeout} + +While writing a document it is desirable to know, what key is used, while writing the text and generating the document. +Therefore \dataref provides the possibility to annotate values. The default option \textbf{none} disables this kind of +annotation. The \textbf{pdfcomment} option uses pdf annotations. Be aware that those annotations work properlyy only on +a few selected PDF readers\footnote{In doubt use Acrobat}. + +\begin{example}[6cm] + \drefkeys{annotate=footnote} + \dref*{/control group/mice race} + \dref{/control group/mice count} + \drefcalc[annotate=pdfcomment]{100/3} +\end{example}\begin{codeexample} +\begin{verbatim} +\drefkeys{annotate=footnote} +\dref*{/control group/mice race} +\dref{/control group/mice count} +\drefcalc[annotate=pdfcomment]{100/3} +\end{verbatim} +\end{codeexample} + + + \subsection{Datagraphy}\label{sec:datagraphy} + + \Macro{\drefusagereport} + \Option{[usagereport]} + \Option{[refall]} + + With the \textbf{usagereport} package option enabled, \macro{\drefusagereport} generates a usagereport of all referenced + keys. The usage report groups the keys by the help texts. If the refall package option is given, all keys are marked as + referenced. + +\section*{Datagraphy} +\drefusagereport + +\end{document} + +%%% Local Variables: +%%% mode: latex +%%% TeX-master: t +%%% End: Binary files old/doc/latex/dataref/dataref.pdf and new/doc/latex/dataref/dataref.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dataref.doc.tlpobj new/tlpkg/tlpobj/dataref.doc.tlpobj --- old/tlpkg/tlpobj/dataref.doc.tlpobj 2016-04-14 18:55:16.000000000 +0200 +++ new/tlpkg/tlpobj/dataref.doc.tlpobj 2017-04-14 17:37:36.000000000 +0200 @@ -1,8 +1,9 @@ name dataref.doc category Package -revision 38394 +revision 42883 shortdesc doc files of dataref relocated 1 -docfiles size=63 - RELOC/doc/latex/dataref/README - RELOC/doc/latex/dataref/dataref.pdf +docfiles size=68 + RELOC/doc/latex/dataref/README.md + RELOC/doc/latex/dataref/dataref-doc.pdf + RELOC/doc/latex/dataref/dataref-doc.tex ++++++ dataref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dataref/dataref.sty new/tex/latex/dataref/dataref.sty --- old/tex/latex/dataref/dataref.sty 2015-09-18 01:49:24.000000000 +0200 +++ new/tex/latex/dataref/dataref.sty 2017-01-07 00:01:05.000000000 +0100 @@ -1,13 +1,5 @@ +%% Copyright 2013-2017 Christian Dietrich %% -%% This is file `dataref.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% dataref.dtx (with options: `package') -%% dataref.dtx -%% Copyright 2013 Christian Dietrich -%% %% 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. @@ -15,33 +7,32 @@ %% 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 Christian Dietrich -%% +%% %% This work consists of the files dataref.dtx and dataref.ins %% and the derived file dataref.sty. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{dataref} - [2015/09/17 v0.5 dataref] +\ProvidesPackage{dataref}[2017/01/06 v0.6 dataref] \ifx\drefloaded\undefined \let\drefloaded=\relax \else \expandafter\endinput \fi -\ifx\PackageError\undefined - \def\dref@error#1{\immediate\write-1{Package dref: Error! #1.}}% -\else - \def\dref@error#1{\PackageError{dref}{#1}{}}% -\fi + +\def\drefutil@packageerror#1#2#3{\errhelp{#3}\errmessage{Package #1 Error: #2}} +\def\drefutil@packagewarning#1#2{\immediate\write17{Package #1: Warning! #2.}} +\def\dref@error#1{\drefutil@packageerror{dref}{#1}{}} +\def\dref@warning#1{\drefutil@packagewarning{dref}{#1}} + \RequirePackage{pgf} +\usepgflibrary{fpu} \RequirePackage{iftex} \RequirePackage{kvoptions} -\usepgflibrary{fpu} -\usepackage{etoolbox} -\RequirePackage{xcolor} +\RequirePackage{etoolbox} \SetupKeyvalOptions{ family=dref, @@ -55,72 +46,297 @@ \DeclareBoolOption{ignoremissing} \DeclareBoolOption{noassert} \ProcessKeyvalOptions* -\def\dref@set#1#2{% - \edef\dref@set@tmp{#2}% - \expandafter\pgfkeys@temptoks\expandafter{\dref@set@tmp}% - \expandafter\xdef\csname - pgfk@\dref@datapath#1\endcsname{\the\pgfkeys@temptoks}% + +% Load & Store Layer + +\def\dref@set#1#2#3{% + \edef\dref@set@path{#3}% + \edef\dref@set@value{#2}% + \expandafter\pgfkeys@temptoks\expandafter{\dref@set@value}% + \expandafter\xdef% + \csname pgfk@\dref@datapath\dref@set@path\endcsname% + {\the\pgfkeys@temptoks}% + % Setting the Unit is a little bit more tricky + %% Unit Path Assembly + \expandafter\def% + \expandafter\dref@set@unitpath% + \expandafter{% + \csname pgfk@\dref@datapath\dref@set@path @unit\endcsname}% + \expandafter\gdef\dref@set@unitpath{#1}% \ifdref@refall% - \expandafter\dref@found\expandafter{\dref@datapath#1}{0} - \expandafter\dref@referenced\expandafter{\dref@datapath#1}{0}% + \expandafter\dref@found\expandafter{\dref@set@path}{0} + \expandafter\dref@referenced\expandafter{\dref@set@path}{0}% \fi% + \dref@debug{\dref@set@path = \dref@set@value (\detokenize{#1})}% } -\def\drefset#1#2{\dref@set{#1}{#2}} -\def\dref@expandable#1{% - \pgfkeysifdefined{\dref@datapath\csuse{dref@prefix}#1}{% - \pgfkeysvalueof{\dref@datapath\csuse{dref@prefix}#1}% +\def\dref@load#1#2#3{% + \edef\dref@load@path{#1}% + \pgfkeysifdefined{\dref@datapath\dref@load@path}{% + \pgfkeysgetvalue{\dref@datapath\dref@load@path}{#2}% + \pgfkeysifdefined{\dref@datapath\dref@load@path @unit}{% + \pgfkeysgetvalue{\dref@datapath\dref@load@path @unit}{#3}% + }{% + \def#3{}% + }% }{% - \ifdref@ignoremissing% - \dref@defaultvalue% - \else% - \typeout{Dref error: undefined key `#1'}\QUIT% - \fi% + \edef#2{\dref@defaultvalue}% + \def#3{}% }% } -\def\dref@unexpandable#1{% - \def\drefcurrentkey{\dref@datapath\csuse{dref@prefix}#1}% - \pgfkeysifdefined{\drefcurrentkey}{% - \edef\dref@thepage{\arabic{page}}% - \immediate\write\@auxout{\noexpand\dref@found{\drefcurrentkey}{\dref@thepage}}% + +\def\drefifdefined#1{% + \pgfkeysifdefined{\dref@datapath\drefprefix #1}%{then}{else} +} + +\def\dref@set@fromaux#1#2#3{% + \drefifdefined{#2}{% + \dref@warning{"\drefprefix #2" set before beginning of document, \string\drefsave{} is ignore}% }{% - \immediate\write\@auxout{\noexpand\dref@notfound{\drefcurrentkey}{\dref@thepage}}% + \dref@set{#1}{#2}{#3}% + }% +} + +\def\drefkeys#1{\pgfkeys{/dref/.cd,#1}} +\def\drefprefix{\pgfkeysvalueof{/dref/prefix}} +\newif\ifdref@debug +\def\dref@debug#1{\ifdref@debug \immediate\write17{Package dref: Debug: #1.}\fi} + +\drefkeys{ + .is family, + .search also={/pgf/number format}, + % The @init action is used to initialize all other actions + @[/.code={\begingroup% + \pgfkeys{/pgf/fpu,/pgf/fpu/output format=fixed}% No more dimensions too large + \def\drefunit{}% At first we are unitless + \aftergroup\edef% + \aftergroup\drefresult% + \aftergroup{% + \aftergroup\drefresult@smuggle% + \aftergroup}% + \aftergroup\expandafter% + \aftergroup\def% + \aftergroup\expandafter% + \aftergroup\drefunit% + \aftergroup\expandafter% + \aftergroup{% + \aftergroup\drefunit@smuggle% + \aftergroup} + }, + @]/.code={% We smuggle \drefresult after the current group + \xdef\drefresult@smuggle{\drefresult}% + \xdef\drefunit@smuggle{\expandonce\drefunit}% + \endgroup% + }, + @init/.style={}, + % The \drefresult macro holds the current value, + % it can be set by value= + prefix/.initial={}, + value/.code={\edef\drefresult{#1}\def\drefunit{}}, + value=0, + path/.estore in={\drefcurrentpath}, + @init/.append style={}, + % \drefresult can be set by the @load action + @load key to/.code n args={3}{% + \dref@load{\drefprefix #1}{#2}{#3}% + }, + @get key to/.style n args={3}{ + @check key={#1}, + @reference key={#1}, + @load key to={#1}{#2}{#3}, + }, + @get/.style={% + @get key to={\drefcurrentpath}{\drefresult}{\drefunit}, + unit/@format enable, + }, + % For most commands, we want to check whether a key exists. + @check key/.code={% + \drefifdefined{#1}{}{% + \ifdref@ignoremissing% + \dref@warning{undefined key `\drefprefix #1'}% + \else% + \dref@error{undefined key `\drefprefix #1'}% + \fi% + }% + }, + % The @set action is used to pipe out \drefresult, before we can + % print it. For example, we can use it to save the result to a new + % key. + @init/.append style={ + @set/.code={}, + }, + set/.style={ + @set/.append code={% + \expandafter\dref@set\expandafter{\drefunit}{\drefresult}{\drefprefix #1}% + } + }, + save/.style={ + set={#1}, + @set/.append code={% + \immediate\write\@auxout{% + \noexpand\dref@set@fromaux{\expandonce\drefunit}{\drefresult}{\drefprefix #1}% + }% + } + }, + to macro/.style={ + @set/.append code={% + \aftergroup\edef% + \aftergroup#1% + \aftergroup{% + \aftergroup\drefresult% + \aftergroup}} + }, + % + debug/.is if=dref@debug, + ignoremissing/.is if=dref@ignoremissing, + defaultvalue/.store in=\dref@defaultvalue, +} + +\csdef{dref@ifnum@0}{} +\csdef{dref@ifnum@1}{} +\csdef{dref@ifnum@2}{} +\csdef{dref@ifnum@3}{} +\csdef{dref@ifnum@4}{} +\csdef{dref@ifnum@5}{} +\csdef{dref@ifnum@6}{} +\csdef{dref@ifnum@7}{} +\csdef{dref@ifnum@8}{} +\csdef{dref@ifnum@9}{} +\csdef{dref@ifnum@-}{} +\csdef{dref@ifnum@.}{} +\def\dref@load@ifkey@firstchar#1#2\@nnil{#1} +\drefkeys{% + @get key or value to/.code n args={3}{% + \edef\dref@load@path{#1}% + \edef\dref@firstchar{\expandafter\dref@load@ifkey@firstchar \dref@load@path\@nnil}% + \ifcsdef{dref@ifnum@\dref@firstchar}{% + \edef#2{\dref@load@path}% + }{% + \drefkeys{@get key to={#1}{#2}{#3}}% + }% + }, + @get key or value/.style={ + @get key or value to={\drefcurrentpath}{\drefresult}{\drefunit}, + unit/@format enable, + }, +} + + +% Print layer +\drefkeys{ + @init/.append style={ + @print result/.code={}, + @print unit/.code={} + }, + @print/.style={@print result, @print unit}, + print default/.initial={pgf}, + print/.is choice, + print/no/.style={ + @print result/.code={}, + @print unit/.code={} + }, + print/default/.style={% + print default/.get=\dref@print@format,% + print/.expand once=\dref@print@format, + }, + print/raw/.style={ + @print result/.code={\drefresult} + }, + print/typeout/.style={ + @print result/.code={\typeout{#1\drefresult}}, + @print unit/.code={\typeout{\expandonce\drefunit}}, + }, + print/show/.style={ + @print result/.append code={\show\drefresult}, + }, + print/pgf/.style={ + @print result/.code={% + \pgfmathprintnumber{\drefresult}% + } + }, + print/siunitx/.style={ + @print result/.code={% + \num{\drefresult}% + } + }, +} + +% Compatibility with underscore package +\def\dref@normalunderscore{_} +\edef\dref@catcode@underscore{\the\catcode`_} +\catcode`_=13 +\def\dref@catcode@setup{% + \edef _{\dref@normalunderscore}% +} +\catcode`_=\dref@catcode@underscore + + +\AtBeginDocument{% + \ifdim 13pt = \the\catcode`_pt% + % _ is an active character + \drefkeys{(a)[/.append code={% + \dref@catcode@setup% + }% + }% + \fi% +} + +\newcommand{\drefset}[3][]{% + % I put this version here, since it + % provides a sped up mass setting of keys + \begingroup% + \ifdim 13pt = \the\catcode`_pt% + \dref@catcode@setup% + \fi% + \edef\drefresult{#3}% + \def\drefunit{}% + \drefkeys{#1}% + \expandafter\dref@set\expandafter{\drefunit}% + {\drefresult}{\drefprefix #2}% + \endgroup% +} + +\newcommand{\drefsave}[3][]{% + \drefkeys{@[, @init, value={#3}, #1, save={#2}, @set, @]}% +} + +\newcommand{\drefinput}[2][]{% + \begingroup + \drefkeys{prefix/.append={#1}} + \input{data/#2} + \endgroup +} + + +\def\drefref#1{\drefkeys{@reference key={#1}}} + +% From here on, everything should be implemented using pgfkeys +\protected\def\dref{\@ifstar\dref@starred\dref@unstarred} +\newcommand{\dref@unstarred}[2][]{% + \drefkeys{@[, @init, print=default, path={#2}, #1, @get, @calc, @print, @set,% + @annotate={\textbackslash dref[#1]\{#2\}}, @]% }% - \immediate\write\@auxout{\noexpand\dref@referenced{\drefcurrentkey}{\dref@thepage}}% } -\newcommand{\drefifdefined}[3]{ - \def\drefcurrentkey{\dref@datapath\csuse{dref@prefix}#1}% - \pgfkeysifdefined{\drefcurrentkey}{#2}{#3}% -} -\def\dref{\@ifstar\@@dref\@dref} -\newcommand{\@dref}[2][]{% Unstarred - \edef\dref@argument{#2}% - \expandafter\dref@unexpandable\expandafter{\dref@argument}% - \pgfmathparse{\dref@expandable{#2}}% - \dref@format[#1]{\pgfmathresult}% - \dref@mkannotate{\textbackslash dref\{#2\}}% -} -\newcommand{\@@dref}[2][]{% Starred - \edef\dref@argument{#2}% - \expandafter\dref@unexpandable\expandafter{\dref@argument}% - \expandafter\gdef\expandafter\dref@dref@output\expandafter{\expandafter\dref@expandable\expandafter{\dref@argument}}% - \dref@dref@output% - \dref@mkannotate{\textbackslash dref*\{#2\}}% +\newcommand{\dref@starred}[2][]{% + \drefkeys{@[, @init, print=raw, path={#2}, #1, @get, @calc, @print, @set,% + @annotate={\textbackslash dref*[#1]\{#2\}}, @]% + }% } -\def\drefvalueof#1{% - \dref@expandable{#1}% +\def\drefgetvalue#1#2{% + \drefkeys{@[,@init, path={#1}, to macro={#2}, @get, @set, @]}% } -\def\drefref#1{% - \dref@unexpandable{#1}% +\def\drefvalueof#1{% + \pgfkeysvalueof{\dref@datapath \drefprefix #1}% } + %% dref@ifstrmatch is copied from etextools, but etextools is %% incompatible with etoolbox %% \ifstrmatch{ pattern }{ string }{ true }{ false } \ifPDFTeX% -\let\dref@strmatch\pdfmatch + \let\dref@strmatch\pdfmatch \fi \ifLuaTeX% -\newcommand{\dref@strmatch}[2]{% + \newcommand{\dref@strmatch}[2]{% \directlua{% local match = string.find("\luaescapestring{#2}", "\luaescapestring{#1}");% if match then @@ -160,6 +376,20 @@ \dolistcsloop{dref@helps}% }% } +\drefkeys{ + @reference key/.code={% + \edef\dref@thepage{\arabic{page}}% + \drefifdefined{#1}{% + \immediate\write\@auxout{% + \noexpand\dref@found{\drefprefix #1}{\dref@thepage}}% + }{% + \immediate\write\@auxout{% + \noexpand\dref@notfound{\drefprefix #1}{\dref@thepage}}% + }% + \immediate\write\@auxout{% + \noexpand\dref@referenced{\drefprefix #1}{\dref@thepage}}% + } +} \def\dref@notfound#1#2{ \ifdref@usagereport% \dref@usagereport@notfound{#1}{#2}% @@ -175,18 +405,9 @@ \dref@usagereport@referenced{#1}{#2}% \else\relax\fi% } -\def\dref@let#1{% - \def\@tmp##1=##2;{\pgfmathdeclarefunction*{##1}{0}{\pgfmathparse{##2}}}% - \renewcommand*{\do}[1]{\@tmp##1;}% - \ifstrempty{#1}{}{% - \docsvlist{#1}% - }% -} -\def\dreflet#1{% - \dref@let{#1}% -} +% The data("") || d() Parser \def\dref@parser#1#2{% \edef\@tempa{#1}% \csdef{dref@parser@result}{}% @@ -221,77 +442,67 @@ \csdef{dref@parser@d@(}{\dref@parser@tillparen} \def\dref@parser@tillquote#1")#2\@nnil{% - \drefref{\dref@data@math@prefix #1}% - \csxdef{dref@parser@result}{\csuse{dref@parser@result}(\drefvalueof{\dref@data@math@prefix #1})}% + \drefkeys{ + @get key to={#1}{\dref@math@value}{\dref@math@unit}, + unit/@combine=\dref@math@unit, + }% + \csxdef{dref@parser@result}{\csuse{dref@parser@result}(\dref@math@value)}% \csdef{dref@parser@state}{}% \ifblank{#2}{}{\dref@parser@parse#2\@nnil}} \def\dref@parser@tillparen#1)#2\@nnil{% - \drefref{\dref@data@math@prefix #1}% - \csxdef{dref@parser@result}{\csuse{dref@parser@result}(\drefvalueof{\dref@data@math@prefix #1})}% + \drefkeys{@get key to={#1}{\dref@math@value}{\dref@math@unit}, + unit/@combine=\dref@math@unit}% + \csxdef{dref@parser@result}{\csuse{dref@parser@result}(\dref@math@value)}% \csdef{dref@parser@state}{}% \ifblank{#2}{}{\dref@parser@parse#2\@nnil}}% \def\dref@parser@end#1#2\@nnil{} -\csdef{dref@parser@@}{\typeout{end}\dref@parser@end} +\csdef{dref@parser@@}{\dref@parser@end} -\newcommand{\dref@calc}[1]{% - %\typeout{Before: '#1'}% - \dref@parser{#1}{\dref@calc@@argA}% - %\typeout{After: \dref@calc@@argA}% - \pgfmathparse{\dref@calc@@argA}% +\drefkeys{ + @init/.append style={% + @calc/.code={},% + }, + @calc pgf/.style={ + @calc/.append code={% + \dref@parser{#1}{\dref@calc@@ready}% + \pgfmathparse{\dref@calc@@ready}% + \dref@debug{#1 -> \dref@calc@@ready = \pgfmathresult}% + \edef\drefresult{\pgfmathresult}% + } + } } -\pgfset{/dref/let/.code={\dref@let{#1}}} -\pgfset{/dref/prefix/.code={\csdef{dref@prefix}{#1}}} -\def\drefprefix#1{\csdef{dref@prefix}{#1}} -\def\drefresult{0} -\def\drefcalc{\@ifstar\@@drefcalc\@drefcalc} -\newcommand{\@drefcalc}[2][]{% Unstarred - \begingroup% - \pgfset{/pgf/number format/.cd, #1}% - \dref@calc{#2}% - \pgfmathprintnumberto[fixed,assume math mode=true,precision=10,1000 sep={}]{\pgfmathresult}{\drefresult}% - \xdef\drefresult{\drefresult}% - \dref@format{\pgfmathresult}% - \dref@mkannotate{\textbackslash drefcalc\{#2\}}% - \endgroup% +\protected\def\drefcalc{\@ifstar\drefcalc@starred\drefcalc@unstarred} +\newcommand{\drefcalc@unstarred}[2][]{% Unstarred + \drefkeys{@[,@init, print=default, @calc pgf={#2}, #1, @calc, @print, @set,% + @annotate={\textbackslash drefcalc[#1]\{#2\}},@]}% } -\newcommand{\@@drefcalc}[2][]{ % Starred - \begingroup% - \pgfset{/pgf/number format/.cd, #1}% - \dref@calc{#2}% - \pgfmathprintnumberto[fixed,assume math mode=true,precision=10,1000 sep={}]{\pgfmathresult}{\drefresult}% - \xdef\drefresult{\drefresult}% - \endgroup% -} -\newcommand{\dref@format}[2][]{% - \pgfmathprintnumber[#1]{#2}% +\newcommand{\drefcalc@starred}[2][]{ % Starred + \drefkeys{@[,@init, @calc pgf={#2}, #1, @calc, @set,% + @annotate={\textbackslash \drefcalc*[#1]\{#2\}},@]% + }% } -\newcommand{\drefformat}[2][]{\dref@format[#1]{#2}} -\gdef\dref@data@math@prefix{} -\pgfmathdeclarefunction{data}{1}{% - \begingroup% - \dref@unexpandable{\dref@data@math@prefix#1}% - \pgfmathparse{\dref@expandable{\dref@data@math@prefix#1}}% - \pgfmath@smuggleone\pgfmathresult% - \endgroup% +\newcommand{\drefformat}[2][]{% + \drefkeys{@[,@init, print=default, value={#2}, #1, @calc, @print, @]}% } + \long\def\drefprojection#1#2#3{% \begingroup% - \def\dref@data@math@prefix{#1}% - \def\rename##1##2{\dref@unexpandable{#1/##1}\drefset{#2/##2}{\dref@expandable{#1/##1}}}% - \def\id##1{\rename{##1}{##1}}% - \def\calc##1##2{% - \begingroup% - \drefcalc{##1}% - \xdef\dref@project@result{\drefresult} - \endgroup% - \drefset{#2/##2}{\dref@project@result}% - }% - #3% - \endgroup% + \def\rename##1##2{% + \drefkeys{@init, path={#1/##1}, set={#2/##2}, @get, @set}% + }% + \def\id##1{\rename{##1}{##1}}% + \def\calc##1##2{% + \edef\drefprojection@prefix{\drefprefix}% + \drefcalc[prefix={#1}]{##1}% + \edef\drefprefix{\drefprojection@prefix}% + \drefset{#2/##2}{\drefresult}% + }% + #3% + \endgroup% } @@ -313,8 +524,8 @@ }% \expandafter\def\expandafter\arglist\expandafter{#1}% \expandafter\docsvlist\expandafter{\arglist}% - \@tempcntb=0\relax - {\loop\ifnum\@tempcntb<\drefcellcount + \@tempcntb=0\relax% + {\loop\ifnum\@tempcntb<\drefcellcount% \advance\@tempcntb by 1\relax% \ifnum \@tempcntb = 1% \edef\@@next{\csuse{@cell\the\@tempcntb}}% @@ -330,31 +541,25 @@ \@@next}% \repeat}% }% - \typeout{LINE: \the\dref@toks}% - \expandafter\scantokens\expandafter{\the\dref@toks}} + \expandafter\scantokens\expandafter{\the\dref@toks}% +} -\long\def\drefrow{\@ifstar\@@drefrow\@drefrow} -\def\@drefrow#1#2{\dref@makerow{#1}{\dref{#2}}} % Unstarred -\def\@@drefrow#1#2{\dref@makerow{#1}{#2}} % Starred +\long\def\drefrow{\@ifstar{\drefrow@starred}{\drefrow@unstarred}} +\newcommand{\drefrow@unstarred}[3][]{\dref@makerow{#2}{\dref[#1]{#3}}\ignorespaces} +\def\drefrow@starred#1#2{\dref@makerow{#1}{#2}\ignorespaces} \expandafter\ifstrequal\expandafter{\dref@annotate}{pdfcomment}{ \RequirePackage{pdfcomment} } -\def\dref@mkannotate@none#1{\relax} -\def\dref@mkannotate@footnote#1{\footnote{\texttt{#1}}} -\def\dref@mkannotate@pdfcomment#1{\pdfcomment[opacity=0.4,voffset=2ex]{#1}} - -\newcommand{\dref@mkannotate}[1]{% - \ifcsdef{dref@mkannotate@\dref@annotate}{% - \csuse{dref@mkannotate@\dref@annotate}{#1}% - }{% - \dref@error{Value for annotate not supported: '\dref@annotate'}% - }% -} -\newcommand{\drefannotate}[1]{% - \renewcommand{\dref@annotate}{#1}% +\drefkeys{ + annotate/.is choice, + annotate/none/.style={(a)annotate/.code={\relax}}, + annotate/footnote/.style={(a)annotate/.code={\footnote{\texttt{##1}}}}, + annotate/pdfcomment/.style={(a)annotate/.code={\pdfcomment[opacity=0.4,voffset=2ex]{##1}}}, + annotate/typeout/.style={(a)annotate/.code={\typeout{##1}}}, + annotate=\dref@annotate, } %% Usagereport @@ -379,7 +584,7 @@ \expandafter\def\expandafter\dref@usagereport@strippath@\dref@datapath#1\blanktest{#1} \newcommand{\dref@usagereport@strippath}[1]{% - \expandafter\dref@ifstrmatch\expandafter{\expandafter^\dref@datapath.*$}{#1}% + \expandafter\dref@ifstrmatch\expandafter{\expandafter^\dref@datapath.*$}{#1}%$ {\dref@usagereport@strippath@#1\blanktest}% {#1}% } @@ -402,7 +607,7 @@ {\hypertarget{#1}{\dref@usagereport@strippath{#1}}}% {\dref@usagereport@strippath{#1}}}% & \dref@usagereport@formatreferencelist{#1}% - & \pgfkeysifdefined{#1}{\pgfkeysvalueof{#1}}{\textbf{\color{red}undefined}}% + & \drefifdefined{#1}{\dref*[@reference key/.code={}]{#1}}{\textbf{undefined}}% } \def\drefusagereportaftergroup{} @@ -492,7 +697,7 @@ } \newcommand{\drefusagereport}{% \ifdref@usagereport% - \ifcsvoid{dref@usagereport@keys}{\typeout{EMPTY}}{% + \ifcsvoid{dref@usagereport@keys}{}{% \begingroup% \renewcommand{\do}[1]{% \ifinlistcs{##1}{dref@usagereport@matchedkeys}{}{% @@ -505,142 +710,243 @@ }% csempty @keys \fi% } +\drefkeys{ + noassert/.is if=dref@noassert +} \newcommand{\drefassert}[1]{% \begingroup% \drefcalc*{#1}% - \expandafter\ifstrequal\expandafter{\drefresult}{1}{% - \typeout{Assertion holds: #1}% - }{% + \ifdim\drefresult pt = 0pt% \ifdref@noassert% - \typeout{Assertion failed: #1}% + \dref@warning{Assertion failed: #1}% \else% \dref@error{Assertion failed: #1}% - \fi% - }% + \fi% + \else + \dref@warning{Assertion holds: #1}% + \fi% \endgroup% } -\newif\if@dref@valuemustderef% -\newif\if@dref@basemustderef% -\newif\if@dref@increase% -\newif\if@dref@product% -\newif\if@dref@factor% -\newif\if@dref@delta% -\newif\if@dref@percent% -\newif\if@dref@abs% -\newif\if@dref@neg% -\pgfkeys{% - \dref(a)datapath/.DUMMY/.initial=1 -} -\pgfkeys{% - /dref/.cd,% - value/.initial = /.DUMMY,% - base/.initial = /.DUMMY,% - divide/.initial = 1,% - value plain/.is if=@dref@valuemustderef,% - value plain/.default=false,% - value plain=true,% - base plain/.is if=@dref@basemustderef,% - base plain/.default=false,% - base plain=true,% - factor/.is if=@dref@factor,% - factor/.default=true,% - factor=false,% - delta/.is if=@dref@delta,% - delta/.default=true,% - delta=false,% - scale/.is if=@dref@product,% - scale/.default=true,% - scale=false,% - product/.is if=@dref@product,% - product/.default=true,% - product=false,% - increase/.is if=@dref@increase,% - increase/.default=true,% - increase=false,% - overhead/.is if=@dref@increase,% - overhead/.default=true,% - overhead=false,% - percent/.is if=@dref@percent,% - percent/.default=true,% - percent=false,% - abs/.is if=@dref@abs,% - abs/.default=true,% - abs=false,% - negate/.is if=@dref@neg,% - negate/.default=true,% - negate=false,% -} - -\def\drefrel{\@ifstar\@@drefrel\@drefrel} - -\newcommand{\@drefrel}[2][]{% - \@@drefrel[#1]{#2}% - \@@drefrel@result% - \dref@mkannotate{\textbackslash{}drefrel[#1]\{#2\}}% +\drefkeys{% + factor of/.style={% + @get key or value to={#1}{\drefrel@tmp}{\drefrel@tmpunit}, + unit/@assert compatible=\drefrel@tmpunit, + @calc pgf/.expanded={(\noexpand\drefresult)/(\drefrel@tmp)}, + @calc/.append code={\def\drefunit{}}, + }, + percent/.style={ + @calc pgf={100 * (\drefresult)}, + }, + percent of/.style={ + factor of=#1, percent, + @calc/.append code={\def\drefunit{}}, + }, + scale by/.style={ + @get key or value to={#1}{\drefrel@tmp}{\drefrel@tmpunit},% + unit/@assert unitless=\drefrel@tmpunit, + @calc pgf/.expanded={(\drefrel@tmp) * (\noexpand\drefresult)}, + }, + product/.style={scale by={#1}}, + divide by/.style={ + @get key or value to={#1}{\drefrel@tmp}{\drefrel@tmpunit},% + unit/@assert unitless=\drefrel@tmpunit, + @calc pgf/.expanded={(\noexpand\drefresult) / (\drefrel@tmp)}, + }, + divide/.style={divide by}, + product/.style={scale by={#1}}, + increase factor from/.style={ + @get key or value to={#1}{\drefrel@tmp}{\drefrel@tmpunit}, + unit/@assert compatible=\drefrel@tmpunit, + @calc pgf/.expanded={((\noexpand\drefresult)-(\drefrel@tmp))/(\drefrel@tmp)}, + @calc/.append code={\def\drefunit{}}, + }, + increase percent from/.style={increase factor from={#1}, percent}, + decrease factor from/.style={increase factor from={#1}, negate}, + decrease percent from/.style={increase factor from={#1}, negate, percent}, + increase from/.style={ + @get key or value to={#1}{\drefrel@tmp}{\drefrel@tmpunit},% + unit/@assert compatible=\drefrel@tmpunit, + @calc pgf/.expanded={((\noexpand\drefresult)-(\drefrel@tmp))}, + }, + decrease from/.style={increase from={#1}, negate}, + abs/.style={ + @calc pgf={abs(\drefresult)} + }, + negate/.style={ + @calc pgf={-1 * (\drefresult)} + }, +} + +\def\drefrel{\@ifstar\drefrel@starred\drefrel@unstarred} + +\newcommand{\drefrel@unstarred}[2][]{% + \drefkeys{@[, + @init, + path={#2}, print=default, #1, + @get key or value, @calc, @print, @set, + @], + @annotate={\textbackslash drefrel[#1]\{#2\}}}% +} + +\newcommand{\drefrel@starred}[2][]{% + \drefkeys{ + @[, @init, + path={#2}, #1, + @get key or value, @calc, @set, + @], + @annotate={\textbackslash drefrel[#1]\{#2\}}, + }% +} + +% Unit scaling + +\def\dref@unit@key#1#2{% + dref@unit@\expandafter\detokenize\expandafter{#1}@\expandafter\detokenize\expandafter{#2}} + +\def\dref@unit@new#1{% + \def\dref@unit@scala{}% + \def\dref@unit@new@outer##1/##2,##3\@nnil{% + \def\dref@outer{\dref@unit@new@outer##3\@nnil}% + \listadd{\dref@unit@scala}{##2}% + \ifx##3&&% + \def\dref@outer{}% + \fi% + \dref@outer% + }% + \dref@unit@new@outer#1,\@nnil% + \def\dref@unit@new@outer##1/##2,##3\@nnil{% + \def\dref@outer{\dref@unit@new@outer##3\@nnil}% + \pgfkeys{/dref/units/\detokenize{##2} to \detokenize{##2}/.initial={* 1},% + /dref/units/scala \detokenize{##2}/.initial/.expand once={\dref@unit@scala}}% + \ifx##3&&% + \def\dref@outer{}% + \else% + \def\dref@unit@factor{}% + \dref@unit@new@inner{##2}##3\@stop% + \fi% + \dref@outer% + } + \def\dref@unit@new@inner##1##2/##3,##4\@stop{% + \def\dref@inner{\dref@unit@new@inner{##1}##4\@stop}% + \ifx##4&&\def\dref@inner{}\else\fi% + \edef\dref@unit@factor{\dref@unit@factor * ##2}% + \pgfkeys{/dref/units/\detokenize{##1} to \detokenize{##3}/.initial/.expanded={* (1 \dref@unit@factor)},% + /dref/units/\detokenize{##3} to \detokenize{##1}/.initial/.expanded={/ (1 \dref@unit@factor)},% + }% + \dref@inner% + }% + \dref@unit@new@outer#1,\@nnil% } -\newcommand{\@@drefrel}[2][]{% - \begingroup% - \pgfkeys{/pgf/fpu}% - \pgfkeys{/dref/.cd,#1}% - \pgfkeys{/dref/value=#2}% - \if@dref@valuemustderef% - \drefref{\pgfkeysvalueof{/dref/value}}% - \edef\drefvalue{\drefvalueof{\pgfkeysvalueof{/dref/value}}}% - \else% - \def\drefvalue{\pgfkeysvalueof{/dref/value}}% - \fi% - \if@dref@basemustderef% - \drefref{\pgfkeysvalueof{/dref/base}}% - \def\drefbase{\drefvalueof{\pgfkeysvalueof{/dref/base}}}% - \else% - \def\drefbase{\pgfkeysvalueof{/dref/base}}% - \fi% - \xdef\drefresult{\drefvalue}% - \if@dref@increase% - \pgfmathparse{((\drefvalue) - (\drefbase)) / (\drefbase)}% - \def\drefresult{\pgfmathresult}% - \else% - \if@dref@factor% - \pgfmathparse{(\drefvalue) / (\drefbase)}% - \def\drefresult{\pgfmathresult}% - \else% - \if@dref@delta% - \pgfmathparse{(\drefvalue) - (\drefbase)}% - \def\drefresult{\pgfmathresult}% - \else% - \if@dref@product% - \pgfmathparse{(\drefvalue) * (\drefbase)}% - \def\drefresult{\pgfmathresult}% - \else - \def\drefresult{\drefvalue}% - \fi +\drefkeys{ + unit/new scala/.code={% + \dref@unit@new{#1}% + }, + unit/.style={ + unit/@load={#1}, + unit/@format enable, + @get/.append style={unit/@load={#1}}, % Override Unit from loads + }, + unit/(a)load/.code={% #1 Is plain unit + \def\drefunit{#1}% + }, + unit/@try override/.code={% #1 must be unit holding macro + \ifx#1\empty#1\else% + \expandafter\def\expandafter\drefunit\expandafter{#1}% + \fi% + }, + unit/@format enable/.code={% + \ifx\drefunit\empty\drefunit\else% + \drefkeys{unit/format=default}% + \fi% + }, + unit/@assert unitless/.code={% + \ifx\drefunit\empty\drefunit\else% We are unit less: good + \ifx#1\empty#1\else% Other has no unit, also good + \dref@error{At least one should be unitless: + \expandafter\detokenize\expandafter{\drefunit}, + \expandafter\detokenize\expandafter{#1}} + % There is some unit here. That is BAD + \fi\fi% + }, + unit/@assert compatible/.code={% + \ifx\drefunit\empty\drefunit\else% We are unit less: good + \ifx#1\empty#1\else% Other has no unit, also good + \ifx\drefunit#1\else% Bot equal: also good + \dref@error{Incompatible Units: + \expandafter\detokenize\expandafter{\drefunit} + != \expandafter\detokenize\expandafter{#1}} \fi% - \fi% - \fi% - % Percent - \if@dref@percent% - \pgfmathparse{(\drefresult)*100.0}% - \def\drefresult{\pgfmathresult}% - \fi% - % Absolute Value - \if@dref@abs% - \pgfmathparse{abs(\drefresult)}% - \def\drefresult{\pgfmathresult}% - \fi% - % Negative Value - \if@dref@neg% - \pgfmathparse{-1.0*(\drefresult)}% - \def\drefresult{\pgfmathresult}% - \fi% - \pgfmathparse{\drefresult/\pgfkeysvalueof{/dref/divide}}% - \pgfmathprintnumberto[fixed,assume math mode=true,precision=10,1000 sep={}]{\pgfmathresult}{\drefresult}% - \pgfmathprintnumberto{\pgfmathresult}{\@@drefrel@result}% - \xdef\drefresult{\drefresult}% - \xdef\@@drefrel@result{\@@drefrel@result}% - \endgroup% + \fi% + \fi% + }, + unit/(a)combine/.style={ + unit/@assert compatible={#1}, unit/@try override={#1}, unit/@format enable + }, + unit/scale to/.code={% + \edef\dref@unit@key{/dref/units/\expandafter\detokenize\expandafter{\drefunit} to \detokenize{#1}}% + \drefkeys{% + \dref@unit@key/.get=\dref@unit@factor,% + @calc pgf/.expanded={((\noexpand\drefresult) \dref@unit@factor)},% + unit=#1% + }% + }, + unit/scale to auto/.default=50, + unit/scale to auto/.style={% #1 is the optimal value + @calc/.append code={ + \dref@ifunit{%Only do the scaling, if there is a unit + \edef\dref@unit@key{/dref/units/scala \expandafter\detokenize\expandafter{\drefunit}}% + % Get all other units in the same scala + \drefkeys{\dref@unit@key/.get=\dref@unit@scala}% + \expandafter\def\expandafter\drefunit@best\expandafter{\drefunit}% + \def\drefunit@bestvalue{\drefresult}% + \def\@@score####1{1 / ( abs(#1) - abs(####1))}% + \def\do####1{% + \edef\dref@unit@key{/dref/units/\expandafter\detokenize\expandafter{\drefunit} to \detokenize{####1}}% + \pgfkeys{\dref@unit@key/.get=\dref@unit@factor}% + \pgfmathparse{\@@score{\drefunit@bestvalue} < \@@score{\drefresult \dref@unit@factor}}% + %\typeout{\drefunit \pgfmathresult \detokenize{####1}}% + \ifdim\pgfmathresult pt=1.0 pt% + \pgfmathparse{(\drefresult) \dref@unit@factor}% + \edef\drefunit@bestvalue{\pgfmathresult}% + \def\drefunit@best{####1}% + %\typeout{\expandafter\detokenize\expandafter{\drefunit} to + % \detokenize{####1} : \drefunit@bestvalue}% + \fi% + }% + \dolistloop\dref@unit@scala% + \edef\drefresult{\drefunit@bestvalue}% + \edef\drefunit{\expandonce{\drefunit@best}}% + }{}% ! \drefunit=\empty + } + }, + unit/format default/.initial={plain}, + unit/format/.is choice, + unit/format/no/.style={unit/format default=no, @print unit/.code={}}, + unit/format/false/.style={unit/format default=no, @print unit/.code={}}, + unit/format/plain/.style={ + unit/format default=plain, + @print unit/.code={\dref@ifunit{\,\drefunit}{}} + }, + unit/format/typeout/.style={ + unit/format default=typeout, + @print unit/.code={\dref@ifunit{\expandafter\typeout\expandafter{\drefunit}}{}} + }, + unit/format/siunitx/.style={ + unit/format default=siunitx, + @print unit/.code={\dref@ifunit{\,\expandafter\si\expandafter{\drefunit}}{}} + }, + unit/format/default/.style={% + unit/format default/.get=\dref@unit@format, + unit/format/.expand once=\dref@unit@format + }, } +\def\dref@ifunit#1#2{% + \expandafter\ifblank\expandafter{\drefunit}{#2}{#1}% +} + + \endinput %% %% End of file `dataref.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dataref.tlpobj new/tlpkg/tlpobj/dataref.tlpobj --- old/tlpkg/tlpobj/dataref.tlpobj 2016-04-14 18:55:16.000000000 +0200 +++ new/tlpkg/tlpobj/dataref.tlpobj 2017-04-14 17:37:36.000000000 +0200 @@ -1,16 +1,16 @@ name dataref category Package -revision 38394 +revision 42883 shortdesc Manage references to experimental data relocated 1 longdesc The package provides a mechanism that maintains a fixed longdesc symbolic reference to numerical results; such results may vary longdesc as the project proceeds (and hence the project report longdesc develops). -runfiles size=5 +runfiles size=7 RELOC/tex/latex/dataref/dataref.sty catalogue-ctan /macros/latex/contrib/dataref -catalogue-date 2015-09-17 13:55:01 +0200 +catalogue-date 2017-01-06 13:05:21 +0100 catalogue-license lppl1.3 catalogue-topics label-ref data-manip -catalogue-version 0.5 +catalogue-version 0.6

1 0

commit texlive-specs-e 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-e for openSUSE:Factory checked in at 2017-06-25 19:21:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-e (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-e.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-e" Sun Jun 25 19:21:33 2017 rev:27 rq:504794 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.changes 2017-06-08 14:54:17.124844668 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-e.new/texlive-specs-e.changes 2017-06-25 19:24:02.388108808 +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: ---- concmath-fonts.doc.tar.xz concmath-fonts.tar.xz concprog.doc.tar.xz concprog.tar.xz concrete.doc.tar.xz concrete.tar.xz confproc.doc.tar.xz confproc.tar.xz constants.doc.tar.xz constants.tar.xz conteq.doc.tar.xz conteq.tar.xz context-account.doc.tar.xz context-account.tar.xz context-algorithmic.tar.xz context-animation.doc.tar.xz context-animation.tar.xz context-annotation.doc.tar.xz context-annotation.tar.xz context-bnf.doc.tar.xz context-bnf.tar.xz context-chromato.doc.tar.xz context-chromato.tar.xz context-construction-plan.doc.tar.xz context-construction-plan.tar.xz context-cyrillicnumbers.doc.tar.xz context-cyrillicnumbers.tar.xz context-degrade.doc.tar.xz context-degrade.tar.xz context-fancybreak.doc.tar.xz context-fancybreak.tar.xz context-filter.doc.tar.xz context-filter.tar.xz context-fixme.tar.xz context-french.doc.tar.xz context-french.tar.xz context-fullpage.doc.tar.xz context-fullpage.tar.xz context-games.doc.tar.xz context-games.tar.xz context-gantt.doc.tar.xz context-gantt.tar.xz context-gnuplot.doc.tar.xz context-gnuplot.tar.xz context-letter.doc.tar.xz context-letter.tar.xz context.doc.tar.xz context.tar.xz context_fourier-map.dif New: ---- changebar.doc.tar.xz changebar.tar.xz changelayout.doc.tar.xz changelayout.tar.xz changepage.doc.tar.xz changepage.tar.xz changes.doc.tar.xz changes.tar.xz chappg.doc.tar.xz chappg.tar.xz chapterfolder.doc.tar.xz chapterfolder.tar.xz charter.doc.tar.xz charter.tar.xz chbibref.doc.tar.xz chbibref.tar.xz checkcites.doc.tar.xz checkcites.tar.xz checklistings.doc.tar.xz checklistings.tar.xz chem-journal.tar.xz chemarrow.doc.tar.xz chemarrow.tar.xz chembst.doc.tar.xz chembst.tar.xz chemcompounds.doc.tar.xz chemcompounds.tar.xz chemcono.doc.tar.xz chemcono.tar.xz chemexec.doc.tar.xz chemexec.tar.xz chemfig.doc.tar.xz chemfig.tar.xz chemformula.doc.tar.xz chemformula.tar.xz chemgreek.doc.tar.xz chemgreek.tar.xz chemmacros.doc.tar.xz chemmacros.tar.xz chemnum.doc.tar.xz chemnum.tar.xz chemschemex.doc.tar.xz chemschemex.tar.xz chemstyle.doc.tar.xz chemstyle.tar.xz cherokee.doc.tar.xz cherokee.tar.xz chess-problem-diagrams.doc.tar.xz chess-problem-diagrams.tar.xz chess.doc.tar.xz chess.tar.xz childdoc.doc.tar.xz childdoc.tar.xz cje.doc.tar.xz cje.tar.xz combofont.doc.tar.xz combofont.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-e.spec ++++++ ++++ 40408 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-e.new/texlive-specs-e.spec ++++++ chessboard.doc.tar.xz ++++++ ++++++ chessboard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessboard.tlpobj new/tlpkg/tlpobj/chessboard.tlpobj --- old/tlpkg/tlpobj/chessboard.tlpobj 2016-04-14 18:49:50.000000000 +0200 +++ new/tlpkg/tlpobj/chessboard.tlpobj 2017-04-14 17:34:59.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/chessboard/chessboard-pgf.sty RELOC/tex/latex/chessboard/chessboard.sty catalogue-ctan /macros/latex/contrib/chessboard -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.7 ++++++ chessfss.doc.tar.xz ++++++ ++++++ chessfss.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessfss.tlpobj new/tlpkg/tlpobj/chessfss.tlpobj --- old/tlpkg/tlpobj/chessfss.tlpobj 2016-04-14 18:49:50.000000000 +0200 +++ new/tlpkg/tlpobj/chessfss.tlpobj 2017-04-14 17:34:59.000000000 +0200 @@ -45,7 +45,7 @@ RELOC/tex/latex/chessfss/lsiskak.fd RELOC/tex/latex/chessfss/lsiskaknew.fd catalogue-ctan /macros/latex/contrib/chessfss -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 games catalogue-version 1.2a ++++++ chet.doc.tar.xz ++++++ ++++++ chet.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chet.tlpobj new/tlpkg/tlpobj/chet.tlpobj --- old/tlpkg/tlpobj/chet.tlpobj 2016-04-14 18:49:50.000000000 +0200 +++ new/tlpkg/tlpobj/chet.tlpobj 2017-04-14 17:34:59.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/bibtex/bst/chet/chetref.bst RELOC/tex/latex/chet/chet.sty catalogue-ctan /macros/latex/contrib/chet -catalogue-date 2015-08-18 23:28:09 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout catalogue-version 2.1 ++++++ chextras.doc.tar.xz ++++++ ++++++ chextras.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chextras.tlpobj new/tlpkg/tlpobj/chextras.tlpobj --- old/tlpkg/tlpobj/chextras.tlpobj 2016-04-14 18:49:50.000000000 +0200 +++ new/tlpkg/tlpobj/chextras.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/chextras/t1lmvttos.fd catalogue-also chletter catalogue-ctan /macros/latex/contrib/chextras -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics swiss catalogue-version 1.01 ++++++ chicago-annote.doc.tar.xz ++++++ ++++++ chicago-annote.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chicago-annote.tlpobj new/tlpkg/tlpobj/chicago-annote.tlpobj --- old/tlpkg/tlpobj/chicago-annote.tlpobj 2016-04-14 18:49:51.000000000 +0200 +++ new/tlpkg/tlpobj/chicago-annote.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=10 RELOC/bibtex/bst/chicago-annote/chicago-annote.bst catalogue-ctan /biblio/bibtex/contrib/chicago-annote -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty bibtex-annote ++++++ chicago.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chicago.tlpobj new/tlpkg/tlpobj/chicago.tlpobj --- old/tlpkg/tlpobj/chicago.tlpobj 2016-04-14 18:49:50.000000000 +0200 +++ new/tlpkg/tlpobj/chicago.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/bibtex/bst/chicago/chicago.bst RELOC/tex/latex/chicago/chicago.sty catalogue-ctan /biblio/bibtex/contrib/chicago -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics bibtex-sty ++++++ chickenize.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/chickenize/README new/doc/luatex/chickenize/README --- old/doc/luatex/chickenize/README 2015-12-29 01:15:08.000000000 +0100 +++ new/doc/luatex/chickenize/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -This is the README file of the chickenize package. The package provides several commands and Lua functions to manipulate the input or output tokens of any Lua(La)TeX document. It serves mostly educational and playful usage, but some functions may be used in serious documents. - -To produce the package files, run lualatex on chickinize.dtx, wich should result in the creation of the following files: - chickenize.pdf (documentation) - chickenize.tex (plainTeX user interface) - chickenize.sty (LaTeX user interface) - chickenize.lua (Lua package code) [does the actual work] - -You need an up-to-date TeX Live (2015, possible) to use this package. Maybe a full MiKTeX will do, too. - -For any comments or suggestions, contact me: -arno dot trautmann at gmx dot de - -Hope you have fun with this package! - -This package is copyright © 2015 Arno L. Trautmann. It may be distributed and/or -modified under the conditions of the LaTeX Project Public License, either version 1.3c -of this license or (at your option) any later version. This work has the LPPL mainten- -ance status ‘author-maintained’. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/chickenize/README.md new/doc/luatex/chickenize/README.md --- old/doc/luatex/chickenize/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/luatex/chickenize/README.md 2016-11-25 19:30:33.000000000 +0100 @@ -0,0 +1,19 @@ +The package chickenize provides several commands and Lua functions to manipulate the input or output tokens of any Lua(La)TeX document. It serves mostly educational and playful usage, but some functions may be used in serious documents. + +To produce the package files, run lualatex on chickinize.dtx, wich should result in the creation of the following files: + chickenize.pdf (documentation) + chickenize.tex (plainTeX user interface) + chickenize.sty (LaTeX user interface) + chickenize.lua (Lua package code) [does the actual work] + +You need an up-to-date TeX Live (2016, if possible) to use this package. Maybe a full MiKTeX will will also work. (Not tested!) Lua\TeX > 0.90 is required for some features since the corresponding syntax has changed! + +For any comments or suggestions, contact me: +arno dot trautmann at gmx dot de + +Hope you have fun with this package! + +This package is copyright © 2016 Arno L. Trautmann. It may be distributed and/or +modified under the conditions of the LaTeX Project Public License, either version 1.3c +of this license or (at your option) any later version. This work has the LPPL mainten- +ance status ‘maintained’. Binary files old/doc/luatex/chickenize/chickenize.pdf and new/doc/luatex/chickenize/chickenize.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.doc.tlpobj new/tlpkg/tlpobj/chickenize.doc.tlpobj --- old/tlpkg/tlpobj/chickenize.doc.tlpobj 2016-04-14 18:49:51.000000000 +0200 +++ new/tlpkg/tlpobj/chickenize.doc.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -1,8 +1,8 @@ name chickenize.doc category Package -revision 39341 +revision 42341 shortdesc doc files of chickenize relocated 1 -docfiles size=48 - RELOC/doc/luatex/chickenize/README +docfiles size=49 + RELOC/doc/luatex/chickenize/README.md RELOC/doc/luatex/chickenize/chickenize.pdf ++++++ chickenize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.lua new/tex/luatex/chickenize/chickenize.lua --- old/tex/luatex/chickenize/chickenize.lua 2016-01-11 01:11:00.000000000 +0100 +++ new/tex/luatex/chickenize/chickenize.lua 2016-11-25 19:34:04.000000000 +0100 @@ -13,27 +13,29 @@ -- of this license or (at your option) any later version. This work has the LPPL mainten- -- ance status ‘maintained’. -local nodenew = node.new +local nodeid = node.id local nodecopy = node.copy +local nodenew = node.new local nodetail = node.tail -local nodeinsertbefore = node.insert_before -local nodeinsertafter = node.insert_after +local nodeslide = node.slide local noderemove = node.remove -local nodeid = node.id local nodetraverseid = node.traverse_id -local nodeslide = node.slide +local nodeinsertafter = node.insert_after +local nodeinsertbefore = node.insert_before Hhead = nodeid("hhead") RULE = nodeid("rule") GLUE = nodeid("glue") WHAT = nodeid("whatsit") COL = node.subtype("pdf_colorstack") -PDF_LITERAL = node.subtype("pdf_literal") +DISC = nodeid("disc") GLYPH = nodeid("glyph") GLUE = nodeid("glue") -PENALTY = nodeid("penalty") -GLUE_SPEc = nodeid("glue_spec") +HLIST = nodeid("hlist") KERN = nodeid("kern") +PUNCT = nodeid("punct") +PENALTY = nodeid("penalty") +PDF_LITERAL = node.subtype("pdf_literal") color_push = nodenew(WHAT,COL) color_pop = nodenew(WHAT,COL) color_push.stack = 0 @@ -52,7 +54,7 @@ local match = unicode.utf8.match chickenize_ignore_word = false chickenize_real_stuff = function(i,head) - while ((i.next.id == GLYPH) or (i.next.id == 11) or (i.next.id == 7) or (i.next.id == 0)) do --find end of a word + while ((i.next.id == GLYPH) or (i.next.id == KERN) or (i.next.id == DISC) or (i.next.id == HLIST)) do --find end of a word i.next = i.next.next end @@ -75,10 +77,9 @@ chicken[j].char = s if match(char,"%s") then chicken[j] = nodenew(GLUE) - chicken[j].spec = nodenew(GLUE_SPEC) - chicken[j].spec.width = space - chicken[j].spec.shrink = shrink - chicken[j].spec.stretch = stretch + chicken[j].width = space + chicken[j].shrink = shrink + chicken[j].stretch = stretch end j = j+1 end @@ -115,7 +116,7 @@ end -- At the end of the word, the ignoring is reset. New chance for everyone. - if not((i.next.id == GLYPH) or (i.next.id == 7) or (i.next.id == 22) or (i.next.id == 11)) then + if not((i.next.id == GLYPH) or (i.next.id == DISC) or (i.next.id == PUNCT) or (i.next.id == KERN)) then chickenize_ignore_word = false end end @@ -395,13 +396,11 @@ end return head end -local letterspace_glue = nodenew(nodeid"glue") -local letterspace_spec = nodenew(nodeid"glue_spec") -local letterspace_pen = nodenew(nodeid"penalty") - -letterspace_spec.width = tex.sp"0pt" -letterspace_spec.stretch = tex.sp"0.05pt" -letterspace_glue.spec = letterspace_spec +local letterspace_glue = nodenew(nodeid"glue") +local letterspace_pen = nodenew(nodeid"penalty") + +letterspace_glue.width = tex.sp"0pt" +letterspace_glue.stretch = tex.sp"0.5pt" letterspace_pen.penalty = 10000 letterspaceadjust = function(head) for glyph in nodetraverseid(nodeid"glyph", head) do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.sty new/tex/luatex/chickenize/chickenize.sty --- old/tex/luatex/chickenize/chickenize.sty 2016-01-11 01:11:00.000000000 +0100 +++ new/tex/luatex/chickenize/chickenize.sty 2016-11-25 19:34:04.000000000 +0100 @@ -13,7 +13,7 @@ %% of this license or (at your option) any later version. This work has the LPPL mainten- %% ance status ‘maintained’. \ProvidesPackage{chickenize}% - [2016/01/09 v0.2.3 chickenize package] + [2016/05/27 v0.2.4 chickenize package] \input{chickenize} \iffalse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/chickenize/chickenize.tex new/tex/luatex/chickenize/chickenize.tex --- old/tex/luatex/chickenize/chickenize.tex 2016-01-11 01:11:00.000000000 +0100 +++ new/tex/luatex/chickenize/chickenize.tex 2016-11-25 19:34:04.000000000 +0100 @@ -18,7 +18,7 @@ \bgroup% \fontspec{Latin Modern Sans}% A% - \kern-.37em \raisebox{.7ex}{\scalebox{0.25}{L}}% + \kern-.4em \raisebox{.65ex}{\scalebox{0.3}{L}}% \kern-.0em \raisebox{-0.98ex}{T}% \egroup% } @@ -157,6 +157,23 @@ } \let\dubstepize\dubstepenize +\def\explainbackslashes{ %% inspired by xkcd #1638 + {\tt\noindent +\textbackslash escape character\\ +\textbackslash\textbackslash line end or escaped escape character in tex.print("")\\ +\textbackslash\textbackslash\textbackslash real, real backslash\\ +\textbackslash\textbackslash\textbackslash\textbackslash line end in tex.print("")\\ +\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash elder backslash \\ +\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash which escapes the screen and enters your brain\\ +\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash so real it transcends time and space \\ +\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash backslash to end all other text\\ +\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash\textbackslash... the true name of Ba'al, the soul-eater} +} + +\def\gameoflife{ + Your Life Is Tetris. Stop Playing It Like Chess. +} + \def\guttenbergenize{ %% makes only sense when using LaTeX \AtBeginDocument{ \let\grqq\relax\let\glqq\relax @@ -255,6 +272,11 @@ \let\nyanize\rainbowcolor \let\unnyanize\unrainbowcolor +\def\randomchars{ + \directlua{luatexbase.add_to_callback("post_linebreak_filter",randomchars,"randomchars")}} +\def\unrandomchars{ + \directlua{luatexbase.remove_from_callback("post_linebreak_filter","randomchars")}} + \def\randomcolor{ \directlua{luatexbase.add_to_callback("post_linebreak_filter",randomcolor,"randomcolor")}} \def\unrandomcolor{ @@ -381,40 +403,35 @@ }% } \long\def\drawchicken{ -\luadraw{90}{ -kopf = {200,50} % Kopfmitte -kopf_rad = 20 - -d = {215,35} % Halsansatz -e = {230,10} % - -korper = {260,-10} -korper_rad = 40 - -bein11 = {260,-50} -bein12 = {250,-70} -bein13 = {235,-70} - -bein21 = {270,-50} -bein22 = {260,-75} -bein23 = {245,-75} - -schnabel_oben = {185,55} -schnabel_vorne = {165,45} -schnabel_unten = {185,35} - -flugel_vorne = {260,-10} -flugel_unten = {280,-40} -flugel_hinten = {275,-15} - -sloppycircle(kopf,kopf_rad) -sloppyline(d,e) -sloppycircle(korper,korper_rad) -sloppyline(bein11,bein12) sloppyline(bein12,bein13) -sloppyline(bein21,bein22) sloppyline(bein22,bein23) -sloppyline(schnabel_vorne,schnabel_oben) sloppyline(schnabel_vorne,schnabel_unten) -sloppyline(flugel_vorne,flugel_unten) sloppyline(flugel_hinten,flugel_unten) -} + \luadraw{90}{ + chickenhead = {200,50} % chicken head center + chickenhead_rad = 20 + + neckstart = {215,35} % neck + neckstop = {230,10} % + + chickenbody = {260,-10} + chickenbody_rad = 40 + chickenleg = { + {{260,-50},{250,-70},{235,-70}}, + {{270,-50},{260,-75},{245,-75}} + } + + beak_top = {185,55} + beak_front = {165,45} + beak_bottom = {185,35} + + wing_front = {260,-10} + wing_bottom = {280,-40} + wing_back = {275,-15} + + sloppycircle(chickenhead,chickenhead_rad) sloppyline(neckstart,neckstop) + sloppycircle(chickenbody,chickenbody_rad) + sloppyline(chickenleg[1][1],chickenleg[1][2]) sloppyline(chickenleg[1][2],chickenleg[1][3]) + sloppyline(chickenleg[2][1],chickenleg[2][2]) sloppyline(chickenleg[2][2],chickenleg[2][3]) + sloppyline(beak_front,beak_top) sloppyline(beak_front,beak_bottom) + sloppyline(wing_front,wing_bottom) sloppyline(wing_back,wing_bottom) + } } %% %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chickenize.tlpobj new/tlpkg/tlpobj/chickenize.tlpobj --- old/tlpkg/tlpobj/chickenize.tlpobj 2016-04-14 18:49:51.000000000 +0200 +++ new/tlpkg/tlpobj/chickenize.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -1,6 +1,6 @@ name chickenize category Package -revision 39341 +revision 42341 shortdesc Use lua callbacks for "interesting" textual effects relocated 1 longdesc The package allows manipulations of any LuaTeX document (it is @@ -15,7 +15,7 @@ RELOC/tex/luatex/chickenize/chickenize.sty RELOC/tex/luatex/chickenize/chickenize.tex catalogue-ctan /macros/luatex/generic/chickenize -catalogue-date 2016-01-10 08:26:51 +0100 +catalogue-date 2016-10-24 19:26:02 +0200 catalogue-license lppl1.3 catalogue-topics typesetting games luatex -catalogue-version 0.2.3 +catalogue-version 0.2.4 ++++++ chivo.doc.tar.xz ++++++ ++++++ chivo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chivo.tlpobj new/tlpkg/tlpobj/chivo.tlpobj --- old/tlpkg/tlpobj/chivo.tlpobj 2016-05-08 03:15:15.000000000 +0200 +++ new/tlpkg/tlpobj/chivo.tlpobj 2017-04-14 17:35:00.000000000 +0200 @@ -165,7 +165,7 @@ RELOC/tex/latex/chivo/T1Chivo-TLF.fd RELOC/tex/latex/chivo/TS1Chivo-TLF.fd catalogue-ctan /fonts/chivo -catalogue-date 2016-05-06 07:19:04 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-sans font-otf font-supp font-type1 font-t1enc catalogue-version 1.0 ++++++ chkfloat.doc.tar.xz ++++++ ++++++ chkfloat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chkfloat.tlpobj new/tlpkg/tlpobj/chkfloat.tlpobj --- old/tlpkg/tlpobj/chkfloat.tlpobj 2016-04-14 18:49:51.000000000 +0200 +++ new/tlpkg/tlpobj/chkfloat.tlpobj 2017-04-14 17:35:01.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/chkfloat/chkfloat.sty catalogue-ctan /macros/latex/contrib/chkfloat -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 0.1 ++++++ chktex.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/chktex/ChkTeX.pdf and new/texmf-dist/doc/chktex/ChkTeX.pdf differ Binary files old/texmf-dist/doc/man/man1/chktex.man1.pdf and new/texmf-dist/doc/man/man1/chktex.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/chkweb.man1.pdf and new/texmf-dist/doc/man/man1/chkweb.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/deweb.man1.pdf and new/texmf-dist/doc/man/man1/deweb.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.doc.tlpobj new/tlpkg/tlpobj/chktex.doc.tlpobj --- old/tlpkg/tlpobj/chktex.doc.tlpobj 2016-04-27 03:16:35.000000000 +0200 +++ new/tlpkg/tlpobj/chktex.doc.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,8 +1,8 @@ name chktex.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of chktex -docfiles size=81 +docfiles size=96 texmf-dist/doc/chktex/ChkTeX.pdf texmf-dist/doc/man/man1/chktex.1 texmf-dist/doc/man/man1/chktex.man1.pdf ++++++ chktex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/chktex/chktexrc new/texmf-dist/chktex/chktexrc --- old/texmf-dist/chktex/chktexrc 2015-04-12 18:20:42.000000000 +0200 +++ new/texmf-dist/chktex/chktexrc 2017-04-14 01:32:21.000000000 +0200 @@ -493,6 +493,8 @@ \citet:*[][]{} \citep:*[][]{} \citealt:*{} \citealp:*[]{} \citeauthor:*{} \Citet:*[][]{} \Citep:*[][]{} \Citealt:*{} \Citealp:*[]{} \Citeauthor:{} \citetext:{} \citeyear:*{} \citeyearpar:{} + # tipa which uses " + \textipa:{} } ##################################################################### @@ -545,7 +547,7 @@ VerbEnvir { verbatim comment listing verbatimtab rawhtml errexam picture texdraw - filecontents pgfpicture tikzpicture + filecontents pgfpicture tikzpicture minted lstlisting IPA } ##################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/chktex/deweb.pl new/texmf-dist/scripts/chktex/deweb.pl --- old/texmf-dist/scripts/chktex/deweb.pl 2012-05-28 20:44:54.000000000 +0200 +++ new/texmf-dist/scripts/chktex/deweb.pl 2017-04-14 01:32:21.000000000 +0200 @@ -26,93 +26,104 @@ # # -print STDERR "DeWEB v1.2 - Copyright 1996 Jens T. Berger Thielemann\n"; +print STDERR "DeWEB v1.3 - Copyright 1996 Jens T. Berger Thielemann\n"; undef $/; -$texmode = 1; -$_ = <>; +my @FILES = @ARGV; +FILE: +while( my $file = shift @FILES ) { + + my $success = open my $fh, '<', "$file"; + if ( ! $success ) { + print STDERR "Couldn't open file '$file'\n"; + next FILE; + } + + $texmode = 1; + $_ = <$fh>; + + while (/\@/) { + &out($`); + $_ = $'; + + if (/^@/) { + $_ = $'; + &out('@'); + next; + } + + if (/^([\s\n])/) { + $_ = $'; + print "\n" if $1 eq "\n"; + $texmode = 1; + next; + } + + if (/^[cpd]/i) { + $_ = $'; + $texmode = 0; + next; + } + + if (/^\,/i) { + $_ = $'; + print '\,'; + next; + } + + if (m!^/!) { + $_ = $'; + print '\\\\'; + next; + } + + if (/^[h\&\|\;\#\+]/i || /^i.*/i) { + $_ = $'; + next; + } + + if (/^\*[0-9\*]?((.|\n)*?\.)/) { + $_ = $'; + print $1; + $texmode = 1; + next; + } + + if (/^[<(^.t!]((.|\n)*?)\@\>/i) { + $_ = $'; + print '{'.$1.'}'; + $texmode = 0; + next; + } + + if (/^[=]((.|\n)*?)\@\>/) { + $_ = $'; + print &printnl($1); + next; + } + + if (/^[fsl](\s+\S+\s+\S+)|^\'(.|\n)*?\'|^\[((.|\n)*?)\@\]/i) { + $_ = $'; + print &printnl($+); + next; + } -while(/\@/) -{ - &out($`); - $_ = $'; - - if(/^@/) { - $_ = $'; - &out('@'); - next; - } - - if(/^([\s\n])/) { - $_ = $'; - print "\n" if $1 eq "\n"; - $texmode = 1; - next; - } - - if(/^[cpd]/i) { - $_ = $'; - $texmode = 0; - next; - } - - if(/^\,/i) { - $_ = $'; - print '\,'; - next; - } - - if(m!^/!) { - $_ = $'; - print '\\\\'; - next; - } + @line = split(/\n/, $_, 2); + print STDERR "Unknown opcode, ignored. Buffer:\n$line[0]\n"; - if(/^[h\&\|\;\#\+]/i || /^i.*/i) { - $_ = $'; - next; } - if(/^\*[0-9\*]?((.|\n)*?\.)/) { - $_ = $'; - print $1; - $texmode = 1; - next; - } - - if(/^[<(^.t!]((.|\n)*?)\@\>/i) { - $_ = $'; - print '{'.$1.'}'; - $texmode = 0; - next; - } - - if(/^[=]((.|\n)*?)\@\>/) { - $_ = $'; - print &printnl($1); - next; - } - - if(/^[fsl](\s+\S+\s+\S+)|^\'(.|\n)*?\'|^\[((.|\n)*?)\@\]/i) { - $_ = $'; - print &printnl($+); - next; - } - - @line = split(/\n/, $_, 2); - print STDERR "Unknown opcode, ignored. Buffer:\n$line[0]\n"; + print $_; } -print $_; - sub printnl { my($foo); - if(defined $_[0]) { - $foo = $_[0]; - $foo =~ s/.//g; + if (defined $_[0]) { + $foo = $_[0]; + $foo =~ s/.//g; } else { - $foo = ""; + $foo = ""; } $foo; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.tlpobj new/tlpkg/tlpobj/chktex.tlpobj --- old/tlpkg/tlpobj/chktex.tlpobj 2016-04-27 03:16:36.000000000 +0200 +++ new/tlpkg/tlpobj/chktex.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name chktex category TLCore -revision 40768 +revision 44166 shortdesc Check for errors in LaTeX documents longdesc The program reports typographic and other errors in LaTeX longdesc documents. Filters are also provided for checking the LaTeX @@ -11,7 +11,7 @@ texmf-dist/scripts/chktex/chkweb.sh texmf-dist/scripts/chktex/deweb.pl catalogue-ctan /support/chktex -catalogue-date 2015-12-09 07:13:40 +0100 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license gpl2 catalogue-topics debug-supp -catalogue-version 1.7.5 +catalogue-version 1.7.6 ++++++ chletter.doc.tar.xz ++++++ ++++++ chletter.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chletter.tlpobj new/tlpkg/tlpobj/chletter.tlpobj --- old/tlpkg/tlpobj/chletter.tlpobj 2016-04-14 18:49:54.000000000 +0200 +++ new/tlpkg/tlpobj/chletter.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/tex/latex/chletter/chletter.cls catalogue-ctan /macros/latex/contrib/chletter -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics letter swiss catalogue-version 2.0 ++++++ chngcntr.doc.tar.xz ++++++ ++++++ chngcntr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chngcntr.tlpobj new/tlpkg/tlpobj/chngcntr.tlpobj --- old/tlpkg/tlpobj/chngcntr.tlpobj 2016-04-14 18:49:54.000000000 +0200 +++ new/tlpkg/tlpobj/chngcntr.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/chngcntr/chngcntr.sty catalogue-ctan /macros/latex/contrib/chngcntr -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 counter-mgmt catalogue-version 1.0a ++++++ chronology.doc.tar.xz ++++++ ++++++ chronology.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chronology.tlpobj new/tlpkg/tlpobj/chronology.tlpobj --- old/tlpkg/tlpobj/chronology.tlpobj 2016-04-14 18:49:55.000000000 +0200 +++ new/tlpkg/tlpobj/chronology.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/chronology/chronology.sty catalogue-ctan /macros/latex/contrib/chronology -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics planning calendar catalogue-version 1.1.1 ++++++ chronosys.doc.tar.xz ++++++ ++++++ chronosys.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chronosys.tlpobj new/tlpkg/tlpobj/chronosys.tlpobj --- old/tlpkg/tlpobj/chronosys.tlpobj 2016-04-14 18:49:55.000000000 +0200 +++ new/tlpkg/tlpobj/chronosys.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/generic/chronosys/chronosyschr.tex RELOC/tex/generic/chronosys/x-chronosys.tex catalogue-ctan /macros/latex/contrib/chronosys -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram catalogue-version 1.2 ++++++ chscite.doc.tar.xz ++++++ ++++++ chscite.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chscite.tlpobj new/tlpkg/tlpobj/chscite.tlpobj --- old/tlpkg/tlpobj/chscite.tlpobj 2016-04-14 18:49:55.000000000 +0200 +++ new/tlpkg/tlpobj/chscite.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/bibtex/bst/chscite/chscite.bst RELOC/tex/latex/chscite/chscite.sty catalogue-ctan /macros/latex/contrib/chscite -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-supp catalogue-version 2.9999 ++++++ churchslavonic.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/churchslavonic/README new/doc/latex/churchslavonic/README --- old/doc/latex/churchslavonic/README 2016-05-16 00:16:48.000000000 +0200 +++ new/doc/latex/churchslavonic/README 2016-12-20 00:01:03.000000000 +0100 @@ -8,6 +8,13 @@ Only Unicode input encoding is supported. This package requires use of a modern TeX engine that supports Unicode, such as XeTeX or LuaTeX. +Changelog +--------- + +v0.2.1 2016.12.18 - gloss file included in CTAN package +v0.2 2016.10.23 - new macrocommands and docs +v0.1 2016.05.10 - first draft release + Installation ------------ Binary files old/doc/latex/churchslavonic/churchslavonic-en.pdf and new/doc/latex/churchslavonic/churchslavonic-en.pdf differ Binary files old/doc/latex/churchslavonic/churchslavonic-ru.pdf and new/doc/latex/churchslavonic/churchslavonic-ru.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/churchslavonic/churchslavonic.tex new/doc/latex/churchslavonic/churchslavonic.tex --- old/doc/latex/churchslavonic/churchslavonic.tex 2016-05-16 00:16:48.000000000 +0200 +++ new/doc/latex/churchslavonic/churchslavonic.tex 2016-11-25 19:28:25.000000000 +0100 @@ -1,7 +1,7 @@ -\newfontfamily\russianfont[Script=Cyrillic,Ligatures=TeX]{Times New Roman} +\newfontfamily\russianfont[Script=Cyrillic,Ligatures=TeX]{Linux Libertine O} \newfontfamily\russianfonttt[Ligatures=TeX]{lmmono10-regular.otf} \newfontfamily\russianfontsf[Ligatures=TeX]{lmsans10-regular.otf} -\newfontfamily\churchslavonicfont[Script=Cyrillic,Ligatures=TeX,HyphenChar="005F]{PonomarUnicode.otf} +\newfontfamily\churchslavonicfont[Script=Cyrillic,Ligatures=TeX,HyphenChar=_]{PonomarUnicode.otf} \usepackage{churchslavonic} \usepackage{hyperref} @@ -15,7 +15,7 @@ \cuDefineDateFormat{long}{% \cuDayName{\cuDOW}, \cuNum{\cuDAY}_гѡ~% - \cuMonthName{\cuMONTH}~% + \cuMonthName{\cuMONTH},~% лѣ́та ѿ сотворе́нїѧ мі́ра~\cuNum{\cuYEARAM}% } % @@ -29,12 +29,12 @@ \begin{EN} \title{\pkg{churchslavonic} package --- Church Slavonic Typography in \LaTeX} -\author{Aleksandr Andreev and Mike Kroutikov\\version~0.1} +\author{Aleksandr Andreev and Mike Kroutikov\\version~0.2} \end{EN} \begin{RU} \title{Пакет \pkg{churchslavonic} --- верстка церковнославянских текстов в системе \LaTeX} -\author{Александр Андреев и Михаил Крутиков\\версия~0.1} +\author{Александр Андреев и Михаил Крутиков\\версия~0.2} \end{RU} \date{\today} @@ -100,8 +100,8 @@ \begin{EN} \section{How to use the package} -To use \pkg{churchslavonic} package one needs to include the following declarations into the document -preamble: +To use the \pkg{churchslavonic} package one needs to include the following +declarations into the document preamble: \end{EN} \begin{RU} @@ -116,36 +116,47 @@ \end{verbatim} \begin{EN} -After that, use standard \pkg{polyglossia} commands to control current language. +This makes the Church Slavonic hyphenation patterns immediately available. +After that, use the standard \pkg{polyglossia} commands to control current language. +Church Slavonic fonts are provided by the \pkg{fonts-churchslavonic} package, +which should have been installed automatically when you installed this package. +See the \pkg{fonts-churchslavonic} documentation for information about fonts. \end{EN} \begin{RU} +Сразу станут доступны церковнославянские шаблоны переноса строки. После чего переключайтесь между языками стандартными средствами пакета \pkg{polyglossia}. +Церковнославянские шритфы предоставлены в отдельном пакете \pkg{fonts-churchslavonic}, +который должен был установиться когда вы установили этот пакет. +Подробности о шрифтах смотрите в документации к пакету \pkg{fonts-churchslavonic}. \end{RU} \begin{EN} -\subsection{Options \texttt{color}, \texttt{gray}, and \texttt{bw}} -These options control what color actually being used for text coloring commands like \cs{cuKinovar}. +\subsection{Options \texttt{color}, \texttt{gray} (= \texttt{grey}), and \texttt{bw}} +These options control what color is actually being used for text coloring commands like \cs{cuKinovar}. \begin{itemize} -\item \texttt{color} this is the default option and it preserves the original color (a shade of red). -\item \texttt{gray} replaces red color with a gray - useful if you are printing on a media that - does not support colors, but is capable of reproduction shades of gray. -\item \texttt{bw} replaces red color with black (effectively turning off commands like \cs{cuKinovar} and \cs{cuKinovarColor}). Use - this option to generate document that will be printed in blank-and-white. +\item \texttt{color} this is the default option; it indicates the original color (a shade of red). +\item \texttt{gray} (\texttt{grey}) replaces the red color with gray - useful if you are printing on media that + does not support color, but is capable of grayscale. +\item \texttt{bw} replaces the red color with black (effectively turning off +commands like \cs{cuKinovar} and \cs{cuKinovarColor}). Use + this option to generate a document that will be printed in black-and-white. \end{itemize} Example: \end{EN} \begin{RU} -\subsection{Опции \texttt{color}, \texttt{gray} и \texttt{bw}} -Опции позволяют отключать цвет раскраски текста в командах типа \cs{cuKinovar}. Полезны для создания версий для печати на -устройствах которые не поддерживают цветности. +\subsection{Опции \texttt{color}, \texttt{gray} (= \texttt{grey}) и \texttt{bw}} +Опции позволяют отключать цвет раскраски текста в командах типа \cs{cuKinovar}. +Полезны для создания версий для печати на +устройствах, которые не поддерживают цветности. \begin{itemize} -\item \texttt{color} эта опция используется по умолчанию и означает что используется нормальный красный цвет. -\item \texttt{gray} заменяет красный цвет серым --- используйте эту опцию если ваше устройство печати не - поддерживает цветности, но может качественно передавать градации серого цвета. +\item \texttt{color} эта опция используется по умолчанию и означает, +что используется нормальный красный цвет. +\item \texttt{gray} (\texttt{grey}) заменяет красный цвет серым --- используйте эту опцию если +ваше устройство печати не поддерживает цветности, но может качественно передавать градации серого цвета. \item \texttt{bw} отключает всякую раскраску --- используйте для создания черно-белой версии документа. \end{itemize} Пример: @@ -156,31 +167,92 @@ \end{verbatim} \begin{EN} +\subsection{Underscore} +The underscore symbol (\texttt{\textunderscore}, U+005F \textsc{Low Line}) + is a valid text symbol in Church Slavonic (it has roughly the same role +as the hyphen in English). The package \pkg{churchslavonic} redefines the +underscore in a way that it can be directly entered in text mode, for example: +\end{EN} +% +\begin{RU} +\subsection{Знак подчеркивания} +Знак подчеркивания (\texttt{\textunderscore}, U+005F \textsc{Low Line})) +в церковнославянском языке играет примерно ту же роль, что и дефис в русском. +Пакет \pkg{churchslavonic} переопределяет знак подчеркивания так, что его можно +набирать и в текстовой моде, например: +\end{RU} +% +\begin{center} +\begin{churchslavonic} +\begin{tabular}{l} +Послѣ́дованїе моле́бнагѡ пѣ́нїѧ ст҃ы̑мъ мч҃камъ к҃_гѡ вѣ́ка, \\ +въ Са́нктъ_Петербꙋ́ржстѣй дꙋхо́внѣй а҆каде́мїи \\ +нача̑льствовавшимъ, ᲂу҆чи̑вшимъ и҆ ᲂу҆чи̑вшимсѧ \\ +\end{tabular} +\end{churchslavonic} +\end{center} + +\begin{EN} +\cuKinovar{Attention:} if you have an older version of the \pkg{fontspec} package installed on your system, +the redefined underscore symbol cannot be used in font names and font options in \pkg{fontspec} commands like +\cs{setXXXfont} and \cs{newfontfamily}. + +Typically you need to set underscore as the hyphenation character for Church Slavonic fonts: \texttt{HyphenChar=_}. +With older versions of \pkg{fontspec} this will cause errors. This problem exists in \TeX\ \texttt{Live 2013} and in \pkg{fontspec v2.3c}. + +We recommend upgrading your \TeX\ distribution to at least \TeX\ \texttt{Live 2015}. Alternatively you can selectively +upgrade the \pkg{fontspec} package to version \texttt{v2.4c} or better. + +If upgrading is not an option, you can work around this problem by either specifying the hexadecimal code for the hyphenation +character: \texttt{HyphenChar="005F}, or by declaring all fonts before loading \pkg{churchslavonic}. +\end{EN} + +\begin{RU} +\cuKinovar{Внимание:} если у вас установлена старая версия пакета \pkg{fontspec}, +переопределенный знак подчеркивания нельзя использовать при задании имен и параметров шрифтов в командах \pkg{fontspec} типа +\cs{setXXXfont} и \cs{newfontfamily}. + +Обычно для церковнославянских шрифтов требуется установить подчеркивание как символ переноса, указав параметр: +\texttt{HyphenChar=_}. Старые версии \pkg{fontspec} выдадут ошибку. +Эта проблема присутствует в \TeX\ \texttt{Live 2013} и в \pkg{fontspec v2.3c}. + +Мы рекомендуем обновить систему \TeX\ до \TeX\ \texttt{Live 2015} или свежее. +Или же обновить только пакет \pkg{fontspec} до +версии \texttt{2.4c} или более новой. + +Если же вы не можете установить обновления, то можно +обойти проблему, указав символ переноса как код в шестнадцатиричном представлении: +\texttt{HyphenChar="005F}. Другой подход --- это декларировать все шрифты до загрузки пакета \pkg{churchslavonic}. +\end{RU} + +\begin{EN} \section{Numbers} -Church Slavonic numbering system is heavily based on the Old Greek one and uses -letters as digits. -For more information on the matter, see the appropriate section in \cite{UN41}. +The Church Slavonic numbering system (Cyrillic numerals) +is based on Greek Ionian numerals and uses letters as digits. +For more information on the implementation, consult the appropriate section of \cite{UN41}. \end{EN} \begin{RU} \section{Числа} -Способ записи чисел в церковнославянском языке основывается на древнегреческом и в -качестве цифр использует буквы. За подробностями отсылаем интересующегося читателя к +Способ записи чисел в церковнославянском языке (кириллическая цифирь) +основывается на древнегреческом и в +качестве цифр использует буквы. +За подробностями отсылаем интересующегося читателя к соответствующей главе \cite{UN41}. \end{RU} \begin{EN} \subsection{\cs{cuNum}} -Use this command to typeset a Church Slavonic number. -The command takes a single argument that should expand to a number (register name works too). +Use this command to typeset a Cyrillic numeral. +The command takes a single argument that should expand to a number. \end{EN} \begin{RU} \subsection{\cs{cuNum}} -Команда печатает число в церковнослявянской нотации. -Она принимает единственный аргумент. Аргументом может быть текст, командная последовательность, или имя -целочисленного регистра. Единственное условие --- аргумент должен раскрыться в число. +Команда печатает число кириллической цифирью. +Она принимает единственный аргумент. Аргументом может быть текст или +командная последовательность. Единственное условие --- аргумент должен раскрыться в число. \end{RU} \begin{center} @@ -218,7 +290,7 @@ \begin{tabular}[]{ | l | l | } \hline \verb+\cuDate{2016-4-21}+ & \cuDate{2016-4-21} \\ -\verb+\cuJulianDate{2016-4-21}+ & \cuJulianDate{2016-4-21} \\ +\verb+\cuDateJulian{2016-4-21}+ & \cuDateJulian{2016-4-21} \\ \verb+\cuDate{\cuToday}+ & \cuDate{\cuToday} \\ \hline \end{tabular} @@ -227,22 +299,27 @@ \begin{EN} \subsection{\cs{cuDate}} -Command formats the date (according to the current format). Argument is a triplet of numbers \texttt{YYYY-MM-DD} specifying -the date. Output will be something like this: \textchurchslavonic{\cuDate{2016-04-22}}. +This command formats the date (according to the current format). +The argument is a triplet of numbers \texttt{YYYY-MM-DD} specifying +the date. The output will be something like this: \textchurchslavonic{\cuDate{2016-04-22}}. Note that \texttt{YYYY-MM-DD} values are not being normalized or interpreted in any way. Thus, it is totally fine to call \verb+\cuDate{2016-4-32}+ even though April 32 is not a valid date. It will be formatted and printed as April 32. This -makes it possible to use this macro in a phrase like ``date \verb+\cuDate{2016-4-32}+ is not a valid date in any calendar''. +makes it possible to use this macro in a phrase like ``the date \verb+\cuDate{2016-4-32}+ is not a valid date in any calendar''. However, if your date format uses \cs{cuDOW} (day of the week) or \cs{cuYEARAM} (year Anno Mundi), the later quantities are computed by -interpreting date as a Gregorian calendar date. Also, if input date is not a valid date, it will be normalized via extrapolation. -For example, April 32nd will be interpreted as May 2nd for the purpose of determining values of the day of the week and year Anno Mundi. +interpreting the date as a Gregorian calendar date. In this case, if the input date is not a valid date, it will be normalized via extrapolation. +For example, April 32 will be interpreted as May 2 for the purpose of determining values of the day of the week and year Anno Mundi. -If your format uses \cs{cuDOW} or \cs{cuYEARAM}, and your date is Julian, not Gregorian, you must use \cs{cuJulianDate} to +If your format uses \cs{cuDOW} or \cs{cuYEARAM}, and you specify a date according to the Julian, not Gregorian, calendar, you must use \cs{cuDateJulian} to correctly format days of the week and year Anno Mundi. -The best practice is to always use \cs{cuDate} with Gregorian dates and use \cs{cuJulianDate} with Julian dates regardless -of the current date format. This way you can later on switch date formatting style without worrying about getting wrong output. +The best practice is to always use \cs{cuDate} with Gregorian calendar dates and use \cs{cuDateJulian} with Julian calendar dates regardless +of the current date format. This way you can switch the date formatting style without worrying about getting the wrong output. + +\subsection{\cs{cuDateJulian}} +Formats the date, just like \cs{cuDate} does, but the argument is interpreted as a date on the Julian calendar (``old style'') instead of the Gregorian calendar. +This makes a difference only if your format is using symbolic names \cs{cuDOW} and/or \cs{cuYEARAM}. \end{EN} \begin{RU} @@ -251,32 +328,38 @@ Команда форматирует дату (в соответствии с текущим форматом). Аргумент должен иметь вид \texttt{YYYY-MM-DD}. Результат может выглядеть примерно так: \textchurchslavonic{\cuDate{2016-04-22}}. -Отметим что значение даты никоем образом не интерпретируется и не нормализируется. Поэтому можно вызывать макрокоманду и с -невозможными датами, нпример 32-е апреля --- така дата будет отформатирована как 32-е апреля. Так что команду \cs{cuDate} можно -использовать для набора фраз вроде ``дата \verb+\cuDate{2016-04-22}+ не существует ни в одном календаре''. +Отметим, что значение даты никоем образом не интерпретируется и не нормализируется. Поэтому можно вызывать макрокоманду и с +невозможными датами, например 32 апреля --- такая дата будет отформатирована как 32 апреля. Так что команду \cs{cuDate} можно +использовать для набора фраз вроде ``дата \verb+\cuDate{2016-04-32}+ не существует ни в одном календаре''. Однако, если вы используете свой формат даты и в этом формате задействованы символические переменные \cs{cuDOW} (день недели) -или \cs{cuYEARAM} (год от сотворения мира), то значения этих переменных будут вычислены исходя из даты --- и дата интерпретируется -как дата грегорианского календаря. Кроме того, невозможные даты будут нормализованы методом экстраполяции. Например, 32 апреля +или \cs{cuYEARAM} (год от сотворения мира), то значения этих переменных будут вычислены исходя из заданной даты --- и дата интерпретируется +как дата по григорианскому календарю (<<новому стилю>>). В этом случае, невозможные даты будут нормализованы методом экстраполяции. Например, 32 апреля будет интерпретировано как 2 мая для целей определения дня недели и года от сотворения мира. -Если ваш формат использует день недели (\cs{cuDOW}) или год от сотворения мира (\cs{cuYEARAM}) и вы указываете дату юлианского календаря, -вы должны вместо \cs{cuDate} пользоваться макрокомандой \cs{cuJulianDate} для правильной обработки дня недели и года от сотворения мира. +Если ваш формат использует день недели (\cs{cuDOW}) или год от сотворения мира (\cs{cuYEARAM}), и вы указываете дату по юлианскому календарю (<<старому стилю>>), +вы должны вместо \cs{cuDate} пользоваться макрокомандой \cs{cuDateJulian} для правильной обработки дня недели и года от сотворения мира. -Лучше всего всегда использовать \cs{cuDate} для форматирования грегорианских дат и всегда использовать \cs{cuJulianDate} для -форматирования юлианских дат --- вне зависимости от значения текущего формата. Таким образом вы можете впоследствии изменить +Лучше всего всегда использовать \cs{cuDate} для форматирования дат по григорианскому календарю и всегда использовать \cs{cuDateJulian} для +форматирования дат по юлианскому календарю --- вне зависимости от значения текущего формата. Таким образом вы можете впоследствии изменить формат даты (например, добавив в него день недели) и результат останется правильным. + +\subsection{\cs{cuDateJulian}} +Форматирует дату в соответствии с текущим форматом подобно команде \cs{cuDate}. Отличие заключается в том, что аргумент +интерпретируется как дата по юлианскому, а не григорианскому календарю. Это имеет значение только если текущий формат даты +использует символические имена \cs{cuDOW} (день недели) или \cs{cuYEARAM} (год от сотворения мира). \end{RU} \begin{EN} \subsection{\cs{cuDefineDateFormat}} -Command allows one to define date format. It does not change how \cs{cuDate} formats its output (for that, use \cs{cuUseDateFormat}). +This command allows you to define your own date format. +It does not change how \cs{cuDate} formats its output (for that, use \cs{cuUseDateFormat}). Example: \end{EN} \begin{RU} \subsection{\cs{cuDefineDateFormat}} -Команда определяет формат даты. Она никак не влияет на то как \cs{cuDate} форматирует свой вывод (для этого используется \cs{cuUseDateFormat}). +Команда определяет формат даты. Она никак не влияет на то, как \cs{cuDate} форматирует свой вывод (для этого используется \cs{cuUseDateFormat}). Пример: \end{RU} @@ -286,7 +369,7 @@ \verb+\cuDefineDateFormat{long}{%+\\ \verb+ \cuDayName{\cuDOW},+\\ \verb+ \cuNum{\cuDAY}+_гѡ\verb+~%+\\ -\verb+ \cuMonthName{\cuMONTH}~%+\\ +\verb+ \cuMonthName{\cuMONTH},~%+\\ \verb+ +лѣ́та ѿ сотворе́нїѧ мі́ра\verb+~%+\\ \verb+ \cuNum{\cuYEARAM}%+\\ \verb+}+\\ @@ -305,56 +388,51 @@ \end{RU} \begin{EN} -Following symbolic names can be used when formatting the date: +The following symbolic names can be used when formatting the date: \begin{itemize} -\item \cs{cuYEAR} --- year part of date (number, like \texttt{2016}) -\item \cs{cuYEARAM}\footnotemark[1] --- year since world creation, aka Anno Mundi (number, like \texttt{7525}) -\item \cs{cuMONTH} --- month part of date (number from 1 to 12) -\item \cs{cuDAY} --- day of the month -\item \cs{cuDOW}\footnotemark[1] --- day of the week (number from 0 to 6, where 0 means ``Sunday'') -\item \cs{cuINDICTION} --- indiction year (number from 1 to 15) +\item \cs{cuYEAR} --- the year part of a date (a number, like \texttt{2016}) +\item \cs{cuYEARAM}\footnotemark[1] --- the year Anno Mundi, that is, since the creation of the world accoding to the Byzantine reckoning (aka ``the Byzantine era''; a number, like \texttt{7525}) +\item \cs{cuMONTH} --- the month part of a date (a number from 1 to 12, with January set to 1) +\item \cs{cuDAY} --- the day of the month +\item \cs{cuDOW}\footnotemark[1] --- the day of the week (number from 0 to 6, where 0 means ``Sunday'') +\footnotetext[1]{If your format uses this value, make sure that you format the date with the correct macro: + you must use \cs{cuDate} for dates on the Gregorian calendar and + \cs{cuDateJulian} for dates on the Julian calendar.} +\footnotetext[2]{See \url{https://en.wikipedia.org/wiki/Indiction}.} +\item \cs{cuINDICTION} --- the indiction\footnotemark[2] (a number from 1 to 15) \end{itemize} -\footnotetext[1]{If your format uses this value, make sure that you format date with a correct macro: you must use -\cs{cuDate} if passed date is Gregorian, or \cs{cuJulianDate} if you pass Julian date.} + \end{EN} \begin{RU} При определении формата можно пользоваться следующими символическими именами: \begin{itemize} \item \cs{cuYEAR} --- год (число, например \texttt{2016}) -\item \cs{cuYEARAM}\footnotemark[1] --- год от сотворения мира, Anno Mundi (число, например \texttt{7525}). -\item \cs{cuMONTH} --- месяц (число от 1 до 12) +\item \cs{cuYEARAM}\footnotemark[1] --- год от сотворения мира по византийскому летоисчеслению (число, например \texttt{7525}). +\item \cs{cuMONTH} --- месяц (число от 1 до 12, где 1 означает ``январь'') \item \cs{cuDAY} --- день месяца -\item \cs{cuDOW}\footnotemark[1] --- день недели (число от 0 to 6, где 0 означает ``воскресение'') -\item \cs{cuINDICTION} --- индикт (число от 1 до 15) -\end{itemize} +\item \cs{cuDOW}\footnotemark[1] --- день недели (число от 0 to 6, где 0 означает ``воскресенье'') +\item \cs{cuINDICTION} --- индикт\footnotemark[2] (число от 1 до 15) \footnotetext[1]{Если ваш формат пользуется этим значением, вы должны форматировать дату правильной макрокомандой: \cs{cuDate} - если вы передаете дату грегорианского календаря, или \cs{cuJulianDate} если используется дата юлианского календаря} + для дат по григорианскому календарю и \cs{cuDateJulian} для дат по юлианскому календарю.} +\footnotetext[2]{См.~\url{https://ru.wikipedia.org/wiki/\%D0\%98\%D0\%BD\%D0\%B4\%D0\%B8\%D0\%BA\%D1\%82}} +\end{itemize} \end{RU} \begin{EN} \subsection{\cs{cuUseDateFormat}} -This command sets the date format to be used by the subsequent \cs{cuDate} and \cs{cuJulianDate}. - -\subsection{\cs{cuJulianDate}} -Formats date, just like \cs{cuDate} does, but argument is interpreted as a Julian calendar date, not a Gregorian calendar one. -This makes difference only if your format is using symbolic names \cs{cuDOW} and/or \cs{cuYEARAM}. +This command sets the date format to be used by the subsequent \cs{cuDate} and \cs{cuDateJulian}. \subsection{\cs{cuMonthName}} -Command expands numeric argument (month number) into textual representation. It is typically used when defining date format. -For example, date format named \texttt{default} is defined as: +This command expands a numeric argument (month number) into textual representation. It is typically used when defining a date format. +For example, a date format named \texttt{default} is defined as: \end{EN} \begin{RU} \subsection{\cs{cuUseDateFormat}} Макро устанавливает имя текущего формата даты. Этот формат будет использоваться при последующих вызовах макрокоманд -\cs{cuDate} и \cs{cuJulianDate}. - -\subsection{\cs{cuJulianDate}} -Форматирует дату в соответствии с текущим форматом подобно команде \cs{cuDate}. Отличие заключается в том, что аргумент -интерпретируется как дата юлианского а не грегорианского календаря. Это имеет значение только если текущий формат даты -использует символические имена \cs{cuDOW} (день недели) или \cs{cuYEARAM} (год от сотворения мира). +\cs{cuDate} и \cs{cuDateJulian}. \subsection{\cs{cuMonthName}} Команда раскрывает числовой аргумент в текстовое представление месяца. Команда обычно используется при задании формата @@ -365,7 +443,7 @@ \begin{churchslavonic} \begin{tabular}{l} \verb+\cuDefineDateFormat{default}{%+\\ -\verb+ \cuNum{\cuDAY}~\cuMonthName{\cuMONTH}%+\\ +\verb+ \cuNum{\cuDAY}~\cuMonthName{\cuMONTH},%+\\ \verb+ ~+лѣ́та\verb+~\cuNum{\cuYEAR}%+\\ \verb+}%+\\ \end{tabular} @@ -374,26 +452,26 @@ \begin{EN} \subsection{\cs{cuDayName}} -Expands numeric argument into a textual representation of the day of the week using nominative case. +Expands a numeric argument into a textual representation of the day of the week in the nominative case. \subsection{\cs{cuDayNameAccusative}} -Expands numeric argument into a textual representation of the day of the week using accusative case. +Expands a numeric argument into a textual representation of the day of the week in the accusative case. \subsection{\cs{cuToday}} -This macro expands to a triplet \texttt{YYYY-MM-DD}. Date is generated using Gregorian calendar. +This macro expands to a triplet \texttt{YYYY-MM-DD}. The date is generated according to the Gregorian calendar. -\subsection{\cs{cuJulianToday}} -This macro expands to a triplet \texttt{YYYY-MM-DD}. Date is generated using Julian calendar. +\subsection{\cs{cuTodayJulian}} +This macro expands to a triplet \texttt{YYYY-MM-DD}. The date is generated according to the Julian calendar. It is a shortcut for \verb+\cuAsJulian{\cuToday}+. \subsection{\cs{cuAsJulian}} -Converts Gregorian date to Julian date. Input and output use numeric triplet format \texttt{YYYY-MM-DD}. +Converts a date on the Gregorian calendar to a date on the Julian calendar. Input and output use numeric triplet format \texttt{YYYY-MM-DD}. -Useful when the same date needs to be formatted as Gregorian and as Julian date. +Useful when the same date needs to be formatted both according to the Gregorian and Julian calendars. \subsection{\cs{cuAsGegorian}} -Converts Julian date to Gregorian date. Input and output use numeric triplet format \texttt{YYYY-MM-DD}. +Converts a date according to the Julian calendar to a date according to the Gregorian calendar. Input and output use numeric triplet format \texttt{YYYY-MM-DD}. \end{EN} @@ -405,38 +483,43 @@ Команда раскрывает числовой аргумент в текстовое представление дня недели в винительном падеже. \subsection{\cs{cuToday}} -Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Используется грегорианский календарь. +Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Дата выводится по григорианскиму календарю (<<новому стилю>>). -\subsection{\cs{cuJulianToday}} -Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Используется юлианский календарь. +\subsection{\cs{cuTodayJulian}} +Эта макрокоманда раскрывается в текущую дату в виде триплета \texttt{YYYY-MM-DD}. Дата выводится по юлианскиму календарю (<<старому стилю>>). -Команда просто ракрывается в: \verb+\cuAsJulian{\cuToday}+. +Команда просто раскрывается в: \verb+\cuAsJulian{\cuToday}+. \subsection{\cs{cuAsJulian}} -Преобразует грегорианскую дату в юлианскую. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}. +Преобразует дату по григорианскому календарю в дату по юлианскому календарю. +Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}. -Команда полезна когда одну и ту же дату надо представить и в грегорианском и в юлианском календаре. +Команда полезна, когда одну и ту же дату надо написать и по григорианскому, и по юлианскому календарю. \subsection{\cs{cuAsGregorian}} -Преобразует юлианскую дату в грегорианскую. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}. +Преобразует дату по юлианскому календарю в дату по григорианскому календарю. Дата задается и выводится как числовой триплет \texttt{YYYY-MM-DD}. \end{RU} \begin{EN} \section{Kinovar} -Printed and hand-written Church Slavonic texts often use color to highlight sectional and paragraph structure. Typical style -would use red color to write section names, comments, marginal notes. First letter of each paragraph is also colored red. +Printed and hand-written Church Slavonic texts often use color to highlight sectional +and paragraph structure and to indicate liturgical rubrics, section names, comments, +and marginal notes. The first letter of each paragraph is also often colored red. \subsection{\cs{cuKinovar}} -Takes a single argument and prints it using red color. For example, explicitly specifying its argument one gets expected result: +Takes a single argument and prints it using red color. +For example, explicitly specifying its argument one gets the expected result: \end{EN} \begin{RU} \section{Киноварь} -Печатные и рукописные книги на церковнославянском часто пользуются красным цветом для выделения структурных элементов текста. -Обычно заголовки, замечания и пометки на полях печатаются красным цветом. Кроме того, первая буква каждого параграфа тоже -выделяется красным цветом. +Печатные и рукописные книги на церковнославянском языке часто пользуются +красным цветом (<<киноварью>>) для выделения структурных элементов текста. +Обычно богослужебные указания (<<рубрики>>), заголовки, замечания и пометы +на полях печатаются красным цветом. Кроме того, первая буква каждого параграфа тоже +часто выделяется красным цветом. \subsection{\cs{cuKinovar}} Команда печатает свой аргумент красным цветом. Например, если мы явно зададим текст аргумента, то получим ожидаемый результат: @@ -453,23 +536,26 @@ \end{center} \begin{EN} -If one uses \TeX\ mechanism of implicit argument detection, then, red color will be used for the first character of the -text after this command. Non-trivial feature of this command is that it will also ``collect'' all diacritical marks that -belong to this first character, and thus all accents will also use the red color! -Use this command in the indirect parameter mode to paint red the first letter of each paragraph.\footnote{You can also experiment -with \TeX\ command \cs{everypar} to autoamte this, but the success or failure of this technique critically depends on the -\LaTeX\ class used and packages loaded. We found it very fragile and thus \pkg{churchslavonic} package does not offer -any automation for this. It may be easier and more robust use Search/Replace functionality embedded in any non-trivial text -editor to just automatically place \cs{cuKinovar} command before every paragraph of the source text.} +If one uses the \TeX\ mechanism of implicit argument detection, +then the first character of the text after this command will be printed in red. +However, a non-trivial feature of this command is that it will also ``collect'' all +of the diacritical marks that belong to this first character, +and thus all accents will also be colored in red! +Use this command in the indirect parameter mode to print in red the first letter +of each paragraph.\footnote{You can also experiment +with the \TeX\ command \cs{everypar} to automate this, but the success or failure of this technique critically depends on the +\LaTeX\ class used and packages loaded. We found it very fragile and thus the \pkg{churchslavonic} package does not offer +any automation for this task. It may be easier and more robust to use the Find/Replace functionality embedded in any non-trivial text +editor to just automatically place a \cs{cuKinovar} command before every paragraph of the source text.} \end{EN} \begin{RU} Если же используется механизм \TeX{} неявного задания аргумента, то команда будет применена к первой букве последующего текста. -При этом команда ``соберет'' все необходимые выносные символы, так что все акценты первой буквы будут корректно раскрашены! +При этом команда ``соберет'' все необходимые выносные символы, так что все надстрочные знаки первой буквы будут также корректно раскрашены! Поэтому очень удобно использовать эту команду с неявным заданием аргумента для раскраски первой буквы параграфа.\footnote{Вы также можете поэкспериментировать со встроенной командой \TeX\ \cs{everypar} с целью полностью автоматизировать раскраску первой буквы -параграфа. Однако успех сильно зависит от того какой класс системы \LaTeX\ используется и от того какие пакеты подгружаются. -Мы не нашли надежного способа заставить \cs{everypar} работать и поэтому пакет \pkg{churchslavonic} не предлагает никаких +каждого параграфа. Однако успех сильно зависит от того, какой класс системы \LaTeX\ используется и от того, какие пакеты подгружаются. +Мы не нашли надежного способа заставить \cs{everypar} работать, и поэтому пакет \pkg{churchslavonic} не предлагает никаких макрокоманд для дальнейшей автоматизации этого процесса. На практике, часто проще и надежнее воспользоваться функцией текстового редактора Найти/Заменить для вставки макрокоманды \cs{cuKinovar} перед каждым параграфом.} \end{RU} @@ -489,34 +575,140 @@ \begin{EN} \subsection{\cs{cuKinovarColor}} -Switches current color to red. One would typically use this command inside a group that limits the scope of red text, unless +Switches the current color to red. One would typically use this command +inside a group that limits the scope of red text, unless you want all subsequent text to be colored red. \end{EN} \begin{RU} \subsection{\cs{cuKinovarColor}} -Команда переключает текущий цвет на красный. Должна использоваться внутри группы, которая ограничит ее действие (если вы не хотите -чтобы весь послеующий текст был напечатан красным цветом). +Команда переключает текущий цвет на красный. Должна использоваться +внутри группы, которая ограничит ее действие (если вы не хотите +чтобы весь последующий текст был напечатан красным цветом). +\end{RU} + +\begin{EN} +\section{Miscellaneous} +\subsection{\cs{cuMarginMark}, \cs{cuMarginMarkSkip}, \& \cs{cuMarginMarkText}} +The command \cs{cuMarginMark} is used to place short text in the margin +at the same level as the line where the macro is placed. +Example: +\end{EN} +% +\begin{RU} +\section{Разное} +\subsection{\cs{cuMarginMark}, \cs{cuMarginMarkSkip} и \cs{cuMarginMarkText}} +Команда \cs{cuMarginMark} используется для печати значков на полях, +напротив строки, где вызвана эта команда. +Например: +\end{RU} +% +\begin{center} +\begin{churchslavonic} +\begin{tabular}{l} + \verb+\cuMarginMark{+в҃\verb+}\cuKinovar+ Бл҃гословѝ дꙋшѐ моѧ̀ гдⷭ҇а и҆ не забыва́й\\ + всѣ́хъ воздаѧ́нїй є҆гѡ̀. \verb+\cuMarginMark{+а҃\verb+}\cuKinovar+ Ѡ҆чища́ющаго \\ + всѧ̑ беззакѡ́нїѧ твоѧ̑, и҆сцѣлѧ́ющаго всѧ̑ недꙋ́ги твоѧ̑: \\ + \verb+\cuMarginMark{+в҃\verb+}\cuKinovar+ И҆збавлѧ́ющаго ѿ и҆стлѣ́нїѧ живо́тъ тво́й,\\ + вѣнча́ющаго тѧ̀ млⷭ҇тїю и҆ щедро́тами: \verb+\cuMarginMark{+а҃\verb+}\cuKinovar+\\ + И҆сполнѧ́ющаго во бл҃ги́хъ жела́нїе твоѐ, ѡ҆бнови́тсѧ ꙗ҆́кѡ ѻ҆́рлѧ \\ + ю҆́ность твоѧ̀. +\end{tabular} +\end{churchslavonic} +\end{center} + +\begin{EN} +\noindent +Will result in: +\end{EN} +% +\begin{RU} +\noindent +Получим такой результат: \end{RU} +\begin{center} +\begin{churchslavonic} +\let\hMn=\cuMarginMark +\let\hKv=\cuKinovar +\parbox{0.75\textwidth}{% + \textwidth=0.75\textwidth + \hMn{в҃}\hKv Бл҃гословѝ дꙋшѐ моѧ̀ гдⷭ҇а и҆ не забыва́й всѣ́хъ воздаѧ́нїй є҆гѡ̀. + \hMn{а҃}\hKv Ѡ҆чища́ющаго всѧ̑ беззакѡ́нїѧ твоѧ̑, и҆сцѣлѧ́ющаго всѧ̑ недꙋ́ги твоѧ̑: + \hMn{в҃}\hKv И҆збавлѧ́ющаго ѿ и҆стлѣ́нїѧ живо́тъ тво́й, вѣнча́ющаго тѧ̀ млⷭ҇тїю и҆ щедро́тами: + \hMn{а҃}\hKv И҆сполнѧ́ющаго во бл҃ги́хъ жела́нїе твоѐ, ѡ҆бнови́тсѧ ꙗ҆́кѡ ѻ҆́рлѧ ю҆́ность твоѧ̀. +} +\end{churchslavonic} +\end{center} + \begin{EN} -\section{Utilities} -The mechanism that \cs{cuKinovar} macro is using to collect all accents (when argument is given implicitly) can be useful for -many other purposes. One example is to typeset a dropletter at the beginning of a chapter (this is often used in Church Slavonic -texts). For this purpose standard \LaTeX\ package \pkg{lettrine} works fine. The only nuisance is that one have to be careful to -pass to \cs{lettrine} not just the first letter, but also all diacritical marks for this letter. Naturally, we want to reuse the -clever mechanism that \cs{cuKinovar} is using to do the collection job. +The marginal mark is placed on the right margin for odd pages +and on the left margin for even pages (e.g.~the mark is placed on the +``outer'' margin, not the spine margin), which is usualy the desired behavior. -Here is an example how to accomplish that: +The distance between the mark and the text is controlled by the value +of \cs{cuMarginMarkSkip}. The default is: +\end{EN} +% +\begin{RU} +Помета помещается на ``внешнее'' поле, то есть справа от текста для нечетных страниц и слева от текста для четных. + +Расстояние между пометой и текстом задается через значение \cs{cuMarginMarkSkip}. По умолчанию это: +\end{RU} +% +\begin{verbatim} +\def\cuMarginMarkSkip{0.6em} +\end{verbatim} + +\begin{EN} +To globally customize the font and color of the margin mark use \cs{cuMarginMarkText}. +For example, to make margin marks appear in red color, redefine \cs{cuMarginMarkText} in the preamble of your +document like this: +\end{EN} +% +\begin{RU} +Шрифт и цвет пометы можно изменить, переопределив команду \cs{cuMarginMarkText}. +Например, если Вы хотите чтобы все пометы печатались красным цветом, то достаточно поместить +в преамбулу вашего документа следующее определение: +\end{RU} +\begin{verbatim} +\def\cuMarginMarkText#1{\cuKinovar{#1}} +\end{verbatim} + +\begin{EN} +If you need to change the font/size/color just for a single mark, you can do it directly with \cs{cuMarginMark}: \end{EN} \begin{RU} -\section{Утилиты} +Если надо поменять размер, цвет, или шрифт для какой-то одной пометы, то проще всего это сделать при +вызове \cs{cuMarginMark}: +\end{RU} + +\begin{verbatim} +\cuMarginMark{{\tiny *}} +\end{verbatim} + +\begin{EN} +\subsection{Dropcaps} +The mechanism that the \cs{cuKinovar} macro is using to collect all accents +(when the argument is specified implicitly) can be useful for +many other purposes. One example is to typeset a dropletter at the beginning of a chapter +(this is often used in Church Slavonic texts). For this purpose, the standard \LaTeX\ package +\pkg{lettrine} works just fine. The only nuisance is that one has to be careful to +pass to \cs{lettrine} not just the first letter, but also any diacritical marks that +attach to this letter. Naturally, we want to reuse the +clever mechanism that \cs{cuKinovar} uses, and automatically collect the diacritical marks! + +Here is an example of how to accomplish this: +\end{EN} + +\begin{RU} +\subsection{Буквицы} Механизм, используемый командой \cs{cuKinovar} для сбора выносных символов (при неявном задании аргумента), может оказаться полезен в некоторых других случаях. Один из примеров --- это ``буквицы'' в начале разделов. Для набора буквицы отлично работает стандартный -пакет \pkg{lettrine}. Единственное неудобство --- это необходимость задавать явно первую букву вместе во всеми ее выносными символами. -Естественно желание упростить и автоматизировать эту работу задействовав тот же механизм что и в \cs{cuKinovar}. +пакет \pkg{lettrine}. Единственное неудобство --- это необходимость задавать явно первую букву вместе со всеми ее выносными символами. +Естественно желание упростить и автоматизировать эту работу задействовав тот же механизм, что и в \cs{cuKinovar}. Вот как можно добиться этого: \end{RU} @@ -532,7 +724,7 @@ \end{center} % \begin{EN} -Once this definition of \verb+\cuLettrine+ is created (put is somewhere in preamble, and do not forget to enclose in \cs{makeatletter} and \cs{makeatother}), +Once this definition of \verb+\cuLettrine+ is created (somewhere in the preamble, between the declarations \cs{makeatletter} and \cs{makeatother}), you can create drop capitals like this: \end{EN} % @@ -549,21 +741,26 @@ \end{churchslavonic} \end{center} +\begin{center} \begin{churchslavonic} +\parbox{0.75\textwidth}{% +\textwidth=0.75\textwidth + \cuLettrine И҆́же дх҃а си́ла въ не́мощи соверша́етсѧ, ꙗ҆́коже пи́сано є҆́сть, и҆ вѣ́рꙋемъ: въ не́мощи же не тѣлесѐ то́чїю, но ᲂу҆́бѡ и҆ сло́ва, и҆ премꙋ́дрости на ѧ҆зы́цѣ лежа́ща. И҆ сѐ ꙗ҆́вѣ ѿ мно́гихъ ᲂу҆́бѡ и҆ны́хъ, па́че же ѿ и҆́же ѡ҆ вели́комъ бг҃осло́вѣ, и҆ бра́тѣ хрⷭ҇то́вѣ, благода́тїю зри́мѣмъ. - +}% \end{churchslavonic} +\end{center} \begin{thebibliography}{9} \bibitem{UN41} Aleksandr Andreev, Yuri Shardt, and Nikita Simmons. \emph{Church Slavonic Typography in Unicode}, - Uncode Technical Note~41, + Uncode Technical Note~41. 2015. \url{http://www.unicode.org/notes/tn41/} \end{thebibliography} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/churchslavonic.doc.tlpobj new/tlpkg/tlpobj/churchslavonic.doc.tlpobj --- old/tlpkg/tlpobj/churchslavonic.doc.tlpobj 2016-05-17 03:18:18.000000000 +0200 +++ new/tlpkg/tlpobj/churchslavonic.doc.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -1,9 +1,9 @@ name churchslavonic.doc category Package -revision 41182 +revision 42751 shortdesc doc files of churchslavonic relocated 1 -docfiles size=63 +docfiles size=58 RELOC/doc/latex/churchslavonic/LICENSE RELOC/doc/latex/churchslavonic/README RELOC/doc/latex/churchslavonic/churchslavonic-en.pdf ++++++ churchslavonic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/churchslavonic.sty new/tex/latex/churchslavonic/churchslavonic.sty --- old/tex/latex/churchslavonic/churchslavonic.sty 2016-05-16 00:16:48.000000000 +0200 +++ new/tex/latex/churchslavonic/churchslavonic.sty 2016-11-25 19:33:45.000000000 +0100 @@ -1,9 +1,9 @@ -% Copyright 2016 Slavonic Computing Initialive +% Copyright 2016 Slavonic Computing Initiative % http://sci.ponomar.net % -\ProvidesPackage{churchslavonic}[2016/04/19 v0.1 Typesetting in Church Slavonic] +\ProvidesPackage{churchslavonic}[2016/04/19 v0.2 Typesetting in Church Slavonic] -\DeclareOption{gray}{ +\DeclareOption*{ \PassOptionsToPackage{\CurrentOption}{cu-kinovar} } \ProcessOptions\relax @@ -13,4 +13,28 @@ \RequirePackage{cu-util} \RequirePackage{cu-kinovar} +% underscore is a valid character in Church Slavonic +\let\cu@oldunderscore=_ +\catcode`\_\active +\protected\def_{\ifmmode\cu@oldunderscore\else\textunderscore\discretionary{}{}{}\fi} + +% suppress variable distance between lines +\lineskiplimit -1ex + +% margin marks +\def\cu@mmark@counter{0}% +\def\cuMarginMarkSkip{0.6em}% +\def\cuMarginMarkText#1{#1}% +\protected\def\cuMarginMark#1{% +\leavevmode +\global\edef\cu@mmark@counter{\the\numexpr 1 + \cu@mmark@counter}% +\label{mnote.\cu@mmark@counter}% +\ifodd\getpagerefnumber{mnote.\cu@mmark@counter}\relax + \vadjust{\hbox{\vbox to 0pt{\vss\hbox to 0pt{\hskip\textwidth\hskip\cuMarginMarkSkip \cuMarginMarkText{#1}\hss}\vskip 0.25\baselineskip}}}% +\else + \vadjust{\hbox{\vbox to 0pt{\vss\hbox to 0pt{\hss \cuMarginMarkText{#1}\hskip\cuMarginMarkSkip}\vskip 0.25\baselineskip}}}% +\fi +}% + + \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/cu-calendar.sty new/tex/latex/churchslavonic/cu-calendar.sty --- old/tex/latex/churchslavonic/cu-calendar.sty 2016-05-16 00:16:48.000000000 +0200 +++ new/tex/latex/churchslavonic/cu-calendar.sty 2016-11-25 19:33:45.000000000 +0100 @@ -34,10 +34,10 @@ \the\numexpr #1 + \intcalcDiv{#2}{400} + 32083 - 32045\relax% }% % -\def\cu@jdnFromJulianDate#1{% +\def\cu@jdnFromDateJulian#1{% \cu@jdn #1-\@firstoftwo }% -\def\cu@jdnFromGregorianDate#1{% +\def\cu@jdnFromDateGregorian#1{% \cu@jdn #1-\greg@ }% % @@ -72,10 +72,10 @@ }}% % \def\cu@julianToGregorian#1{% - \cu@calendarGregorian{\cu@jdnFromJulianDate{#1}}% + \cu@calendarGregorian{\cu@jdnFromDateJulian{#1}}% }% \def\cu@gregorianToJulian#1{% - \cu@calendarJulian{\cu@jdnFromGregorianDate{#1}}% + \cu@calendarJulian{\cu@jdnFromDateGregorian{#1}}% }% \let\cu@julianFromGregorian\cu@gregorianToJulian \let\cu@gregorianFromJulian\cu@julianToGregorian @@ -85,10 +85,10 @@ \let\cuAsJulian\cu@julianFromGregorian \let\cuAsGregorian\cu@gregorianFromJulian % -\def\cuJulianDate#1{% +\def\cuDateJulian#1{% \expandafter\cu@formatDate\number\cu@julianFromGregorian{#1}\relax }% -\def\cuJulianToday{% +\def\cuTodayJulian{% \cu@julianFromGregorian{\year -\month -\day}% }% \def\cuToday{% @@ -141,8 +141,8 @@ \expandafter\let\expandafter\cu@current@dateformat\csname cs@dateformat@#1\endcsname }% \def\cu@@formatDate#1-#2-#3\relax{% - \edef\cu@JDN{\cu@jdnFromGregorianDate{#1-#2-#3}}% - \edef\cu@JDN@March@First{\cu@jdnFromJulianDate{#1-3-1}}% + \edef\cu@JDN{\cu@jdnFromDateGregorian{#1-#2-#3}}% + \edef\cu@JDN@March@First{\cu@jdnFromDateJulian{#1-3-1}}% \edef\cuYEAR{\number #1}% \edef\cuYEARAM{\the\numexpr #1 + 5508\ifnum\cu@JDN<\cu@JDN@March@First\else + 1\fi}% \edef\cuMONTH{\number #2}% @@ -151,9 +151,9 @@ \edef\cuINDICTION{\intcalcAdd{15}{\intcalcMod{#1 - 312}{-15}}}% \edef\cuDISPLAYDATE{\cu@current@dateformat}% }% -\def\cu@@formatJulianDate#1-#2-#3\relax{% - \edef\cu@JDN{\cu@jdnFromJulianDate{#1-#2-#3}}% - \edef\cu@JDN@March@First{\cu@jdnFromJulianDate{#1-3-1}}% +\def\cu@@formatDateJulian#1-#2-#3\relax{% + \edef\cu@JDN{\cu@jdnFromDateJulian{#1-#2-#3}}% + \edef\cu@JDN@March@First{\cu@jdnFromDateJulian{#1-3-1}}% \edef\cuYEAR{\number #1}% \edef\cuYEARAM{\the\numexpr #1 + 5508\ifnum\cu@JDN<\cu@JDN@March@First\else + 1\fi}% \edef\cuMONTH{\number #2}% @@ -169,14 +169,14 @@ \egroup }% % -\protected\def\cu@formatJulianDate#1-#2-#3\relax{% +\protected\def\cu@formatDateJulian#1-#2-#3\relax{% \bgroup - \cu@@formatJulianDate#1-#2-#3\relax + \cu@@formatDateJulian#1-#2-#3\relax \cuDISPLAYDATE \egroup }% \cuDefineDateFormat{default}{% - \cuNum{\cuDAY}~\cuMonthName{\cuMONTH}~лѣ́та~\cuNum{\cuYEAR}% + \cuNum{\cuDAY}~\cuMonthName{\cuMONTH},~лѣ́та~\cuNum{\cuYEAR}% }% \cuUseDateFormat{default}% % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/cu-kinovar.sty new/tex/latex/churchslavonic/cu-kinovar.sty --- old/tex/latex/churchslavonic/cu-kinovar.sty 2016-05-16 00:16:48.000000000 +0200 +++ new/tex/latex/churchslavonic/cu-kinovar.sty 2016-11-25 19:33:45.000000000 +0100 @@ -16,6 +16,10 @@ \renewcommand{\cu@kinovar}[1]{\textcolor{kinovar-gray}{#1}} \renewcommand{\cu@kinovar@color}{\color{kinovar-gray}} } +\DeclareOption{grey}{ + \renewcommand{\cu@kinovar}[1]{\textcolor{kinovar-gray}{#1}} + \renewcommand{\cu@kinovar@color}{\color{kinovar-gray}} +} \DeclareOption{bw}{ \renewcommand{\cu@kinovar}[1]{#1} \renewcommand{\cu@kinovar@color}{\relax} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/churchslavonic/gloss-churchslavonic.ldf new/tex/latex/churchslavonic/gloss-churchslavonic.ldf --- old/tex/latex/churchslavonic/gloss-churchslavonic.ldf 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/churchslavonic/gloss-churchslavonic.ldf 2016-12-20 00:01:04.000000000 +0100 @@ -0,0 +1,245 @@ +\ProvidesFile{gloss-churchslavonic.ldf}[polyglossia: module for Church Slavonic] +\PolyglossiaSetup{churchslavonic}{ + script=Cyrillic, + scripttag=cyrl, + langtag=CHU, + hyphennames={churchslavonic}, + hyphenmins={1,2}, + frenchspacing=true, + fontsetup=true +} + +% if spelling is set to modern, Russian date and caption +% as well as ASCII digits are used. +\define@key{churchslavonic}{spelling}[modern]{% + \ifstrequal{#1}{traditional}% + {\def\captionschurchslavonic{\captionschurchslavonic@traditional}% + \def\datechurchslavonic{\datechurchslavonic@traditional}}% + {\def\captionschurchslavonic{\captionschurchslavonic@modern}% + \def\datechurchslavonic{\datechurchslavonic@modern}}% +} + +\newif\ifcyrillic@numerals +\define@key{churchslavonic}{numerals}[latin]{% + \ifstrequal{#1}{cyrillic}% + {\cyrillic@numeralstrue} + {\cyrillic@numeralsfalse}% +} + +\define@boolkey{churchslavonic}[churchslavonic@]{babelshorthands}[false]{} + +\setkeys{churchslavonic}{spelling,numerals} + +\ifsystem@babelshorthands + \setkeys{churchslavonic}{babelshorthands=true} +\else + \setkeys{churchslavonic}{babelshorthands=false} +\fi + +\ifcsundef{initiate@active@char}{% + \input{babelsh.def}% + \initiate@active@char{"}% +}{} + +\def\churchslavonic@shorthands{% + \bbl@activate{"}% + \def\language@group{churchslavonic}% +% \declare@shorthand{russian}{"`}{„}% +% \declare@shorthand{russian}{"'}{“}% +% \declare@shorthand{russian}{"<}{«}% +% \declare@shorthand{russian}{">}{»}% + \declare@shorthand{churchslavonic}{""}{\hskip\z@skip}% + \declare@shorthand{churchslavonic}{"~}{\textormath{\leavevmode\hbox{-}}{-}}% + \declare@shorthand{churchslavonic}{"=}{\nobreak-\hskip\z@skip}% + \declare@shorthand{churchslavonic}{"|}{\textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}% + \declare@shorthand{churchslavonic}{"-}{% + \def\churchslavonic@sh@tmp{% + \if\churchslavonic@sh@next-\expandafter\churchslavonic@sh@emdash + \else\expandafter\churchslavonic@sh@hyphen\fi + }% + \futurelet\churchslavonic@sh@next\churchslavonic@sh@tmp}% + \def\churchslavonic@sh@hyphen{% + \nobreak\-\bbl@allowhyphens}% + \def\churchslavonic@sh@emdash##1##2{\cdash-##1##2}% + \def\cdash##1##2##3{\def\tempx@{##3}% + \def\tempa@{-}\def\tempb@{~}\def\tempc@{*}% + \ifx\tempx@\tempa@\@Acdash\else + \ifx\tempx@\tempb@\@Bcdash\else + \ifx\tempx@\tempc@\@Ccdash\else + \errmessage{Wrong usage of cdash}\fi\fi\fi}% + \def\@Acdash{\ifdim\lastskip>\z(a)\unskip\nobreak\hskip.2em\fi + \cyrdash\hskip.2em\ignorespaces}% + \def\@Bcdash{\leavevmode\ifdim\lastskip>\z@\unskip\fi + \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}% + \def\@Ccdash{\leavevmode + \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}% + \ifx\cyrdash\undefined + \def\cyrdash{\hbox to.8em{--\hss--}} + \fi + \declare@shorthand{churchslavonic}{",}{\nobreak\hskip.2em\ignorespaces}% +} + +\def\nochurchslavonic@shorthands{% + \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}% +} + + +\def\captionschurchslavonic@modern{% + \def\prefacename{Предисловие}% + \def\refname{Список литературы}% + \def\abstractname{Аннотация}% + \def\bibname{Литература}% +\def\chaptername{Глава}% + \def\appendixname{Приложение}% + \ifcsundef{thechapter}% + {\def\contentsname{Содержание}}% + {\def\contentsname{Оглавление}}% + \def\listfigurename{Список иллюстраций}% + \def\listtablename{Список таблиц}% + \def\indexname{Предметный указатель}% + \def\authorname{Именной указатель}% + \def\figurename{Рис.}% + \def\tablename{Таблица}% + \def\partname{Часть}% + \def\enclname{вкл.}% + \def\ccname{исх.}% + \def\headtoname{вх.}% + \def\pagename{с.}% + \def\seename{см.}% + \def\alsoname{см.~также}% + \def\proofname{Доказательство}% +} +\def\datechurchslavonic@modern{% + \def\today{\number\day% + \space\ifcase\month\or% + января\or + февраля\or + марта\or + апреля\or + мая\or + июня\or + июля\or + августа\or + сентября\or + октября\or + ноября\or + декабря\fi% + \space \number\year\space г.}} + +\def\captionschurchslavonic@traditional{% + \def\prefacename{Предисло́вїе}% + \def\refname{Примѣча̑нїѧ}% + \def\abstractname{А҆ннота́цїѧ}% + \def\bibname{Вивлїогра́фїѧ}% + \def\chaptername{Глава̀}% + \def\appendixname{Приложе́нїе}% + \ifcsundef{thechapter}% + {\def\contentsname{Содержа́нїе}}% + {\def\contentsname{Ѡ҆главле́нїе}}% + \def\listfigurename{Надписа́нїе и҆з̾ѡбраже́нїй}% + \def\listtablename{Надписа́нїе табли́цъ}% + \def\indexname{Предмѣ́тный ᲂу҆каза́тель}% + \def\authorname{И҆менно́й ᲂу҆каза́тель}% + \def\figurename{И҆з̾ѡбраже́нїе}% + \def\tablename{Табли́ца}% + \def\partname{Ча́сть}% + \def\enclname{вкл.}% + \def\ccname{исх.}% + \def\headtoname{вх.}% + \def\pagename{с.}% + \def\seename{зрѝ}% + \def\alsoname{зрѝ~та́кожде}% + \def\proofname{Доказа́тельство}% +} +\def\datechurchslavonic@traditional{% + \def\today{\number\day% + \space\ifcase\month\or% + і҆аннꙋа́рїа\or + феврꙋа́рїа\or + ма́рта\or + а҆прі́ллїа\or + ма́їа\or + і҆ꙋ́нїа\or + і҆ꙋ́лїа\or + а҆́ѵгꙋста\or + септе́мврїа\or + ѻ҆ктѡ́врїа\or + ное́мврїа\or + деке́мврїа\fi% + \space л.\space\number\year\space}} + +% The following is based on some ideas from ruscor.sty +\def\churchslavonic@capsformat{% + \def\@seccntformat##1{\csname pre##1\endcsname% + \csname the##1\endcsname% + \csname post##1\endcsname}% + \def\(a)aftersepkern{\hspace{0.5em}}% + \def\postchapter{.\@aftersepkern}% + \def\postsection{.\@aftersepkern}% + \def\postsubsection{.\@aftersepkern}% + \def\postsubsubsection{.\@aftersepkern}% + \def\postparagraph{.\@aftersepkern}% + \def\postsubparagraph{.\@aftersepkern}% + \def\prechapter{}% + \def\presection{}% + \def\presubsection{}% + \def\presubsubsection{}% + \def\preparagraph{}% + \def\presubparagraph{}} + +\def\Azbuk#1{\expandafter\churchslavonic@Alph\csname c@#1\endcsname} +\def\churchslavonic@Alph#1{\ifcase#1\or + А\or Б\or В\or Г\or Д\or Є\or Ж\or Ѕ\or + З\or И\or І\or К\or Л\or М\or Н\or О\or + П\or Р\or С\or Т\or Ꙋ\or Ф\or Х\or Ѿ\or + Ц\or Ч\or Ш\or Щ\or Ъ\or Ы\or Ь\or Ѣ\or + Ю\or Ѫ\or Ѧ\or Ѯ\or Ѱ\or Ѳ\or Ѵ\else\xpg@ill@value{#1}{churchslavonic@Alph}\fi} + +\def\azbuk#1{\expandafter\churchslavonic@alph\csname c@#1\endcsname} +\def\churchslavonic@alph#1{\ifcase#1\or + а\or б\or в\or г\or д\or е\or ж\or ѕ\or + з\or и\or ї\or к\or л\or м\or н\or о\or + п\or р\or с\or т\or ꙋ\or ф\or х\or ѿ\or + ц\or ч\or ш\or щ\or ъ\or ы\or ь\or ѣ\or + ю\or ѫ\or ѧ\or ѯ\or ѱ\or ѳ\or ѵ\else\xpg@ill@value{#1}{churchslavonic@alph}\fi} + +%% Deleting stuff for Cyrillic numerals +%% TODO: link with cu-num package +\def\noextras@churchslavonic{% + \def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel + \ifcyrillic@numerals\nochurchslavonic@numbers\fi + \nochurchslavonic@shorthands% +} + +\def\blockextras@churchslavonic{% + \churchslavonic@capsformat% + \ifcyrillic@numerals\churchslavonic@numbers\fi + \ifchurchslavonic@babelshorthands\churchslavonic@shorthands\fi +} + +\def\inlineextras@churchslavonic{% + \ifchurchslavonic@babelshorthands\churchslavonic@shorthands\fi% +} + +%%% These lines taken from russianb.ldf, part of babel package. +% make it optional? +\def\sh {\mathop{\operator@font sh}\nolimits} +\def\ch {\mathop{\operator@font ch}\nolimits} +\def\tg {\mathop{\operator@font tg}\nolimits} +\def\arctg {\mathop{\operator@font arctg}\nolimits} +\def\arcctg{\mathop{\operator@font arcctg}\nolimits} +\def\th {\mathop{\operator@font th}\nolimits} +\def\ctg {\mathop{\operator@font ctg}\nolimits} +\def\cth {\mathop{\operator@font cth}\nolimits} +\def\cosec {\mathop{\operator@font cosec}\nolimits} +\def\Prob {\mathop{\kern\z@\mathsf{P}}\nolimits} +\def\Variance{\mathop{\kern\z@\mathsf{D}}\nolimits} +\def\nod {\mathop{\mathrm{н.о.д.}}\nolimits} +\def\nok {\mathop{\mathrm{н.о.к.}}\nolimits} +\def\NOD {\mathop{\mathrm{НОД}}\nolimits} +\def\NOK {\mathop{\mathrm{НОК}}\nolimits} +\def\Proj {\mathop{\mathrm{Пр}}\nolimits} +%\DeclareRobustCommand{\No}{№} + +\endinput + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/churchslavonic.tlpobj new/tlpkg/tlpobj/churchslavonic.tlpobj --- old/tlpkg/tlpobj/churchslavonic.tlpobj 2016-05-17 03:18:19.000000000 +0200 +++ new/tlpkg/tlpobj/churchslavonic.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -1,24 +1,27 @@ name churchslavonic category Package -revision 41182 -shortdesc Typesetting documents in Church Slavonic language using Unicode +revision 42751 +shortdesc Typeset documents in Church Slavonic language using Unicode relocated 1 -longdesc The package provides fonts, hyphenation patterns and supporting -longdesc macros to typeset Church Slavonic texts. +longdesc The package provides fonts, hyphenation patterns, and +longdesc supporting macros to typeset Church Slavonic texts. It depends +longdesc on the following other packages: fonts-churchslavonic, hyph- +longdesc utf8, intcalc, etoolbox, and xcolor. depend fonts-churchslavonic depend hyphen-churchslavonic depend etoolbox depend oberdiek depend xcolor -runfiles size=8 +runfiles size=11 RELOC/tex/latex/churchslavonic/churchslavonic.sty RELOC/tex/latex/churchslavonic/cu-calendar.sty RELOC/tex/latex/churchslavonic/cu-kinovar.sty RELOC/tex/latex/churchslavonic/cu-num.sty RELOC/tex/latex/churchslavonic/cu-util.sty + RELOC/tex/latex/churchslavonic/gloss-churchslavonic.ldf catalogue-also fonts-churchslavonic catalogue-ctan /language/churchslavonic -catalogue-date 2016-05-15 08:36:48 +0200 -catalogue-license other-free +catalogue-date 2016-12-19 08:43:39 +0100 +catalogue-license mit catalogue-topics churchslavonic multilingual-addon -catalogue-version 0.1 +catalogue-version 0.2.1 ++++++ cinzel.doc.tar.xz ++++++ ++++++ cinzel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cinzel.tlpobj new/tlpkg/tlpobj/cinzel.tlpobj --- old/tlpkg/tlpobj/cinzel.tlpobj 2016-04-14 18:49:55.000000000 +0200 +++ new/tlpkg/tlpobj/cinzel.tlpobj 2017-04-14 17:35:02.000000000 +0200 @@ -100,6 +100,6 @@ RELOC/tex/latex/cinzel/TS1CinzelDecorative-LF.fd RELOC/tex/latex/cinzel/cinzel.sty catalogue-ctan /fonts/cinzel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-decor font-type1 font-ttf ++++++ circ.doc.tar.xz ++++++ ++++++ circ.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/circ.tlpobj new/tlpkg/tlpobj/circ.tlpobj --- old/tlpkg/tlpobj/circ.tlpobj 2016-04-14 18:49:57.000000000 +0200 +++ new/tlpkg/tlpobj/circ.tlpobj 2017-04-14 17:35:03.000000000 +0200 @@ -33,7 +33,7 @@ RELOC/tex/latex/circ/physics.def catalogue-also circuit-macros catalogue-ctan /macros/generic/diagrams/circ -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics diagram-circ catalogue-version 1.1 ++++++ circuitikz.doc.tar.xz ++++++ Binary files old/doc/context/third/circuitikz/circuitikz-context.pdf and new/doc/context/third/circuitikz/circuitikz-context.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/circuitikz/CHANGELOG.md new/doc/generic/circuitikz/CHANGELOG.md --- old/doc/generic/circuitikz/CHANGELOG.md 2016-06-07 01:01:18.000000000 +0200 +++ new/doc/generic/circuitikz/CHANGELOG.md 2017-06-06 01:20:06.000000000 +0200 @@ -1,6 +1,54 @@  The major changes among the different circuitikz versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes. +* Version 0.8.3 (2017-05-28) + - Removed unwanted lines at to-paths if the starting point is a node without a explicit anchor. + - Fixed scaling option, now all parts are scaled by bipoles/length + - Surge arrester appears no more if a to path is used without []-options + - Fixed current placement now possible with paths at an angle of around 280° + - Fixed voltage placement now possible with paths at an angle of around 280° + - Fixed label and annotation placement (at some angles position not changable) + - Adjustable default distance for straight-voltages: 'bipoles/voltage/straight label distance' + - Added Symbol for bandstop filter + - New annotation type to show flows using f=... like currents, can be used for thermal, power or current flows + +* Version 0.8.2 (2017-05-01) + - Fixes pgfkeys error using alternatively specified mixed colors(see pgfplots manual section "4.7.5 Colors") + - Added new switches "ncs" and "nos" + - Reworked arrows at spst-switches + - Fixed direction of controlled american voltage source + - "v<=" and "i<=" do not rotate the sources anymore(see them as "counting direction indication", this can be different then the shape orientation); Use the option "invert" to change the direction of the source/apperance of the shape. + - current label "i=" can now be used independent of the regular label "l=" at current sources + - rewrite of current arrow placement. Current arrows can now also be rotated on zero-length paths + - New DIN/EN compliant operational amplifier symbol "en amp" + +* Version 0.8.1 (2017-03-25) + - Fixed unwanted line through components if target coordinate is a name of a node + - Fixed position of labels with subscript letters. + - Absolute distance calculation in terms of ex at rotated labels + - Fixed label for transistor paths (no label drawn) + +* Version 0.8 (2017-03-08) + - Allow use of voltage label at a [short] + - Correct line joins between path components (to[...]) + - New Pole-shape .-. to fill perpendicular joins + - Fixed direction of controlled american current source + - Fixed incorrect scaling of magnetron + - Fixed: Number of american inductor coils not adjustable + - Fixed Battery Symbols and added new battery2 symbol + - Added non-inverting Schmitttrigger + +* Version 0.7 (2016-09-08) + - Added second annotation label, showing, e.g., the value of an component + - Added new symbol: magnetron + - Fixed name conflict of diamond shape with tikz.shapes package + - Fixed varcap symbol at small scalings + - New packet-option "straightvoltages, to draw straight(no curved) voltage arrows + - New option "invert" to revert the node direction at paths + - Fixed american voltage label at special sources and battery + - Fixed/rotated battery symbol(longer lines by default positive voltage) + - New symbol Schmitttrigger + * Version 0.6 (2016-06-06) - Added Mechanical Symbols (damper,mass,spring) - Added new connection style diamond, use (d-d) @@ -58,7 +106,7 @@ - rename of context.tex and context.pdf (thanks to Karl Berry) - updated the email address - in documentation, fixed wrong (non-standard) labelling of the axis in an example (thanks to prof. Claudio Beccaria) - - fixed scaling inconsistencies in quadrupoles + - fixed scaling inconsistencies in quadrupoles - fixed division by zero error on certain vertical paths - introduced options straighlabels, rotatelabels, smartlabels diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/circuitikz/README.md new/doc/generic/circuitikz/README.md --- old/doc/generic/circuitikz/README.md 2016-06-07 01:01:18.000000000 +0200 +++ new/doc/generic/circuitikz/README.md 2017-03-25 21:53:31.000000000 +0100 @@ -1,8 +1,6 @@ circuitikz ========== -This is CircuiTikz, version 0.6 (2016-06-05). - This package provides a set of macros for naturally typesetting electrical and (somewhat less naturally, perhaps) electronical networks. It was born mainly for writing my own exercise book and exams sheets for the Elettrotecnica courses at Politecnico di Milano, Italy. I wanted a tool that was easy to use, with a lean syntax, native to LaTeX, and supporting directly PDF output format. @@ -12,7 +10,7 @@ -------------- ## Requirements -* Tikz graphics library, version 2 +* Tikz/PGF graphics library, version 3 * xstrings not older than 2009/03/13 ## Installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/circuitikz/changelog.tex new/doc/latex/circuitikz/changelog.tex --- old/doc/latex/circuitikz/changelog.tex 2016-06-07 01:01:18.000000000 +0200 +++ new/doc/latex/circuitikz/changelog.tex 2017-06-06 01:20:06.000000000 +0200 @@ -4,12 +4,135 @@ full list of changes. \begin{itemize} -\itemsep1pt\parskip0pt\parsep0pt +\tightlist +\item + Version 0.8.3 (2017-05-28) + + \begin{itemize} + \tightlist + \item + Removed unwanted lines at to-paths if the starting point is a node + without a explicit anchor. + \item + Fixed scaling option, now all parts are scaled by bipoles/length + \item + Surge arrester appears no more if a to path is used without + {[}{]}-options + \item + Fixed current placement now possible with paths at an angle of + around 280° + \item + Fixed voltage placement now possible with paths at an angle of + around 280° + \item + Fixed label and annotation placement (at some angles position not + changable) + \item + Adjustable default distance for straight-voltages: + `bipoles/voltage/straight label distance' + \item + Added Symbol for bandstop filter + \item + New annotation type to show flows using f=\ldots{} like currents, + can be used for thermal, power or current flows + \end{itemize} +\item + Version 0.8.2 (2017-05-01) + + \begin{itemize} + \tightlist + \item + Fixes pgfkeys error using alternatively specified mixed colors(see + pgfplots manual section ``4.7.5 Colors'') + \item + Added new switches ``ncs'' and ``nos'' + \item + Reworked arrows at spst-switches + \item + Fixed direction of controlled american voltage source + \item + ``v\textless{}='' and ``i\textless{}='' do not rotate the sources + anymore(see them as ``counting direction indication'', this can be + different then the shape orientation); Use the option ``invert'' to + change the direction of the source/apperance of the shape. + \item + current label ``i='' can now be used independent of the regular + label ``l='' at current sources + \item + rewrite of current arrow placement. Current arrows can now also be + rotated on zero-length paths + \item + New DIN/EN compliant operational amplifier symbol ``en amp'' + \end{itemize} +\item + Version 0.8.1 (2017-03-25) + + \begin{itemize} + \tightlist + \item + Fixed unwanted line through components if target coordinate is a + name of a node + \item + Fixed position of labels with subscript letters. + \item + Absolute distance calculation in terms of ex at rotated labels + \item + Fixed label for transistor paths (no label drawn) + \end{itemize} +\item + Version 0.8 (2017-03-08) + + \begin{itemize} + \tightlist + \item + Allow use of voltage label at a {[}short{]} + \item + Correct line joins between path components (to{[}\ldots{}{]}) + \item + New Pole-shape .-. to fill perpendicular joins + \item + Fixed direction of controlled american current source + \item + Fixed incorrect scaling of magnetron + \item + Fixed: Number of american inductor coils not adjustable + \item + Fixed Battery Symbols and added new battery2 symbol + \item + Added non-inverting Schmitttrigger + \end{itemize} +\item + Version 0.7 (2016-09-08) + + \begin{itemize} + \tightlist + \item + Added second annotation label, showing, e.g., the value of an + component + \item + Added new symbol: magnetron + \item + Fixed name conflict of diamond shape with tikz.shapes package + \item + Fixed varcap symbol at small scalings + \item + New packet-option ``straightvoltages, to draw straight(no curved) + voltage arrows + \item + New option ``invert'' to revert the node direction at paths + \item + Fixed american voltage label at special sources and battery + \item + Fixed/rotated battery symbol(longer lines by default positive + voltage) + \item + New symbol Schmitttrigger + \end{itemize} \item Version 0.6 (2016-06-06) \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item Added Mechanical Symbols (damper,mass,spring) \item @@ -37,7 +160,7 @@ Version 0.5 (2016-04-24) \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item new option boxed and dashed for hf-symbols \item @@ -55,7 +178,7 @@ Version 0.4 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item minor improvements to documentation \item @@ -73,7 +196,7 @@ Version 0.3.1 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item different management of color\ldots{} \item @@ -94,7 +217,7 @@ Version 0.3.0 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item fixed gate node for a few transistors \item @@ -129,7 +252,7 @@ Version 0.2.4 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item added square voltage source (contributed by Alistair Kwan) \item @@ -150,7 +273,7 @@ in documentation, fixed wrong (non-standard) labelling of the axis in an example (thanks to prof. Claudio Beccaria) \item - fixed scaling inconsistencies in quadrupoles\\ + fixed scaling inconsistencies in quadrupoles \item fixed division by zero error on certain vertical paths \item @@ -160,7 +283,7 @@ Version 0.2.3 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item fixed compatibility problem with label option from tikz \item @@ -210,7 +333,7 @@ Version 0.2.2 - 20090520 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item Added the shape for lamps. \item @@ -225,7 +348,7 @@ Version 0.2.1 - 20090503 \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item Op-amps added \item @@ -236,7 +359,7 @@ Version 0.2 - 20090417 First public release on CTAN \begin{itemize} - \itemsep1pt\parskip0pt\parsep0pt + \tightlist \item \emph{Backward incompatibility}: labels ending with \texttt{:}\textit{angle} are not parsed for positioning anymore. Binary files old/doc/latex/circuitikz/circuitikzmanual.pdf and new/doc/latex/circuitikz/circuitikzmanual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/circuitikz/circuitikzmanual.tex new/doc/latex/circuitikz/circuitikzmanual.tex --- old/doc/latex/circuitikz/circuitikzmanual.tex 2016-06-07 01:01:18.000000000 +0200 +++ new/doc/latex/circuitikz/circuitikzmanual.tex 2017-06-06 01:20:06.000000000 +0200 @@ -44,9 +44,9 @@ \usepackage{hyperref} \hypersetup{ bookmarks=false, % show bookmarks bar? - pdftitle={CircuitTikZ v. \pgfcircversion\ - manual}, % title - pdfauthor={Massimo Redaelli}, % author - pdfsubject={CircuitTikZ manual}, % subject of the document + pdftitle={CircuiTikZ \pgfcircversion\ - manual}, % title + pdfauthor={Massimo Redaelli, Stefan Lindner, Stefan Erhardt}, % author + pdfsubject={CircuiTikZ manual}, % subject of the document pdfkeywords={}, % list of keywords colorlinks=true, % false: boxed links; true: colored links linkcolor=black, % color of internal links @@ -92,7 +92,7 @@ \maketitle \tableofcontents - +\cleardoublepage \section{Introduction} \subsection{About} \Circuitikz\ was initiated by Massimo Redaelli in 2007, who was working as a research assistant at the Polytechnic University of Milan, Italy, and needed a tool for creating exercises and exams. @@ -114,7 +114,7 @@ \bottomrule \end{tabular} \end{table} -\footnotetext{\ConTeXt\ suppurt was added mostly thanks to Mojca Miklavec and Aditya Mahajan.} +\footnotetext{\ConTeXt\ support was added mostly thanks to Mojca Miklavec and Aditya Mahajan.} \noindent \TikZ\ will be automatically loaded. @@ -126,7 +126,7 @@ \subsection{Requirements} \begin{itemize} - \item \texttt{tikz}, version $\ge 2$; + \item \texttt{tikz}, version $\ge 3$; \item \texttt{xstring}, not older than 2009/03/13; \item \texttt{siunitx}, if using \texttt{siunitx} option. \end{itemize} @@ -137,7 +137,7 @@ So, if loaded with said option, one must write \verb!(0,0) to[*R] (2,0)! and, for transistors on a path, \verb!(0,0) to[*Tnmos] (2,0)!, and so on (but \verb!(0,0) node[nmos] {}!). See example at page~\pageref{ex:compatibility}. \subsection{License} -Copyright \copyright\ 2007--2016 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘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. +Copyright \copyright\ 2007--2017 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘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. \subsection{Feedback} The easiest way to contact the authors is via the official Github repository: \url{https://github.com/circuitikz/circuitikz/issues} @@ -145,10 +145,14 @@ \section{Incompabilities between version} Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers. +You can check the used version at your local installation using the macro \verb!\pgfcircversion{}!. \begin{itemize} +\item Since v0.8.2: voltage and current label directions(v<= / i<=) do NOT change the orientation of the drawn source shape anymore. Use the "invert" option to rotate the shape of the source. Furthermore, from this version on, the current label(i=) at current sources can be used independent of the regular label(l=). +\item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions. \item Since v0.5.1: The parts pfet,pigfete,pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this. \item Since v0.5: New voltage counting direction, here exists an option to use the old behaviour \end{itemize} +For older projects, you can use an older version locally using the git-version and picking the correct commit from the repository (branch gh-pages). \section{Package options} @@ -185,6 +189,7 @@ \noindent Here is the list of all the options: \begin{itemize} \item \texttt{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources; + \item \texttt{straightvoltages}: uses arrows to define voltages, and and uses straight voltage arrows; \item \texttt{americanvoltages}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources; \item \texttt{europeancurrents}: uses european-style current sources; \item \texttt{americancurrents}: uses american-style current sources; @@ -448,6 +453,7 @@ \begin{itemize} \circuititembip{battery}{Battery}{} \circuititembip{battery1}{Single battery cell}{} + \circuititembip{battery2}{Single battery cell}{} \circuititembip{european voltage source}{Voltage source (european style)}{} \circuititembip{american voltage source}{Voltage source (american style)}{} \circuititembip{european current source}{Current source (european style)}{} @@ -483,7 +489,6 @@ \circuititembip{dcisource}{DC current source}{} \end{itemize} - \subsubsection{Mechanical Analogy} \begin{itemize} \circuititembip{damper}{Mechanical Damping}{} @@ -491,18 +496,13 @@ \circuititembip{mass}{Mechanical Mass}{} \end{itemize} - -%\begin{framed} -%The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the default) and \texttt{americancurrent} [resp. \texttt{americanvoltage}] define which sinusoidal current [resp. voltage] source is selected by default when the abbreviated styles \texttt{sinusoidal current source}, \texttt{csourcesin}, \texttt{cI} [resp. \texttt{sinusoidal voltage source}, \texttt{vsourcesin}, \texttt{cV}] are used. - -%One can also use the related styles \texttt{[european currents]} [resp. \texttt{[european voltages]}] and \texttt{[american currents]} [resp. \texttt{[american voltages]}]. -%\end{framed} - \subsubsection{Switch} \begin{itemize} \circuititembip{switch}{Switch}{spst} \circuititembip{closing switch}{Closing switch}{cspst} \circuititembip{opening switch}{Opening switch}{ospst} + \circuititembip{normal open switch}{Normally open switch}{nos} + \circuititembip{normal closed switch}{Normally closed switch}{ncs} \circuititembip{push button}{Push button}{} \end{itemize} @@ -512,6 +512,7 @@ \circuititembip{twoport}{generic two port\footnote{To specify text to be put in the component: \texttt{twoport[t=text]}): \tikz \draw[scale=.5, transform shape] (0,0) to[twoport,>,t=text] (2,0); }}{} \circuititembip{vco}{vco}{} \circuititembip{bandpass}{bandpass}{} + \circuititembip{bandstop}{bandstop}{} \circuititembip{highpass}{highpass}{} \circuititembip{lowpass}{lowpass}{} \circuititembip{adc}{A/D converter}{} @@ -634,6 +635,23 @@ \circuititem{isfet}{\scshape isfet}{} \end{itemize} +\subsubsection{Electronic Tubes} +\begin{itemize} + \circuititem{magnetron}{Magnetron}{} +\end{itemize} +\begin{LTXexample}[varwidth=true] + \begin{circuitikz} + \draw (0,-2)node[rground](gnd){} to[voltage source,v<={HV}]++(0,3)--++(1,0)to[V,n=DC]++(2,0); + \draw (2,-1) node[magnetron,scale=1](magn){}; + \draw (DC.left)++(-0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode1); + \draw (DC.right)++(0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode2); + \draw (magn.anode) to [short] (magn.anode|-gnd) node[rground]{}; + \draw (magn.cathode1)node[above]{$1$}; + \draw (magn.cathode2)node[above]{$2$}; + \draw[->](magn.east) --++(1,0)node[right]{$RF_{out}$}; + \end{circuitikz} +\end{LTXexample} + \subsubsection{Block diagram} These come from Stefan Erhardt's contribution of block diagram components. Add a box around them with the option \texttt{box}. \begin{itemize} @@ -715,7 +733,7 @@ \subsection{Logic gates} - +\subsubsection{American Logic gates} \begin{itemize} \circuititem{american and port}{American \textsc{and} port}{} \circuititem{american or port}{American \textsc{or} port}{} @@ -725,7 +743,7 @@ \circuititem{american xor port}{American \textsc{xor} port}{} \circuititem{american xnor port}{American \textsc{xnor} port}{} \end{itemize} - +\subsubsection{European Logic gates} \begin{itemize} \circuititem{european and port}{European \textsc{and} port}{} \circuititem{european or port}{European \textsc{or} port}{} @@ -742,10 +760,15 @@ If otherwise \texttt{europeanports} option is active (or the style \texttt{[european ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the european version of the respective logic port. \end{framed} +\begin{itemize} + \circuititem{schmitt}{Non-Inverting \textsc{Schmitttrigger}}{} + \circuititem{invschmitt}{Inverting \textsc{Schmitttrigger}}{} +\end{itemize} \subsection{Amplifiers} \begin{itemize} \circuititem{op amp}{Operational amplifier}{} + \circuititem{en amp}{Operational amplifier compliant to DIN/EN 60617 standard}{} \circuititem{fd op amp}{Fully differential operational amplifier\footnote{Contributed by Kristofer M. Monisit.}}{} \circuititem{gm amp}{transconductance amplifier}{} \circuititem{plain amp}{Plain amplifier}{} @@ -759,6 +782,7 @@ \circuititem{inputarrow}{Arrow to draw at its tip, useful for block diagrams.}{} \circuititem{circ}{Connected terminal}{} \circuititem{ocirc}{Unconnected terminal}{} + \circuititem{diamondpole}{Diamond-style terminal}{} \end{itemize} @@ -810,17 +834,20 @@ ;\end{circuitikz} \end{LTXexample} -\subsection{Labels} +\subsection{Labels and Annotations} +Since Version 0.7, beside the original label (l) option, there is a new option to place a second label, called annotation (a) at each bipole. Up to now this is a beta-test and there can be problems. For example, up to now this option is not compatible with the concurrent use of voltage labels. + +The position of (a) and (l) labels can be adjusted with \_ and \^, respectively. \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[R, l^=$R_1$] (2,0); + \draw (0,0) to[R, l=$R_1$,a=1<\kilo\ohm>] (2,0); \end{circuitikz} \end{LTXexample} \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[R, l_=$R_1$] (2,0); + \draw (0,0) to[R, l_=$R_1$,a^=1<\kilo\ohm>] (2,0); \end{circuitikz} \end{LTXexample} @@ -956,10 +983,68 @@ \begin{LTXexample}[varwidth=true] \begin{circuitikz}[american] - \draw (0,0) to[V<=10V, i_=$i_1$] (2,0); + \draw (0,0) to[V=10V,invert, i_=$i_1$] (2,0); \end{circuitikz} -\end{LTXexample} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz}[american] + \draw (0,0) to[dcisource=1A, i_=$i_1$] (2,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz}[american] + \draw (0,0) to[dcisource=1A,invert, i_=$i_1$] (2,0); +\end{circuitikz} +\end{LTXexample} + +\subsection{Flows}\label{flows} +As an alternative for the current arrows, you can also use the following flows. They can also be used to indicate thermal or power flows. The syntax is pretty the same as for currents. + +\textit{This is a new beta feature since version 0.8.3, therefore, please provide bugreports or hints to optimize this feature regarding placement and appearance! This means, that the appearance may change in the future!} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f<=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f_=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f_>=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f<^=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f<_=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[R, f>_=$i_1$] (3,0); +\end{circuitikz} +\end{LTXexample} \subsection{Voltages} See introduction note at Currents (chapter \ref{currents}, page \pageref{currents})! @@ -1010,7 +1095,18 @@ \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[I<=1A, v_=$i_1$] (2,0); + \draw (0,0) to[I<=1A, v_=$u_1$] (2,0); +\end{circuitikz} +\end{LTXexample} + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[I=$~$,l=1A, v_=$u_1$] (2,0); +\end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[I,l=1A, v_=$u_1$] (2,0); \end{circuitikz} \end{LTXexample} @@ -1267,7 +1363,7 @@ \begin{LTXexample}[varwidth=true] \begin{circuitikz}[american voltages] - \draw (0,0) to[cV=$k\cdot a_1$] (2,0); + \draw (0,0) to[cV=$k v_e$] (2,0); \end{circuitikz} \end{LTXexample} @@ -1280,7 +1376,7 @@ \begin{LTXexample}[varwidth=true] \begin{circuitikz}[american voltages] - \draw (0,0) to[csV=$k\cdot a_1$] (2,0); + \draw (0,0) to[csV=$k v_e$] (2,0); \end{circuitikz} \end{LTXexample} @@ -1326,7 +1422,8 @@ -\subsection{Mirroring} +\subsection{Mirroring and Inverting} +Bipole paths can also mirrored and inverted (or reverted) to change the drawing direction. \begin{LTXexample}[varwidth=true] \begin{circuitikz} @@ -1338,30 +1435,37 @@ \begin{circuitikz} \draw (0,0) to[pD, mirror] (2,0); \end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[pD, invert] (2,0); +\end{circuitikz} \end{LTXexample} -At the moment, placing labels and currents on mirrored bipoles works: +Placing labels, currents and voltages works also, please note, that mirroring and inverting does not incfluence the positioning of labels and voltages. Labels are by default above/right of the bipole and voltages below/left, respectively. \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T] (2,0); + \draw (0,0) to[ospst=T, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T, mirror, i=$i_1$] (2,0); + \draw (0,0) to[ospst=T, mirror, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} -But voltages don't: - \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T, mirror, v=v] (2,0); + \draw (0,0) to[ospst=T, invert, i=$i_1$, v=$v$] (2,0); +\end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[ospst=T,mirror,invert, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} -Sorry about that. \subsection{Putting them together} \begin{LTXexample}[varwidth=true] @@ -1378,10 +1482,26 @@ \end{circuitikz} \end{LTXexample} +\subsection{Line joins between Path Components} +Line joins should be calculated correctly, if the were on the same path and if the path is not closed. For example, the following path is not closed correctly(\textit{--cycle} does not work here!): +\begin{LTXexample}[varwidth=true] + \begin{tikzpicture}[line width=3pt,european] + \draw (0,0) to[R]++(2,0)to[R]++(0,2) + --++(-2,0)to[R]++(0,-2); + \draw[red,line width=1pt] circle(2mm); + \end{tikzpicture} +\end{LTXexample} +To correct the line ending, there are support shapes to fill the missing rectangle. They can be used like the support shapes(*,o,d) using a dot (.) on one or both ends of a component(have a look at the last resistor in this example: +\begin{LTXexample}[varwidth=true] + \begin{tikzpicture}[line width=3pt,european] + \draw (0,0) to[R]++(2,0)to[R]++(0,2) + --++(-2,0)to[R,-.]++(0,-2); + \draw[red,line width=1pt] circle(2mm); + \end{tikzpicture} +\end{LTXexample} \section{Not only bipoles} - Since only bipoles (but see section~\ref{sec:transasbip}) can be placed "along a line", components with more than two terminals are placed as nodes: \begin{LTXexample}[varwidth=true] \begin{circuitikz} @@ -1446,7 +1566,7 @@ (pigfete.G) node[anchor=east] {G} (pigfete.D) node[anchor=north] {D} (pigfete.S) node[anchor=south] {S} - (pigfete.bulk) node[anchor=east] {Bulk} + (pigfete.bulk) node[anchor=west] {Bulk} ;\end{circuitikz} \end{LTXexample} @@ -1506,7 +1626,7 @@ ;\end{circuitikz} \end{LTXexample} -\begin{LTXexample} +\begin{LTXexample}[varwidth=true] \begin{circuitikz} \draw (0,2) node[rground, yscale=-1] {} @@ -2064,9 +2184,10 @@ \begin{tabular}{l}\label{ex:compatibility} - \fbox{\includegraphics{compatibility.pdf}} - \\ - \begin{lstlisting} +\IfFileExists{compatibility.pdf} +{\fbox{\includegraphics{compatibility.pdf}}} +\\ +\begin{lstlisting} \documentclass{standalone} \usepackage{tikz} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/circuitikz.doc.tlpobj new/tlpkg/tlpobj/circuitikz.doc.tlpobj --- old/tlpkg/tlpobj/circuitikz.doc.tlpobj 2016-06-07 17:33:42.000000000 +0200 +++ new/tlpkg/tlpobj/circuitikz.doc.tlpobj 2017-06-06 02:21:51.000000000 +0200 @@ -1,9 +1,9 @@ name circuitikz.doc category Package -revision 41299 +revision 44488 shortdesc doc files of circuitikz relocated 1 -docfiles size=93 +docfiles size=104 RELOC/doc/context/third/circuitikz/circuitikz-context.pdf RELOC/doc/context/third/circuitikz/circuitikz-context.tex RELOC/doc/generic/circuitikz/CHANGELOG.md ++++++ circuitikz.tar.xz ++++++ ++++ 3790 lines of diff (skipped) ++++++ cite.doc.tar.xz ++++++ ++++++ cite.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cite.tlpobj new/tlpkg/tlpobj/cite.tlpobj --- old/tlpkg/tlpobj/cite.tlpobj 2016-04-14 18:49:58.000000000 +0200 +++ new/tlpkg/tlpobj/cite.tlpobj 2017-04-14 17:35:04.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/cite/overcite.sty catalogue-also natbib catalogue-ctan /macros/latex/contrib/cite -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics cite-supp catalogue-version 5.5 ++++++ citeall.doc.tar.xz ++++++ ++++++ citeall.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/citeall.tlpobj new/tlpkg/tlpobj/citeall.tlpobj --- old/tlpkg/tlpobj/citeall.tlpobj 2016-04-14 18:49:58.000000000 +0200 +++ new/tlpkg/tlpobj/citeall.tlpobj 2017-04-14 17:35:04.000000000 +0200 @@ -4,11 +4,11 @@ shortdesc Cite all entries of a bbl created with BibLaTeX relocated 1 longdesc This small package allows to cite all entries of a bbl-file -longdesc created with biblatex (v1.9). +longdesc created with BibLaTeX (v1.9). runfiles size=1 RELOC/tex/latex/citeall/citeall.sty catalogue-ctan /macros/latex/contrib/biblatex-contrib/citeall -catalogue-date 2015-08-03 08:55:55 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biblatex catalogue-version 1.2 ++++++ cjhebrew.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cjhebrew/cjhebtst.tex new/doc/fonts/cjhebrew/cjhebtst.tex --- old/doc/fonts/cjhebrew/cjhebtst.tex 2006-01-09 01:47:01.000000000 +0100 +++ new/doc/fonts/cjhebrew/cjhebtst.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -\documentclass[a4paper]{article} -\usepackage{german} -\usepackage[T1]{fontenc} -\usepackage{cjhebrew} - -\frenchspacing - -\newcommand{\cjh}{\textsf{cjhebrew}} - -\begin{document} - -\section*{Ein kleines \cjh-Beispieldokument} - -Das \cjh"=Paket erlaubt es, auf recht einfache Weise hebr"aischen -Text zu setzen, und zwar insbesondere innerhalb von "`normalen"' -Flie"stext. Wenn ich also nun einen beliebigen Vers aus dem -Jeremiabuch einfach so hier einmal hinschreiben wollte, dann -k"onnte ich das problemlos tun, etwa so: \<nim:.s:'U d:bArEykA -wA'ok:lem way:hiy d:bAr:kA liy l:,sA,sOn Ul:,sim:.hat l:bAbiy -k*iy--niq:rA' +sim:kA `Alay yhwh 'E:lohey .s:bA'Ot;> Hier zeigt -sich auch gleich, wie der hebr"aische Text in der richtigen -Schreibrichtung gesetzt und korrekt umbrochen wird. - -Hier folgt nun ein l"angerer hebr"aischer Text in erh"ohter -Schriftgr"o"se, der auch zugleich die Verwendung von \verb+\cjLR+ -demonstriert: - -\def\vers#1{\cjLR{\rmfamily\normalsize#1}} - -\Large - -\begin{cjhebrew} - -\vers{1}~b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et -hA'ArE.s; \vers{2}~w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: -`al--p*:ney t:hOm w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney -ham*Ayim; - -\vers{3}~way*o'mEr 'E:lohiym y:hiy 'Or way:hiy--'Or; -\vers{4}~way*ar:' 'E:lohiym 'Et--hA'Or k*iy--.tOb way*ab:d*el -'E:lohiym b*eyn hA'Or Ubeyn ha.ho+sEk:; \vers{5}~way*iq:rA' -'E:lohiym lA'Or yOm w:la.ho+sEk: qArA' lAy:lAh way:hiy--`ErEb -way:hiy--boqEr yOm 'E.hAd; - -\end{cjhebrew} - - -\end{document} Binary files old/doc/fonts/cjhebrew/manual.pdf and new/doc/fonts/cjhebrew/manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/README new/doc/latex/cjhebrew/README --- old/doc/latex/cjhebrew/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cjhebrew/README 2017-02-21 02:01:05.000000000 +0100 @@ -0,0 +1,4 @@ +cjhebrew is a small package for typesetting Hebrew text. It provides +Type1 fonts containing the Hebrew consonants, Hebrew vowels and a few +accents. It is meant to be used by people who want to insert short +Hebrew texts into a non-Hebrew document. \ No newline at end of file Binary files old/doc/latex/cjhebrew/cjhebrew.pdf and new/doc/latex/cjhebrew/cjhebrew.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/cjhebrew.tex new/doc/latex/cjhebrew/cjhebrew.tex --- old/doc/latex/cjhebrew/cjhebrew.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cjhebrew/cjhebrew.tex 2017-03-10 00:01:04.000000000 +0100 @@ -0,0 +1,324 @@ +% This file is part of the cjhebrew package +% +% cjhebrew is subject to the LaTeX Project Public License (LPPL). +% A copy of the LPPL can be found in lppl.txt. +% For the most recent version of this license have a look at +% +% http://www.latex-project.org/lppl.txt +% +\documentclass[a4paper,10pt]{article} +\usepackage[english]{babel} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{cjhebrew} +\usepackage{mathpazo} +\usepackage[scaled=0.9]{helvet} +\usepackage[scaled=0.8]{luximono} +\usepackage[% + pdfauthor={Christian Justen}, + pdftitle={The CJHebrew manual}, + pdfborder={0 0 0}, + bookmarksnumbered=true, + pdfpagemode=None, + pdfstartview=FitH, + ]% + {hyperref} +\usepackage{booktabs} + +\frenchspacing + +\def\cjh{\textsf{cjhebrew}} + +\def\cjhp{\texttt{cjhebrew}} + +\def\!#1!{\texttt{#1}} + +\newcommand{\bs}{\textbackslash} + +\def\showmacro#1{\marginpar{\texttt{{\bs}#1}}} + +\def\showother#1{\marginpar{\texttt{#1}}} + +\def\cjhebversion{0.2a} + +\def\hinweis#1{\mbox{}\marginpar{\textsf{#1}}} + +\def\command#1{\medskip\par\texttt{#1}\medskip\par} + +\newcommand{\eTeX}{$\varepsilon$-\TeX} +\newcommand{\eLaTeX}{$\varepsilon$-\LaTeX} + +\begin{document} + +\title{\cjh% + \footnote{\cjh\ is subject to the \textit{\LaTeX\ Project Public + License}. The most recent version of this license can be found at + \href{http://www.latex-project.org/lppl.txt}{\!www.latex-project.org/lppl.txt!}.}% +} + +\author{Christian Justen\\ +\href{mailto:mail@christian-justen.de}{{\small\!mail@christian-justen.de!}}} + +\date{March 6\textsuperscript{th}, 2017 -- Version \cjhebversion} + +\maketitle + + +\section{Overview} + +\cjh\ is a package which allows the typesetting of Hebrew text in +\LaTeX\ documents. Hebrew text can be vocalised, also a few +accents are available. \cjh\ makes it easy to insert Hebrew words, +sentences or paragraphs into non-Hebrew text; so \cjh\ is quite +appropriate e.\,g. for theological papers. + +When running \LaTeX, \cjh\ uses the extensions of \eTeX\ in order to +typeset Hebrew text from right to left. Most modern \TeX\ systems use +\eLaTeX\ by default when you run \LaTeX, so there should be nothing +special you have to do (unless, of course, you fiddled with your +system). This version of \cjh\ can also be used with lua\LaTeX. + + +\section{Installation} + +\cjh\ is part of most modern \TeX\ distributions. Please, use your +distribution's package manager to install \cjh. If no package manager +is available, then have a look at your distribution's documentation, +as it should tell you how to install packages manually. + + + +\section{Usage} + +To use \cjh\ simply put \verb!\usepackage{cjhebrew}! in the +preamble of your document. + +\cjh\ provides the text font command +\showmacro{textcjheb}\verb!\textcjheb! which switches to the hebrew +font, but does not change the direction of typesetting. Thus, if you +type \verb+\textcjheb{'bgd}+, the result will be \textcjheb{'bgd}, +which is in most cases not what you want. Instead you will normally +use the command \showmacro{cjRL}\verb+\cjRL+, that also switches to +the right direction of typesetting. The input \verb+\cjRL{'bgd}+ will +have as result the ouput \cjRL{'bgd}. There is also an even shorter +form: \showmacro{<>}\verb+\<>+; so, you can type \verb+\<'bgd>+ +instead of \verb+\cjRL{'bgd}+. + +If you want to typeset a complete passage of Hebrew text, you +ought to use the \showother{cjhebrew}\!cjhebrew! environment. + +Finally, \cjh\ provides also the \verb+\cjLR+\showmacro{cjLR} +command, which switches (inside a Hebrew piece of text) back to +the ``normal'' direction of typesetting. Be careful: this command +does not switch to a non-Hebrew font! + +\subsection{The consonants} + +\begin{table} + +\centering + +\begin{tabular}{ccccccccccccccc} + +\toprule\midrule + +\<'> & \ & \<g> & \<d> & \<h> & \<w> & \<z> & \<.h> & +\<.t> & \<y> & \<k|> & \<k> & \<l> & \<m|> & \<m>\\ + +\!'! & \!b! & \!g! & \!d! & \!h! & \!w! & \!z! & \!.h! & \!.t! & +\!y! & \!k! & \!K! & \!l! & \!m! & \!M!\\ + +\midrule + +\<n|> & \<n> & \<s> & \<`> & \<p|> & \ & \<.s|> & \<.s> & \<q> +& \<r> & \</s> +& \<,s> & \<+s> & \<t> &\\ + +\!n! & \!N! & \!s! & \!`! & \!p! & \!P! & \!.s! & \!.S! & \!q! & +\!r! & \!/s! +& \!,s! & \!+s! & \!t! &\\ + +\midrule\bottomrule + +\end{tabular} + +\medskip + +\textit{Note: \!'!~= semicolon, \!`!~= grave accent} + +\caption{Coding of the consonants} + +\label{coding:consonants} + +\end{table} + +How the Hebrew consonants are coded in your input file, is shown +in table~\ref{coding:consonants}. Normally the final letters are +used automatically; \verb+\<mlk>+ will become \<mlk>. Sometimes it +is necessary to use final letters in places where they will not be +set automatically, e.\,g. in the middle of a word. To do this you +either use the coding according to table~\ref{coding:consonants} +or you put an exclamation mark (\showother{!}\verb+!+) after the +consonant; alternatively you can use the +\showmacro{endofword}\verb+\endofword+ command. For example, a +\textit{final mem} could be achieved by typing \verb+\<M>+, +\verb+\<m!>+ or \verb+\<m\endofword>+. + +On the other hand, sometimes you will not want this automatic +replacement. In these cases you put \showother{|}\!|! after the +consonant or use the \showmacro{zeronojoin}\verb+\zeronojoin+ +command. Both \verb+\<m|>+ and \verb+\<m\zeronojoin>+ will give +you a normal \textit{mem}. + +\subsection{The vowels} + +\begin{table} + +\def\dc{\verb+\dottedcircle+} + +\centering + +\begin{tabular}{ccccccccccccccc} + +\toprule\midrule + +\<\dottedcircle i> & \<\dottedcircle e> & \<\dottedcircle E> & +\<\dottedcircle E:> & \<\dottedcircle a> & \</a\dottedcircle> & +\<\dottedcircle a:> & \<\dottedcircle A> & \<\dottedcircle A:> & +\<\dottedcircle o> & \<\dottedcircle u> & +\<\dottedcircle *> & \<\dottedcircle :> & \<O> & \\\ + +\!i! & \!e! & \!E! & \!E:! & \!a! & \!/a! & \!a:! & \!A! & \!A:! & +\!o! & \!u! & \!*! & \!:! & \!O! / \!wo! & \!U! +/ \!w*!\\ + +\midrule + +\<;> & \<--> & \<\dottedcircle> \\ +\!;! & \!-\/-! & \multicolumn{6}{l}{\texttt{\bs dottedcircle}}\\ + +\midrule\bottomrule + +\end{tabular} + +\caption{Coding of the vowels, accents and symbols} + +\label{coding:vowels} + +\end{table} + +How to code the vowels in your input file is shown in +table~\ref{coding:vowels}. The vowels have to be typed +\textit{after} the consonant they belong to (for example +\<'E:lohiym> is coded as \verb+\<'E:lohiym>+). The only exception +is the \textit{pata\d{h} furtivum} as in \<rU/a.h> +(\verb+\<rU/a.h>+). Always use \verb+*+ for \textit{dage\v{s}}; +\cjh\ does not distinguish between \textit{dage\v{s} lene} and +\textit{dage\v{s} forte}. The \textit{dage\v{s}} has to follow its +consonant \textit{immediately} (\verb+\<b*:>+ becomes \<b*:>), +otherwise you will get a wrong result (\verb+\<b:*>+ becomes +\<b:*>). + +\subsection{More accents and symbols} + +There are some more accents and symbols available, as shown in +table~\ref{coding:vowels}. I hope to add some more in the future. + + +\section{An example} + +Here is the beginning of the Bible: + +\bigskip + +\begin{cjhebrew} + +b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s; +w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al--p*:ney t:hOm +w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney ham*Ayim; + +\end{cjhebrew} + +\bigskip + +\bgroup + +\raggedright + +\verb+\begin{cjhebrew}+ + +\!b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et hA'ArE.s; +w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: `al-\/-p*:ney t:hOm +w:rU/a.h 'E:lohiym m:ra.hEpEt `al-\/-p*:ney ham*Ayim;! + +\verb+\end{cjhebrew}+ + +\egroup + +\section{What is new in this version?} + +\subsection*{v0.2a} + +\begin{itemize} +\item Fixed a stupid typo which created a warning. +\end{itemize} + +\subsection*{v 0.2} + +\begin{itemize} +\item \cjh\ can now be used with lua\LaTeX. The neccessary code was + provided by Axel Kielhorn. +\end{itemize} + +\subsection*{v 0.1a} + +\begin{itemize} + + \item A typo in \!cjhebrew.sty! was corrected. It would cause + trouble if you used a Hebrew font in 7pt size or smaller. + +\end{itemize} + + +\subsection*{v 0.1} + +\begin{itemize} + + \item You can use \cjh\ now, even if \eLaTeX\ is not available + (but the Hebrew text will be typeset in the ``wrong'' + direction, i.\,e. from left to right).% + \footnote{This feature was suggested by Malte + Rosenau.} + + \item The documentation was rewritten. Instead of a German and + an English documentation there is now only this English + manual. + + \item Some bugs in \!cjhebrew.sty! are fixed.\footnote{Thanks to Walter Schmidt.} + + \item A problem with the letter ``qof'' is fixed (\<q|A:q|E:q|a:> + does not look \textit{that} good \ldots\ \<qA:qE:qa:> is much better). + + \item There are also some changes regarding the font names and + the encoding. If you use an older version of + \cjh\ make sure that all old files are removed before you + install the new version! + +\end{itemize} + +Probably, some new bugs have crept into any new version. Please do +report them as you discover them! + + +\section{Finally} + +The version number of \cjh\ is \cjhebversion, it is far from being +finished. Especially the fonts still need a lot of work; many +letters look rather imperfect. If you have any ideas how to +improve \cjh, please do send me an email. + +\end{document} + +% Local Variables: +% coding: utf-8-unix +% End: \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cjhebrew/cjhebtst.tex new/doc/latex/cjhebrew/cjhebtst.tex --- old/doc/latex/cjhebrew/cjhebtst.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cjhebrew/cjhebtst.tex 2017-02-21 02:01:05.000000000 +0100 @@ -0,0 +1,48 @@ +\documentclass[a4paper]{article} +\usepackage{german} +\usepackage[T1]{fontenc} +\usepackage{cjhebrew} + +\frenchspacing + +\newcommand{\cjh}{\textsf{cjhebrew}} + +\begin{document} + +\section*{Ein kleines \cjh-Beispieldokument} + +Das \cjh"=Paket erlaubt es, auf recht einfache Weise hebr"aischen +Text zu setzen, und zwar insbesondere innerhalb von "`normalen"' +Flie"stext. Wenn ich also nun einen beliebigen Vers aus dem +Jeremiabuch einfach so hier einmal hinschreiben wollte, dann +k"onnte ich das problemlos tun, etwa so: \<nim:.s:'U d:bArEykA +wA'ok:lem way:hiy d:bAr:kA liy l:,sA,sOn Ul:,sim:.hat l:bAbiy +k*iy--niq:rA' +sim:kA `Alay yhwh 'E:lohey .s:bA'Ot;> Hier zeigt +sich auch gleich, wie der hebr"aische Text in der richtigen +Schreibrichtung gesetzt und korrekt umbrochen wird. + +Hier folgt nun ein l"angerer hebr"aischer Text in erh"ohter +Schriftgr"o"se, der auch zugleich die Verwendung von \verb+\cjLR+ +demonstriert: + +\def\vers#1{\cjLR{\rmfamily\normalsize#1}} + +\Large + +\begin{cjhebrew} + +\vers{1}~b*:re'+siyt b*ArA' 'E:lohiym 'et ha+s*Amayim w:'et +hA'ArE.s; \vers{2}~w:hA'ArE.s hAy:tAh tohU wAbohU w:.ho+sEk: +`al--p*:ney t:hOm w:rU/a.h 'E:lohiym m:ra.hEpEt `al--p*:ney +ham*Ayim; + +\vers{3}~way*o'mEr 'E:lohiym y:hiy 'Or way:hiy--'Or; +\vers{4}~way*ar:' 'E:lohiym 'Et--hA'Or k*iy--.tOb way*ab:d*el +'E:lohiym b*eyn hA'Or Ubeyn ha.ho+sEk:; \vers{5}~way*iq:rA' +'E:lohiym lA'Or yOm w:la.ho+sEk: qArA' lAy:lAh way:hiy--`ErEb +way:hiy--boqEr yOm 'E.hAd; + +\end{cjhebrew} + + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjhebrew.doc.tlpobj new/tlpkg/tlpobj/cjhebrew.doc.tlpobj --- old/tlpkg/tlpobj/cjhebrew.doc.tlpobj 2016-04-14 18:49:58.000000000 +0200 +++ new/tlpkg/tlpobj/cjhebrew.doc.tlpobj 2017-04-14 17:35:04.000000000 +0200 @@ -1,8 +1,10 @@ name cjhebrew.doc category Package -revision 15878 +revision 43444 shortdesc doc files of cjhebrew relocated 1 -docfiles size=29 - RELOC/doc/fonts/cjhebrew/cjhebtst.tex - RELOC/doc/fonts/cjhebrew/manual.pdf +docfiles size=32 + RELOC/doc/latex/cjhebrew/README + RELOC/doc/latex/cjhebrew/cjhebrew.pdf + RELOC/doc/latex/cjhebrew/cjhebrew.tex + RELOC/doc/latex/cjhebrew/cjhebtst.tex ++++++ cjhebrew.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cjhebrew/cjhebrew.sty new/tex/latex/cjhebrew/cjhebrew.sty --- old/tex/latex/cjhebrew/cjhebrew.sty 2007-03-07 19:11:00.000000000 +0100 +++ new/tex/latex/cjhebrew/cjhebrew.sty 2017-03-10 00:01:06.000000000 +0100 @@ -6,9 +6,11 @@ % % http://www.latex-project.org/lppl.txt % +% Contains code provided by Axel Kielhorn (from lfgwluabidi.sty) \ProvidesPackage{cjhebrew} - [2004/08/27 v. 0.1a cjhebrew Hebrew Typesetting System] + [2017/03/06 v. 0.2a cjhebrew Hebrew Typesetting System] +\RequirePackage{ifluatex} \DeclareFontFamily{U}{cjheb}{} @@ -27,20 +29,47 @@ \chardef\zeronojoin=124 \chardef\dottedcircle=203 -\@ifundefined{eTeXrevision}% - {% - \PackageWarningNoLine{cjhebrew}{\MessageBreak - Hebrew text will be typeset from left to right!\MessageBreak - You really should use e-TeX} - \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup} - \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup} - \newenvironment{cjhebrew}{\cjhebfamily}{} - }% - {% - \TeXXeTstate=1 - \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup} - \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup} - \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{} - } +\ifluatex + \RequirePackage{luabidi} + + % The following lines patch luabidi.sty. As soon as luabidi.sty + % itself is patched, these lines can and should be removed. + \def\setRTLmain{\pagedir TRT \bodydir TRT \pardir TRT \textdir TRT} + \def\setRTL{\@RTLtrue\pardir TRT \textdir TRT} + \let\setRL=\setRTL + \def\setLTR{\@RTLfalse\pardir TLT \textdir TLT} + \let\setLR=\setLTR + \let\unsetRTL=\setLTR + \let\unsetLTR=\setRTL + \def\RTL{\@RTLtrue\trivlist \pardir TRT \textdir TRT\item\relax} + \def\LTR{\trivlist \pardir TLT \textdir TLT\item\relax} + \def\Footnote#1{% + \begingroup + \footnotemark + \renewcommand{\thefootnote}{\@arabic\c@footnote}% + \pardir TLT \textdir TLT\footnotetext{#1}% + \endgroup + } + + \newcommand{\cjRL}[1]{\RLE{\textcjheb{#1\endofword}}} + \newcommand{\cjLR}[1]{\LRE{\textcjheb{\endofword#1}}} + \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\setRTL}{\unsetRTL} +\else + \@ifundefined{eTeXrevision}% + {% + \PackageWarningNoLine{cjhebrew}{\MessageBreak + Hebrew text will be typeset from left to right!\MessageBreak + You really should use e-TeX} + \newcommand{\cjRL}[1]{\bgroup\textcjheb{#1\endofword}\egroup} + \newcommand{\cjLR}[1]{\bgroup\endofword#1\egroup} + \newenvironment{cjhebrew}{\cjhebfamily}{} + }% + {% + \TeXXeTstate=1 + \newcommand{\cjRL}[1]{\bgroup\beginR\textcjheb{#1\endofword}\endR\egroup} + \newcommand{\cjLR}[1]{\bgroup\beginL\endofword#1\endL\egroup} + \newenvironment{cjhebrew}{\parindent=0pt\cjhebfamily\everypar{\beginR}}{} + } +\fi \def\<#1>{\cjRL{#1}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjhebrew.tlpobj new/tlpkg/tlpobj/cjhebrew.tlpobj --- old/tlpkg/tlpobj/cjhebrew.tlpobj 2016-04-14 18:49:59.000000000 +0200 +++ new/tlpkg/tlpobj/cjhebrew.tlpobj 2017-04-14 17:35:04.000000000 +0200 @@ -1,6 +1,6 @@ name cjhebrew category Package -revision 15878 +revision 43444 shortdesc Typeset Hebrew with LaTeX relocated 1 longdesc The cjhebrew package provides Adobe Type 1 fonts for Hebrew, @@ -27,7 +27,7 @@ RELOC/fonts/vf/public/cjhebrew/cjhbltx.vf RELOC/tex/latex/cjhebrew/cjhebrew.sty catalogue-ctan /language/hebrew/cjhebrew -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-03-09 19:41:20 +0100 catalogue-license lppl catalogue-topics hebrew font font-type1 font-hebrew font-supp -catalogue-version 0.1a +catalogue-version 0.2a ++++++ cjk-gs-integrate.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog --- old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2016-01-15 23:58:54.000000000 +0100 +++ new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2017-05-06 00:45:42.000000000 +0200 @@ -1,6 +1,490 @@ +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Release 20170505.0 (HEAD -> master) [1f040e5] + +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * snippets: %% -> %, %%%% -> %% seems enough (origin/master, origin/HEAD) [ba0b225] + +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * help message: search paths all if available [727f51c] + +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * update README.md from source [61ca8ec] + +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Merge branch 'win32-support' [a8528dc] + +2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * fix a mistake, adjust help message for search path (origin/win32-support, win32-support) [8fd2c88] + +2017-05-02 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * more TODO for win32 [b2d0cf5] + +2017-05-02 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * the order of option declaration [584c0d5] + +2017-05-02 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * throw an error for machine-readable alone [bbbd319] + +2017-04-29 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * file check [0cf210f] + +2017-04-27 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * fix a mistake in previous commit [e73ca96] + +2017-04-27 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * ensure new line when adding .runlibfile line [d12f6bb] + +2017-04-27 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * more chinese/korean database from debian packages [cf306ed] + +2017-04-26 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * comment [78cd68b] + +2017-04-26 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * default to symlink for win32, add --hardlink option [bd87af7] + +2017-04-25 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * change output to lib/ for tlgs, winbatch instruction [aebfd74] + +2017-04-25 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * tweaked [f487ab8] + +2017-04-24 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * symplify code for Encode::decode -> Encode::encode chain [ca81c6f] + +2017-04-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * simplify code [b2c9c77] + +2017-04-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * database sync [6ebc456] + +2017-04-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Determine tlgs or native-gs (work in progress) [2eb249a] + +2017-04-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * better aliases [362084c] + +2017-03-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * typo in previous commit [092b662] + +2017-03-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Add --winbatch option [cea39ee] + +2017-03-17 Norbert Preining <norbert(a)preining.info> + + * add a TODO concerning symlink generation on Windows [ab4a6ca] + +2017-03-17 Norbert Preining <norbert(a)preining.info> + + * simplify code [c755d0f] + +2017-03-18 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Add more database for Mac [3254356] + +2017-03-18 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Forgotten fonts for Mac OS X 10.7.5 (Lion) [f8de6fa] + +2017-03-17 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Add more database for Office for Mac 2016 [0b9f826] + +2017-03-17 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Support for Office for Mac 2016 search path (typo) [8460b62] + +2017-03-17 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Support for Office for Mac 2016 search path [4db0f57] + +2017-03-17 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Add database for Office for Mac 2016, MSOffice 2010 [86fce22] + +2017-03-09 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * More database for win32 [901274f] + +2017-03-09 Norbert Preining <norbert(a)preining.info> + + * Release 20170309.0 (tag: 20170309.0) [8ce526f] + +2017-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Update wrt. master [6503d0e] + +2017-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * comment (origin/hira-aliases) [efcd6ec] + +2017-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Fix for Hiragino aliases (#23) [b1fb331] + +2017-03-03 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Hiragino aliases (gs9.20 without OTC support) [1c494b6] + +2017-03-03 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * bug fix for morisawa aliases [bcbce0c] + +2017-02-24 Norbert Preining <norbert(a)preining.info> + + * update release script for CTAN location [f2ae343] + +2017-02-20 Norbert Preining <norbert(a)preining.info> + + * Release 20170220.0 (tag: 20170220.0) [4997503] + +2017-02-20 Norbert Preining <norbert(a)preining.info> + + * update copyright [a865618] + +2017-02-20 Norbert Preining <norbert(a)preining.info> + + * update README.md from source [a22f890] + +2017-02-08 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * alias priority: New priority for Simplified/Traditional Chinese [4f02658] + +2017-02-08 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * alias priority: Kozuka before Yu, Adobe before Solaris [4b3e12c] + +2017-02-08 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Fix for priority numbers (#12) [97b0c63] + +2017-01-18 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Support for ptex-fontmaps 20170114.0 (ume, yu etc.) [cd91c2f] + +2017-01-14 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Win32 support: symlink/unlink consistency, quote [0445c18] + +2017-01-14 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Win32 support: encode/decode (cp932 <=> utf8) [6e51c3d] + +2017-01-14 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Reduce file open/close (again) [5c7e946] + +2017-01-13 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Add data for psnames-for-otf also for aliases [5142e98] + +2017-01-12 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * better code [d439cac] + +2017-01-12 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com> + + * Reduce file open/close for winbatch and otfps [6cff16a] + +2016-12-29 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add fandol database (typo) [7c15bdf] + +2016-12-29 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add fandol database [1de88ed] + +2016-12-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Generate psnames-for-otf only when --otfps is given [a1fbdb3] + +2016-12-23 aminophen <h.y.acetaminophen(a)gmail.com> + + * Experiment for supporting win32 (again) [ba45bee] + +2016-12-23 aminophen <h.y.acetaminophen(a)gmail.com> + + * Experiment for supporting win32 [2846489] + +2016-12-14 Norbert Preining <norbert(a)preining.info> + + * fix indentation, add better explanation for case-insensitve problem [b73e45b] + +2016-12-14 Norbert Preining <norbert(a)preining.info> + + * update README.md with the changes included recently [0330718] + +2016-12-14 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add moga-mobo database [de56b28] + +2016-12-14 Norbert Preining <preining(a)logic.at> + + * Merge pull request #20 from aminophen/ttc-ttf-otc [72cc9f1] + +2016-12-13 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix for Name entry different from PSName [fcd2515] + +2016-12-13 aminophen <h.y.acetaminophen(a)gmail.com> + + * Complete TTC/OTC database (thanks to @doraTeX) [67a90e3] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Parse 'Filename:' entry for backward compatibility [ce22753] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Show subfont number only when TTC/OTC (even zero) [4ea9cab] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix typo in d3ad4b4 [515e303] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Do not use OTC font as aliases [780f3b2] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Forgotten initialization [ebb6326] + +2016-12-12 aminophen <h.y.acetaminophen(a)gmail.com> + + * Separate OTC/TTC/TTF (experiment) [d3ad4b4] + +2016-12-10 Yusuke Terada <taylorkgb(a)gmail.com> + + * Merge pull request #19 from doraTeX/master [3db9b75] + +2016-12-10 doraTeX <taylorkgb(a)gmail.com> + + * Revert unintended Unicode normalization [83267e7] + +2016-12-10 Yusuke Terada <taylorkgb(a)gmail.com> + + * Merge pull request #18 from doraTeX/master [2666a1d] + +2016-12-10 Yusuke Terada <taylorkgb(a)gmail.com> + + * cjk-gs-integrate.pl: Fix regex for /bin/gs [2e5d027] + +2016-12-10 doraTeX <taylorkgb(a)gmail.com> + + * cjk-gs-integrate.pl: Fix regex for /bin/gs [a41ddd0] + +2016-12-09 aminophen <h.y.acetaminophen(a)gmail.com> + + * cjk-gs-integrate.pl: change ttfname -> ttname [9bdfd20] + +2016-12-06 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix a mistake in previous commit [daf1c07] + +2016-12-06 aminophen <h.y.acetaminophen(a)gmail.com> + + * cjk-gs-integrate.pl: more database (CJK-Unifonts) [513d8b1] + +2016-12-05 aminophen <h.y.acetaminophen(a)gmail.com> + + * Merge branch 'master' of https://github.com/texjporg/cjk-gs-support [ceb9542] + +2016-12-05 aminophen <h.y.acetaminophen(a)gmail.com> + + * cjk-gs-integrate.pl: more database (arphic) [33b19ff] + +2016-12-05 Norbert Preining <norbert(a)preining.info> + + * adjust header for copyright and url [4da74ae] + +2016-12-03 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix for texjporg/jfontmaps#6 (second attempt) [2374e0c] + +2016-12-03 aminophen <h.y.acetaminophen(a)gmail.com> + + * More .gitignore [e3f323e] + +2016-12-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * cjk-gs-integrate.pl: Fix for database [ec61fef] + +2016-10-26 Norbert Preining <norbert(a)preining.info> + + * Release 20161026.0 (tag: 20161026.0) [af37d2e] + +2016-10-26 Norbert Preining <preining(a)logic.at> + + * Merge pull request #16 from aminophen/master [480b932] + +2016-10-26 aminophen <h.y.acetaminophen(a)gmail.com> + + * Finished macOS Sierra CJK font database. [7763ba6] + +2016-10-07 Norbert Preining <preining(a)logic.at> + + * Merge pull request #15 from aminophen/master [5c852da] + +2016-10-05 aminophen <h.y.acetaminophen(a)gmail.com> + + * Small fix for comments (thanks to @doraTeX) [40017a9] + +2016-10-05 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add CK font list (partial) [90fae6c] + +2016-10-04 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add macOS Sierra fonts (Japan) [003e010] + +2016-10-02 Norbert Preining <norbert(a)preining.info> + + * add Yamashita-san to help and README [9fb17a2] + +2016-10-02 Norbert Preining <preining(a)logic.at> + + * Merge pull request #14 from aminophen/master [8c8e81e] + +2016-10-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add more korean fonts, priority settings [9de8aca] + +2016-10-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add more korean fonts, priority settings [db77c33] + +2016-10-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * small fixups [dfaf936] + +2016-10-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * small fixups [206ffec] + +2016-10-02 aminophen <h.y.acetaminophen(a)gmail.com> + + * restore previous code [ed5c381] + +2016-10-01 Norbert Preining <norbert(a)preining.info> + + * small fixups [38a2059] + +2016-10-01 Norbert Preining <preining(a)logic.at> + + * Merge pull request #13 from aminophen/gsres [9f702b2] + +2016-10-01 aminophen <h.y.acetaminophen(a)gmail.com> + + * Directory check [4845c37] + +2016-10-01 aminophen <h.y.acetaminophen(a)gmail.com> + + * Assume relative path of gs-resource [8e54dc3] + +2016-09-29 Norbert Preining <norbert(a)preining.info> + + * update copyright year [df1fd69] + +2016-09-29 Norbert Preining <preining(a)logic.at> + + * Merge pull request #11 from aminophen/master [5993098] + +2016-09-29 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add baekmuk (korean) -- now the lowest priority [e6edb62] + +2016-09-29 Norbert Preining <preining(a)logic.at> + + * Merge pull request #10 from aminophen/master [0171ef8] + +2016-09-28 aminophen <h.y.acetaminophen(a)gmail.com> + + * Use 'sep' instead of ':' [f87a35b] + +2016-09-27 aminophen <h.y.acetaminophen(a)gmail.com> + + * Workaround (not setting OPENTYPEFONTS/TTFONTS explicitly) [7d0f926] + +2016-09-27 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix a mistake [10e8fd0] + +2016-09-27 aminophen <h.y.acetaminophen(a)gmail.com> + + * Special name (IPAMincho.ttf etc) not needed [ffd8e79] + +2016-09-27 Norbert Preining <preining(a)logic.at> + + * Merge pull request #8 from aminophen/master [2619378] + +2016-09-26 aminophen <h.y.acetaminophen(a)gmail.com> + + * Prevent ttc -> ttf symlink (Songti/STSong, Kaiti/STKaiti) [043feee] + +2016-09-25 aminophen <h.y.acetaminophen(a)gmail.com> + + * TODO: comment about wrong symlink [3009288] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix for STHeiti family [91455e9] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * cleanup [7b0d0e3] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add ipa-proportional database [548fa68] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add yuwin10 fonts to yu-win database [e7acb2c] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix for hiragino database [805e1b1] + +2016-09-24 aminophen <h.y.acetaminophen(a)gmail.com> + + * Fix morisawa database [68f500d] + +2016-09-23 aminophen <h.y.acetaminophen(a)gmail.com> + + * typo [5d116a1] + +2016-09-23 aminophen <h.y.acetaminophen(a)gmail.com> + + * Add /System/Library/Assets, /usr/share/fonts, recursive search [5b96e5a] + 2016-01-15 Norbert Preining <norbert(a)preining.info> - * Release 20160115.0 (HEAD -> master) [bfb2c76] + * Release 20160115.0 (tag: 20160115.0) [bfb2c76] 2016-01-15 Norbert Preining <norbert(a)preining.info> @@ -16,7 +500,7 @@ 2016-01-14 Norbert Preining <norbert(a)preining.info> - * if --link-texmf is passed without argument use TEXMFLOCAL again (origin/master, origin/HEAD) [a4a8228] + * if --link-texmf is passed without argument use TEXMFLOCAL again [a4a8228] 2015-10-21 Norbert Preining <norbert(a)preining.info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md --- old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2016-01-15 23:58:54.000000000 +0100 +++ new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2017-05-06 00:45:42.000000000 +0200 @@ -16,13 +16,11 @@ #### Options #### ````` - -n, --dry-run do not actually output anything - --remove try to remove instead of create - -f, --fontdef FILE specify alternate set of font definitions, if not - given, the built-in set is used -o, --output DIR specifies the base output dir, if not provided, the Resource directory of an installed GhostScript is searched and used. + -f, --fontdef FILE specify alternate set of font definitions, if not + given, the built-in set is used -a, --alias LL=RR defines an alias, or overrides a given alias; illegal if LL is provided by a real font, or RR is neither available as real font or alias; @@ -34,14 +32,27 @@ and DIR/fonts/truetype/cjk-gs-integrate where DIR defaults to TEXMFLOCAL - --machine-readable output of --list-aliases is machine readable + --otfps [DIR] generate configuration file (psnames-for-otf) into + DIR/dvips/ps2otfps + which is used by ps2otfps (developed by Akira Kakuto), + instead of generating snippets --force do not bail out if linked fonts already exist + --remove try to remove instead of create + -n, --dry-run do not actually output anything -q, --quiet be less verbose -d, --debug output debug information, can be given multiple times -v, --version outputs only the version information -h, --help this help ````` +#### Windows only options #### + +````` + --hardlink create hardlinks instead of symlinks + --winbatch prepare a batch file for link generation, instead of + generating links right away +````` + #### Command like options #### ````` @@ -52,6 +63,7 @@ present files --list-fonts lists the fonts found on the system --info combines the above two information + --machine-readable output of --list-aliases is machine readable ````` Operation @@ -60,6 +72,7 @@ For each found TrueType (TTF) font it creates a cidfmap entry in <Resource>/Init/cidfmap.local + -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.local instead and links the font to @@ -79,10 +92,12 @@ Aliases are added to <Resource>/Init/cidfmap.aliases + -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap.aliases instead Finally, it tries to add runlib calls to <Resource>/Init/cidfmap + -- if you are using tlgs win32, tlpkg/tlgs/lib/cidfmap to load the cidfmap.local and cidfmap.aliases. @@ -92,8 +107,13 @@ Search is done using the kpathsea library, in particular using kpsewhich program. By default the following directories are searched: - all TEXMF trees - - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`, - `/Network/Library/Fonts`, and `~/Library/Fonts` (all if available) + - `/Library/Fonts`, `/Library/Fonts/Microsoft`, `/System/Library/Fonts`, + `/System/Library/Assets`, `/Network/Library/Fonts`, + `~/Library/Fonts` and `/usr/share/fonts` (all if available) + - `/Applications/Microsoft Word.app/Contents/Resources/{Fonts,DFonts}`, + `/Applications/Microsoft Excel.app/Contents/Resources/{Fonts,DFonts}`, + `/Applications/Microsoft PowerPoint.app/Contents/Resources/{Fonts,DFonts}` + (all if available, meant for Office for Mac 2016) - `c:/windows/fonts` (on Windows) - the directories in `OSFONTDIR` environment variable @@ -130,15 +150,16 @@ Korean: - HYGoThic-Medium HYSMyeongJo-Medium + HYSMyeongJo-Medium HYGoThic-Medium HYRGoThic-Medium Simplified Chinese: STSong-Light STHeiti-Regular STHeiti-Light STKaiti-Regular + STFangsong-Light STFangsong-Regular Traditional Chinese: - MSung-Light MHei-Medium MKai-Medium + MSung-Light MSung-Medium MHei-Medium MKai-Medium In addition, we also include provide entries for the OTF Morisawa names: RyuminPro-Light GothicBBBPro-Medium FutoMinA101Pro-Bold @@ -146,12 +167,22 @@ The order is determined by the Provides setting in the font database, and for the Japanese fonts it is currently: - Morisawa Pr6, Morisawa, Hiragino ProN, Hiragino, - Yu OSX, Yu Win, Kozuka ProN, Kozuka, IPAex, IPA + Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino, + Kozuka Pr6N, Kozuka ProVI, Kozuka, Yu OSX, Yu Win, + MS, Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume That is, the first font found in this order will be used to provide the alias if necessary. +For the Korean fonts: + (Hanyang,) Adobe, Solaris-hanyang, MS, Unfonts, Baekmuk + +For the Simplified Chinese: + Adobe, Fandol, Hiragino, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf + +For the Traditional Chinese: + Adobe, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf + #### Overriding aliases #### Using the command line option `--alias LL=RR` one can add arbitrary aliases, @@ -164,8 +195,8 @@ ------------------------------------ The script and its documentation was written by Norbert Preining, based -on research and work by Yusuke Kuroki, Bruno Voisin, Munehiro Yamamoto -and the TeX Q&A wiki page. +on research and work by Yusuke Kuroki, Bruno Voisin, Hironobu Yamashita, +Munehiro Yamamoto and the TeX Q&A wiki page. The script is licensed under GNU General Public License Version 3 or later. The contained font data is not copyrightable. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh --- old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh 2015-05-06 06:50:06.000000000 +0200 +++ new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/mkgsfntspecs.sh 2017-05-06 00:45:42.000000000 +0200 @@ -295,17 +295,17 @@ local fontname=$1 local encode=$2 cat <<EOT -%%!PS-Adobe-3.0 Resource-Font -%%%%DocumentNeededResources: ${encode} (CMap) -%%%%IncludeResource: ${encode} (CMap) -%%%%BeginResource: Font (${fontname}-${encode}) +%!PS-Adobe-3.0 Resource-Font +%%DocumentNeededResources: ${encode} (CMap) +%%IncludeResource: ${encode} (CMap) +%%BeginResource: Font (${fontname}-${encode}) (${fontname}-${encode}) (${encode}) /CMap findresource [(${fontname}) /CIDFont findresource] composefont pop -%%%%EndResource -%%%%EOF +%%EndResource +%%EOF EOT } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh --- old/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh 2016-01-15 23:58:54.000000000 +0100 +++ new/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh 2017-03-10 00:01:03.000000000 +0100 @@ -49,8 +49,10 @@ echo echo Informations for submitting CTAN: echo " CONTRIBUTION: $PROJECT" +echo " VERSION: $VER" +echo " AUTHOR: Japanese TeX Development Community" echo " SUMMARY: Tools to integrate CJK fonts into Ghostscript" -echo " DIRECTORY: fonts/$PROJECT" +echo " DIRECTORY: fonts/utilities/$PROJECT" echo " LICENSE: free/GPLv3" echo " FILE: $DIR/$PROJECT-$VER.tar.gz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj new/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj --- old/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj 2016-04-14 18:50:02.000000000 +0200 +++ new/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj 2017-05-06 02:06:51.000000000 +0200 @@ -1,8 +1,8 @@ name cjk-gs-integrate.doc category Package -revision 39391 +revision 44207 shortdesc doc files of cjk-gs-integrate -docfiles size=22 +docfiles size=25 texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog texmf-dist/doc/fonts/cjk-gs-integrate/README.md texmf-dist/doc/fonts/cjk-gs-integrate/tests/Makefile ++++++ cjk-gs-integrate.tar.xz ++++++ ++++ 4477 lines of diff (skipped) ++++++ cjk-ko.doc.tar.xz ++++++ ++++++ cjk-ko.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjk-ko.tlpobj new/tlpkg/tlpobj/cjk-ko.tlpobj --- old/tlpkg/tlpobj/cjk-ko.tlpobj 2016-04-14 18:50:03.000000000 +0200 +++ new/tlpkg/tlpobj/cjk-ko.tlpobj 2017-04-14 17:35:05.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/cjk-ko/konames-utf.sty RELOC/tex/latex/cjk-ko/kotex.sty catalogue-ctan /language/korean/cjk-ko -catalogue-date 2016-04-08 08:37:10 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics korean catalogue-version 1.8 ++++++ cjk.doc.tar.xz ++++++ ++++++ cjk.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjk.tlpobj new/tlpkg/tlpobj/cjk.tlpobj --- old/tlpkg/tlpobj/cjk.tlpobj 2016-04-14 18:50:01.000000000 +0200 +++ new/tlpkg/tlpobj/cjk.tlpobj 2017-04-14 17:35:05.000000000 +0200 @@ -231,7 +231,7 @@ RELOC/tex/latex/cjk/utils/pyhyphen/pinyin.ldf catalogue-also cjk-fonts catalogue-ctan /language/chinese/CJK -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font-use font-cjk chinese japanese korean thai catalogue-version 4.8.4 ++++++ cjkpunct.doc.tar.xz ++++++ ++++++ cjkpunct.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjkpunct.tlpobj new/tlpkg/tlpobj/cjkpunct.tlpobj --- old/tlpkg/tlpobj/cjkpunct.tlpobj 2016-05-15 03:18:06.000000000 +0200 +++ new/tlpkg/tlpobj/cjkpunct.tlpobj 2017-04-14 17:35:05.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/latex/cjkpunct/CJKpunct.spa RELOC/tex/latex/cjkpunct/CJKpunct.sty catalogue-ctan /language/chinese/cjkpunct -catalogue-date 2016-05-14 09:55:31 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chinese japanese korean catalogue-version 4.8.4 ++++++ cjkutils.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/bg5conv.man1.pdf and new/texmf-dist/doc/man/man1/bg5conv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/cef5conv.man1.pdf and new/texmf-dist/doc/man/man1/cef5conv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/cefconv.man1.pdf and new/texmf-dist/doc/man/man1/cefconv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/cefsconv.man1.pdf and new/texmf-dist/doc/man/man1/cefsconv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/extconv.man1.pdf and new/texmf-dist/doc/man/man1/extconv.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/hbf2gf.man1.pdf and new/texmf-dist/doc/man/man1/hbf2gf.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/sjisconv.man1.pdf and new/texmf-dist/doc/man/man1/sjisconv.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjkutils.doc.tlpobj new/tlpkg/tlpobj/cjkutils.doc.tlpobj --- old/tlpkg/tlpobj/cjkutils.doc.tlpobj 2016-04-27 03:16:37.000000000 +0200 +++ new/tlpkg/tlpobj/cjkutils.doc.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,8 +1,8 @@ name cjkutils.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of cjkutils -docfiles size=55 +docfiles size=29 texmf-dist/doc/man/man1/bg5conv.1 texmf-dist/doc/man/man1/bg5conv.man1.pdf texmf-dist/doc/man/man1/cef5conv.1 ++++++ cjkutils.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjkutils.tlpobj new/tlpkg/tlpobj/cjkutils.tlpobj --- old/tlpkg/tlpobj/cjkutils.tlpobj 2016-04-27 03:16:37.000000000 +0200 +++ new/tlpkg/tlpobj/cjkutils.tlpobj 2017-05-04 02:06:59.000000000 +0200 @@ -1,6 +1,6 @@ name cjkutils category TLCore -revision 40768 +revision 44166 depend cjkutils.ARCH runfiles size=16 texmf-dist/hbf2gf/README ++++++ classics.doc.tar.xz ++++++ ++++++ classics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/classics.tlpobj new/tlpkg/tlpobj/classics.tlpobj --- old/tlpkg/tlpobj/classics.tlpobj 2016-04-14 18:50:08.000000000 +0200 +++ new/tlpkg/tlpobj/classics.tlpobj 2017-04-14 17:35:08.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/classics/classics.sty catalogue-ctan /macros/latex/contrib/classics -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics humanities cite-supp catalogue-version 0.1 ++++++ classicthesis.doc.tar.xz ++++++ ++++++ classicthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/classicthesis.tlpobj new/tlpkg/tlpobj/classicthesis.tlpobj --- old/tlpkg/tlpobj/classicthesis.tlpobj 2016-04-14 18:50:09.000000000 +0200 +++ new/tlpkg/tlpobj/classicthesis.tlpobj 2017-04-14 17:35:08.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=9 RELOC/tex/latex/classicthesis/classicthesis.sty catalogue-ctan /macros/latex/contrib/classicthesis -catalogue-date 2015-09-06 15:59:03 +0200 +catalogue-date 2016-08-23 07:55:40 +0200 catalogue-license gpl2 catalogue-topics dissertation catalogue-version 4.2 ++++++ classpack.doc.tar.xz ++++++ ++++++ classpack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/classpack.tlpobj new/tlpkg/tlpobj/classpack.tlpobj --- old/tlpkg/tlpobj/classpack.tlpobj 2016-04-14 18:50:10.000000000 +0200 +++ new/tlpkg/tlpobj/classpack.tlpobj 2017-04-14 17:35:08.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/classpack/classpack.sty catalogue-ctan /support/classpack -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-supp catalogue-version 0.77 ++++++ cleanthesis.doc.tar.xz ++++++ ++++++ cleanthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cleanthesis.tlpobj new/tlpkg/tlpobj/cleanthesis.tlpobj --- old/tlpkg/tlpobj/cleanthesis.tlpobj 2016-04-14 18:50:11.000000000 +0200 +++ new/tlpkg/tlpobj/cleanthesis.tlpobj 2017-04-14 17:35:09.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=6 RELOC/tex/latex/cleanthesis/cleanthesis.sty catalogue-ctan /macros/latex/contrib/cleanthesis -catalogue-date 2015-08-30 05:26:41 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation catalogue-version 0.3.1 ++++++ clearsans.doc.tar.xz ++++++ ++++++ clearsans.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clearsans.tlpobj new/tlpkg/tlpobj/clearsans.tlpobj --- old/tlpkg/tlpobj/clearsans.tlpobj 2016-04-14 18:50:11.000000000 +0200 +++ new/tlpkg/tlpobj/clearsans.tlpobj 2017-04-14 17:35:09.000000000 +0200 @@ -131,6 +131,6 @@ RELOC/tex/latex/clearsans/TS1ClearSansLight-LF.fd RELOC/tex/latex/clearsans/TS1ClearSansThin-LF.fd catalogue-ctan /fonts/clearsans -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license apache2 catalogue-topics font-sans font-type1 font-ttf ++++++ clefval.doc.tar.xz ++++++ ++++++ clefval.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clefval.tlpobj new/tlpkg/tlpobj/clefval.tlpobj --- old/tlpkg/tlpobj/clefval.tlpobj 2016-04-14 18:50:14.000000000 +0200 +++ new/tlpkg/tlpobj/clefval.tlpobj 2017-04-14 17:35:10.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/clefval/clefval.sty catalogue-ctan /macros/latex/contrib/clefval -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 0 ++++++ cleveref.doc.tar.xz ++++++ ++++++ cleveref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cleveref.tlpobj new/tlpkg/tlpobj/cleveref.tlpobj --- old/tlpkg/tlpobj/cleveref.tlpobj 2016-04-14 18:50:15.000000000 +0200 +++ new/tlpkg/tlpobj/cleveref.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=83 RELOC/tex/latex/cleveref/cleveref.sty catalogue-ctan /macros/latex/contrib/cleveref -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.19 ++++++ clipboard.doc.tar.xz ++++++ ++++++ clipboard.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clipboard.tlpobj new/tlpkg/tlpobj/clipboard.tlpobj --- old/tlpkg/tlpobj/clipboard.tlpobj 2016-04-14 18:50:15.000000000 +0200 +++ new/tlpkg/tlpobj/clipboard.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/clipboard/clipboard.sty catalogue-ctan /macros/latex/contrib/clipboard -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-imp catalogue-version 0.2 ++++++ clock.doc.tar.xz ++++++ ++++++ clock.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clock.tlpobj new/tlpkg/tlpobj/clock.tlpobj --- old/tlpkg/tlpobj/clock.tlpobj 2016-04-14 18:50:15.000000000 +0200 +++ new/tlpkg/tlpobj/clock.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/clock/clock.sty RELOC/tex/latex/clock/clock.tex catalogue-ctan /macros/latex/contrib/clock -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics date-time ++++++ cloze.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/cloze/README new/doc/lualatex/cloze/README --- old/doc/lualatex/cloze/README 2015-07-09 00:34:57.000000000 +0200 +++ new/doc/lualatex/cloze/README 2016-11-25 19:30:32.000000000 +0100 @@ -1,10 +1,10 @@ # Description -EN: `cloze` is a LaTeX package to generate cloze. It uses the +EN: `cloze` is a LuaLaTeX/LaTeX package to generate cloze. It uses the capabilities of the modern TeX engine LuaTex. -DE: `cloze` ist a LaTeX-Paket zum Erstellen von Lückentexten. Es nutzt -die Möglichkeiten der modernen TeX-Engine LuaTeX. +DE: `cloze` ist a LuaLaTeX/LaTeX-Paket zum Erstellen von Lückentexten. +Es nutzt die Möglichkeiten der modernen TeX-Engine LuaTeX. # License @@ -20,6 +20,14 @@ and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. +# CTAN + +Since July 2015 the cloze package is included in the Comprehensive TeX +Archive Network (CTAN). + +* TeX archive: http://mirror.ctan.org/tex-archive/macros/luatex/latex/cloze +* Package page: https://www.ctan.org/pkg/cloze + # Repository https://github.com/Josef-Friedrich/cloze diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/cloze/README.md new/doc/lualatex/cloze/README.md --- old/doc/lualatex/cloze/README.md 2015-07-09 00:34:57.000000000 +0200 +++ new/doc/lualatex/cloze/README.md 2016-11-25 19:30:32.000000000 +0100 @@ -1,10 +1,10 @@ # Description -EN: `cloze` is a LaTeX package to generate cloze. It uses the +EN: `cloze` is a LuaLaTeX/LaTeX package to generate cloze. It uses the capabilities of the modern TeX engine LuaTex. -DE: `cloze` ist a LaTeX-Paket zum Erstellen von Lückentexten. Es nutzt -die Möglichkeiten der modernen TeX-Engine LuaTeX. +DE: `cloze` ist a LuaLaTeX/LaTeX-Paket zum Erstellen von Lückentexten. +Es nutzt die Möglichkeiten der modernen TeX-Engine LuaTeX. # License @@ -20,6 +20,14 @@ and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. +# CTAN + +Since July 2015 the cloze package is included in the Comprehensive TeX +Archive Network (CTAN). + +* TeX archive: http://mirror.ctan.org/tex-archive/macros/luatex/latex/cloze +* Package page: https://www.ctan.org/pkg/cloze + # Repository https://github.com/Josef-Friedrich/cloze Binary files old/doc/lualatex/cloze/cloze.pdf and new/doc/lualatex/cloze/cloze.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cloze.doc.tlpobj new/tlpkg/tlpobj/cloze.doc.tlpobj --- old/tlpkg/tlpobj/cloze.doc.tlpobj 2016-04-14 18:50:15.000000000 +0200 +++ new/tlpkg/tlpobj/cloze.doc.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -1,9 +1,9 @@ name cloze.doc category Package -revision 37811 +revision 41531 shortdesc doc files of cloze relocated 1 -docfiles size=44 +docfiles size=60 RELOC/doc/lualatex/cloze/README RELOC/doc/lualatex/cloze/README.md RELOC/doc/lualatex/cloze/cloze.pdf ++++++ cloze.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/cloze/cloze.lua new/scripts/cloze/cloze.lua --- old/scripts/cloze/cloze.lua 2015-07-09 00:34:57.000000000 +0200 +++ new/scripts/cloze/cloze.lua 2016-11-25 19:32:52.000000000 +0100 @@ -25,6 +25,7 @@ registry.global_options = {} registry.local_options = {} local cloze = {} +cloze.status = {} local base = {} base.is_registered = {} function nodex.create_colorstack(data) @@ -58,14 +59,29 @@ rule.width = width return rule end -function nodex.insert_line(head, current, width) - local n = {} -- node - n.color_line = nodex.create_color('line') - head, n.color_line = node.insert_after(head, current, n.color_line) - n.line = nodex.create_line(width) - head, n.line = node.insert_after(head, n.color_line, n.line) - n.color_reset = nodex.create_color('reset') - return node.insert_after(head, n.line, n.color_reset) +function nodex.insert_list(position, current, list, head) + if not head then + head = current + end + for i, insert in ipairs(list) do + if position == 'after' then + head, current = node.insert_after(head, current, insert) + elseif position == 'before' then + head, current = node.insert_before(head, current, insert) + end + end + return current +end +function nodex.insert_line(current, width) + return nodex.insert_list( + 'after', + current, + { + nodex.create_color('line'), + nodex.create_line(width), + nodex.create_color('reset') + } + ) end function nodex.write_line() node.write(nodex.create_color('line')) @@ -75,10 +91,8 @@ function nodex.create_linefil() local glue = node.new('glue') glue.subtype = 100 - local glue_spec = node.new('glue_spec') - glue_spec.stretch = 65536 - glue_spec.stretch_order = 3 - glue.spec = glue_spec + glue.stretch = 65536 + glue.stretch_order = 3 local rule = nodex.create_line(0) rule.dir = 'TLT' glue.leader = rule @@ -106,6 +120,15 @@ local kern = nodex.create_kern(tex.sp(registry.get_value('margin'))) node.write(kern) end +function nodex.search_hlist(head) + while head do + if head.id == node.id('hlist') and head.subtype == 1 then + return nodex.strut_to_hlist(head) + end + head = head.next + end + return false +end function registry.create_marker(index) local marker = node.new('whatsit','user_defined') marker.type = 100 -- number @@ -118,6 +141,15 @@ local marker = registry.create_marker(index) node.write(marker) end +function registry.is_marker(item) + if item.id == node.id('whatsit') + and item.subtype == node.subtype('user_defined') + and item.user_id == registry.user_id then + return true + else + return false + end +end function registry.check_marker(item, mode, position) local data = registry.get_marker_data(item) if data and data.mode == mode and data.position == position then @@ -140,7 +172,7 @@ end function registry.get_marker_data(item) if item.id == node.id('whatsit') - and item.subtype == 44 + and item.subtype == node.subtype('user_defined') and item.user_id == registry.user_id then return registry.get_storage(item.value) else @@ -152,6 +184,9 @@ registry.local_options = data.values return data.values end +function registry.remove_marker(marker) + if registry.is_marker(marker) then node.remove(marker, marker) end +end function registry.get_index() if not registry.index then registry.index = 0 @@ -221,124 +256,151 @@ function registry.get_defaults(option) return registry.defaults[option] end -function cloze.basic_make(head, hlist, start, stop) +function cloze.basic_make(start, stop) local n = {} local l = {} + n.head = start if not start or not stop then return end n.start = start n.stop = stop l.width = node.dimensions( - hlist.glue_set, - hlist.glue_sign, - hlist.glue_order, + cloze.status.hlist.glue_set, + cloze.status.hlist.glue_sign, + cloze.status.hlist.glue_order, n.start, n.stop ) - head, n.line = nodex.insert_line(head, n.start, l.width) - n.color_text = nodex.create_color('text') - head, n.color_text = node.insert_after( - hlist.head, - n.line, - n.color_text - ) + n.line = nodex.insert_line(n.start, l.width) + n.color_text = nodex.insert_list('after', n.line, {nodex.create_color('text')}) if registry.get_value_show() then - n.kern = nodex.create_kern(-l.width) - node.insert_after(head, n.color_text, n.kern) - n.color_reset = nodex.create_color('reset') - node.insert_after(head, n.stop, n.color_reset) + nodex.insert_list('after', n.color_text, {nodex.create_kern(-l.width)}) + nodex.insert_list('before', n.stop, {nodex.create_color('reset')}, n.head) else n.line.next = n.stop.next n.stop.prev = n.line.prev end - + registry.remove_marker(n.start) + registry.remove_marker(n.stop) end -function cloze.basic(head) - local n = {} -- node - local b = {} -- boolean - local l = {} -- length - local t = {} -- temp - for hlist in node.traverse_id(node.id('hlist'), head) do - hlist = nodex.strut_to_hlist(hlist) - if b.line_end then - b.init_cloze = true +function cloze.basic_search_stop(head) + local stop + while head do + cloze.status.continue = true + stop = head + if registry.check_marker(stop, 'basic', 'stop') then + cloze.status.continue = false + break end - n.current = hlist.head - while n.current do - if - registry.check_marker(n.current, 'basic', 'start') - or - b.init_cloze - then - b.init_cloze = false - n.start = n.current - while n.current do - b.line_end = true - n.stop = n.current - if registry.check_marker(n.stop, 'basic', 'stop') then - b.line_end = false - break - end - n.current = n.current.next - end - cloze.basic_make(head, hlist, n.start, n.stop) - n.current = n.stop - else - n.current = n.current.next - end + head = head.next + end + return stop +end +function cloze.basic_search_start(head) + local start + local stop + local n = {} + if cloze.status.continue then + n.hlist = nodex.search_hlist(head) + if n.hlist then + cloze.status.hlist = n.hlist + start = cloze.status.hlist.head end + elseif registry.check_marker(head, 'basic', 'start') then + start = head end + if start then + stop = cloze.basic_search_stop(start) + cloze.basic_make(start, stop) + end +end +function cloze.basic_recursion(head) + while head do + if head.head then + cloze.status.hlist = head + cloze.basic_recursion(head.head) + else + cloze.basic_search_start(head) + end + head = head.next + end +end +function cloze.basic(head) + cloze.status.continue = false + cloze.basic_recursion(head) return head end -function cloze.fix_make(head, start, stop) - local l = {} -- length +function cloze.fix_length(start, stop) + local l = {} l.width = tex.sp(registry.get_value('width')) - local n = {} -- node - n.start = start - n.stop = stop - l.text_width = node.dimensions(n.start, n.stop) - local align = registry.get_value('align') - if align == 'right' then - l.kern_start = -l.text_width + l.text_width = node.dimensions(start, stop) + l.align = registry.get_value('align') + if l.align == 'right' then + l.kern_start = - l.text_width l.kern_stop = 0 - elseif align == 'center' then + elseif l.align == 'center' then l.half = (l.width - l.text_width) / 2 - l.kern_start = -l.half - l.text_width + l.kern_start = - l.half - l.text_width l.kern_stop = l.half else - l.kern_start = -l.width + l.kern_start = - l.width l.kern_stop = l.width - l.text_width end - head, n.line = nodex.insert_line(head, n.start, l.width) + return l.width, l.kern_start, l.kern_stop +end +function cloze.fix_make(start, stop) + local l = {} -- length + local n = {} -- node + l.width, l.kern_start, l.kern_stop = cloze.fix_length(start, stop) + n.line = nodex.insert_line(start, l.width) if registry.get_value_show() then - n.kern_start = nodex.create_kern(l.kern_start) - head, n.kern_start = node.insert_after(head, n.line, n.kern_start) - n.color_text = nodex.create_color('text') - node.insert_after(head, n.kern_start, n.color_text) - n.color_reset = nodex.create_color('reset') - node.insert_before(head, n.stop, n.color_reset) - n.kern_stop = nodex.create_kern(l.kern_stop) - node.insert_before(head, n.stop, n.kern_stop) + nodex.insert_list( + 'after', + n.line, + { + nodex.create_kern(l.kern_start), + nodex.create_color('text') + } + ) + nodex.insert_list( + 'before', + stop, + { + nodex.create_color('reset'), + nodex.create_kern(l.kern_stop) + }, + start + ) else - n.line.next = n.stop.next + n.line.next = stop.next end + registry.remove_marker(start) + registry.remove_marker(stop) end -function cloze.fix(head) +function cloze.fix_recursion(head) local n = {} -- node n.start, n.stop = false - for current in node.traverse_id(node.id('whatsit'), head) do - if not n.start then - n.start = registry.get_marker(current, 'fix', 'start') - end - if not n.stop then - n.stop = registry.get_marker(current, 'fix', 'stop') - end - if n.start and n.stop then - cloze.fix_make(head, n.start, n.stop) - n.start, n.stop = false + while head do + if head.head then + cloze.fix_recursion(head.head) + else + if not n.start then + n.start = registry.get_marker(head, 'fix', 'start') + end + if not n.stop then + n.stop = registry.get_marker(head, 'fix', 'stop') + end + if n.start and n.stop then + cloze.fix_make(n.start, n.stop) + n.start, n.stop = false + end end + head = head.next end +end +function cloze.fix(head) + cloze.fix_recursion(head) return head end function cloze.par(head) @@ -350,15 +412,21 @@ end l.width = hlist.width hlist, n.strut, n.head = nodex.strut_to_hlist(hlist) - head, n.line = nodex.insert_line(head, n.strut, l.width) + n.line = nodex.insert_line(n.strut, l.width) if registry.get_value_show() then - n.kern = nodex.create_kern(-l.width) - head, n.kern = node.insert_after(head, n.line, n.kern) - n.color_text = nodex.create_color('text') - node.insert_after(head, n.kern, n.color_text) - n.tail = node.tail(n.head) - n.color_reset = nodex.create_color('reset') - node.insert_after(n.head, n.tail, n.color_reset) + nodex.insert_list( + 'after', + n.line, + { + nodex.create_kern(-l.width), + nodex.create_color('text') + } + ) + nodex.insert_list( + 'after', + node.tail(head), + {nodex.create_color('reset')} + ) else n.line.next = nil end @@ -366,6 +434,7 @@ return head end function base.register(mode) + local basic if mode == 'par' then luatexbase.add_to_callback( 'post_linebreak_filter', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/cloze/cloze.sty new/tex/lualatex/cloze/cloze.sty --- old/tex/lualatex/cloze/cloze.sty 2015-07-09 00:34:57.000000000 +0200 +++ new/tex/lualatex/cloze/cloze.sty 2016-11-25 19:34:04.000000000 +0100 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2015 by Josef Friedrich <josef(a)friedrich.rocks> +%% Copyright (C) 2015-2016 by Josef Friedrich <josef(a)friedrich.rocks> %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{cloze} - [2015/07/08 v1.0 Package to typeset cloze worksheets or cloze tests] + [2016/06/23 v1.2 Package to typeset cloze worksheets or cloze tests] \RequirePackage{fontspec,luatexbase-mcb,kvoptions,xcolor} \directlua{ cloze = require('cloze') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cloze.tlpobj new/tlpkg/tlpobj/cloze.tlpobj --- old/tlpkg/tlpobj/cloze.tlpobj 2016-04-14 18:50:16.000000000 +0200 +++ new/tlpkg/tlpobj/cloze.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -1,6 +1,6 @@ name cloze category Package -revision 37811 +revision 41531 shortdesc A LuaLaTeX package for creating cloze texts relocated 1 longdesc This is a LuaLaTeX package for generating cloze texts. The main @@ -8,11 +8,11 @@ longdesc when using the hide and show options. There are three commands longdesc and one environment to generate cloze texts: the commands longdesc \cloze, \clozefix, \clozefil, and the environment clozepar. -runfiles size=4 +runfiles size=5 RELOC/scripts/cloze/cloze.lua RELOC/tex/lualatex/cloze/cloze.sty catalogue-ctan /macros/luatex/latex/cloze -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics exam luatex -catalogue-version 1.0 +catalogue-version 1.2 ++++++ clrscode.doc.tar.xz ++++++ ++++++ clrscode.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode.tlpobj new/tlpkg/tlpobj/clrscode.tlpobj --- old/tlpkg/tlpobj/clrscode.tlpobj 2016-04-14 18:50:16.000000000 +0200 +++ new/tlpkg/tlpobj/clrscode.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/clrscode/clrscode.sty catalogue-also newalg clrscode3e catalogue-ctan /macros/latex/contrib/clrscode -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pseudocode catalogue-version 1.7 ++++++ clrscode3e.doc.tar.xz ++++++ ++++++ clrscode3e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode3e.tlpobj new/tlpkg/tlpobj/clrscode3e.tlpobj --- old/tlpkg/tlpobj/clrscode3e.tlpobj 2016-04-14 18:50:16.000000000 +0200 +++ new/tlpkg/tlpobj/clrscode3e.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/clrscode3e/clrscode3e.sty catalogue-also newalg clrscode catalogue-ctan /macros/latex/contrib/clrscode3e -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pseudocode ++++++ cm-lgc.doc.tar.xz ++++++ ++++++ cm-lgc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm-lgc.tlpobj new/tlpkg/tlpobj/cm-lgc.tlpobj --- old/tlpkg/tlpobj/cm-lgc.tlpobj 2016-04-14 18:50:17.000000000 +0200 +++ new/tlpkg/tlpobj/cm-lgc.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -661,7 +661,7 @@ RELOC/tex/latex/cm-lgc/ut1fcs.fd RELOC/tex/latex/cm-lgc/ut1fct.fd catalogue-ctan /fonts/ps-type1/cm-lgc -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-serif font-sans font-mono font-greek font-cyrillic font-type1 omega catalogue-version 0.5 ++++++ cm-super.doc.tar.xz ++++++ ++++++ cm-super.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-e/cm-super.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/cm-super.tar.xz differ: char 27, line 1 ++++++ cm-unicode.doc.tar.xz ++++++ ++++++ cm-unicode.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-e/cm-unicode.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/cm-unicode.tar.xz differ: char 26, line 1 ++++++ cm.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm.doc.tlpobj new/tlpkg/tlpobj/cm.doc.tlpobj --- old/tlpkg/tlpobj/cm.doc.tlpobj 2016-04-14 18:50:16.000000000 +0200 +++ new/tlpkg/tlpobj/cm.doc.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -1,6 +1,6 @@ name cm.doc category Package -revision 32865 +revision 42428 shortdesc doc files of cm relocated 1 docfiles size=2 ++++++ cm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm.tlpobj new/tlpkg/tlpobj/cm.tlpobj --- old/tlpkg/tlpobj/cm.tlpobj 2016-04-14 18:50:16.000000000 +0200 +++ new/tlpkg/tlpobj/cm.tlpobj 2017-04-14 17:35:11.000000000 +0200 @@ -1,6 +1,6 @@ name cm category Package -revision 32865 +revision 42428 shortdesc Computer Modern fonts relocated 1 longdesc Knuth's final iteration of his re-interpretation of a c.19 @@ -230,6 +230,6 @@ RELOC/fonts/tfm/public/cm/cmu10.tfm RELOC/fonts/tfm/public/cm/cmvtt10.tfm catalogue-ctan /fonts/cm -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license knuth catalogue-topics font font-mf font-proportional font-mono font-cm ++++++ cmap.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmap.doc.tlpobj new/tlpkg/tlpobj/cmap.doc.tlpobj --- old/tlpkg/tlpobj/cmap.doc.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/cmap.doc.tlpobj 2017-04-14 17:35:51.000000000 +0200 @@ -1,6 +1,6 @@ name cmap.doc category Package -revision 41168 +revision 42428 shortdesc doc files of cmap relocated 1 docfiles size=2 ++++++ cmap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmap.tlpobj new/tlpkg/tlpobj/cmap.tlpobj --- old/tlpkg/tlpobj/cmap.tlpobj 2016-05-16 00:50:34.000000000 +0200 +++ new/tlpkg/tlpobj/cmap.tlpobj 2017-04-14 17:35:52.000000000 +0200 @@ -1,6 +1,6 @@ name cmap category Package -revision 41168 +revision 42428 shortdesc Make PDF files searchable and copyable relocated 1 longdesc The cmap package provides character map tables, which make PDF @@ -27,7 +27,7 @@ RELOC/tex/latex/cmap/t5.cmap catalogue-also pdftex mmap catalogue-ctan /macros/latex/contrib/cmap -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 1.0h ++++++ cmarrows.doc.tar.xz ++++++ ++++++ cmarrows.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmarrows.tlpobj new/tlpkg/tlpobj/cmarrows.tlpobj --- old/tlpkg/tlpobj/cmarrows.tlpobj 2016-04-14 18:51:47.000000000 +0200 +++ new/tlpkg/tlpobj/cmarrows.tlpobj 2017-04-14 17:35:52.000000000 +0200 @@ -36,7 +36,7 @@ RELOC/metapost/cmarrows/tgbx0027.mp catalogue-also pst-text catalogue-ctan /graphics/metapost/contrib/macros/cmarrows -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-symb catalogue-version 0.9 ++++++ cmbright.doc.tar.xz ++++++ ++++++ cmbright.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmbright.tlpobj new/tlpkg/tlpobj/cmbright.tlpobj --- old/tlpkg/tlpobj/cmbright.tlpobj 2016-04-14 18:51:47.000000000 +0200 +++ new/tlpkg/tlpobj/cmbright.tlpobj 2017-04-14 17:35:52.000000000 +0200 @@ -190,7 +190,7 @@ RELOC/tex/latex/cmbright/ts1cmbr.fd RELOC/tex/latex/cmbright/ts1cmtl.fd catalogue-ctan /fonts/cmbright -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-maths font-sans font-mf catalogue-version 8.1 ++++++ cmcyr.doc.tar.xz ++++++ ++++++ cmcyr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmcyr.tlpobj new/tlpkg/tlpobj/cmcyr.tlpobj --- old/tlpkg/tlpobj/cmcyr.tlpobj 2016-04-14 18:51:48.000000000 +0200 +++ new/tlpkg/tlpobj/cmcyr.tlpobj 2017-04-14 17:35:52.000000000 +0200 @@ -719,6 +719,6 @@ RELOC/fonts/vf/public/cmcyr/ycmtt9.vf RELOC/fonts/vf/public/cmcyr/ycmu10.vf catalogue-ctan /fonts/cyrillic/cmcyr -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-cyrillic font-type1 font-mf ++++++ cmdstring.doc.tar.xz ++++++ ++++++ cmdstring.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmdstring.tlpobj new/tlpkg/tlpobj/cmdstring.tlpobj --- old/tlpkg/tlpobj/cmdstring.tlpobj 2016-04-14 18:51:50.000000000 +0200 +++ new/tlpkg/tlpobj/cmdstring.tlpobj 2017-04-14 17:35:53.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/cmdstring/cmdstring.sty catalogue-ctan /macros/latex/contrib/cmdstring -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 ++++++ cmdtrack.doc.tar.xz ++++++ ++++++ cmdtrack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmdtrack.tlpobj new/tlpkg/tlpobj/cmdtrack.tlpobj --- old/tlpkg/tlpobj/cmdtrack.tlpobj 2016-04-14 18:51:51.000000000 +0200 +++ new/tlpkg/tlpobj/cmdtrack.tlpobj 2017-04-14 17:35:53.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=2 RELOC/tex/latex/cmdtrack/cmdtrack.sty catalogue-ctan /macros/latex/contrib/cmdtrack -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics debug-supp ++++++ cmexb.doc.tar.xz ++++++ ++++++ cmexb.tar.xz ++++++ ++++++ cmextra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmextra.tlpobj new/tlpkg/tlpobj/cmextra.tlpobj --- old/tlpkg/tlpobj/cmextra.tlpobj 2016-04-14 18:51:51.000000000 +0200 +++ new/tlpkg/tlpobj/cmextra.tlpobj 2017-04-14 17:35:53.000000000 +0200 @@ -1,6 +1,6 @@ name cmextra category Package -revision 32831 +revision 42428 catalogue knuth-local shortdesc Knuth's local information relocated 1 @@ -56,6 +56,6 @@ RELOC/fonts/tfm/public/cmextra/gen8.tfm RELOC/fonts/tfm/public/cmextra/gen9.tfm 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 ++++++ cmll.doc.tar.xz ++++++ ++++++ cmll.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmll.tlpobj new/tlpkg/tlpobj/cmll.tlpobj --- old/tlpkg/tlpobj/cmll.tlpobj 2016-04-14 18:51:51.000000000 +0200 +++ new/tlpkg/tlpobj/cmll.tlpobj 2017-04-14 17:35:53.000000000 +0200 @@ -119,6 +119,6 @@ RELOC/tex/latex/cmll/ucmllss.fd RELOC/tex/latex/cmll/ueull.fd catalogue-ctan /fonts/cmll -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-maths font-mf font-type1 ++++++ cmpica.doc.tar.xz ++++++ ++++++ cmpica.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpica.tlpobj new/tlpkg/tlpobj/cmpica.tlpobj --- old/tlpkg/tlpobj/cmpica.tlpobj 2016-04-14 18:51:52.000000000 +0200 +++ new/tlpkg/tlpobj/cmpica.tlpobj 2017-04-14 17:35:53.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/fonts/tfm/public/cmpica/cmpicab.tfm RELOC/fonts/tfm/public/cmpica/cmpicati.tfm catalogue-ctan /fonts/cmpica -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 ++++++ cmpj.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/README new/doc/latex/cmpj/README --- old/doc/latex/cmpj/README 2014-03-24 21:41:22.000000000 +0100 +++ new/doc/latex/cmpj/README 2017-05-10 23:12:18.000000000 +0200 @@ -7,18 +7,23 @@ Files in this directory are: - cmpj2.sty Condensed Matter Physics journal style file - cmpj.sty Old version of the Condensed Matter Physics journal style file + cmpj3.sty Condensed Matter Physics journal style file v3.xx + cmpj2.sty Condensed Matter Physics journal style file v2.xx + cmpj.sty Condensed Matter Physics journal style file v1.xx - cmp-logo.eps EPS and PDF versions of the CMP logo required - cmp-logo.pdf by cmpj.sty and cmpj2.sty + cmp-logo.eps EPS and PDF versions of the CMP logo required + cmp-logo.pdf by cmpj?.sty - cmpj.bst BibTeX style file for Condensed Matter Physics (experimental) + cmpj-cc-by-small.eps EPS and PDF versions of the CC-BY icon required + cmpj-cc-by-small.pdf by cmpj3.sty - README This file + cmpj.bst BibTeX style file for Condensed Matter Physics (experimental) + cmpjxampl.bib Sample bibliography file - userguide/* user guide and template for preparing articles for - publishing in the Condensed Matter Physics journal + README This file + + userguide/* user guide and template for preparing articles for + publishing in the Condensed Matter Physics journal INSTALLATION @@ -31,10 +36,13 @@ 3. Move files to a directories on your LaTeX input path. Recommended TDS location, for modern freeware installations of LaTeX, is <local texmf tree>/tex/latex/cmpj/ for + cmpj3.sty cmpj2.sty cmpj.sty cmp-logo.eps cmp-logo.pdf + cmpj-cc-by-small.eps + cmpj-cc-by-small.pdf files, <local texmf tree>/bibtex/bst/cmpj/ for cmpj.bst file, and <local texmf tree>/doc/latex/cmpj/ for @@ -44,6 +52,7 @@ eps_demo.pdf icmphome.eps icmphome.pdf + cmpjxampl.bib README files. @@ -55,12 +64,14 @@ ADDITIONAL FILES REQUIRED BY THIS PACKAGE -cmpj.sty and cmpj2.sty require the 'doi', 'fancyhdr', 'graphicx', -'hyperref', 'ifthen', 'url', and 'natbib' packages. +cmpj?.sty require the 'doi', 'fancyhdr', 'graphicx', 'hyperref', +'ifthen', 'url', and 'natbib' packages. These packages are included in the current LaTeX distributions. They are also available at CTAN (http://www.ctan.org/). -Besides, cmpj2.sty supports the 'droid' fonts for text -and 'fourier' and 'txfonts' for math. +cmpj2.sty supports the 'droid' fonts for text and 'fourier' and +'txfonts' for math. +cmpj3.sty supports the 'newtx' fonts for text and math and +'droid' fonts for text sans-serif. USER GUIDE AND TEMPLATE @@ -74,6 +85,23 @@ CHANGES +RELEASE NOTES FOR VERSION 3.01: + +* New cmpj3.sty using 'newtx' fonts for text and math and + 'droid' fonts for text sans-serif. + +* Added options 'cc-by' for Creative Commons Attribution 4.0 International + License (default) and 'no-cc' for author retained copyright (obsolete). + +* doi.sty code, modified to follow the CrossRef DOI display guidelines, + is incorporated in cmpj3.sty. + +* Updated cmpj.bst. + +* Some minor changes in the cmpj2.sty code. + +* Updated user guide and template. + RELEASE NOTES FOR VERSION 2.05: * Corrected equation numbering in the appendixes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/cmpjxampl.bib new/doc/latex/cmpj/cmpjxampl.bib --- old/doc/latex/cmpj/cmpjxampl.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cmpj/cmpjxampl.bib 2017-05-10 23:12:18.000000000 +0200 @@ -0,0 +1,151 @@ +@Book{Zub74, +author = {Zubarev, D. N.}, +title = {Nonequilibrium Statistical Thermodynamics}, +publisher = {Consultants Bureau}, +year = {1974}, +address = {New-York}, +numpages = {489}, +} + +@article{Bus89, + title = {Possibility of a common origin to ferroelectricity and superconductivity in oxides}, + author = {Bussmann-Holder, A. and Simon, A. and B\"uttner, H.}, + journal = {Phys. Rev. B}, + volume = {39}, + issue = {1}, + pages = {207--214}, + numpages = {0}, + year = {1989}, + month = {Jan}, + publisher = {American Physical Society}, + doi = {10.1103/PhysRevB.39.207}, + OPTurl = {https://link.aps.org/doi/10.1103/PhysRevB.39.207} +} + +@Article{Mel00, + author="Melnyk, R. S. + and Patsahan, O. V.", + title="Vapor-liquid critical-point properties of a symmetric binary fluid mixture", + journal="Theor. Math. Phys.", + year="2000", + volume="124", + number="2", + pages="1145--1156", + abstract="We propose a microscopic approach for investigating the behavior of a symmetric binary fluid mixture in the vicinity of the vapor-liquid critical point. The problem can be reduced to calculating the partition function of a 3D Ising model in an external field. For a square-well symmetric binary mixture, we express the parameters of the critical point as functions of the microscopic parameter r measuring the relative strength of interactions between the particles of dissimilar and similar species. The calculations are performed at intermediate ($\lambda$=1.5) and moderately long ($\lambda$=2) intermolecular potential ranges. The obtained results agree well with the results of computer simulations.", + issn="1573-9333", + doi="10.1007/BF02551084", + OPTurl="http://dx.doi.org/10.1007/BF02551084", + note = {[Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 339--352 (in Russian), \bibdoi{10.4213/tmf643}]}, +} + +@Article{Mry94, +author = {Mryglod, I. M. and Tokarchuk, M. V.}, +title = {Hydrodynamic theory of a magnetic liquid}, +journal = {Condens. Matter Phys.}, +year = {1994}, +volume = {3}, +pages = {116-133}, +doi = {10.5488/CMP.3.116}, +} + +@Article{Sta11, +author = {Stasyuk, I. V. and Velychko, O. V.}, +title = {Two-state {B}ose-{H}ubbard model in the hard-core boson limit}, +journal = {Condens. Matter Phys.}, +year = {2011}, +volume = {14}, +number = {1}, +pages = {13004}, +eid = {13004}, +numpages = {14}, +doi = {10.5488/CMP.14.13004}, +} + +@TechReport{Sta04, + author = {Stasyuk, I. V. and Mysakovych, T. S.}, + OPTtitle = {Raman scattering in systems with locally anharmonic elements of structure}, + year = {2004}, + type = {Preprint of the Institute for Condensed Matter Physics}, + number = {ICMP--04--12U}, + address = {Lviv}, + OPTinstitution = {Inst. Condens. Matter Phys.}, + note = {(in Ukrainian)}, +} + +@Article{Scient2012, + author="Mryglod, O. + and Kenna, R. + and Holovatch, {\relax Yu}rij + and Berche, B.", + title="Absolute and specific measures of research group excellence", + journal="Scientometrics", + year="2013", + OPTvolume="95", + OPTnumber="1", + OPTpages="115--127", + abstract="A desirable goal of scientific management is to introduce, if it exists, a simple and reliable way to measure the scientific excellence of publicly funded research institutions and universities to serve as a basis for their ranking and financing. While citation-based indicators and metrics are easily accessible, they are far from being universally accepted as way to automate or inform evaluation processes or to replace evaluations based on peer review. Here we consider absolute measurements of research excellence at an amalgamated, institutional level and specific measures of research excellence as performance per head. Using biology research institutions in the UK as a test case, we examine the correlations between peer review-based and citation-based measures of research excellence on these two scales. We find that citation-based indicators are very highly correlated with peer-evaluated measures of group strength, but are poorly correlated with group quality. Thus, and almost paradoxically, our analysis indicates that citation counts could possibly form a basis for deciding on, how to fund research institutions, but they should not be used as a basis for ranking them in terms of quality.", + issn="1588-2861", + doi="10.1007/s11192-012-0874-7", + OPTurl="http://dx.doi.org/10.1007/s11192-012-0874-7", + note="(in press)", +} + +@book{Abr64, +title = {Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical Tables}, +series = {National Bureau of Standards Applied Mathematics Series}, +editor = {Abramovitz, M. and Stegun, I. A.}, +volume = {55}, +publisher = {U.S. Government Printing Office, Washington, D.C.}, +year = {1964}, +} + +@incollection{Olver64, +author = {Olver, F. W. J.}, +title = {Bessel functions of integer order}, +booktitle = {Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical Tables}, +series = {National Bureau of Standards Applied Mathematics Series}, +editor = {Abramovitz, M. and I. A. Stegun}, +volume = {55}, +publisher = {U.S. Government Printing Office, Washington, D.C.}, +year = {1964}, +pages = {355-434}, +} + +@InCollection{Yuk87, + author = {Yukhnovkii, I. R. and Idzyk, I. M. and Kolomiets, V. O.}, + title = {Critical point of the liquid-gas system}, + booktitle = {Proceedings of the Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987)}, + pages = {97-102}, + year = {1987}, + volume = {2}, + address = {Kiev}, + publisher = {Naukova Dumka}, + month = {3--5 February}, + note = {(in Russian)}, +} + +@article{Shv04, + author = {Shvaika, A. M. and Vorobyov, O. and Freericks, J. K. and Devereaux, T. P.}, + OPTtitle = {Electronic {R}aman scattering in correlated materials: exact treatment of nonresonant, mixed, and resonant scattering with dynamical mean field theory}, + journal = {Preprint \arxiv{cond-mat/0408400}}, + OPTeprint = {cond-mat/0408400}, + OPTarchive = {arXiv}, + year = {2004}, +} + +@Misc{url2, + OPTkey = {key}, + OPTauthor = {author}, + title = {{EOSDIS} {W}orldview. {C}ity {L}ights}, + OPThowpublished = {howpublished}, + OPTmonth = {month}, + OPTyear = {year}, + OPTnote = {note}, + OPTannote = {annote}, + url={http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,5…, +} + +@misc{han12, + author = {Han, Y. and Kida, T. and Ikeda, M. and Hagiwara, M. and Stre\v{c}ka, J. and Honda, Z.}, + note = {(unpublished)}, +} Binary files old/doc/latex/cmpj/template.pdf and new/doc/latex/cmpj/template.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/template.tex new/doc/latex/cmpj/template.tex --- old/doc/latex/cmpj/template.tex 2014-03-24 21:41:22.000000000 +0100 +++ new/doc/latex/cmpj/template.tex 2017-05-10 23:12:18.000000000 +0200 @@ -6,9 +6,9 @@ %%% in the Condensed Matter Physics journal <cmp(a)icmp.lviv.ua> %%% %%% using LaTeX2e %%% %%% %%% -%%% Last time modified: March 23, 2014 %%% +%%% Last time modified: May 8, 2017 %%% %%% %%% -%%% Copyright (C) 2014 by the Institute for Condensed Matter Physics %%% +%%% Copyright (C) 2017 by the Institute for Condensed Matter Physics %%% %%% of the National Academy of Sciences of Ukraine %%% %%% %%% %%% This file can be redistributed and/or modified under the terms %%% @@ -20,26 +20,36 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[intlimits,twoside,a4paper]{article} -\usepackage{amsmath,amssymb} -\usepackage{graphicx} +%%%% \usepackage{amsmath,amssymb} %%%% already in cmpj3.sty +%%%% \usepackage{graphicx} %%%% already in cmpj3.sty -\usepackage[T2A]{fontenc} +%%%% \usepackage{bm} %%%% place it below \usepackage{cmpj3} + +%%%% \usepackage[T2A,T1]{fontenc} %%%% already in cmpj3.sty \usepackage[cp1251]{inputenc} % -%% Support for Ukrainian language. Comment two lines above if you do -%% not use Ukrainian. +%% Support for Ukrainian language. Comment line above if you do +%% not use Ukrainian. In the main body, use commands \textcyrrm, \textcyrsf and \textcyrtt +%% to typeset in cyrillic script. -\usepackage[eqsecnum]{cmpj2} +\usepackage[eqsecnum]{cmpj3} %% Fields in square brackets are optional. %% Use 'eqsecnum' for equation numbering by sections; %% and 'preprint' for the preprint layout with the increased %% font size and interline spacing. %% %% Other options control font schema (not required for regular usage): -%% 'droid' for droid fonts (default); +%% 'newtx' for newtx fonts (default); +%% 'droid' for droid fonts as in 'cmpj2.sty'; %% 'helvet' for Helvetica fonts as in old 'cmpj.sty'; -%% 'cm' for standard TeX Computer Modern fonts. +%% 'cm' for standard TeX Computer Modern fonts, +%% and copyright/licensing status: +%% 'cc-by' for Creative Commons Attribution 4.0 International License (default); +%% 'no-cc' for author retained copyright (obsolete); +%% 'nocopyright' for Editorials, etc. + +\usepackage{bm} \articletype{Regular article} @@ -81,7 +91,7 @@ \begin{abstract} These instructions describe how to prepare and submit an article -using \LaTeX{} and \texttt{cmpj2.sty} for publishing in +using \LaTeX{} and \texttt{cmpj3.sty} for publishing in ``Condensed Matter Physics'' journal. Each submitted manuscript should contain an abstract reflecting the essence of the study. The abstract will be published separately from the article in a @@ -94,7 +104,7 @@ discouraged. Please define all nonstandard symbols and abbreviations. % -\keywords Up to six keywords +\keywords Up to six keywords (\href{https://physh.aps.org/browse}{Physics Subject Headings}) % \pacs Up to six PACS numbers \end{abstract} @@ -204,10 +214,14 @@ written as a single paragraph. Mathematical expressions should be avoided. -Up to six keywords should at a glance give a general idea of the +Up to six keywords (Physics Subject Headings) +\\ [1ex] +\centerline{\texttt{\url{https://physh.aps.org/browse}}} +\\ [1ex] +should at a glance give a general idea of the article to a reader. PACS numbers (up to six classification codes) \emph{must} be given. -Please use the full, permanently updated classification system which +Please use the full classification system which is available online at \\ [1ex] \centerline{\texttt{\url{http://journals.aps.org/PACS/}}} @@ -291,12 +305,12 @@ but only the \LaTeX{} environments, so that the document style determines the formula layout. For example, the definition of Dirac $\delta$-function in the Fourier representation looks like -\begin{equation} +\begin{align} \label{delta-def} -\delta(x) = \frac{1}{2\pi} +\delta(x) = \frac{1}{2\uppi} \int_{-\infty}^{\infty} \re^{\ri sx} \rd s, -\end{equation} +\end{align} where the expression $\re^{\ri sx}$ is tolerable but the exponents with more complex arguments should be replaced by $\exp({\ri sx})$. For displayed multi-line formulas use the standard \verb|eqnarray| @@ -333,7 +347,7 @@ unit ($\ri=\sqrt{-1}$), differential ``$\rd$'', and the operators ``$\Im$'' and ``$\Re$'' for the imaginary and real parts of complex numbers, respectively [see -equation~(\ref{delta-def}) for example] and \verb|cmpj.sty| provides +equation~(\ref{delta-def}) for example] and \verb|cmpj3.sty| provides commands \verb|\re|, \verb|\ri|, \verb|\rd|, \verb|\Im|, and \verb|\Re| for typesetting such symbols, respectively. @@ -361,7 +375,6 @@ should avoid. \begin{itemize} % -% \item % For simple fractions in the @@ -376,7 +389,6 @@ where possible; the construction $(\ldots)^{-1}$ should be used instead. % -% \item % Angle brackets (e.g. the ``bra-ket'' notation, average values and @@ -384,7 +396,6 @@ $\langle p|q \rangle$, $\langle S^z \rangle$ and $\langle\langle a_i | a^{\dag}_j \rangle\rangle_{\omega}$. % -% \item % The symbol \verb|\mid| should be used as binary operator only. @@ -392,13 +403,11 @@ as modulus, the ``bra-ket'' notation and Green functions: $X^{pq}= |p\rangle \langle q|$ and $A=|b/c|$. % -% \item % The root sign $\sqrt[n]{x}$ looks fine with simple expressions only, the power $1/n$ should be used for complex ones. % -% \item % Braces, brackets and parentheses should be used in @@ -406,11 +415,13 @@ should be used within each size. However, this ordering can be ignored if the brackets have a special meaning. % -% \item % Decimal point (not comma!) should be used in decimal fractions. % +\item +% +Do not use obsolete commands \verb|\rm|, \verb|\bf|, \verb|\sf|, etc., for font switching, use \verb|\textrm|, \verb|\textbf|, \verb|\textsf|, etc., instead. % \item % @@ -528,6 +539,7 @@ Lettering should not be pasted on to the figures as it may easily become detached as a result of handling. + Colour figures submitted in electronic format will generally remain in colour in the electronic versions of an article at no cost. However, in the paper version of the CMP journal figures are @@ -637,9 +649,9 @@ e.g. in Ukrainian, unpublished, private communication, in press) \cite{Bus89,Mel00,Mry94,Sta11}. For journals without volume numbers place the issue number instead as in reference~\cite{Mry94}. The names of all authors of cited papers should be given. -Title of journal should be abbreviated according to the ISI standards (see \texttt{\url{http://library.caltech.edu/reference/abbreviations/}}). +Title of journal should be abbreviated according to the ISO~4 ``\href{http://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{http://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{http://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles). Please supply \href{http://www.crossref.org/guestquery/}{DOI} for -e-version of the papers if available \cite{Bus89,Mel00,Sta11,Scient2012}. +e-version of the papers if available \cite{Bus89,Mel00,Mry94,Sta11,Scient2012}. For books, the following order is required (skip irrelevant information): Book Authors, Book Title. Book Series Vol. No., Editor(s) (Ed[s].), @@ -653,9 +665,9 @@ publications by adding ``(in press)'' \cite{Scient2012}. If a preprint exists of the paper not yet accepted for publication, give the e-print \href{http://arxiv.org}{arXiv} number \cite{Shv04}. -Any web resources should be cited as references \cite{url1,url2,url3}. +Any web resources should be cited as references \cite{url2}. Please avoid references to unpublished materials, private communication -and web pages \cite{han12,url1,url2,url3}. +and web pages \cite{han12,url2}. It is important to confirm the accuracy of bibliographic information in references. This has become more important now that the journal @@ -667,45 +679,43 @@ you have checked your paper for any relevant references you may have missed. A typical numerical reference list might be -\cite{Zub74,Bus89,Mel00,Mry94,Sta11,Abr64,Olver64,Sta04,Shv04,Yuk87,han12,Scient2012,url1,url2}. +\cite{Zub74,Bus89,Mel00,Mry94,Sta11,Abr64,Olver64,Sta04,Shv04,Yuk87,han12,Scient2012,url2}. {\small \topsep 0.6ex \begin{verbatim} -\begin{thebibliography}{99} -\bibitem{Zub74} Zubarev~D.N., Nonequilibrium Statistical Thermodynamics, Consultants - Bureau, New-York, 1974. -\bibitem{Bus89} Bussmann-Holder~A., Simon~A., B\"uttner~H., Phys. Rev. B, 1989, - \textbf{39}, 207; \bibdoi{10.1103/PhysRevB.39.207}. -\bibitem{Mel00} Melnyk~R., Patsahan~O., Theor. Math. Phys., 2000, \textbf{124}, 1145; - \bibdoi{10.1007/BF02551084} [Teor. Mat. Fiz., 2000, \textbf{124}, 339 (in Russian); - \bibdoi{10.4213/tmf643}]. -\bibitem{Mry94} Mryglod~I.M., Tokarchuk~M.V., Condens. Matter Phys., 1993, \textbf{3}, 116; - \bibdoi{10.5488/CMP.3.116}. -\bibitem{Sta11} Stasyuk~I.V., Velychko~O.V., Condens. Matter Phys., 2011, \textbf{14}, - 13004; \bibdoi{10.5488/CMP.14.13004}. -\bibitem{Abr64} Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical - Tables. National Bureau of Standards Applied Mathematics Series Vol.~55, Abramovitz~M., - Stegun~I.A. (Eds.), U.S. Government Printing Office, Washington, D.C., 1964. -\bibitem{Olver64} Olver~F.W.J., In: Handbook of Mathematical Functions with Formulas, - Graphs, and Mathematical Tables. National Bureau of Standards Applied Mathematics - Series Vol.~55, Abramovitz~M., Stegun~I.A. (Eds.), U.S. Government Printing Office, - Washington, D.C., 1964, 355--434. -\bibitem{Scient2012} Mryglod~O., Kenna~R., Holovatch~Yu., Berche~B., - Scientometrics (in press); \bibdoi{10.1007/s11192-012-0874-7}. -\bibitem{Sta04} Stasyuk~I.V., Mysakovych~T.S., Preprint of the Institute for Condensed - Matter Physics, ICMP--04--12U, Lviv, 2004 (in Ukrainian). -\bibitem{Shv04} Shvaika~A.M., Vorobyov~O., Freericks~J.K., Devereaux~T.P., - Preprint \arxiv{cond-mat/0408400}, 2004. -\bibitem{Yuk87} Yukhnovkii~I.R., Idzyk~I.M., Kolomiets~V.O., - In: Proceedings of the Conference ``Modern Problems of Statistical Physics'' - (Lviv, 1987), Vol.~2, Naukova Dumka, Kiev, 1987, 97--102 (in Russian). -\bibitem{han12} Han~Y., Kida~T., Ikeda~M., Hagiwara~M., Stre\v{c}ka~J., Honda~Z. - (unpublished). -\bibitem{url1} \url{http://en.wikipedia.org/wiki/Condensed_matter_physics}. -\bibitem{url2} \url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}. -\bibitem{url3} \href{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic} - {EOSDIS Worldview. City Lights}. +\begin{thebibliography}{10} +\bibitem{Zub74} Zubarev D.N., Nonequilibrium Statistical Thermodynamics, Consultants + Bureau, New-York, 1974. +\bibitem{Bus89} Bussmann-Holder A., Simon A., B\"uttner H., Phys. Rev. B, 1989, + \textbf{39}, 207--214, \doi{10.1103/PhysRevB.39.207}. +\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2, + 1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, + 339--352 (in Russian), \bibdoi{10.4213/tmf643}]. +\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3}, + 116--133, \doi{10.5488/CMP.3.116}. +\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14}, + No.~1, 13004 (14 pages), \doi{10.5488/CMP.14.13004}. +\bibitem{Sta04} Stasyuk I.V., Mysakovych T.S., Preprint of the Institute for Condensed + Matter Physics, ICMP--04--12U, Lviv, 2004, (in Ukrainian). +\bibitem{Scient2012} Mryglod O., Kenna R., Holovatch Yu., Berche B., Scientometrics, 2013, + \doi{10.1007/s11192-012-0874-7}, (in press). +\bibitem{Abr64} Abramovitz M., Stegun I.A. (Eds.), Handbook of Mathematical Functions with + Formulas, Graphs, and Mathematical Tables, National Bureau of Standards Applied + Mathematics Series, Vol.~55, U.S. Government Printing Office, Washington, D.C., 1964. +\bibitem{Olver64} Olver F.W.J., In: Handbook of Mathematical Functions with Formulas, + Graphs, and Mathematical Tables, National Bureau of Standards Applied Mathematics + Series, Vol.~55, Abramovitz M., Stegun I.A. (Eds.), U.S. Government Printing Office, + Washington, D.C., 1964, 355--434. +\bibitem{Yuk87} Yukhnovkii I.R., Idzyk I.M., Kolomiets V.O., In: Proceedings of the + Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987), Vol.~2, Naukova + Dumka, Kiev, 1987, 97--102, (in Russian). +\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P.,Preprint + \arxiv{cond-mat/0408400}, 2004. +\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights, + URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.050781…. +\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., + (unpublished). \end{thebibliography} \end{verbatim} } @@ -759,10 +769,10 @@ Frequently good physicists (especially young scientists) have a little knowledge how to write a good looking article. As comprehensive (and free) tutorials on the subject one can mention -``IOP Style Guide'' -\\ [1ex] -\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},} -\\ [1ex] +%``IOP Style Guide'' +%\\ [1ex] +%\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},} +%\\ [1ex] ``Physical Review Style and Notation Guide'' \\ [1ex] \centerline{\texttt{\url{http://publish.aps.org/files/styleguide-pr.pdf}},} @@ -779,43 +789,39 @@ %% or create them from your bibtex database using cmpj.bst style (experimental). %\bibliographystyle{cmpj} -%\bibliography{mybibdb} - +%\bibliography{cmpjxampl} -\begin{thebibliography}{99} -\bibitem{Zub74} Zubarev~D.N., Nonequilibrium Statistical Thermodynamics, Consultants - Bureau, New-York, 1974. -\bibitem{Bus89} Bussmann-Holder~A., Simon~A., B\"uttner~H., Phys. Rev. B, 1989, - \textbf{39}, 207; \bibdoi{10.1103/PhysRevB.39.207}. -\bibitem{Mel00} Melnyk~R., Patsahan~O., Theor. Math. Phys., 2000, \textbf{124}, 1145; - \bibdoi{10.1007/BF02551084} [Teor. Mat. Fiz., 2000, \textbf{124}, 339 (in Russian); - \bibdoi{10.4213/tmf643}]. -\bibitem{Mry94} Mryglod~I.M., Tokarchuk~M.V., Condens. Matter Phys., 1993, \textbf{3}, 116; - \bibdoi{10.5488/CMP.3.116}. -\bibitem{Sta11} Stasyuk~I.V., Velychko~O.V., Condens. Matter Phys., 2011, \textbf{14}, - 13004; \bibdoi{10.5488/CMP.14.13004}. -\bibitem{Abr64} Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical - Tables. National Bureau of Standards Applied Mathematics Series Vol.~55, Abramovitz~M., - Stegun~I.A. (Eds.), U.S. Government Printing Office, Washington, D.C., 1964. -\bibitem{Olver64} Olver~F.W.J., In: Handbook of Mathematical Functions with Formulas, - Graphs, and Mathematical Tables. National Bureau of Standards Applied Mathematics - Series Vol.~55, Abramovitz~M., Stegun~I.A. (Eds.), U.S. Government Printing Office, - Washington, D.C., 1964, 355--434. -\bibitem{Scient2012} Mryglod~O., Kenna~R., Holovatch~Yu., Berche~B., - Scientometrics (in press); \bibdoi{10.1007/s11192-012-0874-7}. -\bibitem{Sta04} Stasyuk~I.V., Mysakovych~T.S., Preprint of the Institute for Condensed - Matter Physics, ICMP--04--12U, Lviv, 2004 (in Ukrainian). -\bibitem{Shv04} Shvaika~A.M., Vorobyov~O., Freericks~J.K., Devereaux~T.P., - Preprint \arxiv{cond-mat/0408400}, 2004. -\bibitem{Yuk87} Yukhnovkii~I.R., Idzyk~I.M., Kolomiets~V.O., - In: Proceedings of the Conference ``Modern Problems of Statistical Physics'' - (Lviv, 1987), Vol.~2, Naukova Dumka, Kiev, 1987, 97--102 (in Russian). -\bibitem{han12} Han~Y., Kida~T., Ikeda~M., Hagiwara~M., Stre\v{c}ka~J., Honda~Z. - (unpublished). -\bibitem{url1} \url{http://en.wikipedia.org/wiki/Condensed_matter_physics}. -\bibitem{url2} \url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic}. -\bibitem{url3} \href{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,50.75,62.14453125&products=baselayers.VIIRS_CityLights_2012~overlays.sedac_bound&switch=geographic} -{EOSDIS Worldview. City Lights}. +\begin{thebibliography}{10} +\bibitem{Zub74} Zubarev D.N., Nonequilibrium Statistical Thermodynamics, Consultants Bureau, + New-York, 1974. +\bibitem{Bus89} Bussmann-Holder A., Simon A., B\"uttner H., Phys. Rev. B, 1989, \textbf{39}, + 207--214, \doi{10.1103/PhysRevB.39.207}. +\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2, + 1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, + 339--352 (in Russian), \bibdoi{10.4213/tmf643}]. +\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3}, + 116--133, \doi{10.5488/CMP.3.116}. +\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14}, + No.~1, 13004 (14 pages), \doi{10.5488/CMP.14.13004}. +\bibitem{Sta04} Stasyuk I.V., Mysakovych T.S., Preprint of the Institute for Condensed Matter + Physics, ICMP--04--12U, Lviv, 2004, (in Ukrainian). +\bibitem{Scient2012} Mryglod O., Kenna R., Holovatch Yu., Berche B., Scientometrics, 2013, + \doi{10.1007/s11192-012-0874-7}, (in press). +\bibitem{Abr64} Abramovitz M., Stegun I.A. (Eds.), Handbook of Mathematical Functions with + Formulas, Graphs, and Mathematical Tables, National Bureau of Standards Applied + Mathematics Series, Vol.~55, U.S. Government Printing Office, Washington, D.C., 1964. +\bibitem{Olver64} Olver F.W.J., In: Handbook of Mathematical Functions with Formulas, Graphs, + and Mathematical Tables, National Bureau of Standards Applied Mathematics Series, Vol.~55, + Abramovitz M., Stegun I.A. (Eds.), U.S. Government Printing Office, Washington, D.C., + 1964, 355--434. +\bibitem{Yuk87} Yukhnovkii I.R., Idzyk I.M., Kolomiets V.O., In: Proceedings of the + Conference ``Modern Problems of Statistical Physics'' (Lviv, 1987), Vol.~2, Naukova Dumka, + Kiev, 1987, 97--102, (in Russian). +\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P., Preprint + \arxiv{cond-mat/0408400}, 2004. +\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights, + URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.050781…. +\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., (unpublished). \end{thebibliography} % @@ -846,7 +852,7 @@ \tolerance=3000% � �� ``Condensed Matter Physics'' �� -�� \LaTeX{} � �� \texttt{cmpj2.sty}. +�� \LaTeX{} � �� \texttt{cmpj3.sty}. �� , �� . �� , �� diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpj.doc.tlpobj new/tlpkg/tlpobj/cmpj.doc.tlpobj --- old/tlpkg/tlpobj/cmpj.doc.tlpobj 2016-04-14 18:51:52.000000000 +0200 +++ new/tlpkg/tlpobj/cmpj.doc.tlpobj 2017-05-11 02:06:49.000000000 +0200 @@ -1,10 +1,11 @@ name cmpj.doc category Package -revision 33275 +revision 44283 shortdesc doc files of cmpj relocated 1 -docfiles size=159 +docfiles size=172 RELOC/doc/latex/cmpj/README + RELOC/doc/latex/cmpj/cmpjxampl.bib RELOC/doc/latex/cmpj/eps_demo.eps RELOC/doc/latex/cmpj/eps_demo.pdf RELOC/doc/latex/cmpj/icmphome.eps ++++++ cmpj.tar.xz ++++++ ++++ 1826 lines of diff (skipped) ++++++ cmsd.doc.tar.xz ++++++ ++++++ cmsd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmsd.tlpobj new/tlpkg/tlpobj/cmsd.tlpobj --- old/tlpkg/tlpobj/cmsd.tlpobj 2016-04-14 18:51:52.000000000 +0200 +++ new/tlpkg/tlpobj/cmsd.tlpobj 2017-04-14 17:35:54.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/latex/cmsd/t1cmsd.fd RELOC/tex/latex/cmsd/ts1cmsd.fd catalogue-ctan /macros/latex/contrib/cmsd -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 ++++++ cmtiup.doc.tar.xz ++++++ ++++++ cmtiup.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmtiup.tlpobj new/tlpkg/tlpobj/cmtiup.tlpobj --- old/tlpkg/tlpobj/cmtiup.tlpobj 2016-04-14 18:51:53.000000000 +0200 +++ new/tlpkg/tlpobj/cmtiup.tlpobj 2017-04-14 17:35:54.000000000 +0200 @@ -89,7 +89,7 @@ RELOC/tex/latex/cmtiup/cmtiup.sty catalogue-also cmslup catalogue-ctan /fonts/cm/cmtiup -catalogue-date 2016-02-15 07:16:16 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-virtual catalogue-version 2.1 ++++++ cnbwp.doc.tar.xz ++++++ ++++++ cnbwp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cnbwp.tlpobj new/tlpkg/tlpobj/cnbwp.tlpobj --- old/tlpkg/tlpobj/cnbwp.tlpobj 2016-04-14 18:51:54.000000000 +0200 +++ new/tlpkg/tlpobj/cnbwp.tlpobj 2017-04-14 17:35:54.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/cnbwp/cnbwp.cls RELOC/tex/latex/cnbwp/cnbwpsizes.clo catalogue-ctan /macros/latex/contrib/cnbwp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics misc-paper ++++++ cnltx.doc.tar.xz ++++++ ++++++ cnltx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cnltx.tlpobj new/tlpkg/tlpobj/cnltx.tlpobj --- old/tlpkg/tlpobj/cnltx.tlpobj 2016-04-14 18:51:54.000000000 +0200 +++ new/tlpkg/tlpobj/cnltx.tlpobj 2017-04-14 17:35:55.000000000 +0200 @@ -29,7 +29,7 @@ RELOC/tex/latex/cnltx/cnltx.dbx RELOC/tex/latex/cnltx/cnltx.sty catalogue-ctan /macros/latex/contrib/cnltx -catalogue-date 2015-08-17 17:04:10 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-supp class expl3 catalogue-version 0.13 ++++++ cns.doc.tar.xz ++++++ ++++++ cns.tar.xz ++++++ ++++++ cntformats.doc.tar.xz ++++++ ++++++ cntformats.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cntformats.tlpobj new/tlpkg/tlpobj/cntformats.tlpobj --- old/tlpkg/tlpobj/cntformats.tlpobj 2016-04-14 18:52:10.000000000 +0200 +++ new/tlpkg/tlpobj/cntformats.tlpobj 2017-04-14 17:36:01.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/cntformats/cntformats.sty catalogue-ctan /macros/latex/contrib/cntformats -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics numbers catalogue-version 0.7 ++++++ cntperchap.doc.tar.xz ++++++ ++++++ cntperchap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cntperchap.tlpobj new/tlpkg/tlpobj/cntperchap.tlpobj --- old/tlpkg/tlpobj/cntperchap.tlpobj 2016-04-14 18:52:11.000000000 +0200 +++ new/tlpkg/tlpobj/cntperchap.tlpobj 2017-04-14 17:36:01.000000000 +0200 @@ -13,8 +13,9 @@ longdesc author) and xparse are needed as well. runfiles size=3 RELOC/tex/latex/cntperchap/cntperchap.sty +catalogue-also xcntperchap catalogue-ctan /macros/latex/contrib/cntperchap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics counter-mgmt macro-supp catalogue-version 0.3 ++++++ cochineal.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/README new/doc/fonts/cochineal/README --- old/doc/fonts/cochineal/README 2016-04-07 22:50:07.000000000 +0200 +++ new/doc/fonts/cochineal/README 2017-03-12 01:01:03.000000000 +0100 @@ -19,7 +19,23 @@ The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts. -Current version: 1.01 2016-04-06 +Current version: 1.042 2017-03-10 + +Changes in version 1.042 +Modified the sty file so that Cochineal text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.) + +Changes in version 1.041 +Added two entries to smcp table so that dotlessi and dotlessj map to correct small cap glyph. + +Changes in version 1.04 +Small modifications to sizes to provide better match across styles. + +Changes in version 1.03: +1. Some modifications to a number of glyphs, spacing and kerning. +2. Added uni2016---required for some footnote macros. + +Changes in version 1.02: +Modified the {OT1,T1,LY1}Cochineal-{OsF,LF,TLF,TOsF}.fd files so that the swashQ tests work correctly even when cochineal.sty is not loaded. Changes in version 1.01: Corrected lgr encodings to replace Delta and Omega with uni0394 and uni03A9 respectively. Binary files old/doc/fonts/cochineal/cochineal-doc.pdf and new/doc/fonts/cochineal/cochineal-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/cochineal-doc.tex new/doc/fonts/cochineal/cochineal-doc.tex --- old/doc/fonts/cochineal/cochineal-doc.tex 2016-04-07 22:50:07.000000000 +0200 +++ new/doc/fonts/cochineal/cochineal-doc.tex 2017-03-12 01:01:03.000000000 +0100 @@ -48,8 +48,9 @@ \useosf % switch from lining figures to oldstyle figures \useproportional % switch from tabular to proportional \end{verbatim} -There is a simpler way to achieve the same result though it conflicts with parts of the {\tt babel} package. +There is a simpler way to achieve essentially the same result, but with the advantage that the figure styles are not loaded until after the math package (if any) is loaded, so that math always uses the default tabular lining figures. \begin{verbatim} +% If you use babel, load it here, before cochineal \usepackage[p,osf]{cochineal} % default figure style is proportional, oldstyle % load sans and typewriter fonts % load a math font---it will use tabular lining figures in math @@ -83,10 +84,11 @@ \begin{verbatim} % preamble should include, in this order: \usepackage[T1]{fontenc} +% load babel here \usepackage[p,osf]{cochineal} \usepackage[varqu,varl,var0]{inconsolata} \usepackage[scale=.95,type1]{cabin} -\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath} +\usepackage[cochineal,vvarbb]{newtxmath} \usepackage[cal=boondoxo]{mathalfa} \end{verbatim} \def\Pr{\ensuremath{\mathbb{P}}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cochineal.doc.tlpobj new/tlpkg/tlpobj/cochineal.doc.tlpobj --- old/tlpkg/tlpobj/cochineal.doc.tlpobj 2016-04-14 18:52:11.000000000 +0200 +++ new/tlpkg/tlpobj/cochineal.doc.tlpobj 2017-04-14 17:36:01.000000000 +0200 @@ -1,9 +1,9 @@ name cochineal.doc category Package -revision 40321 +revision 43462 shortdesc doc files of cochineal relocated 1 -docfiles size=89 +docfiles size=91 RELOC/doc/fonts/cochineal/OFL-FAQ.txt RELOC/doc/fonts/cochineal/OFL.txt RELOC/doc/fonts/cochineal/README ++++++ cochineal.tar.xz ++++++ ++++ 276133 lines of diff (skipped) ++++++ codedoc.doc.tar.xz ++++++ ++++++ codedoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codedoc.tlpobj new/tlpkg/tlpobj/codedoc.tlpobj --- old/tlpkg/tlpobj/codedoc.tlpobj 2016-04-14 18:52:32.000000000 +0200 +++ new/tlpkg/tlpobj/codedoc.tlpobj 2017-04-14 17:36:09.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/codedoc/codedoc.cls catalogue-also doc gmdoc catalogue-ctan /macros/latex/contrib/codedoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-supp catalogue-version 0.3 ++++++ codepage.doc.tar.xz ++++++ ++++++ codepage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codepage.tlpobj new/tlpkg/tlpobj/codepage.tlpobj --- old/tlpkg/tlpobj/codepage.tlpobj 2016-04-14 18:52:33.000000000 +0200 +++ new/tlpkg/tlpobj/codepage.tlpobj 2017-04-14 17:36:09.000000000 +0200 @@ -16,6 +16,6 @@ RELOC/tex/latex/codepage/shapecm.tex RELOC/tex/latex/codepage/shapedc.tex catalogue-ctan /macros/latex/contrib/codepage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics inputenc ++++++ codesection.doc.tar.xz ++++++ ++++++ codesection.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codesection.tlpobj new/tlpkg/tlpobj/codesection.tlpobj --- old/tlpkg/tlpobj/codesection.tlpobj 2016-04-14 18:52:33.000000000 +0200 +++ new/tlpkg/tlpobj/codesection.tlpobj 2017-04-14 17:36:09.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/codesection/codesection.sty catalogue-also comment optional version catalogue-ctan /macros/latex/contrib/codesection -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.1 ++++++ codicefiscaleitaliano.doc.tar.xz ++++++ ++++++ codicefiscaleitaliano.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj new/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj --- old/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj 2016-04-14 18:52:33.000000000 +0200 +++ new/tlpkg/tlpobj/codicefiscaleitaliano.tlpobj 2017-04-14 17:36:09.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/codicefiscaleitaliano/codicefiscaleitaliano.sty catalogue-ctan /macros/latex/contrib/codicefiscaleitaliano -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics calculation italian catalogue-version 1.2 ++++++ collcell.doc.tar.xz ++++++ ++++++ collcell.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collcell.tlpobj new/tlpkg/tlpobj/collcell.tlpobj --- old/tlpkg/tlpobj/collcell.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collcell.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/collcell/collcell.sty catalogue-ctan /macros/latex/contrib/collcell -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 catalogue-version 0.5 ++++++ collectbox.doc.tar.xz ++++++ ++++++ collectbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collectbox.tlpobj new/tlpkg/tlpobj/collectbox.tlpobj --- old/tlpkg/tlpobj/collectbox.tlpobj 2016-04-14 18:52:34.000000000 +0200 +++ new/tlpkg/tlpobj/collectbox.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=3 RELOC/tex/latex/collectbox/collectbox.sty catalogue-ctan /macros/latex/contrib/collectbox -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.4b ++++++ collref.doc.tar.xz ++++++ ++++++ collref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collref.tlpobj new/tlpkg/tlpobj/collref.tlpobj --- old/tlpkg/tlpobj/collref.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/collref.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/collref/collref.sty catalogue-also mcite catalogue-ctan /macros/latex/contrib/collref -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cite-supp catalogue-version 2.0b ++++++ colordoc.doc.tar.xz ++++++ ++++++ colordoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colordoc.tlpobj new/tlpkg/tlpobj/colordoc.tlpobj --- old/tlpkg/tlpobj/colordoc.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colordoc.tlpobj 2017-04-14 17:36:10.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=2 RELOC/tex/latex/colordoc/colordoc.sty catalogue-ctan /macros/latex/contrib/colordoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics doc-supp ++++++ colorinfo.doc.tar.xz ++++++ ++++++ colorinfo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorinfo.tlpobj new/tlpkg/tlpobj/colorinfo.tlpobj --- old/tlpkg/tlpobj/colorinfo.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colorinfo.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=2 RELOC/tex/latex/colorinfo/colorinfo.sty catalogue-ctan /macros/latex/contrib/colorinfo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license lppl catalogue-topics colour catalogue-version 0.3c ++++++ coloring.doc.tar.xz ++++++ ++++++ coloring.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coloring.tlpobj new/tlpkg/tlpobj/coloring.tlpobj --- old/tlpkg/tlpobj/coloring.tlpobj 2016-05-12 03:16:59.000000000 +0200 +++ new/tlpkg/tlpobj/coloring.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/coloring/coloring.sty catalogue-ctan /macros/latex/contrib/coloring -catalogue-date 2016-05-11 07:50:10 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics colour catalogue-version 0.2 ++++++ colorsep.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorsep.tlpobj new/tlpkg/tlpobj/colorsep.tlpobj --- old/tlpkg/tlpobj/colorsep.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colorsep.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -7,6 +7,6 @@ runfiles size=2 RELOC/dvips/colorsep/colorsep.pro catalogue-ctan /graphics/colorsep -catalogue-date 2015-12-27 20:31:23 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics colour ++++++ colorspace.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/colorspace/README new/doc/latex/colorspace/README --- old/doc/latex/colorspace/README 2015-06-16 23:22:12.000000000 +0200 +++ new/doc/latex/colorspace/README 2016-11-25 19:28:26.000000000 +0100 @@ -1,23 +1,29 @@ colorspace ----------- -PDF color spaces. Currently, it supports: +This package provides some tools related to PDF color spaces and color +management. It requires xcolor, which is loaded if it has not been +before. -* spot colors -* mixing inks (spot and process), up to 4 +Currently it supports what I think are the most common tools: + +* Spot colors (CMYK and CIE LAB) +* Mixed spot and process colors (up to 4) * ICC based default CMYK, RGB and Gray spaces -* overprinting +* Overprinting -It requires xcolor and currently only pdftex and luatex. +Currently only pdftex and luatex are supported. It seems to work with tikz. -For example, to define a spot color, just say: +For example, to define a spot color, just say something like: \definespotcolor{foo}{BarTone 555 GN}{.3, .4, .5, .6} -That's all. +That's all. + +What's new +---------- -Those docs, like the package itself, are still somewhat tentative, but -the basic behaviour described here will be preserved in future -versions. +* 1.2.0 CIE LAB spot colors (including mixed inks with a CMYK alternative) +* 1.1.1 is compatible with luatex 0.95 -2015-06-01 \ No newline at end of file +2016-10-05 \ No newline at end of file Binary files old/doc/latex/colorspace/colorspace.pdf and new/doc/latex/colorspace/colorspace.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/colorspace/colorspace.tex new/doc/latex/colorspace/colorspace.tex --- old/doc/latex/colorspace/colorspace.tex 2015-06-16 23:22:12.000000000 +0200 +++ new/doc/latex/colorspace/colorspace.tex 2016-11-25 19:28:26.000000000 +0100 @@ -2,9 +2,9 @@ % | Typeset this file to get the documentation. | % +--------------------------------------------------+ % -%% Copyright (C) 2015 Javier Bezos +%% Copyright (C) 2015-2016 Javier Bezos %% All Rights Reserved -%% http://www.tex-tipografia.com +%% http://www.texnia.com %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3 of this @@ -19,175 +19,507 @@ %% This Current Maintainer of this work is Javier Bezos. %% %% This work consists of the files colorspace.tex and colorspace.sty. -\documentclass{article} +\documentclass[a4paper]{ltxguide} -\title{\textsf{colorspace}\\\large Version 1.1.0} +\title{\textsf{colorspace}\\\large Version 1.2.0} - \author{Javier Bezos\\\texttt{http://www.tex-tipografia.com}} +\author{Javier Bezos\\\texttt{http://www.texnia.com}} + +\date{2016-10-05} \raggedright -\parskip=1ex - -\date{2015-06-01} +\parskip=.8ex +\advance\oddsidemargin-.7cm +\advance\textwidth2cm +\addtolength{\textheight}{3.5cm} +\addtolength{\topmargin}{-2cm} + +\newif\ifcolorspace +\newif\iftikz + +\usepackage{graphicx,bera} + +\IfFileExists{colorspace.sty}{% + \usepackage[illuminant=d65]{colorspace}% + \definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3}% + \definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4}% + \definespotcolor{foolab}{BarTone 888 LB}[alt=lab]% + {50, -30, -40/1, .20, .15, .07}% +% + \definecolorspace{fooshaded}{mixed}{foo,black}% + \definecolorspace{labshaded}{mixed}{foolab,foob}% +% + \definecolor{sfoo}{fooshaded}{1,0} + \definecolor{sblack}{fooshaded}{0,1} + \definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack} + \colorspacetrue}{} + +\IfFileExists{tikz.sty}{% + \catcode`|=12 + \usepackage{tikz}% + \catcode`|=\active + \tikztrue}{} + +\def\showclr#1#{\testclr{#1}} +\def\testclr#1#2{{\fboxsep0pt\fbox{\colorbox#1{#2}{\phantom{,MM}}}}} + +\makeatletter +\def\@begintheorem#1#2{% + \list{}{}% + \global\advance\@listdepth\m@ne + \item[{\sffamily\bfseries\color{foob}\MakeUppercase{#1}}]}% +\makeatother +\newtheorem{warning}{Warning} +\newtheorem{note}{Note} +\newtheorem{example}{Example} \begin{document} -\maketitle +{\fontsize{48}{48}\selectfont colorspace\par} +{\LARGE Spot colors, mixed inks and more\par} +\vspace*{1ex} +Version 1.2.0 (2016-10-05)\par +Javier Bezos (\texttt{http://www.texnia.com}) + +\vspace*{6ex} + +The aim of this package is, as its name implies, to provide tools for +PDF color spaces. It requires \textsf{xcolor}, which is loaded if it +has not been before. It seems to work with \textsf{tikz}. + +Currently it supports what I think are the most common tools: +\begin{itemize} +\item Spot colors, with a clean user interface, and including tints + (with the |!| notation). +\item CIE LAB spot colors. +\item Proper switching of color spaces. +\item Mixed spot and process colors (up to 4), like shades (ie, a spot + color with black). Also CIE LAB if a CMYK equivalent is provided. +\item ICC based (or ``tagged'') default CMYK, RGB and Gray spaces. +\item Overprinting (across pages, using the color stack). +\end{itemize} +Currently only \textsf{pdftex} and \textsf{luatex} are +supported. Support for \textsf{xetex} is on the `to do' list, but due +to the limitations of this engine this task is somewhat challenging +and I'm not sure all features will be implemented. + +Other functions related to the PDF color spaces (indexed, calibrated, +Lab spaces) are not yet suported, but they are under study. Calibrated +colors, although not directly supported, can be defined with an ICC +profile created with +LPROF\footnote{\texttt{http://lprof.sourceforge.net/}} and then +assigned to a default space as described below. + +They apply to text and line art only, not external images. For the +latter, \textsf{graphicx} provides a plea of (undocumented) +transformations: \texttt{interpolate}, \texttt{decodearray}, +\texttt{maskarray}, \texttt{intent}, \texttt{ocobjnum}, and +\texttt{ocobjref}. For transparency, see \textsf{transparent}, by +Heiko Oberdiek. + +This package is still evolving, but the basic behaviour described here +will be preserved in future versions. However, some functions from +\textsf{xcolor} might not work yet (for example \verb|\selectcolormodel|). + +Declarations are global and should go in the preamble. This package is built on the previous attempts to provide spot colors and other additional features by Jens Elstner, Stephan Lehmke and Siep -Kroonenberg (with some inspiration from \textsf{ConTeXt}, too). It -requires \textsf{xcolor}, which is loaded if it has not been before. +Kroonenberg (with some inspiration from \textsf{ConTeXt}, too). -It provides a clean user interface, with a single command for defining -a spot color. It seems to work with \textsf{tikz}. Currently only -\textsf{pdftex} and \textsf{luatex} are supported. +\section{CMYK spot colors} -Mixing spot colors (with process colors or other spots colors) is -supported to some extent (see below). You can also assign ICC profiles -to the default CMYK, RGB and Gray spaces. Other functions related to -the PDF color spaces (indexed, calibrated, Lab spaces) are not yet -suported, but they are\texttt{} under study. They apply to text and -line art only, not external images. Declarations are global. Using -\verb|\selectcolormodel| does not work yet. +Spot colors are defined with a single macro: -Those docs, like the package itself, are still somewhat tentative (as -you very likely have noticed), but the basic behaviour described here -will be preserved in future versions. +\begin{decl} +|\definespotcolor{<latex-name>}{<PDF-name>}{<CMYK-equivalent>}| +\end{decl} -For transparencies, see \textsf{transparent}, by Heiko Oberdiek. +Here |<latex-name>| is the \LaTeX{} name, as used in \verb|\color| and +the like, |<PDF-name>| is the PDF name (usually taken from a swatch +book; multiple spaces are collapsed into one) as shown by PDF viewers, +and the four numbers are the CMYK equivalent. \LaTeX{} knows nothing +about the PDF name, which is just a string to be written to the +generated file, while the PDF knows nothing about the \LaTeX{} name. -\section{Spot colors} +To mix inks, see below. -Write, for example: +\begin{example} + Write, for example: \begin{verbatim} -\definespotcolor{foo}{BarTone 555 GN}{.3,.4,.5,.6} +\definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3} \end{verbatim} - -That's all. Here \verb|foo| is the \LaTeX{} name, as used in -\verb|\color| and the like, \verb|BarTone 555 GN| is the PDF name -(multiple spaces are collapsed into one) as shown by PDF readers, and -the four numbers are the CMYK equivalent. \LaTeX{} knows nothing about -the PDF name, which is just a string to be written to the generated -file, while the PDF knows nothing about the \LaTeX{} name. + This creates the color \showclr{foo}, which is used in \LaTeX{} as + |\color{foo}|. If you preflight the PDF file you will see a color + named `BarTone 555 GN' besides cyan, magenta, yellow and black. You can use tints as usual in \textsf{xcolor}, like: \begin{verbatim} -\color{foo!60} -\colorlet{foo60}{foo!60} +\color{foo!50} +\colorlet{foo50}{foo!50} \end{verbatim} -and even set tints from other tints. To mix inks, see below. - -The special PDF names \verb|All| (for all plates) and \verb|None| work -as expected: +\ifcolorspace + which would produce \showclr{foo!50}, and +\fi +even set tints from other tints. +\end{example} + +\begin{note} + The special PDF names \verb|All| (for all plates) and \verb|None| + work as expected: \begin{verbatim} \definespotcolor{registration}{All}{1,1,1,1} \end{verbatim} +\end{note} -Internally, only CMYK is used, but you can define the equivalent color -with another name space, which is then converted: +\begin{note} + Remember as far PDF is concerned a spot color is a color space on + its own. +\end{note} + +\begin{note} + This package does not provide a list of Pantone, TrueMatch, HKS, + Folcoltone, Toyo, etc., colors. Currently you can find quite easily + CMYK equivalents on the web, and after all they are intended to be + used with a ``physical'' swatch book (and not, as often done, by + picking a color from a ``virtual'' palette just because it looks + nice on screen). +\end{note} + +\begin{decl} +|\definespotcolor{<latex-name>}{<PDF-name>}[<model>]{<equivalent>}| +\end{decl} + +Internally, only CMYK is used for the equivalent color, but with this +variant you can define the latter with another name space, which is +then converted. +\begin{example} The following definition is based on RGB: +\begin{verbatim} +\definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4} +\end{verbatim} + which yields \showclr{foob}. Here \textsf{xcolor} just + converts this value to CMYK, which is still the space used + internally. +\end{example} + +\begin{warning} + This conversion relies on the \textsf{xcolor} numerical methods, + which do not take into account any color profile and therefore + should be avoided in production if the alternate space is going to + be actually used. It is provided just for convenience in drafting or + in contexts where accuracy is not essential. +\end{warning} + +\section{CIE LAB spot colors} + +Instead of targeting the CMYK space, spot colors may be defined using +the CIE LAB (also known as L*a*b*, or even just Lab) space. Unlike the +default CMYK space, which is by default device dependend, the Lab +space is device independent. To define a Lab spot color, you must +first set the illuminant with the package option |illuminant|, which +takes a value: +\begin{verbatim} +\usepackage[illuminant=d65]{colorspace} +\end{verbatim} +Values are \texttt{a}, \texttt{c}, \texttt{e}, \texttt{d50}, +\texttt{d55}, \texttt{d65}, \texttt{d75}. + +The command to define a color is: +\begin{decl} +|\definespotcolor{<latex-name>}{<PDF-name>}[alt=lab]{<Lab-values>}| +\end{decl} +Note the optional argument with the string |alt=lab| (which cannot be +combined with a model). The three |<Lab-values>| have ranges +\textit{L}* $=$ $0$\ldots$100$, \textit{a}* $=$ $-$128$\ldots$127, +\textit{b}* $=$ $-$128{\ldots}127, respectively. + +\begin{example} + With +\begin{verbatim} +\definespotcolor{foolab}{BarTone 888 LB}[alt=lab]{50, -30, -40} +\end{verbatim} +the result is \showclr{foolab}. An example of tint is +\verb|\color{foolab!30}| (\showclr{foolab!30}). +\end{example} + +\begin{warning} + The package does not warn if the color falls outside the gamut of + the CMYK space or if the color is not visible. To put it in + other words, you should not just write some arbitrary values to see + what happens. +\end{warning} + +\begin{warning} + This model is not available in \textsf{xcolor}. If you need some + transformation, you must resort to an external tool like + \textsf{transicc} (or \textsf{icctrans}) included in Little + CMS\footnote{\texttt{http://www.littlecms.com/1/downloads.htm}}. +\end{warning} + +\begin{warning} + There is no default illuminant -- it must be set if Lab colors are + defined. +\end{warning} + +\begin{note} + The observer is currently only 2$^\circ$ (1931). +\end{note} + +The Lab space allows to define colors accurately, but there is a price +to pay -- mixing Lab colors is not in general possible except after +converting them somehow to CMYK or RGB.\footnote{There are no simple +rules to carry out those transformations, which, I think, explains why +\textsf{xcolor} does not support Lab at all}. Since currently mixing +colors in this package is based on CMYK, you must provide an alternate +value as shown, if mixed inks are required\footnote{Internally, and +in PDF jargon, Lab is the ``alternate space'' and ``tints transforms'' +are based on CMYK}: \begin{verbatim} -\definespotcolor{foo}{BarTone 555 GN}[rgb]{.5, .4, .3} +\definespotcolor{foolab}{BarTone 888 LB}[alt=lab]{50, -30, -40/1, .20, .15, .07} \end{verbatim} -To change the color space for a page and the subsequent ones, you can -set something like: -\begin{verbatim} -\pagecolorspace{name1,name2,name3} -\end{verbatim} -(It can be empty.) To return to the default color space, which -contains all the defined spot colors, use \verb|\resetpagecolorspace|. -Use this macro with care, because of the asynchronous nature of \TeX{} --- remember it affects the whole current page. - \section{Mixing spot colors} To mix spot colors you must first declare a color space (or model) -including them. This is done with something like: +including them. This is done with the following macro: + +\begin{decl} + |\definecolorspace{<latex-name>}{mixed}{<color-list>}| +\end{decl} + +Here, |<latex-name>| is the name to be used in |\color| and the +like as the color model. The second argument is the string |mixed|, +and the last one is a list of up to 4 colors, either defined with +\textsf{xcolor} using the CMYK model or spot. + +\begin{example} + A simple and typical usage would be for shades: \begin{verbatim} -\definecolorspace{name}{mixed}{color1,color2,color3} +\definecolorspace{fooshaded}{mixed}{foo,black} \end{verbatim} -(The second argument is the type of color space.) For example, if we -have two spot colors named \verb|spot1| and \verb|spot2|, and we want -in addition yellow: + Then, you can define a color in this new model named + \verb|fooshaded| with: \begin{verbatim} -\definecolorspace{spot12y}{mixed}{spot1,spot2,yellow} +\definecolor{darkfoo}{fooshaded}{.6,.3} \end{verbatim} -A typical usage, for shades, would be: +Or set it with: \begin{verbatim} -\definecolorspace{shaded1}{mixed}{spot1,black} +\color[fooshaded]{.6,.3} \end{verbatim} +In both cases, the mix is 60\% \verb|foo| and 30\% \verb|black|. +\end{example} -Due to internal limitations of \textsf{xcolor}, no more than four -colors are allowed. The alternate color space in the PDF file is that -of the spot colors (which means currently it is CMYK). +\begin{example} + If we have two spot colors named \verb|spot1| and \verb|spot2|, and + we want in addition yellow: +\begin{verbatim} +\definecolorspace{mix12y}{mixed}{spot1,spot2,yellow} +\end{verbatim} +To define a new color based on this space: +\begin{verbatim} +\definecolor{mix12y}{mix12y}{.5,.4,.6} +\end{verbatim} +And to set it: +\begin{verbatim} +\color[mix12y]{.5,.4,.6} +\end{verbatim} +\end{example} -Then, you can define a color with: +\begin{example} +Here is a duotone mixing the \verb|foob| and \verb|foolab| colors defined above: \begin{verbatim} -\definecolor{mix12y}{spot12y}{.5,.4,.6} -\definecolor{sh1}{shaded1}{.6,.3} +\definecolorspace{labshaded}{mixed}{foolab,foob} \end{verbatim} -or set it with +The colors corresponding to: \begin{verbatim} -\color[spot12y]{.5,.4,.3} -\color[shaded1]{.6,.3} +\color[labshaded]{1,0} \color[labshaded]{.8,.2} +\color[labshaded]{.6,.4} \color[labshaded]{.4,.6} +\color[labshaded]{.2,.8} \color[labshaded]{0,1} \end{verbatim} -As in spot colors, the only operation allowed is \verb|!| for tints -(ie, \verb|color!num|). But there is an easy trick to mix colors with -\verb|!| and \verb|color,num| -- just define an ortogonal set of -colors based on the new color model: +are \showclr[labshaded]{1,0} \showclr[labshaded]{.8,.2} + \showclr[labshaded]{.6,.4} \showclr[labshaded]{.4,.6} + \showclr[labshaded]{.2,.8} \showclr[labshaded]{0,1} +\end{example} + +\begin{warning} + Due to internal limitations of \textsf{xcolor}, no more than four + colors are allowed. +\end{warning} + +\begin{note} + The alternate color space in the PDF file is that of the spot colors + (which means currently it is CMYK). +\end{note} + +\begin{note} + There is an easy trick to mix colors with \verb|!| and + \verb|color,num| -- just define an ortogonal set of colors based on + the new color model: \begin{verbatim} -\definecolor{xspot1}{spot12y}{1,0,0} -\definecolor{xspot2}{spot12y}{0,1,0} -\definecolor{xyellow}{spot12y}{0,0,1} +\definecolor{xspot1}{mix12y}{1,0,0} +\definecolor{xspot2}{mix12y}{0,1,0} +\definecolor{xyellow}{mix12y}{0,0,1} \end{verbatim} -and then you can say: + and then you can say: \begin{verbatim} \color{xspot1!30!xspot2!40!xyellow} -\color{spot12y:xspot1,3;xspot2,2;xyellow,1} +\color{mix12y:xspot1,3;xspot2,2;xyellow,1} \end{verbatim} -Of course, it is just a trick and a better and direct interface is -under study. + Of course, it is just a trick and a better and direct interface is + under study (none of those provided by \textsf{xcolor} fits well + with the new |mixed| models). +\end{note} + +\begin{warning} + Mixing colors in \verb|\color|, \verb|\definecolor| and the like + from diferent spaces can lead to unexpected results (currently no + checking is done). +\end{warning} + +Color series (see the \textsf{xcolor} documentation) are also +partially supported. For example: +\begin{verbatim} +\definecolorseries{test}{mix12y}{grad}[mix12y]{.95,.85,.55}{3,11,17} +\definecolorseries{test}{mix12y}{last}{xyellow!50}{xspotA} +\end{verbatim} + +\ifcolorspace +\begin{example} + Here is a example with some of the described techniques, based on + the |fooshaded| space defined above (figure 1 shows the |foo| + plate): + +\begin{verbatim} +\definecolor{sfoo}{fooshaded}{1,0} +\definecolor{sblack}{fooshaded}{0,1} +\definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack} +\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}} +\resetcolorseries[8]{shseries} +\begin{tabular}{cccccccc} + 0 \testclr{shseries!!+} & + 1 \testclr{shseries!!+} & + 2 \testclr{shseries!!+} & + 3 \testclr{shseries!!+} & + 4 \testclr{shseries!!+} & + 5 \testclr{shseries!!+} & + 6 \testclr{shseries!!+} & + 7 \testclr{shseries!!+} +\end{tabular} +\end{verbatim} + +\begingroup +\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}} +\resetcolorseries[8]{shseries} +\begin{tabular}{cccccccc} + 0 \testclr{shseries!!+} & + 1 \testclr{shseries!!+} & + 2 \testclr{shseries!!+} & + 3 \testclr{shseries!!+} & + 4 \testclr{shseries!!+} & + 5 \testclr{shseries!!+} & + 6 \testclr{shseries!!+} & + 7 \testclr{shseries!!+} +\end{tabular} +\endgroup +\end{example} +\fi + +\begin{figure} +\fbox{\includegraphics[width=\linewidth]{colorspaceshade.png}} +\caption{Plate for the \texttt{foo} spot color as shown by Adobe +Acrobat. Note both \texttt{foob} and \texttt{foolab}, +defined in this document, are listed, too.} +\end{figure} + +\section{Page color spaces} + +Each PDF page must know which colors will be used (other than the +predefined CMYK, RGB and Gray). By default, \textsf{colorspace} turns +on for every page all newly defined colors, and that will be fine in +most cases. However, you may want to set explicitly the list (for +covers or plates). Use this feature with care, because (1) the +asynchronous nature of \TeX{} (remember it affects the whole current +page), and (2) each distinct color list creates a PDF resource. + +\begin{decl} +|\pagecolorspace{<color-list>}|\\ +|\resetpagecolorspace| +\end{decl} -Color series are also partially supported. For example: +To change the color space for a page and the subsequent ones, you can +set something like: \begin{verbatim} -\definecolorseries{test}{spot12y}{grad}[spot12y]{.95,.85,.55}{3,11,17} -\definecolorseries{test}{spot12y}{last}{xyellow!50}{xspotA} +\pagecolorspace{name1,name2,name3} \end{verbatim} +(It can be empty.) To return to the default color space, which +contains all the defined spot colors, use \verb|\resetpagecolorspace|. -(The key is not to mix the new model with other color models.) - -\section{ICC Based spaces} +\section{ICC based spaces} +\begin{decl} + |\definecolorspace*{<latex-name>}{iccbased}{<icc-file>}| +\end{decl} The starred version \verb|\definecolorspace*| does not define a new color model, but sets the behaviour of the three basic color spaces -(\verb|cmyk|, \verb|rgb| and \verb|gray|). When belonging to the same -space, the last one for that space takes precedence. It cannot be used -to define new colors or set them. Currently, only a type is supported -- -\verb|iccbased|. For example, +(CMYK, RGB and Gray). When belonging to the same space, the last +definition for that space takes precedence and it is considered the +default one. It cannot be used to define new colors or set +them. Currently, only a type is supported -- \verb|iccbased|. For +example, \begin{verbatim} \definecolorspace*{sRGB}{iccbased}{sRGB Profile.icc} \end{verbatim} -The space it applies to is read from the ICC profile. The name can be -used in \verb|\pagecolorspace| (and must, if you want it to be -active). Alternatively, there are 3 reserved names: \verb|*rgb|, -\verb|*gray|, \verb|*cmyk|, which stand for the current default -spaces. The former are not set by \verb|\resetpagecolorspace|, but the -starred named are. - -Note those ICC spaces does not go to the output intent dictionary (see -the \textsf{pdfx} package). The latter, as the PDF reference explains, -supplements rather than replaces the ICC profiles in a default color -space. +The space it applies to is read from the ICC profile. + +The name can be used in \verb|\pagecolorspace|. Alternatively, there +are 3 reserved names: \verb|*rgb|, \verb|*gray|, \verb|*cmyk|, which +stand for the last-defined, default ICC based spaces. Named ICC based +spaces are not set by \verb|\resetpagecolorspace|, but the starred +named are. On the other hand, the starred names are not set +automatically by |\pagecolorspace|, and you must set them explicitly +if you want them to be active. + +\begin{note} + Those ICC spaces do not go to the output intent dictionary (see + the \textsf{pdfx} package). The latter, as the PDF reference + explains, supplements rather than replaces the ICC profiles in a + default color space. +\end{note} + +\begin{example} + Given the following declarations: +\begin{verbatim} +\definecolorspace*{sRGB}{iccbased}{sRGB Profile.icc} +\definecolorspace*{colormatch}{ColorMatchRGB.icc} +\end{verbatim} + and remembering the RGB space is always active (like the CMYK and + Gray ones), +\begin{verbatim} +\pagecolorspace{} +\end{verbatim} +leaves the RGB space unprofiled; +\begin{verbatim} +\pagecolorspace{sRGB} +\end{verbatim} +sets the RGB space to sRGB; while the following are (in this +particular example) equivalent: +\begin{verbatim} +\pagecolorspace{colormatch} +\pagecolorspace{*rgb} +\resetpagecolorspace +\end{verbatim} + + +\end{example} \section{Overprinting} -This is usually a pre-print task, but by setting it in the document you -will get a better idea of how the colors are actually -overlapped. However, remember the effect produced is device-dependent, -and colorant overprint decisions should be made at output time -(according to the PDF reference). +This is usually a pre-print task, but by setting it in the document +you will get a better idea of how the colors are actually overlapped +in soft proofing. However, remember the effect produced is +device-dependent, and colorant overprint decisions should be made at +output time (according to the PDF reference). Very often, it is set for the whole document with the package options \verb|knockout| (no overprint), and \verb|overprint|. By default, the @@ -204,6 +536,17 @@ Since the color stack is used, pdf\TeX{} $\ge$ 1.40 is required. +\begin{warning} + Some PDF viewers ignore this setting. +\end{warning} + +\section{Version} + +1.1.1. No new features. Just internal changes related to +\textsc{luatex} and new manual. + +1.2.0. CIE LAB spot colors and |illuminant|. Manual rewritten. + \end{document} Binary files old/doc/latex/colorspace/colorspaceshade.png and new/doc/latex/colorspace/colorspaceshade.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorspace.doc.tlpobj new/tlpkg/tlpobj/colorspace.doc.tlpobj --- old/tlpkg/tlpobj/colorspace.doc.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colorspace.doc.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -1,9 +1,10 @@ name colorspace.doc category Package -revision 37573 +revision 42228 shortdesc doc files of colorspace relocated 1 -docfiles size=29 +docfiles size=35 RELOC/doc/latex/colorspace/README RELOC/doc/latex/colorspace/colorspace.pdf RELOC/doc/latex/colorspace/colorspace.tex + RELOC/doc/latex/colorspace/colorspaceshade.png ++++++ colorspace.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/colorspace/colorspace.sty new/tex/latex/colorspace/colorspace.sty --- old/tex/latex/colorspace/colorspace.sty 2015-06-16 23:22:12.000000000 +0200 +++ new/tex/latex/colorspace/colorspace.sty 2016-11-25 19:33:45.000000000 +0100 @@ -2,9 +2,9 @@ % | Typeset colorspace.tex to get the documentation. | % +--------------------------------------------------+ % -%% Copyright (C) 2015 Javier Bezos +%% Copyright (C) 2015-2016 Javier Bezos %% All Rights Reserved -%% http://www.tex-tipografia.com +%% http://www.texnia.com %% %% This work may be distributed and/or modified under the conditions %% of the LaTeX Project Public License, either version 1.3 of this @@ -21,7 +21,8 @@ %% This work consists of the files colorspace.tex and colorspace.sty. \ProvidesPackage{colorspace} - [2015/06/01 v1.1.0 PDF color spaces (spot colors...) for pdfTeX] + [2016/10/05 v1.2.0 PDF color spaces (spot colors...) for + pdftex and luatex] \edef\spc@savedcatcodes{% \catcode`\noexpand\/=\the\catcode`\/ @@ -33,6 +34,22 @@ \catcode`\<=12 \catcode`\&=11 % we use it in macro names +% pdftex vs luatex compatibility + +\ifx\pdfextension\@undefined + \let\spc@Pageresources\pdfpageresources + \let\spc@Obj\pdfobj + \let\spc@Lastobj\pdflastobj + \let\spc@Colorstack\pdfcolorstack + \let\spc@Colorstackinit\pdfcolorstackinit +\else + \edef\spc@Pageresources{\pdfvariable pageresources} + \protected\def\spc@Obj{\pdfextension obj } + \protected\def\spc@Lastobj{\numexpr\pdffeedback lastobj\relax} + \protected\def\spc@Colorstack{\pdfextension colorstack} + \def\spc@Colorstackinit{\pdffeedback colorstackinit} +\fi + \def\spc@unknown#1#2{% \@ifundefined{#1}% {\PackageError{colorspace}{Unknown #2}% @@ -111,6 +128,25 @@ \newcommand\definespotcolor[2]{\protected@edef\spc@tempa{{#1}{#2}}\spc@defsc} \newcommand\spc@defsc[2][cmyk]{\expandafter\spc@defsc@i\spc@tempa{#1}{#2}} + +\def\spc@splitbar#1#2#3/#4\@nil{% + \def#1{#3}% + \def#2{#4}} + +\let\spc@lab@values\relax + +\@namedef{spc@opt@alt=lab}#1{% + \@expandtwoargs\in@{/}{#1}% + \ifin@ + \spc@splitbar\spc@lab@values\spc@the@cmyk#1\@nil + \else + \def\spc@lab@values{#1}% + \def\spc@the@cmyk{0,0,0,0}% dummy + \fi + \def\spc@tempd##1,{% comma -> space + \ifx\@empty##1\else##1 \expandafter\spc@tempd\fi}% + \edef\spc@lab@values{\expandafter\spc@tempd\spc@lab@values,\@empty,}} + \def\spc@defsc@i#1#2#3#4{% \def\spc@tempc##1 ##2{% Converts spaces to #20 ##1% @@ -126,13 +162,24 @@ {This spot name was taken by `##2'.}% \fi} \spc@csall - \definecolor{#1}{cmyk:#3}{#4}% internally always cmyk - \expandafter\spc@cmyktospot{#1}\spc@tempb % Convert from cmyk to spot - \immediate\pdfobj{[ /Separation /\spc@tempb\space - /DeviceCMYK << /FunctionType 2 /Domain [0 1] - /C0 [0 0 0 0] /C1 [\spc@tempa] /N 1 >> ]}% pdf separation + \@ifundefined{spc@opt@\zap@space#3 \@empty}% + {\definecolor{#1}{cmyk:#3}{#4}}% + {\@nameuse{spc@opt@\zap@space#3 \@empty}{#4}% + \definecolor{#1}{cmyk}{\spc@the@cmyk}}% + \expandafter\spc@cmyktospot{#1}\spc@tempb % Convert cmyk > spot + \ifx\spc@lab@values\relax + \immediate\spc@Obj{[ /Separation /\spc@tempb\space + /DeviceCMYK << /FunctionType 2 /Domain [0 1] + /C0 [0 0 0 0] /C1 [\spc@tempa] /N 1 >> ]}% pdf separation + \else + \immediate\spc@Obj{[ /Separation /\spc@tempb\space + \spc@illum@ref << /FunctionType 2 /Domain [0 1] + /Range[0 100 -128 127 -128 127] + /C0 [100 0 0] /C1 [\spc@lab@values] /N 1 >> ]}% pdf separation + \global\let\spc@lab@values\relax + \fi \expandafter\xdef\csname spc@ir@#1\endcsname{% - /&\spc@tempb\space\the\pdflastobj\space 0 R}% save ref to obj + /&\spc@tempb\space\the\spc@Lastobj\space 0 R}% save ref to obj \let\spc@elt\relax \xdef\spc@csall{\spc@csall\spc@elt2{#1}}} @@ -141,6 +188,23 @@ \resetpagecolorspace \fi} +% Options for illuminants: + +\def\spc@illum@obj#1{% + \immediate\spc@Obj{[ /Lab + << /WhitePoint [#1] /Range [-128 127 -128 127] >> ]}% + \xdef\spc@illum@ref{\the\spc@Lastobj\space 0 R }} + +% 1931, 2-degree observer. c is deprecated + +\DeclareOption{illuminant=a}{\spc@illum@obj{1.0985 1 0.3558}} +\DeclareOption{illuminant=c}{\spc@illum@obj{0.9807 1 1.1822}} +\DeclareOption{illuminant=e}{\spc@illum@obj{1 1 1}} +\DeclareOption{illuminant=d50}{\spc@illum@obj{0.9642 1 0.8251}} +\DeclareOption{illuminant=d55}{\spc@illum@obj{0.9568 1 0.9214}} +\DeclareOption{illuminant=d65}{\spc@illum@obj{0.9504 1 1.0888}} +\DeclareOption{illuminant=d75}{\spc@illum@obj{0.9497 1 1.2261}} + % Page color spaces. The arrays mapping the spot colors to the obj % refs are saved into the pdf as objects, and then we also save its % reference for later recovery. Well, \pdfpageresources is not @@ -161,7 +225,7 @@ \def\spc@pagecs#1{% \ifx\spc@currcs\@empty\else \edef\tempa{% - \noexpand\spc@remcs\the\pdfpageresources + \noexpand\spc@remcs\the\spc@Pageresources \noexpand\spc@remcs{\spc@currcs}}% \tempa \fi @@ -184,13 +248,13 @@ \fi}% \spc@csall % Uses \spc@elt \@ifundefined{spc@cs@\spc@tempc}% - {\immediate\pdfobj{<< \spc@tempb>>}% - \expandafter\xdef\csname spc@cs@\spc@tempc\endcsname{\the\pdflastobj}}% + {\immediate\spc@Obj{<< \spc@tempb>>}% + \expandafter\xdef\csname spc@cs@\spc@tempc\endcsname{\the\spc@Lastobj}}% {}% \expandafter\let\expandafter\spc@currcs\csname spc@cs@\spc@tempc\endcsname \ifx\spc@currcs\@empty\else - \edef\spc@tempa{\pdfpageresources{% - \the\pdfpageresources\space/ColorSpace \@nameuse{spc@cs@\spc@tempc} 0 R}}% + \edef\spc@tempa{\spc@Pageresources{% + \the\spc@Pageresources\space/ColorSpace \@nameuse{spc@cs@\spc@tempc} 0 R}}% \spc@tempa \fi} @@ -201,7 +265,7 @@ \def\spc@remcs#1\spc@remcs#2{% \def\spc@tempc##1 /ColorSpace #2 ##2 R##3\spc@tempc{% - \pdfpageresources{##1##3}}% + \spc@Pageresources{##1##3}}% \spc@tempc#1\spc@tempc} % Support for pgf (I hope--) @@ -321,6 +385,8 @@ {\spc@dflttrue\spc@defcs}% {\spc@dfltfalse\spc@defcs}} +\@onlypreamble\definecolorspace + \def\spc@defcs#1#2#3{% \@ifundefined{spc@defcs@#2}% {\spc@unknown{spc@defcs@#2}{color space type `#2'}}% @@ -389,7 +455,7 @@ \csname spc@ascmyk@\spc@tempa\endcsname\@@ \advance\@tempcntb-4\relax \fi}% - \immediate\pdfobj stream attr + \immediate\spc@Obj stream attr {/FunctionType 4 /Domain [ \spc@pdfdoms] /Range [ 0 1 0 1 0 1 0 1 ]}% @@ -400,11 +466,11 @@ \spc@@Pblack\spc@@black neg 1.0 add\spc@nl \the\numexpr4+\@tempcntb\relax\space 4 roll\spc@@pops \space\string}}% - \immediate\pdfobj{[ /DeviceN [\spc@pdfdevn\space] /DeviceCMYK - \the\pdflastobj\space0 R + \immediate\spc@Obj{[ /DeviceN [\spc@pdfdevn\space] /DeviceCMYK + \the\spc@Lastobj\space0 R << /Colorants <<\spc@pdfclrnts\space >> >> ]}% \expandafter\xdef\csname spc@ir@#1\endcsname{% - /\spc@name\space\the\pdflastobj\space 0 R}% save ref to obj + /\spc@name\space\the\spc@Lastobj\space 0 R}% save ref to obj \let\spc@elt\relax \xdef\spc@csall{\spc@csall\spc@elt2{#1}}% \xdef\spc@tempa{% @@ -414,7 +480,7 @@ \endgroup \spc@tempa} -% === ICC based dafault spaces === +% === ICC based default spaces === % luatex removed pdffiledump, so we use lua code. @@ -447,13 +513,13 @@ {\PackageError{colorspace}{Unsupported ICC space}% {Currently, only Gray, RGB and CMYK are supported}}% {\edef\spc@tempa{\@nameuse{spc@@\spc@tempa}}}% - \immediate\pdfobj + \immediate\spc@Obj stream attr {\ifcase\spc@tempa /N 1 /Alternate /DeviceGray\or /N 3 /Alternate /DeviceRGB\or /N 4 /Alternate /DeviceCMYK\fi}% file {#2}% - \immediate\pdfobj{[ /ICCBased \the\pdflastobj\space 0 R ]}% + \immediate\spc@Obj{[ /ICCBased \the\spc@Lastobj\space 0 R ]}% % to the default color list, add an intermediate name *<model> % (only once) containing the last setting (add also the % actual name with flag 1 instead of 2) @@ -462,10 +528,10 @@ {\xdef\spc@csall{\spc@csall\spc@elt2{*\spc@@spacelc}}}% {} % -- do nothing \expandafter\xdef\csname spc@ir@*\spc@@spacelc\endcsname{% - /Default\spc@@space\space\the\pdflastobj\space 0 R}% + /Default\spc@@space\space\the\spc@Lastobj\space 0 R}% \xdef\spc@csall{\spc@csall\spc@elt1{#1}}% \expandafter\xdef\csname spc@ir@#1\endcsname{% - /Default\spc@@space\space\the\pdflastobj\space 0 R}% + /Default\spc@@space\space\the\spc@Lastobj\space 0 R}% \endgroup} @@ -495,21 +561,21 @@ \newcommand\textoverprint[2][\spc@opm]{{\overprintstate{#1}#2}} -\immediate\pdfobj{<< /Type /ExtGState /op false /OP false >>}% -\edef\spc@tempa{/SPCko \the\pdflastobj\space 0 R }% -\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}% -\edef\spc@tempa{\spc@tempa/SPCmz \the\pdflastobj\space 0 R }% -\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}% -\edef\spc@tempa{\spc@tempa/SPCop \the\pdflastobj\space 0 R }% -\immediate\pdfobj{<< \spc@tempa>>}% -\edef\spc@tempa{\global\pdfpageresources{\the\pdfpageresources - \space /ExtGState \the\pdflastobj\space 0 R }} +\immediate\spc@Obj{<< /Type /ExtGState /op false /OP false >>}% +\edef\spc@tempa{/SPCko \the\spc@Lastobj\space 0 R }% +\immediate\spc@Obj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}% +\edef\spc@tempa{\spc@tempa/SPCmz \the\spc@Lastobj\space 0 R }% +\immediate\spc@Obj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}% +\edef\spc@tempa{\spc@tempa/SPCop \the\spc@Lastobj\space 0 R }% +\immediate\spc@Obj{<< \spc@tempa>>}% +\edef\spc@tempa{\global\spc@Pageresources{\the\spc@Pageresources + \space /ExtGState \the\spc@Lastobj\space 0 R }} \spc@tempa \def\spc@setop{% - \pdfcolorstack\spc@opstack push{\spc@getop}% + \spc@Colorstack\spc@opstack push{\spc@getop}% \aftergroup\spc@resetop} -\def\spc@resetop{\pdfcolorstack\spc@opstack pop\relax} +\def\spc@resetop{\spc@Colorstack\spc@opstack pop\relax} \def\spc@getop{% \ifcase\spc@op /SPCmz gs @@ -519,7 +585,7 @@ /SPCko gs \fi} -\chardef\spc@opstack\pdfcolorstackinit page direct{\spc@getop} +\chardef\spc@opstack\spc@Colorstackinit page direct{\spc@getop} \spc@savedcatcodes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorspace.tlpobj new/tlpkg/tlpobj/colorspace.tlpobj --- old/tlpkg/tlpobj/colorspace.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colorspace.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -1,6 +1,6 @@ name colorspace category Package -revision 37573 +revision 42228 shortdesc Provides PDF color spaces relocated 1 longdesc The package provides PDF color spaces. Currently, only spot @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/latex/colorspace/colorspace.sty catalogue-ctan /macros/latex/contrib/colorspace -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-11-16 07:47:52 +0100 catalogue-license lppl1.3 -catalogue-topics colour-supp -catalogue-version 1.1.0 +catalogue-topics colour +catalogue-version 1.2.0 ++++++ colortab.doc.tar.xz ++++++ ++++++ colortab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortab.tlpobj new/tlpkg/tlpobj/colortab.tlpobj --- old/tlpkg/tlpobj/colortab.tlpobj 2016-04-14 18:52:35.000000000 +0200 +++ new/tlpkg/tlpobj/colortab.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/generic/colortab/colortab.sty RELOC/tex/generic/colortab/colortab.tex catalogue-ctan /macros/generic/colortab -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics colour table catalogue-version 1.0 ++++++ colortbl.doc.tar.xz ++++++ ++++++ colortbl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortbl.tlpobj new/tlpkg/tlpobj/colortbl.tlpobj --- old/tlpkg/tlpobj/colortbl.tlpobj 2016-04-14 18:52:36.000000000 +0200 +++ new/tlpkg/tlpobj/colortbl.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/colortbl/colortbl.sty catalogue-also xcolor catalogue-ctan /macros/latex/contrib/colortbl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics colour table catalogue-version 1.0a ++++++ colorwav.doc.tar.xz ++++++ ++++++ colorwav.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorwav.tlpobj new/tlpkg/tlpobj/colorwav.tlpobj --- old/tlpkg/tlpobj/colorwav.tlpobj 2016-04-14 18:52:36.000000000 +0200 +++ new/tlpkg/tlpobj/colorwav.tlpobj 2017-04-14 17:36:11.000000000 +0200 @@ -6,11 +6,11 @@ longdesc The package allows the user to obtain an RGB value (suitable longdesc for use in the color package) from a wavelength of light. The longdesc default unit is nanometres, but other units may be used. Note -longdesc that this function is also available within the xcolor. +longdesc that this function is also available within xcolor. runfiles size=2 RELOC/tex/latex/colorwav/colorwav.sty catalogue-ctan /macros/latex/contrib/colorwav -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-11-16 07:52:38 +0100 catalogue-license lgpl -catalogue-topics colour-supp +catalogue-topics colour catalogue-version 1.0 ++++++ colorweb.doc.tar.xz ++++++ ++++++ colorweb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colorweb.tlpobj new/tlpkg/tlpobj/colorweb.tlpobj --- old/tlpkg/tlpobj/colorweb.tlpobj 2016-04-14 18:52:37.000000000 +0200 +++ new/tlpkg/tlpobj/colorweb.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=5 RELOC/tex/latex/colorweb/colorweb.sty catalogue-ctan /macros/latex/contrib/colorweb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics colour catalogue-version 1.3 ++++++ colourchange.doc.tar.xz ++++++ ++++++ colourchange.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colourchange.tlpobj new/tlpkg/tlpobj/colourchange.tlpobj --- old/tlpkg/tlpobj/colourchange.tlpobj 2016-04-14 18:52:38.000000000 +0200 +++ new/tlpkg/tlpobj/colourchange.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/colourchange/colourchange.sty catalogue-ctan /macros/latex/contrib/colourchange -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics presentation colour catalogue-version 1.22 ++++++ combelow.doc.tar.xz ++++++ ++++++ combelow.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combelow.tlpobj new/tlpkg/tlpobj/combelow.tlpobj --- old/tlpkg/tlpobj/combelow.tlpobj 2016-04-14 18:52:38.000000000 +0200 +++ new/tlpkg/tlpobj/combelow.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/combelow/combelow.sty catalogue-ctan /macros/latex/contrib/combelow -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics fake-glyph catalogue-version 0.99f ++++++ combine.doc.tar.xz ++++++ ++++++ combine.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combine.tlpobj new/tlpkg/tlpobj/combine.tlpobj --- old/tlpkg/tlpobj/combine.tlpobj 2016-04-14 18:52:38.000000000 +0200 +++ new/tlpkg/tlpobj/combine.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/combine/combnat.sty catalogue-also docmute includex newclude standalone catalogue-ctan /macros/latex/contrib/combine -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 0.7a ++++++ combinedgraphics.doc.tar.xz ++++++ ++++++ combinedgraphics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combinedgraphics.tlpobj new/tlpkg/tlpobj/combinedgraphics.tlpobj --- old/tlpkg/tlpobj/combinedgraphics.tlpobj 2016-04-14 18:52:39.000000000 +0200 +++ new/tlpkg/tlpobj/combinedgraphics.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -18,7 +18,7 @@ runfiles size=4 RELOC/tex/latex/combinedgraphics/combinedgraphics.sty catalogue-ctan /macros/latex/contrib/combinedgraphics -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics-supp catalogue-version 0.2.2 ++++++ comfortaa.doc.tar.xz ++++++ ++++++ comfortaa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comfortaa.tlpobj new/tlpkg/tlpobj/comfortaa.tlpobj --- old/tlpkg/tlpobj/comfortaa.tlpobj 2016-04-14 18:52:39.000000000 +0200 +++ new/tlpkg/tlpobj/comfortaa.tlpobj 2017-04-14 17:36:12.000000000 +0200 @@ -246,7 +246,7 @@ RELOC/tex/latex/comfortaa/ts1fco.fd RELOC/tex/latex/comfortaa/x2fco.fd catalogue-ctan /fonts/comfortaa -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-sans font-supp catalogue-version 2.3 ++++++ comicneue.doc.tar.xz ++++++ Binary files old/doc/latex/comicneue/comicneue.pdf and new/doc/latex/comicneue/comicneue.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comicneue/comicneue.tex new/doc/latex/comicneue/comicneue.tex --- old/doc/latex/comicneue/comicneue.tex 2015-07-04 00:04:02.000000000 +0200 +++ new/doc/latex/comicneue/comicneue.tex 2017-01-04 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -\documentclass[10pt,a4paper,english]{article} -\usepackage{geometry,metalogo,hyperref,babel,mdwlist,multicol,parskip} +\documentclass[10pt,a4paper,english,twocolumn]{article} +\usepackage{geometry,metalogo,hyperref,babel,mdwlist,parskip} \usepackage[default]{comicneue} \usepackage[scaled=.9]{sourcecodepro} @@ -15,11 +15,10 @@ } \author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}} -\date{Documentation for comicneue v1.0.\\ \today} -\listfiles +\date{Documentation for comicneue v1.1.\\ \today} + \begin{document} \maketitle -\begin{multicols}{2} This package provides the Comic Neue fonts in an easy to use way. For \XeLaTeX\ and \LuaLaTeX\ users the original OpenType fonts are used. The entire font family is included. @@ -66,17 +65,22 @@ \section{Version history} +\subsection*{1.1} +\begin{itemize*} + \item Joseph Wright: \cmd{sys\_if\_engine} replaces \cmd{pdftex\_if\_engine} (\href{https://github.com/silkeh/latex-raleway/pull/1}{pull request~\#1}). +\end{itemize*} + \subsection*{1.0} \begin{itemize*} \item Initial release with v2.2 of the fonts. \end{itemize*} -\end{multicols} - +\onecolumn \clearpage \section{Specimen} \label{sec:specimen} + \subsection{OpenType} \begin{figure}[ht] \centering @@ -92,4 +96,3 @@ This table can also be found in \file{comicneue-type1-specimen}. \end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comicneue.doc.tlpobj new/tlpkg/tlpobj/comicneue.doc.tlpobj --- old/tlpkg/tlpobj/comicneue.doc.tlpobj 2016-04-14 18:52:41.000000000 +0200 +++ new/tlpkg/tlpobj/comicneue.doc.tlpobj 2017-04-14 17:36:13.000000000 +0200 @@ -1,6 +1,6 @@ name comicneue.doc category Package -revision 37744 +revision 42851 shortdesc doc files of comicneue relocated 1 docfiles size=40 ++++++ comicneue.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/comicneue/comicneue.sty new/tex/latex/comicneue/comicneue.sty --- old/tex/latex/comicneue/comicneue.sty 2015-07-04 00:04:02.000000000 +0200 +++ new/tex/latex/comicneue/comicneue.sty 2017-01-04 00:01:12.000000000 +0100 @@ -10,11 +10,11 @@ \RequirePackage{ l3keys2e, xparse } \ProvidesExplClass {comicneue} - {2015/07/03} - {1.0} + {2017/01/03} + {1.1} {Craig Rozynski's Comic Neue fonts} -\pdftex_if_engine:F{ \bool_set_true:N \comicneue_otf } +\sys_if_engine_pdftex:F{ \bool_set_true:N \comicneue_otf } \tl_set:Nn \comicneue_scale {1} @@ -38,7 +38,7 @@ \bool_if:NTF \comicneue_otf { \RequirePackage{ fontspec } - + \bool_if:NTF \comicneue_light { \tl_set:Nn \comicneue_regstyle {Light} } { \tl_set:Nn \comicneue_regstyle {Regular} } @@ -53,14 +53,14 @@ Extension = .otf, BoldFont = *_Bold, BoldItalicFont = *_Bold_Oblique } - + \bool_if:NT \comicneue_sfdefault { \setsansfont [ UprightFont = *_\comicneue_regstyle, ItalicFont = *_\comicneue_regstyle _Oblique ] {ComicNeue\comicneue_style} } - + \newfontfamily \comicneue [ UprightFont = *_Regular, ItalicFont = *_Regular_Oblique ] @@ -70,7 +70,7 @@ [ UprightFont = *_Light, ItalicFont = *_Light_Oblique ] {ComicNeue} - + \newfontfamily \comicneueangular [ UprightFont = *_Regular, ItalicFont = *_Regular_Oblique ] @@ -96,20 +96,20 @@ \bool_if:NT \comicneue_sfdefault { \tl_set:Nn \sfdefault {ComicNeue\comicneue_style-TLF} } - + \bool_if:NT \comicneue_default { \tl_set:Nx \seriesdefault{\mdseries@sf} } \NewDocumentCommand \comicneue {} { \fontfamily{ComicNeue-TLF}\selectfont } - + \NewDocumentCommand \comicneuelight {} { \fontfamily{ComicNeue-TLF}\fontseries{l}\selectfont } - + \NewDocumentCommand \comicneueangular {} { \fontfamily{ComicNeueAngular-TLF}\selectfont } - - \NewDocumentCommand \comicneueangularlight {} + + \NewDocumentCommand \comicneueangularlight {} { \fontfamily{ComicNeueAngular-TLF}\fontseries{l}\selectfont } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comicneue.tlpobj new/tlpkg/tlpobj/comicneue.tlpobj --- old/tlpkg/tlpobj/comicneue.tlpobj 2016-04-14 18:52:41.000000000 +0200 +++ new/tlpkg/tlpobj/comicneue.tlpobj 2017-04-14 17:36:13.000000000 +0200 @@ -1,6 +1,6 @@ name comicneue category Package -revision 37744 +revision 42851 shortdesc Use Comic Neue with TeX(-alike) systems relocated 1 longdesc Comic Neue is a well-known redesign of the (in)famous Comic @@ -243,7 +243,7 @@ RELOC/tex/latex/comicneue/TS1ComicNeueAngular-TLF.fd RELOC/tex/latex/comicneue/comicneue.sty catalogue-ctan /fonts/comicneue -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-03 14:41:44 +0100 catalogue-license ofl catalogue-topics font font-otf font-supp font-type1 -catalogue-version 1.0 +catalogue-version 1.1 ++++++ comma.doc.tar.xz ++++++ ++++++ comma.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comma.tlpobj new/tlpkg/tlpobj/comma.tlpobj --- old/tlpkg/tlpobj/comma.tlpobj 2016-04-14 18:52:42.000000000 +0200 +++ new/tlpkg/tlpobj/comma.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/comma/comma.sty catalogue-ctan /macros/latex/contrib/comma -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.2 ++++++ commado.doc.tar.xz ++++++ ++++++ commado.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/commado.tlpobj new/tlpkg/tlpobj/commado.tlpobj --- old/tlpkg/tlpobj/commado.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/commado.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -20,7 +20,7 @@ RELOC/tex/generic/commado/filesdo.sty catalogue-also loops catalogue-ctan /macros/generic/commado -catalogue-date 2015-11-16 11:38:48 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version r0.11a ++++++ commath.doc.tar.xz ++++++ ++++++ commath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/commath.tlpobj new/tlpkg/tlpobj/commath.tlpobj --- old/tlpkg/tlpobj/commath.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/commath.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/commath/commath.sty catalogue-ctan /macros/latex/contrib/commath -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 0.3 ++++++ comment.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/Makefile new/doc/latex/comment/Makefile --- old/doc/latex/comment/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/Makefile 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,6 @@ +info : + @echo "there is nothing to make here" +clean : + @/bin/rm -f *~ *.{aux,log,out} *.cut +zip : clean + @cd .. ; zip comment.zip comment/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/README new/doc/latex/comment/README --- old/doc/latex/comment/README 2010-02-23 01:21:51.000000000 +0100 +++ new/doc/latex/comment/README 2016-11-25 19:28:27.000000000 +0100 @@ -1,3 +1,7 @@ -files: -comment.sty -- the latest version (August 1998) -comm_latest.tex -- a LaTeX test file for comment.sty +Files: +- comment.sty : LaTeX comment style +- comment_plain.tex : plain TeX version, no longer maintained +- comment.{tex,pdf} : description of how the style works + +- comm_test.tex : illustrative test +- t1test.tex : test of T1 non-ascii characters diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_bug.tex new/doc/latex/comment/comm_bug.tex --- old/doc/latex/comment/comm_bug.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/comm_bug.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,32 @@ +\documentclass[12pt]{article} + +\usepackage{comment} +\excludecomment{conditional} + +\specialcomment{redcomment}{\begingroup\em\Large}{\endgroup\tiny} + +\begin{document} + +plain text. + +\newcommand{\Redcomment}[1]{Original Definition. (#1).} + +\begin{conditional} +Conditional Text. + +More Conditional Text in next paragraph. + +\renewcommand{\Redcomment}[1]{Redefinition Worked! (#1).} +\end{conditional} + +\begin{redcomment} +the first redcomment paragraph. + +the second redcomment paragraph. +\end{redcomment} + +Because redcomment has ended, this should be tiny. + +\Redcomment{This is the command line version.} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_latest.tex new/doc/latex/comment/comm_latest.tex --- old/doc/latex/comment/comm_latest.tex 2010-02-23 01:21:51.000000000 +0100 +++ new/doc/latex/comment/comm_latest.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ -% An illustration of comment.sty by Victor Eijkhout, -% version 3.4 and later. -% -% For use with LaTeX2.09, and LaTeX2e in compatibility mode. -% -\documentstyle{article} -\begin{document} - -\input comment.sty - -\includecomment{thisone} -\excludecomment{notthisone} - -This sentence -\begin{comment} -has -\end{comment} -no verb. - -Check for\begin{notthisone} -superfluous -\end{notthisone} -spaces (there should be none between `for' and `spaces'), -and around -\begin{thisone} -inclusion -\end{thisone} -of proper texts (one space between `around' and `inclusion', -and one between `inclusion' and `of'). - -Als check for -\begin{thisone} -multiple paragraphs. - -Such as -\end{thisone} -here. (`Such as' should be a new paragraph.) - -% a test of the special comments -\specialcomment{smallfry}{\begingroup\rmfamily\footnotesize}{\endgroup} -%\tracingmacros=2 \tracingcommands=2 -This text is -\begin{smallfry} -rather small -\end{smallfry} -don't you think? (The `rather small' should be footnotesize.) - -And now we disable -\excludecomment{smallfry} -\begin{smallfry} -the special comment -\end{smallfry} -environment -(in between `disable' and `environment' is some excluded material). - -% test of weird grouping -We switch to -\begin{thisone} -\bf bold face -\end{thisone} -inside \rm a comment. (The phrase `bold face inside' should be bold.) - -\newcount\comlines -\processcomment{countedcomment} - {\comlines=0\relax - \def\ThisComment##1{\global\advance\comlines1\relax}} - {}{**Comment: \number\comlines\ line(s) removed**} - -This is a line of text -\begin{countedcomment} -Oneline -\end{countedcomment} -another line of text -\begin{countedcomment} -One line -Two line -Three line -\end{countedcomment} -last line of text. - -\end{document} Binary files old/doc/latex/comment/comm_test.pdf and new/doc/latex/comment/comm_test.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test.tex new/doc/latex/comment/comm_test.tex --- old/doc/latex/comment/comm_test.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/comm_test.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,97 @@ +% An illustration of comment.sty by Victor Eijkhout, +% version 3.4 and later. +% +\documentclass{article} + +\usepackage{comment} + +\begin{document} + +\includecomment{thisone} +\excludecomment{notthisone} + +This sentence +\begin{comment} +has +\end{comment} +no verb. + +Check for\begin{notthisone} +superfluous +\end{notthisone} +spaces (there should be none between `for' and `spaces'), +and around +\begin{thisone} +inclusion +\end{thisone} +of proper texts (one space between `around' and `inclusion', +and one between `inclusion' and `of'). + +Als check for +\begin{thisone} +multiple paragraphs. + +Such as +\end{thisone} +here. (`Such as' should be a new paragraph.) + +% a test of the special comments +\specialcomment{smallfry}{\begingroup\rmfamily\footnotesize}{\endgroup} +%\tracingmacros=2 \tracingcommands=2 +This text is +\begin{smallfry} +rather small +\end{smallfry} +don't you think? (The `rather small' should be footnotesize.) + +And now we disable +\excludecomment{smallfry} +\begin{smallfry} +the special comment +\end{smallfry} +environment +(in between `disable' and `environment' is some excluded material). + +% test of weird grouping +We switch to +\begin{thisone} +\bf bold face +\end{thisone} +inside \rm a comment. (The phrase `bold face inside' should be bold.) + +\newcount\comlines +\specialcomment{countedcomment} + {\comlines=0\relax \def\ProcessCutFile{}% + \def\ThisComment##1{\global\advance\comlines1\relax}} + {**Comment: \number\comlines\ line(s) removed**} + +This is a line of text +\begin{countedcomment} +Oneline +\end{countedcomment} +another line of text +\begin{countedcomment} +One line +Two line +Three line +\end{countedcomment} +last line of text. + +\specialcomment + {underlinecomment} + {% + \def\ProcessCutFile{\input{\CommentCutFile}\relax}% Bug! this + % should not be necessary. + \def\ThisComment##1{\WriteCommentLine{u: \underline{##1}\par}} + \par + } + {\par} + +A block of two underlined lines in between this line +\begin{underlinecomment} +line 1 +line 2 +\end{underlinecomment} +and before this line. + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test_ivo.tex new/doc/latex/comment/comm_test_ivo.tex --- old/doc/latex/comment/comm_test_ivo.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/comm_test_ivo.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,32 @@ +\documentclass[12pt]{article} + +\usepackage{comment} +\excludecomment{conditional} + +\specialcomment{redcomment}{\em\Large}{\tiny} + +\begin{document} + +plain text. + +\newcommand{\Redcomment}[1]{Original Definition. (#1).} + +\begin{conditional} +Conditional Text. + +More Conditional Text in next paragraph. + +\renewcommand{\Redcomment}[1]{Redefinition Worked! (#1).} +\end{conditional} + +\begin{redcomment} +the first redcomment paragraph. + +the second redcomment paragraph. +\end{redcomment} + +Because redcomment has ended, this should be tiny. + +\Redcomment{This is the command line version.} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comm_test_l.tex new/doc/latex/comment/comm_test_l.tex --- old/doc/latex/comment/comm_test_l.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/comm_test_l.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,78 @@ +% An illustration of comment.sty by Victor Eijkhout. +% This file belongs to comment.sty version 3.0 or later, +% it is meant to be used with LaTeX + +\documentstyle[comment]{article} +\begin{document} + +\excludecomment{begone} + +\includecomment{thisone} +\excludecomment{notthisone} + +% under development \leveledcomment{maybethis}{1} + +\parskip=20pt +This sentence +\begin{comment} +has +\end{comment} +no verb. + +Check for\begin{notthisone} +superfluous +\end{notthisone} +spaces, and +\begin{thisone} +inclusion +\end{thisone} +of proper texts. + +% a test of the special comments +\newcount\comlines +\processcomment{countedcomment} + {\comlines=0\relax + \def\ThisComment##1{\global\advance\comlines1\relax}} + {}{\endgraf **Comment: \number\comlines\ line(s) removed**\endgraf} + +This is a line of text +\begin{countedcomment} +Oneline +\end{countedcomment} +another line of text +\begin{countedcomment} +One line +Two line +Three line +\end{countedcomment} +last line of text + +Let's test paragraphs: +\begin{notthisone} +This one is missing. + +As is this one. +\end{notthisone} +For starters. + +On the other hand: +\begin{thisone} +This is one is present. + +As is this one. +\end{thisone} +And that's it. + +\begin{comment} % future project +\maybethis 0 +Level zero. +\endmaybethis +\maybethis 1 +Level one. +\endmaybethis +\maybethis 2 +Level two. +\endmaybethis +\end{comment} + +\end{document} Binary files old/doc/latex/comment/comment.pdf and new/doc/latex/comment/comment.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comment.tex new/doc/latex/comment/comment.tex --- old/doc/latex/comment/comment.tex 2010-02-23 01:21:51.000000000 +0100 +++ new/doc/latex/comment/comment.tex 2016-11-25 19:28:27.000000000 +0100 @@ -1,4 +1,4 @@ -\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{scrartcl} +\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{artikel3}%{scrartcl} \usepackage{fixltx2e} \usepackage{etex} @@ -27,11 +27,12 @@ \newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle} \newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}} -\addtokomafont{title}{\rmfamily} +%\addtokomafont{title}{\rmfamily} -\title{The \pkg{comment} package\thanks{This manual corresponds to \pkg{comment}~v3.6, dated~October 1999.}} -\author{Victor Eijkhout\\\mail{victor(a)eijkhout.net}} -\date{October 1999} +\title{The \pkg{comment} package\thanks{This manual corresponds to + \pkg{comment}~v3.8 of July 2016.}} +% +\author{Victor Eijkhout\\\mail{victor(a)eijkhout.net}} \date{August 2016} \begin{document} @@ -40,27 +41,25 @@ \section{Purpose:} -selectively in/exclude pieces of text: the user can define new +Selectively in/exclude pieces of text: the user can define new comment versions, and each is controlled separately. Special comments can be defined where the user specifies the action that is to be taken with each comment line. -This style can be used with plain \TeX\ or \LaTeX, and probably -most other packages too. +Plain \TeX\ support has been phased out. +As of 3.8 the package will increasingly use e\TeX\ features, for +instance to solve Unicode support issues. \section{Usage:} +The `\env{comment}' environment is defined by default: all text included between % \begin{verbatim} -\comment ... \endcomment -\end{verbatim} -% -or -% -\begin{verbatim} -\begin{comment} ... \end{comment} +\begin{comment} + ... +\end{comment} \end{verbatim} % is discarded. @@ -81,27 +80,32 @@ These environments are used as % \begin{verbatim} -\versiona ... \endversiona -\end{verbatim} -% -or -% -\begin{verbatim} -\begin{versiona} ... \end{versiona} +\begin{versiona} + ... +\end{versiona} \end{verbatim} % with the opening and closing commands again on a line of their own. -\pagebreak[1] - -\LaTeX\ users note: for an included comment, the +Note: for an included comment, the \cmd{\begin} and \cmd{\end} lines act as if they don't exist. In particular, they don't imply grouping, so assignments \&c are not local. -\pagebreak[2] +Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+): +% +\begin{verbatim} +\includecomment{cond} +\newcommand{\maybe}[1]{} +\begin{cond} +\renewcommand{\maybe}[1]{#1} +\end{cond} +\end{verbatim} +\section{Special comments} + +It is possible to make highly customized versions of the comment environment. Special comments are defined as % \begin{noverb} @@ -111,63 +115,131 @@ where the second and third arguments are executed before and after each comment block. You can use this for global formatting commands. + To keep definitions \&c local, you can include \cmd{\begingroup} in the `\meta{before commands}' and \cmd{\endgroup} in the `\meta{after commands}'. -ex: + +Example: % \begin{verbatim} \specialcomment{smalltt} {\begingroup\ttfamily\footnotesize}{\endgroup} \end{verbatim} % -You do \emph{not} have to do an additional -% +Special comments are automatically included. + +The comment environments use two auxiliary commands. You can get +nifty special effects by redefining them. + +\subsection{The cutfile} + +The commented text is written to an external file, the `cutfile'. Default definition: \begin{verbatim} -\includecomment{smalltt} + \def\CommentCutFile{comment.cut} \end{verbatim} -% -To remove `\env{smalltt}' blocks, give \verb+\excludecomment{smalltt}+ -after the definition. -Processing comments can apply processing to each line. -% -\begin{noverb} -\cmd{\processcomment}\marg{name}\marg{each-line commands}\marg{before commands}\marg{after commands} -\end{noverb} -% -By defining a control sequence -% +Included comments are processed like this: \begin{verbatim} -\def\Thiscomment##1{...} + \def\ProcessCutFile{\input{\CommentCutFile}\relax} +\end{verbatim} + and excluded files have +\begin{verbatim} + \def\ProcessCutFile{} +\end{verbatim} + +\begin{itemize} +\item By redefining the name of the cutfile, the value of the macro + \cmd{CommentCutFile}, it becomes possible to have nested comment environments. +\item If you are writing a textbook, you could have the answers to + exercises in your source, but write them to file rather than + formatting them: +\begin{verbatim} +\generalcomment{answer} + {\begingroup + \edef\tmp{\def\noexpand\CommentCutFile + {answers/\chapshortname-an\noexpand\arabic{excounter}.tex}}\tmp + \def\ProcessCutFile{}} + {\ifIncludeAnswers \begin{quote} + \leavevmode + \hbox{\kern-\unitindent + \textbf Solution to exercise \arabic{chapter}.\arabic{excounter}.\hspace{1em}}% + \ignorespaces\it + \input{\CommentCutFile} + \end{quote}\fi + \endgroup} +\end{verbatim} +\end{itemize} + +\subsection{Comment inclusion} + +The inclusion of the comment is done +by \cmd{\ProcessCutFile}, so you can redefine that: +\begin{verbatim} + \specialcomment + {mathexamplewithcode} + {\begingroup\def\ProcessCutFile{}} % arg1 + {\verbatiminput{\CommentCutFile} % arg2 + \endgroup + This gives: + \begin{equation} \input{\CommentCutFile} \end{equation} + } +\end{verbatim} +The idea here is to disable inclusion of the file, +but include it in the after commands, in display math. + +\subsection{Processing each line} + +You can also apply processing to each line. +By defining a control sequence +\begin{verbatim} + \def\Thiscomment##1{...} \end{verbatim} -% in the before commands the user can -specify what is to be done with each comment line. -BUG this does not work quite yet BUG +specify what is to be done with each comment line. If something +needs to be written to file, use \verb+\WriteCommentLine{the stuff}+ +Example: +\begin{verbatim} + \specialcomment + {underlinecomment} + {\def\ThisComment##1{\WriteCommentLine{\underline{##1}\par}} + \par} + {\par} +\end{verbatim} + +\subsection{More examples} -Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+): -% \begin{verbatim} -\includecomment{cond} -\newcommand{\maybe}[1]{} -\begin{cond} -\renewcommand{\maybe}[1]{#1} -\end{cond} +\newcount\comlines +\specialcomment{countedcomment} + {\comlines=0\relax \def\ProcessCutFile{}% + \def\ThisComment##1{\global\advance\comlines1\relax}} + {**Comment: \number\comlines\ line(s) removed**} \end{verbatim} +\begin{verbatim} +\specialcomment + {underlinecomment} + {% + \def\ProcessCutFile{\input{\CommentCutFile}\relax} + \def\ThisComment##1{\WriteCommentLine{u: \underline{##1}\par}} + \par + } + {\par} +\end{verbatim} -\section{Basic approach of the implementation:} +\section{Unicode support} -to comment something out, scoop up every line in verbatim mode -as macro argument, then throw it away. -For inclusions, in \LaTeX\ the block is written out to -a file \cmd{\CommentCutFile} (default ``\texttt{comment.cut}''), which is -then included. -In plain \TeX\ (and other formats) both the opening and -closing comands are defined as noop. +Unicode support works if you use e\TeX, which is for instance the case +if you use pdflatex. You need the following lines: +\begin{verbatim} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\end{verbatim} +in your preamble. +\section{Change log} -\section{Changes in version 3.1} +\subsection{Changes in version 3.1} \begin{itemize} \item updated author's address @@ -188,14 +260,14 @@ \end{itemize} -\section{Changes in 3.2} +\subsection{Changes in 3.2} \begin{itemize} \item \cmd{\specialcomment} brought up to date (thanks to Ivo Welch). \end{itemize} -\section{Changes in 3.3} +\subsection{Changes in 3.3} \begin{itemize} \item updated author's address again @@ -203,7 +275,7 @@ \end{itemize} -\section{Changes in 3.4} +\subsection{Changes in 3.4} \begin{itemize} \item added GNU public license @@ -212,7 +284,7 @@ \end{itemize} -\section{Changes in 3.5} +\subsection{Changes in 3.5} \begin{itemize} \item corrected typo in header. @@ -222,7 +294,7 @@ \end{itemize} -\section{Changes in 3.6} +\subsection{Changes in 3.6} \begin{itemize} \item The `cut' file is now written more verbatim, using \cmd{\meaning}; @@ -232,11 +304,8 @@ \end{itemize} -\section{Known bugs:} +\subsection{Changes in 3.8} -\begin{itemize} -\item \texttt{excludecomment} leads to one superfluous space -\item \texttt{processcomment} leads to a superfluous line break -\end{itemize} +T1 font encoding is now supported. See t1test.tex. \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/comment_plain.tex new/doc/latex/comment/comment_plain.tex --- old/doc/latex/comment/comment_plain.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/comment_plain.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,263 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Comment.sty version 3.5, August 1998 +% +% Purpose: +% selectively in/exclude pieces of text: the user can define new +% comment versions, and each is controlled separately. +% Special comments can be defined where the user specifies the +% action that is to be taken with each comment line. +% +% Author +% Victor Eijkhout +% Department of Computer Science +% University of Tennessee +% 107 Ayres Hall +% Knoxville TN 37996 +% USA +% +% victor(a)eijkhout.net +% +% 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. +% +% For a copy of the GNU General Public License, write to the +% Free Software Foundation, Inc., +% 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA, +% or find it on the net, for instance at +% http://www.gnu.org/copyleft/gpl.html +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This style can be used with plain TeX or LaTeX, and probably +% most other packages too. +% +% Usage: all text included between +% \comment ... \endcomment +% or \begin{comment} ... \end{comment} +% is discarded. +% +% The opening and closing commands should appear on a line +% of their own. No starting spaces, nothing after it. +% This environment should work with arbitrary amounts +% of comment, and the comment can be arbitrary text. +% +% Other `comment' environments are defined by +% and are selected/deselected with +% \includecomment{versiona} +% \excludecoment{versionb} +% +% These environments are used as +% \versiona ... \endversiona +% or \begin{versiona} ... \end{versiona} +% with the opening and closing commands again on a line of +% their own. +% +% LaTeX users note: for an included comment, the +% \begin and \end lines act as if they don't exist. +% In particular, they don't imply grouping, so assignments +% &c are not local. +% +% Special comments are defined as +% \specialcomment{name}{before commands}{after commands} +% where the second and third arguments are executed before +% and after each comment block. You can use this for global +% formatting commands. +% To keep definitions &c local, you can include \begingroup +% in the `before commands' and \endgroup in the `after commands'. +% ex: +% \specialcomment{smalltt} +% {\begingroup\ttfamily\footnotesize}{\endgroup} +% You do *not* have to do an additional +% \includecomment{smalltt} +% To remove 'smalltt' blocks, give \excludecomment{smalltt} +% after the definition. +% +% Processing comments can apply processing to each line. +% \processcomment{name}{each-line commands}% +% {before commands}{after commands} +% By defining a control sequence +% \def\Thiscomment##1{...} in the before commands the user can +% specify what is to be done with each comment line. +% BUG this does not work quite yet BUG +% +% Trick for short in/exclude macros (such as \maybe{this snippet}): +%\includecomment{cond} +%\newcommand{\maybe}[1]{} +%\begin{cond} +%\renewcommand{\maybe}[1]{#1} +%\end{cond} +% +% Basic approach of the implementation: +% to comment something out, scoop up every line in verbatim mode +% as macro argument, then throw it away. +% For inclusions, in LaTeX the block is written out to +% a file \CommentCutFile (default "comment.cut"), which is +% then included. +% In plain TeX (and other formats) both the opening and +% closing comands are defined as noop. +% +% Changes in version 3.1 +% - updated author's address +% - cleaned up some code +% - trailing contents on \begin{env} line is always discarded +% even if you've done \includecomment{env} +% - comments no longer define grouping!! you can even +% \includecomment{env} +% \begin{env} +% \begin{itemize} +% \end{env} +% Isn't that something ... +% - included comments are written to file and input again. +% Changes in 3.2 +% - \specialcomment brought up to date (thanks to Ivo Welch). +% Changes in 3.3 +% - updated author's address again +% - parametrised \CommentCutFile +% Changes in 3.4 +% - added GNU public license +% - added \processcomment, because Ivo's fix (above) brought an +% inconsistency to light. +% Changes in 3.5 +% - corrected typo in header. +% - changed author email +% - corrected \specialcomment yet again. +% - fixed excludecomment of an earlier defined environment. +% +% Known bugs: +% - excludecomment leads to one superfluous space +% - processcomment leads to a superfluous line break +% +\def\makeinnocent#1{\catcode`#1=12 } +\def\csarg#1#2{\expandafter#1\csname#2\endcsname} +\def\latexname{lplain}\def\latexename{LaTeX2e} +\newwrite\CommentStream +\def\CommentCutFile{comment.cut} + +\def\ProcessComment#1% start it all of + {\begingroup + \def\CurrentComment{#1}% + \let\do\makeinnocent \dospecials + \makeinnocent\^^L% and whatever other special cases + \endlinechar`\^^M \catcode`\^^M=12 \xComment} +%\def\ProcessCommentWithArg#1#2% to be used in \leveledcomment +% {\begingroup +% \def\CurrentComment{#1}% +% \let\do\makeinnocent \dospecials +% \makeinnocent\^^L% and whatever other special cases +% \endlinechar`\^^M \catcode`\^^M=12 \xComment} +{\catcode`\^^M=12 \endlinechar=-1 % + \gdef\xComment#1^^M{% + \expandafter\ProcessCommentLine} + \gdef\ProcessCommentLine#1^^M{\def\test{#1} + \csarg\ifx{End\CurrentComment Test}\test + \edef\next{\noexpand\EndOfComment{\CurrentComment}}% + \else \ThisComment{#1}\let\next\ProcessCommentLine + \fi \next} +} + +% 3.1 change: in LaTeX and LaTeX2e prevent grouping +\if 0% +\ifx\fmtname\latexename + 0% +\else \ifx\fmtname\latexname + 0% + \else + 1% +\fi \fi +%%%% +%%%% definitions for LaTeX +%%%% +\def\AfterIncludedComment + {\immediate\closeout\CommentStream + \input{\CommentCutFile}\relax + }% +\def\TossComment{\immediate\closeout\CommentStream} +\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}} +\def\BeforeIncludedComment + {\immediate\openout\CommentStream=\CommentCutFile + \let\ThisComment\WriteCommentLine} +\def\includecomment + #1{\message{Include comment '#1'}% + \csarg\let{After#1Comment}\AfterIncludedComment + \csarg\def{#1}{\BeforeIncludedComment + \ProcessComment{#1}}% + \CommentEndDef{#1}} +\long\def\specialcomment + #1#2#3{\message{Special comment '#1'}% + % note: \AfterIncludedComment does \input, so #2 goes here! + \csarg\def{After#1Comment}{#2\AfterIncludedComment#3}% + \csarg\def{#1}{\BeforeIncludedComment\relax + \ProcessComment{#1}}% + \CommentEndDef{#1}} +\long\def\processcomment + #1#2#3#4{\message{Lines-Processing comment '#1'}% + \csarg\def{After#1Comment}{#3\AfterIncludedComment#4}% + \csarg\def{#1}{\BeforeIncludedComment#2\relax + \ProcessComment{#1}}% + \CommentEndDef{#1}} +\def\leveledcomment + #1#2{\message{Include comment '#1' up to level '#2'}% + %\csarg\newif{if#1IsStreamingComment} + %\csarg\newif{if#1IsLeveledComment} + %\csname #1IsLeveledCommenttrue\endcsname + \csarg\let{After#1Comment}\AfterIncludedComment + \csarg\def{#1}{\BeforeIncludedComment + \ProcessCommentWithArg{#1}}% + \CommentEndDef{#1}} +\else +%%%% +%%%%plain TeX and other formats +%%%% +\def\includecomment + #1{\message{Including comment '#1'}% + \csarg\def{#1}{}% + \csarg\def{end#1}{}} +\long\def\specialcomment + #1#2#3{\message{Special comment '#1'}% + \csarg\newif{if#1IsStreamingComment} + \csarg\def{#1}{\def\ThisComment{}\def\AfterComment{#3}#2% + \ProcessComment{#1}}% + \CommentEndDef{#1}} +\fi + +%%%% +%%%% general definition of skipped comment +%%%% +\def\excludecomment + #1{\message{Excluding comment '#1'}% + \csarg\def{#1}{\let\AfterComment\relax + \def\ThisComment####1{}\ProcessComment{#1}}% + \csarg\let{After#1Comment}\TossComment + \CommentEndDef{#1}} + +\if 0% +\ifx\fmtname\latexename + 0% +\else \ifx\fmtname\latexname + 0% + \else + 1% +\fi \fi +% latex & latex2e: +\def\EndOfComment#1{\endgroup\end{#1}% + \csname After#1Comment\endcsname} +\def\CommentEndDef#1{{\escapechar=-1\relax + \csarg\xdef{End#1Test}{\string\\end\string\{#1\string\}}% + }} +\else +% plain & other +\def\EndOfComment#1{\endgroup\AfterComment} +\def\CommentEndDef#1{{\escapechar=-1\relax + \csarg\xdef{End#1Test}{\string\\end#1}% + }} +\fi + +\excludecomment{comment} + +\endinput Binary files old/doc/latex/comment/t1test.pdf and new/doc/latex/comment/t1test.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/t1test.tex new/doc/latex/comment/t1test.tex --- old/doc/latex/comment/t1test.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/t1test.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,24 @@ +\documentclass{article} + +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} + +\usepackage{comment} +\includecomment{mention} + +%% set-language-environment UTF-8 + +\begin{document} + +Yes: +\begin{mention} +Ð +\end{mention} +. + +No: +\begin{comment} +Ñ +\end{comment} +. +\end{document} Binary files old/doc/latex/comment/writeup.pdf and new/doc/latex/comment/writeup.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/comment/writeup.tex new/doc/latex/comment/writeup.tex --- old/doc/latex/comment/writeup.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/comment/writeup.tex 2016-11-25 19:28:27.000000000 +0100 @@ -0,0 +1,244 @@ +\documentclass[parskip=false, DIV=8, headings=normal, pagesize=auto]{scrartcl} + +\usepackage{fixltx2e} +\usepackage{etex} +\usepackage{xspace} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage{microtype} +\usepackage[unicode=true]{hyperref} + +\newenvironment*{noverb}{% + \flushleft + \vskip\parskip + \parskip=0pt\relax +}{% + \endflushleft +} + +\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\cs}[1]{\texttt{\textbackslash#1}} +\makeatletter +\newcommand*{\cmd}[1]{\cs{\expandafter\@gobble\string#1}} +\makeatother +\newcommand*{\env}[1]{\texttt{#1}} +\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle} +\newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}} + +\addtokomafont{title}{\rmfamily} + +\title{The \pkg{comment} package\thanks{This manual corresponds to + \pkg{comment}~v3.8 of July 2016.}} +% +\author{Victor Eijkhout\\\mail{victor(a)eijkhout.net}} \date{August 2016} + + +\begin{document} + +\maketitle + +\section{Purpose:} + +Selectively in/exclude pieces of text: the user can define new +comment versions, and each is controlled separately. +Special comments can be defined where the user specifies the +action that is to be taken with each comment line. + +Plain \TeX\ support has been phased out. + +As of 3.8 the package will increasingly use e\TeX\ features, for +instance to solve Unicode support issues. + +\section{Usage:} + +All text included between +% +\begin{verbatim} +\begin{comment} + ... +\end{comment} +\end{verbatim} +% +is discarded. + +The opening and closing commands should appear on a line +of their own. No starting spaces, nothing after it. +This environment should work with arbitrary amounts +of comment, and the comment can be arbitrary text. + +Other `\env{comment}' environments are defined by +and are selected/deselected with +% +\begin{verbatim} +\includecomment{versiona} +\excludecoment{versionb} +\end{verbatim} +% +These environments are used as +% +\begin{verbatim} +\versiona ... \endversiona +\end{verbatim} +% +or +% +\begin{verbatim} +\begin{versiona} ... \end{versiona} +\end{verbatim} +% +with the opening and closing commands again on a line of +their own. + +\pagebreak[1] + +\LaTeX\ users note: for an included comment, the +\cmd{\begin} and \cmd{\end} lines act as if they don't exist. +In particular, they don't imply grouping, so assignments +\&c are not local. + +\pagebreak[2] + +Special comments are defined as +% +\begin{noverb} +\cmd{\specialcomment}\marg{name}\marg{before commands}\marg{after commands} +\end{noverb} +% +where the second and third arguments are executed before +and after each comment block. You can use this for global +formatting commands. +To keep definitions \&c local, you can include \cmd{\begingroup} +in the `\meta{before commands}' and \cmd{\endgroup} in the `\meta{after commands}'. +ex: +% +\begin{verbatim} +\specialcomment{smalltt} + {\begingroup\ttfamily\footnotesize}{\endgroup} +\end{verbatim} +% +You do \emph{not} have to do an additional +% +\begin{verbatim} +\includecomment{smalltt} +\end{verbatim} +% +To remove `\env{smalltt}' blocks, give \verb+\excludecomment{smalltt}+ +after the definition. + +Processing comments can apply processing to each line. +% +\begin{noverb} +\cmd{\processcomment}\marg{name}\marg{each-line commands}\marg{before commands}\marg{after commands} +\end{noverb} +% +By defining a control sequence +% +\begin{verbatim} +\def\Thiscomment##1{...} +\end{verbatim} +% +in the before commands the user can +specify what is to be done with each comment line. +BUG this does not work quite yet BUG + +Trick for short in/exclude macros (such as \verb+\maybe{this snippet}+): +% +\begin{verbatim} +\includecomment{cond} +\newcommand{\maybe}[1]{} +\begin{cond} +\renewcommand{\maybe}[1]{#1} +\end{cond} +\end{verbatim} + + +\section{Basic approach of the implementation:} + +to comment something out, scoop up every line in verbatim mode +as macro argument, then throw it away. +For inclusions, in \LaTeX\ the block is written out to +a file \cmd{\CommentCutFile} (default ``\texttt{comment.cut}''), which is +then included. +In plain \TeX\ (and other formats) both the opening and +closing comands are defined as noop. + + +\section{Changes in version 3.1} + +\begin{itemize} +\item updated author's address +\item cleaned up some code +\item trailing contents on \cmd{\begin}\marg{env} line is always discarded + even if you've done \cmd{\includecomment}\marg{env} +\item comments no longer define grouping!! you can even + % +\begin{verbatim} +\includecomment{env} +\begin{env} +\begin{itemize} +\end{env} +\end{verbatim} + % + Isn't that something\ldots +\item included comments are written to file and input again. +\end{itemize} + + +\section{Changes in 3.2} + +\begin{itemize} +\item \cmd{\specialcomment} brought up to date (thanks to Ivo Welch). +\end{itemize} + + +\section{Changes in 3.3} + +\begin{itemize} +\item updated author's address again +\item parametrised \cmd{\CommentCutFile} +\end{itemize} + + +\section{Changes in 3.4} + +\begin{itemize} +\item added GNU public license +\item added \cmd{\processcomment}, because Ivo's fix (above) brought an + inconsistency to light. +\end{itemize} + + +\section{Changes in 3.5} + +\begin{itemize} +\item corrected typo in header. +\item changed author email +\item corrected \cmd{\specialcomment} yet again. +\item fixed excludecomment of an earlier defined environment. +\end{itemize} + + +\section{Changes in 3.6} + +\begin{itemize} +\item The `cut' file is now written more verbatim, using \cmd{\meaning}; + some people reported having trouble with ISO~latin~1, or \texttt{umlaute.sty}. +\item removed some \cmd{\newif} statements. + Has this suddenly become \cmd{\outer} again? +\end{itemize} + + +\section{Changes in 3.8} + +T1 font encoding is now supported. See t1test.tex. + +%% \section{Known bugs:} + +%% \begin{itemize} +%% \item \texttt{excludecomment} leads to one superfluous space +%% \item \texttt{processcomment} leads to a superfluous line break +%% \end{itemize} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comment.doc.tlpobj new/tlpkg/tlpobj/comment.doc.tlpobj --- old/tlpkg/tlpobj/comment.doc.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/comment.doc.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -1,10 +1,20 @@ name comment.doc category Package -revision 32778 +revision 41927 shortdesc doc files of comment relocated 1 -docfiles size=68 +docfiles size=145 + RELOC/doc/latex/comment/Makefile RELOC/doc/latex/comment/README - RELOC/doc/latex/comment/comm_latest.tex + RELOC/doc/latex/comment/comm_bug.tex + RELOC/doc/latex/comment/comm_test.pdf + RELOC/doc/latex/comment/comm_test.tex + RELOC/doc/latex/comment/comm_test_ivo.tex + RELOC/doc/latex/comment/comm_test_l.tex RELOC/doc/latex/comment/comment.pdf RELOC/doc/latex/comment/comment.tex + RELOC/doc/latex/comment/comment_plain.tex + RELOC/doc/latex/comment/t1test.pdf + RELOC/doc/latex/comment/t1test.tex + RELOC/doc/latex/comment/writeup.pdf + RELOC/doc/latex/comment/writeup.tex ++++++ comment.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/comment/comment.sty new/tex/latex/comment/comment.sty --- old/tex/latex/comment/comment.sty 2014-01-25 00:00:16.000000000 +0100 +++ new/tex/latex/comment/comment.sty 2016-11-25 19:33:45.000000000 +0100 @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Comment.sty version 3.7, July 2009 -% copyright 1998-2009 Victor Eijkhout +% Comment.sty version 3.8, July 2016 +% copyright 1998-2016 Victor Eijkhout % % Purpose: % selectively in/exclude pieces of text: the user can define new @@ -115,7 +115,7 @@ % needs to be written to file, use \WriteCommentLine{the stuff} % Example: % \specialcomment{underlinecomment} -% {\def\ThisComment##1{\WriteCommentLine{\string\underline{##1}\string\par}} +% {\def\ThisComment##1{\WriteCommentLine{\underline{##1}\par}} % \par} % {\par} % @@ -126,6 +126,9 @@ %\renewcommand{\maybe}[1]{#1} %\end{cond} % +% Changes in 3.8 +% - utf8 is now correctly handled, at least if you use eTeX. +% (Thanks Henry Gregory for the solution) % Changes in 3.7 % - only LaTeX support from now on % - code cleanup, and improvements on \specialcomment @@ -192,22 +195,37 @@ %% %% Initial action: SetUpCutFile opens the CommentCutFile +%% hook for initial actions: PrepareCutFile, default null %% \def\SetUpCutFile - {\immediate\openout\CommentStream=\CommentCutFile} -%% -%% Each line action: ThisComment, default: WriteCommentLine on line contents + {\immediate\openout\CommentStream=\CommentCutFile + \PrepareCutFile} +\def\PrepareCutFile{} + %% -\long\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}} +%% Each line action: ThisComment, +%% default: WriteCommentLine on line contents +%% version 3.8: write unexpanded if using eTeX +%% +\expandafter\ifx\csname eTeXversion\endcsname\relax + \long\def\WriteCommentLine#1{\immediate\write\CommentStream{#1}} +\else + \long\def\WriteCommentLine#1{\immediate\write\CommentStream{\unexpanded{#1}}} +\fi \let\ThisComment\WriteCommentLine + %% %% Final action: ProcessCutFile +%% hook for final action before file closing: FinalizeCutFile, default null +%% \def\ProcessCutFile {\message{Straight input of \CommentCutFile.}% \input{\CommentCutFile}\relax} \def\CloseAndInputCutFile - {\immediate\closeout\CommentStream + {\FinalizeCutFile + \immediate\closeout\CommentStream \ProcessCutFile} +\def\FinalizeCutFile{} %% %% Define the different comment types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comment.tlpobj new/tlpkg/tlpobj/comment.tlpobj --- old/tlpkg/tlpobj/comment.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/comment.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -1,7 +1,7 @@ name comment category Package -revision 32778 -shortdesc Selectively include/excludes portions of text +revision 41927 +shortdesc Selectively include/exclude portions of text relocated 1 longdesc Selectively include/exclude pieces of text, allowing the user longdesc to define new, separately controlled, comment versions. All @@ -19,7 +19,7 @@ runfiles size=3 RELOC/tex/latex/comment/comment.sty catalogue-ctan /macros/latex/contrib/comment -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license gpl +catalogue-date 2016-08-25 07:53:37 +0200 +catalogue-license gpl2 catalogue-topics cond-comp editorial -catalogue-version 3.7 +catalogue-version 3.8 ++++++ compactbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/compactbib.tlpobj new/tlpkg/tlpobj/compactbib.tlpobj --- old/tlpkg/tlpobj/compactbib.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/compactbib.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=2 RELOC/tex/latex/compactbib/compactbib.sty catalogue-ctan /macros/latex/contrib/compactbib -catalogue-date 2015-12-27 20:31:23 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-supp ++++++ complexity.doc.tar.xz ++++++ ++++++ complexity.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/complexity.tlpobj new/tlpkg/tlpobj/complexity.tlpobj --- old/tlpkg/tlpobj/complexity.tlpobj 2016-04-14 18:52:43.000000000 +0200 +++ new/tlpkg/tlpobj/complexity.tlpobj 2017-04-14 17:36:14.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/complexity/complexity.sty RELOC/tex/latex/complexity/mycomplexity.sty catalogue-ctan /macros/latex/contrib/complexity -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-symb catalogue-version 0.76 ++++++ components-of-TeX.doc.tar.xz ++++++ ++++++ comprehensive.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-e/comprehensive.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new/comprehensive.doc.tar.xz differ: char 26, line 1 ++++++ computational-complexity.doc.tar.xz ++++++ ++++++ computational-complexity.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/computational-complexity.tlpobj new/tlpkg/tlpobj/computational-complexity.tlpobj --- old/tlpkg/tlpobj/computational-complexity.tlpobj 2016-04-14 18:53:18.000000000 +0200 +++ new/tlpkg/tlpobj/computational-complexity.tlpobj 2017-04-14 17:36:29.000000000 +0200 @@ -35,7 +35,7 @@ RELOC/tex/latex/computational-complexity/relabel.sty RELOC/tex/latex/computational-complexity/thcc.sty catalogue-ctan /macros/latex/contrib/computational-complexity -catalogue-date 2016-03-01 13:14:04 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics journalpub class catalogue-version 2.25f ++++++ concepts.doc.tar.xz ++++++ ++++++ concepts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/concepts.tlpobj new/tlpkg/tlpobj/concepts.tlpobj --- old/tlpkg/tlpobj/concepts.tlpobj 2016-04-14 18:53:18.000000000 +0200 +++ new/tlpkg/tlpobj/concepts.tlpobj 2017-04-14 17:36:29.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=7 RELOC/tex/latex/concepts/concepts.sty catalogue-ctan /macros/latex/contrib/concepts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics editorial-consistency catalogue-version 0.0.5-r1 ++++++ concmath.doc.tar.xz ++++++ ++++++ concmath.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/concmath.tlpobj new/tlpkg/tlpobj/concmath.tlpobj --- old/tlpkg/tlpobj/concmath.tlpobj 2016-04-14 18:53:19.000000000 +0200 +++ new/tlpkg/tlpobj/concmath.tlpobj 2017-04-14 17:36:30.000000000 +0200 @@ -19,6 +19,6 @@ RELOC/tex/latex/concmath/uccb.fd catalogue-also concrete ccfonts catalogue-ctan /macros/latex/contrib/concmath -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

1 0

commit texlive-specs-d 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-d for openSUSE:Factory checked in at 2017-06-25 19:21:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-d (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-d" Sun Jun 25 19:21:26 2017 rev:26 rq:504793 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.changes 2017-06-08 14:54:08.810018195 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-d.new/texlive-specs-d.changes 2017-06-25 19:23:27.101093672 +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: ---- changebar.doc.tar.xz changebar.tar.xz changelayout.doc.tar.xz changelayout.tar.xz changepage.doc.tar.xz changepage.tar.xz changes.doc.tar.xz changes.tar.xz chappg.doc.tar.xz chappg.tar.xz chapterfolder.doc.tar.xz chapterfolder.tar.xz charter.doc.tar.xz charter.tar.xz chbibref.doc.tar.xz chbibref.tar.xz checkcites.doc.tar.xz checkcites.tar.xz checklistings.doc.tar.xz checklistings.tar.xz chem-journal.tar.xz chemarrow.doc.tar.xz chemarrow.tar.xz chembst.doc.tar.xz chembst.tar.xz chemcompounds.doc.tar.xz chemcompounds.tar.xz chemcono.doc.tar.xz chemcono.tar.xz chemexec.doc.tar.xz chemexec.tar.xz chemfig.doc.tar.xz chemfig.tar.xz chemformula.doc.tar.xz chemformula.tar.xz chemgreek.doc.tar.xz chemgreek.tar.xz chemmacros.doc.tar.xz chemmacros.tar.xz chemnum.doc.tar.xz chemnum.tar.xz chemschemex.doc.tar.xz chemschemex.tar.xz chemstyle.doc.tar.xz chemstyle.tar.xz cherokee.doc.tar.xz cherokee.tar.xz chess-problem-diagrams.doc.tar.xz chess-problem-diagrams.tar.xz chess.doc.tar.xz chess.tar.xz New: ---- binomexp.doc.tar.xz binomexp.tar.xz biochemistry-colors.doc.tar.xz biochemistry-colors.tar.xz biocon.doc.tar.xz biocon.tar.xz biolett-bst.doc.tar.xz biolett-bst.tar.xz bitelist.doc.tar.xz bitelist.tar.xz bitpattern.doc.tar.xz bitpattern.tar.xz bizcard.doc.tar.xz bizcard.tar.xz blacklettert1.doc.tar.xz blacklettert1.tar.xz blindtext.doc.tar.xz blindtext.tar.xz blkarray.doc.tar.xz blkarray.tar.xz blochsphere.doc.tar.xz blochsphere.tar.xz block.doc.tar.xz block.tar.xz blockdraw_mp.doc.tar.xz blockdraw_mp.tar.xz bloques.doc.tar.xz bloques.tar.xz blox.doc.tar.xz blox.tar.xz bnumexpr.doc.tar.xz bnumexpr.tar.xz bodegraph.doc.tar.xz bodegraph.tar.xz bohr.doc.tar.xz bohr.tar.xz boisik.doc.tar.xz boisik.tar.xz boites.doc.tar.xz boites.tar.xz bold-extra.doc.tar.xz bold-extra.tar.xz boldtensors.doc.tar.xz boldtensors.tar.xz bondgraph.doc.tar.xz bondgraph.tar.xz bondgraphs.doc.tar.xz bondgraphs.tar.xz bredzenie.doc.tar.xz bredzenie.tar.xz bxcalc.doc.tar.xz bxcalc.tar.xz bxjalipsum.doc.tar.xz bxjalipsum.tar.xz bxjaprnind.doc.tar.xz bxjaprnind.tar.xz bxorigcapt.doc.tar.xz bxorigcapt.tar.xz callouts.doc.tar.xz callouts.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-d.spec ++++++ ++++ 38553 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-d.new/texlive-specs-d.spec ++++++ bookcover.doc.tar.xz ++++++ ++++ 4148 lines of diff (skipped) ++++++ bookcover.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bookcover/bookcover.cls new/tex/latex/bookcover/bookcover.cls --- old/tex/latex/bookcover/bookcover.cls 2016-05-02 03:30:50.000000000 +0200 +++ new/tex/latex/bookcover/bookcover.cls 2017-04-17 00:19:27.000000000 +0200 @@ -6,7 +6,7 @@ %% %% ./bookcover.dtx (with options: `class') %% This is a generated file. -%% Copyright (C) 2015 Tibor Tomacs +%% Copyright (C) 2015- 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 @@ -18,7 +18,7 @@ %% LaTeX version 1999/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{bookcover}[2016/05/01 v1.1 class for book covers and dust jackets] +\ProvidesClass{bookcover}[2017/04/13 v2.1 class for book covers and dust jackets] %% %% OPTIONS \RequirePackage{kvoptions} @@ -36,20 +36,22 @@ \DeclareStringOption[5mm]{bleedwidth} \DeclareStringOption[red]{markcolor} \DeclareBoolOption[false]{trimmed} -\DeclareBoolOption[false]{bgtikznodes} -\DeclareBoolOption[false]{bgtikzclip} +\DeclareBoolOption[false]{bgtikznodes}% for old method +\DeclareBoolOption[false]{bgtikzclip}% for old method \ProcessKeyvalOptions{bookcover} +\ifbookcover@bgtikzclip\bookcover@bgtikznodestrue\fi% for old method -%% LOADING CLASS +%% CLASS AND PACKAGES \LoadClass{article} - -%% LOADING PACKAGES \RequirePackage{geometry,graphicx,calc,xcolor,ifthen,tikz,eso-pic} \RequirePackage[absolute]{textpos} %% PAGE STYLE \pagestyle{empty} +%% NEW IF +\newif\if@inbookcoverenv + %% USER LENGTHS \newlength{\coverwidth} \newlength{\coverheight} @@ -64,8 +66,14 @@ \newlength{\bookcover@ypos@} \newlength{\bookcover@partwidth@} \newlength{\bookcover@partheight@} -\newlength{\bookcover@bgtikz@trimmed@part@width@minus} -\newlength{\bookcover@bgtikz@trimmed@part@push@right} +\newlength{\bookcover@tikz@trimmed@part@width@minus} +\newlength{\bookcover@tikz@trimmed@part@height@minus} +\newlength{\bookcover@tikz@trimmed@part@push@right} +\newlength{\bookcover@tikz@trimmed@part@push@up} +\newlength{\bookcover@ruler@xshift} +\newlength{\bookcover@ruler@yshift} +\let\partheight\bookcover@partheight@ +\let\partwidth\bookcover@partwidth@ %% USER LENGTHS SETTING \setlength{\coverwidth}{\bookcover@coverwidth} @@ -79,76 +87,87 @@ \setlength{\paperheight}{2\marklength+2\bleedwidth+\coverheight} \setlength{\parindent}{0pt} -%% IF GRID -\ifESO@grid - \setlength{\markthick}{2pt} - \def\bookcover@markcolor{red}\fi - -%% COMMANDS FOR INTERNAL LENGTHS SETTING +%% INTERNAL LENGTHS SETTING \def\bookcover@xpos#1{\setlength{\bookcover@xpos@}{#1}} \def\bookcover@ypos#1{\setlength{\bookcover@ypos@}{#1}} \def\bookcover@partwidth#1{\setlength{\bookcover@partwidth@}{#1}} \def\bookcover@partheight#1{\setlength{\bookcover@partheight@}{#1}} -\def\bookcover@bgtikz@trimmed@part@param#1#2{% - \setlength{\bookcover@bgtikz@trimmed@part@width@minus}{#1}% - \setlength{\bookcover@bgtikz@trimmed@part@push@right}{#2}} +\def\bookcover@tikz@trimmed@part@param#1#2#3#4{% + \setlength{\bookcover@tikz@trimmed@part@width@minus}{#1}% + \setlength{\bookcover@tikz@trimmed@part@height@minus}{#2} + \setlength{\bookcover@tikz@trimmed@part@push@right}{#3} + \setlength{\bookcover@tikz@trimmed@part@push@up}{#4}} +\def\bookcover@bgtikz@trimmed@part@param#1#2{ + \bookcover@tikz@trimmed@part@param{#1}{2\bleedwidth}{#2}{\bleedwidth}}% for old method +\let\setpartposx\bookcover@xpos +\let\setpartposy\bookcover@ypos +\let\setpartwidth\bookcover@partwidth +\let\setpartheight\bookcover@partheight +\let\settrimmedpart\bookcover@tikz@trimmed@part@param -%% MACROS FOR OUTPUTS OF PARTS -%% bgcolor -\def\bookcover@bgcolor#1{ - \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) - \tikz\expandafter\fill#1 (0,0) rectangle (\bookcover@partwidth@,\bookcover@partheight@); - \end{textblock*}} -%% bgpic -\def\bookcover@bgpic#1{ - \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) - \includegraphics[width=\bookcover@partwidth@,height=\bookcover@partheight@]{#1} - \end{textblock*}} -%% bgtikz -\def\bookcover@bgtikz#1{ - \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) - \ifbookcover@bgtikzclip\bookcover@bgtikznodestrue\fi - \ifbookcover@bgtikznodes - \begin{tikzpicture}[overlay,yshift=-\bookcover@partheight@] - \begin{scope}[transparent,line width=0pt] - \pgfset{minimum width=\bookcover@partwidth@,minimum height=\bookcover@partheight@} - \pgfnode{rectangle}{south west}{}{current part}{\pgfusepath{draw}} - \pgfset{minimum width=\bookcover@partwidth@-\bookcover@bgtikz@trimmed@part@width@minus, - minimum height=\bookcover@partheight@-2\bleedwidth} - \pgftransformshift{\pgfpoint{\bookcover@bgtikz@trimmed@part@push@right}{\bleedwidth}} - \pgfnode{rectangle}{south west}{}{current trimmed part}{\pgfusepath{draw}} - \end{scope} - \ifbookcover@bgtikzclip - \clip (current part.south west) rectangle (current part.north east);\fi - \else\begin{tikzpicture}\fi - #1 - \end{tikzpicture} - \end{textblock*}} -%% fg -\def\bookcover@fg#1{ - \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) - \parbox[t][\bookcover@partheight@][t]{\bookcover@partwidth@}{#1} - \end{textblock*}} -%% remark -\def\bookcover@remark#1{ - \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) - \parbox[t][\bookcover@partheight@][c]{\bookcover@partwidth@} - {\centering#1\par} - \end{textblock*}} +%% GRID +\ifESO@grid + \setlength{\markthick}{2pt} + \def\bookcover@markcolor{red}\fi -%% MACROS FOR MARKS -%% vertical mark +%% MARKS \def\bookcover@vmark{ \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) {\color{\bookcover@markcolor}\rule[0pt]{\markthick}{\marklength}} \end{textblock*}} -%% horizontal mark + \def\bookcover@hmark{ \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) {\color{\bookcover@markcolor}\rule[0pt]{\marklength}{\markthick}} \end{textblock*}} -%% MACRO FOR TRIMMING +\def\bookcover@marks{ + \bookcover@ypos{0mm} + \bookcover@partwidth{\markthick} + \bookcover(a)xpos{\marklength+\bleedwidth-.5\markthick} + \bookcover@vmark + \ifdim\flapwidth>0mm + \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth-.5\markthick} + \bookcover@vmark\fi + \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth-.5\markthick} + \bookcover@vmark + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark\fi + \bookcover@xpos{\marklength+\bleedwidth+2\flapwidth+2\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark + \bookcover@ypos{\paperheight-\marklength} + \bookcover@partwidth{\markthick} + \bookcover(a)xpos{\marklength+\bleedwidth-.5\markthick} + \bookcover@vmark + \ifdim\flapwidth>0mm + \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth-.5\markthick} + \bookcover@vmark\fi + \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth-.5\markthick} + \bookcover@vmark + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark\fi + \bookcover@xpos{\marklength+\bleedwidth+2\flapwidth+2\coverwidth+\spinewidth-.5\markthick} + \bookcover@vmark + \bookcover@xpos{0mm} + \bookcover@partwidth{\marklength} + \bookcover(a)ypos{\marklength+\bleedwidth-.5\markthick} + \bookcover@hmark + \bookcover(a)ypos{\marklength+\bleedwidth+\coverheight-.5\markthick} + \bookcover@hmark + \bookcover@xpos{\paperwidth-\marklength} + \bookcover@partwidth{\marklength} + \bookcover(a)ypos{\marklength+\bleedwidth-.5\markthick} + \bookcover@hmark + \bookcover(a)ypos{\marklength+\bleedwidth+\coverheight-.5\markthick} + \bookcover@hmark} + +%% TRIMMING \def\bookcover@trimming{ \begin{textblock*}{\paperwidth}(0mm,0mm) \begin{tikzpicture} @@ -200,6 +219,533 @@ \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth-.5\markthick} \bookcover@vmark} +%% BOOKCOVER COMPONENT +\long\def\bookcovercomponent#1#2#3{ + \if@inbookcoverenv\else + \@latexerr{\string\bookcovercomponent\space is not in 'bookcover' environment.}{}\fi + \bookcover@xpos{0pt} + \bookcover@ypos{0pt} + \bookcover@partwidth{0pt} + \bookcover@partheight{0pt} + \bookcover@tikz@trimmed@part@param{0pt}{0pt}{0pt}{0pt} + \@ifundefined{bookcover@part@param@#2}{\@latexerr{Part '#2' undefined.}{}}{ + \@ifundefined{bookcover@componenttype@#1}{\@latexerr{Component type '#1' undefined.}{}}{ + \ifx#3\@empty\else + \csname bookcover@part@param@#2\endcsname + \ifdim\bookcover@partwidth@>0mm + \ifdim\bookcover@partheight@>0mm + \csname bookcover@componenttype@#1\endcsname{#3}\fi\fi\fi}}} + +%% BOOKCOVER ENVIRONMENT +\def\bookcover{\@inbookcoverenvtrue} +\def\endbookcover{ + \bookcover@marks + \ifbookcover@trimmed\bookcover@trimming\fi + \mbox{}\newpage\@inbookcoverenvfalse} + +%% NEW BOOKCOVER PART +\def\newbookcoverpart#1#2{ + \@ifundefined{bookcover@part@param@#1}{ + \expandafter\def\csname bookcover@part@param@#1\endcsname{#2}} + {\@latexerr{Part '#1' already defined.}{}}} + +%% RENEW BOOKCOVER PART +\def\renewbookcoverpart#1#2{ + \@ifundefined{bookcover@part@param@#1}{\@latexerr{Part '#1' undefined.}{}}{ + \expandafter\def\csname bookcover@part@param@#1\endcsname{#2}}} + +%% NEW NAME BOOKCOVER PART +\def\newnamebookcoverpart#1#2{ + \@ifundefined{bookcover@part@param@#1}{ + \@ifundefined{bookcover@part@param@#2}{\@latexerr{Part '#2' undefined.}{}}{ + \expandafter\def\csname bookcover@part@param@#1\endcsname{% + \csname bookcover@part@param@#2\endcsname}}} + {\@latexerr{Part '#1' already defined.}{}}} + +%% NEW BOOKCOVER COMPONENT TYPE +\def\newbookcovercomponenttype#1#2{ + \@ifundefined{bookcover@componenttype@#1}{ + \long\expandafter\def\csname bookcover@componenttype@#1\endcsname##1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + #2 + \end{textblock*}}} + {\@latexerr{Component type '#1' already defined.}{}}} + +%% RENEW BOOKCOVER COMPONENT TYPE +\def\renewbookcovercomponenttype#1#2{ + \@ifundefined{bookcover@componenttype@#1}{\@latex@error{Component type '#1' undefined.}{}}{ + \long\expandafter\def\csname bookcover@componenttype@#1\endcsname##1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + #2 + \end{textblock*}}}} + +%% NEW NAME BOOKCOVER COMPONENT TYPE +\def\newnamebookcovercomponenttype#1#2{ + \@ifundefined{bookcover@componenttype@#1}{ + \@ifundefined{bookcover@componenttype@#2}{\@latexerr{Component type '#2' undefined.}{}}{ + \expandafter\def\csname bookcover@componenttype@#1\endcsname{% + \csname bookcover@componenttype@#2\endcsname}}} + {\@latexerr{Component type '#1' already defined.}{}}} + +%% COMPONENT TYPES +\newbookcovercomponenttype{color}{ + \tikz\fill[#1] (0,0) rectangle (\bookcover@partwidth@,\bookcover@partheight@);} + +\newbookcovercomponenttype{picture}{ + \includegraphics[width=\bookcover@partwidth@,height=\bookcover@partheight@]{#1}} + +\newbookcovercomponenttype{tikz}{ + \begin{tikzpicture}[overlay,yshift=-\bookcover@partheight@] + \begin{scope}[transparent,line width=0pt] + \pgfset{minimum width=\bookcover@partwidth@,minimum height=\bookcover@partheight@} + \pgfnode{rectangle}{south west}{}{part}{\pgfusepath{draw}} + \pgfset{minimum width=\bookcover@partwidth@-\bookcover@tikz@trimmed@part@width@minus, + minimum height=\bookcover@partheight@-\bookcover@tikz@trimmed@part@height@minus} + \pgftransformshift{\pgfpoint{\bookcover@tikz@trimmed@part@push@right} + {\bookcover@tikz@trimmed@part@push@up}} + \pgfnode{rectangle}{south west}{}{trimmed part}{\pgfusepath{draw}} + \end{scope} + #1 + \end{tikzpicture}} + +\newbookcovercomponenttype{tikz clip}{ + \begin{tikzpicture}[overlay,yshift=-\bookcover@partheight@] + \begin{scope}[transparent,line width=0pt] + \pgfset{minimum width=\bookcover@partwidth@,minimum height=\bookcover@partheight@} + \pgfnode{rectangle}{south west}{}{part}{\pgfusepath{draw}} + \pgfset{minimum width=\bookcover@partwidth@-\bookcover@tikz@trimmed@part@width@minus, + minimum height=\bookcover@partheight@-\bookcover@tikz@trimmed@part@height@minus} + \pgftransformshift{\pgfpoint{\bookcover@tikz@trimmed@part@push@right} + {\bookcover@tikz@trimmed@part@push@up}} + \pgfnode{rectangle}{south west}{}{trimmed part}{\pgfusepath{draw}} + \end{scope} + \clip (part.south west) rectangle (part.north east); + #1 + \end{tikzpicture}} + +\newbookcovercomponenttype{normal}{ + \parbox[t][\bookcover@partheight@][t]{\bookcover@partwidth@}{#1}} + +\newbookcovercomponenttype{center}{ + \parbox[t][\bookcover@partheight@][c]{\bookcover@partwidth@}{\begin{center}#1\end{center}}} + +\newbookcovercomponenttype{ruler}{ + \begin{tikzpicture}[overlay,x=1mm,y=1mm,inner sep=0pt,outer sep=3pt,yshift=-\bookcover@partheight@] + #1 + \pgfmathsetmacro\xmax{round(.351459804*(\bookcover@partwidth@-\bookcover@ruler@xshift))} + \pgfmathsetmacro\xnummax{round(.0351459804*(\bookcover@partwidth@-\bookcover@ruler@xshift))} + \pgfmathsetmacro\ymax{round(.351459804*(\bookcover@partheight@-\bookcover@ruler@yshift))} + \pgfmathsetmacro\ynummax{round(.0351459804*(\bookcover@partheight@-\bookcover@ruler@yshift))} + \ifthenelse{\equal{\bookcover@ruler@coordsys}{lower left}}{ + \begin{scope}[xshift=\bookcover@ruler@xshift,yshift=\bookcover@ruler@yshift] + \foreach \num in {0,1,...,\xmax} + \draw (\num,0)--++(0,1); + \foreach \num in {0,5,...,\xmax} + \draw (\num,0)--++(0,1.5); + \foreach \num in {0,10,...,\xmax} + \draw (\num,0)--++(0,2); + \foreach \num in {1,2,...,\xnummax} + \node[anchor=south] at (10*\num,2) + {\sffamily\scriptsize\num}; + \foreach \num in {0,1,...,\ymax} + \draw (0,\num)--++(1,0); + \foreach \num in {0,5,...,\ymax} + \draw (0,\num)--++(1.5,0); + \foreach \num in {0,10,...,\ymax} + \draw (0,\num)--++(2,0); + \foreach \num in {1,2,...,\ynummax} + \node[anchor=west] at (2,10*\num) + {\sffamily\scriptsize\num}; + \node[anchor=south] at (5,2) + {\sffamily\scriptsize cm}; + \end{scope}}{} + \ifthenelse{\equal{\bookcover@ruler@coordsys}{lower right}}{ + \begin{scope}[xshift=-\bookcover@ruler@xshift,yshift=\bookcover@ruler@yshift] + \foreach \num in {0,1,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,0)--++(0,1); + \foreach \num in {0,5,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,0)--++(0,1.5); + \foreach \num in {0,10,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,0)--++(0,2); + \foreach \num in {1,2,...,\xnummax} + \node[anchor=south] at (\bookcover@partwidth@-10*\num mm,2) + {\sffamily\scriptsize\num}; + \foreach \num in {0,1,...,\ymax} + \draw (\bookcover@partwidth@,\num)--++(-1,0); + \foreach \num in {0,5,...,\ymax} + \draw (\bookcover@partwidth@,\num)--++(-1.5,0); + \foreach \num in {0,10,...,\ymax} + \draw (\bookcover@partwidth@,\num)--++(-2,0); + \foreach \num in {1,2,...,\ynummax} + \node[anchor=east] at (\bookcover@partwidth@-2mm,10*\num) + {\sffamily\scriptsize\num}; + \node[anchor=south] at (\bookcover@partwidth@-5mm,2) + {\sffamily\scriptsize cm}; + \end{scope}}{} + \ifthenelse{\equal{\bookcover@ruler@coordsys}{upper left}}{ + \begin{scope}[xshift=\bookcover@ruler@xshift,yshift=-\bookcover@ruler@yshift] + \foreach \num in {0,1,...,\xmax} + \draw (\num,\bookcover@partheight@)--++(0,-1); + \foreach \num in {0,5,...,\xmax} + \draw (\num,\bookcover@partheight@)--++(0,-1.5); + \foreach \num in {0,10,...,\xmax} + \draw (\num,\bookcover@partheight@)--++(0,-2); + \foreach \num in {1,2,...,\xnummax} + \node[anchor=north] at (10*\num,\bookcover@partheight@-2mm) + {\sffamily\scriptsize\num}; + \foreach \num in {0,1,...,\ymax} + \draw (0,\bookcover@partheight@-\num mm)--++(1,0); + \foreach \num in {0,5,...,\ymax} + \draw (0,\bookcover@partheight@-\num mm)--++(1.5,0); + \foreach \num in {0,10,...,\ymax} + \draw (0,\bookcover@partheight@-\num mm)--++(2,0); + \foreach \num in {1,2,...,\ynummax} + \node[anchor=west] at (2,\bookcover@partheight@-10*\num mm) + {\sffamily\scriptsize\num}; + \node[anchor=north] at (5,\bookcover@partheight@-2mm) + {\sffamily\scriptsize\vphantom{1}cm}; + \end{scope}}{} + \ifthenelse{\equal{\bookcover@ruler@coordsys}{upper right}}{ + \begin{scope}[xshift=-\bookcover@ruler@xshift,yshift=-\bookcover@ruler@yshift] + \foreach \num in {0,1,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,\bookcover@partheight@)--++(0,-1); + \foreach \num in {0,5,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,\bookcover@partheight@)--++(0,-1.5); + \foreach \num in {0,10,...,\xmax} + \draw (\bookcover@partwidth@-\num mm,\bookcover@partheight@)--++(0,-2); + \foreach \num in {1,2,...,\xnummax} + \node[anchor=north] at (\bookcover@partwidth@-10*\num mm,\bookcover@partheight@-2mm) + {\sffamily\scriptsize\num}; + \foreach \num in {0,1,...,\ymax} + \draw (\bookcover@partwidth@,\bookcover@partheight@-\num mm)--++(-1,0); + \foreach \num in {0,5,...,\ymax} + \draw (\bookcover@partwidth@,\bookcover@partheight@-\num mm)--++(-1.5,0); + \foreach \num in {0,10,...,\ymax} + \draw (\bookcover@partwidth@,\bookcover@partheight@-\num mm)--++(-2,0); + \foreach \num in {1,2,...,\ynummax} + \node[anchor=east] at (\bookcover@partwidth@-2mm,\bookcover@partheight@-10*\num mm) + {\sffamily\scriptsize\num}; + \node[anchor=north] at (\bookcover@partwidth@-5mm,\bookcover@partheight@-2mm) + {\sffamily\scriptsize\vphantom{1}cm}; + \end{scope}}{} + \end{tikzpicture}} +\def\setruler#1#2#3#4{ + \def\bookcover@ruler@coordsys{#1} + \setlength{\bookcover@ruler@xshift}{#2} + \setlength{\bookcover@ruler@yshift}{#3} + \color{#4}} + +%% BOOKCOVER PARTS +\newbookcoverpart{bg back flap}{ + \ifdim\flapwidth>0mm + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength} + \bookcover@partwidth{\flapwidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg back}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{\coverwidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth} + \else + \bookcover@xpos{\marklength} + \bookcover@partwidth{\coverwidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg spine}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \bookcover@partwidth{\spinewidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth}} + +\newbookcoverpart{bg front}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \ifdim\flapwidth>0mm + \bookcover@partwidth{\coverwidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth} + \else + \bookcover@partwidth{\coverwidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}\fi} + +\newbookcoverpart{bg front flap}{ + \ifdim\flapwidth>0mm + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth} + \bookcover@partwidth{\flapwidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}\fi} + +\newbookcoverpart{bg back and flap}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength} + \bookcover@partwidth{\bleedwidth+\flapwidth+\coverwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}} + +\newbookcoverpart{bg back and spine}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{\coverwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth} + \else + \bookcover@xpos{\marklength} + \bookcover@partwidth{\coverwidth+\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg front and spine}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \ifdim\flapwidth>0mm + \bookcover@partwidth{\coverwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth} + \else + \bookcover@partwidth{\coverwidth+\spinewidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}\fi} + +\newbookcoverpart{bg front and flap}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@partwidth{\coverwidth+\flapwidth+\bleedwidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}} + +\newbookcoverpart{bg back and flap and spine}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength} + \bookcover@partwidth{\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}} + +\newbookcoverpart{bg whole without flaps}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{2\coverwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{0pt}{2\bleedwidth}{0pt}{\bleedwidth} + \else + \bookcover@xpos{\marklength} + \bookcover@partwidth{2\coverwidth+2\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{2\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg front and flap and spine}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \bookcover@partwidth{\coverwidth+\flapwidth+\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0pt}{\bleedwidth}} + +\newbookcoverpart{bg whole without front flap}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength} + \ifdim\flapwidth>0mm + \bookcover@partwidth{2\coverwidth+\flapwidth+\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth} + \else + \bookcover@partwidth{2\coverwidth+2\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{2\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg whole without back flap}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \ifdim\flapwidth>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{2\coverwidth+\flapwidth+\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{\bleedwidth}{2\bleedwidth}{0mm}{\bleedwidth} + \else + \bookcover@xpos{\marklength} + \bookcover@partwidth{2\coverwidth+2\bleedwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{2\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}\fi} + +\newbookcoverpart{bg whole}{ + \bookcover@ypos{\marklength} + \bookcover@partheight{\coverheight+2\bleedwidth} + \bookcover@xpos{\marklength} + \bookcover@partwidth{2\coverwidth+2\bleedwidth+2\flapwidth+\spinewidth} + \bookcover@tikz@trimmed@part@param{2\bleedwidth}{2\bleedwidth}{\bleedwidth}{\bleedwidth}} + +\newbookcoverpart{whole page}{ + \bookcover@partheight{\paperheight} + \bookcover@partwidth{\paperwidth}} + +\newbookcoverpart{back flap}{ + \ifdim\flapwidth>0mm + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth} + \bookcover@partwidth{\flapwidth}\fi} + +\newbookcoverpart{back}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{\coverwidth}} + +\newbookcoverpart{spine}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \bookcover@partwidth{\spinewidth}} + +\newbookcoverpart{front}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@partwidth{\coverwidth}} + +\newbookcoverpart{front flap}{ + \ifdim\flapwidth>0mm + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth} + \bookcover@partwidth{\flapwidth}\fi} + +\newbookcoverpart{above front}{ + \ifdim\marklength>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@ypos{0mm} + \bookcover@partwidth{\coverwidth} + \bookcover@partheight{\marklength}\fi} + +\newbookcoverpart{below front}{ + \ifdim\marklength>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@ypos{\marklength+2\bleedwidth+\coverheight} + \bookcover@partwidth{\coverwidth} + \bookcover@partheight{\marklength}\fi} + +\newbookcoverpart{above back}{ + \ifdim\marklength>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@ypos{0mm} + \bookcover@partwidth{\coverwidth} + \bookcover@partheight{\marklength}\fi} + +\newbookcoverpart{below back}{ + \ifdim\marklength>0mm + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@ypos{\marklength+2\bleedwidth+\coverheight} + \bookcover@partwidth{\coverwidth} + \bookcover@partheight{\marklength}\fi} + +\newbookcoverpart{back and flap}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth} + \bookcover@partwidth{\flapwidth+\coverwidth} + \bookcover@partheight{\coverheight}} + +\newbookcoverpart{back and spine}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{\coverwidth+\spinewidth}} + +\newbookcoverpart{front and spine}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \bookcover@partwidth{\coverwidth+\spinewidth}} + +\newbookcoverpart{front and flap}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} + \bookcover@partwidth{\coverwidth+\flapwidth}} + +\newbookcoverpart{back and flap and spine}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@xpos{\marklength+\bleedwidth} + \bookcover@partwidth{\flapwidth+\coverwidth+\spinewidth} + \bookcover@partheight{\coverheight}} + +\newbookcoverpart{whole without flaps}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{2\coverwidth+\spinewidth}} + +\newbookcoverpart{front and flap and spine}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth} + \bookcover@partwidth{\coverwidth+\flapwidth+\spinewidth}} + +\newbookcoverpart{whole without front flap}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth} + \bookcover@partwidth{2\coverwidth+\flapwidth+\spinewidth}} + +\newbookcoverpart{whole without back flap}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth+\flapwidth} + \bookcover@partwidth{2\coverwidth+\flapwidth+\spinewidth}} + +\newbookcoverpart{whole}{ + \bookcover@ypos{\marklength+\bleedwidth} + \bookcover@partheight{\coverheight} + \bookcover@xpos{\marklength+\bleedwidth} + \bookcover@partwidth{2\coverwidth+2\flapwidth+\spinewidth}} + +%%%%%%%%%%%%%%%% +%% OLD METHOD %% +%%%%%%%%%%%%%%%% + +%% MAIN LAYERS +\def\bookcover@bgcolor#1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + \tikz\fill\expandafter[#1] (0,0) rectangle (\bookcover@partwidth@,\bookcover@partheight@); + \end{textblock*}} + +\def\bookcover@bgpic#1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + \includegraphics[width=\bookcover@partwidth@,height=\bookcover@partheight@]{#1} + \end{textblock*}} + +\def\bookcover@bgtikz#1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + \ifbookcover@bgtikznodes + \begin{tikzpicture}[overlay,yshift=-\bookcover@partheight@] + \begin{scope}[transparent,line width=0pt] + \pgfset{minimum width=\bookcover@partwidth@,minimum height=\bookcover@partheight@} + \pgfnode{rectangle}{south west}{}{current part}{\pgfusepath{draw}}% for v1.1.1 + \pgfnode{rectangle}{south west}{}{part}{\pgfusepath{draw}} + \pgfset{minimum width=\bookcover@partwidth@-\bookcover@tikz@trimmed@part@width@minus, + minimum height=\bookcover@partheight@-\bookcover@tikz@trimmed@part@height@minus} + \pgftransformshift{\pgfpoint{\bookcover@tikz@trimmed@part@push@right} + {\bookcover@tikz@trimmed@part@push@up}} + \pgfnode{rectangle}{south west}{}{current trimmed part}{\pgfusepath{draw}}% for v1.1.1 + \pgfnode{rectangle}{south west}{}{trimmed part}{\pgfusepath{draw}} + \end{scope} + \ifbookcover@bgtikzclip + \clip (part.south west) rectangle (part.north east);\fi + \else\begin{tikzpicture}\fi + #1 + \end{tikzpicture} + \end{textblock*}} + +\def\bookcover@fg#1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + \parbox[t][\bookcover@partheight@][t]{\bookcover@partwidth@}{#1} + \end{textblock*}} + +\def\bookcover@remark#1{ + \begin{textblock*}{\bookcover@partwidth@}(\bookcover@xpos@,\bookcover@ypos@) + \parbox[t][\bookcover@partheight@][c]{\bookcover@partwidth@}{\begin{center}#1\end{center}} + \end{textblock*}} + %% RESET DATAS \def\bookcover@reset{ \def\bookcover@bgcolor@whole{} @@ -239,16 +785,16 @@ \def\bookcover@fgsecond@frontflap{}} \bookcover@reset -%% SETBOOKCOVER +%% SET BOOKCOVER \long\def\setbookcover#1#2#3{ \ifthenelse{\equal{#1}{bgcolor}}{ - \ifthenelse{\equal{#2}{whole}}{\def\bookcover@bgcolor@whole{[#3]}}{} - \ifthenelse{\equal{#2}{whole without flaps}}{\def\bookcover@bgcolor@wholewf{[#3]}}{} - \ifthenelse{\equal{#2}{back}}{\def\bookcover@bgcolor@back{[#3]}}{} - \ifthenelse{\equal{#2}{front}}{\def\bookcover@bgcolor@front{[#3]}}{} - \ifthenelse{\equal{#2}{back flap}}{\def\bookcover@bgcolor@backflap{[#3]}}{} - \ifthenelse{\equal{#2}{front flap}}{\def\bookcover@bgcolor@frontflap{[#3]}}{} - \ifthenelse{\equal{#2}{spine}}{\def\bookcover@bgcolor@spine{[#3]}}{}}{} + \ifthenelse{\equal{#2}{whole}}{\def\bookcover@bgcolor@whole{#3}}{} + \ifthenelse{\equal{#2}{whole without flaps}}{\def\bookcover@bgcolor@wholewf{#3}}{} + \ifthenelse{\equal{#2}{back}}{\def\bookcover@bgcolor@back{#3}}{} + \ifthenelse{\equal{#2}{front}}{\def\bookcover@bgcolor@front{#3}}{} + \ifthenelse{\equal{#2}{back flap}}{\def\bookcover@bgcolor@backflap{#3}}{} + \ifthenelse{\equal{#2}{front flap}}{\def\bookcover@bgcolor@frontflap{#3}}{} + \ifthenelse{\equal{#2}{spine}}{\def\bookcover@bgcolor@spine{#3}}{}}{} \ifthenelse{\equal{#1}{bgpic}}{ \ifthenelse{\equal{#2}{whole}}{\def\bookcover@bgpic@whole{#3}}{} \ifthenelse{\equal{#2}{whole without flaps}}{\def\bookcover@bgpic@wholewf{#3}}{} @@ -271,7 +817,7 @@ \ifthenelse{\equal{#2}{spine}}{\def\bookcover@fgfirst@spine{#3}}{} \ifthenelse{\equal{#2}{back flap}}{\def\bookcover@fgfirst@backflap{#3}}{} \ifthenelse{\equal{#2}{front flap}}{\def\bookcover@fgfirst@frontflap{#3}}{} - \ifthenelse{\equal{#2}{remark}}{\def\bookcover@fgfirst@abovefront{#3}}{}% for version 1.0 + \ifthenelse{\equal{#2}{remark}}{\def\bookcover@fgfirst@abovefront{#3}}{}% for v1.0 \ifthenelse{\equal{#2}{above front}}{\def\bookcover@fgfirst@abovefront{#3}}{} \ifthenelse{\equal{#2}{below front}}{\def\bookcover@fgfirst@belowfront{#3}}{} \ifthenelse{\equal{#2}{above back}}{\def\bookcover@fgfirst@aboveback{#3}}{} @@ -283,7 +829,7 @@ \ifthenelse{\equal{#2}{back flap}}{\def\bookcover@fgsecond@backflap{#3}}{} \ifthenelse{\equal{#2}{front flap}}{\def\bookcover@fgsecond@frontflap{#3}}{}}{}} -%% MAKEBOOKCOVER +%% MAKE BOOKCOVER \def\makebookcover{ %% background parameters \bookcover@ypos{\marklength} @@ -492,7 +1038,7 @@ \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth} \bookcover@partwidth{\flapwidth} \bookcover@fg{\bookcover@fgfirst@frontflap}\fi\fi -%% {fgfirst}{above front} = {fgfirst}{remark} in version 1.0 +%% {fgfirst}{above front} = {fgfirst}{remark} in v1.0 \ifx\bookcover@fgfirst@abovefront\@empty\else\ifdim\marklength>0mm \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth} \bookcover@ypos{0mm} @@ -520,77 +1066,12 @@ \bookcover@partwidth{\coverwidth} \bookcover@partheight{\marklength} \bookcover@remark{\bookcover@fgfirst@belowback}\fi\fi -%% mark top parameters -\bookcover@ypos{0mm} -\bookcover@partwidth{\markthick} -%% mark top 1 -\bookcover(a)xpos{\marklength+\bleedwidth-.5\markthick} -\bookcover@vmark -%% mark top 2 -\ifdim\flapwidth>0mm - \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth-.5\markthick} - \bookcover@vmark\fi -%% mark top 3 -\bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth-.5\markthick} -\bookcover@vmark -%% mark top 4 -\bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth-.5\markthick} -\bookcover@vmark -%% mark top 5 -\ifdim\flapwidth>0mm - \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth-.5\markthick} - \bookcover@vmark\fi -%% mark top 6 -\bookcover@xpos{\marklength+\bleedwidth+2\flapwidth+2\coverwidth+\spinewidth-.5\markthick} -\bookcover@vmark -%% mark bottom parameters -\bookcover@ypos{\paperheight-\marklength} -\bookcover@partwidth{\markthick} -%% mark bottom 1 -\bookcover(a)xpos{\marklength+\bleedwidth-.5\markthick} -\bookcover@vmark -%% mark bottom 2 -\ifdim\flapwidth>0mm - \bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth-.5\markthick} - \bookcover@vmark\fi -%% mark bottom 3 -\bookcover(a)xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth-.5\markthick} -\bookcover@vmark -%% mark bottom 4 -\bookcover@xpos{\marklength+\bleedwidth+\flapwidth+\coverwidth+\spinewidth-.5\markthick} -\bookcover@vmark -%% mark bottom 5 -\ifdim\flapwidth>0mm - \bookcover@xpos{\marklength+\bleedwidth+\flapwidth+2\coverwidth+\spinewidth-.5\markthick} - \bookcover@vmark\fi -%% mark bottom 6 -\bookcover@xpos{\marklength+\bleedwidth+2\flapwidth+2\coverwidth+\spinewidth-.5\markthick} -\bookcover@vmark -%% mark left parameters -\bookcover@xpos{0mm} -\bookcover@partwidth{\marklength} -%% mark left 1 -\bookcover(a)ypos{\marklength+\bleedwidth-.5\markthick} -\bookcover@hmark -%% mark left 2 -\bookcover(a)ypos{\marklength+\bleedwidth+\coverheight-.5\markthick} -\bookcover@hmark -%% mark right parameters -\bookcover@xpos{\paperwidth-\marklength} -\bookcover@partwidth{\marklength} -%% mark right 1 -\bookcover(a)ypos{\marklength+\bleedwidth-.5\markthick} -\bookcover@hmark -%% mark right 2 -\bookcover(a)ypos{\marklength+\bleedwidth+\coverheight-.5\markthick} -\bookcover@hmark +%% marks +\bookcover@marks %% trimming -\ifbookcover@trimmed - \bookcover@trimming\fi +\ifbookcover@trimmed\bookcover@trimming\fi %% new book cover -\mbox{} -\newpage -\bookcover@reset} +\mbox{}\newpage\bookcover@reset} \endinput %% %% End of file `bookcover.cls'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bookcover.tlpobj new/tlpkg/tlpobj/bookcover.tlpobj --- old/tlpkg/tlpobj/bookcover.tlpobj 2016-05-03 03:16:00.000000000 +0200 +++ new/tlpkg/tlpobj/bookcover.tlpobj 2017-04-17 16:24:29.000000000 +0200 @@ -1,13 +1,13 @@ name bookcover category Package -revision 40827 +revision 43861 shortdesc A class for book covers and dust jackets relocated 1 longdesc This class helps typesetting book covers and dust jackets. -runfiles size=7 +runfiles size=12 RELOC/tex/latex/bookcover/bookcover.cls catalogue-ctan /macros/latex/contrib/bookcover -catalogue-date 2016-05-01 16:50:05 +0200 +catalogue-date 2017-04-13 12:51:22 +0200 catalogue-license lppl1.2 catalogue-topics class covers -catalogue-version 1.1 +catalogue-version 2.1 ++++++ bookdb.doc.tar.xz ++++++ ++++++ bookdb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bookdb.tlpobj new/tlpkg/tlpobj/bookdb.tlpobj --- old/tlpkg/tlpobj/bookdb.tlpobj 2016-04-14 18:47:46.000000000 +0200 +++ new/tlpkg/tlpobj/bookdb.tlpobj 2017-04-14 17:34:01.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=9 RELOC/bibtex/bst/bookdb/bookdb.bst catalogue-ctan /biblio/bibtex/contrib/bookdb -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 catalogue-version 0.2 ++++++ bookest.doc.tar.xz ++++++ ++++++ bookest.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bookest.tlpobj new/tlpkg/tlpobj/bookest.tlpobj --- old/tlpkg/tlpobj/bookest.tlpobj 2016-04-14 18:47:47.000000000 +0200 +++ new/tlpkg/tlpobj/bookest.tlpobj 2017-04-14 17:34:01.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/latex/bookest/bookest.cls catalogue-ctan /macros/latex/contrib/bookest -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics class book-pub catalogue-version 1.1 ++++++ bookhands.doc.tar.xz ++++++ ++++++ bookhands.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bookhands.tlpobj new/tlpkg/tlpobj/bookhands.tlpobj --- old/tlpkg/tlpobj/bookhands.tlpobj 2016-04-14 18:47:49.000000000 +0200 +++ new/tlpkg/tlpobj/bookhands.tlpobj 2017-04-14 17:34:02.000000000 +0200 @@ -266,6 +266,6 @@ RELOC/tex/latex/bookhands/t1uncl.fd RELOC/tex/latex/bookhands/uncial.sty catalogue-ctan /fonts/bookhands -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-07-29 06:41:49 +0200 catalogue-license lppl catalogue-topics font-bookhand collection ++++++ booklet.doc.tar.xz ++++++ ++++++ booklet.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/booklet.tlpobj new/tlpkg/tlpobj/booklet.tlpobj --- old/tlpkg/tlpobj/booklet.tlpobj 2016-04-14 18:47:50.000000000 +0200 +++ new/tlpkg/tlpobj/booklet.tlpobj 2017-04-14 17:34:02.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/booklet/bkltprnt.sty RELOC/tex/latex/booklet/booklet.sty catalogue-ctan /macros/latex/contrib/booklet -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 0.7b ++++++ bookman.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bookman.tlpobj new/tlpkg/tlpobj/bookman.tlpobj --- old/tlpkg/tlpobj/bookman.tlpobj 2016-04-14 18:47:50.000000000 +0200 +++ new/tlpkg/tlpobj/bookman.tlpobj 2017-04-14 17:34:02.000000000 +0200 @@ -208,6 +208,6 @@ RELOC/tex/latex/bookman/ts1ubk.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 ++++++ booktabs-de.doc.tar.xz ++++++ ++++++ booktabs-fr.doc.tar.xz ++++++ ++++++ booktabs.doc.tar.xz ++++++ ++++++ booktabs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/booktabs.tlpobj new/tlpkg/tlpobj/booktabs.tlpobj --- old/tlpkg/tlpobj/booktabs.tlpobj 2016-05-03 03:16:01.000000000 +0200 +++ new/tlpkg/tlpobj/booktabs.tlpobj 2017-04-14 17:34:03.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/booktabs/booktabs.sty catalogue-ctan /macros/latex/contrib/booktabs -catalogue-date 2016-04-29 11:11:52 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics table table-rule catalogue-version 1.618033 ++++++ boolexpr.doc.tar.xz ++++++ ++++++ boolexpr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boolexpr.tlpobj new/tlpkg/tlpobj/boolexpr.tlpobj --- old/tlpkg/tlpobj/boolexpr.tlpobj 2016-04-14 18:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/boolexpr.tlpobj 2017-04-14 17:34:03.000000000 +0200 @@ -17,7 +17,7 @@ runfiles size=2 RELOC/tex/latex/boolexpr/boolexpr.sty catalogue-ctan /macros/latex/contrib/boolexpr -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 3.14 ++++++ boondox.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/boondox/README new/doc/fonts/boondox/README --- old/doc/fonts/boondox/README 2011-05-05 19:09:09.000000000 +0200 +++ new/doc/fonts/boondox/README 2017-02-27 00:01:02.000000000 +0100 @@ -1,4 +1,4 @@ -With the exception of the PostScript fonts, 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. +With the exception of the PostScript fonts, this material is subject to the LaTeX Project Public License. See http://www.ctan.org/help/Catalogue/licenses.lppl.html for the details of that license. The PostScript fonts in this package were derived from the STIX OpenType collection, with regular and bold weights of calligraphic, fraktur and double-struck (aka blackboard bold.) As such, they must be released under the SIL OPEN FONT LICENSE Version 1.1, whose details may be viewed in the file @@ -6,7 +6,27 @@ distributed with the STIX fonts. -The package contains virtual fonts based on the PostScript fonts with metrics adjusted to suit my taste in width, accent position and subscript position. There are also less oblique variants of the calligraphic faces. +The package contains virtual fonts based on the PostScript fonts with metrics adjusted to suit my taste in width, accent position and subscript position. There are also less oblique variants of the calligraphic faces. The current version, 1.01, dated 2015-06-14, corrects a flaw in uboondox-cal.fd, which now once again loads as expected. + +Current version 1.02d 2017-02-25 + +Changes in version 1.02d +Corrected date format in sty files. + +Changes in version 1.02c +Corrected BOONDOX-uprscr.sty + +Changes in version 1.02b +Corrected another error in uboondoxuprscr.fd. + +Changes in version 1.02a +Corrected an error in uboondoxuprscr.fd. + +Changes in version 1.02 +Added a new font, called by BOONDOX-uprscr.sty, which takes the glyphs from STIX-MathScr-*.pfb, unslants them and reshapes the outlines where needed. + +Changes in version 1.01 +Added the newer version of the bold double-struck STIX fonts (version 1.1) so that BOONDOX-b-ds now has full alphabetic coverage. Install the TDS in the usual way. For example, if you have administrative privileges under OS X, cd to the top level of the downloaded folder (where you see subfolders doc, fonts, tex) and type Binary files old/doc/fonts/boondox/boondox-doc.pdf and new/doc/fonts/boondox/boondox-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/boondox/boondox-doc.tex new/doc/fonts/boondox/boondox-doc.tex --- old/doc/fonts/boondox/boondox-doc.tex 2011-05-05 19:09:09.000000000 +0200 +++ new/doc/fonts/boondox/boondox-doc.tex 2017-02-23 23:01:03.000000000 +0100 @@ -1,4 +1,13 @@ +% !TEX TS-program = pdflatexmk \documentclass[11pt]{article} +%SetFonts +% newtxtext+newtxmath +\usepackage{newtxtext} %loads helv for ss, txtt for tt +\usepackage{amsmath} +\usepackage[bigdelims]{newtxmath} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +%SetFonts \usepackage[margin=1.4in]{geometry} %\geometry{landscape} % Activate for for rotated page geometry \usepackage[parfill]{parskip} % Activate to begin paragraphs with an empty line rather than an indent @@ -67,4 +76,10 @@ See the \textsf{mathalfa} documentation for font samples of these and many other math alphabets. +\section*{Added 2017-02-23} +A new BOONDOX alphabet was added, based on STIX-MathScr, but with the slant removed and glyphs reworked to have smaller swashes and smaller tails that intrude less into the space inhabited by subscripts. To call this alphabet as \verb|\mathscr|, use e.g., +\begin{verbatim} +\usepackage[scaled=.98]{BOONDOX-uprscr} +\end{verbatim} +This alphabet is also available through {\tt mathalfa}. Because using it in these ways adds an extra math family, it may be desirable to load it not as a math font. See the documentation to {\tt TXUprCal} for details of such usage. \end{document} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boondox.doc.tlpobj new/tlpkg/tlpobj/boondox.doc.tlpobj --- old/tlpkg/tlpobj/boondox.doc.tlpobj 2016-04-14 18:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/boondox.doc.tlpobj 2017-04-14 17:34:03.000000000 +0200 @@ -1,9 +1,9 @@ name boondox.doc category Package -revision 22313 +revision 43344 shortdesc doc files of boondox relocated 1 -docfiles size=10 +docfiles size=28 RELOC/doc/fonts/boondox/README RELOC/doc/fonts/boondox/boondox-doc.pdf RELOC/doc/fonts/boondox/boondox-doc.tex ++++++ boondox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/boondox/boondox.map new/fonts/map/dvips/boondox/boondox.map --- old/fonts/map/dvips/boondox/boondox.map 2011-05-05 19:09:09.000000000 +0200 +++ new/fonts/map/dvips/boondox/boondox.map 2017-02-23 23:01:07.000000000 +0100 @@ -1,4 +1,3 @@ -% Created by TeXFontUtility 2011-04-25 17:16:06 zxxbf7z BoondoxFraktur-Bold <zxxbf8a.pfb zxxbl7z BoondoxDoubleStruck-Bold <zxxbl8a.pfb zxxbw7z BoondoxCalligraphic-Bold <zxxbw8a.pfb @@ -7,3 +6,5 @@ zxxrw7z BoondoxCalligraphic-Regular <zxxrw8a.pfb zxxbow7z BoondoxCalligraphic-Bold " -.3 SlantFont " <zxxbw8a.pfb zxxrow7z BoondoxCalligraphic-Regular " -.3 SlantFont " <zxxrw8a.pfb +BOONDOXUprScr-Regular BOONDOXUprScr-Regular <BOONDOXUprScr-Regular.pfb +BOONDOXUprScr-Bold BOONDOXUprScr-Bold <BOONDOXUprScr-Bold.pfb Binary files old/fonts/tfm/public/boondox/BOONDOX-b-ds.tfm and new/fonts/tfm/public/boondox/BOONDOX-b-ds.tfm differ Binary files old/fonts/tfm/public/boondox/BOONDOXUprScr-Bold.tfm and new/fonts/tfm/public/boondox/BOONDOXUprScr-Bold.tfm differ Binary files old/fonts/tfm/public/boondox/BOONDOXUprScr-Regular.tfm and new/fonts/tfm/public/boondox/BOONDOXUprScr-Regular.tfm differ Binary files old/fonts/tfm/public/boondox/zxxbl7z.tfm and new/fonts/tfm/public/boondox/zxxbl7z.tfm differ Binary files old/fonts/type1/public/boondox/BOONDOXUprScr-Bold.pfb and new/fonts/type1/public/boondox/BOONDOXUprScr-Bold.pfb differ Binary files old/fonts/type1/public/boondox/BOONDOXUprScr-Regular.pfb and new/fonts/type1/public/boondox/BOONDOXUprScr-Regular.pfb differ Binary files old/fonts/type1/public/boondox/zxxbl8a.pfb and new/fonts/type1/public/boondox/zxxbl8a.pfb differ Binary files old/fonts/vf/public/boondox/BOONDOX-b-ds.vf and new/fonts/vf/public/boondox/BOONDOX-b-ds.vf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/BOONDOX-cal.sty new/tex/latex/boondox/BOONDOX-cal.sty --- old/tex/latex/boondox/BOONDOX-cal.sty 2011-05-05 19:09:09.000000000 +0200 +++ new/tex/latex/boondox/BOONDOX-cal.sty 2017-02-27 00:01:03.000000000 +0100 @@ -1,5 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{BOONDOX-cal}[2011/04/26 v1 U/BOONDOX-cal] +\def\fileversion{1.02} +\def\filedate{2017/02/25} +\ProvidesPackage{BOONDOX-cal}[\filedate\space v\fileversion\space U/BOONDOX-cal] \RequirePackage{xkeyval}% \define(a)key{BOONDOX-cal.sty}{scaled}[1.0]{% \expandafter\def\csname BOONDOX-cal@scale\endcsname {#1}}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/BOONDOX-calo.sty new/tex/latex/boondox/BOONDOX-calo.sty --- old/tex/latex/boondox/BOONDOX-calo.sty 2011-05-05 19:09:09.000000000 +0200 +++ new/tex/latex/boondox/BOONDOX-calo.sty 2017-02-27 00:01:03.000000000 +0100 @@ -1,5 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{BOONDOX-calo}[2011/04/26 v1 U/BOONDOX-calo] +\def\fileversion{1.02} +\def\filedate{2017/02/25} +\ProvidesPackage{BOONDOX-calo}[\filedate\space v\fileversion\space U/BOONDOX-calo] \RequirePackage{xkeyval}% \define(a)key{BOONDOX-calo.sty}{scaled}[1.0]{% \expandafter\def\csname BOONDOX-calo@scale\endcsname {#1}}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/BOONDOX-ds.sty new/tex/latex/boondox/BOONDOX-ds.sty --- old/tex/latex/boondox/BOONDOX-ds.sty 2011-05-05 19:09:09.000000000 +0200 +++ new/tex/latex/boondox/BOONDOX-ds.sty 2017-02-27 00:01:03.000000000 +0100 @@ -1,5 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{BOONDOX-ds}[2011/04/26 v1 U/BOONDOX-ds] +\def\fileversion{1.02} +\def\filedate{2017/02/25} +\ProvidesPackage{BOONDOX-ds}[\filedate\space v\fileversion\space U/BOONDOX-ds] \RequirePackage{xkeyval}% \define(a)key{BOONDOX-ds.sty}{scaled}[1.0]{% \expandafter\def\csname BOONDOX-ds@scale\endcsname {#1}}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/BOONDOX-frak.sty new/tex/latex/boondox/BOONDOX-frak.sty --- old/tex/latex/boondox/BOONDOX-frak.sty 2011-05-05 19:09:09.000000000 +0200 +++ new/tex/latex/boondox/BOONDOX-frak.sty 2017-02-27 00:01:03.000000000 +0100 @@ -1,5 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{BOONDOX-frak}[2011/04/26 v1 U/BOONDOX-frak] +\def\fileversion{1.02} +\def\filedate{2017/02/25} +\ProvidesPackage{BOONDOX-frak}[\filedate\space v\fileversion\space U/BOONDOX-frak] \RequirePackage{xkeyval}% \define(a)key{BOONDOX-frak.sty}{scaled}[1.0]{% \expandafter\def\csname BOONDOX-frak@scale\endcsname {#1}}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/BOONDOX-uprscr.sty new/tex/latex/boondox/BOONDOX-uprscr.sty --- old/tex/latex/boondox/BOONDOX-uprscr.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/boondox/BOONDOX-uprscr.sty 2017-02-25 00:01:05.000000000 +0100 @@ -0,0 +1,13 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{BOONDOX-uprscr}[2017/02/23 v1 U/BOONDOXUprScr] +\RequirePackage{xkeyval}% +\define(a)key{BOONDOX-uprscr.sty}{scaled}[1.0]{% +\def\BDUprScrScale{#1}}% +\ExecuteOptionsX<BOONDOX-uprscr.sty>{scaled}% +\ProcessOptionsX<BOONDOX-uprscr.sty>\relax% +\let\mathscr\relax +\let\mathbscr\relax +\DeclareMathAlphabet{\mathscr}{U}{boondoxuprscr}{m}{n} +\SetMathAlphabet{\mathscr}{bold}{U}{boondoxuprscr}{b}{n} +\DeclareMathAlphabet{\mathbscr} {U}{boondoxuprscr}{b}{n} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/uboondox-cal.fd new/tex/latex/boondox/uboondox-cal.fd --- old/tex/latex/boondox/uboondox-cal.fd 2011-05-05 19:09:09.000000000 +0200 +++ new/tex/latex/boondox/uboondox-cal.fd 2016-11-25 19:33:43.000000000 +0100 @@ -10,14 +10,10 @@ \expandafter\ifx\csname BOONDOX-cal@scale\endcsname\relax \let\BOONDOXcal@@scale\@empty\else\edef\BOONDOXcal@@scale{s*[\csname BOONDOX-cal@scale\endcsname]}\fi -\DeclareFontFamily{U}{BOONDOX-cal}{\skewchar \font =45} -\DeclareFontShape{U}{BOONDOX-cal}{m}{n}{ - <-> \BOONDOXcal@@scale BOONDOX-r-cal -}{} -\DeclareFontShape{U}{BOONDOX-cal}{b}{n}{ - <-> \BOONDOXcal@@scale BOONDOX-b-cal -}{} +\DeclareFontFamily{U}{BOONDOX-cal}{\skewchar\font =45} +\DeclareFontShape{U}{BOONDOX-cal}{m}{n}{<-> \BOONDOXcal@@scale BOONDOX-r-cal}{} +\DeclareFontShape{U}{BOONDOX-cal}{b}{n}{<-> \BOONDOXcal@@scale BOONDOX-b-cal}{} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/boondox/uboondoxuprscr.fd new/tex/latex/boondox/uboondoxuprscr.fd --- old/tex/latex/boondox/uboondoxuprscr.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/boondox/uboondoxuprscr.fd 2017-02-25 00:01:05.000000000 +0100 @@ -0,0 +1,19 @@ +%Filename: uboondoxuprscr.fd + +\ProvidesFile{uboondoxuprscr.fd} + [2017/02/22 Fontinst v1.933 font definitions for U/BOONDOXUprScr.] + + +\@ifundefined{BDUprScrScale} + {\let\BDUprScr@Scale\empty}% + {\edef\BDUprScr@Scale{s*[\BDUprScrScale]}} + +\DeclareFontFamily{U}{boondoxuprscr}{\skewchar \font =45} +\DeclareFontShape{U}{boondoxuprscr}{m}{n}{ + <-> \BDUprScr@Scale BOONDOXUprScr-Regular}{} +\DeclareFontShape{U}{boondoxuprscr}{b}{n}{ + <-> \BDUprScr@Scale BOONDOXUprScr-Bold}{} + + +\endinput + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boondox.tlpobj new/tlpkg/tlpobj/boondox.tlpobj --- old/tlpkg/tlpobj/boondox.tlpobj 2016-04-14 18:47:52.000000000 +0200 +++ new/tlpkg/tlpobj/boondox.tlpobj 2017-04-14 17:34:03.000000000 +0200 @@ -1,15 +1,15 @@ name boondox category Package -revision 22313 +revision 43344 shortdesc Mathematical alphabets derived from the STIX fonts relocated 1 longdesc The package contains a number of PostScript fonts derived from -longdesc the STIX OpenType fonts, that may be used in maths mode in +longdesc the STIX OpenType fonts that may be used in maths mode in longdesc regular and bold weights for calligraphic, fraktur and double- longdesc struck alphabets. Virtual fonts with metrics suitable for maths longdesc mode are provided, as are LaTeX support files. execute addMap boondox.map -runfiles size=66 +runfiles size=98 RELOC/fonts/map/dvips/boondox/boondox.map RELOC/fonts/tfm/public/boondox/BOONDOX-b-cal.tfm RELOC/fonts/tfm/public/boondox/BOONDOX-b-calo.tfm @@ -19,6 +19,8 @@ RELOC/fonts/tfm/public/boondox/BOONDOX-r-calo.tfm RELOC/fonts/tfm/public/boondox/BOONDOX-r-ds.tfm RELOC/fonts/tfm/public/boondox/BOONDOX-r-frak.tfm + RELOC/fonts/tfm/public/boondox/BOONDOXUprScr-Bold.tfm + RELOC/fonts/tfm/public/boondox/BOONDOXUprScr-Regular.tfm RELOC/fonts/tfm/public/boondox/zxxbf7z.tfm RELOC/fonts/tfm/public/boondox/zxxbf8a.tfm RELOC/fonts/tfm/public/boondox/zxxbl7z.tfm @@ -33,6 +35,8 @@ RELOC/fonts/tfm/public/boondox/zxxrow7z.tfm RELOC/fonts/tfm/public/boondox/zxxrw7z.tfm RELOC/fonts/tfm/public/boondox/zxxrw8a.tfm + RELOC/fonts/type1/public/boondox/BOONDOXUprScr-Bold.pfb + RELOC/fonts/type1/public/boondox/BOONDOXUprScr-Regular.pfb RELOC/fonts/type1/public/boondox/zxxbf8a.pfb RELOC/fonts/type1/public/boondox/zxxbl8a.pfb RELOC/fonts/type1/public/boondox/zxxbw8a.pfb @@ -51,12 +55,14 @@ RELOC/tex/latex/boondox/BOONDOX-calo.sty RELOC/tex/latex/boondox/BOONDOX-ds.sty RELOC/tex/latex/boondox/BOONDOX-frak.sty + RELOC/tex/latex/boondox/BOONDOX-uprscr.sty RELOC/tex/latex/boondox/uboondox-cal.fd RELOC/tex/latex/boondox/uboondox-calo.fd RELOC/tex/latex/boondox/uboondox-ds.fd RELOC/tex/latex/boondox/uboondox-frak.fd + RELOC/tex/latex/boondox/uboondoxuprscr.fd catalogue-ctan /fonts/boondox -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl +catalogue-date 2017-02-26 09:09:50 +0100 +catalogue-license ofllppl catalogue-topics font font-maths font-type1 -catalogue-version 1.0 +catalogue-version 1.02d ++++++ bophook.doc.tar.xz ++++++ ++++++ bophook.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bophook.tlpobj new/tlpkg/tlpobj/bophook.tlpobj --- old/tlpkg/tlpobj/bophook.tlpobj 2016-04-14 18:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/bophook.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/bophook/bophook.sty catalogue-also everyshi catalogue-ctan /macros/latex/contrib/bophook -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics defer-stuff catalogue-version 0.02 ++++++ borceux.doc.tar.xz ++++++ ++++++ borceux.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/borceux.tlpobj new/tlpkg/tlpobj/borceux.tlpobj --- old/tlpkg/tlpobj/borceux.tlpobj 2016-04-14 18:47:53.000000000 +0200 +++ new/tlpkg/tlpobj/borceux.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -18,6 +18,6 @@ RELOC/tex/generic/borceux/MiniDiagram RELOC/tex/generic/borceux/MultipleArrows catalogue-ctan /macros/generic/diagrams/borceux -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics diagram-comm ++++++ bosisio.doc.tar.xz ++++++ ++++++ bosisio.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bosisio.tlpobj new/tlpkg/tlpobj/bosisio.tlpobj --- old/tlpkg/tlpobj/bosisio.tlpobj 2016-04-14 18:47:54.000000000 +0200 +++ new/tlpkg/tlpobj/bosisio.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -15,6 +15,6 @@ RELOC/tex/latex/bosisio/quotes.sty RELOC/tex/latex/bosisio/sobolev.sty catalogue-ctan /macros/latex/contrib/bosisio -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics collection ++++++ boxedminipage.doc.tar.xz ++++++ ++++++ boxedminipage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boxedminipage.tlpobj new/tlpkg/tlpobj/boxedminipage.tlpobj --- old/tlpkg/tlpobj/boxedminipage.tlpobj 2016-04-14 18:47:54.000000000 +0200 +++ new/tlpkg/tlpobj/boxedminipage.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/boxedminipage/boxedminipage.sty catalogue-also boxedminipage2e catalogue-ctan /macros/latex/contrib/boxedminipage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics boxing catalogue-version 2 ++++++ boxedminipage2e.doc.tar.xz ++++++ ++++++ boxedminipage2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boxedminipage2e.tlpobj new/tlpkg/tlpobj/boxedminipage2e.tlpobj --- old/tlpkg/tlpobj/boxedminipage2e.tlpobj 2016-04-14 18:47:54.000000000 +0200 +++ new/tlpkg/tlpobj/boxedminipage2e.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/boxedminipage2e/boxedminipage2e.sty catalogue-also boxedminipage catalogue-ctan /macros/latex/contrib/boxedminipage2e -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 1.0 ++++++ boxhandler.doc.tar.xz ++++++ ++++++ boxhandler.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boxhandler.tlpobj new/tlpkg/tlpobj/boxhandler.tlpobj --- old/tlpkg/tlpobj/boxhandler.tlpobj 2016-04-14 18:47:55.000000000 +0200 +++ new/tlpkg/tlpobj/boxhandler.tlpobj 2017-04-14 17:34:04.000000000 +0200 @@ -21,7 +21,7 @@ runfiles size=6 RELOC/tex/latex/boxhandler/boxhandler.sty catalogue-ctan /macros/latex/contrib/boxhandler -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics float caption defer-stuff catalogue-version 1.30 ++++++ bpchem.doc.tar.xz ++++++ ++++++ bpchem.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bpchem.tlpobj new/tlpkg/tlpobj/bpchem.tlpobj --- old/tlpkg/tlpobj/bpchem.tlpobj 2016-04-14 18:47:55.000000000 +0200 +++ new/tlpkg/tlpobj/bpchem.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/bpchem/bpchem.sty catalogue-ctan /macros/latex/contrib/bpchem -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics chemistry catalogue-version 1.06 ++++++ bpolynomial.doc.tar.xz ++++++ ++++++ bpolynomial.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bpolynomial.tlpobj new/tlpkg/tlpobj/bpolynomial.tlpobj --- old/tlpkg/tlpobj/bpolynomial.tlpobj 2016-04-14 18:47:55.000000000 +0200 +++ new/tlpkg/tlpobj/bpolynomial.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=3 RELOC/metapost/bpolynomial/bpolynomial.mp catalogue-ctan /graphics/metapost/contrib/macros/bpolynomial -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-plotfn catalogue-version 0.5 ++++++ br-lex.doc.tar.xz ++++++ ++++++ br-lex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/br-lex.tlpobj new/tlpkg/tlpobj/br-lex.tlpobj --- old/tlpkg/tlpobj/br-lex.tlpobj 2016-04-14 18:47:55.000000000 +0200 +++ new/tlpkg/tlpobj/br-lex.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=1 RELOC/tex/latex/br-lex/br-lex.cls catalogue-ctan /macros/latex/contrib/br-lex -catalogue-date 2016-02-12 11:34:15 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics legal class ++++++ bracketkey.doc.tar.xz ++++++ ++++++ bracketkey.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bracketkey.tlpobj new/tlpkg/tlpobj/bracketkey.tlpobj --- old/tlpkg/tlpobj/bracketkey.tlpobj 2016-04-14 18:47:56.000000000 +0200 +++ new/tlpkg/tlpobj/bracketkey.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/bracketkey/bracketkey.sty catalogue-ctan /macros/latex/contrib/bracketkey -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics biology catalogue-version 1.0 ++++++ braids.doc.tar.xz ++++++ ++++++ braids.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/braids.tlpobj new/tlpkg/tlpobj/braids.tlpobj --- old/tlpkg/tlpobj/braids.tlpobj 2016-04-14 18:47:56.000000000 +0200 +++ new/tlpkg/tlpobj/braids.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/braids/braids.sty catalogue-ctan /graphics/pgf/contrib/braids -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 diagram catalogue-version 1.0 ++++++ braille.doc.tar.xz ++++++ ++++++ braille.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/braille.tlpobj new/tlpkg/tlpobj/braille.tlpobj --- old/tlpkg/tlpobj/braille.tlpobj 2016-04-14 18:47:56.000000000 +0200 +++ new/tlpkg/tlpobj/braille.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=5 RELOC/tex/latex/braille/braille.sty catalogue-ctan /macros/latex/contrib/braille -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics spec-alphabet ++++++ braket.doc.tar.xz ++++++ ++++++ braket.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/braket.tlpobj new/tlpkg/tlpobj/braket.tlpobj --- old/tlpkg/tlpobj/braket.tlpobj 2016-04-14 18:47:56.000000000 +0200 +++ new/tlpkg/tlpobj/braket.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -12,6 +12,6 @@ runfiles size=1 RELOC/tex/latex/braket/braket.sty catalogue-ctan /macros/latex/contrib/braket -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 ++++++ brandeis-dissertation.doc.tar.xz ++++++ ++++++ brandeis-dissertation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brandeis-dissertation.tlpobj new/tlpkg/tlpobj/brandeis-dissertation.tlpobj --- old/tlpkg/tlpobj/brandeis-dissertation.tlpobj 2016-04-14 18:47:57.000000000 +0200 +++ new/tlpkg/tlpobj/brandeis-dissertation.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=4 RELOC/tex/latex/brandeis-dissertation/brandeis-dissertation.cls catalogue-ctan /macros/latex/contrib/brandeis-dissertation -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics dissertation catalogue-version 2.0 ++++++ breakcites.doc.tar.xz ++++++ ++++++ breakcites.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breakcites.tlpobj new/tlpkg/tlpobj/breakcites.tlpobj --- old/tlpkg/tlpobj/breakcites.tlpobj 2016-04-14 18:47:57.000000000 +0200 +++ new/tlpkg/tlpobj/breakcites.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=1 RELOC/tex/latex/breakcites/breakcites.sty catalogue-ctan /macros/latex/contrib/breakcites -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics cite-supp ++++++ breakurl.doc.tar.xz ++++++ ++++++ breakurl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breakurl.tlpobj new/tlpkg/tlpobj/breakurl.tlpobj --- old/tlpkg/tlpobj/breakurl.tlpobj 2016-04-14 18:47:57.000000000 +0200 +++ new/tlpkg/tlpobj/breakurl.tlpobj 2017-04-14 17:34:05.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/breakurl/breakurl.sty catalogue-also hyperref catalogue-ctan /macros/latex/contrib/breakurl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyper catalogue-version 1.40 ++++++ breqn.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/breqn/README.md new/doc/latex/breqn/README.md --- old/doc/latex/breqn/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/breqn/README.md 2017-01-29 00:01:05.000000000 +0100 @@ -0,0 +1,43 @@ +# The BREQN packages + +This is the latest repository for the breqn package, originally developed by Michael J. Downes and later taken over by Morten Høgholm. + +The version of the package here will be used as the source for current CTAN releases. + +Internal updates are planned but no major development is expected. Contributors welcome — if you dare. + +Feedback should be directed to the Issue Tracker at: + <https://github.com/wspr/breqn/issues> + +## Installation + +Running TeX on each dtx file extracts the runtime files. See the dtx +files for details. + +## The code + +### breqn + +The breqn package facilitates automatic line-breaking of displayed +math expressions. The package was originally developed by Michael +J. Downes. + +### flexisym + +This package turns math symbols into macros. +Is is required by breqn so that breqn can make intelligent decisions +with respect to line-breaking and other details. + +### mathstyle + +Ensures uniform syntax for math subscript (_) and superscript (^) +operations so that they always take exactly one argument. +Grants access to the current mathstyle which eases several tasks such +as avoiding the many pitfalls of \mathchoice and \mathpalette. +This package is used by flexisym. + +## Release notes + +* v0.98e (2017/01/27) + + * Fix in `\mathchoice` to allow use under recent versions of LuaTeX Binary files old/doc/latex/breqn/breqn.pdf and new/doc/latex/breqn/breqn.pdf differ Binary files old/doc/latex/breqn/flexisym.pdf and new/doc/latex/breqn/flexisym.pdf differ Binary files old/doc/latex/breqn/mathstyle.pdf and new/doc/latex/breqn/mathstyle.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breqn.doc.tlpobj new/tlpkg/tlpobj/breqn.doc.tlpobj --- old/tlpkg/tlpobj/breqn.doc.tlpobj 2016-04-14 18:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/breqn.doc.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -1,9 +1,10 @@ name breqn.doc category Package -revision 38099 +revision 43071 shortdesc doc files of breqn relocated 1 -docfiles size=281 +docfiles size=282 + RELOC/doc/latex/breqn/README.md RELOC/doc/latex/breqn/breqn.pdf RELOC/doc/latex/breqn/flexisym.pdf RELOC/doc/latex/breqn/mathstyle.pdf ++++++ breqn.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/breqn.sty new/tex/latex/breqn/breqn.sty --- old/tex/latex/breqn/breqn.sty 2015-08-11 23:14:21.000000000 +0200 +++ new/tex/latex/breqn/breqn.sty 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2008 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{breqn}{2015/08/11}{0.98d}{Breaking equations} +\ProvidesExplPackage{breqn}{2017/01/27}{0.98e}{Breaking equations} \ExplSyntaxOff \edef\breqnpopcats{% \catcode\number`\"=\number\catcode`\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/cmbase.sym new/tex/latex/breqn/cmbase.sym --- old/tex/latex/breqn/cmbase.sym 2014-08-24 00:46:35.000000000 +0200 +++ new/tex/latex/breqn/cmbase.sym 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2010 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/flexisym.sty new/tex/latex/breqn/flexisym.sty --- old/tex/latex/breqn/flexisym.sty 2015-08-11 23:14:21.000000000 +0200 +++ new/tex/latex/breqn/flexisym.sty 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2010 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +32,7 @@ %% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym. %% \RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{flexisym}{2015/08/11}{0.98d}{Make math characters macros} +\ProvidesExplPackage{flexisym}{2017/01/27}{0.98e}{Make math characters macros} \edef\do{% \noexpand\AtEndOfPackage{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathpazo.sym new/tex/latex/breqn/mathpazo.sym --- old/tex/latex/breqn/mathpazo.sym 2014-08-24 00:46:35.000000000 +0200 +++ new/tex/latex/breqn/mathpazo.sym 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2010 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathptmx.sym new/tex/latex/breqn/mathptmx.sym --- old/tex/latex/breqn/mathptmx.sym 2014-08-24 00:46:35.000000000 +0200 +++ new/tex/latex/breqn/mathptmx.sym 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2010 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathstyle.sty new/tex/latex/breqn/mathstyle.sty --- old/tex/latex/breqn/mathstyle.sty 2015-08-11 23:14:21.000000000 +0200 +++ new/tex/latex/breqn/mathstyle.sty 2017-01-29 00:01:06.000000000 +0100 @@ -11,8 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2011 by Morten Hoegholm et al %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson -%% Copyright (C) 2015 by Will Robertson, Joseph Wright +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mathstyle} - [2015/08/11 v0.98d Tracking mathstyle implicitly] + [2017/01/27 0.98e Tracking mathstyle implicitly] \providecommand\@saveprimitive[2]{% \begingroup \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}% @@ -122,7 +122,7 @@ \def\sb#1{\mathsub{\protect\subsupstyle#1}}% \def\sp#1{\mathsup{\protect\subsupstyle#1}}% \def\mathchoice{% - \relax\ifcase\mathstyle + \relax\ifcase\numexpr\mathstyle\relax \expandafter\@firstoffour % Display \or \expandafter\@firstoffour % Cramped display @@ -161,10 +161,11 @@ \renewcommand{\binom}{\genfrac{}(){0pt}} \renewcommand{\dbinom}{\genfrac\displaystyle(){0pt}} \renewcommand{\tbinom}{\genfrac\textstyle(){0pt}} + \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax \def\fracstyle{% - \ifcase\mathstyle + \ifcase\numexpr\mathstyle\relax \chardef\mathstyle=\@ne \or \chardef\mathstyle=\@ne @@ -180,7 +181,7 @@ \def\fracstyle{} \fi \def\currentmathstyle{% - \ifcase\mathstyle + \ifcase\numexpr\mathstyle\relax \@@displaystyle \or \@@displaystyle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/msabm.sym new/tex/latex/breqn/msabm.sym --- old/tex/latex/breqn/msabm.sym 2014-08-24 00:46:35.000000000 +0200 +++ new/tex/latex/breqn/msabm.sym 2017-01-29 00:01:06.000000000 +0100 @@ -11,7 +11,8 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2010 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2014 by Will Robertson +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breqn.tlpobj new/tlpkg/tlpobj/breqn.tlpobj --- old/tlpkg/tlpobj/breqn.tlpobj 2016-04-14 18:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/breqn.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -1,6 +1,6 @@ name breqn category Package -revision 38099 +revision 43071 shortdesc Automatic line breaking of displayed equations relocated 1 longdesc The package provides solutions to a number of common @@ -26,7 +26,7 @@ RELOC/tex/latex/breqn/mathstyle.sty RELOC/tex/latex/breqn/msabm.sym catalogue-ctan /macros/latex/contrib/breqn -catalogue-date 2015-08-11 18:03:08 +0200 +catalogue-date 2017-01-28 14:47:37 +0100 catalogue-license lppl1.3 catalogue-topics maths -catalogue-version 0.98d +catalogue-version 0.98e ++++++ bropd.doc.tar.xz ++++++ ++++++ bropd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bropd.tlpobj new/tlpkg/tlpobj/bropd.tlpobj --- old/tlpkg/tlpobj/bropd.tlpobj 2016-04-14 18:47:58.000000000 +0200 +++ new/tlpkg/tlpobj/bropd.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/bropd/bropd.sty catalogue-ctan /macros/latex/contrib/bropd -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 catalogue-version 1.2 ++++++ brushscr.doc.tar.xz ++++++ ++++++ brushscr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brushscr.tlpobj new/tlpkg/tlpobj/brushscr.tlpobj --- old/tlpkg/tlpobj/brushscr.tlpobj 2016-04-14 18:47:59.000000000 +0200 +++ new/tlpkg/tlpobj/brushscr.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -21,6 +21,6 @@ RELOC/tex/latex/brushscr/pbsi.sty RELOC/tex/latex/brushscr/t1pbsi.fd catalogue-ctan /fonts/brushscr -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-calligraphic font-type1 ++++++ bullcntr.doc.tar.xz ++++++ ++++++ bullcntr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bullcntr.tlpobj new/tlpkg/tlpobj/bullcntr.tlpobj --- old/tlpkg/tlpobj/bullcntr.tlpobj 2016-04-14 18:47:59.000000000 +0200 +++ new/tlpkg/tlpobj/bullcntr.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/bullcntr/bullcntr.sty RELOC/tex/latex/bullcntr/bullenum.sty catalogue-ctan /macros/latex/contrib/bullcntr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics numbers catalogue-version 0.04 ++++++ bundledoc.doc.tar.xz ++++++ ++++++ bundledoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bundledoc.tlpobj new/tlpkg/tlpobj/bundledoc.tlpobj --- old/tlpkg/tlpobj/bundledoc.tlpobj 2016-04-14 18:47:59.000000000 +0200 +++ new/tlpkg/tlpobj/bundledoc.tlpobj 2017-04-14 17:34:06.000000000 +0200 @@ -21,7 +21,7 @@ texmf-dist/tex/latex/bundledoc/texlive-unix-arlatex.cfg texmf-dist/tex/latex/bundledoc/texlive-unix.cfg catalogue-ctan /support/bundledoc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bundle catalogue-version 3.2 ++++++ burmese.doc.tar.xz ++++++ ++++++ burmese.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/burmese.tlpobj new/tlpkg/tlpobj/burmese.tlpobj --- old/tlpkg/tlpobj/burmese.tlpobj 2016-04-14 18:48:00.000000000 +0200 +++ new/tlpkg/tlpobj/burmese.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/burmese/birm.sty RELOC/tex/latex/burmese/ubirm.fd catalogue-ctan /language/burmese -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics burmese ++++++ bussproofs.doc.tar.xz ++++++ ++++++ bussproofs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bussproofs.tlpobj new/tlpkg/tlpobj/bussproofs.tlpobj --- old/tlpkg/tlpobj/bussproofs.tlpobj 2016-04-14 18:48:00.000000000 +0200 +++ new/tlpkg/tlpobj/bussproofs.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/bussproofs/bussproofs.sty catalogue-also ebproof catalogue-ctan /macros/latex/contrib/bussproofs -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 proof catalogue-version 1.1 ++++++ bxbase.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/00README new/doc/latex/bxbase/00README --- old/doc/latex/bxbase/00README 2013-01-14 00:06:54.000000000 +0100 +++ new/doc/latex/bxbase/00README 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ - -Package bxucs - bxucs.sty, bxutf8.def - -Description: - Simple Unicode support to use with TrueType fonts - -Example with 'Charis SIL' - -1. Name the family and font base name. - - Here I use 'fsch' and 'zfsch' -2. Setup this family for some ordinary TeX encoding (say T1). - - (Ex) Generate zfschr8t.tfm by: - ttf2tfm CharisSILR.ttf zfschr@TeXStd@.tfm - - Make t1fsch.fd as follows: -<t1fsch.fd> -\DeclareFontFamily{T1}{fsch}{} -\DeclareFontShape{T1}{fsch}{m}{n}{<->zfschr8t}{} -<EOF> -3. Setup this family for Unicode-subfont (USF) encoding. - - Generate USF-encoding TFMs: - ttf2tfm CharisSILR.ttf zfschr9u-@Unicode@.tfm - - Note the valid UCS-row range: - 00-05,1D-1E,20-25,27,2C,A7,F1-F3,FB,FE-FF - - Make a special FD file for USF-encoding: -<usffsch.fd> -\USFDeclareFontShape{fsch}{00-05,1D-1E,20-25,27,2C,A7,F1-F3,FB,FE-FF}{ - \USFShape{m}{n}{<->zfschr9z-#1}{} -} -<EOF> - - -bxutf8.def: <utf8> -> \bxus@uc -bxutf8s.def: <utf8> -> <bxutf8.def> / \bxus@uc - -\bxus@uc - - - - - -utf8 - bxucs - otf - - -utf8 - bxucs - otf - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/LICENSE new/doc/latex/bxbase/LICENSE --- old/doc/latex/bxbase/LICENSE 2013-01-14 00:06:54.000000000 +0100 +++ new/doc/latex/bxbase/LICENSE 2017-06-06 01:15:19.000000000 +0200 @@ -1,9 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#Cx:n8"$O:n<T$G$k!V(BZR$B!W$K(B -$BB0$7$^$9!#$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - The MIT License -Copyright (c) 2009 ZR +Copyright (c) 2017 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/README new/doc/latex/bxbase/README --- old/doc/latex/bxbase/README 2013-01-14 00:06:54.000000000 +0100 +++ new/doc/latex/bxbase/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,472 +0,0 @@ -================================================== -== BXbase バンドル v0.5 <2010/06/15> == -== by「ZR」（八登崇之/Takayuki YATO）== -== <zrbabbler(a)yahoo.co.jp> == -================================================== -(This file is encoded in UTF-8,) - -欧文 LaTeX2e における多言語文書およびそれに関わるマクロパッケージの作成 -を支援する基本的な機能を提供する。 - - - bxutf8 入力エンコーディング: UTF-8 入力 - - bxutf8x 入力エンコーディング: UTF-8 入力 - - bxbase パッケージ: 基礎ライブラリ - - bxucs パッケージ: 欧文 Unicode 文字出力 - -※ 対応環境は各々のパッケージの解説を参照。 - -■ 本ソフトウェアの一次配布サイト(作者のサイト) - - En toi Pythmeni tes TeXnopoleos 〜電脳世界の奥底にて〜 - http://zrbabbler.hp.infoseek.co.jp/ - - ※ 以下のページに一部機能の使用例を紹介した。 - 「Unicode による文字入力」 - http://zrbabbler.hp.infoseek.co.jp/unichar.html - 「BXbase パッケージ」 - http://zrbabbler.hp.infoseek.co.jp/bxbase.html - -■ インストール - - TDS 1.1 に従ったシステムでは、各ファイルを次の場所に移動する。 - ・*.sty, *.def → $TEXMF/tex/latex/BXbase/ - (残りのファイルは不要) - - W32TeX を C:\usr\local にインストールした場合の例。 - ・*.sty, *.def → C:\usr\local\share\texmf-local\tex\latex\BXbase - --------------------------------------------------- - bxutf8 入力エンコーディング (v0.5) -- UTF-8 入力 --------------------------------------------------- - -LaTeX2e 標準の utf8 入力エンコーディングを拡張して、utf8 で処理できない -文字について符号値を含む中間形式に変換する。この中間形式は他のパッケージ -が処理することが想定されている。 - -■ 対応環境 - - 欧文 LaTeX2e / pLaTeX2e / upLaTeX2e - -■ 読込 - - inputenc のオプションとして指定する。 - \usepackage[bxutf8]{inputenc} - - inputenc が読み込み済の場合は \inputencoding を使う。 - \inputencoding{bxutf8} - - 本文中で他の入力エンコーディングとの間で切り替えることも可能であるが、 - その場合は、一度プレアンブルのどこかで入力エンコーディングを bxutf8 - に切り替えなければならない(bxutf8.def が内部で読み込む utf8.def の - 仕様による)。本文での切り替えはあまりテストされていないので、バグが - ある可能性が高い ;-) - -■ 機能 - - bxutf8 は utf8 の拡張である。utf8 は UTF-8 で書かれた文字を次のよう - に処理する。その文字が出力方法を知っている—つまり読込済のフォント - エンコーディングに含まれる—文字の場合、それを LaTeX の標準的な内部 - 形式(\"a や \OE 等)に変換して後をフォントエンコーディング(fontenc) - の処理に任せる。しかし、知らない文字の場合はエラーになる。 - - bxutf8 は「知らない文字」の場合の処理を変更し、これを \bxUHex{XXXX} - の形式に変換する。ここで XXXX は該当の文字のコード値の 16 進表現で - ある。\bxUHex は該当の文字を出力することが想定されているが、これの - 定義(「ドライバ」と呼ぶことにする)は他のパッケージで与えられる。 - bxutf8 自身のドライバの定義は単にエラーを出すだけである。 - -■ 注意事項 - - - UTF-8 のバイト列から \bxUHex の形式までは完全展開可能になっている。 - また、\bxUHex の定義は robust でなければならない。これは他の入力 - エンコーディングと共通の性質である。 - - 0.5 版の改訂で、BMP 外(U+10000 以上)の符号値に対応した。 - - pLaTeX/upLaTeX の場合、入力漢字コードは UTF-8 (-kanji=utf8) である - 必要がある。この場合、処理系により和文トークンと解釈される文字以外 - が bxutf8 の処理に回る。 - - utf8 が扱える文字については飽くまでも utf8 と全く同じように処理 - されることに注意。例えば、フォントエンコーディングに OT1 と T2A が - 読み込まれている状態で「Д」が入力されると、utf8 はこれを \CYRD に - 変換するが、これは現在のフォントエンコーディングが OT1 である時は - エラーになる(たとえ \bxUHex がフォントエンコーディングに関わらず - 動作するとしても)。 - - ---------------------------------------------------- - bxutf8x 入力エンコーディング (v0.3) -- UTF-8 入力 ---------------------------------------------------- - -Unicode パッケージ(ucs パッケージ)が使用する utf8x 入力エンコーディング -を拡張して、bxutf8 と同様の機能を実現したものである。 - -■ 対応環境 - - 欧文 LaTeX2e / pLaTeX2e / upLaTeX2e - -■ 読込 - - inputenc のオプションとして指定する。 - \usepackage[bxutf8]{inputenc} - - inputenc が読み込み済の場合は \inputencoding を使う。 - \inputencoding{bxutf8} - - 後者の使用については、bxutf8 と同じ制限の他に、utf8x に特有の制限 - がある。 - -■ 機能 - - 基本的には bxutf8 と同じなので、相違点を挙げておく。 - - - utf8x (ucs) のプログラムは utf8 と比して遥かに複雑である。従って - bxutf8x が正しく実装されているかについてはあまり自信が無い。 - - bxutf8x は \bxUInt という内部命令を用いる。 - - utf8x は実際にフォントエンコーディングが読み込まれているかに関わら - ず広範な範囲の文字を自分で処理しようとする。結果的に、欧文の文字に - 関してはほとんど \bxUInt に変換されない。CJK 文字に対しては utf8x - は既定では処理しないので \bxUInt に変換される。 - - --------------------------------------------- - bxbase パッケージ (v0.5) -- 基礎ライブラリ --------------------------------------------- - -他の BX シリーズのパッケージの下請けが主な役目である。文書作成者がこの -パッケージを読み込む場面は少ない。 - -■ 対応環境 - - 欧文 LaTeX2e / pLaTeX2e / upLaTeX2e - -■ 読込 - - \usepackage で読み込む。オプションはない。 - -■ pxbase パッケージとの関係 - - bxbase パッケージと pxbase パッケージ(PX シリーズ)は大部分の機能を - 共通にしている。両方読み込んだ場合は、共通する機能については版が - 新しい方が採用される。過去互換性を崩す更新は行われないので、このこと - に関して文書作成者が気にする必要はないはずである。 - - なお、現在の所、bxbase のみに存在する機能はない。 - -■ 機能 - - DVI special 出力の命令。 - - \recordpapersize - 次の形の papersize special 命令を DVI の先頭に出力する。 - papersize=<幅>,<高さ> - (幅と高さは現在の \paperwidth と \paperheight の値。) - - \dvipdfmxmapline{<テキスト>} - dvipdfmx のマップ指定を文書中で行う。 - ※次の形の papersize special 命令を DVI の先頭に出力する。 - pdf:mapline <テキスト> - - \dvipdfmxmapfile{<ファイル名>} - dvipdfmx のマップファイル指定を文書中で行う。 - ※次の形の papersize special 命令を DVI の先頭に出力する。 - pdf:mapfile <ファイル名> - - 符号値による文字入力のための命令。 - - \Ux{<コード値>,...} - \UI{<コード値>,...} - Unicode コード値による入力を行う。\Ux は欧文用、\UI は和文用(I は - Ideographic の意味)。コード値は以下の形式で表す。コンマで区切って - 複数文字入力できる。 - - <16進数>: A72C, 02000B, 1bd 等。 - - +<10進数>: +254, +0937 等。 - - '<8進数>: '376, '1651 等。 - Unicode 文字の出力には次の順番で利用可能な最初の機能を用いる。(\UI - の場合 3) を飛ばす。) - 1) zxjatype パッケージ。この場合、その機構に従って出力される。\UI - は必ず和文フォントで出力し、\Ux は和文/欧文切替の対象となる。 - 2) XeTeX の Unicode 出力。 - 3) [\Ux のみ] bxums パッケージ。 - 4) upTeX の和文 Unicode 出力。 - 5) UTF/OTF/pxotf パッケージ。 - 6) ums/bxsuika パッケージ。 - どれも使えない場合は「16進表現による代替表現」になる。 - - \AJ{<コード値>,...} - Adobe-Japan1 のコード値による入力を行う。コード値は 10 進数で指定 - する。出力には次の順番で利用可能な最初の機能を用いる。 - 1) zxotf パッケージ。 - 2) UTF/OTF/pxotf パッケージ。 - どれも使えない場合は代替表現になる。 - - \JI{<コード値>,...} - いわゆる「JIS コード」（JIS X 0208 の GL 表現）のコード値による入力 - を行う。コード値指定の方法は \Ux と同じ。出力には (u)pTeX の JIS - コード和文出力の機能を使う。使えない場合は代替表現になる。 - - \KI{<コード値>,...} - いわゆる「区点コード」のコード値による入力を行う。コード値指定は - 以下のいずれかの方法で指定する。 - - RRCC : RR は区番号、CC は点番号を 10 進 2 桁で表したもの。 - - PRRCC : P は面番号。JIS X 0213 のための指定。 - 出力には (u)pTeX の JIS コード和文出力の機能を使う。使えない場合は - 代替表現になる。JIS X 0213 の文字を出力したい場合は、現在の和文 - フォントのエンコーディングが JIS X 0213 に対応するものである必要が - ある。さらに、第 2 面の文字を出力する場合には pTeX の内部漢字コード - が sjis でなければならない。 - - \bxUx / \bxUI / \bxAJ / \bxJI / \bxKI - \Ux 等は非常に短い名前なので他のパッケージと衝突する恐れがあり、 - そこでこのパッケージでは既に同名の命令がある場合は上書きしない - ようにしている。\bxUx 等はそれぞれ \Ux 等と同じで、先のような場合 - にも常に使える。 - - 加えて、このパッケージは bxutf8 の為のドライバ \bxUHex および bxutf8x - の為のドライバを \Ux に相当するものに設定する。 - - 以下のものは本来は和文用の命令であるが、理由があって bxbase にも含めて - いる。pxbase と共通なので詳細は PXbase の説明書を参照してほしい。 - - \safecaret - TeX エスケープ形式(^^ab)の解釈が失敗するのを回避する。 - - Bwbel 関係の命令。 - - \bxcaptionlanguage{<言語名>} - Babel では、通常言語が切り替わるとキャプションや日付の文字列が切り - 替わる。この命令を実行すると、文字列は指定された言語のもので固定 - され、Babel の言語切替の命令に追随しなくなる。この命令自体はプレ - アンブル中で何回でも使用できて最後のものが有効になる。引数には有効 - な言語オプションの名前の他に以下のものが指定できる。 - - main : 基底言語、すなわち Babel で最後に読み込まれた言語だが - 次に述べる \bxmainlanguage で変更可能。 - - default : 文書クラスで指定されたものをそのまま用いる。日本語 - の文書クラスで Babel を用いる時に便利である。 - この命令の意義については後の「キャプション文字列の切替機能について」 - の節を参照。 - - \bxmainlanguage{<言語名>} - 基底言語、すなわち \begin{document} の直後において有効となる言語を - 設定する。通常は Babel において最後に読み込まれた言語オプションが - 基底言語になる。 - -■ キャプション文字列の切替機能について - - Babel の機能の 1 つとして、言語の切替に伴って、キャプションの文字列 - (「参考文献」や「図」等)および日付の書式をその言語用のものに切り替え - るというものがある。これにより、ある言語(例えばスロベニア語)の為の - 文書クラスがなくても英語用のクラスと Babel の言語切替でスロベニア語 - のキャプションの文書が作成できる(レイアウトがその言語の使用圏で許容 - されるかの問題は残るが)。だがこの目的には、プレアンブルでキャプション - 言語を 1 回指定できればよく、文書途中での言語切替にまでキャプション - が追随する利点はあまりなく、場合によっては弊害があると思われる。この - ような場合は - \bxcaptionlanguage{main} - を実行すれば、キャプションは基底言語(\bxmainlanguage の説明参照)で - 固定され以後は変更されない。また - \bxcaptionlanguage{spanish} - のように直接に言語名を指定することもできる。 - - 日本語の場合はもっと特殊な事情がある。日本語のレイアウトは欧米の言語 - のものとは大きく異なるので、日本語の文書を作成する場合には日本語用の - 文書クラスが用いられるのが普通であり、そこでは当然キャプションは既に - 日本語になっている。このような場合は - \bxcaptionlanguage{default} - を実行すれば、キャプションは文書クラスで設定されたものに固定され、 - 以後は変更されない。 - -■ 開発者向け機能 - - \bxUHex{<コード値16進表記>} - bxutf8 が構成する内部表現。用いる機能は \Ux と同じ。 - \bxUInt{<整数>} - bxutf8x が構成する内部表現。用いる機能は \Ux と同じ。 - - \bxInputDefFIle{<ファイルベース名>} - 拡張子 .def のファイルを \usepackage と同じ方式で読み込む。 - \bxCheckCPart{<ファイルベース名>} - 別のファイル(.sty/.def)との版の比較。 - \bxNullify\CS - マクロ \CS を無効にする。 - \bxDebug{<テキスト>} - デバッグメッセージの表示。 - \bxCheckMA<テキスト>\bxEndCheckMA - \edef 中ではこの部分がエラーを出す命令に展開される。 - \bxIfPrimitive\CS{<yes>}{<no>} - 現在の \CS の定義が(同名の)プリミティブかの判定。 - \bxEngineTypeX [整数定数] - 1=pTeX拡張; 2=XeTeX拡張; 3=Omega拡張; 0=以上に該当せず - \bxEngineTypeY [整数定数] - 1=eTeX拡張; 3=pdfTeX拡張; 0=以上に該当せず - (upTeX か否かの判定は ifuptex パッケージを用いる) - - \bxTrivLangDef{<言語名>} - 中身が空の Babel 言語オプションを生成する。 - - \bxToHexTwo{<整数>} [%02X 形式; 0x00〜FF] - \bxToHexThree{<整数>} [%03X 形式; 0x000〜FFF] - \bxToHexFour{<整数>} [%04X 形式; 0x0000〜FFFF] - \bxToHexFive{<整数>} [%05X 形式; 0x00000〜FFFFF] - \bxToHexFiveX{<整数>} [%05X 形式; 0x00000〜FFFFF ※1] - \bxToHexEight{<整数>} [%08X 形式; 0x00000000〜7FFFFFFF] - \bxToHexTiny{<整数>} [%X 形式; 0x0〜FF] - \bxToHexSmall{<整数>} [%X 形式; 0x0〜7FFF] - \bxToHexUC{<整数>} [%04X 形式; 0x0000〜10FFFF ※2] - 16 進表記を \bxHex に返す。UC は 4〜6 桁での表記。 - ※1 0xFFFFF を超える場合は "FFFFF" になる - ※2 XeTeX/LuaTeX/upTeX の場合、\char が可能な範囲。 - - \bxCodeValueSeq\CS{<文字列>} [16進] - \bxCodeValueSeqD\CS{<文字列>} [10進] - \Ux, \UI が使っている、コード値の列を解釈するルーチン。 - - \bxAssign<代入文>\relax - 代入文が完全(ゴミがない)かの判定しスイッチ \ifbxOk に返す。 - - \bxToLower{<文字列>} - \bxToUpper{<文字列>} - 小文字/大文字に変換したものを \bxRes に返す。 - - \bxDocumentSpecial{<テキスト>} - \AtBeginDvi を普通に用いて DVI の先頭部に special を出力する。 - \bxDocumentSpecialUrgent{<テキスト>} - DVI のなるべく先頭(他の special より前)の位置に special を出力。 - - \bxEnableSafeCaret - safe caret 機能を使用可能にしておく。すなわち、プレアンブルでこの - 命令が呼ばれなかった場合、safe caret は使用不可になる。実際にある - 状況で safe caret を有効にするには、\bx@acr@normcaret を「その状況 - での本来の〈^〉の動作」に定義した上で〈^〉をアクティブにする必要が - ある。 - ※ ユーザ命令の \safecaret はこの命令を実行するとともに、verbatim - と babel での適切な safe caret 処理を有効化している。 - - \bxUseShadowMap\CS{<TFM名>} - 命令語 \CS を指定の TFM から生成される shadow map として定義する。 - \bxMap\CS - 整数レジスタ \bxUcv の現在の値に shadow map を適用し、その結果を - \bxUcv に代入する。 - ※ shadow map とは「16 bit 整数 → 整数」の写像を TFM として表現 - したもの。 - ---------------------------------------------------- - bxucs パッケージ (v0.2) -- 欧文 Unicode 文字出力 ---------------------------------------------------- - -Unicode subfont を利用して、(欧文の) Unicode 処理能力をネイティブには -もたない LaTeX 処理系で Unicode フォントを最大限活用する為のパッケージ -である。upLaTeX は和文に関するネイティブな Unicode 処理を行うが、欧文 -として Unicode 文字を扱う場合にはこのパッケージが有効であろう。 - -■ 対応環境 - - 欧文 LaTeX2e / pLaTeX2e / upLaTeX2e - -■ 読込 - - \usepackage で読み込む。オプションはない。 - \usepackage{bxucs} - -■ フォントの準備 - - 欧文フォントファミリに対してこのパッケージによる Unicode 出力を可能 - にする為には、次の 2 種類のエンコーディングに対するファミリの NFSS - に基づくフォント定義が必要である。 - - LaTeX の通常のエンコーディング、最低でも OT1 と T1 - - Unicode subfont エンコーディング(ここでは USF と呼ぶ) - - 例えば、次の 2 シェープからなるフォントファミリがあるとする。 - - FOO_R.ttf : regular weight - - FOO_B.ttf ; bold weight - これを LaTeX ファミリ名 "foo" で定義することを考える。 - - 最初に OT1 に関する定義をする。その為には、各シェープに対する TFM の - 名前を決める必要がある。regular を foo-r-ot1、bold を foo-b-ot1 と - する(勿論 Berry 命名法に従っても良い)と、OT1 に対するフォント定義 - ファイル ot1foo.fd の内容は次のようになる。 - - \DeclareFontFamily{T1}{foo}{} - \DeclareFontShape{T1}{foo}{m}{n}{<->foo-r-ot1}{} - \DeclareFontShape{T1}{foo}{bx}{n}{<->foo-b-ot1}{} - - T1 エンコーディングに対する設定も同様である。 - - 次に Unicode subfont (USF) に対する定義をする。Unicode subfont とは - Unicode の BMP 領域を 256 文字毎に分割して複数の TFM に収めたもので - ある。従って、1 つのシェープに対して TFM は(最大で) 256 個あること - になり、名前の一部に番号(小文字 16 進表記)を含めて表す。今の場合で - は例えば Regular のシェープに対する TFM 名は - foo-r-u?? (?? は 00, 01, …, fe, ff) - とすることができる。同様に Bold を foo-b-u?? とする。Unicode subfont - に対するフォント定義ファイルは次の形式で記述される。 - - \USFDeclareFontShape{<ファミリ>}{<番号列>}{ - \USFShape{<シリーズ>}{<シェープ>}{<TFM定義>}{<初期化>} - (必要なだけ \USFShape を繰り返す) - } - - Unicode subfont は 256 個全てが揃っているとは限らない。例えば 60 番 - (U+6000〜60FF) は漢字のみを含むので、元のフォントファイルが CJK 対応 - のものでない限り、60 番の subfont は存在しないことになる。<番号列> - には、存在する番号の範囲の列を記す。ここでは 00, 01, 02, 03, ff が - 存在するとする。今の例でのフォント定義ファイル usffoo.fd の内容は次 - のようになる。 - - \USFDeclareFontShape{foo}{00-03,FF}{ - \USFShape{m}{n}{<->foo-r-u#1}{} - \USFShape{bx}{n}{<->foo-b-u#1}{} - } - - あとは、今の過程で決めた事項に従って、実際に TFM ファイルを生成し - (TrueType フォントの場合は ttf2tfm を使う)、さらに TFM と実物の - フォントファイルを関連付けるように DVI ウェアを設定する必要もある。 - -■ 機能 - - このパッケージは bxbase の \Ux のインタフェースを利用する。従って、 - \Ux{0425,043E,0440,043E,0448,043E} - のように \Ux の引数にコード値の 16 進表記の列を書けばよい。ただし - この時に、現在のフォントファミリは前述の説明で用意した Unicode - subfont が定義されたものでなければならない。(なお、このパッケージは - 内部で bxbase を読み込むので別に読み込む必要はない。) - - 使用中のフォントに指定されたコードの文字がない場合は、和文用の \UI - の方に処理を渡す。ただしここで e-TeX 拡張が使えない場合、存在する - 文字と同じ subfont に属する文字は全て存在すると判断されてしまうと - いう制限があり、結果として和文フォントには文字があるのに使えない - という現象が起こりうる。 - - -------------------------------------------------------- - zxbase パッケージ (v0.4a) -- XeLaTeX 基礎ライブラリ ------------------------------------------------------- - -拙作の XeLaTeX 用パッケージ(ZX シリーズ)で使われる部品的機能を収めた -パッケージである。今のところ、このパッケージにはユーザ命令は定義されて -いないので、文書作成者が \usepackage で直接これを読み込むことはない。 -(現在、zxotf がこのパッケージを内部で読み込む。) - ----------------------------------------- - -■ 更新履歴 - - version 0.5 <2010/06/15> - - bxbase: \JI/\KI を追加。 - - bxbase: \dvipdfmxmapline/\dvipdfmxmapfont を追加。 - - bxutf8: BMP 外の符号値への対応。 - - version 0.4a <2009/11/16> - - bxbase で \UI/\Ux を zxjatype と、\AJ を zxotf と連携させた。 - - zxbase パッケージを追加。 - - version 0.4 <2009/07/05> - - PXbase の v0.4 に合わせた改訂。 - - version 0.3 <2008/04/06> - - bxutf8x を追加。 - - bxutf8 のバグを修正。 - - bxbase でも pxbase の命令 \recordpapersize を使用可能にした。 - - version 0.2 <2008/03/28> - - 最初の公開版。 - -# EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/README-ja.md new/doc/latex/bxbase/README-ja.md --- old/doc/latex/bxbase/README-ja.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxbase/README-ja.md 2017-06-06 01:15:19.000000000 +0200 @@ -0,0 +1,535 @@ +BXbase パッケージバンドル +========================= + +LaTeX：他の BX パッケージのためのサポートライブラリ + +本バンドルの主な目的は、作者（ZR）の制作する他のパッケージ（名前が +“BX”や“PX”で始まる）が依拠するライブラリ機能の提供である。 + +ただし bxbase パッケージは少数のユーザレベルのコマンドも含むので +単体でも有用である。 + +### 前提環境 + + * TeX フォーマット： LaTeX + * TeX エンジン：不問 + * DVI ウェア（DVI 出力時）：不問 + +### 構成物 + + * `bxbase.sty`： ‘bxbase’パッケージ + * `bxbase.def`： ‘bxbase’のサブモジュール + * `bxtoolbox.sty`： ‘bxtoolbox’パッケージ + * `bxtoolbox.def`： ‘bxtoolbox’のサブモジュール + * `bxtoolbox-ext.def`： ‘bxtoolbox’のサブモジュール + * `bxtoolbox-ja.def`： ‘bxtoolbox’のサブモジュール + * `bxutf8.def`： ‘bxutf8’入力エンコーディング定義 + * `bxutf8x.def`：‘bxutf8x’入力エンコーディング定義 + * `zxbase.sty`： ‘zxbase’パッケージ + * `bxbase-ja.pdf`： ‘bxbase’のユーザ向け説明書（日本語） + * `bxbase-ja.tex`： `bxbase-ja.pdf` のソースファイル + +### インストール + +TDS 1.1 に準拠するシステムの場合、以下のようにファイルを移動する： + + - `*.sty`, `*.def` → $TEXMF/tex/latex/BXbase + +この後必要に応じて mktexlsr を実行する。 + +### ライセンス + +本パッケージは MIT ライセンスの下で配布される。 + +bxbase パッケージ ― 基礎ライブラリ +---------------------------------- + +基本的に、他のパッケージの内部で読み込まれるものであり、作者（ZR）の制作 +する他のパッケージで必要な機能を提供する。 + +本パッケージは幾つかのユーザ命令も提供していたが、その大部分が 1.1 版に +おいて非推奨となった。日本語入力に関する少数の機能が残されている。 + +### ユーザ向け機能 + +ユーザ向け機能についてはマニュアル `bxbase-ja.pdf` を参照されたい。 + +### 開発者向け機能 + +ここでは bxbase パッケージが提供する開発者向け機能について簡単に解説する。 + +※ bxbase パッケージは内部で bxtoolbox パッケージを読み込むため、bxtoolbox +の機能も利用できる。 + +#### 書式記述に関する注意 + +`<LaTeXマクロ定義記述>` は `\newcommand` 等の LaTeX マクロ定義命令に +後続する要素列で、以下のものに等しい。 + + {<命令>}[<引数個数>][<引数既定値>]{<置換テキスト>} + +`<TeXマクロ定義記述>` は `\def` 等の TeX マクロ定義プリミティブに +後続する要素列で、以下のものに等しい。 + + <命令><引数宣言部>{<置換テキスト>} + +`<TeXマクロ定義記述*>` は `<TeXマクロ定義記述>` の先頭の `<命令>` +を除去したもの。 + +#### プログラミング補助 + + * `\bxDebug{<テキスト>}` + デバック出力用命令。このパッケージでの定義では何もしない。 + * `\bxRequireDefinition{<ファイルベース名>}` + 拡張子 .def のファイルを `\usepackage` と同じ方式で読み込む。 + * `\bxNullify\制御綴` + `\制御綴` を「何もしない命令」で `\providecommand` により + 上書きされないものに再定義する。 + * `\bxForEachIn<引数1>,<引数2>,...\do{<置換テキスト>}` + 各々の引数について、`<置換テキスト>` の `#1` をそれで置き換えた + ものを実行する。LaTeX の `\@for` のラッパーで、`\@for` と同じく、 + `\bxForEachIn` の直後のトークンは予め一度展開される。 + * `\bxForEachTokenIn<トークン1><トークン2>...\do{<置換テキスト>}` + 各々の引数について `<置換テキスト>` の `#1` を置き換えたものを + 実行する。LaTeX の `\@tfor` のラッパー。 + * `\bxWithArgExpd{<引数1>}\do{<置換テキスト>}` + * `\bxWithArgsExpd{<引数1>}{<引数2>}...\do{<置換テキスト>}` + `<置換テキスト>` 中の `#1`、`#2`… を各々の引数を一回展開した + ものに置き換えたものを実行する。`\bxWithArgExpd` は 1 引数用に + 最適化したもの。 + * `\bxWithArgFullExpd{<引数1>}\do{<置換テキスト>}` + * `\bxWithArgsFullExpd{<引数1>}{<引数2>}...\do{<置換テキスト>}` + `\bxWithArgsExpd` と同様だが、一回展開でなく完全展開する点が + 異なる。 + * `\bxChompComma<命令>` + `<命令>` の置換テキストの先頭が `,` の場合、それを削除したもので + 再定義する。 + * `\bxAssign<代入文>\relax` + 代入を行った後、代入文の後ろにゴミがないかを判定しその結果を + スイッチ `\ifbxOk` に返す。 + * `\bxCheckMA<テキスト>\bxEndCheckMA` + `\edef` 中ではこの部分がエラーを出す命令に展開される。 + +#### TeX エンジン判別 + + * `\bxEngineTypeX` [整数定数] + 1=pTeX拡張; 2=XeTeX拡張; 3=Omega拡張; 0=以上に該当せず + * `\bxEngineTypeY` [整数定数] + 1=eTeX拡張; 3=pdfTeX拡張; 5=LuaTeX拡張; 0=以上に該当せず + ※現在の LuaTeX は X/Y=0/5 となる。 + ※upTeX か否かの判定は ifptex パッケージを用いる。 + +#### Babel 関係 + + * `\bxAtBeginDocumentBabel{<テキスト>}` + Babel 読込時にのみ実行される begin-document 時のフック。 + * `\bxTrivLangDef{<言語名>}` + 中身（キャプション定義等）が空の Babel 言語オプションを生成する。 + +#### 数値の書式化出力 + + * `\bxToHexTwo{<整数>}` [%02X 形式; 0x00～FF] + * `\bxToHexThree{<整数>}` [%03X 形式; 0x000～FFF] + * `\bxToHexFour{<整数>}` [%04X 形式; 0x0000～FFFF] + * `\bxToHexFive{<整数>}` [%05X 形式; 0x00000～FFFFF] + * `\bxToHexFiveX{<整数>}` [%05X 形式; 0x00000～FFFFF ※1] + * `\bxToHexEight{<整数>}` [%08X 形式; 0x00000000～7FFFFFFF] + * `\bxToHexTiny{<整数>}` [%X 形式; 0x0～FF] + * `\bxToHexSmall{<整数>}` [%X 形式; 0x0～7FFF] + * `\bxToHexUC{<整数>}` [%04X 形式; 0x0000～10FFFF ※2] + 16 進表記を `\bxHex` に返す。UC は 4～6 桁での表記。 + ※1 0xFFFFF を超える場合は `FFFFF` になる + ※2 XeTeX/LuaTeX/upTeX の場合、`\char` が可能な範囲。 + * `\bxToDecFour{<整数>}` [%04d 形式; 0000～9999] + * `\bxToDecFive{<整数>}` [%05d 形式; 00000～99999] + ゼロ付の 10 進表記を `\bxHex` に返す。 + +#### 符号値による入力 + + * `\bxCodeValueSeq\制御綴{<符号値>,...} [16進]` + * `\bxCodeValueSeqD\制御綴{<符号値>,...} [10進]` + 各々の `<符号値>` を解釈した結果を `\bxUcv` に代入してマクロ + `\制御綴` を呼び出す。解釈方法はそれぞれ `\Ux` と `\AJ` 命令の + 解説にある通り。 + * `\bxUHex{<コード値16進表記>}` + bxutf8 が構成する内部表現。用いる機能は `\Ux` と同じ。 + * `\bxUInt{<整数>}` + bxutf8x が構成する内部表現。用いる機能は `\Ux` と同じ。 + +#### 文字列操作 + + * `\bxToLower{<文字列>} [小文字]` + * `\bxToUpper{<文字列>} [大文字]` + `<文字列>` を小文字／大文字に変換したものを `\bxRes` に返す。 + +#### Special 出力 + + * `\bxDocumentSpecial{<テキスト>}` + `\AtBeginDvi` を普通に用いて DVI の先頭部に special を出力する。 + * `\bxDocumentSpecialUrgent{<テキスト>}` + DVI のなるべく先頭（他の special より前）の位置に special を出力。 + +#### Safe caret 機能 + + * `\bxBDHookSafeCaret` + safe caret 機能に関する begin-document フック。 + * `\bxEnableSafeCaret` + safe caret 機能を使用可能にしておく。すなわち、プレアンブルでこの + 命令が呼ばれなかった場合、safe caret は使用不可になる。実際にある + 状況で safe caret を有効にするには、`\bx@acr@normcaret` を「その + 状況での本来の `^` の動作」に定義した上で `^` をアクティブにする + 必要がある。 + ※ ユーザ命令の `\safecaret` はこの命令を実行した上で、verbatim + と babel での適切な safe caret 処理を有効化している。 + +#### Shadow map 機能 + +Shadow map とは「16 ビット整数 → 整数」の写像を TFM として表現 +したもの。 + + * `\bxUseShadowMap\制御綴{<TFM名>}` + `\制御綴` を指定の TFM から生成される shadow map として定義。 + * `\bxMap\制御綴` + 整数レジスタ `\bxUcv` の現在の値に shadow map を適用し、その結果を + `\bxUcv` に代入する。 + +#### モジュール名 + +ここでいう「モジュール」とは文書クラス（.cls）・パッケージ（.sty）・ +定義ファイル（.def）の総称。「モジュール読込中に発生するエラーを出力 +するためのマクロ」を別のモジュール内で定義する際に、呼び出した側の +モジュール名をメッセージ中に出力させるための仕組み。 + + * `\bxSetModuleName{<文字列>}` + 現在のモジュールに対するモジュール名を設定する。 + * `\bxModuleName` + 現在のモジュールに対するモジュール名に展開される。モジュール名が + 設定されていない場合はファイルのベース名を代わりに使う。 + * `\bxError` [`\PackageError` に対応] + * `\bxWarning` [`\PackageWarning` に対応] + * `\bxWarningNoLine` [`\PackageWarningNoLine` に対応] + * `\bxInfo` [`\PackageInfo` に対応] + 現在のモジュール名をパッケージ名として `\PackageError` 等を呼ぶ。 + +#### keyval の拡張 + +（xkeyval が普及した今では非推奨かも…） + +keyval の `\setkeys` について、「未定義のキーをエラーにせず、代わりに +未定義のキーのリストを作成する」という変種を提供する。この機能は +xkeyval で `\setkeys*` として提供されている。しかし xkeyval が利用 +できない環境に対応するために keyval へのパッチとして実現すること +にする。しかし、xkeyval はこのパッチを無効化してしまう。従って +xkeyval.sty が存在するかに応じて処理を分けることにした。 + + * `\bxPrepareSetKeysSafe` + `\bxSetKeysSafe` を使用可能にする。 + ※ xkeyval.sty が存在するかを判定し、存在すれば読み込む。 + そして `\bxSetKeysSafe` の実現方法をこの段階で確定させる。 + * `\bxSetKeysSafe{<ファミリ>}{<テキスト>}` + `\setkeys` と同様だが、未定義のキーをエラーとせず、代わりに + 未定義のキーからなるコンマ区切りのリストを `\bxRestKeys` に + 代入する。 + +#### ドライバ判別 + +以下の説明で「先天的な」ドライバとは、TeX 実行時に使用が判定できる +もの（事実上「TeX エンジンがドライバを兼ねるもの」に等しい）を指し、 +例えば pdfTeX、XeTeX、LuaTeX が該当する。 + + * `\bxDriverList` + （後天的な）ドライバ名のリスト。 + ※ 現状では「`dvips,dvipdfmx,dviout`」。 + * `\bxDriverInherent` + 先天的なドライバ名（未定義なら空）に展開される。 + * `\bxSetDriver[<ファイル名>]{<ドライバ名>}` + 指定のファイル名をもつモジュールに対するドライバ名を指定する。 + `<ファイル名>` がない場合は現在のモジュールに対する設定。 + * `\bxDriver` + 現在のモジュールに対するドライバ名に展開される。未定義ならば + `default` を返す。 + * `\bxDriverSpecifiedFor{<ファイル名>}` + `\bxDriver` と同様だが、指定のファイル名をもつモジュールに + 対する設定を返す。 + * `\bxDefineDDProcess{<名前>}{<ドライバ名>}<TeXマクロ定義記述*>` + ドライバ依存マクロを定義する。 + * `\bxDefineDDProcessDefault{<名前>}` + `<ドライバ名>` が `default` の `\bxDefineDDProcess`。 + * `\bxDoDDProcess{<名前>}` + ドライバ依存マクロを実行する。 + * `\bxDeclareDriverOptions` + 後天的なドライバ名の各々について、「`\bxSetDriver{ドライバ名}` + を呼ぶ」という動作のパッケージ（クラス）オプションを定義する。 + +bxtoolbox パッケージ ― 非 e-TeX エンジンでの etoolbox の模倣 +------------------------------------------------------------- + +本パッケージの主な目的は、etoolbox パッケージの一部の機能を e-TeX 拡張を +持たないエンジンで利用可能にすることである。（pTeX エンジンの e-TeX 拡張 +が普及し出したのは 2010 年頃である。） + +なお、本パッケージを e-TeX 拡張をもつエンジンで読み込んだ場合は、本物の +etoolbox が読み込まれてその機能が使われる。 + +### etoolbox 互換命令 + +ここに挙げる命令は、etoolbox の命令の複製であり、それぞれ、命令名の頭の +`bx` を取って先頭を小文字に変えた名前（`\bxCsdef`→`\csdef`）の etoolbox +の命令に対応する。e-TeX 拡張のエンジンで動作する場合は実際に etoolbox を +読み込んでそれの命令のエイリアスとするが、そうでない場合は自前の実装を +用いる。 + +各命令の詳細については etoolbox のマニュアルを参照されたい。etoolbox の +元の命令と仕様が異なる部分にのみ説明を付している（この説明は e-TeX 非拡張 +のエンジンでの動作時のみ当てはまることに注意）。 + +(頑強な命令の定義) + + * `\bxNewrobustcmd[*]<LaTeXマクロ定義記述>` + * `\bxRenewrobustcmd[*]<LaTeXマクロ定義記述>` + * `\bxProviderobustcommand[*]<LaTeXマクロ定義記述>` + * `\bxRobustify{<命令>}` + e-TeX の \protected の代わりに LaTeX の protect 処理を用いる。結果 + 的に \DeclareRobustCommand と同じ処理が使われる。 + +(メイン文書コンパイル時フック) + + * `\AfterPreamble{<テキスト>}` + * `\AtEndPreamble{<テキスト>}` + * `\AfterEndPreamble{<テキスト>}` + * `\AfterEndDocument{<テキスト>}` + +(マクロ定義) + + * `\csdef<TeXマクロ定義記述*>` + * `\csgdef<TeXマクロ定義記述*>` + * `\csedef<TeXマクロ定義記述*>` + * `\csxdef<TeXマクロ定義記述*>` + +(命令の意味の操作) + + * `\cslet{<命令名1>}{<命令2>}` + * `\letcs{<命令1>}{<命令名2>}` + * `\csletcs{<命令名1>}{<命令名2>}` + * `\bxCsuse{<命令名>}` + * `\undef{<命令>}` + * `\csundef{<命令名>}` + * `\bxCsshow{<命令名>}` + `\bxCsuse` と `\bxCsshow` は、LaTeX の protect を施しているが、 + 動く引数の中で展開されるとエラーになる。 + +(マクロの追記式定義) + + * `\appto{<命令>}{<テキスト>}` + * `\gappto{<命令>}{<テキスト>}` + * `\eappto{<命令>}{<テキスト>}` + * `\xappto{<命令>}{<テキスト>}` + * `\csappto{<命令名>}{<テキスト>}` + * `\csgappto{<命令名>}{<テキスト>}` + * `\cseappto{<命令名>}{<テキスト>}` + * `\csxappto{<命令名>}{<テキスト>}` + * `\preto{<命令>}{<テキスト>}` + * `\gpreto{<命令>}{<テキスト>}` + * `\epreto{<命令>}{<テキスト>}` + * `\xpreto{<命令>}{<テキスト>}` + * `\cspreto{<命令名>}{<テキスト>}` + * `\csgpreto{<命令名>}{<テキスト>}` + * `\csepreto{<命令名>}{<テキスト>}` + * `\csxpreto{<命令名>}{<テキスト>}` + +(真理値変数―bool系) + + * `\newbool{<名前>}` + * `\providebool{<名前>}` + * `\booltrue{<名前>}` + * `\boolfalse{<名前>}` + * `\setbool{<名前>}{<値>}` + * `\ifbool{<名前>}{<真>}{<偽>}` + * `\notbool{<名前>}{<真>}{<偽>}` + +(真理値変数―toggle系) + + * `\newtoggle{<名前>}` + * `\providetoggle{<名前>}` + * `\toggletrue{<名前>}` + * `\togglefalse{<名前>}` + * `\settoggle{<名前>}{<値>}` + * `\iftoggle{<名前>}{<真>}{<偽>}` + * `\nottoggle{<名前>}{<真>}{<偽>}` + +(定義済判定) + + * `\ifdef{<命令>}{<真>}{<偽>}` + * `\ifundef{<命令>}{<真>}{<偽>}` + * `\bxIfcsdef{<命令名>}{<真>}{<偽>}` + * `\bxIfcsundef{<命令名>}{<真>}{<偽>}` + `\bxIfcsdef` と `\bxIfcsdef` は動く引数の中で展開されるとエラーに + なる。 + +### それ以外の命令 + +種々の事情により、「etoolbox 互換用」以外の機能も含まれている。 + +(エンジンチェック―ifトークン) + + * `\ifbxineTeX` + * `\ifbxinpdfTeX` + * `\ifbxinLuaTeX` + * `\ifbxinOmega` + * `\ifbxinAleph` + * `\ifbxinXeTeX` + * `\ifbxinpTeX` + * `\ifbxinupTeX` + エンジンのチェック。これらは TeX の if-トークンである。 + +(エンジンチェック―LaTeXテスト) + + * `\bxIfineTeX{<真>}{<偽>}` + * `\bxIfinpdfTeX{<真>}{<偽>}` + * `\bxIfinLuaTeX{<真>}{<偽>}` + * `\bxIfinOmega{<真>}{<偽>}` + * `\bxIfinAleph{<真>}{<偽>}` + * `\bxIfinXeTeX{<真>}{<偽>}` + * `\bxIfinpTeX{<真>}{<偽>}` + * `\bxIfinupTeX{<真>}{<偽>}` + エンジンのチェック。これらは LaTeX 形式のテストである。（完全展開 + 可能である。） + +(プリミティブifトークンのLaTeXテスト版) + + * `\bxIf{<テスト>}{<真>}{<偽>}` + * `\bxIfcat{<テスト>}{<真>}{<偽>}` + * `\bxIfx{<テスト>}{<真>}{<偽>}` + * `\bxIfdim{<テスト>}{<真>}{<偽>}` + * `\bxIfnum{<テスト>}{<真>}{<偽>}` + TeX のプリミティブなテストを LaTeX 形式のテストにしたもの。例えば + 以下のようにして使う。 + `\bxIfx{\somecs\relax}{\dotrue}{\dofalse}` + `\bxIfnum{\count@<3}{\dotrue}{\dofalse}` + （これらの命令は完全展開可能である。） + +(プリミティブ判定) + + * `\bxIfPrimitive{<命令>}{<真>}{<偽>}` + * `\bxIfPrimitiveX{<命令名>}{<真>}{<偽>}` + `<命令>` が同名の TeX プリミティブであるかを判定する。機能としては + pdfTeX の `\ifpdfprimitive` と同じ。`\bxIfPrimitive` は脆弱である。 + `\bxIfPrimitiveX` は完全展開可能（従って頑強）であるが、pdfTeX + 拡張の `\ifpdfprimitive` が使えない時は処理が非常に重い。 + * `\bxIfCsPrimitive{<命令名>}{<真>}{<偽>}` + 引数が命令名であることを除き `\bxIfPrimitive` と同じ。 + +(文字列化) + + * `\bxDetokenize{<テキスト>}` + e-TeX 拡張の `\detokenize` と同じ機能で、e-TeX 拡張が有効の場合は + `\detokenize` のエイリアスになる。無効の場合は自前の実装を使うが、 + 処理が非常に重い。（完全展開可能である。） + * `\bxStringify{<テキスト>}` + 完全展開して detokenize した文字列に展開する。現状では全エンジン + について自前の実装を使っていて処理が非常に重い。（完全展開可能。） + +(トークン列比較) + + * `\bxIfExpToEqual{<テキスト1>}{<テキスト2>}{<真>}{<偽>}` + * `\bxIfExpToEqualX{<テキスト1>}{<テキスト2>}{<真>}{<偽>}` + 2つのテキストについて、完全展開して detokenize した結果の文字列が + 等しいかを判定する。機能としては pdfTeX の `\pdfstrcmp` での等価 + 判定と同じ。`\bxIfExpToEqual` は脆弱である。`\bxIfExpToEqualX` + は完全展開可能だが、`\pdfstrcmp` が使えない時は処理が非常に重い。 + * `\bxIfstrequalX{<テキスト1>}{<テキスト2>}{<真>}{<偽>}` + etoolbox の `\ifstrequal` と同じ機能、すなわち 2 つのテキストに + ついて展開せずに detokenize した結果の文字列が等しいかを判定する。 + 元の `\ifstrequal` と異なり完全展開可能であるが、e-TeX 拡張が無効 + の時は処理が非常に重い。 + +(プレアンブル専用命令宣言) + + * `\bxPreamble<TeXマクロ定義命令><TeXマクロ定義記述>` + * `\bxPreamble<LaTeXマクロ定義命令>[*]<LaTeXマクロ定義記述>` + `\@onlypreamble` を設定してマクロを定義する。 + ※ 実際の動作は単に `\bxPreamble\制御綴A[*]\制御綴B` を + `\@onlypreamble\制御綴B \制御綴A[*]\制御綴B` + に置き換えているだけである。 + +(保護付マクロ定義) + + * `\bxRobustdef<TeXマクロ定義記述>` + * `\bxRobustgdef<TeXマクロ定義記述>` + * `\bxRobustedef<TeXマクロ定義記述>` + * `\bxRobustxdef<TeXマクロ定義記述>` + 保護付な命令を定義する。e-TeX 拡張が有効であれば、`\protected` を + 有効にし、無効であれば、LaTeX の保護機構を用いる。前に `\long` を + 付けられるが `\global` は不可。 + +(その他) + + * `\bxIfInMovingArg{<真>}{<偽>}` + いわゆる動く引数(実行が抑止された環境)であるかのテスト。実行が有効 + である場合は、<偽> を実行したのと等価になる。実行が抑止されている + 場合は「無意味な代入文」の後に <真> を続けたものに展開される。この + 命令は、動く引数の中での使用を事前に検査してエラーを出すという目的 + を想定している。(`\bxCheckForMovingArg` も参照。) + + * `\bxMessageToken{<文字列>}{<テキスト>}` + `<テキスト>` の中の `#1` を制御綴 `\<文字列>` に置換したテキスト + を実行する。`\<文字列>` の意味は変化しない。`<テキスト>` 中で + パラメタ `#1` 等を使う場合は `##1` のように書く必要がある。例えば + 以下のように用いる。 + + \bxMessageToken{Hello TeX!}{\def\dohello{\do#1}} + + `\dohello` の定義は `\do` の後に制御綴「`\Hello TeX!`」が続いた + ものになる。 + + * `\bxCheckForMovingArg{<テキスト>}` + 動く引数の中であるかの確認。動く引数の中でない場合は `<テキスト>` + が実行されるが、ある場合は次のように「未定義命令の形」でエラーが + 表示される。ここでは、`\xx@prepare` の中で `\bxCheckForMovingArg` + のテストを行っているとする。 + + ! Undefined control sequence. + <argument> \ ERROR: Use in wrong place! + <*> \protected@edef\xx@example{\xx@prepare + \xx@tmpa} + + ※ 実行が抑止されている場合は `\errmessage` プリミティブも実行 + されないので、普通にエラー表示ができないのである。 + ※ `\bxIfInMovingArg` を利用しているので、そこに述べられている + ように、動く引数である場合の展開結果にはゴミが残る。 + +zxbase パッケージ ― XeTeX 用基礎ライブラリ +------------------------------------------- + +作者（ZR）の制作する他のパッケージで必要な、XeTeX 特有の機能を提供する。 + +現状では、本パッケージに公開の機能は存在しない。 + +更新履歴 +-------- + + * Version 1.1 〈2017/05/29〉 + - 内容の整理。 + - 一部の機能を非推奨にした。 + * Version 1.0 〈2013/04/29〉 + - ほぼ全面的な書き直し。 + * Version 0.5 〈2010/06/15〉 + - bxbase: `\JI`/`\KI` を追加。 + - bxbase: `\dvipdfmxmapline`/`\dvipdfmxmapfont` を追加。 + - bxutf8: BMP 外の符号値への対応。 + * Version 0.4a 〈2009/11/16〉 + - bxbase で `\UI`/`\Ux` を zxjatype と、`\AJ` を zxotf + と連携させた。 + - zxbase パッケージを追加。 + * Version 0.4 〈2009/07/05〉 + - PXbase の v0.4 に合わせた改訂。 + * Version 0.3 〈2008/04/06〉 + - bxutf8x を追加。 + - bxutf8 のバグを修正。 + - bxbase でも pxbase の命令 `\recordpapersize` を使用可能にした。 + * Version 0.2 〈2008/03/28〉 + - 最初の公開版。 + +-------------------- +Takayuki YATO (aka. "ZR") +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/README.md new/doc/latex/bxbase/README.md --- old/doc/latex/bxbase/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxbase/README.md 2017-06-06 01:15:19.000000000 +0200 @@ -0,0 +1,133 @@ +BXbase Package Bundle +===================== + +LaTeX: Support library for other BX packages + +The main purpose of this bundle is to serve as underlying library +to make work other packages created by the same author (their names +start with “BX” or “PX”). + +However bxbase package contains a few user-level commands and is of +some use by itself. + +### System Requirements + + * TeX format: LaTeX. + * TeX engine: Any engine. + * DVI-ware (in DVI output): Anything. + +### Package content + + * `bxbase.sty`: the ‘bxbase’ package + * `bxbase.def`: a submodule of ‘bxbase’ + * `bxtoolbox.sty`: the ‘bxtoolbox’ package + * `bxtoolbox.def`: a submodule of ‘bxtoolbox’ + * `bxtoolbox-ext.def`: a submodule of ‘bxtoolbox’ + * `bxtoolbox-ja.def`: a submodule of ‘bxtoolbox’ + * `bxutf8.def`: the ‘bxutf8’ input encoding definition + * `bxutf8x.def`: the ‘bxutf8x’ input encoding definition + * `zxbase.sty`: the ‘zxbase’ package + * `bxbase-ja.pdf`: the user manual for the ‘bxbase’ (in Japanese) + * `bxbase-ja.tex`: the source file of `bxbase-ja.pdf` + +### Installation + +In a system compliant to TDS 1.1, move the files as follows: + + - `*.sty`, `*.def` → $TEXMF/tex/latex/BXbase + +And rehash your TEXMF trees if necessary. + +### License + +This package is distributed under the MIT License. + +bxbase Package ― The base library +---------------------------------- + +This package provides many package-level features, which are required by +other packages created by the same author. + +It also contains some user-level commands, but most of such commands have +been deprecated since v1.1, except a few which are related to inputting +Japanese text. + +Unfortunately the documentation is available only in Japanese. (However, +those unfamiliar with the Japanese language will probably have no need to +load this package directly.) + +bxtoolbox Package ― To emulate etoolbox on non-e-TeX +----------------------------------------------------- + +The main goal of this package is to provide part of the functions of the +[etoolbox] package for TeX engines without e-TeX extension. (Note that +TeX users in Japan have long used the pTeX engine for writing Japanese, +and e-TeX extention for the engine did not appeared until around 2010.) + +[etoolbox]: https://www.ctan.org/pkg/etoolbox + +Note that when this package is loaded in e-TeX engines, then it loads +the real etoolbox and uses the functions of that package. + +### e-TeX functions provided by this package + +Below is the list: + + \AfterPreamble \AtEndPreamble \AfterEndPreamble + \AfterEndDocument + \csdef \csgdef \csedef \csxdef + \cslet \letcs \csletcs \undef \csundef + \appto \gappto \eappto \xappto + \csappto \csgappto \cseappto \csxappto + \preto \gpreto \epreto \xpreto + \cspreto \csgpreto \csepreto \csxpreto + \newbool \providebool \booltrue \boolfalse + \setbool \ifbool \notbool + \newtoggle \providetoggle \toggletrue \togglefalse + \settoggle \iftoggle \nottoggle + \ifdef \ifundef + \ifstrequal \ifstrempty + +### “Fakes” provided by this package + +These commands have a name of the original command prefixed by “bx”, +that is, `\bxZzz` instead of `\zzz`. Some come in two versions: `\bxZzz` +works as `\zzz` but is lack of expandability `\zzz` has, whereas `\bxZzzX` +is expandable as `\zzz` is but otherwise flawed. + + * `\bxNewrobustcmd`: Uses LaTeX-protect instead of `\protected`. + * `\bxRenewrobustcmd`: Ditto. + * `\bxProviderobustcmd`: Ditto. + * `\bxRobustify`: Ditto. + * `\bxCsuse`: Forbidden in moving arguments. + * `\bxCsuseX`: Suffering from `\relax`’ifying. + * `\bxCsshow`: Forbidden in moving arguments. + * `\bxIfcsdef`: Forbidden in moving arguments. + * `\bxIfcsundef`: Forbidden in moving arguments. + * `\bxIfcsundefX`: Suffering from `\relax`’ifying. + +Note: On e-TeX extended engines, these commands are simply aliases to the +real commands of etoolbox. + +zxbase Package ― The base library for XeTeX +-------------------------------------------- + +This package provides XeTeX-specific features, which are required by +other packages created by the same author. + +For the present this package contains no public features. + +Revision History +---------------- + + * Version 1.1 〈2017/05/29〉 + * Version 1.0 〈2013/04/29〉 + * Version 0.5 〈2010/06/15〉 + * Version 0.4a 〈2009/11/16〉 + * Version 0.4 〈2009/07/05〉 + * Version 0.3 〈2008/04/06〉 + * Version 0.2 〈2008/03/28〉 + +-------------------- +Takayuki YATO (aka. "ZR") +https://github.com/zr-tex8r Binary files old/doc/latex/bxbase/bxbase-ja.pdf and new/doc/latex/bxbase/bxbase-ja.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxbase/bxbase-ja.tex new/doc/latex/bxbase/bxbase-ja.tex --- old/doc/latex/bxbase/bxbase-ja.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxbase/bxbase-ja.tex 2017-06-06 01:15:19.000000000 +0200 @@ -0,0 +1,108 @@ +% 文字コードは UTF-8 +% uplatex で組版する +\documentclass[a4paper,uplatex]{jsarticle} +\usepackage{shortvrb} +\MakeShortVerb{\|} +\newcommand{\PkgVersion}{1.1} +\newcommand{\PkgDate}{2017/05/29} +\newcommand{\Pkg}[1]{\textsf{#1}} +\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} +\newcommand{\Note}{\par\noindent ※} +\newcommand{\Means}{~：\quad} +\providecommand{\pTeX}{p\TeX} +\providecommand{\upTeX}{u\pTeX} +\providecommand{\pLaTeX}{p\LaTeX} +\providecommand{\upLaTeX}{u\pLaTeX} +%----------------------------------------------------------- +\begin{document} +\title{\Pkg{bxbase} パッケージ\\ +（ユーザ命令の解説）} +\author{八登崇之\ （Takayuki YATO; aka.~``ZR''）} +\date{v\PkgVersion \quad[\PkgDate]} +\maketitle + +%=========================================================== +\section{パッケージの読込} + +|\usepackage| で読み込む。オプションは無い。 +\begin{quote}\small\begin{verbatim} +\usepackage{bxbase} +\end{verbatim}\end{quote} + +\Note 本パッケージのライブラリとしての機能は特定の +エンジンやDVIウェアに依存しないが、以下に述べる命令に +ついては必ずしもそうでないことに注意。 + +%=========================================================== +\section{機能} + +%------------------- +\subsection{符号値による文字入力} + +\begin{itemize} +\item |\Ux{|\Meta{コード値}|,...}|\\ + |\UI{|\Meta{<コード値>}|,...}|\Means +Unicode コード値による入力を行う。 +|\Ux| は欧文用、|\UI| は和文用 +（I は Ideographic の意味）。 +コード値は以下の形式で表す。 +コンマで区切って複数文字入力できる。 +\begin{itemize} +\item \Meta{16進数}\Means |A72C|, |02000B|, |1bd| 等。 +\item |+|\Meta{10進数}\Means |+254|, |+0937| 等。 +\item |'|\Meta{8進数}\Means |'376|, |'1651| 等。 +\end{itemize} + +Unicode 文字の出力には次の順番で利用可能な最初の機能を用いる。 +（|\UI| の場合 3) を飛ばす。） +\begin{enumerate} +\item[1)] \Pkg{zxjatype}パッケージ。 +この場合、その機構に従って出力される。 +すなわち |\UI| は必ず和文フォントで出力し、 +|\Ux| は和文/欧文切替の対象となる。 +\item[2)] XeTeXのUnicode出力。 +\item[3)] （|\Ux| のみ）\Pkg{bxucs}パッケージ。 +\item[4)] {\upTeX}の和文Unicode出力。 +\item[5)] \Pkg{UTF}／\Pkg{OTF}パッケージ。 +\item[6)] \Pkg{ums}／\Pkg{bxsuika}パッケージ。 +\end{enumerate} +どれも使えない場合は「16進表現による代替表現」になる。 + +\item |\AJ{|\Meta{コード値}|,...}|\Means +Adobe-Japan1のコード値による入力を行う。 +コード値は10進数で指定する。 +出力には次の順番で利用可能な最初の機能を用いる。 +\begin{enumerate} +\item[1)] \Pkg{zxotf}パッケージ。 +\item[2)] \Pkg{UTF}／\Pkg{OTF}パッケージ。 +\end{enumerate} +どれも使えない場合は代替表現になる。 + +\item |\JI{|\Meta{コード値}|,...}|\Means +いわゆる「JISコード」（JIS~X~0208のGL表現） +のコード値による入力を行う。 +コード値指定の方法は |\Ux| と同じ。 +出力には{(u)\pTeX}のJISコード和文出力の機能を使う。 +使えない場合は代替表現になる。 + +\item |\KI{|\Meta{コード値}|,...}|\Means +いわゆる「区点コード」のコード値による入力を行う。 +コード値指定は「RRCC」（RRは区番号、CCは点番号を10進2桁で表したもの） +の形式で指定する。 +出力には{(u)\pTeX}のJISコード和文出力の機能を使う。 +使えない場合は代替表現になる。 + +\item |\bxUx| / |\bxUI| / |\bxAJ| / |\bxJI| / |\bxKI|\Means +|\Ux| 等は非常に短い名前なので他のパッケージと衝突する恐れがあり、 +そこでこのパッケージでは既に同名の命令がある場合は上書きしない +ようにしている。 +|\bxUx| 等はそれぞれ |\Ux| 等と同じで、 +先のような場合にも常に使える。 + +\end{itemize} + +なお、このパッケージは\Pkg{bxutf8}の為のドライバ（|\bxUHex|） +および\Pkg{bxutf8x}の為のドライバを |\Ux| に相当するものに設定する。 + +%=========================================================== +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxbase.doc.tlpobj new/tlpkg/tlpobj/bxbase.doc.tlpobj --- old/tlpkg/tlpobj/bxbase.doc.tlpobj 2016-04-14 18:48:00.000000000 +0200 +++ new/tlpkg/tlpobj/bxbase.doc.tlpobj 2017-06-06 02:21:51.000000000 +0200 @@ -1,9 +1,11 @@ name bxbase.doc category Package -revision 28825 +revision 44481 shortdesc doc files of bxbase relocated 1 -docfiles size=8 - RELOC/doc/latex/bxbase/00README +docfiles size=30 RELOC/doc/latex/bxbase/LICENSE - RELOC/doc/latex/bxbase/README + RELOC/doc/latex/bxbase/README-ja.md + RELOC/doc/latex/bxbase/README.md + RELOC/doc/latex/bxbase/bxbase-ja.pdf + RELOC/doc/latex/bxbase/bxbase-ja.tex ++++++ bxbase.tar.xz ++++++ ++++ 3550 lines of diff (skipped) ++++++ bxcjkjatype.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcjkjatype/LICENSE new/doc/latex/bxcjkjatype/LICENSE --- old/doc/latex/bxcjkjatype/LICENSE 2013-09-29 00:28:12.000000000 +0200 +++ new/doc/latex/bxcjkjatype/LICENSE 2016-11-25 19:28:20.000000000 +0100 @@ -1,12 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#(B -$BCx:n8"$O:n<T$G$"$k!VH,EP(B $B?rG7!JJLL>(B ZR$B!K!W$KB0$7$^$9!#(B -$B$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - -This software is distributed under the MIT License. - The MIT License -Copyright (c) 2013 Takayuki YATO (aka. "ZR") +Copyright (c) 2016 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcjkjatype/README new/doc/latex/bxcjkjatype/README --- old/doc/latex/bxcjkjatype/README 2013-11-04 00:41:58.000000000 +0100 +++ new/doc/latex/bxcjkjatype/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,258 +0,0 @@ -BXcjkjatype Package -=================== - -LaTeX: Support for Japanese typesetting with pdfLaTeX and CJK package - -This package provides working configuration of the CJK package suitable -for Japanese typesetting of moderate quality. Moreover, it facilitates -use of the CJK package for pLaTeX users, by providing commands that -are similar to those used by the pLaTeX kernel and some other packages -used with it. - -Note that while the CJK package supports many input encodings, this -package supports only UTF-8. - -### System requirement - - * TeX format: LaTeX. - * TeX engine: pdfTeX (DVI or PDF mode). - * DVI driver: Anything. - - Non-default font settings require dvipdfmx or pdfTeX. - * Dependent packages: - - CJK, CJKutf8, CJKspace, CJKpunct, etoolbox; - - ipaex-type1 (when using default font mapping); - - zhmetrics (when using non-default font mapping). - -### Installation - - - `*.sty` → $TEXMF/tex/latex/BXcjkjatype - -The bxcjkjatype Package ------------------------ - -### Package Loading - - \usepackage[<option>,...]{bxcjkjatype} - -The available options are described hereafter. - -#### Options for auto-wrapping - -These options enable one to wrap the document body with a `CJK(*)` -environemnt automatically and safely. They are suitable when a document -contains much amount of CJK text, or some “moving arguemnts” hold -CJK text. - - * `whole`, `wholeCJK*`: Wraps the whole document body with a `CJK*` - environment (precisely speaking, with - `\begin{uCJK*}` ... `\end{uCJK*}` ). - * `wholeCJK`: Wraps the whole document body with a `CJK` environment - (precisely speaking, with - `\begin{uCJK}` ... `\end{uCJK}` ). - * `nowhole` (default): Negation of `wholeCJK*` or `wholeCJK`. - -#### Options for “auto-tilde” - -The option `autotilde` triggers automatic invocation of `\CJKtilde`, -which makes a tilde character (`~`) insert “shibuaki” (a thin space -between alphabetic and ideographic letters) rather than a no-break -space (standard). No-break spaces can still be inserted by the command -`\nbs`, and `\standardtilde` cancels the effect of `\CJKtilde`. (The -commands mentioned here belong to CJK package.) - - * `autotilde`: Makes `\CJKtilde` invoked at the beginning of every - `CJK(*)` environemnt. - * `noautotilde` (default): Negation of `autotilde`. - -#### Options for font-mapping - -One can use preset font mappings in the same way as in the [pxchfon -package]. Please refer to the manual of that package for detailed -explanation of this feature. - - * `oneweight`, `nooneweight`: The same as in pxchfon. - * One can use font preset options (such as `ms`) which are available - in pxchfon (except obsolete ones). - * `ipaex-type1`: Disables the font management of this package and - directly uses the families provided by the ipaex-type1 package, - namely `ipxm` and `ipxg`. In this setting the value of `\mcdefault` - is `ipxm` and the value of `\gtdefault` and `\mgdefault` is `ipxg`, - so that the higher level commands (such as `\sffamily` and - `\gtfamily`) can work correctly. - -[pxchfon package]: http://www.ctan.org/pkg/pxchfon - -#### Options for CJK font scaling - - * `scale=<real>`: Sets the scaling factor for CJK fonts. - -Note: One cannot employ the scaling when using the font setting of the -`ipaex-type1` option. - -#### Other options - - * `everypage`: Outputs the font mapping information on every page of - the resulted DVI document. Available only with `dvipdfmx` driver. - * `noeverypage` (default): Negation of `everypage`. - * driver options: - `pdftex`, `dvipdfmx`, `dvips` and `none` are available. The driver - setting is relevant only when using font mappings other than the - default one (ipaex-type1 fonts), so one need not care of drivers - in using default fonts. Moreover, non-default font mappings are - supported only by `pdftex` and `dvipdfmx`, and these two values are - auto-detected (`pdftex` is default in PDF mode and `dvipdfmx` in - DVI mode). Thus one will never need to specify the driver. - -### Usage - -#### Selecting CJK fonts - -The present package provides three “generic” CJK families in the same -way as pLaTeX plus the [japanese-otf package]: Mincho family -(`\mcfamily`), Gothic family (`\gtfamily`), and Maru-gothic family -(`\mgfamily`). In default setting, the font set from the ipaex-type1 -package are allocated; Mincho family uses IPAex Mincho font, and Gothic -and Maru-gothic families use IPAex Gothic font. This allocation can be -altered by users. - - * `\mcfamily`: Changes the CJK family to Mincho family. Equivalent - to `\CJKfamily{\mcdefault}`. - * `\gtfamily`: Changes the CJK family to Gothic family. Equivalent - to `\CJKfamily{\gtdefault}`. - * `\mgfamily`: Changes the CJK family to Maru-gothic family. - Equivalent to `\CJKfamily{\mgdefault}`. - -More advanced commands: - - * `\mcdefault`/`\gtdefault`/`\mgdefault`: The names of CJK families - corresponding to the three generic families. In the standard - allocation their values are `mc`/`gt`/`mg` respectively and the - allocation is used as default. - - * `\setCJKfamilydefault{<CJK-family>}`: Declares the default CJK - family. This default value is used when family names are missing - in some commands, such as `\CJKfamily{}` and `\begin{CJK}{UTF8}{}`. - The (redefined) `\normalfont` also switches the CJK family to the - family specified by this command. - - The default value of this default family is the “counterpart” of - the alphabetic font family which is in effect at the beginning of - the document body. (See the next subsection.) - -[japanese-otf package]: http://www.ctan.org/pkg/japanese-otf - -#### Synchronization of CJK and non-CJK families - -The CJK package (and pTeX engine) manages separate “current families” -for CJK and alphabetic (non-CJK) families. While this treatment has its -merit, synchronization of the two “current families” is convenient in -many cases. Accordingly, tHe present package redefines some of the -LaTeX commands that switches current alphabetic font families so that -the CJK family will be switched to the counterpart of the current -alphabetic family, where the “counterpart” is defined as follows: - - * `\rmfamily` (Serif) → `\mcfamily` (Mincho) - * `\sffamily` (Sans-serif) → `\gtfamily` (Gothic) - * `\ttfamily` (Monospace) → `\gtfamily` (Gothic) - * The counterpart of the other families is `\mcfamily`. - -Redefined commands: - - * `\rmfamily`/`\sffamily`/`\ttfamily`: Changes the CJK family to - the counterpart of the alphabetic font family after executing the - original function. - * `\normalfont`: Changes the CJK family to the default CJK family - specified by `\setCJKfamilydefault` command. - -There are shorthand forms of `CJK`/`CJK*` environemnts: - - * `\begin{uCJK*}...\end{uCJK*}`: Equivalent to: - - \begin{CJK*}{UTF8}{counterpart}...\end{CJK*} - - where `counterpart` means the counterpart of the current alphabetic - font family. - - Note that this is *not* equivalent to - - \begin{CJK*}{UTF8}{}...\end{CJK*} - - structure, which uses the default CJK family. - - * `\begin{uCJK}...\end{uCJK}`: Equivalent to: - - \begin{CJK}{UTF8}{counterpart}...\end{CJK} - -#### Font mapping - -The usage of these commands are the same as in the pxchfon package. -Please refer to the manual of that package for detail. - - * `\setminchofont[<id>]{<font-file>}` - * `\setgothicfont[<id>]{<font-file>}` - * `\setmarugothicfont[<id>]{<font-file>}` - * `\setmediumminchofont[<id>]{<font-file>}` - * `\setboldminchofont[<id>]{<font-file>}` - * `\setmediumgothicfont[<id>]{<font-file>}` - * `\setboldgothicfont[<id>]{<font-file>}` - * `\setxboldgothicfont[<id>]{<font-file>}` - -However there is a major limitation as to the use of font mapping with -the pdfTeX engine. One can use only TrueType fonts and moreover -TTC format is not allowed. (One can use any flavor of OpenType fonts -when using dvipdfmx.) - -Note: The present package does not support the light-weight Mincho font, -and thus `\setlightminchofont` does nothing useful. - -#### Other commands - - * `\UTF{<hexadecimal-number>}`: Inputs a CJK character through Unicode - codepoint value. `\UTF{5B57}` is equivalent to `\Unicode{"5B}{"57}`. - - * `\CJKforce{<character>...}`: Afterwards Treats the characters given - in the argument as CJK characters (printed using CJK fonts). - - * `\CJKunforce{<character>...}`: Cancels the effect of the `\CJKforce` - command. - - * `\@<character>`: Treats the next character (only that occurrence) - as a CJK character, when the character is outside ASCII; othersize - the normal meaning of `\@` is retained. - - * `\CJKecglue`: Insers a “shibuaki” space. This will be invoked by - `~` when `\CJKtilde` is in effect. This command can be redefined by - users to adjust the value of shibuaki space, just as `\CJKglue` can - be redefined to adjust inter-ideographic space. - - For example: - - \renewcommand{\CJKecglue}{\hspace{0.125em minus 0.125em}} - -### Remarks - - * The standard font families provided by this package does *not* - support vertical writing, even when using default ipaex-type1 font - set. However, the families provided by ipaex-type1 (`ipxm` and - `ipxg`) do support vertical writing, and one can utilize these - families directly by specifying `ipaex-type1` option. - -Revision History ----------------- - - * Version 0.2c <2013/10/18> - - Added support of CJK font scaling. - - Added `\CJKforce`, `\CJKunforce`, `\@`. - - * Version 0.2b <2013/09/28> - - Added `\UTF`, `\CJKecglue`. - - * Version 0.2a <2013/08/08> - - Added `autotilde` option. - - * Version 0.2 <2013/08/08> - - The first public version. - --------------------- -Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcjkjatype/README-ja.md new/doc/latex/bxcjkjatype/README-ja.md --- old/doc/latex/bxcjkjatype/README-ja.md 2013-11-04 00:41:58.000000000 +0100 +++ new/doc/latex/bxcjkjatype/README-ja.md 2016-11-25 19:28:20.000000000 +0100 @@ -66,6 +66,8 @@ * `oneweight`、`nooneweight`： pxchfon と同様。 * pxchfon で利用可能なプリセットオプション（`ms` 等）が利用できる。（旧式のものを除く。） + * `ttfname=<パターン>`： TTC 代替（後述）を行う場合の TTF フォント名の + パターンを指定する。 * `ipaex-type1`：本パッケージのフォント管理を無効にし、ipaex-type1 パッケージのファミリ（`ipxm` と `ipxg`）を直接用いる。この設定では `\mcdefault` の値は `ipxm` に、`\gtdefault` の値は `ipxg` になる。 @@ -76,7 +78,8 @@ * `scale=<実数>`： CJK フォントに対するスケール値を設定する。 -注意： `ipaex-type1` 指定時は CJK フォントスケールは使用不可。 +※0.3 版より、`ipaex-type1` 指定時も CJK フォントスケールが利用できるよう +になった。 #### その他のオプション @@ -90,6 +93,42 @@ されまたこの 2 つの値は常に自動判定可能（PDF モードでは `pdftex`、 DVI モードでは `dvipdfmx` が既定）なので、実際にはドライバを指定する必要はない。 + * `substmingoth`： CJK パッケージの日本語用総称ファミリとして慣習的に + 使われているファミリの `min`／`goth`／`maru` について、LaTeX レベル + で、本パッケージにおける標準ファミリである `mc`／`gt`／`mg` への代替 + を設定する。これにより、`min` 等のファミリの使用を前提とした日本語湯 + テンプレート等を使う場合においても、論理フォントレベルでの代替設定を + 行う必要がなくなる。 + * `nosubstmingoth`（既定）： `substmingoth` の否定。 + * `boldbyembolden`（既定）： CJK パッケージの“擬似太字”（`\CJKbold`） + の処理方法を“重ね打ち”から“合成太字”に変更する。 + * `noboldbyembolden`： `boldbyembolden` の否定。 + +#### TTC 代替 + +pdfTeX エンジンは TTC 形式のフォントをサポートしていない（サポートして +いる OpenType の形式は単体の TTF グリフのものだけである）。従って、 +`\setminchofont` 命令などで TTC フォントを使おうと望むなら、適当なツール +を使って TTC フォントファイルを個々の TTF フォントファイルに分解する処理 +を行うことが必須になる。 + +これはエンジン側の制限仕様のため仕方がないだろう。しかし本パッケージを +用いる場合には他に問題がある。変換後の TTF フォントはファイル名が元のもの +と異なるため、プリセット設定（`mobo-moga` 等のオプション）が使えないので +ある。これを解決するために、0.3 版で `ttfname` オプションが新設された。 + +例えば、パッケージ読込時に `ttfname=*_1` が指定されたとする。この状態で +本パッケージの処理において「mogam.ttc の最初（0 番）」が要求された場合、 +代わりに「mogam_1.ttf」というファイルが使われる。同様に、「mogam.ttc の +1 番、2 番、……」については「mogam_2.ttf」「mogam_3.ttf」……での代替が +行われる。 + +`ttfname` で指定するファイル名のパターンには「`*_1`」「`TEMP-*-00.TTF`」 +のように「`*` を 1 つ含み、数字列を含む文字列」が指定できる。この `*` の +部分は要求の TTC ファイルのベース名（`mogam` 等）で置き換えられ、かつ、 +拡張子がない場合は `.ttf` が補われる。その結果の文字列が TTC の最初（0 +番）のフォントに対する代替ファイル名となる。後続（1 番、2 番、……）の +代替ファイル名は数字部分をインクリメントしたものになる。 ### 機能 @@ -219,17 +258,25 @@ 更新履歴 -------- - * Version 0.2c <2013/10/18> + * Version 0.3 ‹2016/10/15› + - CJKvert パッケージによる縦組と共存を可能にした。 + - hyperref での PDF 文字列の文字化けを防止し。 + - `ipaex-type1` 指定時もフォントスケールを可能にした。 + - `boldbyembolden` 機能を実装。 + - `ttfname` オプションを追加。 + - `substmingoth` オプションを追加。 + + * Version 0.2c ‹2013/10/18› - CJK フォントスケールをサポートした。 - `\CJKforce`、`\CJKunforce`、`\@` を追加。 - * Version 0.2b <2013/09/28> + * Version 0.2b ‹2013/09/28› - `\UTF`、`\CJKecglue` を追加。 - * Version 0.2a <2013/08/08> + * Version 0.2a ‹2013/08/08› - `autotilde` オプションを追加。 - * Version 0.2 <2013/08/08> + * Version 0.2 ‹2013/08/08› - 最初の公開版。 -------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcjkjatype/README.md new/doc/latex/bxcjkjatype/README.md --- old/doc/latex/bxcjkjatype/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxcjkjatype/README.md 2016-11-25 19:28:20.000000000 +0100 @@ -0,0 +1,282 @@ +BXcjkjatype Package +=================== + +LaTeX: Support for Japanese typesetting with pdfLaTeX and CJK package + +This package provides working configuration of the CJK package suitable +for Japanese typesetting of moderate quality. Moreover, it facilitates +use of the CJK package for pLaTeX users, by providing commands that +are similar to those used by the pLaTeX kernel and some other packages +used with it. + +Note that while the CJK package supports many input encodings, this +package supports only UTF-8. + +### System requirement + + * TeX format: LaTeX. + * TeX engine: pdfTeX (DVI or PDF mode). + * DVI driver: Anything. + - Non-default font settings require dvipdfmx or pdfTeX. + * Dependent packages: + - CJK, CJKutf8, CJKspace, CJKpunct, etoolbox; + - ipaex-type1 (when using default font mapping); + - zhmetrics (when using non-default font mapping). + +### Installation + + - `*.sty` → $TEXMF/tex/latex/BXcjkjatype + +### License + +This package is distributed under the MIT License. + +The bxcjkjatype Package +----------------------- + +### Package Loading + + \usepackage[<option>,...]{bxcjkjatype} + +The available options are described hereafter. + +#### Options for auto-wrapping + +These options enable one to wrap the document body with a `CJK(*)` +environemnt automatically and safely. They are suitable when a document +contains much amount of CJK text, or some “moving arguemnts” hold +CJK text. + + * `whole`, `wholeCJK*`: Wraps the whole document body with a `CJK*` + environment (precisely speaking, with + `\begin{uCJK*}` ... `\end{uCJK*}` ). + * `wholeCJK`: Wraps the whole document body with a `CJK` environment + (precisely speaking, with + `\begin{uCJK}` ... `\end{uCJK}` ). + * `nowhole` (default): Negation of `wholeCJK*` or `wholeCJK`. + +#### Options for “auto-tilde” + +The option `autotilde` triggers automatic invocation of `\CJKtilde`, +which makes a tilde character (`~`) insert “shibuaki” (a thin space +between alphabetic and ideographic letters) rather than a no-break +space (standard). No-break spaces can still be inserted by the command +`\nbs`, and `\standardtilde` cancels the effect of `\CJKtilde`. (The +commands mentioned here belong to CJK package.) + + * `autotilde`: Makes `\CJKtilde` invoked at the beginning of every + `CJK(*)` environemnt. + * `noautotilde` (default): Negation of `autotilde`. + +#### Options for font-mapping + +One can use preset font mappings in the same way as in the [pxchfon +package]. Please refer to the manual of that package for detailed +explanation of this feature. + + * `oneweight`, `nooneweight`: The same as in pxchfon. + * One can use font preset options (such as `ms`) which are available + in pxchfon (except obsolete ones). + * `ttfname=<pattern>`: Specifies the pattern of the TTF font names + which are used when TTC substitution is employed. For example, + when `ttfname=*_1` is given, the font “index 0 of mogam.ttc” will + map to “mogam_1.ttf”, and similarly, “index 1” to “mogam_2.ttf” + and so on. + * `ipaex-type1`: Disables the font management of this package and + directly uses the families provided by the ipaex-type1 package, + namely `ipxm` and `ipxg`. In this setting the value of `\mcdefault` + is `ipxm` and the value of `\gtdefault` and `\mgdefault` is `ipxg`, + so that the higher level commands (such as `\sffamily` and + `\gtfamily`) can work correctly. + +[pxchfon package]: http://www.ctan.org/pkg/pxchfon + +#### Options for CJK font scaling + + * `scale=<real>`: Sets the scaling factor for CJK fonts. + +(With version 0.3 or later, one can employ the scaling even with the +`ipaex-type1` option.) + +#### Other options + + * `everypage`: Outputs the font mapping information on every page of + the resulted DVI document. Available only with `dvipdfmx` driver. + * `noeverypage` (default): Negation of `everypage`. + * driver options: + `pdftex`, `dvipdfmx`, `dvips` and `none` are available. The driver + setting is relevant only when using font mappings other than the + default one (ipaex-type1 fonts), so one need not care of drivers + in using default fonts. Moreover, non-default font mappings are + supported only by `pdftex` and `dvipdfmx`, and these two values are + auto-detected (`pdftex` is default in PDF mode and `dvipdfmx` in + DVI mode). Thus one will never need to specify the driver. + * `substmingoth`: Applies the substituion of families `min`, `goth` + and `maru` (used conventionally for Japanese) with families `mc`, + `gt` and `mg` (standard in this package). + * `nosubstmingoth` (default): Negation of `substmingoth`. + * `boldbyembolden` (default): Changes the implemention of `\CJKbold` + (pseudo-bold) from “overstriking” to “synthetic emboldening”. + * `noboldbyembolden`: Negation of `boldbyembolden`. + +### Usage + +#### Selecting CJK fonts + +The present package provides three “generic” CJK families in the same +way as pLaTeX plus the [japanese-otf package]: Mincho family +(`\mcfamily`), Gothic family (`\gtfamily`), and Maru-gothic family +(`\mgfamily`). In default setting, the font set from the ipaex-type1 +package are allocated; Mincho family uses IPAex Mincho font, and Gothic +and Maru-gothic families use IPAex Gothic font. This allocation can be +altered by users. + + * `\mcfamily`: Changes the CJK family to Mincho family. Equivalent + to `\CJKfamily{\mcdefault}`. + * `\gtfamily`: Changes the CJK family to Gothic family. Equivalent + to `\CJKfamily{\gtdefault}`. + * `\mgfamily`: Changes the CJK family to Maru-gothic family. + Equivalent to `\CJKfamily{\mgdefault}`. + +More advanced commands: + + * `\mcdefault`/`\gtdefault`/`\mgdefault`: The names of CJK families + corresponding to the three generic families. In the standard + allocation their values are `mc`/`gt`/`mg` respectively and the + allocation is used as default. + + * `\setCJKfamilydefault{<CJK-family>}`: Declares the default CJK + family. This default value is used when family names are missing + in some commands, such as `\CJKfamily{}` and `\begin{CJK}{UTF8}{}`. + The (redefined) `\normalfont` also switches the CJK family to the + family specified by this command. + + The default value of this default family is the “counterpart” of + the alphabetic font family which is in effect at the beginning of + the document body. (See the next subsection.) + +[japanese-otf package]: http://www.ctan.org/pkg/japanese-otf + +#### Synchronization of CJK and non-CJK families + +The CJK package (and pTeX engine) manages separate “current families” +for CJK and alphabetic (non-CJK) families. While this treatment has its +merit, synchronization of the two “current families” is convenient in +many cases. Accordingly, tHe present package redefines some of the +LaTeX commands that switches current alphabetic font families so that +the CJK family will be switched to the counterpart of the current +alphabetic family, where the “counterpart” is defined as follows: + + * `\rmfamily` (Serif) → `\mcfamily` (Mincho) + * `\sffamily` (Sans-serif) → `\gtfamily` (Gothic) + * `\ttfamily` (Monospace) → `\gtfamily` (Gothic) + * The counterpart of the other families is `\mcfamily`. + +Redefined commands: + + * `\rmfamily`/`\sffamily`/`\ttfamily`: Changes the CJK family to + the counterpart of the alphabetic font family after executing the + original function. + * `\normalfont`: Changes the CJK family to the default CJK family + specified by `\setCJKfamilydefault` command. + +There are shorthand forms of `CJK`/`CJK*` environemnts: + + * `\begin{uCJK*}...\end{uCJK*}`: Equivalent to: + + \begin{CJK*}{UTF8}{counterpart}...\end{CJK*} + + where `counterpart` means the counterpart of the current alphabetic + font family. + + Note that this is *not* equivalent to + + \begin{CJK*}{UTF8}{}...\end{CJK*} + + structure, which uses the default CJK family. + + * `\begin{uCJK}...\end{uCJK}`: Equivalent to: + + \begin{CJK}{UTF8}{counterpart}...\end{CJK} + +#### Font mapping + +The usage of these commands are the same as in the pxchfon package. +Please refer to the manual of that package for detail. + + * `\setminchofont[<id>]{<font-file>}` + * `\setgothicfont[<id>]{<font-file>}` + * `\setmarugothicfont[<id>]{<font-file>}` + * `\setmediumminchofont[<id>]{<font-file>}` + * `\setboldminchofont[<id>]{<font-file>}` + * `\setmediumgothicfont[<id>]{<font-file>}` + * `\setboldgothicfont[<id>]{<font-file>}` + * `\setxboldgothicfont[<id>]{<font-file>}` + +However there is a major limitation as to the use of font mapping with +the pdfTeX engine. One can use only TrueType fonts and moreover +TTC format is not allowed. (One can use any flavor of OpenType fonts +when using dvipdfmx.) + +Note: The present package does not support the light-weight Mincho font, +and thus `\setlightminchofont` does nothing useful. + +#### Other commands + + * `\UTF{<hexadecimal-number>}`: Inputs a CJK character through Unicode + codepoint value. `\UTF{5B57}` is equivalent to `\Unicode{"5B}{"57}`. + + * `\CJKforce{<character>...}`: Afterwards Treats the characters given + in the argument as CJK characters (printed using CJK fonts). + + * `\CJKunforce{<character>...}`: Cancels the effect of the `\CJKforce` + command. + + * `\@<character>`: Treats the next character (only that occurrence) + as a CJK character, when the character is outside ASCII; othersize + the normal meaning of `\@` is retained. + + * `\CJKecglue`: Insers a “shibuaki” space. This will be invoked by + `~` when `\CJKtilde` is in effect. This command can be redefined by + users to adjust the value of shibuaki space, just as `\CJKglue` can + be redefined to adjust inter-ideographic space. + + For example: + + \renewcommand{\CJKecglue}{\hspace{0.125em minus 0.125em}} + +### Remarks + + * The standard font families provided by this package does *not* + support vertical writing, even when using default ipaex-type1 font + set. However, the families provided by ipaex-type1 (`ipxm` and + `ipxg`) do support vertical writing, and one can utilize these + families directly by specifying `ipaex-type1` option. + +Revision History +---------------- + + * Version 0.3 ‹2016/10/15› + - Made the vertical writing work well (with CJKvert). + - Avoided garbling of PDF strings created by hyperref. + - Allowed font scaling even when `ipaex-type1` is set. + - Added `boldbyembolden` feature. + - Added `ttfname` option. + - Added `substmingoth` option. + + * Version 0.2c ‹2013/10/18› + - Added support of CJK font scaling. + - Added `\CJKforce`, `\CJKunforce`, `\@`. + + * Version 0.2b ‹2013/09/28› + - Added `\UTF`, `\CJKecglue`. + + * Version 0.2a ‹2013/08/08› + - Added `autotilde` option. + + * Version 0.2 ‹2013/08/08› + - The first public version. + +-------------------- +Takayuki YATO (aka. "ZR") +http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj new/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj --- old/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj 2016-04-14 18:48:00.000000000 +0200 +++ new/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,12 +1,12 @@ name bxcjkjatype.doc category Package -revision 32048 +revision 42292 shortdesc doc files of bxcjkjatype relocated 1 -docfiles size=73 +docfiles size=74 RELOC/doc/latex/bxcjkjatype/LICENSE - RELOC/doc/latex/bxcjkjatype/README RELOC/doc/latex/bxcjkjatype/README-ja.md + RELOC/doc/latex/bxcjkjatype/README.md RELOC/doc/latex/bxcjkjatype/sample-bxcjkjatype-beamer.pdf RELOC/doc/latex/bxcjkjatype/sample-bxcjkjatype-beamer.tex RELOC/doc/latex/bxcjkjatype/sample-bxcjkjatype.pdf ++++++ bxcjkjatype.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxcjkjatype/bxcjkjatype.sty new/tex/latex/bxcjkjatype/bxcjkjatype.sty --- old/tex/latex/bxcjkjatype/bxcjkjatype.sty 2013-11-04 00:41:58.000000000 +0100 +++ new/tex/latex/bxcjkjatype/bxcjkjatype.sty 2016-11-25 19:33:43.000000000 +0100 @@ -1,10 +1,16 @@ -% -% bxcjkjatype.sty -% +%% +%% This is file 'bxcjkjatype.sty'. +%% +%% Copyright (c) 2016 Takayuki YATO (aka. "ZR") +%% GitHub: https://github.com/zr-tex8r +%% Twitter: @zr_tex8r +%% +%% This package is distributed under the MIT License. +%% %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxcjkjatype}[2013/10/18 v0.2c] +\ProvidesPackage{bxcjkjatype}[2016/10/15 v0.3] \def\bxjy@pkgname{bxcjkjatype} %% definitions @@ -14,8 +20,10 @@ %--------------------------------------- helpers -%% variables +%% switches \newif\ifbxjy@ok +\newif\ifbxjy@default@set +\newif\ifbxjy@byembolden %% unique tokens \def\bxjy@mark{\bxjy@mark@} @@ -71,8 +79,9 @@ \newif\ifbxjy@everypage \DeclareOption{everypage}{\bxjy@everypagetrue} \DeclareOption{noeverypage}{\bxjy@everypagefalse} +\newif\ifbxjy@ipaex \let\bxjy@oneweight=f -\DeclareOption{ipaex-type1}{\let\bxjy@oneweight=i} +\DeclareOption{ipaex-type1}{\bxjy@ipaextrue} \DeclareOption{oneweight}{\let\bxjy@oneweight=t} \DeclareOption{nooneweight}{\let\bxjy@oneweight=f} \newif\ifbxjy@autotilde @@ -84,6 +93,12 @@ \newif\ifbxjy@CJKspace \bxjy@CJKspacetrue \DeclareOption{CJKspace}{\bxjy@CJKspacetrue} \DeclareOption{noCJKspace}{\bxjy@CJKspacefalse} +\newif\ifbxjy@boldbyembolden \bxjy@boldbyemboldentrue +\DeclareOption{boldbyembolden}{\bxjy@boldbyemboldentrue} +\DeclareOption{noboldbyembolden}{\bxjy@boldbyemboldenfalse} +\newif\ifbxjy@substmin +\DeclareOption{substmingoth}{\bxjy@substmintrue} +\DeclareOption{nosubstmingoth}{\bxjy@substminfalse} % preset spec options \def\bxjy@all@main@preset{% %(uniweight) @@ -100,9 +115,18 @@ \DeclareOption*{% \expandafter\bxjy@setkey@a\expandafter{\CurrentOption}} \def\bxjy@setkey@a{\setkeys{bxjy}} +% 'scale=<real>' \let\bxjy@scale\relax \define@key{bxjy}{scale}{% \def\bxjy@scale{#1}} +% 'verrtical=<val>' +\let\bxjy@vertical\@empty +\define@key{bxjy}{vertical}[true]{% + \def\bxjy@vertical{#1}} +% 'ttfname=<val>' +\let\bxjy@ttfname\@empty +\define@key{bxjy}{ttfname}{% + \def\bxjy@ttfname{#1}} %% Dispatch options \ProcessOptions* @@ -130,7 +154,7 @@ \fi %% Consistency check -\ifx i\bxjy@oneweight \unless\ifx\bxjy@main@preset\relax +\ifbxjy@ipaex \unless\ifx\bxjy@main@preset\relax \bxjy@error{Preset options cannot go with 'ipaex-type1'}\@ehc \let\bxjy@main@preset\relax \fi\fi @@ -138,10 +162,9 @@ \bxjy@error{Preset options require a valid driver}\@ehc \let\bxjy@main@preset\relax \fi\fi -\ifx i\bxjy@oneweight \unless\ifx\bxjy@scale\relax - \bxjy@error{Scaling cannot go with 'ipaex-type1'}\@ehc - \let\bxjy@main@preset\relax -\fi\fi +\ifx \bxjy@driver\bxjy@none + \bxjy@boldbyemboldenfalse +\fi %% default scale value \ifx\bxjy@scale\relax @@ -153,9 +176,6 @@ \else \let\bxjy@scale\Cjascale \fi \fi -\ifx i\bxjy@oneweight - \def\bxjy@scale{1}% -\fi %--------------------------------------- preparations @@ -193,6 +213,39 @@ \newcommand*\EveryCJKUse{% \gappto\bxjy@every@cjk@use@hook} +%--------------------------------------- vertical + +%% constants +\chardef\bxjy@vert@none=0 +\chardef\bxjy@vert@false=0 +\chardef\bxjy@vert@=0 +\chardef\bxjy@vert@sub=1 +\chardef\bxjy@vert@main=2 +\chardef\bxjy@vert@true=2 + +%% \bxjy@vert +\let\bxjy@vert\bxjy@vert@none +\ifcsdef{bxjy@vert@\bxjy@vertical}{% + \letcs\bxjy@vert{bxjy@vert@\bxjy@vertical} +}{%else + \bxjy@error{Invalid value of 'vertical': \bxjy@vertical}\@ehc +} +\ifcase\bxjy@vert %none + \AfterEndPreamble{\csuse{CJKhorz}} +\or %sub + \RequirePackage{CJKvert}[]% + \AfterEndPreamble{\CJKhorz} +\or %main + \RequirePackage{CJKvert}[]% + \AfterEndPreamble{\CJKvert} +\fi +\AtBeginDocument{% + \@ifpackageloaded{CJKvert}{% + \bxjy@patch@CJKsymbol@CJKvert + \patchcmd{\CJKvert}{\normalfont}{\bxjy@normalafont}{}{}% + \patchcmd{\CJKhorz}{\normalfont}{\bxjy@normalafont}{}{}% + }{}} + %--------------------------------------- user interface %%%%<*> \setminchofont/\setgothicfont/etc. @@ -214,11 +267,8 @@ \else \@for\bxjy@x:={#1}\do{% \ifx @#2@\@namedef{bxjy@FS/\bxjy@x}{#3}% - \else\ifx\bxjy@driver\bxjy@dvipdfmx - \@namedef{bxjy@FS/\bxjy@x}{:#2:#3}% - \else % ttc is unavailable in pdfTeX - \bxjy@error{pdfTeX does not support TTC}\@eha - \fi\fi}% + \else \@namedef{bxjy@FS/\bxjy@x}{:#2:#3}% + \fi}% \fi} \@for\bxjy@x:={% mnr,mnb,gtr,gtb,gtx,gtu,mgr% @@ -240,7 +290,7 @@ } %%<*> \setCJKfamilydefault{<fam>} -\newbool{bxjy@default@set} +%\newif\ifbxjy@default@set \newrobustcmd*\setCJKfamilydefault[1]{% \bxjy@default@settrue \CJKencfamily{UTF8}{#1}} @@ -388,6 +438,113 @@ }#1% } +%--------------------------------------- ttfname + +%% variables +\let\bxjy@ttfname@ptn\relax +\let\bxjy@ttc@info + +%% constants +\begingroup \let\\\@backslashchar +% The set of allowed characters, all ASCII but the followings: +% [special in Windwos path name] \ / ? : * " > < | +% [special in LaTeX] # % ^ { } ~ +\edef\x{[]!$&'()+,.0-9;=@A-Z_`a-z-]} +\xdef\bxjy@Rx@tp@a{^(\x*)\\*(\x*)$} +\xdef\bxjy@Rx@tp@b{^.*\\.[Tt][Tt][Ff]$} +\xdef\bxjy@Rx@tp@c{^(|.*[^0-9])([0-9]{1,5})([^0-9]*)$} +\xdef\bxjy@Rx@fn@a{^(.*)\\.\\w+$} +\xdef\bxjy@Rx@fn@b{^.*\\.[Tt][Tt][Cc]$} +\endgroup + +%% \bxjy@set@match\CS{<number>} +\@onlypreamble\bxjy@set@match +\def\bxjy@set@match#1#2{% + \expandafter\bxjy@set@match@a\pdflastmatch#2\relax#1} +\@onlypreamble\bxjy@set@match@a +\def\bxjy@set@match@a#1>#2\relax#3{\def#3{#2}} + +%% \bxjy@set@ttfname@ptn +% Sets \bxjy@ttfname@ptn. +\@onlypreamble\bxjy@set@ttfname@ptn +\def\bxjy@set@ttfname@ptn{% + \begingroup + \let\bxjy@ttfname@ptn\relax + \ifnum\pdfmatch{\bxjy@Rx@tp@a}{\bxjy@ttfname}>\z@ + \bxjy@set@match\bxjy@ptnA{1}\bxjy@set@match\bxjy@ptnBC{2}% + \ifnum\pdfmatch{\bxjy@Rx@tp@b}{\bxjy@ptnBC}=\z@ + \edef\bxjy@ptnBC{\bxjy@ptnBC.ttf}% + \fi + \ifnum\pdfmatch{\bxjy@Rx@tp@c}{\bxjy@ptnBC}>\z@ + \bxjy@set@match\bxjy@ptnB{1}\bxjy@set@match\bxjy@ptnC{3}% + \bxjy@set@match\bxjy@ptnN{2}% + \xdef\bxjy@ttfname@ptn{% + {\bxjy@ptnA}{\bxjy@ptnB}{\bxjy@ptnC}{\bxjy@ptnN}}% + \fi + \fi + \ifx\bxjy@ttfname@ptn\relax + \@latex@warning@no@line + {Option 'ttfname' has an invalid value:\MessageBreak + "\bxjy@ttfname"}% + \fi + \endgroup} + +%% \bxjy@make@ttfname\CS{<ttc-name>}{<number>} +\@onlypreamble\bxjy@make@ttfname +\def\bxjy@make@ttfname{% + \expandafter\bxjy@make@ttfname@a\bxjy@ttfname@ptn} +\@onlypreamble\bxjy@make@ttfname@a +\def\bxjy@make@ttfname@a#1#2#3#4#5#6#7{% + \numdef\bxjy@tmpa{#4+#7}\numdef\bxjy@tmpb{1#4-#4}% + \ifnum\bxjy@tmpa<\bxjy@tmpb + \numdef\bxjy@tmpa{\bxjy@tmpa+\bxjy@tmpb}% + \edef\bxjy@tmpa{\expandafter\@gobble\bxjy@tmpa}% + \fi + \edef\bxjy@tmpb{\detokenize{#6}}% + \ifnum\pdfmatch{\bxjy@Rx@fn@a}{\bxjy@tmpb}>\z@ + \bxjy@set@match\bxjy@tmpb{1}% + \fi + \edef#5{#1\bxjy@tmpb#2\bxjy@tmpa#3}} + +%% set the pattern +\unless\ifx\bxjy@ttfname\@empty + \ifdefined\pdfmatch + \bxjy@set@ttfname@ptn + \else + \bxjy@error + {Option 'ttfname' cannot be used because your\MessageBreak + pdfTeX engine is too old}\@ehc + \fi +\fi + +%% \bxjy@modify@fontname +\@onlypreamble\bxjy@modify@fontname +\def\bxjy@modify@fontname{% + \bxly@check@ttc\FONT + \unless\ifx\bxjy@ttc@info\relax + \ifx\bxjy@ttfname@ptn\relax + \bxjy@error{pdfTeX does not support TTC}\@eha + \else + \edef\bxjy@tmpa{\noexpand\FONT\bxjy@ttc@info}% + \expandafter\bxjy@make@ttfname\bxjy@tmpa + \fi + \fi} + +%% \bxly@check@ttc{<name>} +\@onlypreamble\bxly@check@ttc +\ifdefined\pdfmatch +\def\bxly@check@ttc#1{% + \ifnum\pdfmatch{^:([0-9]+):(.*)}{#1}>\z@ + \bxjy@set@match\bxjy@tmpa{1}\bxjy@set@match\bxjy@tmpb{2}% + \edef\bxjy@ttc@info{{\bxjy@tmpb}{\bxjy@tmpa}}% + \else\ifnum\pdfmatch{\bxjy@Rx@fn@b}{#1}>\z@ + \edef\bxjy@ttc@info{{#1}{0}}% + \else\let\bxjy@ttc@info\relax + \fi\fi} +\else +\def\bxjy@check@ttc#1{\let\bxjy@ttc@info\relax} +\fi + %--------------------------------------- fontmap internals %% \bxjy@noembed @@ -430,7 +587,8 @@ \let\bxjy@spec\@empty \else\ifx\bxjy@driver\bxjy@pdftex \def\bxjy@entry@sub#1{%<tfm-spec> - \pdfmapline{=#1 <\FONT}} + \bxjy@modify@fontname + \unless\ifx\FONT\relax \pdfmapline{=#1 <\FONT}\fi} \else % invalid in dvips \fi\fi @@ -474,6 +632,9 @@ \not@math@alphabet\mcfamily\relax \CJKfamily{\mgdefault}} +%% \bxjy@normalafont +\letcs\bxjy@normalafont{normalfont } + %% Add patches to \rmfamily, etc. \csappto{rmfamily }{% \CJKfamily{\mcdefault}} @@ -491,8 +652,8 @@ \fontseries\ebdefault\selectfont} \providecommand{\ebdefault}{eb} \fi -\let\bxjy@CJKnormal\CJKnormal -\protected\def\CJKnormal{\bxjy@CJKnormal} +\protected\def\CJKbold{\CJK@bold@true} +\protected\def\CJKnormal{\CJK@bold@false} %% \bxjy@decl@series \@onlypreamble\bxjy@decl@series @@ -520,11 +681,7 @@ \bxjy@decl@family{mc}{\bxjy@sc unisong}{CJKssub*gt/m/n}{CJKssub*gt/m/n} \bxjy@decl@family{gt}{\bxjy@sc unihei}{CJKssub*gt/m/n}{CJKssub*gt/m/n} \bxjy@decl@family{mg}{\bxjy@sc unikai}{CJKssub*mg/m/n}{CJKssub*mg/m/n} -\else\ifx i\bxjy@oneweight -\renewcommand{\mcdefault}{ipxm} -\renewcommand{\gtdefault}{ipxg} -\renewcommand{\mgdefault}{ipxg} -\fi\fi\fi +\fi\fi %% Set default CJK family \setCJKfamilydefault{\mcdefault} @@ -553,6 +710,171 @@ \fi } +%% \bxjy@force@load@font@fam +\@onlypreamble\bxjy@force@load@font@fam +\def\bxjy@force@load@font@fam#1{% + \begingroup + \def\f@encoding{C70}\let\CJK@enc\f@encoding + \edef\f@family{#1}\let\CJK@family\f@family + \def\f@series{m}\def\f@shape{n}% + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \let\extract@font\relax \pickup@font + \endgroup} + +%--------------------------------------- ipaex-type1 +\ifbxjy@ipaex + +%% default changed +\renewcommand{\mcdefault}{ipxm} +\renewcommand{\gtdefault}{ipxg} +\renewcommand{\mgdefault}{ipxg} + +%% scale applied +\unless\ifdim\bxjy@scale\p@=\p@ + \def\bxjy@tmpa#1#2#3{% + \bxjy@force@load@font@fam{#1}% + \expandafter\ifx\csname C70+#1\endcsname\@empty\else + \def\bxjy@tmpb{\DeclareFontShape{C70}{#1}}% + \bxjy@tmpb{m}{n}{<->sCJK*[\bxjy@scale]#3-r-u}{}% + \ifx t#2% + \bxjy@tmpb{m}{sl}{<->sCJK*[\bxjy@scale]#3-ro-u}{}% + \bxjy@tmpb{bx}{n}{<->sCJKb*[\bxjy@scale]#3-r-u}{\CJKbold}% + \bxjy@tmpb{bx}{sl}{<->sCJKb*[\bxjy@scale]#3-ro-u}{\CJKbold}% + \fi + \fi} + \bxjy@tmpa{ipxm}f{ipxm}% + \bxjy@tmpa{ipxg}f{ipxg}% + \bxjy@tmpa{ipxma}t{ipxm}% + \bxjy@tmpa{ipxga}t{ipxg}% +\fi + +\fi +%--------------------------------------- subst-mingoth +\ifbxjy@substmin + +%% apply +\def\bxjy@tmpa#1#2{% + \bxjy@force@load@font@fam{#1}% + \expandafter\ifx\csname C70+#1\endcsname\@empty\else + \def\bxjy@tmpb{\DeclareFontShape{C70}{#1}}% + \bxjy@tmpb{l}{n}{<->CJKssub*#2/m/n}{}% + \bxjy@tmpb{m}{n}{<->CJKssub*#2/m/n}{}% + \bxjy@tmpb{bx}{n}{<->CJKssub*#2/bx/n}{\CJKbold}% + \fi} +\bxjy@tmpa{min}{mc}% +\bxjy@tmpa{goth}{gt}% +\bxjy@tmpa{maru}{mg}% + +\fi +%--------------------------------------- bold-by-embolden +\ifbxjy@boldbyembolden %<*boldbyembolden> + +%<*>\CJKboldbyembolden/\CJKnoboldbyembolden +%\newif\ifbxjy@byembolden +\newcommand*{\CJKboldbyembolden}{\bxjy@byemboldentrue} +\newcommand*{\CJKnoboldbyembolden}{\bxjy@byemboldenfalse} +\CJKboldbyembolden % initial value + +%% \bxjy@pdfliteraldirect{<pdf-text>} +\ifx\bxjy@driver\bxjy@pdftex + \def\bxjy@pdfliteraldirect#1{\pdfliteral page {#1}} +\else\ifx\bxjy@driver\bxjy@dvipdfmx + \def\bxjy@pdfliteraldirect#1{\special{pdf:literal direct #1}} +\else + \bxjy@error{INTERNAL_ERROR(1)} +\fi\fi + +%% \bxjy@embolden +\def\bxjy(a)bsfactor{1.68} +\def\bxjy@bswd;{\strip@pt\dimexpr\bxjy@bsfactor + \dimexpr\CJKboldshift\relax\relax} +\def\bxjy@embolden{% + \bxjy@pdfliteraldirect{q 2 Tr \bxjy@bswd; w}} +\def\bxjy@embolden@alt{% + \bxjy@pdfliteraldirect{2 Tr \bxjy@bswd; w}} +%% \bxjy@noembolden +\def\bxjy@noembolden{% + \bxjy@pdfliteraldirect{Q}} +\def\bxjy@noembolden@alt{% + \bxjy@pdfliteraldirect{0 Tr}} + +%% \bxjy@patch@CJKsymbol@CJKvert +% Patches to CJKvert version of \CJKsymbol. +\@onlypreamble\bxjy@patch@CJKsymbol@CJKvert +\def\bxjy@patch@CJKsymbol@CJKvert{% + \global\let\bxjy@patch@CJKsymbol@CJKvert\relax + \bxjy@oktrue + \expandafter\patchcmd\csname CJKsymbol \endcsname{%from + \ifCJK@bold@ \CJK@temp + \hbox to \z@{\hss \raise\CJKboldshift\hbox{\CJK@temp}}% + \hbox to \z@{\hss \raise-\CJKboldshift\hbox{\CJK@temp}}% + \else \CJK@temp + \fi + }{%to + \ifCJK@bold@\ifbxjy@byembolden + \bxjy@embolden@alt + \fi\fi + \CJK@temp + \ifCJK@bold@ + \ifbxjy@byembolden + \bxjy@noembolden@alt + \else + \hbox to \z@{\hss \raise\CJKboldshift\hbox{\CJK@temp}}% + \hbox to \z@{\hss \raise-\CJKboldshift\hbox{\CJK@temp}}% + \fi + \fi + }{}{\bxjy@okfalse}% + \expandafter\patchcmd\csname CJKsymbol \endcsname{%from + \ifCJK@bold@ \CJK@temp + \hbox to \CJKboldshift{\hss\CJK@temp}% + \hbox to \CJKboldshift{\hss\CJK@temp}% + \else \CJK@temp + \fi + }{%to + \ifCJK@bold@\ifbxjy@byembolden + \bxjy@embolden@alt + \fi\fi + \CJK@temp + \ifCJK@bold@ + \ifbxjy@byembolden + \bxjy@noembolden@alt + \else + \kern-\CJKboldshift\hb@xt@\z@{\hss\CJK@temp}% + \kern2\dimexpr\CJKboldshift\relax + \hb@xt@\z@{\hss\CJK@temp}\kern-\CJKboldshift\relax + \fi + \fi + }{}{\bxjy@okfalse}% + \unless\ifbxjy@ok + \bxjy@error{Failure in patching to CJKvert}\@ehc + \fi +} +%% redefine \CJKsymbol +\@ifpackageloaded{CJKvert}{% + % CJKvert version + \bxjy@patch@CJKsymbol@CJKvert +}{% non-CJKvert version + \@namedef{CJKsymbol }#1{% + \ifCJK@bold@\ifbxjy@byembolden + \bxjy@embolden + \fi\fi + \symbol{#1}% + \ifCJK@bold@ + \ifbxjy@byembolden + \bxjy@noembolden + \else + \kern-\CJKboldshift\hb@xt@\z@{\hss\symbol{#1}}% + \kern2\dimexpr\CJKboldshift\relax + \hb@xt@\z@{\hss\symbol{#1}}\kern-\CJKboldshift\relax + \fi + \fi}% +} + +\else %<*!boldbyembolden> +% makes \CJK[no]boldbyembolden no-op +\newcommand*{\CJKboldbyembolden}{} +\newcommand*{\CJKnoboldbyembolden}{} +\fi %</boldbyembolden> %--------------------------------------- begin-document hook \ifx\bxjy@driver\bxjy@dvipdfmx %<*dvipdfmx> @@ -596,6 +918,34 @@ %% Invokes first-CJK hook at begin-document \AtBeginDocument{\bxjy@first@cjk@use@hook} +%--------------------------------------- PDF-string hack + +%%<+> \bxcjkjatypeHyperrefPatchDone +%% Informs that the patch is applied. +\let\bxcjkjatypeHyperrefPatchDone=t + +%% prepare +\begingroup + \CJK(a)input{UTF8.bdg}% emerge CJK@UTF8Binding +\endgroup +%% register to \pdfstringdefPreHook +\g@addto@macro\pdfstringdefPreHook{% + \@nameuse{CJK@UTF8Binding}% enable UTF8 decoder + \ifx~\bxjy@@CJKtilde % \CJKtilde is effective + \let\bxjy@org@LetUnexpandableSpace\HyPsd@LetUnexpandableSpace + \let\HyPsd@LetUnexpandableSpace\bxjy@LetUnexpandableSpace + \let~\@empty + \fi +} +\def\bxjy@@CJKtilde{\CJKecglue\ignorespaces} +%% patch to \HyPsd@LetUnexpandableSpace +\def\bxjy@@tildecmd{~} +\def\bxjy@LetUnexpandableSpace#1{% + \def\bxjy@tmpa{#1}\ifx\bxjy@tmpa\bxjy@@tildecmd\else + \bxjy@org@LetUnexpandableSpace#1% + \fi +} + %--------------------------------------- preset font mappings %% \bxjy@declare@preset{<name>}{<text>} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcjkjatype.tlpobj new/tlpkg/tlpobj/bxcjkjatype.tlpobj --- old/tlpkg/tlpobj/bxcjkjatype.tlpobj 2016-04-14 18:48:00.000000000 +0200 +++ new/tlpkg/tlpobj/bxcjkjatype.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,6 +1,6 @@ name bxcjkjatype category Package -revision 32048 +revision 42292 shortdesc Typeset Japanese with pdfLaTeX and CJK relocated 1 longdesc The package provides a working configuration of the CJK @@ -8,10 +8,10 @@ longdesc Moreover, it facilitates use of the CJK package for pLaTeX longdesc users, by providing commands that are similar to those used by longdesc the pLaTeX kernel and some other packages used with it. -runfiles size=6 +runfiles size=8 RELOC/tex/latex/bxcjkjatype/bxcjkjatype.sty catalogue-ctan /language/japanese/bxcjkjatype -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics japanese -catalogue-version 0.2c +catalogue-version 0.3 ++++++ bxdpx-beamer.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdpx-beamer/LICENSE new/doc/latex/bxdpx-beamer/LICENSE --- old/doc/latex/bxdpx-beamer/LICENSE 2013-05-04 01:36:50.000000000 +0200 +++ new/doc/latex/bxdpx-beamer/LICENSE 2016-11-25 19:28:20.000000000 +0100 @@ -6,7 +6,7 @@ The MIT License -Copyright (c) 2013 Takayuki YATO (aka. "ZR") +Copyright (c) 2013-2016 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdpx-beamer/README new/doc/latex/bxdpx-beamer/README --- old/doc/latex/bxdpx-beamer/README 2013-05-04 01:36:50.000000000 +0200 +++ new/doc/latex/bxdpx-beamer/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -bxdpx-beamer Package -==================== - -LaTeX: to fix some problems in use of Beamer with dvipdfmx - -This packges makes the two types of links work: - - Navigation symbols - - \framezoom'd regions - -### Installation - - - `*.sty` → $TEXMF/tex/latex/bxdpx-beamer - -### Usage - -Load this package as usual in the preamble of Beamer documents: - - \documentclass[dvipdfmx]{beamer} - \usepackage{bxdpx-beamer} - -This package does not provide any user commands. - -Revision History ----------------- - - * Version 0.2 <2013/02/27> - - The first public version. - --------------------- -Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdpx-beamer/README.md new/doc/latex/bxdpx-beamer/README.md --- old/doc/latex/bxdpx-beamer/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxdpx-beamer/README.md 2016-11-25 19:28:20.000000000 +0100 @@ -0,0 +1,37 @@ +bxdpx-beamer Package +==================== + +LaTeX: to fix some problems in use of Beamer with dvipdfmx + +This packges makes the two types of links work: + - Navigation symbols + - \framezoom'd regions + +### Installation + + - `*.sty` → $TEXMF/tex/latex/bxdpx-beamer + +### Usage + +Load this package as usual in the preamble of Beamer documents: + + \documentclass[dvipdfmx]{beamer} + \usepackage{bxdpx-beamer} + +This package does not provide any user commands. + +### License + +This package is distributed under the MIT License. + +Revision History +---------------- + + * Version 0.3 〈2016/08/06〉 + - The driver of geometry package is forced to be `dvipdfm`. + * Version 0.2 〈2013/02/27〉 + - The first public version. + +-------------------- +Takayuki YATO (aka. "ZR") +http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex new/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex --- old/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex 2013-05-04 01:36:50.000000000 +0200 +++ new/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex 2016-11-25 19:28:20.000000000 +0100 @@ -1,24 +1,24 @@ -\documentclass[17pt]{beamer} % dvipdfmx needed -\usetheme{Warsaw} -\usepackage{bxdpx-beamer} -% These settings make navigation symbols rendered in black. +\documentclass[17pt,dvipdfmx]{beamer} % dvipdfmx needed +\usetheme{Warsaw} +\usepackage{bxdpx-beamer} +% These settings make navigation symbols rendered in black. %\setbeamercolor{navigation symbols dimmed}{fg=black} %\setbeamercolor{navigation symbols}{fg=black} -% This makes all links have a border. +% This makes all links have a border. %\hypersetup{pdfborder={0 0 1},allbordercolors={0 0.5 0}} -\begin{document} - -\section{Important but Meaningless} -\begin{frame}{First} -This slide \pause is \alert{meaningless}. -\end{frame} -\begin{frame}{Second} -This slide \pause is also \alert{meaningless}. -\end{frame} - -\section{Meaningless but Important} -\begin{frame}{Third} -This is yet another \alert{meaningless} slide. -\end{frame} - -\end{document} +\begin{document} + +\section{Important but Meaningless} +\begin{frame}{First} +This slide \pause is \alert{meaningless}. +\end{frame} +\begin{frame}{Second} +This slide \pause is also \alert{meaningless}. +\end{frame} + +\section{Meaningless but Important} +\begin{frame}{Third} +This is yet another \alert{meaningless} slide. +\end{frame} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxdpx-beamer.doc.tlpobj new/tlpkg/tlpobj/bxdpx-beamer.doc.tlpobj --- old/tlpkg/tlpobj/bxdpx-beamer.doc.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxdpx-beamer.doc.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,10 +1,10 @@ name bxdpx-beamer.doc category Package -revision 30220 +revision 41813 shortdesc doc files of bxdpx-beamer relocated 1 docfiles size=4 RELOC/doc/latex/bxdpx-beamer/LICENSE - RELOC/doc/latex/bxdpx-beamer/README + RELOC/doc/latex/bxdpx-beamer/README.md RELOC/doc/latex/bxdpx-beamer/sample/test-framezoom.tex RELOC/doc/latex/bxdpx-beamer/sample/test-navisymbol.tex ++++++ bxdpx-beamer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxdpx-beamer/bxdpx-beamer.sty new/tex/latex/bxdpx-beamer/bxdpx-beamer.sty --- old/tex/latex/bxdpx-beamer/bxdpx-beamer.sty 2013-05-04 01:36:50.000000000 +0200 +++ new/tex/latex/bxdpx-beamer/bxdpx-beamer.sty 2016-11-25 19:33:43.000000000 +0100 @@ -1,22 +1,29 @@ % bxdpx-beamer.sty \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxdpx-beamer}[2013/02/27 v0.2] +\ProvidesPackage{bxdpx-beamer}[2016/08/06 v0.3] \def\bxqbd@pkgname{bxdpx-beamer} -% environment check +% if Beamer is not used, then abort with error \@ifclassloaded{beamer}{}{%else \PackageError\bxqbd@pkgname{Beamer is not in use}% {Package loading is aborted.}% \endinput} -% if not in presentation mode, then abort silently -\mode<presentation>{\let\bxqbd@tempa=t } -\ifx t\bxqbd@tempa\else -\expandafter\endinput\fi\relax % if PGF driver is not dvipdfmx/xetex, then abort silently +\let\bxqbd@pgf=\relax +\def\bxqbd(a)tempa{pgfsys-dvipdfmx.def} +\ifx\pgfsysdriver\bxqbd@tempa \let\bxqbd@pgf=d \fi +\def\bxqbd(a)tempa{pgfsys-xetex.def} +\ifx\pgfsysdriver\bxqbd@tempa \let\bxqbd@pgf=x \fi +\ifx\bxqbd@pgf\relax +\expandafter\endinput\fi\relax +%--------------------------------------- geometry +% if geometry driver is not set, set it to 'dvipdfm' +\ifx d\bxqbd@pgf \ifx\Gm@driver\@empty + \Gm@setdriver{dvipdfm} +\fi\fi +%--------------------------------------- hyperlink +% if not in presentation mode, then abort silently \let\bxqbd@tempa=f -\def\bxqbd(a)tempb{pgfsys-dvipdfmx.def} -\ifx\pgfsysdriver\bxqbd@tempb \let\bxqbd@tempa=t \fi -\def\bxqbd(a)tempb{pgfsys-xetex.def} -\ifx\pgfsysdriver\bxqbd@tempb \let\bxqbd@tempa=t \fi +\mode<presentation>{\let\bxqbd@tempa=t } \ifx t\bxqbd@tempa\else \expandafter\endinput\fi\relax % if ec-lmr10 is not available, then abort with warning @@ -26,7 +33,6 @@ hackery cannot be applied in absence of the \MessageBreak LM Roman font}% \endinput} -%--------------------------------------- % \bxqbd@enghost \newbox\bxqbd@ghost \font\bxqbd@font=ec-lmr10 at 1.1613pt % 10*0.5/4.3055 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxdpx-beamer.tlpobj new/tlpkg/tlpobj/bxdpx-beamer.tlpobj --- old/tlpkg/tlpobj/bxdpx-beamer.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxdpx-beamer.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,6 +1,6 @@ name bxdpx-beamer category Package -revision 30220 +revision 41813 shortdesc Dvipdfmx extras for use with beamer relocated 1 longdesc The package is a driver to support beamer Navigation symbols @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/bxdpx-beamer/bxdpx-beamer.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/bxdpx-beamer -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics graphics-drv -catalogue-version 0.2 +catalogue-version 0.3 ++++++ bxdvidriver.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdvidriver/LICENSE new/doc/latex/bxdvidriver/LICENSE --- old/doc/latex/bxdvidriver/LICENSE 2016-03-26 23:57:34.000000000 +0100 +++ new/doc/latex/bxdvidriver/LICENSE 2017-02-14 01:01:03.000000000 +0100 @@ -1,12 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#(B -$BCx:n8"$O:n<T$G$"$k!VH,EP(B $B?rG7!JJLL>(B ZR$B!K!W$KB0$7$^$9!#(B -$B$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - -This software is distributed under the MIT License. - The MIT License -Copyright (c) 2016 Takayuki YATO (aka. "ZR") +Copyright (c) 2017 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxdvidriver/README.md new/doc/latex/bxdvidriver/README.md --- old/doc/latex/bxdvidriver/README.md 2016-03-26 23:57:34.000000000 +0100 +++ new/doc/latex/bxdvidriver/README.md 2017-02-14 01:01:03.000000000 +0100 @@ -94,9 +94,11 @@ Revision History ---------------- + * Version 0.2a ‹2017/02/13› + - Bug fix. * Version 0.2 ‹2016/03/26› - The first public version. -------------------- Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxdvidriver.doc.tlpobj new/tlpkg/tlpobj/bxdvidriver.doc.tlpobj --- old/tlpkg/tlpobj/bxdvidriver.doc.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxdvidriver.doc.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,6 +1,6 @@ name bxdvidriver.doc category Package -revision 40148 +revision 43219 shortdesc doc files of bxdvidriver relocated 1 docfiles size=2 ++++++ bxdvidriver.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxdvidriver/bxdvidriver.sty new/tex/latex/bxdvidriver/bxdvidriver.sty --- old/tex/latex/bxdvidriver/bxdvidriver.sty 2016-03-26 23:57:34.000000000 +0100 +++ new/tex/latex/bxdvidriver/bxdvidriver.sty 2017-02-14 01:01:05.000000000 +0100 @@ -2,7 +2,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxdvidriver}[2016/03/26 v0.2] +\ProvidesPackage{bxdvidriver}[2017/02/13 v0.2a] %% preparation \def\bxdd@pkgname{bxdvidriver} @@ -29,9 +29,9 @@ %% variables \newif\ifbxdd@ok \@onlypreamble\bxdd@driver -\let\bxdd@driver\relax +\let\bxdd@driver\relax % driver given to this package \@onlypreamble\bxdd@pdf@driver -\let\bxdd@pdf@driver\relax +\let\bxdd@pdf@driver\relax % actual pdf-mode driver, or \relax %% \[bxdd@T/<driver>] \@for\bxdd@x:=\bxdd@dvi@driver@list\do{% @@ -45,6 +45,12 @@ \def\bxdd@detokenize@a#1>#2\relax#3{% \def#3{#2}} +%% switch 'bxdd@in@preamble' +\newif\ifbxdd@in@preamble +\ifx\documentclass\@twoclasseserror + \bxdd@in@preambletrue +\fi + %--------------------------------------- options %% 'check'/'nocheck' @@ -53,26 +59,35 @@ \bxdd@checktrue} \DeclareOption{nocheck}{% \bxdd@checkfalse} -%% drivers +%% driver options \DeclareOption*{% - \expandafter\let\expandafter\bxdd@tmpa - \csname bxdd@T/\CurrentOption\endcsname - \ifx\bxdd@tmpa\relax + \bxdd@pfxplus\CurrentOption \ifx\bxdd@tmpa\@empty + \let\bxdd@tmpa\CurrentOption + \else + \expandafter\let\csname bxdd@T/\bxdd@tmpa\endcsname=d% + \fi + \expandafter\let\expandafter\bxdd@tmpb + \csname bxdd@T/\bxdd@tmpa\endcsname + \ifx\bxdd@tmpb\relax % unknown name \PackageError\bxdd@pkgname - {Unknown driver name '\CurrentOption' found}% + {Unknown driver name '\bxdd@tmpa' found}% {The invalid option is ignored.\MessageBreak\@ehc} - \else\ifx\bxdd@driver\relax - \let\bxdd@driver\CurrentOption - \else\ifx\bxdd@driver\CurrentOption + \else\ifx\bxdd@driver\relax % first + \let\bxdd@driver\bxdd@tmpa + \else\ifx\bxdd@driver\bxdd@tmpa % repeated \PackageInfo\bxdd@pkgname - {Redundant driver option '\CurrentOption',\MessageBreak + {Redundant driver option '\bxdd@tmpa',\MessageBreak found}% - \else + \else % second \PackageError\bxdd@pkgname {Multiple driver options are given\MessageBreak - ('\bxdd@driver' and '\CurrentOption')}% - {The extra option '\CurrentOption' is ignored.\MessageBreak\@ehc} + ('\bxdd@driver' and '\bxdd@tmpa')}% + {The extra option '\bxdd@tmpa' is ignored.\MessageBreak\@ehc} \fi\fi\fi} +\def\bxdd@pfxplus#1{% + \expandafter\bxdd@pfxplus@a#1\@gobble+\@nil} +\def\bxdd@pfxplus@a#1+#2\@nil{% + \edef\bxdd@tmpa{\ifx\@nil#1\@nil#2\else\fi}} %% \ProcessOptions* @@ -89,7 +104,7 @@ %--------------------------------------- pdf-mode detection -%% check 'pdfmode' +%% check 'pdfmode' and set \bxdd@pdf@driver \bxdd@oktrue \ifluatex \let\bxdd@tmpa\m@ne @@ -113,6 +128,7 @@ \ifbxdd@ok\else \expandafter\endinput\fi\relax +% clear \bxdd@driver if pdf-mode \ifx\bxdd@pdf@driver\relax\else \PackageInfo\bxdd@pkgname {Driver option '\bxdd@driver' is ignored, because\MessageBreak @@ -120,7 +136,7 @@ \let\bxdd@driver\relax \fi -%--------------------------------------- +%--------------------------------------- append to global %% variables \let\bxdd@gopt\relax @@ -134,6 +150,10 @@ \@for\bxdd@gopt:=\@classoptionslist\do{% \let\bxdd@tmpa\bxdd@gopt \bxdd@detokenize\bxdd@tmpa \expandafter\ifx\csname bxdd@T/\bxdd@tmpa\endcsname\relax\else + \ifbxdd@in@preamble + \@expandtwoargs\@removeelement\bxdd@gopt + \@unusedoptionlist\@unusedoptionlist + \fi \ifx\bxdd@godrv\bxdd@gopt % just redundant \else\ifx\bxdd@godrv\relax % first \let\bxdd@godrv\bxdd@gopt @@ -148,6 +168,7 @@ \let\bxdd@godrv\bxdd@godrv@multiple \fi\fi\fi \fi} + \global\let\@unusedoptionlist\@unusedoptionlist \aftergroup\bxdd@okfalse \ifx\bxdd@godrv\relax \ifx\bxdd@driver\relax\else @@ -167,6 +188,8 @@ (see log for detail)}% {\@ehd}% \fi + \else\ifx\bxdd@driver\relax + % nothing to do \else % inconsistent \ifbxdd@check \PackageError\bxdd@pkgname @@ -179,11 +202,11 @@ because the global option list contains another driver\MessageBreak '\bxdd@godrv',} \fi - \fi\fi\fi + \fi\fi\fi\fi \endgroup} %% append the specified driver option -\ifx\documentclass\@twoclasseserror% in preamble +\ifbxdd@in@preamble \bxdd@scan@global@options \ifbxdd@ok \edef\bxdd@tmpa{% @@ -211,7 +234,7 @@ \bxdd@tmpa} \fi -%--------------------------------------- +%--------------------------------------- check for graphics drivers %% \bxdd@scan@graphics@drivers \@onlypreamble\bxdd@scan@graphics@drivers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxdvidriver.tlpobj new/tlpkg/tlpobj/bxdvidriver.tlpobj --- old/tlpkg/tlpobj/bxdvidriver.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxdvidriver.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,6 +1,6 @@ name bxdvidriver category Package -revision 40148 +revision 43219 shortdesc Enables specifying a driver option effective only in DVI output relocated 1 longdesc This single-function package enables authors to specify a @@ -8,10 +8,10 @@ longdesc only when the engine outputs a DVI file. It is useful to create longdesc special document- templates that can be compiled in both PDF- longdesc mode and DVI-mode. -runfiles size=2 +runfiles size=3 RELOC/tex/latex/bxdvidriver/bxdvidriver.sty catalogue-ctan /macros/latex/contrib/bxdvidriver -catalogue-date 2016-03-30 06:22:42 +0200 -catalogue-license other-free +catalogue-date 2017-02-13 17:55:09 +0100 +catalogue-license mit catalogue-topics dvi-proc -catalogue-version 0.2 +catalogue-version 0.2a ++++++ bxeepic.doc.tar.xz ++++++ ++++++ bxeepic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxeepic.tlpobj new/tlpkg/tlpobj/bxeepic.tlpobj --- old/tlpkg/tlpobj/bxeepic.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxeepic.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/latex/bxeepic/bxdpxp2e.def RELOC/tex/latex/bxeepic/bxeepic.sty catalogue-ctan /macros/latex/contrib/bxeepic -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-in-tex catalogue-version 0.2 ++++++ bxenclose.doc.tar.xz ++++++ ++++++ bxenclose.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxenclose.tlpobj new/tlpkg/tlpobj/bxenclose.tlpobj --- old/tlpkg/tlpobj/bxenclose.tlpobj 2016-04-14 18:48:01.000000000 +0200 +++ new/tlpkg/tlpobj/bxenclose.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=1 RELOC/tex/latex/bxenclose/bxenclose.sty catalogue-ctan /macros/latex/contrib/bxenclose -catalogue-date 2016-04-05 05:21:13 +0200 -catalogue-license other-free +catalogue-date 2016-12-18 08:45:22 +0100 +catalogue-license mit catalogue-topics macro-supp catalogue-version 0.2 ++++++ bxjscls.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/LICENSE new/doc/latex/bxjscls/LICENSE --- old/doc/latex/bxjscls/LICENSE 2016-03-28 00:17:49.000000000 +0200 +++ new/doc/latex/bxjscls/LICENSE 2017-03-15 23:01:04.000000000 +0100 @@ -1,11 +1,9 @@ -本ソフトウェアは修正BSDライセンス(The BSD 2-Clause License)の下で -配布されます。 -著作権は作者である「八登崇之（別名 ZR）」に属します。 -また本ソフトウェアは無保証です。 - The BSD 2-Clause License -Copyright (c) 2016 Takayuki YATO (aka. "ZR") +Copyright 1995-1999 ASCII Corporation. +Copyright 1999-2016 Haruhiko Okumura +Copyright 2016-2017 Japanese TeX Development Community +Copyright 2013-2017 Takayuki YATO (aka. "ZR") All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/README-ja.md new/doc/latex/bxjscls/README-ja.md --- old/doc/latex/bxjscls/README-ja.md 2016-05-03 19:27:57.000000000 +0200 +++ new/doc/latex/bxjscls/README-ja.md 2017-04-11 00:02:38.000000000 +0200 @@ -97,6 +97,63 @@ 更新履歴 -------- + * Version 1.5b 〈2017/04/01〉 + - 全エンジンについて、`\>` で和欧文間空白を挿入するようにした。 + - `xkanjiskip-cmd` オプションを新設。 + - `nodvidriver` ドライバオプションを新設。 + - バグ修正。 + * Version 1.5a 〈2017/03/14〉 + - バグ修正。 + * Version 1.5 〈2017/03/11〉 + - jsreport の `layout=v2` 指定で、従来の jsbook + report に代わって、 + jsclasses で新設された jsreport のレイアウトを継承する。 + - pLaTeX-ng のためのエンジンオプション `platex-ng` を新設。 + - `chapterabstract` 環境を新設。 + - `hyperref-enc`、`whole-zw-lines` オプションを新設。 + - jsclasses の 2017/03/05 と同期。 + + `openleft` オプションを新設。 + + `\frontmatter`、`\backmatter` の仕様の変更。 + * Version 1.4 〈2017/02/03〉 + - `\zwapace` 命令を追加。 + - 数式中の和文出力をサポートした。 + - バグ修正。 + * Version 1.3a 〈2017/01/28〉 + - jsclasses の 2017/01/13 と同期。 + * Version 1.3 〈2016/11/01〉 + - bxjsbook について、水平マージンの量が jsbook と大きく異なると + いう不具合を修正した。同時に修正前のレイアウトを継続するための + オプション `layout` を新設した。 + - jsclasses の 2016/10/08 と同期。 + ※ページレイアウトの修正にはまだ追随てきていない。 + + `(no)jslogo` オプションを新設。`jslogo` 指定時は（jsclasses + の）jslogo パッケージを読みこむ。（既定は `nojslogo`。） + + bxjsslide の一部の節見出しのレイアウトを修正。 + + 和文用の微調整。 + * Version 1.2a 〈2016/08/17〉 + - fancyhdr パッケージに対する調整を入れた。 + - `fancyhdr`、`textwidth-limit`、`paragraph-mark` オプションを新設。 + - `\ascpt` 命令を新設した。 + * Version 1.2 〈2016/08/01〉 + - `geometry` オプションを新設した。 + - `dvi` オプションを新設した。 + - `\bf` や `\it` などの“二文字フォント命令”の使用に対して警告を + (現状では控えめに)出すようにする。この警告を制御するオプション + `(no)oldfontcommands` および `\(dis)allowoldfontcommands` 命令 + を新設した。 + - 万一“2.09 互換モード”で BXJS クラスが読み込まれた場合は致命的 + エラーとする。 + * Version 1.1f 〈2016/07/16〉 + - jsclasses の開発体制の変更に応じて、原作に関する記述を修正。 + - magstyle オプションの値の名前を jsclasses に合わせて変更。 + - 動く引数中で `\@` を用いた場合に aux ファイル中で後続の空白文字 + が消えてしまう不具合を修正。 + - graphics/color パッケージ対策で `nosetpagesize` をグローバルに + 指定した。 + * Version 1.1e 〈2016/05/28〉 + - `\subtitle` の定義を遅延させる。 + * Version 1.1d 〈2016/05/21〉 + - XeTeX でも「hyperref で `unicode` を既定で有効」にする。 + - `bigcode`/`nobigcode` オプションを追加。 * Version 1.1c 〈2016/05/01〉 - バグ修正。 * Version 1.1b 〈2016/03/27〉 @@ -152,4 +209,4 @@ -------------------- Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/README.md new/doc/latex/bxjscls/README.md --- old/doc/latex/bxjscls/README.md 2016-05-03 19:27:57.000000000 +0200 +++ new/doc/latex/bxjscls/README.md 2017-04-11 00:02:38.000000000 +0200 @@ -87,6 +87,20 @@ Revision History ---------------- + * Version 1.5b 〈2017/04/01〉 + * Version 1.5a 〈2017/03/14〉 + * Version 1.5 〈2017/03/11〉 + - Sync with jsclasses 2017/03/05. + * Version 1.4 〈2017/02/03〉 + * Version 1.3a 〈2017/01/28〉 + - Sync with jsclasses 2017/01/13. + * Version 1.3 〈2016/11/01〉 + - Sync with jsclasses 2016/10/08. + * Version 1.2a 〈2016/08/17〉 + * Version 1.2 〈2016/08/01〉 + * Version 1.1f 〈2016/07/16〉 + * Version 1.1e 〈2016/05/28〉 + * Version 1.1d 〈2016/05/21〉 * Version 1.1c 〈2016/05/01〉 * Version 1.1b 〈2016/03/27〉 * Version 1.1a 〈2016/02/20〉 @@ -104,4 +118,4 @@ -------------------- Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ +https://github.com/zr-tex8r Binary files old/doc/latex/bxjscls/bxjscls-manual.pdf and new/doc/latex/bxjscls/bxjscls-manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/bxjscls-manual.tex new/doc/latex/bxjscls/bxjscls-manual.tex --- old/doc/latex/bxjscls/bxjscls-manual.tex 2016-05-03 19:27:57.000000000 +0200 +++ new/doc/latex/bxjscls/bxjscls-manual.tex 2017-04-11 00:02:38.000000000 +0200 @@ -1,24 +1,30 @@ % 文字コードは UTF-8 % lualatex で組版する \documentclass[a4paper]{ltjsarticle} -\usepackage{url} +\usepackage{color} +\definecolor{myblue}{rgb}{0,0,0.75} +\definecolor{mygreen}{rgb}{0,0.45,0} +%\usepackage{url} +\usepackage[unicode,colorlinks,hyperfootnotes=false]{hyperref} +\hypersetup{linkcolor=myblue,urlcolor=mygreen} \usepackage{metalogo} +\pdfstringdefDisableCommands{% + \renewcommand*{\XeLaTeX}{XeLaTeX}} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.1c} -\newcommand{\PkgDate}{2016/05/01} +\newcommand{\PkgVersion}{1.5b} +\newcommand{\PkgDate}{2017/04/01} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} \newcommand{\Means}{：\ } \newcommand{\jemph}{\textsf} -\newcommand{\Ord}[1]{#1$^\circ$} -\newcommand{\Prn}[1]{\<（#1）\<} \providecommand{\pTeX}{p\TeX} \providecommand{\pLaTeX}{p\LaTeX} \providecommand{\upTeX}{u\pTeX} \providecommand{\upLaTeX}{u\pLaTeX} \providecommand{\pdfLaTeX}{pdf\LaTeX} +\providecommand{\BibTeX}{Bib\TeX} %----------------------------------------------------------- \begin{document} \title{\Pkg{BXjscls} パッケージ\\ @@ -27,15 +33,14 @@ \author{八登崇之\ （Takayuki YATO; aka.~``ZR''）} \date{v\PkgVersion\quad[\PkgDate]} \maketitle +\tableofcontents %=========================================================== \section*{注意} -このマニュアルは\textgt{暫定版}であり、内容に不完全な点がある。 - BXJS文書クラスについては、“{\TeX} Wiki”中の記事、 \footnote{\url{https://texwiki.texjp.org/?BXjscls}}% -およびそこからたどれるサイトにある情報も参照してほしい。 +およびそこからたどれるサイトにある情報も併せて参照してほしい。 %=========================================================== \section{概要} @@ -43,7 +48,8 @@ 本パッケージに含まれる文書クラス集（以下では\jemph{BXJS（文書）クラス}と呼ぶ） -は、奥村晴彦氏製作の「p{\LaTeXe}新ドキュメントクラス」 +は、奥村晴彦氏および“日本語{\TeX}開発コミュニティ”により作製された +\Pkg{jsclasses}パッケージの文書クラス集（以下では\jemph{JS（文書）クラス}と呼ぶ）の拡張版に相当する。 JSクラスのレイアウトデザインと機能をほぼ踏襲しているが、 @@ -61,6 +67,8 @@ 利用しているが、これが他のパッケージと衝突して不具合を起こすことがある。 BXJSクラスではmag機能を使う他に別の方式を選べるようにしている。 + \Note JSクラスについても新しい（2016/07/11以降の）版では + 同様の機能が提供されている。 \item 用紙サイズや基底フォントサイズについて、任意の値を指定することができる。 \end{itemize} @@ -347,6 +355,16 @@ 再設定用の命令（\ref{ssec:page-layout}節参照）か、または \Pkg{geometry}パッケージが提供する再設定用命令（|\geometry| 等）を利用する。 +\item |papersize|オプションは既定で有効になっていて、 + 出力用紙サイズはクラスオプションで指定したものに + 自動的に設定される。 + この処理を無効にするには|nopapersize|オプションを指定すればよい。 +\item |papersize|オプションの処理は\Pkg{geometry}パッケージの + 機能により行われる。 + \Pkg{hyperref}パッケージや（最近の）\Pkg{graphics}／ + \Pkg{color}パッケージがもつ出力用紙サイズ設定の機能は + これと干渉する可能性があるので、 + BXJSクラスにおいては自動的に無効化される。 \item \Pkg{hyperref}パッケージにおける“PDFの文字コード”の設定はエンジンごとに適切な値が異なっていて複雑であり、これが不適切であるためにPDF文書情報（しおり等）が文字化けして @@ -384,6 +402,13 @@ そこでBXJSクラスでは代わりに |\ifjsDraft| の名前を用い、本文開始時に |\ifdraft| が未定義の場合に限り、 |\ifjsDraft| を |\ifdraft| にコピーする処理にしている。 + \Note JSクラスの |\ifdraft| は2016/07/13版で廃止された。 + 従って、BXJSクラスにおいて |\ifdraft| スイッチの使用を + 非推奨とし、将来的に廃止を予定する。 +\item 1.2版より、|\bf| や |\it| 等の + {\pLaTeX}\,2.09方式のフォント選択命令の使用が + 非推奨となり、これらの命令を使うと警告が出るようになった。 + 詳細は\ref{sec:Old-font-commands}節を参照。 % TODO: \@ptsize の話 \end{itemize} @@ -512,7 +537,7 @@ \item エンジンオプション\Means 実際に使用するエンジン（{\LaTeX}コマンド名）を指定する。有効な値は |latex|、|platex|、|uplatex|、|pdflatex|、|xelatex|、 - |lualatex| である。 + |lualatex|、|platex-ng| である。エンジンオプション（と次項の |autodetect-engine| の何れか）の指定は必須である。 \item |autodetect-engine|\Means @@ -531,21 +556,35 @@ \item ドライバオプション\Means DVI出力のエンジンを用いる場合に、実際に使用するDVIウェアの名前を指定する。 - 有効な値は |dvips|、|dvipdfmx|、|dviout|、|xdvi|、そして特殊な - 値として |dvipdfmx-if-dvi| がある。 - これは「エンジンがDVI出力の場合に限り |dvipdfmx| を指定する」 - ことを表すもので、|autodetect-engine| と一緒に使うことが - 想定されている。 - \footnote{「実際に |dvipdfmx| が指定された」場合は、 - |dvipdfmx| がグローバルオプションとしても働く。}% - ドライバオプションの指定は必須である。 + 有効な値は |dvips|、|dvipdfmx|、|dviout|、|xdvi| である。 + DVI出力時はドライバオプション（と次項の |nodvidriver| の何れか） + の指定は必須である。 + \footnote{ただし現状では、ドライバオプションが無い場合には + エラーではなく警告が出る。} +\item |nodvidriver|\Means + 特殊なドライバオプションの一種で、BXJSクラスが持つ + ドライバ依存の機能を全て抑止することを指定する。% + \footnote{従って、ドライバ依存のパッケージを使用しなければ、 + 出力されるDVIファイルは特定のDVIウェアに依存しないものになる。} +\item |dvi=|\Meta{ドライバ名}\Means + エンジンがDVI出力の場合に限り、指定のドライバオプションを + 有効にする。 + \footnote{実際にドライバオプションが有効化された場合は、 + そのオプションがグローバルオプションとしても働く。 + 例えば、DVI出力のエンジンで |dvi=dvipdfmx| が指定された場合は、 + |dvipdfmx| がグローバルオプションに追加される。}% + |autodetect-engine| と一緒に使うことが想定されている。 +\item |dvipdfmx-if-dvi|\Means + |dvi=dvipdfmx| と同値。 + \Note |dvi| オプションは1.2版で新設されたもので、以前は + このオプションのみが存在した。 \item |pandoc|\Means 「Pandocモード」（\ref{sec:Pandoc-mode}節）を指定する。以下の設定が行われる： \begin{itemize} \item エンジンオプションが |autodetect-engine| に固定される。 \item 和文ドライバが |pandoc| に固定される。 - \item ドライバオプションについて |dvipdfmx-if-dvi| が既定になる + \item ドライバオプションについて |dvi=dvipdfmx| が既定になる（明示指定で上書可能）。 \end{itemize} \item |nopapersize|\Means @@ -554,20 +593,6 @@ は既定で有効である。） \Note papersize specialを出力する他のパッケージとの干渉に対する対策。 -\item |zw|（既定）\Means - |\jsZw| と等価な命令として |\zw| を定義する。 -\item |nozw|\Means - |zw| の否定。 - \Note 命令名の衝突に対する対策。 -\item |js|（既定）\Means - JSクラス（例えば\Pkg{bxjsreport}の場合は\Pkg{jsbook}） - が読込済であるように振舞う。 - \Note 「JSクラスであるかによって挙動を変える」 - パッケージに対する対策。 -\item |nojs|\Means - |js| の否定。 - \Note つまり「JSクラスの一種である」と判定されると不都合な場合に - このオプションを指定する。 \item |ja=|\Meta{名前}\Means 使用する和文ドライバの名前を指定する。（詳細は\ref{sec:Ja-Driver}節を参照。） @@ -621,14 +646,156 @@ |a4paper| 等と同じ役割で、任意の値を指定できる。用紙サイズの既定値はA4縦（$\mbox{210\,mm}\times\mbox{294\,mm}$）である。 +\item |enablejfam=|\Meta{値}\Means + 数式中の和文出力をサポートするか否か。 + 値は |true|（有効）／|false|（無効）／|default|（既定値に従う） + の何れかである。 + エンジンや和文ドライバの種類により、 + 既定値が有効・無効の何れになるかは異なり、また、 + そもそも有効・無効の一方しか選択できない場合もある。 + 詳細については\ref{sec:Ja-math-fonts}節を参照されたい。 +\item |disablejfam|\Means + |enablejfam=false| と同値。 + \Note JSクラスとの互換のため存在する。 +\end{itemize} + +以下に挙げるのは上級者向けのオプションである。 + +\begin{itemize} +\item |zw|（既定）\Means + |\jsZw| と等価な命令として |\zw| を定義する。 +\item |nozw|\Means + |zw| の否定。 + \Note 命令名の衝突に対する対策。 +\item |js|（既定）\Means + JSクラス（例えば\Pkg{bxjsreport}の場合は\Pkg{jsbook}） + が読込済であるように振舞う。 + \Note 「JSクラスであるかによって挙動を変える」 + パッケージに対する対策。 +\item |nojs|\Means + |js| の否定。 + \Note つまり「JSクラスの一種である」と判定されると不都合な場合に + このオプションを指定する。 +\item |bigcode|\Means + {\upTeX}エンジンとdvipdfmxの組合せで\Pkg{hyperref}パッケージを + 利用する時に適用されるToUnicode CMapとして |UTF8-UTF16| を指定する。 + PDFの文書情報の文字列にBMP外の文字が含まれる場合には + この指定が必要である。 + |UTF8-UTF16| のファイルがインストールされていないと、 + dvipdfmxの処理が失敗する。 +\item |nobigcode|\Means + |bigcode| の否定。ToUnicode CMapとして |UTF8-UCS2| を指定する。 + この場合は文書情報の文字列にBMP外の文字を使用できない。 + \Note |UTF8-UTF16| のファイルが利用できるかを確実に判定するのは + 困難なため、|bigcode| の既定値は次のようなアドホックな方法で + 決めている： + {\TeX}エンジンのバージョンが3.14159265以上 + \footnote{{\TeX}のバージョン3.14159265は2014年1月にリリースされた。} + である場合は、 + （{\TeX}環境がある程度新しく、|UTF8-UTF16| が利用可能と思われるので） + |bigcode| を既定とし、それ以外は |nobigcode| を既定とする。 +\item |precisetext|\Means + {\XeTeX}エンジンにおいて、「ActualText生成機能」を有効化する。 + \footnote{つまり、|\XeTeXgenerateactualtext=1| を行う。 + ActualText 生成機能と日本語処理は相性が悪いため、これを使うと + 出力PDFのサイズが増大する（1.5～2倍）ことに注意。} +\item |noprecisetext|（既定）\Means + |precisetext|の否定。 +\item |simplejasetup|（既定）\Means + {\XeTeX}エンジン自体の行組版機能（|\XeTeXlinebreaklocale| 等） + を利用した、簡易的な日本語用組版設定を行う。 + \Note {\XeTeX}エンジン以外では無効である。 + また、\Pkg{xeCJK}や\Pkg{zhspacing}等の日本語（CJK）組版用 + パッケージが読み込まれた場合も無効化される。 + 特に、和文ドライバがstandardである場合は、必ず\Pkg{xeCJK}が + 読み込まれるため、このオプションは無意味である。 +\item |nosimplejasetup|\Means + |simplejasetup| の否定。 \item |mag=|\Meta{整数}\Means 版面拡大率（mag値）の直接設定。既定は |base| から算出する。 \Note mag値が$n$の場合、版面が $n/1000$ 倍に拡大される。 \item |magstyle=|\Meta{値}\Means “版面拡大”の実現方法を指定する。 - 有効な値は |mag|、|real|、|xreal| の何れか。 + 有効な値は |usemag|、|nomag|、|nomag*| の何れか。詳細は\ref{ssec:magstyle}節を参照。 +\item |geometry=|\Meta{値}\Means + \Pkg{geometry}パッケージの読込に対する制御。 + \begin{itemize} + \item |class|（既定）\Means + 通常通り、文書クラスが\Pkg{geometry}パッケージを読み込む。 + ユーザは\Pkg{geometry}を後から読み込むことはできない。 + \item |user|\Means + 文書クラスによる\Pkg{geometry}パッケージの読込をスキップする。 + この場合、ユーザが自分で\Pkg{geometry}を読み込むことが想定される。 + \footnote{\Pkg{geometry}の読込は必須ではなく、ページレイアウトの + パラメタを自分で設定しても構わない。 + ただし\Pkg{geometry}の読込が強く推奨される。 + （\Pkg{geometry}非読込時の動作テストはほとんど行っていない。）} + \end{itemize} + \Note “どうしても\Pkg{geometry}パッケージを自分で読み込みたい” + という人のための設定。 +\item |oldfontcommands|\Means + |\bf| 等の“二文字フォント命令”の使用を許容する。 +\item |nooldfontcommands|（既定）\Means + “二文字フォント命令”の使用に対して警告を出す。 + 詳細については\ref{sec:Old-font-commands}節を参照されたい。 +\item |fancyhdr=|\Meta{真偽値}% +\footnote{真偽値は |true|（真）または |false|（偽）で指定する。}\Means + \Pkg{fancyhdr}パッケージの機能に対する補正を行うか。 + 真の場合、以下の補正が行われる。既定値は真。 + \begin{itemize} + \item ヘッダ・フッタ書式の既定値に含まれる“二文字フォント命令” + を除去する。 + \item \Pkg{bxjsbook}クラスでヘッダ・フッタの横幅を（|\textwidth| + ではなく）|\fullwidth| に一致させる。 + \end{itemize} +\item |textwidth-limit=|\Meta{整数}\Means + \Pkg{bxjsbook}クラスにおける、|\textwidth| の上限の長さ + （全角単位）。% + \footnote{つまり、\Pkg{bxjsbook}クラスにおいては、\Pkg{geometry}で + 指定する“width”の値は |\fullwidth| の値と見なされ、それが + このオプションで指定する上限値を超えている場合は、|\textwidth| + は上限値になる。 + この場合の本文領域の配置の様式は\Pkg{jsbook}クラスと同様である。} % + 既定値は40。 +\item |paragraph-mark=|\Meta{文字1つ}\Means + パラグラフ（|\paragraph|）の見出し先頭に付く記号。 + 既定値は“■”。 +\item |whole-zw-lines=|\Meta{真偽値}\Means + ページレイアウト策定において「行長を全角幅の整数倍に丸める処理」 + を行うか否か。 +\item |hyperref-enc=|\Meta{真偽値}\Means + \Pkg{hyperref}パッケージについて + 「PDF文字列の文字コード設定を補正する処理」 + を行うか否か。 +\item |xkanjiskip-cmd=|\Meta{真偽値}\Means + |\>| を和欧文間空白を挿入する命令として定義するか否か。 + （詳しくは\ref{ssec:ja-settings}節を参照。） +\item |layout=|\Meta{値}\Means + レイアウトの変種を選択する。 + 現状では、過去の版との互換性を維持するために用いられている。 + 有効な値は以下の通り。 + \begin{itemize} + \item \Pkg{bxjsbook}クラスの場合： + \begin{itemize} + \item |v2|（既定）\Means + 現版の既定のレイアウト。 + \item |v1|\Means + 1.2a版以前の（本来は不適切な）水平マージンの設定を適用する。 + （詳細は\ref{ssec:page-layout}節を参照。） + \end{itemize} + \item \Pkg{bxjsreport}クラスの場合： + \begin{itemize} + \item |v2|\Means + JSクラスに新設された\Pkg{jsreport}クラスのレイアウトを継承する。 + \Note 近い将来に、既定値が |v2| に変更される予定。 + \item |v1|（既定）\Means + 従来の「\Pkg{jsbook}クラス\,+\,|report|オプション」の + レイアウトを継承する。 + \end{itemize} + \item それ以外のクラスでは、本オプションは無効である。 + \end{itemize} \end{itemize} %------------------- @@ -678,9 +845,10 @@ |titlepage|、|notitlepage|。 \paragraph{起こし} -|openright|、|openany|。 -\Note \Pkg{jsbook}のみ（BXJSでは\Pkg{bxjsreport}と\Pkg{bxjsbook}） -にのみ存在するオプション。 +|openright|、|openleft|、|openany|。 +\Note \Pkg{jsreport}と\Pkg{jsbook}にのみ存在するオプション。 +\Note |openleft| は部・章の開始を見開き左側のページ +（偶数ページ）に強制する（左起こし）。 \paragraph{数式配置} |leqno|、|fleqn|。 @@ -695,6 +863,25 @@ \paragraph{英語化} |english|。 +\paragraph{エンジン種別} +|uplatex|、|autodetect-engine|。 +\Note 既に\ref{ssec:BXJS-specific-option}節で述べた通り。 + +\paragraph{magstyle指定} +|usemag|、|nomag|、|nomag*|。 +\Note BXJSクラスでは、これらは“|magstyle=|”を前置したものと +同等に扱われる。 +詳細は\ref{ssec:magstyle}節を参照。 + +\paragraph{和文数式ファミリ不使用} +|disablejfam|。 +\Note BXJSクラスでは |enablejfam=false| と同値。 +詳細は\ref{sec:Ja-math-fonts}節を参照。 + +\paragraph{ロゴ命令パッケージの読込} +|jslogo|、|nojslogo|。 +\Note BXJSクラスでは |nojslogo| が既定値である。 + %------------------- \subsection{JSクラスのオプションで使用不可能なもの} \label{ssec:JS-deleted-option} @@ -711,11 +898,6 @@ \item 和文フォントメトリック指定\Means |jis|、|winjis|、|mingoth|。 \Note 異なるエンジンで汎用的に扱うのが難しい。 -\item 和文数式フォントの登録の制御\Means - |disablejfam|。 - \Note 前項と同じ理由。 - \footnote{ただし、こちらは一部のエンジンだけでも対応したほうが - よいかも知れない。}% \end{itemize} %------------------- @@ -725,8 +907,8 @@ \item BXJSクラス共通\Means |a4paper|、|onecolumn|、|final|、 |ja=minimal|、|jafont|は空、|japaram|は空、 - |scale=0.924715|、|magstyle=mag|% - \footnote{Lua{\TeX}の0.87版以降では |magstyle=xreal| が既定となる。 + |scale=0.924715|、|magstyle=usemag|% + \footnote{Lua{\TeX}の0.87版以降では |magstyle=nomag*| が既定となる。 \ref{ssec:magstyle}節参照。} \item \Pkg{bxjsarticle}\Means |10pt|、|oneside|、|notitlepage| @@ -770,15 +952,17 @@ これらの問題を緩和するため、BXJSクラスでは“版面拡大”について他の実現方法を提供している。 -それを選択するのがクラスオプションの|magstyle|である。 -\footnote{ところで、このオプションキーの値 -（|mag|、|real|、|xreal|）はかなりイマイチなんだけど、 -もっと素敵な名前はないものだろうか……。}% +それを選択するのが以下に挙げる「magstyleオプション」である。 +\footnote{「magstyleオプション」の値は、|magstyle|をキー名にした +keyval形式（例えば|magstyle=nomag*|）で書くこともできる。 +1.1e版以前では、keyval形式のみがサポートされ、しかも値の識別子として +|usemag|／|nomag|／|nomag*|の代わりに|mag|／|real|／|xreal|を用いて +（つまり|magstyle=xreal|と書いて）いた。} \begin{itemize} -\item |magstyle=mag|\Means +\item |usemag|\Means JSクラスと同様に、“版面拡大”のためにmag設定を用いる。 -\item |magstyle=real|\Means +\item |nomag|\Means mag設定を一切用いず、代わりに、全てのページレイアウトのパラメタの値をスケールさせる。 |\normalsize| や |\large| 等の高位フォントサイズ命令で指定される @@ -787,8 +971,8 @@ いわゆる「基本35書体」のようなオプティカルサイズでない \footnote{或いは、オプティカルサイズに“変な癖”のない。}% フォントのみを用いるのであれば、この設定が最も適切である。 -\item |magstyle=xreal|\Means - |real| と同様に、 +\item |nomag*|\Means + |nomag| と同様に、全てのページレイアウトのパラメタの値をスケールさせる。さらに、“オプティカルサイズの調整”を実現するために、 NFSSの実装コードにパッチを当てる。 @@ -800,12 +984,12 @@ \Note Lua{\TeX}の0.87版以降では（PDF出力時の）「mag設定」の機能が廃止されている。 -そのため、そのようなエンジンでは |mag| はサポートされない +そのため、そのようなエンジンでは |usemag| はサポートされない（エラーになる）。 -\Note |magstyle| オプションの既定値は |mag| である。 -ただし例外として、Lua{\TeX}の0.87版以降では -（|mag| が使えないため）|xreal| が既定値となる。 +\Note |magstyle| オプションの既定値は |usemag| である。 +ただし例外として、|usemag| がサポートされない +エンジンでは |nomag*| が既定値となる。 %=========================================================== \section{和文ドライバ} @@ -819,7 +1003,7 @@ これを\jemph{和文ドライバ}と呼ぶ。 \footnote{\Pkg{graphicx}パッケージ等の「ドライバ」と類似した概念のためこの名称を用いた。}% -\Pkg{BXjscls}のバンドルでは次の2つの和文ドライバを提供している。 +\Pkg{BXjscls}のバンドルでは以下に挙げる和文ドライバを提供している。 \begin{itemize} \item standard和文ドライバ\Means @@ -836,7 +1020,7 @@ 用いることを想定している。 \item pandoc和文ドライバ\Means 「Pandocモード」で仕様される和文ドライバ。 -基本的にstandardと同じ設定を用いるが、 +standardドライバの機能を継承するが、「Pandocの既定のlatexテンプレート」が使われることを前提として、それとBXJSの設定を整合させるための措置を加えている。 \end{itemize} @@ -846,7 +1030,9 @@ 情報については、ソースコード説明書（bxjscls.pdf）の付録Aを参照してほしい。}% |bxjsja-XXX.def|（|XXX| は任意の文字列 -\footnote{カテゴリコード11または12の文字からなる必要がある。}% +\footnote{{\LaTeX}の非特殊文字 +（{\TeX}言語でいうとカテゴリコードが11または12の文字） +からなる必要がある。}% ）の名前のファイルに実装コードを書いてそのファイルを配置すると、 |ja=XXX| のオプション指定でその和文ドライバを利用できる。 @@ -877,35 +1063,45 @@ 用いて次の手順で行っている。 \begin{enumerate} -\item[\Ord{1}] +\item （基底フォントサイズにより決定されたmag値を実際に設定する。） -\item[\Ord{2}] +\item \Pkg{geometry}で次のパラメタを設定する。 + \label{itm:pl-param} \begin{enumerate} - \item[\Prn{a}] + \item クラスオプションで指定された用紙サイズ、および|truedimen|。 - \item[\Prn{ii}] + \label{itm:pl-parama} + \item \Pkg{bxjsarticle}／\Pkg{bxjsreport}の場合は次のパラメタ値。 \begin{quote}\small\begin{verbatim} headheight=10pt, footskip=0.03367\paperheight, headsep=\footskip-\topskip, includeheadfoot, hscale=0.76, hmarginratio=1:1, vscale=0.83, vmarginratio=1:1 \end{verbatim}\end{quote} - \item[\Prn{iii}] - \Pkg{bxjsbook}の場合は次のパラメタ値。 + \item + \Pkg{bxjsbook}の場合は次のパラメタ値。% \begin{quote}\small\begin{verbatim} headheight=10pt, headsep=6mm, nofoot, includeheadfoot, -hmargin=36mm, hmarginratio=1:1, vscale=0.83, vmarginratio=1:1 +hmargin=18mm, vscale=0.83, vmarginratio=1:1 \end{verbatim}\end{quote} - \item[\Prn{iv}] + \Note \Pkg{bxjsbook}の1.2a版以前では、この設定の中の + “|hmargin=18mm|”の代わりに“|hmargin=36mm,| |hmarginratio=1:1|” + を用いていた。 + これでは\Pkg{jsbook}の水平マージン設定と同等にならないため + 1.3版で現在の設定に修正された。 + もし1.2a版以前との互換性を保ちたい場合は、 + クラスオプションに |layout=v1| を指定してほしい。 + \item \Pkg{bxjsslide}の場合は次のパラメタ値。 \begin{quote}\small\begin{verbatim} noheadfoot, hscale=0.9, hmarginratio=1:1, vscale=0.944, vmarginratio=1:1 \end{verbatim}\end{quote} \end{enumerate} -\item[\Ord{3}] +\item 後処理を行う。 + \label{itm:pl-post}% 以下の処理が含まれる。 \begin{itemize} \item |textwidth| を全角幅の整数倍に、|textheight| を整数行分の @@ -920,15 +1116,16 @@ 現在のページレイアウトの設定の一部を修正する。 \Meta{設定}は\Pkg{geometry}のパラメタの記述であり、現在の設定に追記して\Pkg{geometry}が再設定を行った後、 - 再び\Ord{3}の後処理が行われる。 + 再び\ref{itm:pl-post}の後処理が行われる。 \item |\setpagelayout*{|\Meta{設定}|}|\Means 用紙以外の設定をリセットして改めてページレイアウトの設定を行う。 - 具体的には、\Ord{2}の\Prn{i}と\Meta{設定}の内容を用いて - \Pkg{geometry}が再設定を行った後、再び\Ord{3}の後処理が行われる。 + 具体的には、\ref{itm:pl-parama}と\Meta{設定}の + 内容を用いて\Pkg{geometry}が再設定を行った後、 + 再び\ref{itm:pl-post}の後処理が行われる。 \end{itemize} なお、|\geometry| 命令を直接呼び出すことも可能である。 -当然この場合は\Ord{3}の後処理は行われない。 +当然この場合は\ref{itm:pl-post}の後処理は行われない。 %------------------- \subsection{構造マークアップ関連} @@ -937,35 +1134,55 @@ \item |\subtitle{|\Meta{テキスト}|}|\Means サブタイトルを設定する。 \Note |\maketitle| の出力にサブタイトルが含まれるようになる。 +\item |chapterabstract| 環境\Means + \Pkg{jsbook}クラスの |abstract| 環境 + \footnote{article系やreport系のクラスにあるような + （文書要旨のための）abstract 環境は、book系クラスでは + 用意されていないことが多いことに注意。}% + と等価な環境で、 + “各章の初めにちょっとしたことを書く”用途を想定したもの。 + （ただし使用可能な場所に特に制限はない。） \end{itemize} +なお、|abstract| 環境の機能については継承元のJSクラスと同一に +なるため以下のようになる。 +\begin{itemize} +\item \Pkg{bxjsarticle}および|layout=v2|指定の\Pkg{bxjsreport}\Means + \Pkg{jsarticle}／\Pkg{jsreport}クラスと同じ、 + つまり「文書要旨」のための環境。 +\item \Pkg{bxjsbook}および|layout=v1|指定の\Pkg{bxjsreport}\Means + \Pkg{jsbook}クラスと同じ、 + つまり |chapterabstract| 環境と等価。 +\end{itemize} %------------------- \subsection{和文用設定関連} +\label{ssec:ja-settings} \begin{itemize} \item |\jsZw|\Means 和文の全角幅を表す。 + 例えば |2\jsZw| が pLaTeX の |2zw| に相当する。 \item |\zw|\Means |\jsZw| の別名。 \footnote{\Pkg{\LuaTeX-ja}では「実際の全角幅」を表す命令 |\zw|（{\pLaTeX}の |zw| と本当に等価）が規定されている。 |lualatex| エンジン指定かつ和文ドライバが |standard| の場合はこの |\zw| の定義がそのまま使われる。 - （従って |nozw| は実質的に無効である。） + （従って |zw|／|nozw| は実質的に意味を持たない。）なお、|\jsZw| は「規約上の全角幅」であり、「実際の全角幅」と本来は一致するはずだが、実際には計算誤差のせいで僅かに値が異なる。}% ただし |nozw| 指定時は定義されない。 +\item |\zwspace|\Means + 全角（|\jsZw|）幅の水平空き。 \end{itemize} \subsubsection{standard和文ドライバの場合} -standard和文ドライバでは和文に関連する +standard和文ドライバ（およびそれを継承するドライバ）では和文に関連する文書ソース記述をエンジンに依らずに共通になることを目指している。 -従って、和文関連の組版パラメタの設定*1についても +従って、和文関連の組版パラメタの設定についても「共通の命令」が提供される。 -\footnote{pandoc和文ドライバはstandard和文ドライバの設定を -引き継ぐため、pandocモードでもこれらの命令を使用できる。} \begin{itemize} \item 和文ファミリ変更命令\Means @@ -977,9 +1194,6 @@ \footnote{ちなみに、(u){\pLaTeX}の既定ではこの連動は起こらない。}% に、|\rmfamily| で和文が「明朝」、 |\sffamily| および |\ttfamily| で和文が「ゴシック」に変更される。 -\item |\zw|\Means - 和文の全角幅を表す。 - 例えば |2\zw| が pLaTeX の |2zw| に相当する。 \item |\jQ|、|\jH|、|\trueQ|、|\trueH|\Means それぞれ{\pLaTeX}の単位Q、H、trueQ、trueHに相当する長さ。 \item |\ascQ|\Means @@ -987,6 +1201,10 @@ \footnote{命令名は“anti-scaled Q”の略。}% 例えば、|\fontsize{10\ascQ}{16\trueH}| で和文のサイズが10\,Qになる。 +\item |\ascpt|\Means + 1\,true\,ptを和文スケール値で割った長さ。 + 例えば、|\fontsize{9\ascpt}{13truept}| + で和文のサイズが9ポイントになる。 \item |\setxkanjiskip{|\Meta{長さ}|}|\Means 和欧文間空白の量を指定する。 {\pLaTeX}での |\setlength{\xkanjiskip}{|\Meta{長さ}|}| に相当する。 @@ -1009,8 +1227,29 @@ \item |\autospacing|／|\noautospacing|\Means 和文間空白の挿入を有効／無効にする。 {\pLaTeX}の同名の命令と同等。 +\item |\>|\Means + 和欧文間空白を挿入する。% + \footnote{|\>| という命令名は、plain {\TeX}では数式中の空白 + （{\LaTeX}の |\:| と同等）を表す。 + このため、実際には{\LaTeX}でも |\>| は |\:| と同等の命令として + 定義されている。 + この「plain互換の |\>|」を利用したコードが影響を受けるのを避ける + ため、数式中では |\>| は従来通り |\:| と同等の動作を行う。} + ただし |xkanjiskip-cmd=false| 指定時は定義されない。% + \footnote{ただし、standard和文ドライバで自動的に読み込まれる + \Pkg{zxjatype}や\Pkg{bxcjkjatype}のパッケージは、 + それ自体が同様の機能の |\>| を提供することにも注意を要する。} \item |\jachar{|\Meta{文字1つ}|]|\Means 指定の文字を和文文字として（現在の和文フォントで）出力する。 +\item 和文数式フォント命令\Means + JSクラスと同様に、 + |\mathmc| で「明朝」、|\mathgt| で「ゴシック」の + 和文数式フォントを指定する。 +\item 欧文数式フォント命令での和文の連動\Means + |\mathrm| で和文が「明朝」、 + |\mathsf| および |\mathtt| で和文が「ゴシック」に指定される。 + \Note JSクラスとは異なり、“連動の組合せ”は + テキストと同一であることに注意。 \end{itemize} 例えば、{\pLaTeX}において、次のように「和文間空白」を @@ -1033,5 +1272,198 @@ \end{verbatim}\end{quote} %=========================================================== +\section{数式中の和文出力について} +\label{sec:Ja-math-fonts} + +minimal和文ドライバは数式中の和文出力の機能を何も提供しない。 +従って、そのような機能を提供する他のパッケージを併用するので +ない限り、数式中に和文を書いたときの挙動は未定義である。 + +standard和文ドライバ（およびそれを継承する和文ドライバ）に +おける数式中の和文出力の扱いは、エンジンと |enablejfam| オプション +の値の組合せにより異なり、表\ref{tbl:ja-math}に示すようになる。 +以下でこの表に関する補足説明を行う。 +\begin{itemize} +\item この表にある以外のエンジンと |enablejfam| 値の組合せは + 許容されない。 + この場合、警告が出て、|enablejfam| が可能な値に自動的に変更される。 +\item 「直書き」が「可」の場合、数式フォント命令（|\mathXX{}|）の外に + 書いた和文文字は明朝体で出力される。 + 「不可」の場合、そのような和文文字の扱いは未定義である。 +\item 「|\mathmc|/|gt|」が「サポート有り」の場合、これらの命令は + “本物”の数式フォント命令として働く。 + 「フォールバック」の場合は、これらの命令は内部で一旦テキストモードに + 切り替えて非数式として出力される。 + このフォールバック機能を実用したい場合は、 + \Pkg{amstext}（または\Pkg{amsmath}）パッケージの併用が望ましい。% + \footnote{\Pkg{amstext}を読み込まない場合、 + 添字中で |\mathmc|/|gt| を用いたときに + 文字サイズが非添字のものに戻ってしまうという不具合が出る。} +\end{itemize} + +\DeleteShortVerb{\|} +\MakeShortVerb{\+} +\begin{table}[t] + \caption{standard和文ドライバにおける数式中の和文出力のサポート} + \label{tbl:ja-math} + \small\centering + \begin{tabular}{ll|ccc} + \hline + エンジン & +enablejfam+ & 直書き & +\mathmc+/+gt+ & 和欧文連動 \\ + \hline + +(u)platex+ & +true+（既定） & 可 & サポート有り & 有り \\ + & +false+ & 不可 & フォールバック & --- \\ + +lualatex+ & +true+ & 可 & サポート有り & 有り \\ + +xelatex+ & +true+ & 可 & フォールバック & 無し \\ + & +false+（既定）& 不可 & フォールバック & --- \\ + +pdflatex+ & +false+ & 不可 & フォールバック & --- \\ + \hline + \end{tabular} +\end{table} +\DeleteShortVerb{\+} +\MakeShortVerb{\|} + +%=========================================================== +\section{“二文字フォント命令”に対する警告} +\label{sec:Old-font-commands} + +ここでいう“二文字フォント命令”というのは、|\bf| や |\it| 等の +{\LaTeX}~2.09で標準であったフォント選択命令のことである。 +\footnote{なお、|\em| は「二文字の名前のフォント命令」であるが、 + これは{\LaTeXe}でも標準命令であり、“二文字フォント命令”には + 含まれない。}\ +{\LaTeXe}においては、これらに代わって、|\bfseries| 等の +（NFSSに基づく）新しい命令群が標準となり、 +古い二文字フォント命令はカーネルではもはサポートされなくなった。 +しかし同時に、二文字フォント命令を利用したパッケージを +動作させるための“当面の” +\footnote{ちなみに、 + {\LaTeXe}が最初にリリースされたのは1994年のことである。}% +互換性対策として、 +「標準の文書クラス（article、book等）で二文字フォント命令の +サポートを行う」という方針がとられた。 +これに倣って、他の文書クラスの多くもクラスのレベルで +二文字フォント命令をサポートしていて、 +BXJSクラスもその例に含まれる。 + +ところが最近になって、一部の文書クラス +（\Pkg{KOMA-Script}クラス群や\Pkg{memoir}クラス等） +において、二文字フォント命令を明示的に非推奨の扱いにした上で、 +その使用に制限を設ける +（警告を出す、オプションを指定しないと使えない、等） +という措置が取られるようになっている。 + +これに合わせて、BXJSクラスでは1.2版より +二文字フォント命令を非推奨とし、また、 +既定でその使用に対して警告を出すようにした。 + +%------------------- +\subsection{警告の内容} + +現状では警告はとても控えめに出される。 +すなわち、文書中で |\bf| などの二文字フォント命令が呼び出された場合、 +コンパイルの最後に（一度だけ）以下の警告メッセージが表示される。 + +\begin{quote}\small\begin{verbatim} +Class bxjsarticle Warning: Some old font commands were used in text +(bxjsarticle) (see the log output for detail). +\end{verbatim} +\end{quote} + +少し詳細な注意メッセージが、ログファイルのみに書き出される。 + +なお、この警告は、パッケージの機能の実装として用いられたものも含めて +全ての二文字フォント命令の呼出が対象になる。 +ただし例外として、thebibliography環境の内部で呼び出されたものだけは +対象から除外される。 +{\BibTeX}の文献スタイルファイル（|.bst|）や文献データベース（|.bib|） +のファイルは（パッケージと比較しても）極めて古いものが +割と普通に使い続けられることが多い。 +そういった極めて古いファイルに由来する二文字フォント命令を +警告したとしても、多くの場合、ユーザ側には対処する方法が存在しない。 +これが文献リスト環境中で警告を抑止する理由である。 + +%------------------- +\subsection{警告の制御} + +二文字フォント命令に対する警告の有無はクラスオプションで制御できる。 + +\begin{itemize} +\item |oldfontcommands|\Means + 二文字フォント命令を警告の対象にしない。 +\item |nooldfontcommands|（既定）\Means + 二文字フォント命令を警告の対象にする。 +\end{itemize} + +また、以下の命令により、文書中で一時的に警告の設定を変えられる。 +\footnote{これらの命令の効果はグルーピングの影響を受ける。} + +\begin{itemize} +\item |\allowoldfontcommands|\Means + これ以降に実行される二文字フォント命令を警告の対象にしない。 +\item |\disallowoldfontcommands|\Means + これ以降に実行される二文字フォント命令を警告の対象にする。 +\end{itemize} + +%------------------- +\subsection{将来的な二文字フォント命令の扱い} + +\Note 以下の記述は現在存在する和文ドライバを使用する場合に +ついてのものである。 + +\begin{itemize} +\item 二文字フォント命令に対する警告の様式は、 + 今後変更される可能性がある。 +\item しかし、将来に二文字フォント命令のサポートが廃止されることはない。 +\item |oldfontcommands| オプションよおび |\allowoldfontcommands| 命令 + は継続して提供され、 + これらの機能を用いた場合は、二文字フォント命令に関する警告が + 端末に表示されることは一切無い。 +\end{itemize} + +%=========================================================== \end{document} + +%=========================================================== +\appendix +\section{パッケージレベル公開命令の一覧} + +\begin{itemize} +% \jsAtEndOfClass はBXJSの補助パッケージ専用 +\item |\jsBaseFontSize| +\item |\jsDocClass| + \begin{itemize} + \item |\jsArticle| + \item |\jsBook| + \item |\jsReport| + \item |\jsSlide| + \end{itemize} +\item |\ifjsDraft| +\item |\jsEngine| +\item |\jsFontSizeChanged| +\item |\jsGeometryOptions| +\item |\jsInhibitGlue| +\item |\jsInhibitGlueAtParTop| +\item |\jsInJaParen| +\item |\ifjsInPdfMode| +\item |\jsJaChar| +\item |\jsJaFont| +\item |\jsJaParam| +\item |\jsKanjiSkip| +\item |\jsLetHeadChar| +\item |\jsParagraphMark| +\item |\jsResetDimen| +\item |\jsScale| +\item |\ifjsSeireki| +\item |\jsSimpleJaSetup| +\item |\jsSubtitle| +\item |\jsTextWidthLimit| +\item |\jsUnusualPtSize| +% \jsUseMinimalPageLayout はテスト用 +\item |\ifjsWitheTeX| +\item |\ifjsWithupTeX| +\item |\jsXKanjiSkip| +% \jsZw はユーザレベル命令 +\end{itemize} + %% EOF Binary files old/doc/latex/bxjscls/bxjscls.pdf and new/doc/latex/bxjscls/bxjscls.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxjscls.doc.tlpobj new/tlpkg/tlpobj/bxjscls.doc.tlpobj --- old/tlpkg/tlpobj/bxjscls.doc.tlpobj 2016-05-04 03:14:45.000000000 +0200 +++ new/tlpkg/tlpobj/bxjscls.doc.tlpobj 2017-04-14 17:34:07.000000000 +0200 @@ -1,9 +1,9 @@ name bxjscls.doc category Package -revision 40865 +revision 43741 shortdesc doc files of bxjscls relocated 1 -docfiles size=419 +docfiles size=400 RELOC/doc/latex/bxjscls/LICENSE RELOC/doc/latex/bxjscls/README-ja.md RELOC/doc/latex/bxjscls/README.md ++++++ bxjscls.tar.xz ++++++ ++++ 6171 lines of diff (skipped) ++++++ bxnewfont.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxnewfont/LICENSE new/doc/latex/bxnewfont/LICENSE --- old/doc/latex/bxnewfont/LICENSE 2016-04-02 23:57:03.000000000 +0200 +++ new/doc/latex/bxnewfont/LICENSE 2017-05-03 23:29:00.000000000 +0200 @@ -1,12 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#(B -$BCx:n8"$O:n<T$G$"$k!VH,EP(B $B?rG7!JJLL>(B ZR$B!K!W$KB0$7$^$9!#(B -$B$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - -This software is distributed under the MIT License. - The MIT License -Copyright (c) 2016 Takayuki YATO (aka. "ZR") +Copyright (c) 2017 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxnewfont/README.md new/doc/latex/bxnewfont/README.md --- old/doc/latex/bxnewfont/README.md 2016-04-02 23:57:03.000000000 +0200 +++ new/doc/latex/bxnewfont/README.md 2017-05-03 23:29:00.000000000 +0200 @@ -70,6 +70,13 @@ Revision History ---------------- + * Version 0.2b ‹2017/05/01› + - Change the rule for automatic quoting. Namely, names which are + judged as illegal by mktextfm should be quoted. + * Version 0.2a ‹2016/08/08› + - Now “TFM” names can contain spaces with suitable quoting. + This enables one to specify OpenType fonts on Unicode engines. + - An experimental command `\newfontjascale` is added. * Version 0.2 ‹2016/03/27› - The first public version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxnewfont.doc.tlpobj new/tlpkg/tlpobj/bxnewfont.doc.tlpobj --- old/tlpkg/tlpobj/bxnewfont.doc.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxnewfont.doc.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,6 +1,6 @@ name bxnewfont.doc category Package -revision 40214 +revision 44173 shortdesc doc files of bxnewfont relocated 1 docfiles size=2 ++++++ bxnewfont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxnewfont/bxnewfont.sty new/tex/latex/bxnewfont/bxnewfont.sty --- old/tex/latex/bxnewfont/bxnewfont.sty 2016-04-02 23:57:03.000000000 +0200 +++ new/tex/latex/bxnewfont/bxnewfont.sty 2017-05-03 23:29:00.000000000 +0200 @@ -1,8 +1,16 @@ -% bxnewfont.sty +%% +%% This is file 'bxnewfont.sty'. +%% +%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% GitHub: https://github.com/zr-tex8r +%% Twitter: @zr_tex8r +%% +%% This package is distributed under the MIT License. +%% %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxnewfont}[2016/03/27 v0.2] +\ProvidesPackage{bxnewfont}[2017/05/01 v0.2b] %% preparation \def\bxnf@pkgname{bxnewfont} @@ -34,6 +42,9 @@ %% variables \newbool{bxnf@ok} +%% constants +\def\bxnf@@star{*} + %% \bxnf@cond\if...\fi{<true>}{<false>} \@gobbletwo\if\if \def\bxnf@cond#1\fi{% #1\expandafter\@firstoftwo @@ -77,6 +88,7 @@ }%] } \def\bxnf@newfontx@b#1[#2]#3{% + \bxnf@annihilate@setjascale \edef\bxnf@enc{#2}% \edef\bxnf@font{#3}% \bxnf@split@name @@ -85,36 +97,17 @@ \ifbxnf@ok \bxnf@make@cmd#1\fi } -%% \bxnf@split@name -% Parses \bxnf@font and sets \bxnf@tfm and \bxnf@atcl. -\def\bxnf@next#1{% - \def\bxnf@split@name{% - \expandafter\bxnf@split@name@a\bxnf@font\bxnf@mk#1\bxnf@end - }% - \def\bxnf@split@name@a##1#1##2\bxnf@end{% - \ifstrempty{##2}{% - \let\bxnf@tfm\bxnf@font \let\bxnf@atcl\relax - }{%else - \def\bxnf@tfm{##1}% - \bxnf@split@name@b##2\bxnf@end - }% - }% - \def\bxnf@split@name@b##1\bxnf@mk##2\bxnf@end{% - \def\bxnf@atcl{##1}% - }% -} -\bxnf@next{ } - %% \bxnf@check@param % Sets bxnf@ok. \def\bxnf@check@param{% \bxnf@oktrue \bxnf@get@tfm@info - \unless\ifdim\bxnf@size>\z@ + \unless\ifnum\bxnf@type=\z@ \unless\ifdim\bxnf@size>\z@ \chardef\bxnf@type\z@ - \fi + \fi\fi \ifnum\bxnf@type=\z@ \bxnf@error{Failed in getting TFM info}\@eha + \let\bxnf@enc\cf@encoding \bxnf@okfalse \else \ifx\bxnf@enc\@empty @@ -138,7 +131,7 @@ \unless\ifbxnf@fixed \unless\ifx\bxnf@atcl\relax \bxnf@error{You cannot use size spec here}{% The invalid size spec (\bxnf@atcl) is ignored.% - \MeesageBreak\@ehc}% + \MessageBreak\@ehc}% \fi\fi } @@ -176,45 +169,209 @@ __\bxnf@select@family{#1}}% \endgroup +%--------------------------------------- parse + +%% variables +\let\bxnf@pre\relax +\let\bxnf@post\relax +\let\bxnf@quoted@part\relax + +%% \bxnf@split@at{<sep>}{<text>} +% Splits the text by the given separator. +% In success, it will set \bxnf@pre and \bxnf@post. +\def\bxnf@split@at#1#2{% + \def\bxnf@next##1#1##2\bxnf@end{% + \bxnf@split@at@a{##1}{##2}}% + \bxnf@next#2\bxnf@mk#1\bxnf@end +} +\def\bxnf@split@at@a#1#2{% + \ifstrempty{#2}{% + \let\bxnf@pre\relax \let\bxnf@post\relax + }{%else + \def\bxnf@pre{#1}% + \bxnf@split@at@b#2\bxnf@end + }% +}% +\def\bxnf@split@at@b#1\bxnf@mk#2\bxnf@end{% + \def\bxnf@post{#1}% +}% + +%% \bxnf@guard@quote\CS +% Extract from the string a part enclosed by a pair of quotes, +% and replaces the part with the cs '\bxnf@quoted@part'. +% Then the cs is assigned to the content of the part. +\def\bxnf@guard@quote#1{% + \let\bxnf@quoted@part\relax + \edef\bxnf@tmpb{{"}{#1}}% + \expandafter\bxnf@split@at\bxnf@tmpb + \unless\ifx\bxnf@pre\relax + \let\bxnf@tmpa\bxnf@pre \edef\bxnf@tmpb{{"}{\bxnf@post}}% + \expandafter\bxnf@split@at\bxnf@tmpb + \unless\ifx\bxnf@pre\relax + \let\bxnf@quoted@part\bxnf@pre + \edef#1{\bxnf@tmpa"\noexpand\bxnf@quoted@part"\bxnf@post}% + \fi + \fi +} + +%% \bxnf@enclose@quote\CS +% If the string does not contain a quote but does contain +% a space, then the string will get enclosed by quotes. +\def\bxnf@enclose@quote#1{% + \edef\bxnf@tmpa{#1}% + \edef\bxnf@tmpb{{"}{\bxnf@tmpa}}% + \expandafter\bxnf@split@at\bxnf@tmpb + \ifx\bxnf@pre\relax + \edef\bxnf@tmpb{{\bxnf@tmpa}}% + \expandafter\bxnf@find@unsafe@char\bxnf@tmpb + \unless\ifx\bxnf@pre\relax + \edef\bxnf@tmpa{"\bxnf@tmpa"}% + \fi + \fi + \let#1\bxnf@tmpa +} + +%% \bxnf@find@unsafe@char +\def\bxnf@find@unsafe@char#1{% + \bxnf@find@unsafe@char@a#1\bxnf@end +} +\def\bxnf@find@unsafe@char@a{% + \futurelet\bxnf@tok\bxnf@find@unsafe@char@b +} +\def\bxnf@find@unsafe@char@b{% + \ifx\bxnf@tok\bxnf@end + \let\bxnf@tok\relax + \let\bxnf@tmpb\bxnf@find@unsafe@char@c + \else\ifcat A\noexpand\bxnf@tok + \let\bxnf@tmpb\bxnf@find@unsafe@char@d + \else\ifcat 0\noexpand\bxnf@tok + \let\bxnf@tmpb\bxnf@find@unsafe@char@e + \else\ifcat _\noexpand\bxnf@tok + \let\bxnf@tmpb\bxnf@find@unsafe@char@e + \else + \let\bxnf@tmpb\bxnf@find@unsafe@char@c + \fi\fi\fi\fi + \bxnf@tmpb +} +\def\bxnf@find@unsafe@char@c#1\bxnf@end{% + \let\bxnf@pre= \bxnf@tok +} +\def\bxnf@find@unsafe@char@d#1{% + \bxnf@find@unsafe@char@a +} +\def\bxnf@find@unsafe@char@e#1{% + \ifcsundef{bxnf@sc/#1}{% + \bxnf@find@unsafe@char@c + }{%else + \bxnf@find@unsafe@char@a + }% +} +\@tfor\bxnf@tmpa:=0123456789.-_+\do{% + \cslet{bxnf@sc/\bxnf@tmpa}{t}% +} + +%% \bxnf@split@name +% Parses \bxnf@font and sets \bxnf@tfm and \bxnf@atcl. +\def\bxnf@split@name{% + \let\bxnf@tfm\bxnf@font \let\bxnf@atcl\relax + \bxnf@guard@quote\bxnf@tfm + \expandafter\bxnf@split@name@a\bxnf@tfm\bxnf@end + \bxnf@enclose@quote\bxnf@tfm +} +\def\bxnf@split@name@a#1\bxnf@end{% + \let\bxnf@pre\relax + \def\do##1{% + \bxnf@split@name@b{##1}{#1}% + }% + \bxnf@split@sep@list +} +\def\bxnf@split@name@b#1#2{% + \ifx\bxnf@pre\relax + \bxnf@split@at{ #1}{#2}% + \unless\ifx\bxnf@pre\relax + \let\bxnf@tfm\bxnf@pre + \edef\bxnf@atcl{#1\bxnf@post}% + \fi + \fi +} +\let\do\relax +\edef\bxnf@split@sep@list{% + \do{at}\do{scaled}% + \do{\detokenize{at}}% + \do{\detokenize{scaled}}% +} + %--------------------------------------- Family name %% variables -%\[bxnf@varid/<tfm>] % maximum used id number -%\[bxnf@prm/<family>] % font parameter ({<enc>}{<size>}) -%\[bxnf@pc/<spec>] % cache +%\[bxnf@g@varid/<tfm>] % maximum used id number +%\[bxnf@g@prm/<family>] % font parameter ({<enc>}{<size>}) +%\[bxnf@g@pc/<spec>] % cache +\let\bxnf@stfm\relax %% \bxnf@get@family@name % Generates a family name and returns to \bxnf@fam. % The name is of the form "<tfm-name>(<id>)". \def\bxnf@get@family@name{% - \def\bxnf@tmpa{bxnf@pc/\bxnf@enc:\bxnf@tfm:% + \def\bxnf@tmpa{bxnf@g@pc/\bxnf@enc:\bxnf@tfm:% \ifbxnf@fixed \the\dimexpr\bxnf@size\relax \fi}% \letcs\bxnf@fam{\bxnf@tmpa}% \ifdef\bxnf@fam{% \bxDebug{\bxnf@tmpa==\bxnf@fam}% \bxnf@oktrue }{%else - \csnumdef{bxnf@varid/\bxnf@tfm}{\csuse{bxnf@varid/\bxnf@tfm}+1}% - \edef\bxnf@fam{\bxnf@tfm(\csuse{bxnf@varid/\bxnf@tfm})}% - \cslet{\bxnf@tmpa}\bxnf@fam + \bxnf@sanitize@tfmname\bxnf@stfm + \csnumgdef{bxnf@g@varid/\bxnf@stfm}{\csuse{bxnf@g@varid/\bxnf@stfm}+1}% + \edef\bxnf@fam{\bxnf@stfm*\csuse{bxnf@g@varid/\bxnf@stfm}*}% + \global\cslet{\bxnf@tmpa}\bxnf@fam \bxDebug{\bxnf@tmpa:=\bxnf@fam}% \bxnf@okfalse }% } +%% \bxnf@sanitize@tfmname\CS +\def\bxnf@sanitize@tfmname#1{% + \begingroup + \let\bxnf@pre\relax + \let\do\bxnf@sanitize@tfmname@a + \bxnf@sanitize@list + \ifx\bxnf@pre\relax + \global\let\bxnf@g@tmpa\bxnf@tfm + \else + \global\let\bxnf@g@tmpa\bxnf@@sanitized + \fi + \endgroup + \let#1\bxnf@g@tmpa +} +\def\bxnf@sanitize@tfmname@a#1{% + \ifx\bxnf@pre\relax + \edef\bxnf@tmpa{{#1}{\bxnf@tfm}}% + \expandafter\bxnf@split@at\bxnf@tmpa + \fi +} +\def\bxnf@@sanitized{(OpenType)} +\def\bxnf@sanitize@list{% + \do{ }\do{:}\do{,}\do{;}\do{=}\do{/}% +} + %% \def\bxnf@set@family@param -% Sets \[bxnf@prm/*]. +% Sets \[bxnf@g@prm/*]. \def\bxnf@set@family@param{% - \csedef{bxnf@prm/\bxnf@fam}{{\bxnf@enc}% + \csxdef{bxnf@g@prm/\bxnf@fam}{{\bxnf@enc}% {\ifbxnf@fixed \expandafter\rem@pt\bxnf@size \fi}}% - \bxDebug{bxnf@prm/\bxnf@fam:=\csuse{bxnf@prm/\bxnf@fam}}% + \bxDebug{bxnf@g@prm/\bxnf@fam:=\csuse{bxnf@g@prm/\bxnf@fam}}% } %% \bxnf@declare@family \def\bxnf@declare@family{% \DeclareFontFamily{\bxnf@enc}{\bxnf@fam}{}% + \let\bxnf@tmpb\@empty + \ifcase\bxnf@type\or + \or \let\bxnf@tmpb\bxnf@jfscale@spec + \or \let\bxnf@tmpb\bxnf@jfscale@spec + \fi \DeclareFontShape{\bxnf@enc}{\bxnf@fam}{m}{n}% - {<->\bxnf@tfm}{}% + {<->\bxnf@tmpb\bxnf@tfm}{}% % In pTeX, a dummy entry must be declared for the % encoding counterpart. \let\bxnf@tmpb\relax @@ -232,7 +389,7 @@ %% \bxnf@select@family{<family>} \def\bxnf@select@family#1{% \edef\bxnf@next{\noexpand\bxnf@select@family@a - {#1}\csuse{bxnf@prm/#1}}% + {#1}\csuse{bxnf@g@prm/#1}}% \bxnf@next } \def\bxnf@select@family@a#1#2#3{% @@ -251,6 +408,7 @@ %% \bxnf@get@tfm@info \def\bxnf@get@tfm@info{% + \bxDebug{name=\bxnf@tfm}% \begingroup \chardef\bxnf@type=0 \let\bxnf@size\@empty \font\bxnf@tmpa=\bxnf@tfm\space scaled 2000\relax @@ -306,7 +464,7 @@ %% \bxnf@curr@font\CS\Xfont \def\bxnf@curr@font#1#2{% - \xdef#1{\expandafter\meaning\the#2}% + \xdef#1{\fontname#2}% } \ifbxnf@ptex %----<*pTeX> @@ -349,6 +507,117 @@ \fi %----</pTeX> +%--------------------------------------- Ja-font scaling + +%% variables +\def\bxnf@jfscale{1} + +%% error message +\def\bxnf@err@ivjsc{% + \PackageError\bxnf@pkgname + {Invalid argument given to \string\newfontjascale + \MessageBreak(\bxnf@tmpa)}% + {\@eha}% +} +\def\bxnf@err@najsc{% + \PackageError\bxnf@pkgname + {The command is already invalidated}% + {\@eha}% +} + +%% \bxnf@jfscale@spec +\def\bxnf@jfscale@spec{% + \unless\ifdim\p@=\bxnf@jfscale\p@ + s*[\bxnf@jfscale]% + \fi +} + +%%<*>\newfontjascale +\newrobustcmd*\newfontjascale[1]{% + \edef\bxnf@tmpa{#1}% + \ifx\bxnf@tmpa\bxnf@@star + \edef\bxnf@tmpa{\csuse{mcdefault}}% + \fi + \expandafter\bxnf@setjascale@a\bxnf@tmpa\bxnf@end +} +\def\bxnf@setjascale@a#1\bxnf@end{% + \ifblank{#1}{% + \bxnf@setjascale@real{1}% + }{%else + \bxnf@setjascale@b#1\bxnf@end% + }% +} +\def\bxnf@setjascale@b#1#2\bxnf@end{% + \ifcat\noexpand#10% + \afterassignment\bxnf@setjascale@c\dimen@ii=#1#2\p@\bxnf@stop + \else + \bxnf@setjascale@fam\bxnf@tmpa + \fi +} +\def\bxnf@setjascale@c#1\bxnf@stop{% + \ifstrempty{#1}{% + \edef\bxnf@tmpa{\strip@pt\dimen@ii}% + \bxnf@setjascale@real\bxnf@tmpa + }{%else + \bxnf@err@ivjsc + }% +} + +%% \bxnf@setjascale@real +\let\bxnf@setjascale@real\@gobble +%% \bxnf@setjascale@fam +\let\bxnf@setjascale@fam\@gobble + +%% \bxnf@annihilate@setjascale +\def\bxnf@annihilate@setjascale{% + \global\let\bxnf@annihilate@setjascale\relax + \gdef\newfontjascale##1{% + \bxnf@err@najsc + }% + \global\let\bxnf@setjascale@a\@undefined + \global\let\bxnf@setjascale@b\@undefined + \global\let\bxnf@setjascale@c\@undefined + \global\let\bxnf@setjascale@real\@undefined + \global\let\bxnf@setjascale@fam\@undefined +} + +\ifbxnf@ptex %----<*pTeX> + +%% \bxnf@setjascale@real +\def\bxnf@setjascale@real#1{% + \edef\bxnf@jfscale{#1}% + \bxDebug{jfscale:=\bxnf@jfscale}% +} +%% \bxnf@setjascale@fam +\def\bxnf@setjascale@fam#1{% + \letcs\bxnf@tmpb{\cy@encoding/#1/m/n}% + \ifdef\bxnf@tmpb{% + \expandafter\bxnf@setjascale@fam@a\meaning\bxnf@tmpb\bxnf@end + }{%else + \bxnf@err@ivjsc + }% +} +\begingroup + \catcode`\S=12 + \lowercase{% + \gdef\bxnf@setjascale@fam@a#1\bxnf@end{% + \def\bxnf@tmpb{1}% + \bxnf@split@at{<->S*[}{#1}% + \ifx\bxnf@pre\relax \bxnf@split@at{<->*[}{#1}\fi + \unless\ifx\bxnf@pre\relax + \edef\bxnf@tmpb{{]}{\bxnf@post}}% + \expandafter\bxnf@split@at\bxnf@tmpb + \unless\ifx\bxnf@pre\relax + \let\bxnf@tmpb\bxnf@pre + \fi + \fi + \bxnf@setjascale@real\bxnf@tmpb + }% + }% +\endgroup + +\fi %----</pTeX> + %--------------------------------------- Switching of \newfont %% \bxnf@ltx@newfont @@ -356,11 +625,11 @@ \let\bxnf@ltx@newfont\newfont %%<*>\enhancenewfont -\newcommand*\enhancenewfont{% +\newrobustcmd*\enhancenewfont{% \let\newfont\newfontx} %%<*>\noenhancenewfont -\newcommand*\noenhancenewfont{% +\newrobustcmd*\noenhancenewfont{% \let\newfont\bxnf@ltx@newfont} %% initial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxnewfont.tlpobj new/tlpkg/tlpobj/bxnewfont.tlpobj --- old/tlpkg/tlpobj/bxnewfont.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxnewfont.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,6 +1,6 @@ name bxnewfont category Package -revision 40214 +revision 44173 shortdesc Enhanced \newfont command relocated 1 longdesc This package provides a new command \newfontx. It is similar to @@ -8,12 +8,12 @@ longdesc more compatible with NFSS. In particular, one can safely change longdesc font size after invoking a font command defined by \newfontx. longdesc The new command will be useful to users who know much of the -longdesc old \newfont command but are unfamiliar with the detail of +longdesc old \newfont command, but are unfamiliar with the details of longdesc NFSS. -runfiles size=3 +runfiles size=4 RELOC/tex/latex/bxnewfont/bxnewfont.sty catalogue-ctan /macros/latex/contrib/bxnewfont -catalogue-date 2016-04-09 19:12:15 +0200 -catalogue-license other-free +catalogue-date 2017-05-02 23:06:45 +0200 +catalogue-license mit catalogue-topics font-sel -catalogue-version 0.2 +catalogue-version 0.2b ++++++ bxpapersize.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpapersize/LICENSE new/doc/latex/bxpapersize/LICENSE --- old/doc/latex/bxpapersize/LICENSE 2016-03-26 23:58:03.000000000 +0100 +++ new/doc/latex/bxpapersize/LICENSE 2017-02-09 00:01:03.000000000 +0100 @@ -1,12 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#(B -$BCx:n8"$O:n<T$G$"$k!VH,EP(B $B?rG7!JJLL>(B ZR$B!K!W$KB0$7$^$9!#(B -$B$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - -This software is distributed under the MIT License. - The MIT License -Copyright (c) 2016 Takayuki YATO (aka. "ZR") +Copyright (c) 2017 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpapersize/README.md new/doc/latex/bxpapersize/README.md --- old/doc/latex/bxpapersize/README.md 2016-03-26 23:58:03.000000000 +0100 +++ new/doc/latex/bxpapersize/README.md 2017-05-03 23:29:13.000000000 +0200 @@ -5,8 +5,14 @@ As is well known, in LaTeX processing layout paper size specified by document class options is not automatically applied to output paper -size. This package enables LaTeX authors to synchronize both kinds of -paper sizes. +size. By employing this package, authors can make output paper size +be identical to layout paper size. They can also set output paper size +to arbitrary values. + +It should be noted that there are many packages that try to synchronize +paper sizes, possibly in a slightly different manner. This package +allows authors to decide whether the setting made by this package +should have higher or lower priority over the settings made by others. ### System requirement @@ -42,7 +48,7 @@ useful to resolve conflict caused by some packages depending on the bxpapersize package. Note that once `disabled` is used there is no way to enable the functionality. - + * `nodvidriver`: A synonym for `disabled`. #### Priority @@ -51,20 +57,34 @@ ‘papersize’ specials issued by others. The set of valid values is: - `low`: Priotizes specials by others. - - `middle` (default): Does not care about priority. + - `middle`/`default` (default): Does not care about priority. - `high`: Priotizes specials by this package. + * `olddvips`: Must be specified when you use dvips older than that + included in TeX Live 2017, so as to make the `priority` option + work correctly. #### Other options -Any key-value pairs that are valid in `\bxpapersizesetup` can be used +Any key-value pairs that are valid in `\papersizesetup` can be used as package options. % to begin with deactivated state \usepackage[active=false]{bxpapersize} +Note that the default values of the `\papersizesetup` command are also +applied when the package is loaded. For example, `size=real` will be +in effect when this package is loaded without the `size` option key. + ### Usage -You can change the settings of this package using `\bxpapersizesetup` +Once the package is loaded, the output paper size will be adjusted, +respecting the settings given by the package options. By default, the +output papersize will be made identical to the layout paper size. + + % For many cases, it's enough. + \usepackage{bxpapersize} + +You can change the settings of this package using `\papersizesetup` command, invoked as follows: \bxpapersizesetup[<key>=<value>,...] @@ -72,18 +92,60 @@ The available keys are listed below: * `active=true|false`: Temporarily activates/deactivates the function - of this package. Note that, however, what happens about paper size - synchronization when activation settings are changed in the midst - of documents differs among TeX engines and/or DVI drivers. Thus - this should be employed only by advanced users. - + of this package. + * `size=<value>`: Decides what the output paper size should be. + Available values are: + - `real`: The output should be equal to the layout paper size + given by `\paperwidth/height`, except that the stock paper size + given by `\stockwidth/height` will be employed instead when + it is available. + - `real*`: The output should be equal to the layout paper size, + even if the stock paper size is available. + - `{<width>,<height>}`: The output should be equal to the + specified values. + - `<width>*<height>`: The alternative form of `{<width>,<height>}`. + It is provided because option strings including braces are not + permitted in the package option list. + - `<papersize-name>`: The output should be equal to the given + size. The set pf available paper-size names is the same as the + [geometry package] and is listed below: + a0paper--a6paper, b0paper--b6paper, c0paper--c6paper, b0j--b6j, + ansiapaper--ansiepaper, letterpaper, legalpaper, executivepaper, + screen. + - `landscape`, `truedimen`: These are used in combination with + `<papersize-name>` options, and have the same meaning as in the + geometry package. + - `box`: The output should be the actual size of the TeX box + to be shipped out. It is provided for advanced users. + +[geometry package]: https://www.ctan.org/pkg/geometry + +Note that, however, what happens about output paper size when some +settings are changed in the midst of pages differs among TeX engines +and/or DVI drivers. Thus such usage should be employed only by advanced +users. + +The comamnd `\bxpapersizesetup` is a synonym for `\papersizesetup`, +so as to cope with command name conflict. Namely, `\papersizesetup` +will be not (re)defined if the command of that name is already defined, +but `\bxpapersizesetup` will be always provided. Revision History ---------------- + * Version 0.3a ‹2017/05/02› + - Support format `size=<width>*<height>` + * Version 0.3 ‹2017/02/08› + - As to `size=real`, the stock size becomes taken into account, + and the new value `real*` is provided. + - Make `nodvidriver` synonym for `disabled`. + - Make `\papersizesetup` synonym for `\bxpapersizesetup`. + - Add `olddvips`. + - Support `size=<papersize-name>`. together with `landscape` and + `truedimen`. * Version 0.2 ‹2016/03/26› - The first public version. -------------------- Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpapersize.doc.tlpobj new/tlpkg/tlpobj/bxpapersize.doc.tlpobj --- old/tlpkg/tlpobj/bxpapersize.doc.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxpapersize.doc.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,8 +1,8 @@ name bxpapersize.doc category Package -revision 40149 +revision 44174 shortdesc doc files of bxpapersize relocated 1 -docfiles size=2 +docfiles size=3 RELOC/doc/latex/bxpapersize/LICENSE RELOC/doc/latex/bxpapersize/README.md ++++++ bxpapersize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxpapersize/bxpapersize.sty new/tex/latex/bxpapersize/bxpapersize.sty --- old/tex/latex/bxpapersize/bxpapersize.sty 2016-03-26 23:58:03.000000000 +0100 +++ new/tex/latex/bxpapersize/bxpapersize.sty 2017-05-03 23:29:13.000000000 +0200 @@ -1,8 +1,16 @@ -% bxpapersize.sty +%% +%% This is file 'bxpapersize.sty'. +%% +%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% GitHub: https://github.com/zr-tex8r +%% Twitter: @zr_tex8r +%% +%% This package is distributed under the MIT License. +%% %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpapersize}[2016/03/26 v0.2] +\ProvidesPackage{bxpapersize}[2017/05/02 v0.3a] %% preparation \def\bxpr@pkgname{bxpapersize} @@ -10,32 +18,40 @@ %--------------------------------------- options -%% 'disabled' +% Note: Only non-key-value global options should be picked. + +%% 'disabled' / 'nodvidriver' \chardef\bxpr@disabled=0 \DeclareOption{disabled}{% \chardef\bxpr@disabled=1 } +\DeclareOption{nodvidriver}{% + \chardef\bxpr@disabled=1 } +%% 'olddvips' +\chardef\bxpr@olddvips=0 +\DeclareOption{olddvips}{% + \chardef\bxpr@olddvips=1 } %% keyval \@onlypreamble\bxpr@kvopt -\let\bxpr@kvopt\@empty +\let\bxpr@kvopt\@empty % key-value option list \DeclareOption*{% \edef\bxpr@kvopt{\bxpr@kvopt,\CurrentOption}} \ProcessOptions* %% If 'disabled' is given, quit now. \ifnum\bxpr@disabled>\z@ + \providecommand*\papersizesetup{\bxpapersizesetup}% \newcommand*\bxpapersizesetup[1]{}% \expandafter\endinput\fi\relax %--------------------------------------- general %% load packages -\RequirePackage{xkeyval} +\RequirePackage{xkeyval}[2008/08/10]% v2.6 \RequirePackage{atbegshi} \RequirePackage{ifpdf,ifxetex,ifluatex,ifvtex} %% variables \newdimen\bxpr@dima -\newif\ifbxpr@active \let\bxpr@width\relax \let\bxpr@height\relax @@ -43,6 +59,9 @@ \chardef\bxpr@mode@@dvimode=0 \chardef\bxpr@mode@@pdfmode=1 +%% unique tokens +\def\bxpr@end{\bxpr@end@} + %% \bxpr@pagewidth / \bxpr@pageheight %% \bxpr@horigin / \bxpr@vorigin \ifluatex % LuaTeX @@ -83,19 +102,30 @@ \let\bxpr@mode\bxpr@mode@@pdfmode \fi +%% \bxpr@csletcs{<CSa>}{<CSb>} +\def\bxpr@csletcs#1#2{% + \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname} + %--------------------------------------- parameters %% constants \chardef\bxpr@priority@@low=0 \chardef\bxpr@priority@@middle=1 +\chardef\bxpr@priority@@default=1 \chardef\bxpr@priority@@high=2 +\ifnum\bxpr@olddvips>\z@ + \chardef\bxpr@priority@@low=2 + \chardef\bxpr@priority@@high=0 +\fi \chardef\bxpr@size@@real=0 %'real', use \paperwidth/height -\chardef\bxpr@size@@box=1 %'box', use shipout box size -\chardef\bxpr@size@@boxS=2 %'box*' -\chardef\bxpr@size@@custom=3 % size explicitly given +\chardef\bxpr@size@@realS=1 %'real*' +\chardef\bxpr@size@@box=2 %'box', use shipout box size +\chardef\bxpr@size@@boxS=3 %'box*' +\chardef\bxpr@size@@custom=4 % size explicitly given %% variables -\let\bxpr@priority\bxpr@priority@@middle +\newif\ifbxpr@needs@reset@size +\let\bxpr@priority\bxpr@priority@@default \let\bxpr@size\bxpr@size@@real \def\bxpr@cs@width{\z@}% custom page width \def\bxpr@cs@height{\z@}% custom page height @@ -109,28 +139,98 @@ \PackageError\bxpr@pkgname {Invalid value for '#1': #2}% \@ehc} +\def\bxpr@err@ivkey{% + \begingroup \let\MessageBreak\relax % freeze + \let\bxpr@tmpb\@empty + \@for\bxpr@tmpa:=\XKV@rm\do{% + \edef\bxpr@tmpb{\bxpr@tmpb\MessageBreak\@spaces\bxpr@tmpa}}% + \PackageError\bxpr@pkgname + {Unknown parameter(s)\bxpr@tmpb\MessageBreak + are found in the given list} + \endgroup} %% 'active' -\define@boolkey+{bxpr}{active}% - {\@nameuse{bxpr@active#1}}% - {\bxpr@ivval{active}{#1}} -\bxpr@activetrue +\define@boolkey+[bxpr]{prm}{active}[true]{}% + {\bxpr@err@ivval{active}{#1}} +\bxpr@prm@activetrue %% 'priority' -\define@choicekey*+{bxpr}{priority}[\bxpr@tmpa\bxpr@tmpb]% - {low,middle,high}% - {\bxpr@set@priority}% - {\bxpr@ivval{priority}{#1}} -\def\bxpr@set@priority{% - \chardef\bxpr@priority\bxpr@tmpb\relax} +\define@choicekey*+[bxpr]{prm}{priority}% + {low,middle,default,high}% + {\bxpr@set@priority{#1}}% + {\bxpr@err@ivval{priority}{#1}} +\def\bxpr@set@priority#1{% + \bxpr@csletcs{bxpr@priority}{bxpr@priority@@#1}} \AtBeginDocument{% - \def\bxpr@set@priority{\bxpr@err@nlprm{priority}}} + \def\bxpr@set@priority#1{% invalidate + \bxpr@err@nlprm{priority}}} + +%% 'truedimen' +\define@boolkey+[bxpr]{prm}{truedimen}[true]% + {\bxpr@needs@reset@sizetrue}% + {\bxpr@err@ivval{truedimen}{#1}} + +%% 'landscape' +\define@boolkey+[bxpr]{prm}{landscape}[true]% + {\bxpr@needs@reset@sizetrue}% + {\bxpr@err@ivval{landscape}{#1}} %% 'size' -\define@choicekey*+{bxpr}{size}[\bxpr@tmpa\bxpr@tmpb]% - {real,box,box*}% - {\chardef\bxpr@size\bxpr@tmpb\relax}% +\define@choicekey*+[bxpr]{prm}{size}[\bxpr@tmpa\bxpr@tmpb]% + {real,real*,box,box*, + % preset paper sizes + a0paper,a1paper,a2paper,a3paper,a4paper,a5paper,a6paper,% + b0paper,b1paper,b2paper,b3paper,b4paper,b5paper,b6paper,% + c0paper,c1paper,c2paper,c3paper,c4paper,c5paper,c6paper,% + b0j,b1j,b2j,b3j,b4j,b5j,b6j,% + ansiapaper,ansibpaper,ansicpaper,ansidpaper,ansiepaper,% + letterpaper,legalpaper,executivepaper,screen}% + {\def\bxpr@val@size{#1}\bxpr@needs@reset@sizefalse + \ifcase\bxpr@tmpb\relax + \let\bxpr@size\bxpr@size@@real + \or \let\bxpr@size\bxpr@size@@realS + \or \let\bxpr@size\bxpr@size@@box + \or \let\bxpr@size\bxpr@size@@boxS + \or \bxpr@set@size@a(841,1189){mm}% a0paper + \or \bxpr@set@size@a(594,841){mm}% a1paper + \or \bxpr@set@size@a(420,594){mm}% a2paper + \or \bxpr@set@size@a(297,420){mm}% a3paper + \or \bxpr@set@size@a(210,297){mm}% a4paper + \or \bxpr@set@size@a(148,210){mm}% a5paper + \or \bxpr@set@size@a(105,148){mm}% a6paper + \or \bxpr@set@size@a(1000,1414){mm}% b0paper + \or \bxpr@set@size@a(707,1000){mm}% b1paper + \or \bxpr@set@size@a(500,707){mm}% b2paper + \or \bxpr@set@size@a(353,500){mm}% b3paper + \or \bxpr@set@size@a(250,353){mm}% b4paper + \or \bxpr@set@size@a(176,250){mm}% b5paper + \or \bxpr@set@size@a(125,176){mm}% b6paper + \or \bxpr@set@size@a(917,1297){mm}% c0paper + \or \bxpr@set@size@a(648,917){mm}% c1paper + \or \bxpr@set@size@a(458,648){mm}% c2paper + \or \bxpr@set@size@a(324,458){mm}% c3paper + \or \bxpr@set@size@a(229,324){mm}% c4paper + \or \bxpr@set@size@a(162,229){mm}% c5paper + \or \bxpr@set@size@a(114,162){mm}% c6paper + \or \bxpr@set@size@a(1030,1456){mm}% b0j + \or \bxpr@set@size@a(728,1030){mm}% b1j + \or \bxpr@set@size@a(515,728){mm}% b2j + \or \bxpr@set@size@a(364,515){mm}% b3j + \or \bxpr@set@size@a(257,364){mm}% b4j + \or \bxpr@set@size@a(182,257){mm}% b5j + \or \bxpr@set@size@a(128,182){mm}% b6j + \or \bxpr@set@size@a(8.5,11){in}% ansiapaper + \or \bxpr@set@size@a(11,17){in}% ansibpaper + \or \bxpr@set@size@a(17,22){in}% ansicpaper + \or \bxpr@set@size@a(22,34){in}% ansidpaper + \or \bxpr@set@size@a(34,44){in}% ansiepaper + \or \bxpr@set@size@a(8.5,11){in}% letterpaper + \or \bxpr@set@size@a(8.5,14){in}% legalpaper + \or \bxpr@set@size@a(7.25,10.5){in}% executivepaper + \or \bxpr@set@size@a(225,180){mm}% screen + \fi}% {% custom page size ('size={<width>,<height>}') + \def\bxpr@val@size{#1}\bxpr@needs@reset@sizefalse \def\bxpr@tmpa##1,##2,##3\@nil{% \begingroup\setbox\z@\hbox{% \@tempdima##1\relax \@tempdimb##2\relax @@ -138,19 +238,44 @@ \def\noexpand\bxpr@cs@width{\the\@tempdima}% \def\noexpand\bxpr@cs@height{\the\@tempdimb}}}% \endgroup\bxpr@g@next}% - \bxpr@tmpa#1,,\@nil + \def\bxpr@tmpb{#1}% + \bxpr@set@size@star + \expandafter\bxpr@tmpa\bxpr@tmpb,,\@nil \let\bxpr@size\bxpr@size@@custom} - -%% apply package options -\edef\bxpr@tmpa{% - \noexpand\setkeys{bxpr}{\bxpr@kvopt}% -}\bxpr@tmpa +\def\bxpr@set@size@a(#1,#2)#3{% + \edef\bxpr@tmpa##1##2{% + \ifbxpr@prm@landscape##2\else##1\fi + \ifbxpr@prm@truedimen true\fi #3\relax}% + \bxpr@dima=\bxpr@tmpa{#1}{#2}\edef\bxpr@cs@width{\the\bxpr@dima}% + \bxpr@dima=\bxpr@tmpa{#2}{#1}\edef\bxpr@cs@height{\the\bxpr@dima}% + \let\bxpr@size\bxpr@size@@custom} +\def\bxpr@set@size@star{% + \expandafter\bxpr@set@size@star@a\bxpr@tmpb**\bxpr@end} +\def\bxpr@set@size@star@a#1*#2*#3\bxpr@end{% + \ifx*#2*\else \def\bxpr@tmpb{#1,#2}\fi} %--------------------------------------- user interface %%<*> \bxpapersizesetup{<key>=<value>,...} \newcommand*\bxpapersizesetup[1]{% - \setkeys{bxpr}{#1}} + \setkeys*[bxpr]{prm}{#1}% + \ifx\XKV@rm\@empty\else + \bxpr@err@ivkey + \fi + \ifbxpr@needs@reset@size + \edef\bxpr@tmpa{% + \noexpand\setkeys[bxpr]{prm}{size=\bxpr@val@size}% + }\bxpr@tmpa + \fi} +%%<*> \papersizesetup{<key>=<value>,...} +% Synonym for \bxpapersizesetup, declared only if not yet defined. +\providecommand*\papersizesetup{% + \bxpapersizesetup} + +%% apply package options +\edef\bxpr@tmpa{% + \noexpand\bxpapersizesetup{\bxpr@kvopt}% +}\bxpr@tmpa %--------------------------------------- page hook @@ -165,19 +290,20 @@ \the\toks@} \endgroup -%% \bxpr@begindoc@second@hook +%% \bxpr@begindoc@last@hook % Placed after the begin-docuemnt hook. -\def\bxpr@begindoc@second@hook{% - \let\bxpr@begindoc@second@hook\@undefined} +\def\bxpr@begindoc@last@hook{% + \let\bxpr@begindoc@last@hook\@undefined} \g@addto@macro\document{% - \bxpr@begindoc@second@hook} + \bxpr@begindoc@last@hook} %% add hook for every page \g@addto@macro\bxpr@begindoc@first@hook{% \bxDebug{bxpapersize settings:^^J% mode=\the\bxpr@mode^^J% - prioity=\the\bxpr@priority^^J% - size=\the\bxpr@size}% + priority=\the\bxpr@priority^^J% + size=\the\bxpr@size(\bxpr@cs@width,\bxpr@cs@height)% + \ifnum\bxpr@tombow>\z@ [tombow]\fi}% \bxpr@geometry@hack \ifcase\bxpr@mode % dvi \ifcase\bxpr@priority % low @@ -190,12 +316,12 @@ \bxpr@page@process \AtBeginShipoutNext{\bxpr@every@page@hook}}% \AtBeginShipoutFirst{\bxpr@special@chunk} - \or % middle + \or % default \def\bxpr@every@page@hook{% \bxpr@page@process \bxpr@modify@output@box\relax\bxpr@special@chunk}% \AtBeginShipout{\bxpr@every@page@hook}% - \or % higih + \or % high \AtBeginShipoutInit \def\bxpr@every@page@hook{% \bxpr@page@process @@ -210,7 +336,14 @@ \AtBeginShipout{\bxpr@every@page@hook}% \fi} -%% \bxpr@modify@output@box +%% \bxpr@tombow +\chardef\bxpr@tombow=0 +\expandafter\ifx\csname iftombow\expandafter\endcsname + \csname iftrue\endcsname + \chardef\bxpr@tombow=1 +\fi + +%% \bxpr@modify@output@box{<pre>}{<post>} \def\bxpr@modify@output@box#1#2{% \setbox\AtBeginShipoutBox\vbox{% #1\box\AtBeginShipoutBox#2}} @@ -233,7 +366,7 @@ \edef\bxpr@tmpa{% \paperwidth=\the\paperwidth \paperheight=\the\paperheight}% - \expandafter\g@addto@macro\expandafter\bxpr@begindoc@second@hook + \expandafter\g@addto@macro\expandafter\bxpr@begindoc@last@hook \expandafter{\bxpr@tmpa}% }{}} @@ -245,8 +378,13 @@ %% \bxpr@set@page@size{<width>}{<height>} \ifcase\bxpr@mode %dvi \def\bxpr@set@page@size#1#2{% - \bxpr@dima=#1\relax \edef\bxpr@tmpb{\the\bxpr@dima}% - \bxpr@dima=#2\relax \edef\bxpr@tmpb{\bxpr@tmpb,\the\bxpr@dima}% + \begingroup + \bxpr@let@real@mag@to\bxpr@tmpa + \paperwidth=#1\relax \paperwidth=\bxpr@tmpa\paperwidth + \paperheight=#2\relax \paperheight=\bxpr@tmpa\paperheight + \xdef\bxpr@g@next{% + \def\noexpand\bxpr@tmpb{\the\paperwidth,\the\paperheight}}% + \endgroup \bxpr@g@next \bxDebug{papersize=\bxpr@tmpb}% \edef\bxpr@special@chunk{\special{papersize=\bxpr@tmpb}}}% \else %pdf @@ -255,23 +393,28 @@ \bxDebug{papersize=\the\bxpr@pagewidth,\the\bxpr@pageheight}}% \fi +%% \bxpr@let@real@mag@to\CS +\def\bxpr@let@real@mag@to#1{% + \begingroup + \@tempcnta=\mag \advance\@tempcnta100000 + \def\bxpr@tmpa1##1##2##3##4##5\relax{% + \@tempdima=##1##2.##3##4##5\p@}% + \expandafter\bxpr@tmpa\the\@tempcnta\relax + \xdef\bxpr@g@next{% + \def\noexpand#1{\strip@pt\@tempdima}}% + \endgroup \bxpr@g@next} + %% \bxpr@page@process \def\bxpr@page@process{% - \ifbxpr@active + \ifbxpr@prm@active \bxpr@page@process@a \fi} \def\bxpr@page@process@a{% \ifcase\bxpr@size % real - \ifcase\bxpr@mode % dvi - \ifnum\mag=\@m - \bxpr@set@page@size{\paperwidth}{\paperheight}% - \else - \bxpr@apply@mag - \bxpr@set@page@size{\bxpr@width}{\bxpr@height}% - \fi - \or % pdf - \bxpr@set@page@size{\paperwidth}{\paperheight}% - \fi + \bxpr@use@real@size + \bxpr@set@page@size{\bxpr@width}{\bxpr@height}% + \or % real* + \bxpr@set@page@size{\paperwidth}{\paperheight}% \or % box \bxpr@use@box@size \setbox\AtBeginShipoutBox\vbox{% @@ -285,20 +428,23 @@ \bxpr@set@page@size{\bxpr@cs@width}{\bxpr@cs@height}% \fi} -%% \bxpr@apply@mag -\def\bxpr@apply@mag{% +%% \bxpr@use@real@size +\def\bxpr@use@real@size{% + \bxpr@use@real@size@a{width}% + \bxpr@use@real@size@a{height}} +\def\bxpr@use@real@size@a#1{% \begingroup - \ifnum\mag=\@m\else - \@tempcnta=\mag \advance\@tempcnta100000 - \def\bxpr@next1##1##2##3##4##5\relax{% - \def\bxpr(a)tmpa{##1##2.##3##4##5}}% - \expandafter\bxpr@next\the\@tempcnta\relax - \paperwidth=\bxpr@tmpa\paperwidth - \paperheight=\bxpr@tmpa\paperheight + \bxpr@csletcs{bxpr@tmpa}{paper#1}% + \ifnum\bxpr@tombow>\z@ + \advance\bxpr@tmpa2truein\relax \fi + \bxpr@csletcs{bxpr@tmpb}{stock#1}% + \ifx\bxpr@tmpb\relax\else \ifdim\bxpr@tmpb>\z@ + \bxpr@tmpa\bxpr@tmpb + \fi\fi \xdef\bxpr@g@next{% - \def\noexpand\bxpr@width{\the\paperwidth}% - \def\noexpand\bxpr@height{\the\paperheight}}% + \def\expandafter\noexpand\csname bxpr@#1\endcsname{% + \the\bxpr@tmpa}} \endgroup \bxpr@g@next} %% \bxpr@use@box@size @@ -308,6 +454,79 @@ \advance\bxpr@dima\dp\AtBeginShipoutBox \edef\bxpr@height{\the\bxpr@dima}} +%--------------------------------------- cope with tate-direction + +% In (u)pTeX engine, boxes and lists have the direction attribute, +% and yoko boxes cannot be unboxed in tate lists (and vice versa). +% This restriction can cause the atbegshi package to fail, and thus +% the 'priority=low' setting results in an error when used together +% with document classes of tate direction. + +% if '\tate' is invalid then quit now +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname tate\endcsname\relax +\expandafter\endinput\fi\relax + +% if priority is middle then quit +\ifnum\bxpr@priority=\bxpr@priority@@default +\expandafter\endinput\fi\relax + +% check in advance +\ifx\AtBegShi@Output\@undefined + \PackageWarningNoLine\bxpr@pkgname + {The patch to atbegshi failed, so\MessageBreak + the package might not work well} +\expandafter\endinput\fi\relax + +%% \ifbxpr@ddir +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ifddir\endcsname\relax + \bxpr@csletcs{ifbxpr@ddir}{iffalse} +\else + \bxpr@csletcs{ifbxpr@ddir}{ifddir} +\fi + +%% \bxpr@patch +% Patches the internal macro \AtBegShi@Output of atbegshi package, +% so that the macro is prepended by a `\yoko` primitive and appended +% by a direction primitive to switch back to the original. +\@onlypreamble\bxpr@patch +\def\bxpr@patch{% + \expandafter\bxpr@patch@a\AtBegShi@Output\bxpr@end} +\@onlypreamble\bxpr@patch@a +\def\bxpr@patch@a{% + \futurelet\bxpr@tok\bxpr@patch@b} +\@onlypreamble\bxpr@patch@b +\def\bxpr@patch@b{% + \ifx\bxpr@tok\egroup \expandafter\@firstoftwo + \else \expandafter\@secondoftwo + \fi{\bxpr@patch@c}{\bxpr@patch@d{}}} +\@onlypreamble\bxpr@patch@c +\def\bxpr@patch@c#1#2{% + \bxpr@patch@d{#1#2}} +\@onlypreamble\bxpr@patch@d +\def\bxpr@patch@d#1#2\bxpr@end{% + \def\AtBegShi@Output{#1\bxpr@ABS@prehook#2\bxpr@ABS@posthook}} +% do patch +\bxpr@patch + +%% \bxpr@restore@dir +\let\bxpr@restore@dir\relax + +%% \bxpr@ABS@prehook +\def\bxpr@ABS@prehook{% + \iftdir \yoko \let\bxpr@restore@dir\tate + \else\ifbxpr@ddir \yoko \let\bxpr@restore@dir\dtou + \else \let\bxpr@restore@dir\relax + \fi\fi + \ifx\bxpr@restore@dir\relax\else + \bxDebug{Temporarily switching \meaning\bxpr@restore@dir + \space to \string\yoko}% + \fi} +%% \bxpr@ABS@posthook +\def\bxpr@ABS@posthook{% + \bxpr@restore@dir} + %--------------------------------------- all done \endinput %% EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpapersize.tlpobj new/tlpkg/tlpobj/bxpapersize.tlpobj --- old/tlpkg/tlpobj/bxpapersize.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxpapersize.tlpobj 2017-05-04 02:06:58.000000000 +0200 @@ -1,16 +1,16 @@ name bxpapersize category Package -revision 40149 +revision 44174 shortdesc Synchronize output paper size with layout paper size relocated 1 longdesc As is well known, in LaTeX processing layout paper size longdesc specified by document class options is not automatically longdesc applied to output paper size. This package enables LaTeX longdesc authors to synchronize both kinds of paper sizes. -runfiles size=3 +runfiles size=5 RELOC/tex/latex/bxpapersize/bxpapersize.sty catalogue-ctan /macros/latex/contrib/bxpapersize -catalogue-date 2016-03-30 06:22:42 +0200 -catalogue-license other-free +catalogue-date 2017-05-02 23:06:01 +0200 +catalogue-license mit catalogue-topics page-control -catalogue-version 0.2 +catalogue-version 0.3a ++++++ bxpdfver.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/LICENSE new/doc/latex/bxpdfver/LICENSE --- old/doc/latex/bxpdfver/LICENSE 2015-08-05 22:15:15.000000000 +0200 +++ new/doc/latex/bxpdfver/LICENSE 2017-02-13 01:01:03.000000000 +0100 @@ -1,12 +1,6 @@ -$BK\%=%U%H%&%'%"$O(B MIT $B%i%$%;%s%9$N2<$GG[I[$5$l$^$9!#(B -$BCx:n8"$O:n<T$G$"$k!VH,EP(B $B?rG7!JJLL>(B ZR$B!K!W$KB0$7$^$9!#(B -$B$^$?K\%=%U%H%&%'%"$OL5J]>Z$G$9!#(B - -This software is distributed under the MIT License. - The MIT License -Copyright (c) 2013 Takayuki YATO (aka. "ZR") +Copyright (c) 2017 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README new/doc/latex/bxpdfver/README --- old/doc/latex/bxpdfver/README 2015-08-05 22:15:15.000000000 +0200 +++ new/doc/latex/bxpdfver/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -BXpdfver Package -================ - -LaTeX: To specify the version and compression level of output PDF files - -This package enables users to specify in their sources the following -settings on the PDF document to output: - - * PDF version (1.4, 1.5 etc.); - * whether or not to compress streams; - * whether or not to use object streams. - -### SYSTEM REQUIREMENT - - * TeX format: LaTeX. - * TeX engine: pdfTeX, XeTeX, LuaTeX, and any DVI-output engines. - * DVI-ware: dvipdfmx. - * Required packages: - - atbegshi (when using dvipdfmx driver) - -### INSTALLATION - - - `*.sty` → $TEXMF/tex/latex/BXpdfver - -### LICENSE - -This package is distributed under the MIT license. - -bxpdfver package ----------------- - -### PACKAGE LOADING - - \usepackage[<option>,...]{bxpdfver} - -The available options are: - - * `1.4`, `1.5`, `1.6`, or `1.7`: Sets PDF version. - * `nocompress`: Suppresses stream compression. - * `compress` (defalt): Does not suppress stream compression. - * `noobjcompress`: Suppresses use of object streams. - * `objcompress` (default): Does not suppress use of object streams. - * Driver options: As below: - + When using a PDF-output engine, you need not give driver options - since the appropriate one is auto-detected. - + `dvipdfmx`: Uses dvipdfmx driver. - + `disabled`: Disables all functions of the package. - -Note that the options `compress` and `objcompress` mean that this -package *does not suppress* a feature. They do not active a feature -when it is already suppressed by other means. - -### NOTE ON DRIVERS - - * pdfTeX and LuaTeX support all features. - * XeTeX and dvipdfmx support only PDF version setting. - * If you try to use unavailable features, an error will occur. - * The package recognizes some “unsupported” driver options such as - `dvips`; when such drivers are used, use of any feature will cause - an error. - * When `disabled` is used, use of any feature will do nothing (nor - issue an error). - -### COMMANDS - - * `\setpdfversion{<version>}`: Sets PDF version. - Here `<version>` is either one of the following: - + `1.4`, `1.5`, `1.6`, or `1.7`; the version itself. - + the name of a PDF file; the version is set equal to that of - the given file. - * `\suppresspdfcompression`: Suppresses use of object streams. - * `\suppresspdfobjcompression`: Suppresses use of object streams. - -REVISION HISTORY ----------------- - - * Version 0.2a [2015/08/05] - - Minor fix. - * Version 0.2 [2014/07/04] - - First public version. - --------------------- -Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README-ja new/doc/latex/bxpdfver/README-ja --- old/doc/latex/bxpdfver/README-ja 2015-08-05 22:15:15.000000000 +0200 +++ new/doc/latex/bxpdfver/README-ja 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -BXpdfver パッケージバンドル -=========================== - -LaTeX: 出力 PDF のバージョンや圧縮状態を指定する - -LaTeX 文書を PDF 文書に変換する際に出力 PDF に関する以下の設定を文書中で -行う機能を提供する。 - - * PDF バージョン（1.4, 1.5 等） - * ストリームの圧縮の有無 - * オブジェクトストリームの使用の有無 - -### 前提環境 - - * フォーマット： LaTeX - * エンジン：不問 - * DVIウェア： dvipdfmx、および PDF 出力のエンジン - * 依存パッケージ： - - atbegshi（dvipdfmx ドライバの場合） - -### インストール - - - `*.sty` → $TEXMF/tex/latex/BXpdfver - -### ライセンス - -本パッケージは MIT ライセンスの下で配布される。 - -bxpdfver パッケージ -------------------- - -### パッケージ読込 - - \usepackage[<オプション>,...]{bxpdfver} - -利用可能なオプションは以下の通り。 - - * `1.4`、`1.5`、`1.6`、`1.7`： PDF バージョンを指定する。 - * `nocompress`：ストリームの圧縮を抑止する。 - * `compress`（既定）：ストリームの圧縮を抑止しない。 - * `noobjcompress`：オブジェクトストリームの使用を抑止する。 - * `objcompress`（既定）：オブジェクトストリームの使用を抑止しない。 - * ドライバオプション：以下の通り。なお、後述の「ドライバ指定」の - 節も参照されたい。 - + PDF 出力のエンジンの場合は、既定で適切なドライバが選択される - のでドライバオプションは不要である。 - + `dvipdfmx`： dvipdfmx 用のドライバを指定する。 - + `disabled`：全ての機能を無効化する。 - -`compress`、`objcompress` はこのパッケージによる抑止を行わないという意味 -であり、既に抑止されている場合にそれを再び有効化するものではない。 - -### ドライバ指定 - - * pdfTeX および LuaTeX では全ての機能が使用可能。 - * XeTeX および dvipdfmx では PDF バージョン指定のみ使用可能。 - * 使用不可能な機能を使おうと試みるとエラーが発生する。 - * `dvips` 等の“全く対応していない”若干のドライバオプションを認識 - する。この場合、全ての機能の呼出でエラーが発生する。 - * `disabled` は特殊で、これを指定した場合は、どの機能の呼出でも - エラーは発生しないが、全く何の動作も行わない。 - -### 機能 - - * `\setpdfversion{<バージョン>}`：出力 PDF バージョンを指定する。 - `<バージョン>` には以下の何れかを指定する。 - + `1.4`、`1.5`、`1.6`、`1.7` の何れか。バージョンをその値に設定 - する。 - + PDF ファイルの名前。この場合、その PDF のバージョンと同じ値に - 設定する。 - * `\suppresspdfcompression`：ストリームの圧縮を抑止する。 - * `\suppresspdfobjcompression`：オブジェクトストリームの使用を抑止 - する。（実はこの指定自体は圧縮とは無関係であるが、pdfTeX エンジンの - プリミティブ `\pdfobjcompresslevel` に合わせた命令名を用いた。） - - -更新履歴 --------- - - * Version 0.2a [2015/08/05] - - 細かい修正。 - * Version 0.2 [2014/07/04] - - 最初の公開版。 - --------------------- -Takayuki YATO (aka. "ZR") -http://zrbabbler.sp.land.to/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README-ja.md new/doc/latex/bxpdfver/README-ja.md --- old/doc/latex/bxpdfver/README-ja.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxpdfver/README-ja.md 2017-02-13 01:01:03.000000000 +0100 @@ -0,0 +1,118 @@ +BXpdfver パッケージバンドル +=========================== + +LaTeX: 出力 PDF のバージョンや圧縮状態を指定する + +LaTeX 文書を PDF 文書に変換する際に出力 PDF に関する以下の設定を文書中で +行う機能を提供する。 + + * PDF バージョン（1.4, 1.5 等） + * ストリームの圧縮の有無 + * オブジェクトストリームの使用の有無 + +### 前提環境 + + * フォーマット： LaTeX + * エンジン： pdfTeX、XeTeX、LuaTeX、および DVI 出力のエンジン + * DVIウェア（DVI出力時）： dvipdfmx + * 依存パッケージ： + - atbegshi（dvipdfmx ドライバの場合） + +### インストール + + - `*.sty` → $TEXMF/tex/latex/BXpdfver + +### ライセンス + +本パッケージは MIT ライセンスの下で配布される。 + +bxpdfver パッケージ +------------------- + +### パッケージ読込 + + \usepackage[<オプション>,...]{bxpdfver} + +利用可能なオプションは以下の通り。 + + * `1.4`、`1.5`、`1.6`、`1.7`： PDF バージョンを指定する。 + * `nocompress`：ストリームの圧縮を抑止する。 + * `compress`（既定）：ストリームの圧縮を抑止しない。 + * `noobjcompress`：オブジェクトストリームの使用を抑止する。 + * `objcompress`（既定）：オブジェクトストリームの使用を抑止しない。 + * ドライバオプション：以下の通り。なお、後述の「ドライバ指定」の + 節も参照されたい。 + + PDF 出力のエンジンの場合は、既定で適切なドライバが選択される + のでドライバオプションは不要である。 + + `dvipdfmx`： dvipdfmx 用のドライバを指定する。 + + `disabled`／`nodvidriver`：全ての機能を無効化する。 + * `lenient`：サポートしない機能に対するエラーを警告に格下げする。 + +`compress`、`objcompress` はこのパッケージによる抑止を行わないという意味 +であり、既に抑止されている場合にそれを再び有効化するものではない。 + +### 機能 + + * `\setpdfversion{<バージョン>}`：出力 PDF バージョンを指定する。 + `<バージョン>` には以下の何れかを指定する。 + + `1.4`、`1.5`、`1.6`、`1.7` の何れか。その値に設定する。 + + PDF ファイルの名前。そのファイルのバージョンと同じ値に設定する。 + * `\suppresspdfcompression`：ストリームの圧縮を抑止する。 + * `\suppresspdfobjcompression`：オブジェクトストリームの使用を抑止 + する。（実はこの指定自体は圧縮とは無関係であるが、pdfTeX エンジンの + プリミティブ `\pdfobjcompresslevel` に合わせた命令名を用いた。） + * `\setpdfdecimaldigits{<精度>}`： PDF 命令列中に現れる小数値の精度 + （小数点以下の桁数）を指定する。 + * `\preservepdfdestinations`： PDF 目的地（PDF destination）の名前の + 短縮を抑止し、TeX 文書で指定された名前を用いる。異なる PDF 文書間で + のリンクを正常に機能させるために必要である。 + +### ドライバ指定に関する補足 + + \ Drivers (engines) pdfTeX dvipdfmx + Features / LuaTeX / XeTeX others + --------------------------- --------- --------- ------ + \setpdfversion Yes Yes No + \suppresspdfcompression Yes Maybe(*2) No + \suppresspdfobjcompression Yes Maybe(*2) No + \setpdfdecimaldigits Yes Maybe(*2) No + \preservepdfdestinations No-op(*1) Maybe(*2) No + + 1. pdfTeX／LuaTeX では PDF 目的地の名前が短縮されるることはない。つまり + `\preservepdfdestinations` は常に有効になっていると見なせる。 + 2. これらの機能を使用するためには、(x)dvipdfmx のバージョンが 20160307 + 以上である必要がある。 + - バージョン判定のために kpsewhich と extractbb の起動を利用する + ため、少なくともこれらのプログラムについて、シェルエスケープが + 許可されている必要がある。 + - dvipdfmx のバージョン情報は補助ファイル（.aux）中にキャッシュ + される。このため、何か状況が変わった場合は、一旦補助ファイルを + 削除する必要が生じる。 + +以下のことにも注意されたい。 + + * 使用不可能な機能を使おうと試みるとエラーが発生する。 + * `dvips` 等の“全く対応していない”若干のドライバオプションを認識 + する。この場合、全ての機能の呼出でエラーが発生する。 + * `disabled` は特殊で、これを指定した場合は、どの機能の呼出でも + エラーは発生しないが、全く何の動作も行わない。 + + +更新履歴 +-------- + + * Version 0.4 ‹2017/02/11› + - `\setpdfdecimaldigits`、`\preservepdfdestinations` を追加。 + * Version 0.3 ‹2016/08/11› + - dvipdfmx/XeTeX でも全ての機能がサポートされる。 + * Version 0.2b ‹2016/08/10› + - `lenient` オプションを追加。 + - 新しい LuaTeX エンジンのサポート。 + * Version 0.2a ‹2015/08/05› + - 細かい修正。 + * Version 0.2 ‹2014/07/04› + - 最初の公開版。 + +-------------------- +Takayuki YATO (aka. "ZR") +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README.md new/doc/latex/bxpdfver/README.md --- old/doc/latex/bxpdfver/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/bxpdfver/README.md 2017-02-13 01:01:03.000000000 +0100 @@ -0,0 +1,118 @@ +BXpdfver Package +================ + +LaTeX: To specify the version and compression level of output PDF files + +This package enables users to specify in their sources the following +settings on the PDF document to output: + + * PDF version (1.4, 1.5 etc.); + * whether or not to compress streams; + * whether or not to use object streams. + * precision of decimal numbers used in PDF commands + * whether or not to preserve (not shorten) PDF destination names + +### SYSTEM REQUIREMENT + + * TeX format: LaTeX. + * TeX engine: pdfTeX, XeTeX, LuaTeX, and any DVI-output engines. + * DVI-ware (in DVI mode): dvipdfmx. + * Required packages: + - atbegshi (when using dvipdfmx driver) + +### INSTALLATION + + - `*.sty` → $TEXMF/tex/latex/BXpdfver + +### LICENSE + +This package is distributed under the MIT license. + +bxpdfver package +---------------- + +### PACKAGE LOADING + + \usepackage[<option>,...]{bxpdfver} + +The available options are: + + * `1.4`, `1.5`, `1.6`, or `1.7`: Sets PDF version. + * `nocompress`: Suppresses stream compression. + * `compress` (default): Does not suppress stream compression. + * `noobjcompress`: Suppresses use of object streams. + * `objcompress` (default): Does not suppress use of object streams. + * Driver options: As below: + + When using a PDF-output engine, you need not give driver options + since the appropriate one is auto-detected. + + `dvipdfmx`: Uses dvipdfmx driver. + + `disabled`/`nodvidriver`: Disables all functions of the package. + * `lenient`: Turns the errors for unsupported features into warnings. + +Note that the options `compress` and `objcompress` mean that this +package *does not suppress* a feature. They do not activate a feature +when it is already suppressed by other means. + +### USAGE + + * `\setpdfversion{<version>}`: Sets PDF version. + Here `<version>` is either one of the following: + + `1.4`, `1.5`, `1.6`, or `1.7`; the version itself. + + the name of a PDF file; the version is set equal to that of + the given file. + * `\suppresspdfcompression`: Suppresses stream compression. + * `\suppresspdfobjcompression`: Suppresses use of object streams. + * `\setpdfdecimaldigits{<precision>}`: Sets the precision (the number + of digits after decimal points) of the decimal numbers that appear + in PDF command sequences. + * `\preservepdfdestinations`: Stops shortening the PDF destination + names and uses the original names given in the TeX documents. This + is necessary for cross-document links to work correctly. + +### NOTE ON DRIVERS + + \ Drivers (engines) pdfTeX dvipdfmx + Features / LuaTeX / XeTeX others + --------------------------- --------- --------- ------ + \setpdfversion Yes Yes No + \suppresspdfcompression Yes Maybe(*2) No + \suppresspdfobjcompression Yes Maybe(*2) No + \setpdfdecimaldigits Yes Maybe(*2) No + \preservepdfdestinations No-op(*1) Maybe(*2) No + + 1. In pdfTeX and LuaTeX, PDF destination names are never shortened; + that is, it can be thought as if `\preservepdfdestinations` were + always in effect. + 2. These features are available only when the version of (x)dvipdfmx + is 20160307 or later. Also shell escape must be accepted (with or + without restriction) so that `kpsewhich` and `extractbb` will be + allowed to run, because those programs are used in order to detect + the dvipdfmx version. + +More notices: + + * If you try to use unavailable features, an error will occur. + * The package recognizes some “unsupported” driver options such as + `dvips`; when such drivers are used, use of any feature will cause + an error. + * When `disabled` is used, use of any feature will do nothing (nor + issue an error). + +REVISION HISTORY +---------------- + + * Version 0.4 ‹2017/02/11› + - Add `\setpdfdecimaldigits` and `\preservepdfdestinations`. + * Version 0.3 ‹2016/08/11› + - Supported all features on dvipdfmx/XeTeX. + * Version 0.2b ‹2016/08/10› + - Added the `lenient` option. + - Supported the newer version of LuaTeX. + * Version 0.2a ‹2015/08/05› + - Minor fix. + * Version 0.2 ‹2014/07/04› + - First public version. + +-------------------- +Takayuki YATO (aka. "ZR") +https://github.com/zr-tex8r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/sample-bxpdfver.tex new/doc/latex/bxpdfver/sample-bxpdfver.tex --- old/doc/latex/bxpdfver/sample-bxpdfver.tex 2015-08-05 22:15:15.000000000 +0200 +++ new/doc/latex/bxpdfver/sample-bxpdfver.tex 2017-02-13 01:01:03.000000000 +0100 @@ -6,6 +6,9 @@ noobjcompress% to suppress compression of strings for describing objects ]{bxpdfver} %\setpdfversion{some.pdf}% to set output version equal to some other PDF file +\setpdfdecimaldigits{4}% to set precision of decimals used in PDF commands +%\setpdfpkresoluion{1200}% to set resolution (dpi) of PK bitmap fonts +%\preservepdfdestinations % to preserve PDF destnation names as is \begin{document} Need to say hello {\TeX}!? \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpdfver.doc.tlpobj new/tlpkg/tlpobj/bxpdfver.doc.tlpobj --- old/tlpkg/tlpobj/bxpdfver.doc.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxpdfver.doc.tlpobj 2017-04-14 17:34:08.000000000 +0200 @@ -1,10 +1,10 @@ name bxpdfver.doc category Package -revision 38050 +revision 43201 shortdesc doc files of bxpdfver relocated 1 -docfiles size=4 +docfiles size=6 RELOC/doc/latex/bxpdfver/LICENSE - RELOC/doc/latex/bxpdfver/README - RELOC/doc/latex/bxpdfver/README-ja + RELOC/doc/latex/bxpdfver/README-ja.md + RELOC/doc/latex/bxpdfver/README.md RELOC/doc/latex/bxpdfver/sample-bxpdfver.tex ++++++ bxpdfver.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxpdfver/bxpdfver.sty new/tex/latex/bxpdfver/bxpdfver.sty --- old/tex/latex/bxpdfver/bxpdfver.sty 2015-08-05 22:15:15.000000000 +0200 +++ new/tex/latex/bxpdfver/bxpdfver.sty 2017-02-13 01:01:04.000000000 +0100 @@ -2,23 +2,26 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpdfver}[2015/08/05 v0.2a] +\ProvidesPackage{bxpdfver}[2017/02/11 v0.4] +\def\bxpv@pkgname{bxpdfver} %% preparations -\def\bxpv@pkgname{bxpdfver} -\def\bxpv@error{\PackageError\bxpv@pkgname} -\def\bxpv@info{\PackageInfo\bxpv@pkgname} +\RequirePackage{ifthen}[]% for \newboolean +\newif\ifbxpv@ok +\providecommand\bxDebug[1]{} + +%--------------------------------------- package options %% variables -\newif\ifbxpv@ok -\let\bxpv@drv@type\relax -\let\bxpv@drv@name\relax -\let\bxpv@version\relax -\let\bxpv@mversion\relax -\let\bxpv@compress=t -\let\bxpv@obj@compress=t +\let\bxpv@drv@type\relax % driver type + % p=pdfmode,d=dvipdfmx,0=disabled,x=unsupported +\let\bxpv@drv@name\relax % driver name +\let\bxpv@version\relax % version value (eg. 1.4) +\let\bxpv@compress=t % use compression? +\let\bxpv@obj@compress=t % use object stream? +\chardef\bxpv@infolevel=2 % info-log level -%% process options +%% options % (PDF version) \DeclareOption{1.4}{% \edef\bxpv@version{\CurrentOption}% @@ -68,11 +71,24 @@ \let\bxpv@drv@type=x% \def\bxpv@drv@name{dviout}% } +\DeclareOption{xdvi}{% + \let\bxpv@drv@type=x% + \def\bxpv@drv@name{xdvi}% +} \DeclareOption{disabled}{% \let\bxpv@drv@type=0% \def\bxpv@drv@name{disabled}% } -% +\DeclareOption{nodvidriver}{% + \let\bxpv@drv@type=0% + \def\bxpv@drv@name{nodvidriver}% +} +% (other) +\DeclareOption{lenient}{% + \chardef\bxpv@infolevel=1 +} + +%% process \ProcessOptions* %--------------------------------------- helpers @@ -80,34 +96,90 @@ %% unique tokens \def\bxpv@end{\bxpv@end@} \def\bxpv@mt{\bxpv@mt@} +\let\bxpv@mk\noindent + +%% \bxpv@csletcs +\def\bxpv@csletcs#1#2{% + \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname +} + +%% \bxpv@detokenize\CS +\def\bxpv@detokenize#1{% + \expandafter\bxpv@detokenize@a\meaning#1\bxpv@end#1% +} +\def\bxpv@detokenize@a#1>#2\bxpv@end#3{% + \def#3{#2}% +} + +%% \bxpv@fail{<message>} +% Issues an error or a warning. +\@onlypreamble\bxpv@fail +\def\bxpv@fail#1{% + \ifcase\bxpv@infolevel % silenced + \or % lenient + \PackageWarningNoLine\bxpv@pkgname{#1}% + \or % strict + \PackageError\bxpv@pkgname{#1}{\@ehc}% + \fi +} + +%% \bxpv@fail@nafea +\@onlypreamble\bxpv@fail@nafea +\def\bxpv@fail@nafea#1{% + \bxpv@fail{#1, because\MessageBreak + the engine/driver does not support the feature}% +} -%--------------------------------------- environment check +%--------------------------------------- internal dispatchers %% \bxpv@suppress@compress \@onlypreamble\bxpv@suppress@compress \def\bxpv@suppress@compress{% - \bxpv@error{Cannot suppress compression}% - \bxpv@errh@na + \bxpv@fail@nafea{Cannot suppress compression}% } %% \bxpv@suppress@obj@compress \@onlypreamble\bxpv@suppress@obj@compress \def\bxpv@suppress@obj@compress{% - \bxpv@error{Cannot suppress object compression}% - \bxpv@errh@na + \bxpv@fail@nafea{Cannot suppress object compression}% } %% \bxpv@set@version \@onlypreamble\bxpv@set@version \def\bxpv@set@version{% - \bxpv@error{Cannot set PDF version}% - \bxpv@errh@na -} -%% \bxpv@errh@na -\@onlypreamble\bxpv@errh@na -\def\bxpv@errh@na{% - This feature is not supported by the engine in use.% - \MessageBreak\@ehc + \bxpv@fail@nafea{Cannot set PDF version}% } +%% \bxpv@set@decimaldigits +\@onlypreamble\bxpv@set@decimaldigits +\def\bxpv@set@decimaldigits{% + \bxpv@fail@nafea{Cannot set PDF decimal digits}% +} +%% \bxpv@set@pkresolution +\@onlypreamble\bxpv@set@pkresolution +\def\bxpv@set@pkresolution{% + \bxpv@fail@nafea{Cannot set PK resolution}% +} +%% \bxpv@preserve@destinations +\@onlypreamble\bxpv@preserve@destinations +\def\bxpv@preserve@destinations{% + \bxpv@fail@nafea{Cannot preserve PDF destinations}% +} +%% \bxpv@cancel@obj@compress +% The silent version of \bxpv@suppress@obj@compress. +\@onlypreamble\bxpv@cancel@obj@compress +\let\bxpv@cancel@obj@compress\relax + +%% \bxpv@begin@document@hook +% The begin-document hook. +\@onlypreamble\bxpv@begin@document@hook +\let\bxpv@begin@document@hook\@empty +\AtBeginDocument{\bxpv@begin@document@hook} + +%% 'disabled' driver +\if 0\bxpv@drv@type + \chardef\bxpv@infolevel=0 +\fi +%% adjust internal dispatchers +\ifx 0\bxpv@drv@type\else %-------- \begingroup %% \bxpv@check@prim\CS{<proc>} @@ -120,89 +192,117 @@ \fi } -%% \bxpv@pdfoutput: use PDF output? -\ifx\pdfoutput\@undefined - \chardef\bxpv@pdfoutput\z@ - % XeTeX might support \pdfminorversion etc in the future :) - \bxpv@check@prim\XeTeXversion{\chardef\bxpv@pdfoutput\@ne}% - % pTeX-ng - \bxpv@check@prim\ngbanner{\chardef\bxpv@pdfoutput\@ne}% -\else - \chardef\bxpv@pdfoutput\pdfoutput -\fi +%% \bxpv@pdfoutput +\chardef\bxpv@pdfoutput\z@ +\bxpv@check@prim\pdfoutput{\chardef\bxpv@pdfoutput\pdfoutput} +\bxpv@check@prim\outputmode{\chardef\bxpv@pdfoutput\outputmode} +\bxpv@check@prim\ngbanner{\chardef\bxpv@pdfoutput\@ne} -%% adjust internal dispatchers -\bxpv@okfalse -\ifnum\bxpv@pdfoutput>\z@ % PDF-output +%% when in PDF mode +\ifnum\bxpv@pdfoutput>\z@ \global\let\bxpv@drv@type=p - % \bxpv@isupp@obj@compress: auto-supress of obj-compression - \@onlypreamble\bxpv@isupp@obj@compress - \global\let\bxpv@isupp@obj@compress\relax - % \bxpv@iunsupp@obj@compress: un-auto-supress - \@onlypreamble\bxpv@iunsupp@obj@compress - \global\let\bxpv@iunsupp@obj@compress\relax - %% If \pdfcompresslevel is available, use it. - \bxpv@check@prim\pdfcompresslevel{% + \global\let\bxpv@@compresslevel\pdfcompresslevel + \global\let\bxpv@@objcompresslevel\pdfobjcompresslevel + \global\let\bxpv@@minorversion\pdfminorversion + \global\let\bxpv@@decimaldigits\pdfdecimaldigits + \global\let\bxpv@@pkresolution\pdfpkresolution + \bxpv@check@prim\pdfvariable{% + \protected\xdef\bxpv@@compresslevel{\pdfvariable compresslevel}% + \protected\xdef\bxpv@@objcompresslevel{\pdfvariable objcompresslevel}% + \protected\xdef\bxpv@@minorversion{\pdfvariable minorversion}% + \protected\xdef\bxpv@@decimaldigits{\pdfvariable decimaldigits}% + \protected\xdef\bxpv@@pkresolution{\pdfvariable pkresolution}% + }% + % If \pdfcompresslevel is available, use it. + \ifx\bxpv@@compresslevel\@undefined\else \gdef\bxpv@suppress@compress{% - \global\pdfcompresslevel\z@ + \global\bxpv@@compresslevel\z@ }% - } - %% If \pdfobjcompresslevel is available, use it. - \bxpv@check@prim\pdfobjcompresslevel{% - \global\chardef\bxpv@org@pdfobjcompresslevel\pdfobjcompresslevel + \fi + % If \pdfobjcompresslevel is available, use it. + \ifx\bxpv@@objcompresslevel\@undefined\else + \global\chardef\bxpv@org@objcompresslevel\bxpv@@objcompresslevel \gdef\bxpv@suppress@obj@compress{% - \global\pdfobjcompresslevel\z@ - \global\let\bxpv@iunsupp@obj@compress\relax + \global\bxpv@@objcompresslevel\z@ }% - \gdef\bxpv@isupp@obj@compress{% - \global\pdfobjcompresslevel\z@ + \global\let\bxpv@cancel@obj@compress\bxpv@suppress@obj@compress + \fi + % If \pdfminorversion is available, use it. + \ifx\bxpv@@minorversion\@undefined\else + \global\chardef\bxpv@org@minorversion\bxpv@@minorversion + \gdef\bxpv@set@version{% + \ifx\bxpdfverMinorVersion\relax + \global\bxpv@@minorversion\bxpv@org@minorversion + \else + \global\bxpv@@minorversion\bxpdfverMinorVersion + \fi }% - \gdef\bxpv@iunsupp@obj@compress{% - \global\pdfobjcompresslevel\bxpv@org@pdfobjcompresslevel + \g@addto@macro\bxpv@begin@document@hook{% + \ifnum\bxpv@@minorversion<5 + \bxpv@cancel@obj@compress + \fi }% - } - \bxpv@check@prim\pdfminorversion\bxpv@oktrue -\fi -\ifbxpv@ok % \pdfminorversion is available - \global\chardef\bxpv@org@pdfminorversion\pdfminorversion - \gdef\bxpv@set@version{% - \ifx\bxpv@mversion\relax - \global\pdfminorversion\bxpv@org@pdfminorversion - \else - \global\pdfminorversion\bxpv@mversion - \fi - \ifnum\pdfminorversion<5 - \bxpv@isupp@obj@compress - \else - \bxpv@iunsupp@obj@compress - \fi - }% + \fi + % If \pdfdecimaldigits is available, use it. + \ifx\bxpv@@decimaldigits\@undefined\else + \global\chardef\bxpv@org@decimaldigits\bxpv@@decimaldigits + \gdef\bxpv@set@decimaldigits{% + \ifx\bxpdfverDecimalDigits\relax + \global\bxpv@@decimaldigits\bxpv@org@decimaldigits + \else + \global\bxpv@@decimaldigits\bxpdfverDecimalDigits + \fi + }% + \fi + % If \pdfpkresolution is available, use it. + \ifx\bxpv@@pkresolution\@undefined\else + \global\mathchardef\bxpv@org@pkresolution\bxpv@@pkresolution + \gdef\bxpv@set@pkresolution{% + \ifx\bxpdfverPkResolution\relax + \global\bxpv@@pkresolution\bxpv@org@pkresolution + \else + \global\bxpv@@pkresolution\bxpdfverPkResolution + \fi + }% + \fi + % On pdfTeX or LuaTeX, \pdfpreservedestionations can be no-op. + \bxpv@oktrue \bxpv@check@prim\ngbanner{\bxpv@okfalse}% + \ifbxpv@ok + \global\let\bxpv@preserve@destinations\relax + \fi \else - % XeTeX now does not have \pdfminorversion, - % so do it just as dvipdfmx. + % XeTeX should do just as dvipdfmx. \bxpv@check@prim\XeTeXversion{% \global\let\bxpv@drv@type=d% } \fi -%% driver check +%% when in DVI mode \if x\bxpv@drv@type % 'bad' driver - \bxpv@error{Unsupported driver '\bxpv@drv@name'}\@ehc + \bxpv@fail{Unsupported driver '\bxpv@drv@name'}% % no further errors - \let\bxpv@drv@type=0\relax -\fi -\if d\bxpv@drv@type % 'dvipdfmx' - \global\let\bxpv@set@version\relax - \AtBeginDocument{% - \bxpv@set@version@dvipdfmx - } -\else\if 0\bxpv@drv@type % 'disabled' - \global\let\bxpv@set@version\relax + \global\chardef\bxpv@infolevel=0 +\else\if d\bxpv@drv@type % 'dvipdfmx' \global\let\bxpv@suppress@compress\relax \global\let\bxpv@suppress@obj@compress\relax -\fi\fi + \global\let\bxpv@set@version\relax + \global\let\bxpv@set@decimaldigits\relax + %\global\let\bxpv@set@pkresolution\relax + \global\let\bxpv@preserve@destinations\relax + \g@addto@macro\bxpv@begin@document@hook{% + \bxpv@begin@document@dvipdfmx + } + \AtEndOfPackage{\g@addto@macro\bxpv@begin@document@hook{% + \bxpv@cache@finalize + }} +\else\if \relax\bxpv@drv@type % no driver + \bxpv@fail + {No driver option is given}% + \global\chardef\bxpv@infolevel=0 +\fi\fi\fi \endgroup +\fi %-------- %--------------------------------------- public interface @@ -210,12 +310,14 @@ \@onlypreamble\suppresspdfcompression \newcommand*\suppresspdfcompression{% \bxpv@suppress@compress + \global\bxpdfverCompressionSuppressedtrue } %%<*> \suppresspdfobjcompression \@onlypreamble\suppresspdfobjcompression \newcommand*\suppresspdfobjcompression{% \bxpv@suppress@obj@compress + \global\bxpdfverObjCompressionSuppressedtrue } %%<*> \setpdfversion{<version>} @@ -226,15 +328,105 @@ \bxpv@set@version } +%%<*> \setpdfdecimaldigits{<number>} +\@onlypreamble\setpdfdecimaldigits +\newcommand*\setpdfdecimaldigits[1]{% + \bxpv@assign@num\bxpdfverDecimalDigits{#1}{0}{4}% + \bxpv@set@decimaldigits +} + +%%<*> \setpdfpkresolution{<number>} +\@onlypreamble\setpdfpkresolution +\newcommand*\setpdfpkresolution[1]{% + \bxpv@assign@num\bxpdfverPkResolution{#1}{0}{10000}% + \bxpv@set@pkresolution +} + +%%<*> \preservepdfdestinations +\@onlypreamble\preservepdfdestinations +\newcommand*\preservepdfdestinations{% + \bxpv@preserve@destinations + \global\bxpdfverDestinationsPreservedtrue +} + +%%<+> \ifbxpdfverCompressionSuppressed +\newboolean{bxpdfverCompressionSuppressed} + +%%<+> \ifbxpdfverObjCompressionSuppressed +\newboolean{bxpdfverObjCompressionSuppressed} + +%%<+> \bxpdfverMinorVersion +% The PDF minor version (eg. '4' for 1.4) that this package +% will impose. It is a number constant, or \relax. +\@ifdefinable{\bxpdfverMinorVersion}{% + \let\bxpdfverMinorVersion\relax +} + +%%<+> \bxpdfverDecimalDigits +% The PDF decimal-digits value that this package +% will impose. It is a number constant, or \relax. +\@ifdefinable{\bxpdfverDecimalDigits}{% + \let\bxpdfverDecimalDigits\relax +} + +%%<+> \bxpdfverPkResolution +% The PK resolution value that this package +% will impose. It is a number constant, or \relax. +\@ifdefinable{\bxpdfverPkResolution}{% + \let\bxpdfverPkResolution\relax +} + +%%<+> \ifbxpdfverDestinationsPreserved +\newboolean{bxpdfverDestinationsPreserved} + +%% \bxpv@assign@num\CS{<value>}{<min>}{<max>} +\@onlypreamble\bxpv@assign@num +\def\bxpv@assign@num#1#2#3#4{% + \begingroup + \edef\bxpv@tmpa{#2}% + \ifx\bxpv@tmpa\@empty + \global\let#1\relax + \else + \@tempswatrue + \afterassignment\bxpv@assign@num@a + \@tempcnta=\bxpv@tmpa\bxpv@mk + \if@tempswa + \ifnum\@tempcnta<#3\relax \@tempswafalse \fi + \ifnum\@tempcnta>#4\relax \@tempswafalse \fi + \if@tempswa + \global\mathchardef#1=\@tempcnta + \else + \PackageError\bxpv@pkgname + {Number is out of range (#3..#4)\MessageBreak + (value=\the\@tempcnta)}% + {\@ehc} + \fi + \else + \PackageError\bxpv@pkgname + {Illegal number format\MessageBreak + (value=\bxpv@tmpa)}% + {\@ehc} + \fi + \fi + \endgroup} +\@onlypreamble\bxpv@assign@num@a +\def\bxpv@assign@num@a#1\bxpv@mk{% + \ifx\bxpv@mt#1\bxpv@mt\else \@tempswafalse \fi} + %--------------------------------------- version values +%% variables +\let\bxpv@mversion\relax % minor version (temporary) + %% \bxpv@get@mversion -% Sets \bxpv@mversion. -% Note: \bxpv@version is assumed to be already expnaded. +% Sets \bxpdfverMinorVersion. \@onlypreamble\bxpv@get@mversion \def\bxpv@get@mversion{% - \let\bxpv@mversion\relax - \ifx\bxpv@version\@empty\else + \edef\bxpv@version{\bxpv@version}% + \ifx\bxpv@version\@empty + \global\let\bxpdfverMinorVersion\relax % unset + \else + \let\bxpv@mversion\relax \@tfor\bxpv@x:=456789\do{% \edef\bxpv@tmpa{1.\bxpv@x}% \ifx\bxpv@version\bxpv@tmpa @@ -245,14 +437,17 @@ \bxpv@file@mversion \fi \ifx\bxpv@mversion\relax - \bxpv@error{Invalid value given for PDF version\MessageBreak + \PackageError\bxpv@pkgname + {Invalid value given for PDF version\MessageBreak (value=\bxpv@version)}{% PDF version must be either 1.4, 1.5, ..., 1.9, or\MessageBreak or the name of a PDF file from which the version is pulled.% \MessageBreak\@ehc}% \else - \bxpv@info{Output PDF version is set to 1.\the\bxpv@mversion + \PackageInfo\bxpv@pkgname + {Output PDF version is set to 1.\the\bxpv@mversion \MessageBreak}% + \global\let\bxpdfverMinorVersion\bxpv@mversion \fi \fi } @@ -260,44 +455,33 @@ %% \bxpv@file@mversion \@onlypreamble\bxpv@file@mversion \def\bxpv@file@mversion{% - \begingroup - \expandafter\bxpv@file@mversion@a\bxpv@version\bxpv@end - \global\let\bxpv@gtmpa\bxpv@mversion - \endgroup - \let\bxpv@mversion\bxpv@gtmpa + \let\bxpv@mversion\relax + \expandafter\bxpv@file@mversion@a\bxpv@version\bxpv@end } \@onlypreamble\bxpv@file@mversion@a \def\bxpv@file@mversion@a#1\bxpv@end{% - \bxpv@okfalse - \lowercase{\bxpv@file@mversion@b#1}% - \bxpv@mark.pdf\bxpv@mark\bxpv@end - \ifbxpv@ok - \openin\@inputcheck=#1\relax - \bxpv@file@mversion@c - \closein\@inputcheck + \filename@parse{#1}% + \edef\bxpv@next{% + \lowercase{\def\noexpand\filename@ext{\filename@ext}}% + }\bxpv@next + \def\bxpv@tmpb{pdf}% + \ifx\filename@ext\bxpv@tmpb + \global\let\bxpv@gtmpa\relax + \bxpv@read@file{#1}{% + \bxpv@file@mversion@xa{##1 }% + \bxpv@read@file@finish + }% + \ifbxpv@read@file@ok\else + \PackageWarning\bxpv@pkgname + {File '#1' not found}% + \fi \@tfor\bxpv@x:=456789\do{% - \ifx\bxpv@x\bxpv@tmpb + \ifx\bxpv@x\bxpv@gtmpa \chardef\bxpv@mversion=\bxpv@x\relax \fi }% \fi } -\@onlypreamble\bxpv@file@mversion@b -\def\bxpv@file@mversion@b#1.pdf\bxpv@mark#2\bxpv@end{% - \ifx\bxpv@mt#2\bxpv@mt\else \bxpv@oktrue \fi -} -\@onlypreamble\bxpv@file@mversion@c -\def\bxpv@file@mversion@c{% - \@tempcnta\z@ - \loop\ifnum\@tempcnta<\@cclvi - \catcode\@tempcnta12 % - \advance\@tempcnta\@ne - \repeat - \endlinechar=32 - \catcode32=10 - \read\@inputcheck to\bxpv@tmpb - \expandafter\bxpv@file@mversion@xa\bxpv@tmpb\bxpv@end -} % some more subprocedures \@onlypreamble\bxpv@file@mversion@xa \@onlypreamble\bxpv@file@mversion@xb @@ -305,7 +489,7 @@ \begingroup \escapechar\m@ne \def\bxpv@tmpa#1\bxpv@end{% - \gdef\bxpv@file@mversion@xa##1\bxpv@end{% + \gdef\bxpv@file@mversion@xa##1{% \bxpv@file@mversion@xb##1#1\bxpv@end }% \gdef\bxpv@file@mversion@xb##1#1##2\bxpv@end{% @@ -314,7 +498,7 @@ \fi }% \gdef\bxpv@file@mversion@xc##1 ##2\bxpv@end{% - \def\bxpv@tmpb{##1}% + \gdef\bxpv@gtmpa{##1}% }% } \edef\bxpv(a)tmpb{{\expandafter\string\csname\string\%PDF-1.\endcsname}}% @@ -325,59 +509,408 @@ \ifx d\bxpv@drv@type % 'dvipdfmx' %% required packages -\RequirePackage{atbegshi}[2009/07/70] +\RequirePackage{atbegshi}[2007/04/19]% v1.2 -%% \bxpv@set@version@dvipdfmx -\@onlypreamble\bxpv@set@version@dvipdfmx -\def\bxpv@set@version@dvipdfmx{% - \ifx\bxpv@mversion\relax\else - % special added to every page +%% variables +\let\bxpv@C@value\relax + +%% \bxpv@C@bits +\@onlypreamble\bxpv@C@bits +\let\bxpv@C@bits\@empty + +%% \bxpv@page@specials +\let\bxpv@page@specials\@empty + +%% \bxpv@put@special +\@onlypreamble\bxpv@put@special +\def\bxpv@put@special#1{% + \edef\bxpv@page@specials{\bxpv@page@specials\special{#1}}% +} + +%% \bxpv@begin@document@dvipdfmx +\@onlypreamble\bxpv@begin@document@dvipdfmx +\def\bxpv@begin@document@dvipdfmx{% + % PDF version + \ifx\bxpdfverMinorVersion\relax\else + \g@addto@macro\bxpv@page@specials{% + \special{pdf:minorversion \the\bxpdfverMinorVersion}% + }% + \fi + % compression + \ifbxpdfverCompressionSuppressed + \bxpv@check@dvipdfmx@version{20160307}% + {Cannot suppress compression}% + \ifbxpv@ok + % New dvipdfmx supports this special. + \g@addto@macro\bxpv@page@specials{% + \special{dvipdfmx:config z 0}% + }% + \fi + \fi + % object compression + \ifbxpdfverObjCompressionSuppressed + \bxpv@check@dvipdfmx@version{20160307}% + {Cannot suppress object compression}% + \ifbxpv@ok + \g@addto@macro\bxpv@C@bits{\do{64}}% + \fi + \fi + % PDF decimal digits + \ifx\bxpdfverDecimalDigits\relax\else + \bxpv@check@dvipdfmx@version{20160307}% + {Cannot set PDF decimal digits}% + \ifbxpv@ok + \bxpv@put@special{dvipdfmx:config d \the\bxpdfverDecimalDigits}% + \fi + \fi + % PK resolution + \ifx\bxpdfverPkResolution\relax\else + \iffalse % This will never work.... + \bxpv@put@special{dvipdfmx:config r \the\bxpdfverPkResolution}% + \fi + \fi + % PDF destinations + \ifbxpdfverDestinationsPreserved + \bxpv@check@dvipdfmx@version{20160307}% + {Cannot preserve PDF destinations}% + \ifbxpv@ok + \g@addto@macro\bxpv@C@bits{\do{16}}% + \fi + \fi + % C option value + \ifx\bxpv@C@bits\@empty\else + \bxpv@cache@fetch{dvipdfmxcfg}% + \def\bxpv@next##1##2\bxpv@mk{\def\bxpv@C@value{##1}}% + \expandafter\bxpv@next\bxpv@cache@@dvipdfmxcfg{0}\bxpv@mk + \bxpv@rc@bitset{\bxpv@C@value}{64}% + \def\do##1{% + \bxpv@rc@bitset{\bxpv@C@value}{##1}% + \let\bxpv@C@value\bxpv@rc@num}% + \bxpv@C@bits + \bxpv@put@special{dvipdfmx:config C \bxpv@C@value}% + \fi + % special added to every page + \ifx\bxpv@page@specials\@empty\else + \edef\bxpv@page@specials{\bxpv@page@specials}% \AtBeginShipout{% \setbox\AtBeginShipoutBox=\vbox{% \baselineskip\z@skip\lineskip\z@skip\lineskiplimit\z@ - \special{pdf:minorversion \the\bxpv@mversion}% + \bxpv@page@specials \copy\AtBeginShipoutBox }% }% \fi } +%% \bxpv@check@dvipdfmx@version +\@onlypreamble\bxpv@check@dvipdfmx@version +\def\bxpv@check@dvipdfmx@version#1#2{% + \bxpv@cache@fetch{dvipdfmxver}% + \bxpv@okfalse + \ifnum\bxpv@cache@@dvipdfmxver=\z@ + \bxpv@fail + {#2, because the\MessageBreak + version of dvipdfmx in use is unknown + \MessageBreak (v.#1 or later is required)}% + \else\ifnum\bxpv@cache@@dvipdfmxver<#1 + \bxpv@fail + {#2, because the\MessageBreak + version of dvipdfmx in use (v.\bxpv@cache@@dvipdfmxver) is too old + \MessageBreak (v.#1 or later is required)}% + \else + \PackageInfo\bxpv@pkgname + {dvipdfmx version is \bxpv@cache@@dvipdfmxver\@gobble}% + \bxpv@oktrue + \fi\fi +} + \fi +%--------------------------------------- software version + +%% \bxpv@cache@get@@newtex +% Returns 1 if the version of TeX is 3.14159265 (released on +% 2014/01/20) or later, 0 otherwise. +\@onlypreamble\bxpv@cache@get@@newtex +\def\bxpv@cache@get@@newtex{% + \edef\bxpv@tmpa{\expandafter\noexpand\csname\endcsname}% + \def\bxpv@tmpb##1 ##2##3\@nil{\gdef\bxpv@g@value{##2}}% + \expandafter\bxpv@tmpb\meaning\bxpv@tmpa1 0\@nil +} + +%% \bxpv@cache@get@@dvipdfmxver +% Returns the version of dvipdfmx (eg. 20110311). +% It returns 0 in failure. +\@onlypreamble\bxpv@cache@get@@dvipdfmxver +\def\bxpv@cache@get@@dvipdfmxver{% + % Here the version of TeX is checked, bacause on old TeX + % engines on Windows, pipe inputs will fail when the + % command line has arguments. + \bxpv@cache@fetch{newtex}% + \global\let\bxpv@gtmpa\relax + \ifnum\bxpv@cache@@newtex>\z@ + \def\bxpv@tmpc{This is extractbb Version }% + \bxpv@detokenize\bxpv@tmpc + \bxpv@read@file{"|extractbb --version"}{% + \bxpv@split@at{\bxpv@tmpc}{##1}% + \ifx\bxpv@pre\relax\else + \global\let\bxpv@gtmpa\bxpv@post + \fi + }% + \fi + \ifx\bxpv@gtmpa\relax % failed somewhere + \gdef\bxpv@g@value{0}% + \else + \global\let\bxpv@g@value\bxpv@gtmpa + \fi +} + +%--------------------------------------- dvipdfmx config + +%% variables +\let\bxpv@rc@num\relax + +%% \bxpv@cache@get@@dvipdfmxcfg +\@onlypreamble\bxpv@cache@get@@dvipdfmxcfg +\def\bxpv@cache@get@@dvipdfmxcfg{% + % check TeX version + \bxpv@cache@fetch{newtex}% + \ifnum\bxpv@cache@@newtex>\z@ + % search dvipdfmx.cfg + \global\let\bxpv@gtmpa\@empty + \bxpv@read@file{% + "|kpsewhich --progname=dvipdfmx --format=othertext dvipdfmx.cfg"% + }{% + \gdef\bxpv@gtmpa{##1}% + \bxpv@read@file@finish + }% + % read the file + \ifx\bxpv@gtmpa\@empty\else + \gdef\bxpv@g@rc@tmp@C{0}% + \def\bxpv@rc@tmp@C{C }% + \bxpv@detokenize\bxpv@rc@tmp@C + \gdef\bxpv@g@rc@tmp@V{5}% + \def\bxpv@rc@tmp@V{V }% + \bxpv@detokenize\bxpv@rc@tmp@V + \bxpv@read@file{\bxpv@gtmpa}{% + \bxpv@split@at{\bxpv@rc@tmp@C}{##1}% + \ifx\bxpv@pre\@empty + \bxpv@rc@parse@num{\bxpv@post}% + \global\let\bxpv@g@rc@tmp@C\bxpv@rc@num + \fi + \bxpv@split@at{\bxpv@rc@tmp@V}{##1}% + \ifx\bxpv@pre\@empty + \bxpv@rc@parse@num{\bxpv@post}% + \global\let\bxpv@g@rc@tmp@V\bxpv@rc@num + \fi + }% + % the return value + \xdef\bxpv@g@value{{\bxpv@g@rc@tmp@C}{\bxpv@g@rc@tmp@V}}% + \fi + \fi +} + +%% \bxpv@rc@parse@num{<string>} +% Returns to \bxpv@rc@num. +\def\bxpv@rc@parse@num#1{% + \edef\bxpv@tmpy{#1\relax\relax}% + \expandafter\bxpv@rc@parse@num@a\bxpv@tmpy\bxpv@end +} +\def\bxpv@rc@parse@num@a#1#2\bxpv@end{% + % skip leading spaces and change to uppercase + \uppercase{\bxpv@rc@parse@num@b#1#2\bxpv@end}% +} +\def\bxpv@rc@parse@num@b#1#2#3\bxpv@end{% + \def\bxpv@tmpy{#1#2#3}% + \if0#1\if X#2% convert '0x' to '"' + \def\bxpv@tmpy{"#3}% + \fi\fi + \afterassignment\bxpv@rc@parse@num@c\@tempcnta=\bxpv@tmpy +} +\def\bxpv@rc@parse@num@c#1\relax{% discard trailer + \edef\bxpv@rc@num{\the\@tempcnta}% +} + +%% \bxpv@rc@bitset{<number1>}{<number2>} +% Returns to \bxpv@rc@num. +\def\bxpv@rc@bitset#1#2{% + \@tempcnta=#1\relax \divide\@tempcnta#2\relax + \@tempcnta=\ifodd\@tempcnta\z@\else#2\relax\fi + \advance\@tempcnta#1\relax + \edef\bxpv@rc@num{\the\@tempcnta}% +} + +%--------------------------------------- string splitter + +%% variables +\let\bxpv@pre\relax +\let\bxpv@post\relax + +%% \bxpv@split@at{<sep>}{<text>} +% Splits the text by the given separator. +% In success, it will set \bxpv@pre and \bxpv@post. +\def\bxpv@split@at#1#2{% + \edef\bxpv@next{{#1}{#2}}% + \expandafter\bxpv@split@at@a\bxpv@next +} +\def\bxpv@split@at@a#1#2{% + \def\bxpv@next##1#1##2\bxpv@end{% + \bxpv@split@at@b{##1}{##2}}% + \bxpv@next#2\bxpv@mk#1\bxpv@end +} +\def\bxpv@split@at@b#1#2{% + \ifx\bxpv@mt#2\bxpv@mt + \let\bxpv@pre\relax \let\bxpv@post\relax + \else + \def\bxpv@pre{#1}% + \bxpv@split@at@c#2\bxpv@end + \fi +}% +\def\bxpv@split@at@c#1\bxpv@mk#2\bxpv@end{% + \def\bxpv@post{#1}% +}% + +%--------------------------------------- file reader + +%% variables +\let\bxpv@rf@parse\relax % line parser +\let\bxpv@rf@line\relax % line content +\let\bxpv@rf@cont\relax % continue to read? + +%% \ifbxpv@read@file@ok +% Whether or not the last \bxpv@read@file succeeded. +\newboolean{bxpv@read@file@ok} + +%% \bxpv@read@file{<file-name>}{<line-parser-code>} +% Reads from a text file. The line parser takes as #1 the +% content of each line. +\def\bxpv@read@file#1{% + \bxpv@read@file@oktrue + \begingroup + \openin\@inputcheck=#1\relax + \afterassignment\bxpv@read@file@a + \def\bxpv@rf@parse##1% +} +\@onlypreamble\bxpv@read@file@a +\def\bxpv@read@file@a{% + \ifeof\@inputcheck + \aftergroup\bxpv@read@file@okfalse + \else + % freeze special characters + \@tempcnta\z@ + \loop\ifnum\@tempcnta<\@cclvi + \catcode\@tempcnta12 + \advance\@tempcnta\@ne + \repeat + \endlinechar\m@ne + % go to loop + \chardef\bxpv@rf@cont\@ne + \bxpv@read@file@b + \fi + \endgroup +} +\@onlypreamble\bxpv@read@file@b +\def\bxpv@read@file@b{% + \read\@inputcheck to\bxpv@rf@line + \bxpv@detokenize\bxpv@rf@line + \expandafter\bxpv@rf@parse\expandafter{\bxpv@rf@line}% + \ifeof\@inputcheck + \chardef\bxpv@rf@cont\z@ + \fi + \ifnum\bxpv@rf@cont>\z@ + \expandafter\bxpv@read@file@b + \fi +} + +%% \bxpv@read@file@finish +\@onlypreamble\bxpv@read@file@finish +\def\bxpv@read@file@finish{% + \chardef\bxpv@rf@cont\z@ +} + +%--------------------------------------- simple cache system +% - \bxpv@cache@xxx can be invoked only in \AtBeginDocument. +% - \bxpv@cache@finalize must be called last. + +%% \bxpv@g@value +% The return variable for fetchers. +\@onlypreamble\bxpv@g@value +\let\bxpv@g@value\@undefined + +%% \bxpv@cache@fetch{<key>} +\@onlypreamble\bxpv@cache@fetch +\def\bxpv@cache@fetch#1{% + \begingroup + \expandafter\ifx\csname bxpv@cache@@#1\endcsname\relax + \global\let\bxpv@g@value\@empty + \@nameuse{bxpv@cache@get@@#1}% + \bxpv@cache@store{#1}{\bxpv@g@value}% + \bxDebug{cache-fetch:#1=\@nameuse{bxpv@cache@@#1}}% + \fi + \endgroup +} + +%% \bxpv@cache@store{<key>}{<value>} +\def\bxpv@cache@store#1#2{% + \expandafter\ifx\csname bxpv@cache@@#1\endcsname\relax + \expandafter\xdef\csname bxpv@cache@@#1\endcsname{#2}% + \g@addto@macro\bxpv@cache@keylist{{#1}}% + \fi +} +\@onlypreamble\bxpv@cache@keylist +\let\bxpv@cache@keylist\@empty + +%% \bxpv@cache@finalize +\@onlypreamble\bxpv@cache@finalize +\def\bxpv@cache@finalize{% + \if@filesw + \ifx\bxpv@cache@keylist\@empty\else + \immediate\write\@auxout{% + \string\providecommand\string\bxpv@cache@store[2]{}}% + \fi + \def\bxpv@x{\@tfor\bxpv@x:=}% + \expandafter\bxpv@x\bxpv@cache@keylist\do{% + \immediate\write\@auxout{% + \string\bxpv@cache@store{\bxpv@x}{\@nameuse{bxpv@cache@@\bxpv@x}}}}% + \fi + \global\let\bxpv@cache@store\@gobbletwo % for end-document clear-up +} + %--------------------------------------- start-up \ifx t\bxUseDebug -\typeout{% - mversion=\meaning\bxpv@mversion^^J% - compress=\meaning\bxpv@compress^^J% - objcompress=\meaning\bxpv@obj@compress^^J% - drvtype=\meaning\bxpv@drv@type^^J% - drvname=\meaning\bxpv@drv@name^^J% - +version=\meaning\bxpv@set@version^^J% - +compress=\meaning\bxpv@suppress@compress^^J% - +objcompress=\meaning\bxpv@suppress@obj@compress^^J% -} -\ifx p\bxpv@drv@type + \typeout{**bxpdfver-----------% + ^^Jdrvtype=\meaning\bxpv@drv@type + ^^Jdrvname=\meaning\bxpv@drv@name} \AtBeginDocument{% - \def\do#1{\ifx#1\@undefined\else\the#1\fi}% - \typeout{% - pdfminorversion=\do\pdfminorversion^^J% - pdfcompresslevel=\do\pdfcompresslevel^^J% - pdfobjcompresslevel=\do\pdfobjcompresslevel^^J% + \def\do#1=#2{\ifx#2\@undefined\else + ^^J#1=\the#2 [\meaning#2]% + \fi}% + \def\next#1{\expandafter\meaning\csname if#1\endcsname}% + \typeout{**bxpdfver-----------% + ^^JMinorVersion=\meaning\bxpdfverMinorVersion + ^^JCompressionSuppressed=\next{bxpdfverCompressionSuppressed}% + ^^JObjCompressionSuppressed=\next{bxpdfverObjCompressionSuppressed}% + ^^JDecimalDigits=\meaning\bxpdfverDecimalDigits + ^^JPkResolution=\meaning\bxpdfverPkResolution + \do minorversion=\bxpv@@minorversion + \do compresslevel=\bxpv@@compresslevel + \do objcompresslevel=\bxpv@@objcompresslevel + \do decimaldigits=\bxpv@@decimaldigits + \do pkresolution=\bxpv@@pkresolution + ^^JCvalue=\meaning\bxpv@C@value }% } \fi -\fi %% Applies the setting specified by package options \ifx\bxpv@version\relax\else - \bxpv@get@mversion - \bxpv@set@version + \setpdfversion{\bxpv@version} \fi \if t\bxpv@compress\else - \bxpv@suppress@compress + \suppresspdfcompression \fi \if t\bxpv@obj@compress\else - \bxpv@suppress@obj@compress + \suppresspdfobjcompression \fi %--------------------------------------- all done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpdfver.tlpobj new/tlpkg/tlpobj/bxpdfver.tlpobj --- old/tlpkg/tlpobj/bxpdfver.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bxpdfver.tlpobj 2017-04-14 17:34:08.000000000 +0200 @@ -1,6 +1,6 @@ name bxpdfver category Package -revision 38050 +revision 43201 shortdesc Specify version and compression level of output PDF files relocated 1 longdesc This package enables users to specify in their sources the @@ -8,10 +8,10 @@ longdesc (1.4, 1.5 etc.); whether or not to compress streams; whether or longdesc not to use object streams. This package supports all major PDF- longdesc output engines and dvipdfmx. -runfiles size=3 +runfiles size=7 RELOC/tex/latex/bxpdfver/bxpdfver.sty catalogue-ctan /macros/latex/contrib/bxpdfver -catalogue-date 2015-08-08 07:23:52 +0200 -catalogue-license other-free +catalogue-date 2017-02-14 00:26:52 +0100 +catalogue-license mit catalogue-topics pdf-feat -catalogue-version 0.2a +catalogue-version 0.4 ++++++ bytefield.doc.tar.xz ++++++ ++++++ bytefield.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bytefield.tlpobj new/tlpkg/tlpobj/bytefield.tlpobj --- old/tlpkg/tlpobj/bytefield.tlpobj 2016-04-14 18:48:03.000000000 +0200 +++ new/tlpkg/tlpobj/bytefield.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=5 RELOC/tex/latex/bytefield/bytefield.sty catalogue-ctan /macros/latex/contrib/bytefield -catalogue-date 2015-10-28 22:34:48 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics engineering comp-sci comp-net catalogue-version 2.3 ++++++ c-pascal.doc.tar.xz ++++++ ++++++ c-pascal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/c-pascal.tlpobj new/tlpkg/tlpobj/c-pascal.tlpobj --- old/tlpkg/tlpobj/c-pascal.tlpobj 2016-04-14 18:48:04.000000000 +0200 +++ new/tlpkg/tlpobj/c-pascal.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/c-pascal/cap_pas.tex RELOC/tex/generic/c-pascal/cap_pyt.tex catalogue-ctan /macros/generic/c_pascal -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics listing catalogue-version 1.2 ++++++ c90.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/c90.doc.tlpobj new/tlpkg/tlpobj/c90.doc.tlpobj --- old/tlpkg/tlpobj/c90.doc.tlpobj 2016-04-14 18:48:04.000000000 +0200 +++ new/tlpkg/tlpobj/c90.doc.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -1,6 +1,6 @@ name c90.doc category Package -revision 37676 +revision 42428 shortdesc doc files of c90 relocated 1 docfiles size=22 ++++++ c90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/c90.tlpobj new/tlpkg/tlpobj/c90.tlpobj --- old/tlpkg/tlpobj/c90.tlpobj 2016-04-14 18:48:04.000000000 +0200 +++ new/tlpkg/tlpobj/c90.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -1,6 +1,6 @@ name c90 category Package -revision 37676 +revision 42428 relocated 1 runfiles size=1 RELOC/fonts/enc/dvips/c90/c90.enc ++++++ cabin.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/README new/doc/fonts/cabin/README --- old/doc/fonts/cabin/README 2016-02-26 23:37:06.000000000 +0100 +++ new/doc/fonts/cabin/README 2017-04-04 07:05:03.000000000 +0200 @@ -1,4 +1,4 @@ -This is the README for the cabin package, version 2016-02-26. +This is the README for the cabin package, version 2017-04-02. This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for the Cabin and Cabin Condensed families of sans serif fonts, designed by @@ -65,9 +65,11 @@ Macros \cabin and \cabincondensed select the Cabin and CabinCondensed font family, respectively. -The original fonts are available at http://www.google.com/webfonts 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) +The original fonts are available at +http://www.google.com/webfonts 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 and cfftot1. 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cabin.doc.tlpobj new/tlpkg/tlpobj/cabin.doc.tlpobj --- old/tlpkg/tlpobj/cabin.doc.tlpobj 2016-04-14 18:48:04.000000000 +0200 +++ new/tlpkg/tlpobj/cabin.doc.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -1,6 +1,6 @@ name cabin.doc category Package -revision 39875 +revision 43687 shortdesc doc files of cabin relocated 1 docfiles size=49 ++++++ cabin.tar.xz ++++++ Binary files old/fonts/type1/impallari/cabin/Cabin-Bold.pfb and new/fonts/type1/impallari/cabin/Cabin-Bold.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-BoldItalic.pfb and new/fonts/type1/impallari/cabin/Cabin-BoldItalic.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-Medium.pfb and new/fonts/type1/impallari/cabin/Cabin-Medium.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-MediumItalic.pfb and new/fonts/type1/impallari/cabin/Cabin-MediumItalic.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-Regular.cff and new/fonts/type1/impallari/cabin/Cabin-Regular.cff differ Binary files old/fonts/type1/impallari/cabin/Cabin-Regular.pfb and new/fonts/type1/impallari/cabin/Cabin-Regular.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-SemiBold.pfb and new/fonts/type1/impallari/cabin/Cabin-SemiBold.pfb differ Binary files old/fonts/type1/impallari/cabin/Cabin-SemiBoldItalic.pfb and new/fonts/type1/impallari/cabin/Cabin-SemiBoldItalic.pfb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cabin.tlpobj new/tlpkg/tlpobj/cabin.tlpobj --- old/tlpkg/tlpobj/cabin.tlpobj 2016-04-14 18:48:04.000000000 +0200 +++ new/tlpkg/tlpobj/cabin.tlpobj 2017-04-14 17:34:09.000000000 +0200 @@ -1,6 +1,6 @@ name cabin category Package -revision 39875 +revision 43687 shortdesc A humanist Sans Serif font, with LaTeX support relocated 1 longdesc Cabin is a humanist sans with four weights and true italics and @@ -14,7 +14,7 @@ longdesc is provided to enable Cabin as the default text font. The longdesc fontaxes package is required for use with [pdf]LaTeX. execute addMap cabin.map -runfiles size=1485 +runfiles size=1483 RELOC/fonts/enc/dvips/cabin/cbn_6vzwvh.enc RELOC/fonts/enc/dvips/cabin/cbn_7kg2sc.enc RELOC/fonts/enc/dvips/cabin/cbn_aojlca.enc @@ -261,7 +261,6 @@ RELOC/fonts/type1/impallari/cabin/Cabin-Italic.pfb RELOC/fonts/type1/impallari/cabin/Cabin-Medium.pfb RELOC/fonts/type1/impallari/cabin/Cabin-MediumItalic.pfb - RELOC/fonts/type1/impallari/cabin/Cabin-Regular.cff RELOC/fonts/type1/impallari/cabin/Cabin-Regular.pfb RELOC/fonts/type1/impallari/cabin/Cabin-SemiBold.pfb RELOC/fonts/type1/impallari/cabin/Cabin-SemiBoldItalic.pfb @@ -379,6 +378,6 @@ RELOC/tex/latex/cabin/TS1CabinCondensed-TLF.fd RELOC/tex/latex/cabin/cabin.sty catalogue-ctan /fonts/cabin -catalogue-date 2016-02-26 19:04:26 +0100 +catalogue-date 2017-04-03 05:27:02 +0200 catalogue-license ofl catalogue-topics font font-sans font-type1 font-otf ++++++ cachepic.doc.tar.xz ++++++ ++++++ cachepic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cachepic.tlpobj new/tlpkg/tlpobj/cachepic.tlpobj --- old/tlpkg/tlpobj/cachepic.tlpobj 2016-04-14 18:48:08.000000000 +0200 +++ new/tlpkg/tlpobj/cachepic.tlpobj 2017-04-14 17:34:10.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/tex/latex/cachepic/cachepic.sty texmf-dist/tex/latex/cachepic/prcachepic.def catalogue-ctan /macros/latex/contrib/cachepic -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-prep catalogue-version 1.0 ++++++ caladea.doc.tar.xz ++++++ ++++++ caladea.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/caladea.tlpobj new/tlpkg/tlpobj/caladea.tlpobj --- old/tlpkg/tlpobj/caladea.tlpobj 2016-04-14 18:48:08.000000000 +0200 +++ new/tlpkg/tlpobj/caladea.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -69,6 +69,6 @@ RELOC/tex/latex/caladea/TS1Caladea-TLF.fd RELOC/tex/latex/caladea/caladea.sty catalogue-ctan /fonts/caladea -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license apache2 catalogue-topics font font-type1 font-ttf ++++++ calcage.doc.tar.xz ++++++ ++++++ calcage.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calcage.tlpobj new/tlpkg/tlpobj/calcage.tlpobj --- old/tlpkg/tlpobj/calcage.tlpobj 2016-04-14 18:48:09.000000000 +0200 +++ new/tlpkg/tlpobj/calcage.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/calcage/calcage.sty catalogue-ctan /macros/latex/contrib/calcage -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics date-time catalogue-version 0.90 ++++++ calctab.doc.tar.xz ++++++ ++++++ calctab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calctab.tlpobj new/tlpkg/tlpobj/calctab.tlpobj --- old/tlpkg/tlpobj/calctab.tlpobj 2016-04-14 18:48:09.000000000 +0200 +++ new/tlpkg/tlpobj/calctab.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=5 RELOC/tex/latex/calctab/calctab.sty catalogue-ctan /macros/latex/contrib/calctab -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics calculation catalogue-version 0.6.1 ++++++ calculation.doc.tar.xz ++++++ ++++++ calculation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calculation.tlpobj new/tlpkg/tlpobj/calculation.tlpobj --- old/tlpkg/tlpobj/calculation.tlpobj 2016-04-14 18:48:09.000000000 +0200 +++ new/tlpkg/tlpobj/calculation.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -19,7 +19,7 @@ runfiles size=3 RELOC/tex/latex/calculation/calculation.sty catalogue-ctan /macros/latex/contrib/calculation -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 maths catalogue-version 1.0 ++++++ calculator.doc.tar.xz ++++++ ++++++ calculator.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calculator.tlpobj new/tlpkg/tlpobj/calculator.tlpobj --- old/tlpkg/tlpobj/calculator.tlpobj 2016-04-14 18:48:10.000000000 +0200 +++ new/tlpkg/tlpobj/calculator.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/calculator/calculator.sty RELOC/tex/latex/calculator/calculus.sty catalogue-ctan /macros/latex/contrib/calculator -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics calculation maths catalogue-version 2.0 ++++++ calligra-type1.doc.tar.xz ++++++ ++++++ calligra-type1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calligra-type1.tlpobj new/tlpkg/tlpobj/calligra-type1.tlpobj --- old/tlpkg/tlpobj/calligra-type1.tlpobj 2016-04-14 18:48:11.000000000 +0200 +++ new/tlpkg/tlpobj/calligra-type1.tlpobj 2017-04-14 17:34:12.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/fonts/map/dvips/calligra-type1/calligra.map RELOC/fonts/type1/public/calligra-type1/callig15.pfb catalogue-ctan /fonts/calligra-type1 -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-calligraphic font-type1 catalogue-version 001.000 ++++++ calligra.doc.tar.xz ++++++ ++++++ calligra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calligra.tlpobj new/tlpkg/tlpobj/calligra.tlpobj --- old/tlpkg/tlpobj/calligra.tlpobj 2016-04-14 18:48:10.000000000 +0200 +++ new/tlpkg/tlpobj/calligra.tlpobj 2017-04-14 17:34:11.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/fonts/tfm/public/calligra/callig15.tfm catalogue-also calligra-type1 catalogue-ctan /fonts/calligra -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-calligraphic font-mf ++++++ calrsfs.doc.tar.xz ++++++ ++++++ calrsfs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calrsfs.tlpobj new/tlpkg/tlpobj/calrsfs.tlpobj --- old/tlpkg/tlpobj/calrsfs.tlpobj 2016-04-14 18:48:11.000000000 +0200 +++ new/tlpkg/tlpobj/calrsfs.tlpobj 2017-04-14 17:34:12.000000000 +0200 @@ -8,6 +8,6 @@ RELOC/tex/latex/calrsfs/OMSrsfs.fd RELOC/tex/latex/calrsfs/calrsfs.sty catalogue-ctan /macros/latex/contrib/calrsfs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font-supp ++++++ cals.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/README new/doc/latex/cals/README --- old/doc/latex/cals/README 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/README 2017-01-21 05:01:04.000000000 +0100 @@ -4,7 +4,7 @@ with repeatable headers and footers, with cells spanned over rows and columns. Decorations are supported: padding, background color, width of separation rules. The code is compatible with -multicols and pdfsync. +multicol and bidi. The work is released to public (LaTeX license, see below) by bitplant.de GmbH, a company which provides technical @@ -16,7 +16,7 @@ README: This file. -cals.pdf: +cals.pdf, tb101parashchenko.pdf, notes.pdf: Documentation. dev/ @@ -28,15 +28,16 @@ The file "demo.pdf", produced from "demo.tex" and several include files, demonstrates features of the cals package. To re-generate demo.pdf, after you got cals.ins: - $ export TEXINPUTS=../cals: + $ ln -s ../dev/cals.sty $ pdflatex demo.tex + $ xelatex bididemo.tex -tests/ +test/ Unit tests. See "README" inside. Copyright (C) 2010 by Oleg Parashchenko <olpa uucode com> - + Files from this pacjage may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. @@ -44,5 +45,5 @@ http://www.latex-project.org/lppl.txt -and version 1.3c or later is part of all distributions of LaTeX +and version 1.3c or later is part of all distributions of LaTeX version 2006/05/20 or later. Binary files old/doc/latex/cals/cals.pdf and new/doc/latex/cals/cals.pdf differ Binary files old/doc/latex/cals/examples/bididemo.pdf and new/doc/latex/cals/examples/bididemo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/bididemo.tex new/doc/latex/cals/examples/bididemo.tex --- old/doc/latex/cals/examples/bididemo.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/examples/bididemo.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,59 @@ +\documentclass[twocolumn]{minimal} +\usepackage[paper=a5paper,landscape=true,margin=1cm, + twocolumn=true,columnsep=1cm]{geometry} +\usepackage{helvet} +\usepackage{times} +\usepackage{color} +\usepackage{fancyvrb} +\usepackage{multicol} + +\usepackage[RTLdocument]{bidi} +\usepackage{cals} + +\newcommand\newcolumn{\vfil\penalty-10000 } +\newcommand\small{\fontsize{9pt}{11pt}\selectfont} +\newcommand\Small{\fontsize{8pt}{9pt}\selectfont} +\newcommand\Large{\fontsize{12pt}{14pt}\selectfont} + +\newcommand\header[1]{\noindent{\Large\bfseries#1\strut}\par\bigskip} + +\showboxdepth=100 +\showboxbreadth=100 + +\begin{document} +\makeatletter + +\header{CALS tables demo} +\newcolumn +\parindent=0pt +by Oleg Parashchenko\par +\textless{}olpa uucode com\textgreater\par +\par +24 May 2013\par +\clearpage + +\header{Simple table} +\input biditable1 +\newcolumn +\VerbatimInput{biditable1.tex} +\clearpage + +\header{Decorations} +\input biditable2 +\newcolumn +\VerbatimInput[fontsize=\small]{biditable2.tex} +\clearpage + +\header{Cell spanning} +\input biditable3 +\newcolumn +\VerbatimInput[fontsize=\small]{biditable3.tex} +\clearpage + +\header{Multipage table (in a multicols in a table)} +\input biditable4 +\newcolumn +\VerbatimInput[fontsize=\small]{biditable4.tex} +\clearpage + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/biditable1.tex new/doc/latex/cals/examples/biditable1.tex --- old/doc/latex/cals/examples/biditable1.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/examples/biditable1.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,18 @@ +\begin{calstable} +\colwidths{{3cm}{4cm}} +\thead{ + I'm a caption in the header\par + \bfseries + \brow \cell{head 1.1}\cell{head 1.2} \erow + \brow \cell{head 2.1}\cell{head 2.2} \erow + \mdseries} + +\tfoot{ + \brow \cell{foot 1.1} \cell{foot 1.2} \erow + \lastrule + I'm a caption in the footer\par} + +\brow \cell{body 1.1}\cell{body 1.2} \erow +\brow \cell{body 2.1}\cell{body 2.2} \erow +\brow \cell{body 3.1}\cell{body 3.2} \erow +\end{calstable} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/biditable2.tex new/doc/latex/cals/examples/biditable2.tex --- old/doc/latex/cals/examples/biditable2.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/examples/biditable2.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,33 @@ +\makeatletter +\newcommand\bbrow{\brow\setbox\cals@current@row= + \hbox{\vbox to 2.9cm{}}} + +\newenvironment{decotable}{\begin{calstable} +\fontsize{15pt}{17pt}\selectfont +\cals@setpadding{Ag}\cals@setcellprevdepth{Al} +\cals@paddingL=0pt \relax +\cals@paddingR=0pt \relax +\def\cals@framecs@width{2pt} +\def\cals@rs@width{8pt} +\def\cals@cs@width{4pt} +}{\end{calstable}} + +\begin{decotable} +\colwidths{{2.9cm}{2.9cm}{2.9cm}} +\bbrow + \cell{left,\\top} + \alignC \cell{center,\\top} + \def\cals@borderL{0pt}\def\cals@borderB{0pt} + \alignR \cell{right,\\top} \erow + \let\cals@borderL=\relax \let\cals@borderB=\relax +\bbrow + \alignL \cell{\vfil left,\\middle} + \alignC \cell{\vfil center,\\middle} + \alignR \cell{\vfil right,\\middle} \erow +\bbrow + \def\cals@bgcolor{green} + \alignL \cell{\vfill left,\\bottom} + \def\cals@bgcolor{} + \alignC \cell{\vfill center,\\bottom} + \alignR \cell{\vfill right,\\bottom} \erow +\end{decotable} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/biditable3.tex new/doc/latex/cals/examples/biditable3.tex --- old/doc/latex/cals/examples/biditable3.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/examples/biditable3.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,33 @@ +\makeatletter \let\olderow=\erow +\def\erow{\ht\cals@current@row=1.3cm \olderow} + +\begin{calstable} +\def\cals@framecs@width{.4pt} +\def\cals@framers@width{.4pt} +\colwidths{{1.3cm}} +\brow + \cell{a6} \cell{b6} \cell{c6} + \cell{d6} \cell{e6} \cell{f6} \erow +\brow + \cell{a5} \nullcell{ltb} \nullcell{tb} + \nullcell{rtb}\spancontent{b5, c5, d5} + \nullcell{ltr} \cell{f5} \erow +\brow + \cell{a4} \nullcell{ltr} \nullcell{tl} + \nullcell{tr} \nullcell{lr} \cell{f4} \erow +\brow + \cell{a3} \nullcell{lr} \nullcell{lb} + \nullcell{rb}\spancontent{c3, c4, d3, d4} + \nullcell{lrb}\spancontent{e3, e4, e5} + \cell{f3} \erow +\brow + \cell{a2} + \nullcell{lrb}\spancontent{b2, b3, b4} + \nullcell{ltb} \nullcell{tb} + \nullcell{tbr}\spancontent{c2, d2, e2} + \cell{f2} \erow +\brow + \cell{a1} \cell{b1} \cell{c1} + \cell{d1} \cell{e1} \cell{f1} \erow +\end{calstable} +\let\erow=\olderow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/biditable4.tex new/doc/latex/cals/examples/biditable4.tex --- old/doc/latex/cals/examples/biditable4.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/examples/biditable4.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,32 @@ +\begin{calstable} +\colwidths{{1cm}{7cm}{1cm}} +\brow \cell{x} \cell{x} \cell{x} \erow +\brow \cell{x} \cell{ +\columnsep=0cm\relax +% Force multicols to regard our \leftskip +% by pretending that we are a list. +\@totalleftmargin=\cals@paddingL\relax +\begin{multicols}{2} + +\begin{calstable} +\alignR +\colwidths{{1.5cm}{1.5cm}} +\thead{\brow \cell{$n$}\cell{$n^2$} \erow} +\tfoot{\brow \cell{$n$}\cell{$n^2$} \erow} +\brow \cell{2} \cell{4} \erow +\brow \cell{3} \cell{9} \erow +\brow \cell{4} \cell{16} \erow +\brow \cell{5} \cell{25} \erow +\brow \cell{6} \cell{36} \erow +\tbreak{\break } +\brow \cell{7} \cell{49} \erow +\brow \cell{8} \cell{64} \erow +\brow \cell{9} \cell{81} \erow +\brow \cell{10} \cell{100} \erow +\brow \cell{11} \cell{121} \erow +\end{calstable} + +\end{multicols} +} \cell{x} \erow +\brow \cell{x} \cell{x} \cell{x} \erow +\end{calstable} Binary files old/doc/latex/cals/examples/demo.pdf and new/doc/latex/cals/examples/demo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/examples/demo.tex new/doc/latex/cals/examples/demo.tex --- old/doc/latex/cals/examples/demo.tex 2013-05-29 00:11:43.000000000 +0200 +++ new/doc/latex/cals/examples/demo.tex 2016-11-26 01:09:04.000000000 +0100 @@ -8,14 +8,6 @@ \usepackage{fancyvrb} \usepackage{multicol} \usepackage{cals} -\usepackage{pdfsync} - -% pdfsync setup. The command \pdfsyncstart is not defined yet, -% therefore I use "def" instead of "let". -\makeatletter -\let\oldcalstable=\calstable -\def\calstable{\oldcalstable\pdfsyncstop} -\def\cals@AtBeginCell{\pdfsyncstart} \newcommand\newcolumn{\vfil\penalty-10000 } \newcommand\small{\fontsize{9pt}{11pt}\selectfont} Binary files old/doc/latex/cals/notes.pdf and new/doc/latex/cals/notes.pdf differ Binary files old/doc/latex/cals/tb101parashchenko.pdf and new/doc/latex/cals/tb101parashchenko.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/README new/doc/latex/cals/test/README --- old/doc/latex/cals/test/README 2013-05-29 00:11:43.000000000 +0200 +++ new/doc/latex/cals/test/README 2016-11-26 01:09:04.000000000 +0100 @@ -9,6 +9,7 @@ Expect that the tests in the directory "visual_tables" fail. Depending on the OS and TeX distro version, the font drawing might look different. +17 Nov 2014: the tests in "visual_tables" are disabled. Probably I need to package the unit testing code as a separate package and publish an article about it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_060_alignment.chk new/doc/latex/cals/test/regression/test_060_alignment.chk --- old/doc/latex/cals/test/regression/test_060_alignment.chk 2013-05-29 00:11:43.000000000 +0200 +++ new/doc/latex/cals/test/regression/test_060_alignment.chk 2016-11-26 01:09:04.000000000 +0100 @@ -12,7 +12,6 @@ ..\glue 50.0 ..\vbox(100.0+0.0)x240.0 [] ..\glue 0.0 -.\glue 0.0 .\penalty 10000 .\vbox(0.0+0.0)x290.0 ..\hbox(50.0+0.0)x290.0 [] @@ -26,6 +25,7 @@ ..\glue 50.0 ..\hbox(50.0+0.0)x240.0 [] ..\glue 0.0 +.\penalty 10000 .\hbox(0.0+0.0)x290.0 ..\glue 50.0 ..\glue -0.2 @@ -48,7 +48,6 @@ ..\glue 0.0 plus 1.0fil ..\vbox(100.0+0.0)x240.0 [] ..\glue 0.0 plus 1.0fil -.\glue 0.0 .\penalty 10000 .\vbox(0.0+0.0)x400.0 ..\hbox(50.0+0.0)x400.0, glue set 80.0fil [] @@ -62,6 +61,7 @@ ..\glue 0.0 plus 1.0fil ..\hbox(50.0+0.0)x240.0 [] ..\glue 0.0 plus 1.0fil +.\penalty 10000 .\hbox(0.0+0.0)x400.0, glue set 80.0fil ..\glue 0.0 plus 1.0fil ..\glue -0.2 @@ -84,7 +84,6 @@ ..\glue 0.0 plus 1.0fil ..\vbox(100.0+0.0)x240.0 [] ..\glue 0.0 -.\glue 0.0 .\penalty 10000 .\vbox(0.0+0.0)x400.0 ..\hbox(50.0+0.0)x400.0, glue set 160.0fil [] @@ -98,6 +97,7 @@ ..\glue 0.0 plus 1.0fil ..\hbox(50.0+0.0)x240.0 [] ..\glue 0.0 +.\penalty 10000 .\hbox(0.0+0.0)x400.0, glue set 160.0fil ..\glue 0.0 plus 1.0fil ..\glue -0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_060_alignment.tex new/doc/latex/cals/test/regression/test_060_alignment.tex --- old/doc/latex/cals/test/regression/test_060_alignment.tex 2013-05-29 00:11:43.000000000 +0200 +++ new/doc/latex/cals/test/regression/test_060_alignment.tex 2016-11-26 01:09:04.000000000 +0100 @@ -1,6 +1,6 @@ \def\w{\ht\cals@current@row=50pt\relax} \def\mktable{% -\begin{calstable} +\begin{calstable}[n] \colwidths{{70pt}{80pt}{90pt}} \def\cals@framecs@width{\cals@cs@width} \def\cals@framers@width{\cals@rs@width} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_070_clean_backup_row.chk new/doc/latex/cals/test/regression/test_070_clean_backup_row.chk --- old/doc/latex/cals/test/regression/test_070_clean_backup_row.chk 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_070_clean_backup_row.chk 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1 @@ +> the letter Y. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_070_clean_backup_row.tex new/doc/latex/cals/test/regression/test_070_clean_backup_row.tex --- old/doc/latex/cals/test/regression/test_070_clean_backup_row.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_070_clean_backup_row.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,18 @@ +% +% Collision of two tables when a table is started in an unexpected moment +% http://tex.stackexchange.com/questions/167400/fancyhdr-and-cals-vertical-me… +% + +\setbox\cals@backup@row=\hbox{nonsense} + +\begin{calstable} +\colwidths{{90pt}} +\brow +\nullcell{ltr} +\erow +\brow +\nullcell{lbr}\spancontent{spanned} +\erow +\end{calstable} + +\show Y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk new/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk --- old/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,14 @@ +% +% Between the 2&3 rows with a vertically straddled cell +% +> \cals@last@rs@below=macro: +->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}. +> \cals@current@rs@above=macro: +->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}. +% +% Between the first row and the straddled 2&3 +% +> \cals@last@rs@below=macro: +->{{100pt}{0.4pt}{0.4pt}{0.4pt}}{{100pt}{0.4pt}{0.4pt}{0.4pt}}. +> \cals@current@rs@above=macro: +->{{100pt}{0pt}{0pt}{0pt}}{{100pt}{0pt}{0pt}{0pt}}. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex new/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex --- old/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,38 @@ +% http://tex.stackexchange.com/questions/159814/miss-the-bottom-line-of-the-f… + +% The first row should be inside a border, because the rules are +% switched off after the row is made. However, the straddled rows +% "forget" about the first row decoration. Fix it. + +% Mock +\renewcommand\cals@rs@joinTwo[3]{\show#2\show#3} + +\begin{calstable} +\colwidths{{100pt}{100pt}} +\def\cals(a)borderT{0.4pt} +\def\cals(a)borderB{0.4pt} +\def\cals(a)borderL{0.4pt} +\def\cals(a)borderR{0.4pt} + +\brow +\cell{head1} +\cell{head2} +\erow + +\def\cals@borderT{0pt} +\def\cals@borderB{0pt} +\def\cals@borderL{0pt} +\def\cals@borderR{0pt} + +\brow +\nullcell{ltr} +\cell{text 2} +\erow + +\brow +\nullcell{blr} +\spancontent{2} +\cell{text 2} +\erow + +\end{calstable} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk new/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk --- old/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,4 @@ +> \cals@last@context=the letter n. +> \cals@last@context=the letter b. +> \cals@last@context=the letter b. +> \cals@last@context=the letter b. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex new/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex --- old/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex 2016-11-26 01:09:04.000000000 +0100 @@ -0,0 +1,46 @@ +% Don't break inside a float + +% Mock +\let\issue@orig=\cals@issue@row +\renewcommand\cals@issue@row{% +\show\cals@last@context +\issue@orig} + +% Start float at the end of page, so that the table breaking code +% think it should split over page. +Start of text\par +\dimen0=\pagegoal\relax +\advance\dimen0 by -5cm\relax +\vskip\dimen0\relax +here we are\par + +\newcommand\www{\ht\cals@current@row=2.5cm} + +\vbox{% +\begin{calstable} +\colwidths{{0.25in}{1.5in}{1.5in}{1.5in}} +% +\brow \cell{}\cell{C1}\cell{C2}\cell{C3} \www\erow +% +\brow +\cell{R} +\cell{r1c1} +\cell{r1c2} +\cell{r1c3} +\www\erow +% +\brow \nullcell{lrt} +\cell{r2c1} +\cell{r2c2} +\cell{r2c3} +\www\erow +% +\brow +\nullcell{lrb}\spancontent{S} +\cell{r3c1} +\cell{r3c2} +\cell{r3c3} +\www\erow +\end{calstable} +}% vbox +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex new/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex --- old/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex 2017-01-21 05:01:04.000000000 +0100 @@ -0,0 +1,32 @@ +% Allow table in colspan +% No warnings are expected: +% You can't use `\\prevdepth' in horizontal mode. +% Missing $ inserted. +% etc. + +\par +\begin{calstable} +\colwidths{{1in}{1in}{1in}{1in}} +\brow +\cell{normal} +\tracingall + +\nullcell{ltb} +\nullcell{rtb} +\spancontent{ + xxx\par + + \begin{calstable} + \colwidths{{1in}} + \brow\cell{inner table}\erow + \end{calstable} +} +\par + +\cell{normal} +%\tracingall +%\par +\erow +\end{calstable} + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/support/LatexTest.py new/doc/latex/cals/test/support/LatexTest.py --- old/doc/latex/cals/test/support/LatexTest.py 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/support/LatexTest.py 2016-11-26 01:09:04.000000000 +0100 @@ -154,7 +154,7 @@ expected_png = os.path.join(module, png) got_png = os.path.join(tmp_dir, png) diff_png = os.path.join(tmp_dir, 'diff.png') - cmd = "compare -metric RMSE %s %s %s 2>%s" % (expected_png, got_png, diff_png, os.path.join(tmp_dir, 'compare-stdout')) + cmd = "compare compare -metric RMSE %s %s %s 2>%s" % (expected_png, got_png, diff_png, os.path.join(tmp_dir, 'compare-stdout')) os.system(cmd) h = open(os.path.join(tmp_dir, 'compare-stdout')) s = h.read() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/support/run_tests.py new/doc/latex/cals/test/support/run_tests.py --- old/doc/latex/cals/test/support/run_tests.py 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/support/run_tests.py 2016-11-26 01:09:04.000000000 +0100 @@ -23,6 +23,7 @@ if len(sys.argv) > 1: filter = sys.argv[1] test_files = glob.glob('*/test_*.tex') +test_files = [x for x in test_files if 'visual_tables' not in x] modules_and_tests = {} for fname in test_files: (dir, basename) = os.path.split(fname) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/table/test_40_issuerow.chk new/doc/latex/cals/test/table/test_40_issuerow.chk --- old/doc/latex/cals/test/table/test_40_issuerow.chk 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/table/test_40_issuerow.chk 2016-11-26 01:09:04.000000000 +0100 @@ -25,3 +25,4 @@ ....\rule(20.0+0.0)x200.0 ....\glue 0.0 plus 1.0fil ..\glue 0.0 +.\penalty 10000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/table/test_50_row.chk new/doc/latex/cals/test/table/test_50_row.chk --- old/doc/latex/cals/test/table/test_50_row.chk 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/table/test_50_row.chk 2016-11-26 01:09:04.000000000 +0100 @@ -47,11 +47,13 @@ ....\rule(20.0+0.0)x200.0 ....\glue 0.0 plus 1.0fil ..\glue 0.0 -% -% Output procesure forcing -% -.\glue 0.0 .\penalty 10000 +% % +% % Output procesure forcing +% % 18.11.2016: conditionally +% % +% .\glue 0.0 +% .\penalty 10000 % % Row 2, colsep % @@ -97,3 +99,4 @@ ....\rule(40.0+0.0)x200.0 ....\glue 0.0 plus 1.0fil ..\glue 0.0 +.\penalty 10000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/table/test_70_lrskip.chk new/doc/latex/cals/test/table/test_70_lrskip.chk --- old/doc/latex/cals/test/table/test_70_lrskip.chk 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/table/test_70_lrskip.chk 2016-11-26 01:09:04.000000000 +0100 @@ -22,8 +22,6 @@ ....\glue 0.0 plus 1.0fil ....\glue 0.0 ..\glue 150.0 -% thead+row1 break workaround -.\glue 0.0 .\penalty 10000 % rowsep .\hbox(0.0+0.0)x300.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cals/test/template.txt new/doc/latex/cals/test/template.txt --- old/doc/latex/cals/test/template.txt 2010-10-09 00:55:52.000000000 +0200 +++ new/doc/latex/cals/test/template.txt 2016-11-26 01:09:04.000000000 +0100 @@ -15,6 +15,7 @@ \input{decor.dtx} \input{colsep.dtx} \input{rowsep.dtx} +\input{rtl.dtx} \fi % Variables defined inside calstable environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cals.doc.tlpobj new/tlpkg/tlpobj/cals.doc.tlpobj --- old/tlpkg/tlpobj/cals.doc.tlpobj 2016-04-14 18:48:11.000000000 +0200 +++ new/tlpkg/tlpobj/cals.doc.tlpobj 2017-04-14 17:34:12.000000000 +0200 @@ -1,17 +1,25 @@ name cals.doc category Package -revision 30784 +revision 43003 shortdesc doc files of cals relocated 1 -docfiles size=214 +docfiles size=259 RELOC/doc/latex/cals/README RELOC/doc/latex/cals/cals.pdf + RELOC/doc/latex/cals/examples/bididemo.pdf + RELOC/doc/latex/cals/examples/bididemo.tex + RELOC/doc/latex/cals/examples/biditable1.tex + RELOC/doc/latex/cals/examples/biditable2.tex + RELOC/doc/latex/cals/examples/biditable3.tex + RELOC/doc/latex/cals/examples/biditable4.tex RELOC/doc/latex/cals/examples/demo.pdf RELOC/doc/latex/cals/examples/demo.tex RELOC/doc/latex/cals/examples/table1.tex RELOC/doc/latex/cals/examples/table2.tex RELOC/doc/latex/cals/examples/table3.tex RELOC/doc/latex/cals/examples/table4.tex + RELOC/doc/latex/cals/notes.pdf + RELOC/doc/latex/cals/tb101parashchenko.pdf RELOC/doc/latex/cals/test/README RELOC/doc/latex/cals/test/cell/test_10_create.chk RELOC/doc/latex/cals/test/cell/test_10_create.tex @@ -59,6 +67,14 @@ RELOC/doc/latex/cals/test/regression/test_060_alignment.tex RELOC/doc/latex/cals/test/regression/test_065_alignment.chk RELOC/doc/latex/cals/test/regression/test_065_alignment.tex + RELOC/doc/latex/cals/test/regression/test_070_clean_backup_row.chk + RELOC/doc/latex/cals/test/regression/test_070_clean_backup_row.tex + RELOC/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.chk + RELOC/doc/latex/cals/test/regression/test_075_vstraddled_retain_rowsep.tex + RELOC/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.chk + RELOC/doc/latex/cals/test/regression/test_080_never_pagebreak_in_float.tex + RELOC/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk + RELOC/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex RELOC/doc/latex/cals/test/rowsep/test_10_waitrule.chk RELOC/doc/latex/cals/test/rowsep/test_10_waitrule.tex RELOC/doc/latex/cals/test/rowsep/test_15_waitover.chk ++++++ cals.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cals/cals.sty new/tex/latex/cals/cals.sty --- old/tex/latex/cals/cals.sty 2013-05-29 00:11:43.000000000 +0200 +++ new/tex/latex/cals/cals.sty 2017-01-21 05:01:05.000000000 +0100 @@ -12,6 +12,7 @@ %% decor.dtx (with options: `package') %% colsep.dtx (with options: `package') %% rowsep.dtx (with options: `package') +%% rtl.dtx (with options: `package') %% %% This is a generated file. %% @@ -29,7 +30,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{cals} - [2013/05/24 CALS tables v.2.2] + [2016/11/23 CALS tables v.2.4.2] + \newcommand\cals@cell[3]{} @@ -73,11 +75,11 @@ \newcommand\spancontent[1]{} \def\spancontent{% -\let\cals@tmp=\cals@celll@end +\let\cals@tmp@celll=\cals@celll@end \let\cals@cell@width=\cals@span@width \def\cals@celll@end{% \cals@width@cell@put@row% - \let\cals@celll@end=\cals@tmp}% + \let\cals@celll@end=\cals@tmp@celll}% \setbox0=\cals@cell{\cals@span@width}{\cals@span@height}% }%{Implicit content} @@ -106,16 +108,21 @@ \cals@paddingD=\dimen0 } \newcommand\alignL{% -\dimen0=\cals@paddingL \cals@paddingL=\dimen0 \relax -\dimen0=\cals@paddingR \cals@paddingR=\dimen0 \relax} +\cals@vfillDrop\cals@paddingL +\cals@vfillDrop\cals@paddingR} \newcommand\alignC{% -\dimen0=\cals@paddingL \cals@paddingL=\dimen0 plus 1fill\relax -\dimen0=\cals@paddingR \cals@paddingR=\dimen0 plus 1fill\relax} +\cals@vfillAdd\cals@paddingL +\cals@vfillAdd\cals@paddingR} \newcommand\alignR{% -\dimen0=\cals@paddingL \cals@paddingL=\dimen0 plus 1fill\relax -\dimen0=\cals@paddingR \cals@paddingR=\dimen0 \relax} +\cals@vfillAdd\cals@paddingL +\cals@vfillDrop\cals@paddingR} + +\newcommand\cals@vfillAdd[1]{\ifnum\gluestretchorder#1>1\relax\else +\dimen0=#1\relax #1=\dimen0 plus 1fill\relax \fi} +\newcommand\cals@vfillDrop[1]{\ifnum\gluestretchorder#1>0\relax +\dimen0=#1\relax #1=\dimen0\relax \fi} \newbox\cals@current@row @@ -260,10 +267,20 @@ \let\cals@current@rs@below=\cals@backup@rs@below \let\cals@current@context=\cals@backup@context \fi\fi\fi +\ifdim\wd\cals@current@row>\hsize\relax +\def\cals@tohsize{}% +\fi \cals@issue@row \ifx b\cals@last@context - \ifx h\cals@last@context@bak \vskip0pt \penalty10000 \fi - \ifx n\cals@last@context@bak \vskip0pt \penalty10000 \fi + {\dimen0=\pagetotal\relax + \advance\dimen0 by \cals@tfoot@height\relax + \advance\dimen0 by -\pagegoal + \ifdim\dimen0>0pt\relax + \vskip\dimen0 + \penalty9999 % with 10000, the output page builder is not called + \vskip-\dimen0\relax + \fi + }% \fi } @@ -272,6 +289,7 @@ \setbox\cals@backup@row=\vbox{\box\cals@current@row}% \setbox\cals@backup@cs=\box\cals@current@cs \let\cals@backup@rs@above=\cals@current@rs@above + \let\cals@backup@last@rs@below=\cals@last@rs@below \let\cals@backup@context=\cals@last@context \cals@backup@leftskip=\leftskip\relax \cals@backup@rightskip=\rightskip\relax @@ -287,6 +305,7 @@ \setbox\cals@current@row=\box\cals@backup@row \setbox\cals@current@cs=\box\cals@backup@cs \let\cals@current@rs@above=\cals@backup@rs@above + \let\cals@last@rs@below=\cals@backup@last@rs@below \let\cals@last@context=\cals@backup@context \leftskip=\cals@backup@leftskip \rightskip=\cals@backup@rightskip @@ -308,22 +327,23 @@ \let\cals@tmp=\cals@iffalse \let\cals@tmpII=\cals@iftrue \ifx\relax\cals@tbreak@tokens - \ifx h\cals@current@context \else - \ifx f\cals@current@context \else - \ifx h\cals@last@context \else - \ifx n\cals@last@context \else - \dimen0=\pagetotal\relax - \advance\dimen0 by \ht\cals@current@row\relax - %\showthe\ht\cals@current@row\relax - \ifx \cals@tfoot@tokens\relax \else - %\show\cals@tfoot@height\relax - \advance\dimen0 by \cals@tfoot@height\relax - \fi - %\showthe\dimen0\relax - \ifdim \dimen0>\pagegoal\relax - \let\cals@tmp=\cals@tmpII - \fi - \fi\fi\fi\fi + \ifinner\else + \ifx h\cals@current@context \else + \ifx f\cals@current@context \else + \ifx h\cals@last@context \else + \ifx n\cals@last@context \else + \dimen0=\pagetotal\relax + \advance\dimen0 by \ht\cals@current@row\relax + %\showthe\ht\cals@current@row\relax + \ifx \cals@tfoot@tokens\relax \else + %\show\cals@tfoot@height\relax + \advance\dimen0 by \cals@tfoot@height\relax + \fi + %\showthe\dimen0\relax + \ifdim \dimen0>\pagegoal\relax + \let\cals@tmp=\cals@tmpII + \fi + \fi\fi\fi\fi\fi \else \let\cals@tmp=\cals@tmpII % tbreak@tokens \fi \cals@tmp} @@ -346,11 +366,11 @@ \newcommand\cals@issue@rowsep@alone{% \setbox0=\cals@hbox\cals@tohsize{% - \hskip\leftskip + \cals@hskip@lr\leftskip\rightskip \cals@rs@sofar@reset \cals@rs@joinOne\cals@framers@width\cals@current@rs@above \cals@rs@sofar@end - \hskip\rightskip}% + \cals@hskip@lr\rightskip\leftskip}% \ht0=0pt \dp0=0pt \box0 } \newcommand\cals@issue@rowsep{% @@ -359,11 +379,11 @@ \let\cals@tmpIII=\cals@rs@width \else \let\cals@tmpIII=\cals@bodyrs@width \fi \setbox0=\cals@hbox\cals@tohsize{% - \hskip\leftskip + \cals@hskip@lr\leftskip\rightskip \cals@rs@sofar@reset \cals@rs@joinTwo\cals@tmpIII\cals@last@rs@below\cals@current@rs@above \cals@rs@sofar@end - \hskip\rightskip}% + \cals@hskip@lr\rightskip\leftskip}% \ht0=0pt \dp0=0pt \box0 % \fi} @@ -371,24 +391,29 @@ \newcommand\cals@issue@row{% \nointerlineskip -\setbox0=\vtop{\cals@hbox\cals@tohsize{\hskip\leftskip \box\cals@current@cs \hskip\rightskip}}% +\setbox0=\vtop{\cals@hbox\cals@tohsize{\cals@hskip@lr\leftskip\rightskip +\box\cals@current@cs \cals@hskip@lr\rightskip\leftskip}}% \ht0=0pt\relax\box0 \nointerlineskip \cals@issue@rowsep \nointerlineskip -\cals@hbox\cals@tohsize{\hskip\leftskip \box\cals@current@row \hskip\rightskip}% +\cals@hbox\cals@tohsize{\cals@hskip@lr\leftskip\rightskip +\box\cals@current@row \cals@hskip@lr\rightskip\leftskip}% \let\cals@last@rs@below=\cals@current@rs@below -\let\cals@last@context=\cals@current@context} +\let\cals@last@context=\cals@current@context +\nobreak} -\newenvironment{calstable}{% +\newenvironment{calstable}[1][\cals@table@alignment]{% +\if@RTL\@RTLtabtrue\cals@activate@rtl\fi \let\cals@thead@tokens=\relax \let\cals@tfoot@tokens=\relax \let\cals@tbreak@tokens=\relax \cals@tfoot@height=0pt \relax \let\cals@last@context=n% \let\cals@current@context=b% -\parindent=0pt % +\parindent=0pt \relax% +\cals@setup@alignment{#1}% \cals@setpadding{Ag}\cals@setcellprevdepth{Al}\cals@set@tohsize% %% Alignment inside is independent on center/flushright outside \parfillskip=0pt plus1fil\relax @@ -396,6 +421,7 @@ \let\cals@borderR=\relax \let\cals@borderT=\relax \let\cals@borderB=\relax +\setbox\cals@backup@row=\box\voidb@x\relax \cals@AtBeginTable }{% End of the table \cals@tfoot@tokens\lastrule\cals@AtEndTable} @@ -424,6 +450,8 @@ \newcommand\tbreak[1]{\def\cals@tbreak@tokens{#1}} +\newcommand\cals@table@alignment{l} + \def\llt@cons#1#2{% \toks0=\expandafter{#1}% \toks2=\expandafter{#2}% @@ -717,6 +745,28 @@ \cals@rs@sofar@next\cals@tmpL\cals@tmpBl\cals@tmpBr\cals@width \fi\next}% \expandafter\next#2\eol} + +\def\next{% + \let\if@RTL=\iffalse + \let\if@RTLtab=\iffalse + \let\@RTLtabtrue=\relax +} +\ifdefined\if@RTL \relax \else \next \fi + +\newcommand\cals@setup@alignment[1]{% +\if c#1\relax \cals@vfillAdd \leftskip \cals@vfillAdd \rightskip \fi +\if@RTL + \if l#1\relax \cals@vfillAdd \leftskip \cals@vfillDrop\rightskip \fi + \if r#1\relax \cals@vfillDrop\leftskip \cals@vfillDrop\rightskip \fi +\else + \if l#1\relax \cals@vfillDrop\leftskip \cals@vfillDrop\rightskip \fi + \if r#1\relax \cals@vfillAdd \leftskip \cals@vfillDrop\rightskip \fi +\fi +} + +\newcommand\cals@hskip@lr[2]{% +\if@RTL \hskip#2\relax \else \hskip#1\relax \fi} + \endinput %% %% End of file `cals.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cals.tlpobj new/tlpkg/tlpobj/cals.tlpobj --- old/tlpkg/tlpobj/cals.tlpobj 2016-04-14 18:48:11.000000000 +0200 +++ new/tlpkg/tlpobj/cals.tlpobj 2017-04-14 17:34:12.000000000 +0200 @@ -1,18 +1,18 @@ name cals category Package -revision 30784 +revision 43003 shortdesc Multipage tables with wide range of features relocated 1 -longdesc The package allows the user to typeset multipage tables with -longdesc repeatable headers and footers, and with cells spanned over -longdesc rows and columns. Decorations are supported: padding, -longdesc background color, width of separation rules. The package is -longdesc compatible with multicol and pdfsync. -runfiles size=5 +longdesc The package is a set of macros to typeset multipage tables with +longdesc repeatable headers and footers, with cells spanned over rows +longdesc and columns. Decorations are supported: padding, background +longdesc color, width of separation rules. The code is compatible with +longdesc multicol and bidi. +runfiles size=6 RELOC/tex/latex/cals/cals.sty catalogue-also longtable supertabular catalogue-ctan /macros/latex/contrib/cals -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-01-20 11:13:03 +0100 catalogue-license lppl1.3 catalogue-topics table table-long -catalogue-version 2.2 +catalogue-version 2.4.2 ++++++ calxxxx-yyyy.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/calxxxx-yyyy/README new/doc/latex/calxxxx-yyyy/README --- old/doc/latex/calxxxx-yyyy/README 2015-12-31 23:38:40.000000000 +0100 +++ new/doc/latex/calxxxx-yyyy/README 2017-01-03 01:01:07.000000000 +0100 @@ -1,4 +1,4 @@ -README for calxxxx-yyyy, 2016/01/01, v1.0i +README for calxxxx-yyyy, 2017/01/01, v20.17a TABLE OF CONTENTS @@ -17,8 +17,8 @@ ============== To print a calendar for some given years, use the \textsf{calxxxx-yyyy.tex} -file. LaTeXe it, type in the year to start with (for example 2016), the -year to end with (for example 2033), and the calendars for those years are +file. LaTeXe it, type in the year to start with (for example 2017), the +year to end with (for example 2034), and the calendars for those years are produced. It is possible to print the calendars in different languages. @@ -50,8 +50,8 @@ Also a ZIP file is provided that contains the files: the manual (README.tex, README.pdf), the compiled examples -(cal2016-2033_DE.pdf, cal2016-2033_DK.pdf, and -cal2016-2033_EN.pdf), calxxxx-yyyy.tex, +(cal2017-2034_DE.pdf, cal2017-2034_DK.pdf, and +cal2017-2034_EN.pdf), calxxxx-yyyy.tex, and this README, already sorted in a TDS tree: http://mirrors.ctan.org/install/macros/latex/contrib/calxxxx-yyyy.tds.zip @@ -90,8 +90,8 @@ e) Copy the documentation files to "TDS:doc/latex/calxxxx-yyyy/": README, README.tex, README.pdf - (and e.g. cal2016-2033_DE.pdf, cal2016-2033_DK.pdf, - and cal2016-2033_EN.pdf). + (and e.g. cal2017-2034_DE.pdf, cal2017-2034_DK.pdf, + and cal2017-2034_EN.pdf). 4 ADDITIONAL PACKAGES Binary files old/doc/latex/calxxxx-yyyy/README.pdf and new/doc/latex/calxxxx-yyyy/README.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/calxxxx-yyyy/README.tex new/doc/latex/calxxxx-yyyy/README.tex --- old/doc/latex/calxxxx-yyyy/README.tex 2015-12-31 23:38:40.000000000 +0100 +++ new/doc/latex/calxxxx-yyyy/README.tex 2017-01-03 01:01:07.000000000 +0100 @@ -16,13 +16,13 @@ ]{hyperref}[2012/11/06]% v6.83m \begin{document} \section*{\texttt{ReadMe} for cal$xxxx-yyyy$.tex file} -Version: v1.0i\newline -Date: 2016/01/01\newline -\copyright{} 2010 - 2016 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)\newline +Version: v20.17a\newline +Date: 2017/01/01\newline +\copyright{} 2010 - 2017 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)\newline Some old versions have been archived at\newline \url{https://ctanhg.scharrer-online.de/pkg/calxxxx-yyyy.html}. -This file explains the use of the \textsf{calxxxx-yyyy.tex} file, +\noindent This file explains the use of the \textsf{calxxxx-yyyy.tex} file, available at\newline \url{https://www.ctan.org/pkg/calxxxx-yyyy}.\newline \noindent For information about possible modifications and the mathematical background @@ -32,7 +32,7 @@ \hspace*{-1.98471pt}To print a calendar for some given years, use the \textsf{calxxxx-yyyy.tex} file. \LaTeXe{} it, type in the year to start with -(for example 2016), the year to end with (for example 2033), and the calendars +(for example 2017), the year to end with (for example 2034), and the calendars for those years are produced. It is possible to print the calendars in different languages. Currently Binary files old/doc/latex/calxxxx-yyyy/cal2016-2033_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2016-2033_DE.pdf differ Binary files old/doc/latex/calxxxx-yyyy/cal2016-2033_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2016-2033_DK.pdf differ Binary files old/doc/latex/calxxxx-yyyy/cal2016-2033_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2016-2033_EN.pdf differ Binary files old/doc/latex/calxxxx-yyyy/cal2017-2034_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2017-2034_DE.pdf differ Binary files old/doc/latex/calxxxx-yyyy/cal2017-2034_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2017-2034_DK.pdf differ Binary files old/doc/latex/calxxxx-yyyy/cal2017-2034_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2017-2034_EN.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj --- old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2016-04-14 18:48:12.000000000 +0200 +++ new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2017-05-01 02:06:51.000000000 +0200 @@ -1,12 +1,12 @@ name calxxxx-yyyy.doc category Package -revision 39245 +revision 44131 shortdesc doc files of calxxxx-yyyy relocated 1 docfiles size=108 RELOC/doc/latex/calxxxx-yyyy/README RELOC/doc/latex/calxxxx-yyyy/README.pdf RELOC/doc/latex/calxxxx-yyyy/README.tex - RELOC/doc/latex/calxxxx-yyyy/cal2016-2033_DE.pdf - RELOC/doc/latex/calxxxx-yyyy/cal2016-2033_DK.pdf - RELOC/doc/latex/calxxxx-yyyy/cal2016-2033_EN.pdf + RELOC/doc/latex/calxxxx-yyyy/cal2017-2034_DE.pdf + RELOC/doc/latex/calxxxx-yyyy/cal2017-2034_DK.pdf + RELOC/doc/latex/calxxxx-yyyy/cal2017-2034_EN.pdf ++++++ calxxxx-yyyy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex --- old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2015-12-31 23:38:40.000000000 +0100 +++ new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2017-01-03 01:01:17.000000000 +0100 @@ -1,8 +1,8 @@ % calxxx-yyyy.tex -% version: v1.0i -% date: 2016/01/01 +% version: v20.17a +% date: 2017/01/01 % -% Copyright (C) 2010 - 2016 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de) +% Copyright (C) 2010 - 2017 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de) % Portions of code copyrighted by Slobodan Jankovi\'{c}. % This file was invented in 1999 by Slobodan Jankovi\'{c}. % I was not able to reach him at slobodan(a)archimed.filfak.ni.ac.yu @@ -21,7 +21,7 @@ % no style file and the original code used \def, I did not want to change it. % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License (LPPL), +% conditions of the LaTeX Project Public License (LPPL), % either version 1.3c of this license or (at your option) any later version. % This version of this license is in % http://www.latex-project.org/lppl/lppl-1-3c.txt @@ -37,8 +37,8 @@ % This work consists of the main source files % calxxxx-yyyy.tex, README and README.tex, % and the derived files -% README.pdf, cal2016-2033_DE.pdf, cal2016-2033_DK.pdf, -% and cal2016-2033_EN.pdf. +% README.pdf, cal2017-2034_DE.pdf, cal2017-2034_DK.pdf, +% and cal2017-2034_EN.pdf. % % In memoriam % Claudia Simone Barth + 1996/01/30 @@ -48,7 +48,7 @@ \documentclass[12pt,a4paper,danish,german,english]{report} % In the options you need to place the desired language at the last position. % Sorry for the inconvenience. -\usepackage{babel}[2015/08/03]% v3.9m +\usepackage{babel}[2016/02/24]% v3.9q \selectlanguage{english}% Also possible: 'english', 'german', or 'danish' \usepackage[a4paper,textwidth=\paperwidth,textheight=\paperheight]{geometry}[2010/09/12]% v5.6 \usepackage{array}[2014/10/28]% v2.4c @@ -341,7 +341,8 @@ \message{^^J}\message{^^J}% \newline% \tiny{\indent Original calxxxx.\TeX{} \copyright{} 1999/12/19 Slobodan Jankovi\'{c}; % -these calendars produced with calxxxx-yyyy 2016/01/01 v1.0i by \texttt{Martin.Muench(a)Uni-Bonn.de}; % +these calendars produced with calxxxx-yyyy 2017/01/01 v20.17a by \texttt{Martin.Muench(a)Uni-Bonn.de};% +\newline\indent% \iflanguage{english}{English by Slobodan Jankovi\'{c}.}{% \iflanguage{german}{Deutsch von H.-Martin M\"{u}nch.}{% \iflanguage{danish}{Dansk af Michael Lodahl.}{% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj --- old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2016-04-14 18:48:12.000000000 +0200 +++ new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2017-05-01 02:06:51.000000000 +0200 @@ -1,18 +1,18 @@ name calxxxx-yyyy category Package -revision 39245 +revision 44131 shortdesc Print a calendar for a group of years relocated 1 longdesc The package prints a calendar for 2 or more years, according to longdesc a language selection. The package is also "culture dependent", longdesc in the sense that it will start weeks according to local rules: longdesc e.g., weeks conventionally start on Monday in the English- -longdesc speaking world. +longdesc speaking world. It requires array, babel, and geometry. runfiles size=4 RELOC/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex catalogue-also calxxxx catalogue-ctan /macros/latex/contrib/calxxxx-yyyy -catalogue-date 2015-12-31 20:21:14 +0100 +catalogue-date 2017-01-01 17:05:20 +0100 catalogue-license lppl1.3 catalogue-topics calendar -catalogue-version 1.0i +catalogue-version 20.17a ++++++ cancel.doc.tar.xz ++++++ ++++++ cancel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cancel.tlpobj new/tlpkg/tlpobj/cancel.tlpobj --- old/tlpkg/tlpobj/cancel.tlpobj 2016-04-14 18:48:12.000000000 +0200 +++ new/tlpkg/tlpobj/cancel.tlpobj 2017-04-14 17:34:12.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/cancel/cancel.sty catalogue-ctan /macros/latex/contrib/cancel -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 2.2 ++++++ canoniclayout.doc.tar.xz ++++++ ++++++ canoniclayout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/canoniclayout.tlpobj new/tlpkg/tlpobj/canoniclayout.tlpobj --- old/tlpkg/tlpobj/canoniclayout.tlpobj 2016-04-14 18:48:12.000000000 +0200 +++ new/tlpkg/tlpobj/canoniclayout.tlpobj 2017-04-14 17:34:13.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/canoniclayout/canoniclayout.sty catalogue-ctan /macros/latex/contrib/canoniclayout -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics geometry catalogue-version 0.4 ++++++ cantarell.doc.tar.xz ++++++ ++++++ cantarell.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cantarell.tlpobj new/tlpkg/tlpobj/cantarell.tlpobj --- old/tlpkg/tlpobj/cantarell.tlpobj 2016-04-14 18:48:13.000000000 +0200 +++ new/tlpkg/tlpobj/cantarell.tlpobj 2017-04-14 17:34:13.000000000 +0200 @@ -145,7 +145,7 @@ RELOC/tex/latex/cantarell/ts1fca.fd RELOC/tex/latex/cantarell/x2fca.fd catalogue-ctan /fonts/cantarell -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-sans font-type1 catalogue-version 2.4 ++++++ capt-of.doc.tar.xz ++++++ ++++++ capt-of.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/capt-of.tlpobj new/tlpkg/tlpobj/capt-of.tlpobj --- old/tlpkg/tlpobj/capt-of.tlpobj 2016-04-14 18:48:14.000000000 +0200 +++ new/tlpkg/tlpobj/capt-of.tlpobj 2017-04-14 17:34:13.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/capt-of/capt-of.sty catalogue-also caption captdef catalogue-ctan /macros/latex/contrib/capt-of -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption ++++++ captcont.doc.tar.xz ++++++ ++++++ captcont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/captcont.tlpobj new/tlpkg/tlpobj/captcont.tlpobj --- old/tlpkg/tlpobj/captcont.tlpobj 2016-04-14 18:48:14.000000000 +0200 +++ new/tlpkg/tlpobj/captcont.tlpobj 2017-04-14 17:34:13.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/captcont/captcont.sty catalogue-ctan /macros/latex/contrib/captcont -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption catalogue-version 2.0 ++++++ captdef.doc.tar.xz ++++++ ++++++ captdef.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/captdef.tlpobj new/tlpkg/tlpobj/captdef.tlpobj --- old/tlpkg/tlpobj/captdef.tlpobj 2016-04-14 18:48:15.000000000 +0200 +++ new/tlpkg/tlpobj/captdef.tlpobj 2017-04-14 17:34:14.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/tex/latex/captdef/captdef.sty catalogue-also capt-of catalogue-ctan /macros/latex/contrib/captdef -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption ++++++ caption.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/caption/README new/doc/latex/caption/README --- old/doc/latex/caption/README 2016-02-21 23:43:25.000000000 +0100 +++ new/doc/latex/caption/README 2016-11-25 19:28:21.000000000 +0100 @@ -1,7 +1,7 @@ ========================================================================== The `caption' package bundle -Release 2016-02-21 +Release 2016-05-22 Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt(a)f-m.fm) License: LPPL = LaTeX Project Public Licence diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/caption.doc.tlpobj new/tlpkg/tlpobj/caption.doc.tlpobj --- old/tlpkg/tlpobj/caption.doc.tlpobj 2016-04-14 18:48:16.000000000 +0200 +++ new/tlpkg/tlpobj/caption.doc.tlpobj 2017-04-14 17:34:14.000000000 +0200 @@ -1,6 +1,6 @@ name caption.doc category Package -revision 39809 +revision 41409 shortdesc doc files of caption relocated 1 docfiles size=456 ++++++ caption.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/caption/bicaption.sty new/tex/latex/caption/bicaption.sty --- old/tex/latex/caption/bicaption.sty 2016-02-04 00:00:45.000000000 +0100 +++ new/tex/latex/caption/bicaption.sty 2016-11-25 19:33:43.000000000 +0100 @@ -39,7 +39,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: bicaption.sty 136 2016-02-02 09:41:30Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 158 2016-03-27 17:17:41Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] \RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% @@ -78,15 +78,25 @@ \caption@set@bool\bicaption@ifslc{#1}} \DeclareCaptionOption{bi-swap}[1]{% \caption@set@bool\bicaption@ifswap{#1}} -\DeclareCaptionOption{lang}{\def\bicaption@language{#1}} +\DeclareCaptionOption{lang}{% + \caption@ifundefined\bicaption@language + {\let\KV@bicaption@name\KV@caption@name + \def\KV@caption@name{\bicaption@KV{name}}}% + {}% + \def\bicaption@language{#1}% + \let\bicaption@language@options\@empty} \let\KV@caption@language\KV@caption@lang +\newcommand\bicaption@KV[2]{% + \@bicaption@KV{#1}{#2}% + \l@addto@macro\bicaption@language@options{\@bicaption@KV{#1}{#2}}} +\newcommand\@bicaption@KV[1]{% + \@nameuse{KV@bicaption@#1}} \newcommand*\bicaption@selectlanguage[1]{% \caption@ifundefined\bicaption@language{}{% - \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption@language}}} -\g@addto@macro\caption@applyfont{% + \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption@language}% + \bicaption@language@options}} +\g@addto@macro\caption@beginhook{% \bicaption@selectlanguage\@firstoftwo} -\g@addto@macro\caption@prepareslc{% - \let\bicaption@language\@undefined} \providecommand*\selectcaptionlanguage[1]{% #1\select@language\selectlanguage} \caption@ExecuteOptions{caption}{bi-lang=0,bi-slc=1,bi-swap=0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/caption/caption3.sty new/tex/latex/caption/caption3.sty --- old/tex/latex/caption/caption3.sty 2016-02-21 23:43:25.000000000 +0100 +++ new/tex/latex/caption/caption3.sty 2016-11-25 19:33:43.000000000 +0100 @@ -39,7 +39,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption3.sty 139 2016-02-04 10:26:00Z sommerfeldt $ +\caption@tempa $Id: caption3.sty 166 2016-05-22 18:50:55Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] \providecommand\caption@FixArabTeX{% \def\caption@tempa##1{}% @@ -657,7 +657,7 @@ \DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2} \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)} \DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)} -\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}\autodot} +\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}#2\autodot} \def\caption@lfmt@default{\caption@lfmt@simple} \newcommand\DeclareCaptionLabelSeparator{% \caption@teststar\caption@declarelabelseparator\@gobble\@firstofone} @@ -1117,17 +1117,25 @@ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi \nobreak\vskip\belowcaptionskip\nobreak}} -\newcommand*\caption@ifbeamertemplate[1]{% - \begingroup - \let\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption - \@nameuse{beamer@@tmpop@caption@#1}% - \ifx\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption - \endgroup\expandafter\@firstoftwo - \else - \endgroup\expandafter\@secondoftwo - \fi} + \newcommand*\caption@ifbeamertemplate[1]{% + \begingroup + \let\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption + \@nameuse{beamer@@tmpop@caption@#1}% + \ifx\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption + \endgroup\expandafter\@firstoftwo + \else + \endgroup\expandafter\@secondoftwo + \fi} \DeclareCaptionLabelFormat{default}{% - #1\caption@ifbeamertemplate{numbered}{~#2}{}} + \caption@ifbeamertemplate{numbered}{% + \caption@lfmt@simple{#1}{#2}}{#1}} + \DeclareCaptionLabelFormat{default@magyar}{% + \caption@ifbeamertemplate{numbered}{% + \caption@lfmt@simple@magyar{#1}{#2}}{#1}} + \@ifundefined{@@magyar@captionfix}\AtBeginDocument\@firstofone{% + \g@addto@macro\@@magyar@captionfix{% + \let\caption@lfmt@simple@magyar\caption@lfmt@simpleMagyar + \let\caption@lfmt@simpleMagyar\caption@lfmt@default@magyar}} \caption@declarelabelseparator {\caption@ifbeamertemplate{caption name own line}\@gobble\@firstofone} {default} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/caption/subcaption.sty new/tex/latex/caption/subcaption.sty --- old/tex/latex/caption/subcaption.sty 2016-02-21 23:43:25.000000000 +0100 +++ new/tex/latex/caption/subcaption.sty 2016-11-25 19:33:43.000000000 +0100 @@ -39,25 +39,37 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: subcaption.sty 142 2016-02-20 19:59:43Z sommerfeldt $ +\caption@tempa $Id: subcaption.sty 161 2016-05-22 14:39:14Z sommerfeldt $ \ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] \RequirePackage{caption}[2012/03/25] % needs v3.3 or newer -\caption@AtBeginDocument{\caption@ifcompatibility{% - \caption@Error{% - The `subcaption' package does not work correctly\MessageBreak - in compatibility mode}}{}} -\@ifpackageloaded{subfigure}{% - \PackageError{subcaption}% - {This package can't be used in cooperation\MessageBreak - with the subfigure package}% - {RTFM}% - \endinput}{}% -\@ifpackageloaded{subfig}{% - \PackageError{subcaption}% - {This package can't be used in cooperation\MessageBreak - with the subfig package}% - {RTFM}% - \endinput}{}% +\newcommand\subcaption@CheckCompatibility{% + \@ifpackageloaded{subfigure}{% + \PackageError{subcaption}% + {This package can't be used in cooperation\MessageBreak + with the subfigure package}% + {\subcaption@EH}% + \endinput}{}% + \@ifpackageloaded{subfig}{% + \PackageError{subcaption}% + {This package can't be used in cooperation\MessageBreak + with the subfig package}% + {\subcaption@EH}% + \endinput}{}% +} +\newcommand*\subcaption@EH{% + If you do not understand this error, please take a closer look\MessageBreak + at the documentation of the `subcaption' package, especially the\MessageBreak + section about errors.\MessageBreak\@ehc} +\subcaption@CheckCompatibility +\caption@AtBeginDocument{% + \caption@ifcompatibility{% + \caption@Error{% + The `subcaption' package does not work correctly\MessageBreak + in compatibility mode}}{}% + \subcaption@CheckCompatibility + \let\subcaption@CheckCompatibility\@undefined + \let\subcaption@EH\@undefined +} \caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}% \caption@ExecuteOptions{subcaption}{% font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/caption.tlpobj new/tlpkg/tlpobj/caption.tlpobj --- old/tlpkg/tlpobj/caption.tlpobj 2016-04-14 18:48:17.000000000 +0200 +++ new/tlpkg/tlpobj/caption.tlpobj 2017-04-14 17:34:14.000000000 +0200 @@ -1,6 +1,6 @@ name caption category Package -revision 39809 +revision 41409 shortdesc Customising captions in floating environments relocated 1 longdesc The caption package provides many ways to customise the @@ -23,6 +23,6 @@ RELOC/tex/latex/caption/totalcount.sty catalogue-also subcaption bicaption catalogue-ctan /macros/latex/contrib/caption -catalogue-date 2016-02-21 13:56:30 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics caption float ++++++ carbohydrates.doc.tar.xz ++++++ ++++++ carbohydrates.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/carbohydrates.tlpobj new/tlpkg/tlpobj/carbohydrates.tlpobj --- old/tlpkg/tlpobj/carbohydrates.tlpobj 2016-04-14 18:48:17.000000000 +0200 +++ new/tlpkg/tlpobj/carbohydrates.tlpobj 2017-04-14 17:34:15.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=7 RELOC/tex/latex/carbohydrates/carbohydrates.sty catalogue-ctan /macros/latex/contrib/carbohydrates -catalogue-date 2015-12-09 05:49:08 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram chemistry catalogue-version 0.1 ++++++ carlisle.doc.tar.xz ++++++ ++++++ carlisle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/carlisle.tlpobj new/tlpkg/tlpobj/carlisle.tlpobj --- old/tlpkg/tlpobj/carlisle.tlpobj 2016-04-14 18:48:18.000000000 +0200 +++ new/tlpkg/tlpobj/carlisle.tlpobj 2017-04-14 17:34:15.000000000 +0200 @@ -23,6 +23,6 @@ RELOC/tex/latex/carlisle/scalefnt.sty RELOC/tex/latex/carlisle/slashed.sty catalogue-ctan /macros/latex/contrib/carlisle -catalogue-date 2016-02-03 10:04:48 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics collection ++++++ carlito.doc.tar.xz ++++++ ++++++ carlito.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/carlito.tlpobj new/tlpkg/tlpobj/carlito.tlpobj --- old/tlpkg/tlpobj/carlito.tlpobj 2016-04-14 18:48:18.000000000 +0200 +++ new/tlpkg/tlpobj/carlito.tlpobj 2017-04-14 17:34:15.000000000 +0200 @@ -231,6 +231,6 @@ RELOC/tex/latex/carlito/TS1Carlito-TOsF.fd RELOC/tex/latex/carlito/carlito.sty catalogue-ctan /fonts/carlito -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-ttf font-type1 font-sans ++++++ carolmin-ps.doc.tar.xz ++++++ ++++++ carolmin-ps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/carolmin-ps.tlpobj new/tlpkg/tlpobj/carolmin-ps.tlpobj --- old/tlpkg/tlpobj/carolmin-ps.tlpobj 2016-04-14 18:48:22.000000000 +0200 +++ new/tlpkg/tlpobj/carolmin-ps.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -24,6 +24,6 @@ RELOC/fonts/type1/public/carolmin-ps/cminb17.pfb RELOC/fonts/type1/public/carolmin-ps/cminb7.pfb catalogue-ctan /fonts/carolmin-ps -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-bookhand font-type1 ++++++ cascadilla.doc.tar.xz ++++++ ++++++ cascadilla.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cascadilla.tlpobj new/tlpkg/tlpobj/cascadilla.tlpobj --- old/tlpkg/tlpobj/cascadilla.tlpobj 2016-04-14 18:48:23.000000000 +0200 +++ new/tlpkg/tlpobj/cascadilla.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/bibtex/bst/cascadilla/cascadilla.bst RELOC/tex/latex/cascadilla/cascadilla.cls catalogue-ctan /macros/latex/contrib/cascadilla -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.8.2 ++++++ cases.doc.tar.xz ++++++ ++++++ cases.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cases.tlpobj new/tlpkg/tlpobj/cases.tlpobj --- old/tlpkg/tlpobj/cases.tlpobj 2016-04-14 18:48:23.000000000 +0200 +++ new/tlpkg/tlpobj/cases.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/cases/cases.sty catalogue-ctan /macros/latex/contrib/cases -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics maths-syseqn catalogue-version 2.5 ++++++ casyl.doc.tar.xz ++++++ ++++++ casyl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/casyl.tlpobj new/tlpkg/tlpobj/casyl.tlpobj --- old/tlpkg/tlpobj/casyl.tlpobj 2016-04-14 18:48:23.000000000 +0200 +++ new/tlpkg/tlpobj/casyl.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/casyl/casyltex.sty catalogue-also oinuit catalogue-ctan /language/casyl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics linguistic catalogue-version 2.0 ++++++ catchfilebetweentags.doc.tar.xz ++++++ ++++++ catchfilebetweentags.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/catchfilebetweentags.tlpobj new/tlpkg/tlpobj/catchfilebetweentags.tlpobj --- old/tlpkg/tlpobj/catchfilebetweentags.tlpobj 2016-04-14 18:48:23.000000000 +0200 +++ new/tlpkg/tlpobj/catchfilebetweentags.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/catchfilebetweentags/catchfilebetweentags.sty catalogue-ctan /macros/latex/contrib/catchfilebetweentags -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.1 ++++++ catcodes.doc.tar.xz ++++++ ++++++ catcodes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/catcodes.tlpobj new/tlpkg/tlpobj/catcodes.tlpobj --- old/tlpkg/tlpobj/catcodes.tlpobj 2016-04-14 18:48:24.000000000 +0200 +++ new/tlpkg/tlpobj/catcodes.tlpobj 2017-04-14 17:34:17.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/generic/catcodes/catcodes.RLS RELOC/tex/generic/catcodes/stacklet.sty catalogue-ctan /macros/generic/catcodes -catalogue-date 2015-11-16 10:20:14 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp quote-marks macro-gen catalogue-version r0.2 ++++++ catechis.doc.tar.xz ++++++ ++++++ catechis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/catechis.tlpobj new/tlpkg/tlpobj/catechis.tlpobj --- old/tlpkg/tlpobj/catechis.tlpobj 2016-04-14 18:48:24.000000000 +0200 +++ new/tlpkg/tlpobj/catechis.tlpobj 2017-04-14 17:34:18.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=7 RELOC/tex/latex/catechis/catechis.sty catalogue-ctan /macros/latex/contrib/catechis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics theology catalogue-version 1.1 ++++++ catoptions.doc.tar.xz ++++++ ++++++ catoptions.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/catoptions.tlpobj new/tlpkg/tlpobj/catoptions.tlpobj --- old/tlpkg/tlpobj/catoptions.tlpobj 2016-04-14 18:48:24.000000000 +0200 +++ new/tlpkg/tlpobj/catoptions.tlpobj 2017-04-14 17:34:18.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/catoptions/catoptions-guide.cfg RELOC/tex/latex/catoptions/catoptions.sty catalogue-ctan /macros/latex/contrib/catoptions -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 keyval catalogue-version 0.2.7h ++++++ cbcoptic.doc.tar.xz ++++++ ++++++ cbcoptic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbcoptic.tlpobj new/tlpkg/tlpobj/cbcoptic.tlpobj --- old/tlpkg/tlpobj/cbcoptic.tlpobj 2016-04-14 18:48:25.000000000 +0200 +++ new/tlpkg/tlpobj/cbcoptic.tlpobj 2017-04-14 17:34:18.000000000 +0200 @@ -22,7 +22,7 @@ RELOC/tex/latex/cbcoptic/lcopcoptic.fd RELOC/tex/latex/cbcoptic/prnthyph.sty catalogue-ctan /language/coptic/cbcoptic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics coptic catalogue-version 0.2 ++++++ cbfonts-fd.doc.tar.xz ++++++ ++++++ cbfonts-fd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbfonts-fd.tlpobj new/tlpkg/tlpobj/cbfonts-fd.tlpobj --- old/tlpkg/tlpobj/cbfonts-fd.tlpobj 2016-04-14 18:49:27.000000000 +0200 +++ new/tlpkg/tlpobj/cbfonts-fd.tlpobj 2017-04-14 17:34:50.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/cbfonts-fd/lgrlmss.fd RELOC/tex/latex/cbfonts-fd/lgrlmtt.fd catalogue-ctan /fonts/greek/cbfonts-fd -catalogue-date 2016-03-04 13:06:55 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-supp font-greek catalogue-version 1.1 ++++++ cbfonts.doc.tar.xz ++++++ ++++++ cbfonts.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-d/cbfonts.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-d.new/cbfonts.tar.xz differ: char 25, line 1 ++++++ cc-pl.doc.tar.xz ++++++ ++++++ cc-pl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cc-pl.tlpobj new/tlpkg/tlpobj/cc-pl.tlpobj --- old/tlpkg/tlpobj/cc-pl.tlpobj 2016-04-14 18:49:27.000000000 +0200 +++ new/tlpkg/tlpobj/cc-pl.tlpobj 2017-04-14 17:34:50.000000000 +0200 @@ -45,7 +45,7 @@ RELOC/fonts/type1/public/cc-pl/pcslc9.pfb RELOC/fonts/type1/public/cc-pl/pcti10.pfb catalogue-ctan /fonts/cc-pl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics polish font font-serif font-mf font-type1 catalogue-version 1.02.2 ++++++ ccaption.doc.tar.xz ++++++ ++++++ ccaption.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccaption.tlpobj new/tlpkg/tlpobj/ccaption.tlpobj --- old/tlpkg/tlpobj/ccaption.tlpobj 2016-04-14 18:49:28.000000000 +0200 +++ new/tlpkg/tlpobj/ccaption.tlpobj 2017-04-14 17:34:50.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/ccaption/ccaption.sty catalogue-also float caption catalogue-ctan /macros/latex/contrib/ccaption -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics caption catalogue-version 3.2c ++++++ ccfonts.doc.tar.xz ++++++ ++++++ ccfonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccfonts.tlpobj new/tlpkg/tlpobj/ccfonts.tlpobj --- old/tlpkg/tlpobj/ccfonts.tlpobj 2016-04-14 18:49:28.000000000 +0200 +++ new/tlpkg/tlpobj/ccfonts.tlpobj 2017-04-14 17:34:50.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/ccfonts/ts1ccr.fd catalogue-also ecc catalogue-ctan /macros/latex/contrib/ccfonts -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 1.1 ++++++ ccicons.doc.tar.xz ++++++ ++++++ ccicons.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccicons.tlpobj new/tlpkg/tlpobj/ccicons.tlpobj --- old/tlpkg/tlpobj/ccicons.tlpobj 2016-04-14 18:49:28.000000000 +0200 +++ new/tlpkg/tlpobj/ccicons.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/fonts/type1/public/ccicons/ccicons.pfb RELOC/tex/latex/ccicons/ccicons.sty catalogue-ctan /fonts/ccicons -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-symbol font-type1 catalogue-version 1.5 ++++++ cclicenses.doc.tar.xz ++++++ ++++++ cclicenses.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cclicenses.tlpobj new/tlpkg/tlpobj/cclicenses.tlpobj --- old/tlpkg/tlpobj/cclicenses.tlpobj 2016-04-14 18:49:28.000000000 +0200 +++ new/tlpkg/tlpobj/cclicenses.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=2 RELOC/tex/latex/cclicenses/cclicenses.sty catalogue-ctan /macros/latex/contrib/cclicenses -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics logo ++++++ cd-cover.doc.tar.xz ++++++ ++++++ cd-cover.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cd-cover.tlpobj new/tlpkg/tlpobj/cd-cover.tlpobj --- old/tlpkg/tlpobj/cd-cover.tlpobj 2016-04-14 18:49:29.000000000 +0200 +++ new/tlpkg/tlpobj/cd-cover.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/cd-cover/cd-cover.cls catalogue-also cd catalogue-ctan /macros/latex/contrib/cd-cover -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics covers catalogue-version 1.0 ++++++ cd.doc.tar.xz ++++++ ++++++ cd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cd.tlpobj new/tlpkg/tlpobj/cd.tlpobj --- old/tlpkg/tlpobj/cd.tlpobj 2016-04-14 18:49:29.000000000 +0200 +++ new/tlpkg/tlpobj/cd.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/cd/cd.cls catalogue-also cdcover catalogue-ctan /macros/latex/contrib/cd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics labels catalogue-version 1.4 ++++++ cdpbundl.doc.tar.xz ++++++ ++++++ cdpbundl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cdpbundl.tlpobj new/tlpkg/tlpobj/cdpbundl.tlpobj --- old/tlpkg/tlpobj/cdpbundl.tlpobj 2016-04-14 18:49:30.000000000 +0200 +++ new/tlpkg/tlpobj/cdpbundl.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -25,7 +25,7 @@ RELOC/tex/latex/cdpbundl/hp-laserjet-4500.def RELOC/tex/latex/cdpbundl/letteracdp.cls catalogue-ctan /macros/latex/contrib/cdpbundl -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 0.36 ++++++ cell.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cell.doc.tlpobj new/tlpkg/tlpobj/cell.doc.tlpobj --- old/tlpkg/tlpobj/cell.doc.tlpobj 2016-04-14 18:49:30.000000000 +0200 +++ new/tlpkg/tlpobj/cell.doc.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -1,6 +1,6 @@ name cell.doc category Package -revision 20756 +revision 42428 shortdesc doc files of cell relocated 1 docfiles size=1 ++++++ cell.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cell.tlpobj new/tlpkg/tlpobj/cell.tlpobj --- old/tlpkg/tlpobj/cell.tlpobj 2016-04-14 18:49:30.000000000 +0200 +++ new/tlpkg/tlpobj/cell.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -1,6 +1,6 @@ name cell category Package -revision 20756 +revision 42428 shortdesc Bibliography style for Cell relocated 1 longdesc This is an "apa-like" style (cf. apalike.bst in the BibTeX @@ -10,6 +10,6 @@ RELOC/bibtex/bst/cell/cell.bst RELOC/tex/latex/cell/cell.sty catalogue-ctan /macros/latex/contrib/cell -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics bibtex-sty ++++++ cellspace.doc.tar.xz ++++++ ++++++ cellspace.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cellspace.tlpobj new/tlpkg/tlpobj/cellspace.tlpobj --- old/tlpkg/tlpobj/cellspace.tlpobj 2016-04-14 18:49:30.000000000 +0200 +++ new/tlpkg/tlpobj/cellspace.tlpobj 2017-04-14 17:34:51.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/cellspace/cellspace.sty catalogue-ctan /macros/latex/contrib/cellspace -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.6 ++++++ celtic.doc.tar.xz ++++++ ++++++ celtic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/celtic.tlpobj new/tlpkg/tlpobj/celtic.tlpobj --- old/tlpkg/tlpobj/celtic.tlpobj 2016-04-14 18:49:31.000000000 +0200 +++ new/tlpkg/tlpobj/celtic.tlpobj 2017-04-14 17:34:52.000000000 +0200 @@ -7,7 +7,7 @@ runfiles size=5 RELOC/tex/latex/celtic/tikzlibraryceltic.code.tex catalogue-ctan /graphics/pgf/contrib/celtic -catalogue-date 2016-02-20 08:43:02 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics pgf-tikz catalogue-version 1.1 ++++++ censor.doc.tar.xz ++++++ ++++++ censor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/censor.tlpobj new/tlpkg/tlpobj/censor.tlpobj --- old/tlpkg/tlpobj/censor.tlpobj 2016-04-14 18:49:31.000000000 +0200 +++ new/tlpkg/tlpobj/censor.tlpobj 2017-04-14 17:34:52.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/censor/censor.sty catalogue-ctan /macros/latex/contrib/censor -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics security catalogue-version 3.21 ++++++ cfr-initials.doc.tar.xz ++++++ ++++++ cfr-initials.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cfr-initials.tlpobj new/tlpkg/tlpobj/cfr-initials.tlpobj --- old/tlpkg/tlpobj/cfr-initials.tlpobj 2016-04-14 18:49:32.000000000 +0200 +++ new/tlpkg/tlpobj/cfr-initials.tlpobj 2017-04-14 17:34:52.000000000 +0200 @@ -36,7 +36,7 @@ RELOC/tex/latex/cfr-initials/Typocaps.sty RELOC/tex/latex/cfr-initials/Zallman.sty catalogue-ctan /macros/latex/contrib/cfr-initials -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 font-decor catalogue-version 1.01 ++++++ cfr-lm.doc.tar.xz ++++++ ++++++ cfr-lm.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cfr-lm.tlpobj new/tlpkg/tlpobj/cfr-lm.tlpobj --- old/tlpkg/tlpobj/cfr-lm.tlpobj 2016-04-14 18:49:34.000000000 +0200 +++ new/tlpkg/tlpobj/cfr-lm.tlpobj 2017-04-14 17:34:53.000000000 +0200 @@ -911,7 +911,7 @@ RELOC/tex/latex/cfr-lm/uclmt.fd RELOC/tex/latex/cfr-lm/uclmv.fd catalogue-ctan /fonts/cfr-lm -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.5

1 0

Jump to page: