Hello community, here is the log from the commit of package texlive-specs-h for openSUSE:Factory checked in at 2015-02-24 12:59:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-h (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-h.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-h" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.changes 2014-06-18 07:50:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-h.new/texlive-specs-h.changes 2015-02-24 13:01:52.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 19 09:29:36 UTC 2015 - coolo@suse.com + +- rework generate to create the texlive-specs-$letter.spec directly + to build X sources +- this decouples the letter from being a prefix to be a slice of + all the texlive packages + +- as such patches move between packages, among them + bbold_bbold11.dif bbold_bbold11.dif context_fourier-map.dif context_fourier-map.dif + jadetex_ini.dif kpathsea_cnf.dif latexdiff_env.dif luaotfload_varfonts.dif latex2man_tmphandling.dif + musixtex_various.dif pgf_plain.dif musixtex_various.dif texconfig_scripts.dif + texdraw_info.dif tex4ht_env.dif texdoc_cnf.dif tetex_scripts.dif + +------------------------------------------------------------------- Old: ---- hacm.doc.tar.xz hacm.tar.xz hands.tar.xz hanging.doc.tar.xz hanging.tar.xz hanoi.tar.xz happy4th.doc.tar.xz happy4th.tar.xz har2nat.doc.tar.xz har2nat.tar.xz hardwrap.doc.tar.xz hardwrap.tar.xz harmony.doc.tar.xz harmony.tar.xz harnon-cv.doc.tar.xz harnon-cv.tar.xz harpoon.doc.tar.xz harpoon.tar.xz harvard.doc.tar.xz harvard.tar.xz harvmac.doc.tar.xz harvmac.tar.xz hatching.doc.tar.xz hatching.tar.xz hausarbeit-jura.doc.tar.xz hausarbeit-jura.tar.xz hc.doc.tar.xz hc.tar.xz he-she.doc.tar.xz he-she.tar.xz helvetic.tar.xz hep.doc.tar.xz hep.tar.xz hepnames.doc.tar.xz hepnames.tar.xz hepparticles.doc.tar.xz hepparticles.tar.xz hepthesis.doc.tar.xz hepthesis.tar.xz hepunits.doc.tar.xz hepunits.tar.xz here.doc.tar.xz here.tar.xz hexgame.doc.tar.xz hexgame.tar.xz hf-tikz.doc.tar.xz hf-tikz.tar.xz hfbright.doc.tar.xz hfbright.tar.xz hfoldsty.doc.tar.xz hfoldsty.tar.xz hhtensor.doc.tar.xz hhtensor.tar.xz histogr.doc.tar.xz histogr.tar.xz historische-zeitschrift.doc.tar.xz historische-zeitschrift.tar.xz 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 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-docsrc.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.tar.xz hyphen-catalan.tar.xz hyphen-chinese.tar.xz hyphen-coptic.tar.xz hyphen-croatian.tar.xz hyphen-czech.tar.xz hyphen-danish.tar.xz hyphen-dutch.tar.xz hyphen-english.tar.xz hyphen-esperanto.tar.xz hyphen-estonian.tar.xz hyphen-ethiopic.tar.xz hyphen-farsi.tar.xz hyphen-finnish.tar.xz hyphen-french.tar.xz hyphen-friulan.tar.xz hyphen-galician.tar.xz hyphen-georgian.tar.xz hyphen-german.tar.xz hyphen-greek.doc.tar.xz hyphen-greek.tar.xz hyphen-hungarian.doc.tar.xz hyphen-hungarian.tar.xz hyphen-icelandic.tar.xz hyphen-indic.tar.xz hyphen-indonesian.tar.xz hyphen-interlingua.tar.xz hyphen-irish.tar.xz hyphen-italian.tar.xz hyphen-kurmanji.tar.xz hyphen-latin.tar.xz hyphen-latvian.tar.xz hyphen-lithuanian.tar.xz hyphen-mongolian.tar.xz hyphen-norwegian.tar.xz hyphen-piedmontese.tar.xz hyphen-polish.tar.xz hyphen-portuguese.tar.xz hyphen-romanian.tar.xz hyphen-romansh.tar.xz hyphen-russian.tar.xz hyphen-sanskrit.tar.xz hyphen-serbian.tar.xz hyphen-slovak.tar.xz hyphen-slovenian.tar.xz hyphen-spanish.tar.xz hyphen-swedish.tar.xz hyphen-thai.tar.xz hyphen-turkish.tar.xz hyphen-turkmen.tar.xz hyphen-ukrainian.tar.xz hyphen-uppersorbian.tar.xz hyphen-welsh.tar.xz hyphenat.doc.tar.xz hyphenat.tar.xz hyphenex.tar.xz hyplain.doc.tar.xz hyplain.tar.xz texlive-specs-rpmlintrc texlive-specs.tar.xz New: ---- enctex.doc.tar.xz enctex.tar.xz encxvlna.doc.tar.xz encxvlna.tar.xz endfloat.doc.tar.xz endfloat.tar.xz endheads.doc.tar.xz endheads.tar.xz endiagram.doc.tar.xz endiagram.tar.xz endnotes.doc.tar.xz endnotes.tar.xz engpron.doc.tar.xz engpron.tar.xz engrec.doc.tar.xz engrec.tar.xz engtlc.doc.tar.xz engtlc.tar.xz enigma.doc.tar.xz enigma.tar.xz enotez.doc.tar.xz enotez.tar.xz enumitem-zref.doc.tar.xz enumitem-zref.tar.xz enumitem.doc.tar.xz enumitem.tar.xz envbig.doc.tar.xz envbig.tar.xz environ.doc.tar.xz environ.tar.xz envlab.doc.tar.xz envlab.tar.xz epigrafica.doc.tar.xz epigrafica.tar.xz epigram.tar.xz epigraph.doc.tar.xz epigraph.tar.xz epiolmec.doc.tar.xz epiolmec.tar.xz eplain.doc.tar.xz eplain.tar.xz epsdice.doc.tar.xz epsdice.tar.xz epsf.doc.tar.xz epsf.tar.xz epsincl.doc.tar.xz epsincl.tar.xz epslatex-fr.doc.tar.xz epspdf.doc.tar.xz epspdf.tar.xz epspdfconversion.doc.tar.xz epspdfconversion.tar.xz epstopdf.doc.tar.xz epstopdf.tar.xz eqell.doc.tar.xz eqell.tar.xz eqlist.doc.tar.xz eqlist.tar.xz eqname.tar.xz eqnarray.doc.tar.xz eqnarray.tar.xz eqparbox.doc.tar.xz eqparbox.tar.xz erdc.doc.tar.xz erdc.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 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 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 eukdate.doc.tar.xz eukdate.tar.xz euler.doc.tar.xz euler.tar.xz eulervm.doc.tar.xz eulervm.tar.xz euro-ce.doc.tar.xz euro-ce.tar.xz euro.doc.tar.xz euro.tar.xz europecv.doc.tar.xz europecv.tar.xz eurosym.doc.tar.xz eurosym.tar.xz euxm.tar.xz everyhook.doc.tar.xz everyhook.tar.xz everypage.doc.tar.xz everypage.tar.xz exam.doc.tar.xz exam.tar.xz examdesign.doc.tar.xz examdesign.tar.xz examplep.doc.tar.xz examplep.tar.xz exceltex.doc.tar.xz exceltex.tar.xz excludeonly.doc.tar.xz excludeonly.tar.xz exercise.doc.tar.xz exercise.tar.xz exp-testopt.doc.tar.xz exp-testopt.tar.xz expdlist.doc.tar.xz expdlist.tar.xz export.doc.tar.xz export.tar.xz expressg.doc.tar.xz expressg.tar.xz exsheets.doc.tar.xz exsheets.tar.xz exsol.doc.tar.xz exsol.tar.xz extarrows.doc.tar.xz extarrows.tar.xz exteps.doc.tar.xz exteps.tar.xz extpfeil.doc.tar.xz extpfeil.tar.xz extract.doc.tar.xz extract.tar.xz extsizes.doc.tar.xz extsizes.tar.xz facsimile.doc.tar.xz facsimile.tar.xz factura.doc.tar.xz factura.tar.xz facture.doc.tar.xz facture.tar.xz faktor.doc.tar.xz faktor.tar.xz fancybox.doc.tar.xz fancybox.tar.xz fancyhdr-it.doc.tar.xz fancyhdr.doc.tar.xz fancyhdr.tar.xz fancynum.doc.tar.xz fancynum.tar.xz fancypar.doc.tar.xz fancypar.tar.xz fancyref.doc.tar.xz fancyref.tar.xz fancytabs.doc.tar.xz fancytabs.tar.xz fancytooltips.doc.tar.xz fancytooltips.tar.xz fancyvrb.doc.tar.xz fancyvrb.tar.xz fast-diagram.doc.tar.xz fast-diagram.tar.xz fbithesis.doc.tar.xz fbithesis.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-h.spec ++++++ ++++ 10060 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 ++++++ hyplain.doc.tar.xz -> eplain.doc.tar.xz ++++++ ++++ 22980 lines of diff (skipped) ++++++ hyplain.tar.xz -> eplain.tar.xz ++++++ ++++ 6170 lines of diff (skipped) ++++++ hpsdiss.doc.tar.xz -> epsdice.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/epsdice/README new/doc/latex/epsdice/README --- old/doc/latex/epsdice/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/epsdice/README 2007-02-22 20:56:52.000000000 +0100 @@ -0,0 +1,69 @@ +Package: EPSDICE +Version: 2.1 +Date: 2007/02/15 +Author: Thomas Heim (thomas.heim@unibas.ch) +Purpose: A scalable dice font +License: LPPL + +Distributed files: + + epsdice.ins -- docstrip installer file + epsdice.dtx -- source and sample doc + dice.pdf -- dice drawings in pdf format + README -- this file + epsdice.pdf -- documentation (from LaTeX -> dvips -> pstopdf) + +Generated files: + + epsdice.sty -- the package + epsdice.cfg -- a config file + dice.eps -- dice drawings in eps format + +Test installation: + +With all distributed files in your present +working directory, run epsdice.ins through LaTeX. +To test the package, you can reproduce the documentation +(epsdice.pdf) by running epsdice.dtx (twice) through pdfLaTeX +or through LaTeX -> dvips -> pstopdf. + +If you decide to keep the package, move the files + epsdice.sty epsdice.cfg dice.eps dice.pdf +to /tex/latex/epsdice in your local texmf tree +according to the instructions in epsdice.dtx/ins. + +Changes from version 2.0: + +- clean up the documentation +- minor bug fix in generated file dice.eps: removed spurious + comment line at beginning + +Changes from version 1.2: + + (suggested by Christoph Zurnieden; Thanks!) + +- CHANGE TO USER INTERFACE: + \epsdice now recognises an OPTIONAL ARGUMENT [black] for + reversed colors (white dots on black background) +- additional drawings (originally by Christoph Zurnieden) + in PostScript format + +Changes from version 1.1: + +- Introduced `@' in counter name (program encapsulation) +- More detailed documentation of the PostScript code + is now included in the sample document +- renamed files with drawings to `dice.eps' and `dice.pdf' +- Now distributed as .ins and .dtx files (plus binary .pdf) +- *** NO CHANGES TO USER INTERFACE *** + +Changes from version 1.0: + + (suggested by Rolf Niepraschk; Thanks!) + +- Removed package option [dvips] for graphicx. +- Changed bounding box specifications to viewport specification + to facilitate clipping in pdflatex. +- Added epsdice.pdf (generated from epsdice.eps). +- Replaced documentation by dicetest.tex. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/epsdice/dice.eps new/doc/latex/epsdice/dice.eps --- old/doc/latex/epsdice/dice.eps 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/epsdice/dice.eps 2007-02-22 20:56:52.000000000 +0100 @@ -0,0 +1,15 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%BoundingBox: 0 0 258 86 +/frame { /n exch def /xoffset n 1 sub 43 mul def gsave newpath +xoffset yoffset translate 32 5 bw sub moveto 32 10 r -90 0 arc +37 bw add 32 lineto 32 32 r 0 90 arc 10 37 bw add lineto +10 32 r 90 180 arc 5 bw sub 10 lineto 10 10 r 180 270 arc closepath +bw 0 eq { stroke } { fill } ifelse grestore } def +/dot { /y exch def /x exch def /n exch def /xoffset n 1 sub 43 +mul def gsave newpath xoffset yoffset translate x 8 mul 5 add y 8 mul +5 add 3.5 0 360 arc closepath bw setgray fill grestore } def +2 setlinewidth 0 1 1 { /bw exch def /yoffset bw 43 mul def /r 5 bw +add def 0 setgray 1 1 6 { frame } for 2 1 6 { dup 1 2 3 { dup dot } +for } for 1 2 5 { 2 2 dot } for 4 1 6 { dup 1 3 dot 3 1 dot } for +1 2 3 { 6 exch 2 dot } for } for +%%EOF Files old/doc/latex/epsdice/dice.pdf and new/doc/latex/epsdice/dice.pdf differ Files old/doc/latex/epsdice/epsdice.pdf and new/doc/latex/epsdice/epsdice.pdf differ Files old/doc/latex/hpsdiss/hpsdiss.pdf and new/doc/latex/hpsdiss/hpsdiss.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsdice.doc.tlpobj new/tlpkg/tlpobj/epsdice.doc.tlpobj --- old/tlpkg/tlpobj/epsdice.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/epsdice.doc.tlpobj 2010-06-10 18:26:58.000000000 +0200 @@ -0,0 +1,10 @@ +name epsdice.doc +category Package +revision 15878 +shortdesc doc files of epsdice +relocated 1 +docfiles size=22 + RELOC/doc/latex/epsdice/README + RELOC/doc/latex/epsdice/dice.eps + RELOC/doc/latex/epsdice/dice.pdf + RELOC/doc/latex/epsdice/epsdice.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hpsdiss.doc.tlpobj new/tlpkg/tlpobj/hpsdiss.doc.tlpobj --- old/tlpkg/tlpobj/hpsdiss.doc.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/hpsdiss.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name hpsdiss.doc -category Package -revision 15878 -shortdesc doc files of hpsdiss -relocated 1 -docfiles size=54 - RELOC/doc/latex/hpsdiss/hpsdiss.pdf ++++++ hpsdiss.doc.tar.xz -> epsdice.tar.xz ++++++ Files old/doc/latex/hpsdiss/hpsdiss.pdf and new/doc/latex/hpsdiss/hpsdiss.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/epsdice/dice.eps new/tex/latex/epsdice/dice.eps --- old/tex/latex/epsdice/dice.eps 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/epsdice/dice.eps 2008-10-28 22:22:30.000000000 +0100 @@ -0,0 +1,15 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%BoundingBox: 0 0 258 86 +/frame { /n exch def /xoffset n 1 sub 43 mul def gsave newpath +xoffset yoffset translate 32 5 bw sub moveto 32 10 r -90 0 arc +37 bw add 32 lineto 32 32 r 0 90 arc 10 37 bw add lineto +10 32 r 90 180 arc 5 bw sub 10 lineto 10 10 r 180 270 arc closepath +bw 0 eq { stroke } { fill } ifelse grestore } def +/dot { /y exch def /x exch def /n exch def /xoffset n 1 sub 43 +mul def gsave newpath xoffset yoffset translate x 8 mul 5 add y 8 mul +5 add 3.5 0 360 arc closepath bw setgray fill grestore } def +2 setlinewidth 0 1 1 { /bw exch def /yoffset bw 43 mul def /r 5 bw +add def 0 setgray 1 1 6 { frame } for 2 1 6 { dup 1 2 3 { dup dot } +for } for 1 2 5 { 2 2 dot } for 4 1 6 { dup 1 3 dot 3 1 dot } for +1 2 3 { 6 exch 2 dot } for } for +%%EOF Files old/tex/latex/epsdice/dice.pdf and new/tex/latex/epsdice/dice.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/epsdice/epsdice.cfg new/tex/latex/epsdice/epsdice.cfg --- old/tex/latex/epsdice/epsdice.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/epsdice/epsdice.cfg 2007-02-22 20:56:52.000000000 +0100 @@ -0,0 +1 @@ +\def\dicefile{dice} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/epsdice/epsdice.sty new/tex/latex/epsdice/epsdice.sty --- old/tex/latex/epsdice/epsdice.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/epsdice/epsdice.sty 2007-02-22 20:56:52.000000000 +0100 @@ -0,0 +1,86 @@ +%% +%% This is file `epsdice.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% epsdice.dtx (with options: `package') +%% +%% This is a generated file; it is part of the `epsdice' package. +%% +%% Copyright (c) 2007 Thomas A. Heim +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License (LPPL) distributed from CTAN +%% archives in directory macros/latex/base/lppl.txt; either +%% version 1 of the License, or any later version. +%% +%% This file 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. +%% +%% Bug reports ON UNMODIFIED VERSIONS of this package, or +%% suggestions for improvement and additional features +%% should be directed to the author (thomas.heim@unibas.ch) +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{epsdice}[2007/02/15 by Thomas Heim (v. 2.1)] +\RequirePackage{graphicx} +\RequirePackage{ifthen} +\InputIfFileExists{epsdice.cfg}{}{\def\dicefile{dice}} +\newcounter{eps@face} +\newcommand*\epsdice[2][white]{% +\setcounter{eps@face}{\number #2}% +\ifthenelse{\value{eps@face}>6}{\theeps@face\setcounter{eps@face}{0}}{}% +\ifthenelse{\value{eps@face}<0}{\theeps@face\setcounter{eps@face}{0}}{}% +\ifthenelse {\equal{#1}{black}} {\addtocounter{eps@face}{6}} {}% +\eps@dice{\value{eps@face}}} +\newcommand*\eps@dice[1]{% +\setcounter{eps@face}{\number #1}% +\ifcase\value{eps@face}% + \PackageError{EPSDICE}{% +Argument is not a number, or its value\MessageBreak +lies outside the allowed range for dice}{% +Make sure the argument is either 1, 2, 3, 4, 5, or 6.\MessageBreak +-- Just go on and I'll write whatever you typed;\MessageBreak + the output may not make much sense, though}% +\or + \includegraphics[height=1.75ex,viewport= 3 4 38 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 46 4 81 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 89 4 124 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 132 4 167 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 175 4 210 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 218 4 253 39,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 3 47 38 82,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 46 47 81 82,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 89 47 124 82,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 132 47 167 82,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 175 47 210 82,% + clip=true]{\dicefile}% +\or + \includegraphics[height=1.75ex,viewport= 218 47 253 82,% + clip=true]{\dicefile}% +\fi} +\endinput +%% +%% End of file `epsdice.sty'. 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/epsdice.tlpobj 2010-06-10 18:26:58.000000000 +0200 @@ -0,0 +1,19 @@ +name epsdice +category Package +revision 15878 +shortdesc A scalable dice "font". +relocated 1 +longdesc The epsdice package defines a single command \epsdice that +longdesc takes a numeric argument (in the range 1-6), and selects a face +longdesc image from a file that contains each of the 6 possible die +longdesc faces. The graphic file is provided in both Encapsulated +longdesc PostScript and PDF formats. +runfiles size=5 + RELOC/tex/latex/epsdice/dice.eps + RELOC/tex/latex/epsdice/dice.pdf + RELOC/tex/latex/epsdice/epsdice.cfg + RELOC/tex/latex/epsdice/epsdice.sty +catalogue-ctan /macros/latex/contrib/epsdice +catalogue-date 2007-02-15 14:08:03 +0100 +catalogue-license lppl +catalogue-version 2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hpsdiss.doc.tlpobj new/tlpkg/tlpobj/hpsdiss.doc.tlpobj --- old/tlpkg/tlpobj/hpsdiss.doc.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/hpsdiss.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name hpsdiss.doc -category Package -revision 15878 -shortdesc doc files of hpsdiss -relocated 1 -docfiles size=54 - RELOC/doc/latex/hpsdiss/hpsdiss.pdf ++++++ hpsdiss.doc.tar.xz -> epsf.doc.tar.xz ++++++ ++++ 2701 lines of diff (skipped) ++++++ hpsdiss.doc.tar.xz -> epsf.tar.xz ++++++ Files old/doc/latex/hpsdiss/hpsdiss.pdf and new/doc/latex/hpsdiss/hpsdiss.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/epsf/epsf.sty new/tex/generic/epsf/epsf.sty --- old/tex/generic/epsf/epsf.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/epsf/epsf.sty 2011-02-19 01:39:16.000000000 +0100 @@ -0,0 +1,653 @@ +%%% -*-TeX-*- +%%% ==================================================================== +%%% @TeX-file{ +%%% author = "Tom Rokicki", +%%% version = "2.7.4", +%%% date = "14 February 2011", +%%% time = "15:44:06 MST", +%%% filename = "epsf.tex", +%%% address = "Tom Rokicki +%%% Box 2081 +%%% Stanford, CA 94309 +%%% USA", +%%% telephone = "+1 415 855 9989", +%%% checksum = "29223 653 3100 27123", +%%% email = "rokicki@cs.stanford.edu (Internet)", +%%% codetable = "ISO/ASCII", +%%% copyright = "This file is freely redistributable and +%%% placed into the public domain by Tomas +%%% Rokicki.", +%%% keywords = "PostScript, TeX", +%%% license = "public domain", +%%% supported = "yes", +%%% abstract = "This file contains macros to support the +%%% inclusion of Encapsulated PostScript files +%%% in TeX documents.", +%%% docstring = "This file contains TeX macros to include an +%%% Encapsulated PostScript graphic. It works +%%% by finding the bounding box comment, +%%% calculating the correct scale values, and +%%% inserting a vbox of the appropriate size at +%%% the current position in the TeX document. +%%% +%%% To use, simply use +%%% +%%% \input epsf % somewhere early on in your TeX file +%%% +%%% % then where you want to insert a vbox for a figure: +%%% \epsfbox{filename.ps} +%%% +%%% Alternatively, you can supply your own +%%% bounding box by +%%% +%%% \epsfbox[0 0 30 50]{filename.ps} +%%% +%%% This will not read in the file, and will +%%% instead use the bounding box you specify. +%%% +%%% The effect will be to typeset the figure as +%%% a TeX box, at the point of your \epsfbox +%%% command. By default, the graphic will have +%%% its `natural' width (namely the width of +%%% its bounding box, as described in +%%% filename.ps). The TeX box will have depth +%%% zero. +%%% +%%% You can enlarge or reduce the figure by +%%% using +%%% +%%% \epsfxsize = <dimen> \epsfbox{filename.ps} +%%% or +%%% \epsfysize = <dimen> \epsfbox{filename.ps} +%%% +%%% instead. Then the width of the TeX box will +%%% be \epsfxsize and its height will be scaled +%%% proportionately (or the height will be +%%% \epsfysize and its width will be scaled +%%% proportionately). +%%% +%%% The width (and height) is restored to zero +%%% after each use, so \epsfxsize or \epsfysize +%%% must be specified before EACH use of +%%% \epsfbox. +%%% +%%% A more general facility for sizing is +%%% available by defining the \epsfsize macro. +%%% Normally you can redefine this macro to do +%%% almost anything. The first parameter is +%%% the natural x size of the PostScript +%%% graphic, the second parameter is the +%%% natural y size of the PostScript graphic. +%%% It must return the xsize to use, or 0 if +%%% natural scaling is to be used. Common uses +%%% include: +%%% +%%% \epsfxsize % just leave the old value alone +%%% 0pt % use the natural sizes +%%% #1 % use the natural sizes +%%% \hsize % scale to full width +%%% 0.5#1 % scale to 50% of natural size +%%% \ifnum #1 > \hsize \hsize \else #1\fi +%%% % smaller of natural, hsize +%%% +%%% If you want TeX to report the size of the +%%% figure (as a message on your terminal when +%%% it processes each figure), use +%%% `\epsfverbosetrue'. +%%% +%%% If you only want to get the bounding box +%%% extents, without producing any output boxes +%%% or \special{}, then use \epsfgetbb{filename}. +%%% The bounding box corner coordinates are saved +%%% in the macros \epsfllx, \epsflly, \epsfurx, +%%% and \epsfury in PostScript units of big +%%% points. +%%% +%%% Revision history: +%%% +%%% --------------------------------------------- +%%% epsf.tex macro file: +%%% Originally written by Tomas Rokicki of +%%% Radical Eye Software, 29 Mar 1989. +%%% +%%% --------------------------------------------- +%%% Revised by Don Knuth, 3 Jan 1990. +%%% +%%% --------------------------------------------- +%%% Revised by Tomas Rokicki, 18 Jul 1990. +%%% Accept bounding boxes with no space after +%%% the colon. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 03 Dec 1991 [2.0]. +%%% Add version number and date typeout. +%%% +%%% Use \immediate\write16 instead of \message +%%% to ensure output on new line. +%%% +%%% Handle nested EPS files. +%%% +%%% Handle %%BoundingBox: (atend) lines. +%%% +%%% Do not quit when blank lines are found. +%%% +%%% Add a few percents to remove generation of +%%% spurious blank space. +%%% +%%% Move \special output to +%%% \epsfspecial{filename} so that other macro +%%% packages can input this one, then change +%%% the definition of \epsfspecial to match +%%% another DVI driver. +%%% +%%% Move size computation to \epsfsetsize which +%%% can be called by the user; the verbose +%%% output of the bounding box and scaled width +%%% and height happens here. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 05 May 1992 [2.1]. +%%% Wrap \leavevmode\hbox{} around \vbox{} with +%%% the \special so that \epsffile{} can be +%%% used inside \begin{center}...\end{center} +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 09 Dec 1992 [2.2]. +%%% Introduce \epsfshow{true,false} and +%%% \epsfframe{true,false} macros; the latter +%%% suppresses the insertion of the PostScript, +%%% and instead just creates an empty box, +%%% which may be handy for rapid prototyping. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 14 Dec 1992 [2.3]. +%%% Add \epsfshowfilename{true,false}. When +%%% true, and \epsfshowfalse is specified, the +%%% PostScript file name will be displayed +%%% centered in the figure box. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 20 June 1993 [2.4]. +%%% Remove non-zero debug setting of \epsfframemargin, +%%% and change margin handling to preserve EPS image +%%% size and aspect ratio, so that the actual +%%% box is \epsfxsize+\epsfframemargin wide by +%%% \epsfysize+\epsfframemargin high. +%%% Reduce output of \epsfshowfilenametrue to +%%% just the bare file name. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 13 July 1993 [2.5]. +%%% Add \epsfframethickness for control of +%%% \epsfframe frame lines. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 02 July 1996 [2.6] +%%% Add missing initialization \epsfatendfalse; +%%% the lack of this resulted in the wrong +%%% BoundingBox being picked up, mea culpa, sigh... +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 25 October 1996 [2.7] +%%% Update to match changes in from dvips 5-600 +%%% distribution: new user-accessible macros: +%%% \epsfclipon, \epsfclipoff, \epsfdrafton, +%%% \epsfdraftoff, change \empty to \epsfempty. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 18 May 2002 [2.7.1] +%%% Add write statements to echo input file +%%% names. Prior to that change, an error in +%%% such a file could be quite hard to track +%%% down: a long list of TeX page numbers could +%%% suddenly be followed by ``TeX buffer +%%% capacity'' exceeded, without any indication +%%% of the file that was responsible. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 16 May 2003 [2.7.2] +%%% Supply two critical percent characters that +%%% were mistakenly omitted in version 2.7.1, +%%% and resulted in a small amount of spurious +%%% horizontal space. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 14 Feb 2011 [2.7.3] +%%% Add previously-missing \space in rwi +%%% assignments (bug reported 14-Feb-2011 by +%%% Stefan Rueger <s.rueger@open.ac.uk>). +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, Karl Berry +%%% <karl@freefriends.org>, and Robin Fairbairns +%%% <Robin.Fairbairns@cl.cam.ac.uk>, +%%% 23 July 2005 [2.7.3] +%%% Add critical \hbox{} wrapper in \epsfsetgraph +%%% so that \epsfbox{} does not conflict with +%%% LaTeX center environment when \epsfbox{} is +%%% surrounded by other horizonal objects. +%%% Improve macro readability by adding legal, +%%% but invisible-in-typeset-output, spaces. +%%% Ensure that verbose status reports come +%%% inside (filename ...) list. +%%% +%%% --------------------------------------------- +%%% The checksum field above contains a CRC-16 +%%% checksum as the first value, followed by +%%% the equivalent of the standard UNIX wc +%%% (word count) utility output of lines, +%%% words, and characters. This is produced by +%%% Robert Solovay's checksum utility.", +%%% } +%%% ==================================================================== + +%\immediate \write16 {This is `epsf.tex' v2.0 <02 Dec 1991>}% +%\immediate \write16 {This is `epsf.tex' v2.1 <05 May 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.2 <09 Dec 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.3 <14 Dec 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.4 <20 June 1993>}% +%\immediate \write16 {This is `epsf.tex' v2.5 <13 July 1993>}% +%\immediate \write16 {This is `epsf.tex' v2.6 <02 July 1996>}% +%\immediate \write16 {This is `epsf.tex' v2.7 <25 October 1996>}% +%\immediate \write16 {This is `epsf.tex' v2.7.1 <18 May 2002>}% +%\immediate \write16 {This is `epsf.tex' v2.7.2 <16 May 2003>}% +%\immediate \write16 {This is `epsf.tex' v2.7.3 <23 July 2005>}% +\immediate \write16 {This is `epsf.tex' v2.7.4 <14 February 2011>}% +% +\newread \epsffilein % file to \read +\newif \ifepsfatend % need to scan to LAST %%BoundingBox comment? +\newif \ifepsfbbfound % success? +\newif \ifepsfdraft % use draft mode? +\newif \ifepsffileok % continue looking for the bounding box? +\newif \ifepsfframe % frame the bounding box? +\newif \ifepsfshow % show PostScript file, or just bounding box? +\epsfshowtrue % default is to display PostScript file +\newif \ifepsfshowfilename % show the file name if \epsfshowfalse specified? +\newif \ifepsfverbose % report what you're making? +\newdimen \epsfframemargin % margin between box and frame +\newdimen \epsfframethickness % thickness of frame rules +\newdimen \epsfrsize % vertical size before scaling +\newdimen \epsftmp % register for arithmetic manipulation +\newdimen \epsftsize % horizontal size before scaling +\newdimen \epsfxsize % horizontal size after scaling +\newdimen \epsfysize % vertical size after scaling +\newdimen \pspoints % conversion factor +% +\pspoints = 1bp % Adobe points are `big' +\epsfxsize = 0pt % default value, means `use natural size' +\epsfysize = 0pt % ditto +\epsfframemargin = 0pt % default value: frame box flush around picture +\epsfframethickness = 0.4pt % TeX's default rule thickness +% +\def \epsfbox #1{% + \global \def \epsfllx {72}% + \global \def \epsflly {72}% + \global \def \epsfurx {540}% + \global \def \epsfury {720}% + \def \lbracket {[}% + \def \testit {#1}% + \ifx \testit \lbracket + \let \next = \epsfgetlitbb + \else + \let \next = \epsfnormal + \fi + \next{#1}% +}% +% +% We use \epsfgetlitbb if the user specified an explicit bounding box, +% and \epsfnormal otherwise. Because \epsfgetbb can be called +% separately to retrieve the bounding box, we move the verbose +% printing the bounding box extents and size on the terminal to +% \epsfstatus. Therefore, when the user provided the bounding box, +% \epsfgetbb will not be called, so we must call \epsfsetsize and +% \epsfstatus ourselves. +% +\def \epsfgetlitbb #1#2 #3 #4 #5]#6{% + \epsfgrab #2 #3 #4 #5 .\\% + \epsfsetsize + \epsfstatus{#6}% + \epsfsetgraph{#6}% +}% +% +\def \epsfnormal #1{% + \epsfgetbb{#1}% + \epsfsetgraph{#1}% +}% +% +\def \epsfgetbb #1{% +% +% The first thing we need to do is to open the +% PostScript file, if possible. +% + \openin\epsffilein=#1 + \immediate \write16 {(#1}% + \ifeof \epsffilein + \errmessage{Could not open file #1, ignoring it}% + \else %process the file + {% %start a group to contain catcode changes + % Make all special characters, except space, to be of type + % `other' so we process the file in almost verbatim mode + % (TeXbook, p. 344). + \chardef \other = 12% + \def \do ##1{\catcode`##1=\other}% + \dospecials + \catcode `\ = 10% + \epsffileoktrue %true while we are looping + \epsfatendfalse %[02-Jul-1996]: add forgotten initialization + \loop %reading lines from the EPS file + \read \epsffilein to \epsffileline + \ifeof \epsffilein %then no more input + \epsffileokfalse %so set completion flag + \else %otherwise process one line + \expandafter \epsfaux \epsffileline :. \\% + \fi + \ifepsffileok + \repeat + \ifepsfbbfound + \else + \ifepsfverbose + \immediate \write16 {No BoundingBox comment found in % + file #1; using defaults}% + \fi + \fi + }% %end catcode changes + \closein\epsffilein + \fi %end of file processing + \epsfsetsize %compute size parameters + \epsfstatus{#1}% + \immediate \write16 {)}% +}% +% +% Clipping control: +\def \epsfclipon {\def \epsfclipstring { clip}}% +\def \epsfclipoff {\def \epsfclipstring {\ifepsfdraft \space clip\fi}}% +\epsfclipoff % default for dvips is OFF +% +% The special that is emitted by \epsfsetgraph comes from this macro. +% It is defined separately to allow easy customization by other +% packages that first \input epsf.tex, then redefine \epsfspecial. +% This macro is invoked in the lower-left corner of a box of the +% width and height determined from the arguments to \epsffile, or +% from the %%BoundingBox in the EPS file itself. +% +% This version is for dvips: +\def \epsfspecial #1{% + \epsftmp=10\epsfxsize + \divide \epsftmp by \pspoints + \ifnum \epsfrsize = 0% + \relax + \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space + llx=\epsfllx\space + lly=\epsflly\space + urx=\epsfurx\space + ury=\epsfury\space + rwi=\number\epsftmp\space + \epsfclipstring + }% + \else + \epsfrsize=10\epsfysize + \divide \epsfrsize by \pspoints + \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space + llx=\epsfllx\space + lly=\epsflly\space + urx=\epsfurx\space + ury=\epsfury\space + rwi=\number\epsftmp\space + rhi=\number\epsfrsize + \epsfclipstring + }% + \fi +}% +% +% \epsfframe macro adapted from the TeXbook, exercise 21.3, p. 223, 331. +% but modified to set the box width to the natural width, rather +% than the line width, and to include space for margins and rules +\def \epsfframe #1% +{% + % method for detecting latex suggested by Robin Fairbairns, May 2005. + \ifx \documentstyle \epsfundefined + \relax + \else +% \leavevmode % so we can put this inside + % a latex centered environment + % The \leavevmode breaks under plain when this is inside a box, + % because it forces the figure to be the entire \hsize. On the + % other hand, we need the \leavevmode for it to work in LaTeX, + % because the {center} environment works by adjusting TeX's + % paragraph parameters. + % + % Compare the LaTeX sequence + % \begin{center} + % \epsfbox{tip.eps}q + % \end{center} + % (needs the \leavevmode to put the q right next to the image) + % + % with the plain TeX sequence: + % \leftline{\vbox{\epsfbox{tip.eps}}q} + % (had the q all the way over to the right, when \leavevmode was used) + \fi + % + \setbox0 = \hbox{#1}% + \dimen0 = \wd0 % natural width of argument + \advance \dimen0 by 2\epsfframemargin % plus width of 2 margins + \advance \dimen0 by 2\epsfframethickness % plus width of 2 rule lines + \relax + \hbox{% + \vbox + {% + \hrule height \epsfframethickness depth 0pt + \hbox to \dimen0 + {% + \hss + \vrule width \epsfframethickness + \kern \epsfframemargin + \vbox {\kern \epsfframemargin \box0 \kern \epsfframemargin }% + \kern \epsfframemargin + \vrule width \epsfframethickness + \hss + }% end hbox + \hrule height 0pt depth \epsfframethickness + }% end vbox + }% end hbox + \relax +}% +% +\def \epsfsetgraph #1% +{% + % + % Make the vbox and stick in a \special that the DVI driver can + % parse. \vfil and \hfil are used to place the \special origin at + % the lower-left corner of the vbox. \epsfspecial can be redefined + % to produce alternate \special syntaxes. + % + \ifvmode \leavevmode \fi + \relax + \hbox{% so we can put this in \begin{center}...\end{center} + \ifepsfframe \expandafter \epsfframe \fi + {\vbox to\epsfysize + {% + \ifepsfshow + % output \special{} at lower-left corner of figure box + \vfil + \hbox to \epsfxsize{\epsfspecial{#1}\hfil}% + \else + \vfil + \hbox to\epsfxsize{% + \hss + \ifepsfshowfilename + {% + \epsfframemargin=3pt % local change of margin + \epsfframe{{\tt #1}}% + }% + \fi + \hss + }% + \vfil + \fi + }% + }}% + \relax + % + % Reset \epsfxsize and \epsfysize, as documented above. + % + \global \epsfxsize = 0pt + \global \epsfysize = 0pt +}% +% +% Now we have to calculate the scale and offset values to use. +% First we compute the natural sizes. +% +\def \epsfsetsize +{% + \epsfrsize = \epsfury \pspoints + \advance \epsfrsize by -\epsflly \pspoints + \epsftsize = \epsfurx \pspoints + \advance \epsftsize by -\epsfllx \pspoints +% +% If `epsfxsize' is 0, we default to the natural size of the picture. +% Otherwise we scale the graph to be \epsfxsize wide. +% + \epsfxsize = \epsfsize{\epsftsize}{\epsfrsize}% + \ifnum \epsfxsize = 0 + \ifnum \epsfysize = 0 + \epsfxsize = \epsftsize + \epsfysize = \epsfrsize + \epsfrsize = 0pt +% +% We have a sticky problem here: TeX doesn't do floating point arithmetic! +% Our goal is to compute y = rx/t. The following loop does this reasonably +% fast, with an error of at most about 16 sp (about 1/4000 pt). +% + \else + \epsftmp = \epsftsize + \divide \epsftmp by \epsfrsize + \epsfxsize = \epsfysize + \multiply \epsfxsize by \epsftmp + \multiply \epsftmp by \epsfrsize + \advance \epsftsize by -\epsftmp + \epsftmp = \epsfysize + \loop + \advance \epsftsize by \epsftsize + \divide \epsftmp by 2 + \ifnum \epsftmp > 0 + \ifnum \epsftsize < \epsfrsize + \else + \advance \epsftsize -\epsfrsize + \advance \epsfxsize \epsftmp + \fi + \repeat + \epsfrsize = 0pt + \fi + \else + \ifnum \epsfysize = 0 + \epsftmp = \epsfrsize + \divide \epsftmp by \epsftsize + \epsfysize = \epsfxsize + \multiply \epsfysize by \epsftmp + \multiply \epsftmp by \epsftsize + \advance \epsfrsize by -\epsftmp + \epsftmp = \epsfxsize + \loop + \advance \epsfrsize by \epsfrsize + \divide \epsftmp by 2 + \ifnum \epsftmp > 0 + \ifnum \epsfrsize < \epsftsize + \else + \advance \epsfrsize by -\epsftsize + \advance \epsfysize by \epsftmp + \fi + \repeat + \epsfrsize = 0pt + \else + \epsfrsize = \epsfysize + \fi + \fi +}% +% +% Issue some status messages if the user requested them +% +\def \epsfstatus #1{% arg = filename + \ifepsfverbose + \immediate \write16 {#1: BoundingBox: + llx = \epsfllx \space lly = \epsflly \space + urx = \epsfurx \space ury = \epsfury \space}% + \immediate \write16 {#1: scaled width = \the\epsfxsize \space + scaled height = \the\epsfysize}% + \fi +}% +% +% We still need to define the tricky \epsfaux macro. This requires +% a couple of magic constants for comparison purposes. +% +{\catcode`\%=12 \global \let \epsfpercent=%\global \def \epsfbblit {%BoundingBox}}% +\global \def \epsfatend{(atend)}% +% +% So we're ready to check for `%BoundingBox:' and to grab the +% values if they are found. +% +% If we find a line +% +% %%BoundingBox: (atend) +% +% then we ignore it, but set a flag to force parsing all of the +% file, so the last %%BoundingBox parsed will be the one used. This +% is necessary, because EPS files can themselves contain other EPS +% files with their own %%BoundingBox comments. +% +% If we find a line +% +% %%BoundingBox: llx lly urx ury +% +% then we save the 4 values in \epsfllx, \epsflly, \epsfurx, \epsfury. +% Then, if we have not previously parsed an (atend), we flag completion +% and can stop reading the file. Otherwise, we must keep on reading +% to end of file so that we find the values on the LAST %%BoundingBox. +\long \def \epsfaux#1#2:#3\\% +{% + \def \testit {#2}% % save second character up to just before colon + \ifx#1\epsfpercent % then first char is percent (quick test) + \ifx \testit \epsfbblit % then (slow test) we have %%BoundingBox + \epsfgrab #3 . . . \\% + \ifx \epsfllx\epsfatend % then ignore %%BoundingBox: (atend) + \global \epsfatendtrue + \else % else found %%BoundingBox: llx lly urx ury + \ifepsfatend % then keep parsing ALL %%BoundingBox lines + \else % else stop after first one parsed + \epsffileokfalse + \fi + \global \epsfbbfoundtrue + \fi + \fi + \fi +}% +% +% Here we grab the values and stuff them in the appropriate definitions. +% +\def \epsfempty {}% +\def \epsfgrab #1 #2 #3 #4 #5\\{% + \global \def \epsfllx {#1}\ifx \epsfllx\epsfempty + \epsfgrab #2 #3 #4 #5 .\\\else + \global \def \epsflly {#2}% + \global \def \epsfurx {#3}\global \def \epsfury {#4}\fi +}% +% +% We default the epsfsize macro. +% +\def \epsfsize #1#2{\epsfxsize}% +% +% Finally, another definition for compatibility with older macros. +% +\let \epsffile = \epsfbox +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/epsf/epsf.tex new/tex/generic/epsf/epsf.tex --- old/tex/generic/epsf/epsf.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/generic/epsf/epsf.tex 2011-02-19 01:39:16.000000000 +0100 @@ -0,0 +1,653 @@ +%%% -*-TeX-*- +%%% ==================================================================== +%%% @TeX-file{ +%%% author = "Tom Rokicki", +%%% version = "2.7.4", +%%% date = "14 February 2011", +%%% time = "15:44:06 MST", +%%% filename = "epsf.tex", +%%% address = "Tom Rokicki +%%% Box 2081 +%%% Stanford, CA 94309 +%%% USA", +%%% telephone = "+1 415 855 9989", +%%% checksum = "29223 653 3100 27123", +%%% email = "rokicki@cs.stanford.edu (Internet)", +%%% codetable = "ISO/ASCII", +%%% copyright = "This file is freely redistributable and +%%% placed into the public domain by Tomas +%%% Rokicki.", +%%% keywords = "PostScript, TeX", +%%% license = "public domain", +%%% supported = "yes", +%%% abstract = "This file contains macros to support the +%%% inclusion of Encapsulated PostScript files +%%% in TeX documents.", +%%% docstring = "This file contains TeX macros to include an +%%% Encapsulated PostScript graphic. It works +%%% by finding the bounding box comment, +%%% calculating the correct scale values, and +%%% inserting a vbox of the appropriate size at +%%% the current position in the TeX document. +%%% +%%% To use, simply use +%%% +%%% \input epsf % somewhere early on in your TeX file +%%% +%%% % then where you want to insert a vbox for a figure: +%%% \epsfbox{filename.ps} +%%% +%%% Alternatively, you can supply your own +%%% bounding box by +%%% +%%% \epsfbox[0 0 30 50]{filename.ps} +%%% +%%% This will not read in the file, and will +%%% instead use the bounding box you specify. +%%% +%%% The effect will be to typeset the figure as +%%% a TeX box, at the point of your \epsfbox +%%% command. By default, the graphic will have +%%% its `natural' width (namely the width of +%%% its bounding box, as described in +%%% filename.ps). The TeX box will have depth +%%% zero. +%%% +%%% You can enlarge or reduce the figure by +%%% using +%%% +%%% \epsfxsize = <dimen> \epsfbox{filename.ps} +%%% or +%%% \epsfysize = <dimen> \epsfbox{filename.ps} +%%% +%%% instead. Then the width of the TeX box will +%%% be \epsfxsize and its height will be scaled +%%% proportionately (or the height will be +%%% \epsfysize and its width will be scaled +%%% proportionately). +%%% +%%% The width (and height) is restored to zero +%%% after each use, so \epsfxsize or \epsfysize +%%% must be specified before EACH use of +%%% \epsfbox. +%%% +%%% A more general facility for sizing is +%%% available by defining the \epsfsize macro. +%%% Normally you can redefine this macro to do +%%% almost anything. The first parameter is +%%% the natural x size of the PostScript +%%% graphic, the second parameter is the +%%% natural y size of the PostScript graphic. +%%% It must return the xsize to use, or 0 if +%%% natural scaling is to be used. Common uses +%%% include: +%%% +%%% \epsfxsize % just leave the old value alone +%%% 0pt % use the natural sizes +%%% #1 % use the natural sizes +%%% \hsize % scale to full width +%%% 0.5#1 % scale to 50% of natural size +%%% \ifnum #1 > \hsize \hsize \else #1\fi +%%% % smaller of natural, hsize +%%% +%%% If you want TeX to report the size of the +%%% figure (as a message on your terminal when +%%% it processes each figure), use +%%% `\epsfverbosetrue'. +%%% +%%% If you only want to get the bounding box +%%% extents, without producing any output boxes +%%% or \special{}, then use \epsfgetbb{filename}. +%%% The bounding box corner coordinates are saved +%%% in the macros \epsfllx, \epsflly, \epsfurx, +%%% and \epsfury in PostScript units of big +%%% points. +%%% +%%% Revision history: +%%% +%%% --------------------------------------------- +%%% epsf.tex macro file: +%%% Originally written by Tomas Rokicki of +%%% Radical Eye Software, 29 Mar 1989. +%%% +%%% --------------------------------------------- +%%% Revised by Don Knuth, 3 Jan 1990. +%%% +%%% --------------------------------------------- +%%% Revised by Tomas Rokicki, 18 Jul 1990. +%%% Accept bounding boxes with no space after +%%% the colon. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 03 Dec 1991 [2.0]. +%%% Add version number and date typeout. +%%% +%%% Use \immediate\write16 instead of \message +%%% to ensure output on new line. +%%% +%%% Handle nested EPS files. +%%% +%%% Handle %%BoundingBox: (atend) lines. +%%% +%%% Do not quit when blank lines are found. +%%% +%%% Add a few percents to remove generation of +%%% spurious blank space. +%%% +%%% Move \special output to +%%% \epsfspecial{filename} so that other macro +%%% packages can input this one, then change +%%% the definition of \epsfspecial to match +%%% another DVI driver. +%%% +%%% Move size computation to \epsfsetsize which +%%% can be called by the user; the verbose +%%% output of the bounding box and scaled width +%%% and height happens here. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 05 May 1992 [2.1]. +%%% Wrap \leavevmode\hbox{} around \vbox{} with +%%% the \special so that \epsffile{} can be +%%% used inside \begin{center}...\end{center} +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 09 Dec 1992 [2.2]. +%%% Introduce \epsfshow{true,false} and +%%% \epsfframe{true,false} macros; the latter +%%% suppresses the insertion of the PostScript, +%%% and instead just creates an empty box, +%%% which may be handy for rapid prototyping. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 14 Dec 1992 [2.3]. +%%% Add \epsfshowfilename{true,false}. When +%%% true, and \epsfshowfalse is specified, the +%%% PostScript file name will be displayed +%%% centered in the figure box. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 20 June 1993 [2.4]. +%%% Remove non-zero debug setting of \epsfframemargin, +%%% and change margin handling to preserve EPS image +%%% size and aspect ratio, so that the actual +%%% box is \epsfxsize+\epsfframemargin wide by +%%% \epsfysize+\epsfframemargin high. +%%% Reduce output of \epsfshowfilenametrue to +%%% just the bare file name. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 13 July 1993 [2.5]. +%%% Add \epsfframethickness for control of +%%% \epsfframe frame lines. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 02 July 1996 [2.6] +%%% Add missing initialization \epsfatendfalse; +%%% the lack of this resulted in the wrong +%%% BoundingBox being picked up, mea culpa, sigh... +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 25 October 1996 [2.7] +%%% Update to match changes in from dvips 5-600 +%%% distribution: new user-accessible macros: +%%% \epsfclipon, \epsfclipoff, \epsfdrafton, +%%% \epsfdraftoff, change \empty to \epsfempty. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 18 May 2002 [2.7.1] +%%% Add write statements to echo input file +%%% names. Prior to that change, an error in +%%% such a file could be quite hard to track +%%% down: a long list of TeX page numbers could +%%% suddenly be followed by ``TeX buffer +%%% capacity'' exceeded, without any indication +%%% of the file that was responsible. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 16 May 2003 [2.7.2] +%%% Supply two critical percent characters that +%%% were mistakenly omitted in version 2.7.1, +%%% and resulted in a small amount of spurious +%%% horizontal space. +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, 14 Feb 2011 [2.7.3] +%%% Add previously-missing \space in rwi +%%% assignments (bug reported 14-Feb-2011 by +%%% Stefan Rueger <s.rueger@open.ac.uk>). +%%% +%%% --------------------------------------------- +%%% Revised by Nelson H. F. Beebe +%%% <beebe@math.utah.edu>, Karl Berry +%%% <karl@freefriends.org>, and Robin Fairbairns +%%% <Robin.Fairbairns@cl.cam.ac.uk>, +%%% 23 July 2005 [2.7.3] +%%% Add critical \hbox{} wrapper in \epsfsetgraph +%%% so that \epsfbox{} does not conflict with +%%% LaTeX center environment when \epsfbox{} is +%%% surrounded by other horizonal objects. +%%% Improve macro readability by adding legal, +%%% but invisible-in-typeset-output, spaces. +%%% Ensure that verbose status reports come +%%% inside (filename ...) list. +%%% +%%% --------------------------------------------- +%%% The checksum field above contains a CRC-16 +%%% checksum as the first value, followed by +%%% the equivalent of the standard UNIX wc +%%% (word count) utility output of lines, +%%% words, and characters. This is produced by +%%% Robert Solovay's checksum utility.", +%%% } +%%% ==================================================================== + +%\immediate \write16 {This is `epsf.tex' v2.0 <02 Dec 1991>}% +%\immediate \write16 {This is `epsf.tex' v2.1 <05 May 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.2 <09 Dec 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.3 <14 Dec 1992>}% +%\immediate \write16 {This is `epsf.tex' v2.4 <20 June 1993>}% +%\immediate \write16 {This is `epsf.tex' v2.5 <13 July 1993>}% +%\immediate \write16 {This is `epsf.tex' v2.6 <02 July 1996>}% +%\immediate \write16 {This is `epsf.tex' v2.7 <25 October 1996>}% +%\immediate \write16 {This is `epsf.tex' v2.7.1 <18 May 2002>}% +%\immediate \write16 {This is `epsf.tex' v2.7.2 <16 May 2003>}% +%\immediate \write16 {This is `epsf.tex' v2.7.3 <23 July 2005>}% +\immediate \write16 {This is `epsf.tex' v2.7.4 <14 February 2011>}% +% +\newread \epsffilein % file to \read +\newif \ifepsfatend % need to scan to LAST %%BoundingBox comment? +\newif \ifepsfbbfound % success? +\newif \ifepsfdraft % use draft mode? +\newif \ifepsffileok % continue looking for the bounding box? +\newif \ifepsfframe % frame the bounding box? +\newif \ifepsfshow % show PostScript file, or just bounding box? +\epsfshowtrue % default is to display PostScript file +\newif \ifepsfshowfilename % show the file name if \epsfshowfalse specified? +\newif \ifepsfverbose % report what you're making? +\newdimen \epsfframemargin % margin between box and frame +\newdimen \epsfframethickness % thickness of frame rules +\newdimen \epsfrsize % vertical size before scaling +\newdimen \epsftmp % register for arithmetic manipulation +\newdimen \epsftsize % horizontal size before scaling +\newdimen \epsfxsize % horizontal size after scaling +\newdimen \epsfysize % vertical size after scaling +\newdimen \pspoints % conversion factor +% +\pspoints = 1bp % Adobe points are `big' +\epsfxsize = 0pt % default value, means `use natural size' +\epsfysize = 0pt % ditto +\epsfframemargin = 0pt % default value: frame box flush around picture +\epsfframethickness = 0.4pt % TeX's default rule thickness +% +\def \epsfbox #1{% + \global \def \epsfllx {72}% + \global \def \epsflly {72}% + \global \def \epsfurx {540}% + \global \def \epsfury {720}% + \def \lbracket {[}% + \def \testit {#1}% + \ifx \testit \lbracket + \let \next = \epsfgetlitbb + \else + \let \next = \epsfnormal + \fi + \next{#1}% +}% +% +% We use \epsfgetlitbb if the user specified an explicit bounding box, +% and \epsfnormal otherwise. Because \epsfgetbb can be called +% separately to retrieve the bounding box, we move the verbose +% printing the bounding box extents and size on the terminal to +% \epsfstatus. Therefore, when the user provided the bounding box, +% \epsfgetbb will not be called, so we must call \epsfsetsize and +% \epsfstatus ourselves. +% +\def \epsfgetlitbb #1#2 #3 #4 #5]#6{% + \epsfgrab #2 #3 #4 #5 .\\% + \epsfsetsize + \epsfstatus{#6}% + \epsfsetgraph{#6}% +}% +% +\def \epsfnormal #1{% + \epsfgetbb{#1}% + \epsfsetgraph{#1}% +}% +% +\def \epsfgetbb #1{% +% +% The first thing we need to do is to open the +% PostScript file, if possible. +% + \openin\epsffilein=#1 + \immediate \write16 {(#1}% + \ifeof \epsffilein + \errmessage{Could not open file #1, ignoring it}% + \else %process the file + {% %start a group to contain catcode changes + % Make all special characters, except space, to be of type + % `other' so we process the file in almost verbatim mode + % (TeXbook, p. 344). + \chardef \other = 12% + \def \do ##1{\catcode`##1=\other}% + \dospecials + \catcode `\ = 10% + \epsffileoktrue %true while we are looping + \epsfatendfalse %[02-Jul-1996]: add forgotten initialization + \loop %reading lines from the EPS file + \read \epsffilein to \epsffileline + \ifeof \epsffilein %then no more input + \epsffileokfalse %so set completion flag + \else %otherwise process one line + \expandafter \epsfaux \epsffileline :. \\% + \fi + \ifepsffileok + \repeat + \ifepsfbbfound + \else + \ifepsfverbose + \immediate \write16 {No BoundingBox comment found in % + file #1; using defaults}% + \fi + \fi + }% %end catcode changes + \closein\epsffilein + \fi %end of file processing + \epsfsetsize %compute size parameters + \epsfstatus{#1}% + \immediate \write16 {)}% +}% +% +% Clipping control: +\def \epsfclipon {\def \epsfclipstring { clip}}% +\def \epsfclipoff {\def \epsfclipstring {\ifepsfdraft \space clip\fi}}% +\epsfclipoff % default for dvips is OFF +% +% The special that is emitted by \epsfsetgraph comes from this macro. +% It is defined separately to allow easy customization by other +% packages that first \input epsf.tex, then redefine \epsfspecial. +% This macro is invoked in the lower-left corner of a box of the +% width and height determined from the arguments to \epsffile, or +% from the %%BoundingBox in the EPS file itself. +% +% This version is for dvips: +\def \epsfspecial #1{% + \epsftmp=10\epsfxsize + \divide \epsftmp by \pspoints + \ifnum \epsfrsize = 0% + \relax + \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space + llx=\epsfllx\space + lly=\epsflly\space + urx=\epsfurx\space + ury=\epsfury\space + rwi=\number\epsftmp\space + \epsfclipstring + }% + \else + \epsfrsize=10\epsfysize + \divide \epsfrsize by \pspoints + \special{PSfile=\ifepsfdraft psdraft.ps\else#1\fi\space + llx=\epsfllx\space + lly=\epsflly\space + urx=\epsfurx\space + ury=\epsfury\space + rwi=\number\epsftmp\space + rhi=\number\epsfrsize + \epsfclipstring + }% + \fi +}% +% +% \epsfframe macro adapted from the TeXbook, exercise 21.3, p. 223, 331. +% but modified to set the box width to the natural width, rather +% than the line width, and to include space for margins and rules +\def \epsfframe #1% +{% + % method for detecting latex suggested by Robin Fairbairns, May 2005. + \ifx \documentstyle \epsfundefined + \relax + \else +% \leavevmode % so we can put this inside + % a latex centered environment + % The \leavevmode breaks under plain when this is inside a box, + % because it forces the figure to be the entire \hsize. On the + % other hand, we need the \leavevmode for it to work in LaTeX, + % because the {center} environment works by adjusting TeX's + % paragraph parameters. + % + % Compare the LaTeX sequence + % \begin{center} + % \epsfbox{tip.eps}q + % \end{center} + % (needs the \leavevmode to put the q right next to the image) + % + % with the plain TeX sequence: + % \leftline{\vbox{\epsfbox{tip.eps}}q} + % (had the q all the way over to the right, when \leavevmode was used) + \fi + % + \setbox0 = \hbox{#1}% + \dimen0 = \wd0 % natural width of argument + \advance \dimen0 by 2\epsfframemargin % plus width of 2 margins + \advance \dimen0 by 2\epsfframethickness % plus width of 2 rule lines + \relax + \hbox{% + \vbox + {% + \hrule height \epsfframethickness depth 0pt + \hbox to \dimen0 + {% + \hss + \vrule width \epsfframethickness + \kern \epsfframemargin + \vbox {\kern \epsfframemargin \box0 \kern \epsfframemargin }% + \kern \epsfframemargin + \vrule width \epsfframethickness + \hss + }% end hbox + \hrule height 0pt depth \epsfframethickness + }% end vbox + }% end hbox + \relax +}% +% +\def \epsfsetgraph #1% +{% + % + % Make the vbox and stick in a \special that the DVI driver can + % parse. \vfil and \hfil are used to place the \special origin at + % the lower-left corner of the vbox. \epsfspecial can be redefined + % to produce alternate \special syntaxes. + % + \ifvmode \leavevmode \fi + \relax + \hbox{% so we can put this in \begin{center}...\end{center} + \ifepsfframe \expandafter \epsfframe \fi + {\vbox to\epsfysize + {% + \ifepsfshow + % output \special{} at lower-left corner of figure box + \vfil + \hbox to \epsfxsize{\epsfspecial{#1}\hfil}% + \else + \vfil + \hbox to\epsfxsize{% + \hss + \ifepsfshowfilename + {% + \epsfframemargin=3pt % local change of margin + \epsfframe{{\tt #1}}% + }% + \fi + \hss + }% + \vfil + \fi + }% + }}% + \relax + % + % Reset \epsfxsize and \epsfysize, as documented above. + % + \global \epsfxsize = 0pt + \global \epsfysize = 0pt +}% +% +% Now we have to calculate the scale and offset values to use. +% First we compute the natural sizes. +% +\def \epsfsetsize +{% + \epsfrsize = \epsfury \pspoints + \advance \epsfrsize by -\epsflly \pspoints + \epsftsize = \epsfurx \pspoints + \advance \epsftsize by -\epsfllx \pspoints +% +% If `epsfxsize' is 0, we default to the natural size of the picture. +% Otherwise we scale the graph to be \epsfxsize wide. +% + \epsfxsize = \epsfsize{\epsftsize}{\epsfrsize}% + \ifnum \epsfxsize = 0 + \ifnum \epsfysize = 0 + \epsfxsize = \epsftsize + \epsfysize = \epsfrsize + \epsfrsize = 0pt +% +% We have a sticky problem here: TeX doesn't do floating point arithmetic! +% Our goal is to compute y = rx/t. The following loop does this reasonably +% fast, with an error of at most about 16 sp (about 1/4000 pt). +% + \else + \epsftmp = \epsftsize + \divide \epsftmp by \epsfrsize + \epsfxsize = \epsfysize + \multiply \epsfxsize by \epsftmp + \multiply \epsftmp by \epsfrsize + \advance \epsftsize by -\epsftmp + \epsftmp = \epsfysize + \loop + \advance \epsftsize by \epsftsize + \divide \epsftmp by 2 + \ifnum \epsftmp > 0 + \ifnum \epsftsize < \epsfrsize + \else + \advance \epsftsize -\epsfrsize + \advance \epsfxsize \epsftmp + \fi + \repeat + \epsfrsize = 0pt + \fi + \else + \ifnum \epsfysize = 0 + \epsftmp = \epsfrsize + \divide \epsftmp by \epsftsize + \epsfysize = \epsfxsize + \multiply \epsfysize by \epsftmp + \multiply \epsftmp by \epsftsize + \advance \epsfrsize by -\epsftmp + \epsftmp = \epsfxsize + \loop + \advance \epsfrsize by \epsfrsize + \divide \epsftmp by 2 + \ifnum \epsftmp > 0 + \ifnum \epsfrsize < \epsftsize + \else + \advance \epsfrsize by -\epsftsize + \advance \epsfysize by \epsftmp + \fi + \repeat + \epsfrsize = 0pt + \else + \epsfrsize = \epsfysize + \fi + \fi +}% +% +% Issue some status messages if the user requested them +% +\def \epsfstatus #1{% arg = filename + \ifepsfverbose + \immediate \write16 {#1: BoundingBox: + llx = \epsfllx \space lly = \epsflly \space + urx = \epsfurx \space ury = \epsfury \space}% + \immediate \write16 {#1: scaled width = \the\epsfxsize \space + scaled height = \the\epsfysize}% + \fi +}% +% +% We still need to define the tricky \epsfaux macro. This requires +% a couple of magic constants for comparison purposes. +% +{\catcode`\%=12 \global \let \epsfpercent=%\global \def \epsfbblit {%BoundingBox}}% +\global \def \epsfatend{(atend)}% +% +% So we're ready to check for `%BoundingBox:' and to grab the +% values if they are found. +% +% If we find a line +% +% %%BoundingBox: (atend) +% +% then we ignore it, but set a flag to force parsing all of the +% file, so the last %%BoundingBox parsed will be the one used. This +% is necessary, because EPS files can themselves contain other EPS +% files with their own %%BoundingBox comments. +% +% If we find a line +% +% %%BoundingBox: llx lly urx ury +% +% then we save the 4 values in \epsfllx, \epsflly, \epsfurx, \epsfury. +% Then, if we have not previously parsed an (atend), we flag completion +% and can stop reading the file. Otherwise, we must keep on reading +% to end of file so that we find the values on the LAST %%BoundingBox. +\long \def \epsfaux#1#2:#3\\% +{% + \def \testit {#2}% % save second character up to just before colon + \ifx#1\epsfpercent % then first char is percent (quick test) + \ifx \testit \epsfbblit % then (slow test) we have %%BoundingBox + \epsfgrab #3 . . . \\% + \ifx \epsfllx\epsfatend % then ignore %%BoundingBox: (atend) + \global \epsfatendtrue + \else % else found %%BoundingBox: llx lly urx ury + \ifepsfatend % then keep parsing ALL %%BoundingBox lines + \else % else stop after first one parsed + \epsffileokfalse + \fi + \global \epsfbbfoundtrue + \fi + \fi + \fi +}% +% +% Here we grab the values and stuff them in the appropriate definitions. +% +\def \epsfempty {}% +\def \epsfgrab #1 #2 #3 #4 #5\\{% + \global \def \epsfllx {#1}\ifx \epsfllx\epsfempty + \epsfgrab #2 #3 #4 #5 .\\\else + \global \def \epsflly {#2}% + \global \def \epsfurx {#3}\global \def \epsfury {#4}\fi +}% +% +% We default the epsfsize macro. +% +\def \epsfsize #1#2{\epsfxsize}% +% +% Finally, another definition for compatibility with older macros. +% +\let \epsffile = \epsfbox +\endinput 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/epsf.tlpobj 2011-02-19 04:17:10.000000000 +0100 @@ -0,0 +1,18 @@ +name epsf +category Package +revision 21461 +shortdesc Simple macros for EPS inclusion. +relocated 1 +longdesc The original graphics inclusion macros for use with dvips; +longdesc still widely used by Plain TeX users (in particular). For LaTeX +longdesc users, the package is nowadays deprecated in favour of the more +longdesc sophisticated standard LaTeX graphics bundle of packages (which +longdesc are also available to Plain TeX users, either via its Plain TeX +longdesc version, or through the support offered by etex). +runfiles size=14 + RELOC/tex/generic/epsf/epsf.sty + RELOC/tex/generic/epsf/epsf.tex +catalogue-ctan /macros/generic/epsf +catalogue-date 2011-02-18 10:32:12 +0100 +catalogue-license pd +catalogue-version 2.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hpsdiss.doc.tlpobj new/tlpkg/tlpobj/hpsdiss.doc.tlpobj --- old/tlpkg/tlpobj/hpsdiss.doc.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/hpsdiss.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name hpsdiss.doc -category Package -revision 15878 -shortdesc doc files of hpsdiss -relocated 1 -docfiles size=54 - RELOC/doc/latex/hpsdiss/hpsdiss.pdf ++++++ har2nat.doc.tar.xz -> erdc.doc.tar.xz ++++++ ++++ 3907 lines of diff (skipped) ++++++ har2nat.doc.tar.xz -> erdc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/har2nat/README new/doc/latex/har2nat/README --- old/doc/latex/har2nat/README 2007-11-23 21:11:37.000000000 +0100 +++ new/doc/latex/har2nat/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -har2nat package written by Bas Straathof, 2005/12/01 -Eindhoven University of Technology, The Netherlands -bas.straathof@gmail.com. - -This small package allows a LaTeX document containing the citation commands -provided by the Harvard package (Peter Williams and Thorsten Schnier) -to be compiled using the natbib package (Patrick W. Daly). Migration from -harvard to natbib thus can be achieved simply by replacing - -\usepackage{harvard} - -with - -\usepackage{natbib} -\usepackage{har2nat} - ----IMPORTANT--- -har2nat must not be loaded before the natbib package as it redefines -the natbib commands \cite and \citeyear. All other natbib commands remain -unchanged and can be used alongside the Harvard commands. Files old/doc/latex/har2nat/har2nat.pdf and new/doc/latex/har2nat/har2nat.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/har2nat/har2nat.tex new/doc/latex/har2nat/har2nat.tex --- old/doc/latex/har2nat/har2nat.tex 2010-03-07 17:58:43.000000000 +0100 +++ new/doc/latex/har2nat/har2nat.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -\documentclass[DIV=8, pagesize=auto]{scrartcl} - -\usepackage{fixltx2e} -\usepackage{etex} -\usepackage{xspace} -\usepackage{lmodern} -\usepackage[T1]{fontenc} -\usepackage{textcomp} -\usepackage{microtype} -\usepackage[unicode=true]{hyperref} - -\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 - -\addtokomafont{title}{\rmfamily} - -\title{The \pkg{har2nat} package\thanks{This manual corresponds to \pkg{har2nat}~v1.0, dated~2005/12/01.}} -\author{Bas Straathof\\Eindhoven University of Technology, The Netherlands\\\mail{bas.straathof@gmail.com}} -\date{2005/12/01} - - -\begin{document} - -\maketitle - -\noindent -This small package allows a \LaTeX\ document containing the citation commands -provided by the \pkg{Harvard} package (Peter Williams and Thorsten Schnier) -to be compiled using the \pkg{natbib} package (Patrick W. Daly). Migration from -\pkg{harvard} to \pkg{natbib} thus can be achieved simply by replacing -% -\begin{verbatim} -\usepackage{harvard} -\end{verbatim} -% -with -% -\begin{verbatim} -\usepackage{natbib} -\usepackage{har2nat} -\end{verbatim} - - -\minisec{Important:} - -\pkg{har2nat} must not be loaded before the \pkg{natbib} package as it redefines -the \pkg{natbib} commands \cmd{\cite} and \cmd{\citeyear}.\@ All other \pkg{natbib} commands remain -unchanged and can be used alongside the \pkg{Harvard} commands. - -\end{document} 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 2009-07-26 23:52:16.000000000 +0200 @@ -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@}{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@}{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{\@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\@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 2010-06-10 18:27:04.000000000 +0200 @@ -0,0 +1,16 @@ +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 2009-11-09 22:14:03 +0100 +catalogue-license lppl +catalogue-version 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/har2nat.doc.tlpobj new/tlpkg/tlpobj/har2nat.doc.tlpobj --- old/tlpkg/tlpobj/har2nat.doc.tlpobj 2010-06-10 18:29:15.000000000 +0200 +++ new/tlpkg/tlpobj/har2nat.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -name har2nat.doc -category Package -revision 17356 -shortdesc doc files of har2nat -relocated 1 -docfiles size=57 - RELOC/doc/latex/har2nat/README - RELOC/doc/latex/har2nat/har2nat.pdf - RELOC/doc/latex/har2nat/har2nat.tex ++++++ hausarbeit-jura.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 2011-02-14 00:28:58.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. 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/hausarbeit-jura/README new/doc/latex/hausarbeit-jura/README --- old/doc/latex/hausarbeit-jura/README 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ----------------------------------------------------------------- -hausarbeit-jura -- Eine Klasse für juristische Hausarbeiten -E-Mail: info@schoenerpublizieren.de -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -This is the initial version of the class "hausarbeit-jura" for -writing "juristische Hausarbeiten" at German Universities. It -was originally developed for a course at Trier University. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/README. new/doc/latex/hausarbeit-jura/README. --- old/doc/latex/hausarbeit-jura/README. 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/README. 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ----------------------------------------------------------------- -hausarbeit-jura -- Eine Klasse für juristische Hausarbeiten -E-Mail: info@schoenerpublizieren.de -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -This is the initial version of the class "hausarbeit-jura" for -writing "juristische Hausarbeiten" at German Universities. It -was originally developed for a course at Trier University. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/hausarbeit-demo.bib new/doc/latex/hausarbeit-jura/hausarbeit-demo.bib --- old/doc/latex/hausarbeit-jura/hausarbeit-demo.bib 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/hausarbeit-demo.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -@ARTICLE{hau98, - author = {Wolfgang Hau}, - title = {Anmerkung zu BGH, Urt. vom 1.10.1997}, - journal = {JA}, - year = {1998}, - pages = {358--361} -} - -@BOOK{rosenberg10, - title = {Zivilprozessrecht}, - year = {2010}, - author = {Leo Rosenberg and Karl Heinz Schwab and Peter Gottwald}, - shortauthor = {Rosenberg/Schwab/Gottwald}, - shorttitle = {ZPO}, - address = {München}, - edition = {17} -} - -@BOOK{prutting10, - title = {ZPO Kommentar}, - year = {2010}, - editor = {Hanns Prütting and Markus Gehrlein}, - shortauthor = {Prütting/Gehrlein}, - shorttitle = {ZPO}, - address = {Köln}, - edition = {1} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/hausarbeit-demo.tex new/doc/latex/hausarbeit-jura/hausarbeit-demo.tex --- old/doc/latex/hausarbeit-jura/hausarbeit-demo.tex 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/hausarbeit-demo.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -\documentclass{hausarbeit-jura} -\usepackage{blindtext} - -\begin{document} -\title{Hausarbeit} -\subtitle{Übung für Anfänger im öffentlichen Recht} -\author{Otto Normalverbraucher\\Musterweg 12\\12345 Musterstadt\\123456\\3. Fachsemester} -\prof{Prof.\,Dr. X. Y.} -\semester{Wintersemester 2011/2012} -\date{8. Februar 2012} -\maketitle - -\tableofcontents %Inhaltsverzeichnis -\bibliography{hausarbeit-demo} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\chapter{Ein erstes Kapitel}\label{chap:ErstesKapitel} -\TODO{Das fehlt noch was!} -\section{Abschnitt} -\blindtext[4] - -Eine erste Fußnote\footnote{Dies ist eine Fußnote mit Zitat \cite[348, 349]{hau98}.} -\section{Noch ein Abschnitt} -\blindtext - -\chapter{Noch ein Kapitel} -Wie in Kapitel~\ref{chap:ErstesKapitel} auf S.~\pageref{chap:ErstesKapitel} \ldots - -Wie in Kapitel~\xref{chap:ErstesKapitel} \ldots - -\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 2011-02-14 04:13:11.000000000 +0100 @@ -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/hausarbeit-jura.doc.tlpobj new/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj --- old/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj 2012-02-11 04:31:22.000000000 +0100 +++ new/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name hausarbeit-jura.doc -category Package -revision 25356 -shortdesc doc files of hausarbeit-jura -relocated 1 -docfiles size=4 - RELOC/doc/latex/hausarbeit-jura/README - RELOC/doc/latex/hausarbeit-jura/README. - RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.bib - RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.tex ++++++ hausarbeit-jura.doc.tar.xz -> esdiff.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/README new/doc/latex/hausarbeit-jura/README --- old/doc/latex/hausarbeit-jura/README 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ----------------------------------------------------------------- -hausarbeit-jura -- Eine Klasse für juristische Hausarbeiten -E-Mail: info@schoenerpublizieren.de -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -This is the initial version of the class "hausarbeit-jura" for -writing "juristische Hausarbeiten" at German Universities. It -was originally developed for a course at Trier University. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/README. new/doc/latex/hausarbeit-jura/README. --- old/doc/latex/hausarbeit-jura/README. 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/README. 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ----------------------------------------------------------------- -hausarbeit-jura -- Eine Klasse für juristische Hausarbeiten -E-Mail: info@schoenerpublizieren.de -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -This is the initial version of the class "hausarbeit-jura" for -writing "juristische Hausarbeiten" at German Universities. It -was originally developed for a course at Trier University. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/hausarbeit-demo.bib new/doc/latex/hausarbeit-jura/hausarbeit-demo.bib --- old/doc/latex/hausarbeit-jura/hausarbeit-demo.bib 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/hausarbeit-demo.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -@ARTICLE{hau98, - author = {Wolfgang Hau}, - title = {Anmerkung zu BGH, Urt. vom 1.10.1997}, - journal = {JA}, - year = {1998}, - pages = {358--361} -} - -@BOOK{rosenberg10, - title = {Zivilprozessrecht}, - year = {2010}, - author = {Leo Rosenberg and Karl Heinz Schwab and Peter Gottwald}, - shortauthor = {Rosenberg/Schwab/Gottwald}, - shorttitle = {ZPO}, - address = {München}, - edition = {17} -} - -@BOOK{prutting10, - title = {ZPO Kommentar}, - year = {2010}, - editor = {Hanns Prütting and Markus Gehrlein}, - shortauthor = {Prütting/Gehrlein}, - shorttitle = {ZPO}, - address = {Köln}, - edition = {1} -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hausarbeit-jura/hausarbeit-demo.tex new/doc/latex/hausarbeit-jura/hausarbeit-demo.tex --- old/doc/latex/hausarbeit-jura/hausarbeit-demo.tex 2012-02-11 01:54:49.000000000 +0100 +++ new/doc/latex/hausarbeit-jura/hausarbeit-demo.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -\documentclass{hausarbeit-jura} -\usepackage{blindtext} - -\begin{document} -\title{Hausarbeit} -\subtitle{Übung für Anfänger im öffentlichen Recht} -\author{Otto Normalverbraucher\\Musterweg 12\\12345 Musterstadt\\123456\\3. Fachsemester} -\prof{Prof.\,Dr. X. Y.} -\semester{Wintersemester 2011/2012} -\date{8. Februar 2012} -\maketitle - -\tableofcontents %Inhaltsverzeichnis -\bibliography{hausarbeit-demo} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\chapter{Ein erstes Kapitel}\label{chap:ErstesKapitel} -\TODO{Das fehlt noch was!} -\section{Abschnitt} -\blindtext[4] - -Eine erste Fußnote\footnote{Dies ist eine Fußnote mit Zitat \cite[348, 349]{hau98}.} -\section{Noch ein Abschnitt} -\blindtext - -\chapter{Noch ein Kapitel} -Wie in Kapitel~\ref{chap:ErstesKapitel} auf S.~\pageref{chap:ErstesKapitel} \ldots - -Wie in Kapitel~\xref{chap:ErstesKapitel} \ldots - -\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 2008-06-30 18:18:19.000000000 +0200 @@ -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@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 2011-02-14 04:13:11.000000000 +0100 @@ -0,0 +1,16 @@ +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 2011-02-13 18:31:54 +0100 +catalogue-license lppl1 +catalogue-version 1.2 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 2012-02-11 04:31:22.000000000 +0100 +++ new/tlpkg/tlpobj/hausarbeit-jura.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name hausarbeit-jura.doc -category Package -revision 25356 -shortdesc doc files of hausarbeit-jura -relocated 1 -docfiles size=4 - RELOC/doc/latex/hausarbeit-jura/README - RELOC/doc/latex/hausarbeit-jura/README. - RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.bib - RELOC/doc/latex/hausarbeit-jura/hausarbeit-demo.tex ++++++ hyphen-sanskrit.tar.xz -> eskd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/eskd/eskd.cls new/tex/latex/eskd/eskd.cls --- old/tex/latex/eskd/eskd.cls 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/eskd/eskd.cls 2006-01-13 00:55:04.000000000 +0100 @@ -0,0 +1,562 @@ +%% Copyright 2004 Vjacheslav A. Fyodorov + + + + + + + + + + + + + + + + + + + + + + +\NeedsTeXFormat{LaTeX2e} \ProvidesClass{eskd}[2004/10/12 a4 eskd +format (V.Fyodorov@tltsu.ru)] + +\newif\ifeskd@twoside +\eskd@twosidefalse + +\newif\ifeskd@title +\eskd@titlefalse + +\newcommand{\eskdheight}{282} +\newcommand{\eskdencoding}{koi8-r} +\newcommand{\eskdyear}{\number\year} + +\newcommand{\eskd@thin}{0.2} +\newcommand{\eskd@half@thin}{0.1} + +\newcommand{\eskd@thick}{0.4} +\newcommand{\eskd@half@thick}{0.2} + +\RequirePackage{keyval} + +\define@key{eskd}{height}{\renewcommand{\eskdheight}{#1}} +\define@key{eskd}{encoding}{\renewcommand{\eskdencoding}{#1}} +\define@key{eskd}{year}{\renewcommand{\eskdyear}{#1}} + +\DeclareOption{title}{\eskd@titletrue} + +\DeclareOption{twoside}{% + \eskd@twosidetrue + \PassOptionsToClass{\CurrentOption}{article} + \PassOptionsToPackage{twosideshift=0pt}{geometry} + } + +\DeclareOption{draft}{\PassOptionsToClass{\CurrentOption}{article}} + +\DeclareOption*{\edef\@tempa{% + \noexpand\setkeys{eskd}{\CurrentOption}}\@tempa} + +\ProcessOptions\relax + +\LoadClass[a4paper]{article} + + +\RequirePackage[koi8-r,\eskdencoding]{inputenc} +\RequirePackage[russian]{babel} +\RequirePackage[T2A]{fontenc} +\RequirePackage{rotating} +\RequirePackage{lastpage} +\RequirePackage{ifthen} +\RequirePackage{fancyhdr} + +\RequirePackage{pscyr} +\renewcommand{\rmdefault}{far} + +\RequirePackage[left=24mm,right=11mm% +,top=10mm,nofoot,headsep=0pt]{geometry} + + + +\newcommand{\set@eskd@bottom}[1]{% + \setlength{\textheight}{\eskdheight mm} + \addtolength{\textheight}{-#1} + \addtolength{\textheight}{5 mm} + } + + + + + +\newsavebox{\eskd@vertical@frame} + +\newcommand{\make@eskd@vertical@frame}{% + \unitlength 1mm % + \savebox{\eskd@vertical@frame}(0,0){% + \begin{rotate}{90} + \begin{picture}(0,0)(0,0) + \linethickness{\eskd@thick mm} + \put(0,0){\line(0,1){12}} + \put(25,0){\line(0,1){12}} + \put(60,0){\line(0,1){12}} + \put(85,0){\line(0,1){12}} + \put(110,0){\line(0,1){12}} + \put(145,0){\line(0,1){12}} + \put(0,12){\line(0,1){\eskd@half@thick}} + \put(145,12){\line(0,1){\eskd@half@thick}} + \put(0,7){\line(1,0){145}} + \put(0,12){\line(1,0){145}} + \put(12.5,9.5){\makebox(0,0){\itshape + \textar{���. \textnumero\ ����.}}} + \put(42.5,9.5){\makebox(0,0){\itshape + \textar{����. � ����}}} + \put(72.5,9.5){\makebox(0,0){\itshape + \textar{����. ���. \textnumero}}} + \put(97.5,9.5){\makebox(0,0){\itshape + \textar{���. \textnumero\ ����.}}} + \put(127.5,9.5){\makebox(0,0){\itshape + \textar{����. � ����}}} + % + \end{picture}% + \end{rotate} + }} + + + +\newsavebox{\eskd@border} + +\newcommand{\make@eskd@border}{% + \savebox{\eskd@border}(0,0){% + \unitlength 1mm + \begin{picture}(0,0)(0,\eskdheight) + \linethickness{\eskd@thick mm} + \put(0,0){\line(1,0){185}} + \put(0,\eskdheight){\line(1,0){185}} + \put(0,0){\line(0,1){\eskdheight}} + \put(185,0){\line(0,1){\eskdheight}} + \put(-\eskd@half@thick,0){\line(1,0){\eskd@half@thick}} + \put(-\eskd@half@thick,\eskdheight){\line(1,0){\eskd@half@thick}} + \put(185,0){\line(1,0){\eskd@half@thick}} + \put(185,\eskdheight){\line(1,0){\eskd@half@thick}} + \end{picture} +}} + + + +\newsavebox{\eskd@common@left} + +\newcommand{\make@eskd@common@left}{% + \savebox{\eskd@common@left}(0,0){% + \unitlength 1mm % + \begin{picture}(0,0)(0,0) + \linethickness{\eskd@thick mm} + \put(7,0){\line(0,1){15}} + \put(17,0){\line(0,1){15}} + \put(40,0){\line(0,1){15}} + \put(55,0){\line(0,1){15}} + \put(0,5){\line(1,0){65}} + \put(0,15){\line(1,0){65}} + \linethickness{\eskd@thin mm} + \put(0,10){\line(1,0){65}} + \put(3.5,2.5){\makebox(0,0){\footnotesize\itshape\textar{���.}}} + \put(12,2.5){\makebox(0,0){\itshape\textar{����}}} + \put(28.5,2.5){\makebox(0,0){\itshape + \textar{\textnumero\ �����.}}} + \put(47.5,2.5){\makebox(0,0){\itshape\textar{����.}}} + \put(60,2.5){\makebox(0,0){\small\itshape\textar{����}}} + \end{picture} + }} + + +\newsavebox{\eskd@common@hole} +\newcommand{\make@eskd@common@hole}{% + \savebox{\eskd@common@hole}(0,0){% + \unitlength 1mm + \begin{picture}(0,0)(0,0) + \linethickness{\eskd@thick mm} + \put(0,0){\line(0,1){15}} + \put(110,0){\line(0,1){15}} + \put(0,15){\line(1,0){110}} + % + \end{picture} + }} + + + +\newsavebox{\eskd@common@page} + +\newcommand{\make@eskd@common@page}{% + \savebox{\eskd@common@page}(0,0){% + \unitlength 1mm + \begin{picture}(0,0)(0,0) + \linethickness{\eskd@thick mm} + \put(0,15){\line(1,0){10}} + \put(0,8){\line(1,0){10}} + % + \end{picture} + }} + + + +\newcommand{\make@eskd@common@style}{% + \newsavebox{\eskd@common@list} + \savebox{\eskd@common@list}{\itshape + \textar{\ifeskd@twoside ���.\else ����\fi}} + \newsavebox{\eskd@common@gost} + \savebox{\eskd@common@gost}{\scriptsize\textar{���� 2.104-68 + ����� 2\ifeskd@twoside �\else a\fi}} + \newsavebox{\eskd@common@signature} + \savebox{\eskd@common@signature}{{\inputencoding{\eskdencoding}\eskd@ii}} + \fancypagestyle{common}{% + \fancyhf{} + \fancyhead[L]{% + \unitlength 1mm + \begin{picture}(0,0)(3,-6) + \put(0,0){\usebox{\eskd@border}} + \put(0,-\eskdheight){\usebox{\eskd@vertical@frame}} + \put(0,-\eskdheight){\usebox{\eskd@common@left}} + \put(65,-\eskdheight){\usebox{\eskd@common@hole}} + \put(175,-\eskdheight){\usebox{\eskd@common@page}} + \put(0,-\eskdheight){\begin{picture}(0,0) + \put(180,4){\makebox(0,0){\large\textbf{\textar{\thepage}}}} + \put(120,7.5){\makebox(0,0){\usebox{\eskd@common@signature}}} + \put(180,11.5){\makebox(0,0){\usebox{\eskd@common@list}}} + \put(185,\ifeskd@twoside-1\else0\fi){\makebox(0,0)[rt]{% + \usebox{\eskd@common@gost}}} + \end{picture}} + \end{picture} + } + \ifeskd@twoside + \fancyhead[LE]{% + \unitlength 1mm + \begin{picture}(0,0)(3,-6) + \put(0,0){\usebox{\eskd@border}} + \put(120,-\eskdheight){\usebox{\eskd@common@left}} + \put(10,-\eskdheight){\usebox{\eskd@common@hole}} + \put(0,-\eskdheight){\usebox{\eskd@common@page}} + \put(0,-\eskdheight){\begin{picture}(0,0) + \put(5,4){\makebox(0,0){\large\textbf{\textar{\thepage}}}} + \put(65,7.5){\makebox(0,0){\usebox{\eskd@common@signature}}} + \put(5,11.5){\makebox(0,0){\usebox{\eskd@common@list}}} + \put(185,\ifeskd@twoside-1\else0\fi){\makebox(0,0)[rt]{% + \usebox{\eskd@common@gost}}} + \end{picture}} + \end{picture} + } + \fi + \renewcommand{\headrulewidth}{0pt} + \renewcommand{\footrulewidth}{0pt}} +} + + + + +\newcommand{\make@eskd@first@style}{% + \newsavebox{\eskd@first@text} + \savebox{\eskd@first@text}{% + \unitlength 1mm + \begin{picture}(0,0)(0,0) + \put(185,-1){\makebox(0,0)[rt]{\scriptsize + ���� 2.104-68 ����� 2}} + \put(3.5,27.5){\makebox(0,0){\footnotesize\itshape ���.}} + \put(12,27.5){\makebox(0,0){\itshape ����}} + \put(28.5,27.5){\makebox(0,0){\itshape\textnumero\ �����.}} + \put(47.5,27.5){\makebox(0,0){\itshape ����.}} + \put(60,27.5){\makebox(0,0){\small\itshape ����}} + \put(8.5,22.5){\makebox(0,0){\itshape ������.}} + \put(8.5,17.5){\makebox(0,0){\itshape ����.}} + \put(8.5,7.5){\makebox(0,0){\itshape �. �����.}} + \put(8.5,2.5){\makebox(0,0){\itshape ���.}} + \put(142.5,22.5){\makebox(0,0){\itshape ���.}} + \put(157.5,22.5){\makebox(0,0){\itshape + \ifeskd@twoside ���.\else ����\fi}} + \put(175,22.5){\makebox(0,0){\itshape + \ifeskd@twoside �������\else ������\fi}} + + \end{picture} + } + \fancypagestyle{first}{% + \fancyhf{} + \fancyhead[L]{% + \unitlength 1mm + \begin{picture}(0,0)(3,-6) + \put(0,0){\usebox{\eskd@border}} + \put(0,-\eskdheight){\usebox{\eskd@vertical@frame}} + \put(0,-\eskdheight){\makebox(0,0){% + \unitlength 1mm + \begin{picture}(0,0)(0,0) + \put(157.5,17.5){\makebox(0,0){\ifthenelse + {\pageref{LastPage}=1}{}{\thepage}}} + \put(175,17.5){\makebox(0,0){\pageref{LastPage}}} + \put(18,22.5){\makebox(0,0)[l]{\eskd@xiI}} + \put(18,17.5){\makebox(0,0)[l]{\eskd@xiII}} + \put(18,12.5){\makebox(0,0)[l]{\eskd@xiIII}} + \put(18,7.5){\makebox(0,0)[l]{\eskd@xiIV}} + \put(18,2.5){\makebox(0,0)[l]{\eskd@xiV}} + \put(67,12.5){\makebox(0,0)[l]{% + \parbox{66mm}{\large\raggedright\eskd@i}}} + \put(125,32.5){\makebox(0,0){\LARGE\eskd@ii}} + \put(160,7.5){\makebox(0,0){\eskd@ix}} + \put(8.5,12.5){\makebox(0,0){\itshape\eskd@x}} + \linethickness{\eskd@thick mm} + \put(7,25){\line(0,1){15}} + \put(17,0){\line(0,1){40}} + \put(40,0){\line(0,1){40}} + \put(55,0){\line(0,1){40}} + \put(65,0){\line(0,1){40}} + \put(135,0){\line(0,1){25}} + \put(140,15){\line(0,1){5}} + \put(145,15){\line(0,1){5}} + \put(150,15){\line(0,1){10}} + \put(165,15){\line(0,1){10}} + \put(0,40){\line(1,0){185}} + \put(0,30){\line(1,0){65}} + \put(0,25){\line(1,0){185}} + \put(135,20){\line(1,0){50}} + \put(135,15){\line(1,0){50}} + \linethickness{\eskd@thin mm} + \put(0,35){\line(1,0){65}} + \multiput(0,5)(0,5){4}{\line(1,0){65}} + \put(0,0){\usebox{\eskd@first@text}} + % + \end{picture} + }} + \end{picture} + } + \renewcommand{\headrulewidth}{0pt} + \renewcommand{\footrulewidth}{0pt}} + } + +\newcommand{\make@eskd@title@style}{% + \newsavebox{\eskd@title@text} + \savebox{\eskd@title@text}{\scriptsize\textar{�. 1288}} + \newsavebox{\eskd@agr} + \savebox{\eskd@agr}{\usefont{T2A}{far}{b}{n}\Large �����������} + \newsavebox{\eskd@appr} + \savebox{\eskd@appr}{\usefont{T2A}{far}{b}{n}\Large ���������} + \fancypagestyle{title}{% + \fancyhf{} + \fancyhead[L]{% + \unitlength 1mm + \begin{picture}(0,0)(3,-6) + \put(0,0){\usebox{\eskd@border}} + \put(0,-\eskdheight){\usebox{\eskd@vertical@frame}} + \put(185,-\eskdheight){% + \begin{picture}(0,0) + \put(0,-1){\makebox(0,0)[rt]{\usebox{\eskd@title@text}}} + \end{picture}} + \end{picture} + } + \renewcommand{\headrulewidth}{0pt} + \renewcommand{\footrulewidth}{0pt}} + } + + +\newcommand{\eskd@i}{} +\newcommand{\docName}[1]{\renewcommand{\eskd@i}{#1}} +\newcommand{\fI}{\docName} + +\newcommand{\eskd@ii}{} +\newcommand{\docSignature}[1]{\renewcommand{\eskd@ii}{#1}} +\newcommand{\fII}[1]{\renewcommand{\eskd@ii}{#1}} + +\newcommand{\eskd@ix}{} +\newcommand{\fIX}[1]{\renewcommand{\eskd@ix}{#1}} +\newcommand{\docLabel}[1]{\renewcommand{\eskd@ix}{#1}} + +\newcommand{\eskd@x}{} +\newcommand{\middleLabel}[1]{\renewcommand{\eskd@x}{#1}} +\newcommand{\fX}[1]{\renewcommand{\eskd@x}{#1}} + +\newcommand{\eskd@xiI}{} +\newcommand{\docAuthor}[1]{\renewcommand{\eskd@xiI}{#1}} +\newcommand{\fXIi}[1]{\renewcommand{\eskd@xiI}{#1}} + +\newcommand{\eskd@xiII}{} +\newcommand{\docChecker}[1]{\renewcommand{\eskd@xiII}{#1}} +\newcommand{\fXIii}[1]{\renewcommand{\eskd@xiII}{#1}} + +\newcommand{\eskd@xiIII}{} +\newcommand{\middleName}[1]{\renewcommand{\eskd@xiIII}{#1}} +\newcommand{\fXIiii}[1]{\renewcommand{\eskd@xiIII}{#1}} + +\newcommand{\eskd@xiIV}{} +\newcommand{\normController}[1]{\renewcommand{\eskd@xiIV}{#1}} +\newcommand{\fXIiv}[1]{\renewcommand{\eskd@xiIV}{#1}} + +\newcommand{\eskd@xiV}{} +\newcommand{\approvedBy}[1]{\renewcommand{\eskd@xiV}{#1}} +\newcommand{\fXIv}[1]{\renewcommand{\eskd@xiV}{#1}} + + +\newcommand{\eskd@title@i}{} +\newcommand{\titleTop}[1]{\renewcommand{\eskd@title@i}{#1}} +\newcommand{\tfI}[1]{\renewcommand{\eskd@title@i}{#1}} + +\newif\ifeskd@title@appr \eskd@title@apprfalse +\newif\ifeskd@title@agr \eskd@title@agrfalse + +\newcommand{\eskd@des@list}{} + +\newcommand{\eskd@title@iii@right@position}{} +\newcommand{\eskd@title@iii@right@name}{} +\newcommand{\titleApprovedBy}[2]{% + \renewcommand{\eskd@title@iii@right@position}{#1} + \renewcommand{\eskd@title@iii@right@name}{#2} + \eskd@title@apprtrue + } + +\newcommand{\eskd@title@iii@left@position}{} +\newcommand{\eskd@title@iii@left@name}{} +\xdef\eskd@agr@list{} +\newcommand{\titleAgreedBy}[2]{% + \ifeskd@title@agr + \xdef\eskd@agr@list{\eskd@agr@list#1\par\vrule + depth 0.8pt height -0.4pt width31mm~#2\par + ''\vrule depth 0.8pt height -0.4pt width8mm''\vrule + depth 0.8pt height -0.4pt width20mm\ \eskdyear\ \cyrg\par\vskip 3mm} + \else + \renewcommand{\eskd@title@iii@left@position}{#1} + \renewcommand{\eskd@title@iii@left@name}{#2} + \eskd@title@agrtrue + \fi + } + +\xdef\eskd@author@list{} +\newcommand{\titleDesignedBy}[2]{% + \xdef\eskd@author@list{\eskd@author@list#1\par\vrule + depth 0.8pt height -0.4pt width31mm~#2\par + ''\vrule depth 0.8pt height -0.4pt width8mm''\vrule + depth 0.8pt height -0.4pt width20mm\ \eskdyear\ \cyrg\par\vskip 3mm} + } + +\newcommand{\tfIII}{\hyphenpenalty=10000 % + \begin{tabular}{@{\hspace{5mm}}p{80mm}@{\hspace{10mm}}p{80mm}}% + \ifeskd@title@agr \hspace{15mm}\usebox{\eskd@agr}\fi &% + \ifeskd@title@appr \hspace{15mm}\usebox{\eskd@appr}\fi \\[3mm] + \ifeskd@title@agr{\raggedright \eskd@title@iii@left@position}\fi &% + \ifeskd@title@appr{\raggedright + \eskd@title@iii@right@position}\fi\\[3mm] + \ifeskd@title@agr \rule[-1mm]{31mm}{0.4pt}~% + \eskd@title@iii@left@name \fi &% + \ifeskd@title@appr \rule[-1mm]{31mm}{0.4pt}~% + \eskd@title@iii@right@name \fi\\[3mm] + \ifeskd@title@agr ''\rule[-1mm]{8mm}{0.4pt}''\rule[-1mm]{20mm}{0.4pt} + \eskdyear\ \cyrg\fi &% + \ifeskd@title@appr ''\rule[-1mm]{8mm}{0.4pt}''\rule[-1mm]{20mm}{0.4pt} + \eskdyear\ \cyrg\fi + \end{tabular} + } + +\newcommand{\eskd@title@iv}{\eskd@i} +\newcommand{\titleName}[1]{\renewcommand{\eskd@title@iv}{#1}} +\newcommand{\tfIV}[1]{\renewcommand{\eskd@title@iv}{#1}} + +\newcommand{\eskd@title@vi}{\eskd@ii} +\newcommand{\titleSignature}[1]{\renewcommand{\eskd@title@vi}{#1}} +\newcommand{\tfVI}[1]{\renewcommand{\eskd@title@vi}{#1}} + + + +\newcommand{\eskd@title@bottom}{\eskdyear} +\newcommand{\titleBottom}[1]{\renewcommand{\eskd@title@bottom}{#1}} + +\renewcommand{\maketitle}{} +\newcommand{\eskd@maketitle}{% +\thispagestyle{title} +\set@eskd@bottom{55mm} +\usefont{T2A}{far}{m}{n} +\large +\vspace*{1mm} +\begin{center} +\bfseries\Large +\eskd@title@i +\end{center} +\vfill +\centerline{\raisebox{0mm}[0mm][0mm]{\tfIII}} +\vfill +\begin{center} +{\bfseries\Large +\MakeUppercase{\eskd@title@iv}}\mbox{}\\[3mm] +{\large\MakeUppercase{\eskd@title@vi}} +\end{center} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\vfill +\unitlength\textwidth\begin{picture}(0,0) +\put(0,0){\makebox(0,0)[l]{\hyphenpenalty=10000 % +\begin{tabular}{@{\hspace{5mm}}p{80mm}@{\hspace{10mm}}p{80mm}} +\raggedright\eskd@agr@list &{\raggedright\eskd@author@list}\\ +\end{tabular} +}} +\end{picture} +\vfill\vfill +\begin{center} + \eskd@title@bottom +\end{center} +\newpage + +\ifeskd@twoside +\thispagestyle{empty} +\cleardoublepage +\fi + +\thispagestyle{first} +\set@eskd@bottom{30mm} + +} + +\set@eskd@bottom{\ifeskd@title15mm\else55mm\fi} + + + + +\AtBeginDocument{% + + \inputencoding{koi8-r} + +\newcommand{\eskdListOfChanges}{\newpage +{\small\noindent +\begin{tabular}{|c|*{7}{p{1.5cm}|}c|c|} + \multicolumn{10}{c}{\Large\bf ���� ����������� ���������}\\\hline +& \multicolumn{4}{c|}{������ ������ +(�������)}&&&&&\\\cline{2-5} +���.&��\-��\-���\-���&��\-��\-���\-���&��\-���&% +��\-��\-��\-��\-���\-���& +����� ������ (�������) +� �����.&\No\ �����.&���\-��\-��� \No\ +����������������� �����. � ����&�������&����\\\hline +\vbox{\vspace{\eskdheight mm}\vspace{-6cm}}&&&&&&&&&\\\hline +\end{tabular} +} +} + + + \make@eskd@border + \make@eskd@vertical@frame + + \make@eskd@common@left + \make@eskd@common@hole + \make@eskd@common@page + + \make@eskd@first@style + \make@eskd@title@style + \make@eskd@common@style + + \pagestyle{common} + \inputencoding{\eskdencoding} + \ifeskd@title\eskd@maketitle + \else\thispagestyle{first}\set@eskd@bottom{30mm}\fi + + \renewcommand{\make@eskd@border}{} + \renewcommand{\make@eskd@vertical@frame}{} + \renewcommand{\make@eskd@common@left}{} + \renewcommand{\make@eskd@common@hole}{} + \renewcommand{\make@eskd@common@page}{} + \renewcommand{\make@eskd@first@style}{} + \renewcommand{\make@eskd@title@style}{} + \renewcommand{\make@eskd@common@style}{} + \renewcommand{\eskd@maketitle}{} + \relax +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eskd.tlpobj new/tlpkg/tlpobj/eskd.tlpobj --- old/tlpkg/tlpobj/eskd.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/eskd.tlpobj 2010-06-10 18:27:07.000000000 +0200 @@ -0,0 +1,13 @@ +name eskd +category Package +revision 15878 +shortdesc Modern Russian typesetting. +relocated 1 +longdesc The class offers modern Russian text formatting, in accordance +longdesc with accepted design standards. Fonts not (apparently) +longdesc available on CTAN are required for use of the class. +runfiles size=5 + RELOC/tex/latex/eskd/eskd.cls +catalogue-ctan /macros/latex/contrib/eskd +catalogue-date 2007-02-14 08:57:40 +0100 +catalogue-license lppl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-sanskrit.tlpobj new/tlpkg/tlpobj/hyphen-sanskrit.tlpobj --- old/tlpkg/tlpobj/hyphen-sanskrit.tlpobj 2012-12-14 04:33:25.000000000 +0100 +++ new/tlpkg/tlpobj/hyphen-sanskrit.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -name hyphen-sanskrit -category TLCore -revision 28522 -shortdesc Sanskrit hyphenation patterns. -relocated 1 -longdesc Hyphenation patterns for Sanskrit and Prakrit in -longdesc transliteration, and in Devanagari, Bengali, Kannada, Malayalam -longdesc and Telugu scripts for Unicode engines. -depend hyphen-base -depend hyph-utf8 -execute AddHyphen name=sanskrit lefthyphenmin=1 righthyphenmin=3 file=loadhyph-sa.tex file_patterns=hyph-sa.pat.txt file_exceptions= ++++++ hrlatex.doc.tar.xz -> etex.doc.tar.xz ++++++ ++++ 8482 lines of diff (skipped) ++++++ hrlatex.tar.xz -> etex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hrlatex/fsbispit.cls new/tex/latex/hrlatex/fsbispit.cls --- old/tex/latex/hrlatex/fsbispit.cls 2010-04-27 03:11:09.000000000 +0200 +++ new/tex/latex/hrlatex/fsbispit.cls 1970-01-01 01:00:00.000000000 +0100 @@ -1,134 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{fsbispit}[2010/04/09 Marcelix za FSB] -\LoadClassWithOptions{article} - -\RequirePackage[% -a4paper,% -left=2.2cm,% -top=2.15cm,% -right=1.6cm, -bottom=2cm% -%,showframe -]{geometry} - - - - -\RequirePackage{fsbmath} % fsbmath poziva hrlatex.sty -% -% \ProcessOptions - -\RequirePackage{txfonts} - -\ProcessOptions* - - - - - - - -\newcommand{\novirok}{ - \newpage - \setcounter{zad}{0} - \malititle -} - - - - - -\pagestyle{plain} - - - -\newcommand{\malititle}{ - \maketitle - \section*{} - \addcontentsline{toc}{subsubsection}{\@date} -} - - -\renewcommand{\maketitle}{% - %\addcontentsline{toc}{subsection}{\@date} - \thispagestyle{empty} - \let\footnote\thanks - - \vskip 1.5em - \noindent - {\Large \textsf{\textbf{\@grupa}}} - \\[-5ex] - \parbox[t][][c]{\textwidth}{ - \Large\centering - \textbf{ - \textsf{ - \MakeUppercase\@title} - } - } %parbox - - \begin{center} - \textsf{(\@date)} - \end{center} - - \vskip 1em -} %maketitle - - -\newcommand{\printtitle}{\@title} - - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5555 - - - - -\let\@grupa\empty -\newcommand{\grupa}[1]{\def\@grupa{#1}} - - - -%%%%% -% -% obicni title - -\newcommand{\makeheadertitle}{% - \let\footnote\thanks - - \vskip 1.5em - \noindent - {\Large \textsf{\textbf{\@grupa}}} - \\[-5ex] - \parbox[t][][c]{\textwidth}{ - \Large\centering - \textbf{ - \textsf{ - \MakeUppercase\@title} - } - } %parbox - - \begin{center} - \textsf{(\@date)} - \end{center} - - \vskip 1em -} %maketitle - -\definecolor{shadecolor}{rgb}{0.8,0.85,0.95} - - - -%%%============================ -% trik za optional argument... -% Treba napraviti par \tcmd i \@tcmd komandi. \@dblarg pomaze da ako [#1] nije pozvan nego samo jedan argument, default -% #1 <- #2 -% - -\def\tcmd{\@dblarg{\@tcmd}} - -\long\def\@tcmd[#1]#2{% -#1, #2 -} -% -%=========================== \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hrlatex/fsbmath.sty new/tex/latex/hrlatex/fsbmath.sty --- old/tex/latex/hrlatex/fsbmath.sty 2010-04-27 03:11:09.000000000 +0200 +++ new/tex/latex/hrlatex/fsbmath.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,353 +0,0 @@ -% -% -% Style for FSB Math docs -% -% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fsbmath}[2010/04/09 v0.31 LaTeX Macros for FSB Math Dept, University of Zagreb] - - -\RequirePackage{amsmath, amsthm, amssymb} -% \RequirePackage{esvect} -%\RequirePackage{theorem} - - - -\RequirePackage[dvips]{graphicx} -\RequirePackage[default, rjesenja]{optional} - - -\RequirePackage{calc} -\RequirePackage{ifthen} - -\RequirePackage[enc=cp1250]{hrlatex} - - -\RequirePackage{framed} -% \RequirePackage{picins} -\RequirePackage{multicol} - - - -\RequirePackage{enumerate} -\RequirePackage{paralist} - - -\RequirePackage{xcolor} - - - -% \RequirePackage{pst-plot} -% \RequirePackage{pstricks-add} -% \RequirePackage{pstricks, pst-node, pst-tree} - -\RequirePackage{cancel} - - -% \RequirePackage{txfonts} - -\RequirePackage[% - linkcolor=blue,% - urlcolor=blue,% - colorlinks,% -% breaklinks,% -]{hyperref} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\newcommand{\R}{\mathbb{R}} -\newcommand{\Q}{\mathbb{Q}} -\newcommand{\Z}{\mathbb{Z}} -\newcommand{\N}{\mathbb{N}} -\newcommand{\C}{\mathbb{C}} -\newcommand{\D}{\displaystyle} -\newcommand{\F}{\mathbf{F}} - -\renewcommand{\Re}{\mathop{\textrm{Re}}} -\renewcommand{\Im}{\mathop{\textrm{Im}}} -\newcommand{\Ln}{\mathop{\textrm{Ln}}} -\newcommand{\Arg}{\mathop{\textrm{Arg}}} -% \newcommand{\ch}{\mathop{\textrm{ch}}} -% \newcommand{\sh}{\mathop{\textrm{sh}}} - - - -\newcommand{\hpm}{\ensuremath{\hphantom{-}}} - - -\newcommand{\eqdef}{\ensuremath{\stackrel{\mathrm{def}}{=}}} - -% \DeclareMathOperator{\arccos}{arc cos} - - - -\ProcessOptions* - -%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -% fsbmath.sty macros -%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - - -\newcommand{\ispitFooter}{\noindent\emph{\textbf{Rezultati ispita}: sljede\'ci radni dan u 13:00 sati}} - - -\let\@fsbZadatakBodovi\empty -\def\bodovi#1{% -% PROVJERI jel #1 prazan string: -\ifthenelse{\equal{#1}{}}% -{\def\@fsbZadatakBodovi{}}% -{\def\@fsbZadatakBodovi{(#1)}}% -} - -\newcommand{\fsbShowBodovi}{\medskip\hfill \small \@fsbZadatakBodovi\relax} - - -\newenvironment{zadaca}[1] -{ - \newpage - \pagestyle{marcelstyleb} - \setcounter{zad}{0} - - \phantomsection - \addcontentsline{toc}{subsubsection}{#1} - - \date{#1} - \makeheadertitle -} -{ - \pagebreak -} - -\newenvironment{ispit}[1] -{ - \newpage - \thispagestyle{empty} - - \setcounter{zad}{0} - \date{#1} - - \phantomsection - \addcontentsline{toc}{subsubsection}{#1} - - \makeheadertitle -} -{ - \vfill - \ispitFooter -% \pagebreak -} - - - -\newenvironment{kolokvij}[2] -{ - % #1 -> datum - % #2 -> grupa (A ili B) - - \newpage - \pagestyle{empty} - \setcounter{zad}{0} - \date{#1} - \grupa{#2} - - \phantomsection - \addcontentsline{toc}{subsubsection}{#1\ --\ #2} - - \makeheadertitle -} -{ -% \pagebreak -} - - - -%-------------------------------------------------------- -% -% section styles -% -% -\renewcommand\section{\@startsection {section}{1}{\z@}% - {-3.5ex \@plus -1ex \@minus -.2ex}% - {2.3ex \@plus.2ex}% - {\normalfont\Large\bfseries\sffamily}} - -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\large\bfseries\sffamily}} - -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\normalfont\bfseries\sffamily}} - -\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {3.25ex \@plus1ex \@minus.2ex}% - {-1em}% - {\normalfont\bfseries\sffamily}} - -\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%\parindent}% - {3.25ex \@plus1ex \@minus .2ex}% - {-1em}% - {\normalfont\normalsize\bfseries\sffamily}} - -%-------------------------------------------------------- - -\newenvironment{lekcija}[1]% -{\newpage\section*{#1}}% -{} - -\newtheorem{primjer}{Primjer} -\newtheorem*{napomena}{Napomena} - -% \theoremstyle{definition} - -\newtheoremstyle{zadatakstyle}% -{\topsep}{\topsep}% -{\rmfamily}% -{0cm}%{-0.145cm}%-12pt}% -{\bfseries}% -{}% -{0pt}% -{\makebox[0cm]{{\makebox[1cm][r]{\thmnumber{ #2}.\,}}}}% - - -\newtheoremstyle{zzadatakstyle}% -{\topsep}{\topsep}% -{\rmfamily}% -{0cm}%{-0.145cm}%-12pt}% -{\bfseries}% -{}% -{0pt}% -{\makebox[0cm]{{\makebox[1cm][r]{\thmnumber{ #2}.\!$^{*}$\,}}}}% - -\newtheoremstyle{zvjezdastibrojac}% -{\topsep}{\topsep}% -{\rmfamily}% -{}%-12pt}%-12pt}% -{\bfseries}% -{.\!$^{*}$}% -{ }% -{}% - - - - - -%\theoremstyle{plain} - -\theoremstyle{zadatakstyle}% -\newtheorem{zad}{}% - -\theoremstyle{zzadatakstyle}% -\newtheorem{zzad}[zad]{}% - - -% ====================================== - - - -\newenvironment{zadatak}[1][]{ -% \if\notempty{##1}%d -% \relax -% \else -% \ifthenelse{\equal{#1}{}}% -% {\bodovi{}}% -\bodovi{#1} -% \bodovi{#1} -% \fi -\begin{zad}% -\begin{list}{}{% -\setlength\leftmargin{0.8165cm}%\makebox{\textbf{\textsf{111.\ }}\ }} -% \setlength{\labelwidth}{1cm}% -\setlength{\labelsep}{0pt}% -\setlength{\listparindent}{0cm}% -\setlength{\itemindent}{0cm}% -} -\item -\setlength{\labelsep}{1ex}% -}% -{%END environment -\end{list}% -\end{zad}% -\fsbShowBodovi\relax -\bigskip% -} - -\newenvironment{zzadatak}[1][]{%kopija zadatak environmenta -\bodovi{#1} -\begin{zzad}% -\begin{list}{}{% -\setlength\leftmargin{0.8165cm}%\makebox{\textbf{\textsf{111.\ }}\ }} -% \setlength{\labelwidth}{1cm}% -\setlength{\labelsep}{0pt}% -\setlength{\listparindent}{0cm}% -\setlength{\itemindent}{0cm}% -} -\item -}% -{%END environment -\end{list}% -\end{zzad}% -\fsbShowBodovi\relax -\bigskip% -} - - - -\setlength{\parindent}{0pt} - - -%BEGIN RJESENJA ............... -% otvori novi filedescriptor -\newwrite\tf@rjesenja - -\newcommand{\rjesenje}[1]{% -\opt{inlinerjesenja}{% -\par\textcolor{lightgray}{\fbox{\scriptsize \textcolor{red}{Rj. }\textcolor{lightgray}{ #1}}} -}% end opt inlinerjesenja -\protected@write{\@auxout} - {} - {\string\@writefile{rjesenja}{ - {\protect\par {\small \textbf{\thezad.} #1}} - }}} - -\newcommand{\rjesenjeSection}[1]{ -\protected@write{\@auxout} - {} - {\string\@writefile{rjesenja}{ - {\protect{\bigskip}\protect\par \protect\itshape \protect\fbox\protect{#1\protect} \protect\dotfill {str.~\thepage}\protect\par\protect\medskip } - }}} -% } - - -%BEGIN ispis rjesenja - - -\newcommand{\printRjesenja}{% -\section*{Rje\v{s}enja zadataka} -\addcontentsline{toc}{section}{Rje\v{s}enja zadataka} - - \begin{multicols*}{2} %mcols* je nebalansirana verzija... - \raggedright - \makeatletter - \@starttoc{rjesenja} - \makeatother - \vfill - \end{multicols*} -% -} - -%END ispis rjesenja - - -\newcommand{\stopRjesenja}{ - \let\oldrjesenjeMacro\rjesenje - \let\rjesenje\@gobble -} - -% \continueRjesenja -% \let\rjesenje\oldrjesenjeMacro - -%END rjesenja - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hrlatex/hrlatex.sty new/tex/latex/hrlatex/hrlatex.sty --- old/tex/latex/hrlatex/hrlatex.sty 2010-04-27 03:11:09.000000000 +0200 +++ new/tex/latex/hrlatex/hrlatex.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -%% -%% This is file `hrlatex.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% hrlatex.dtx (with options: `package') -%% -%% - -\NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{hrlatex}[2010/04/05 v0.23 LaTeX Macros for HRLaTeX project] -\usepackage{xkeyval} -\DeclareOption{slovene}{\PassOptionsToPackage{slovene}{babel}} -\DeclareOptionX{enc}[utf8]{% -\PassOptionsToPackage{#1}{inputenc} -} - -\DeclareOption{last}{ - -} - -\DeclareOption*{} -\DeclareOptionX*{} - -\PassOptionsToPackage{utf8}{inputenc} %% Default -\PassOptionsToPackage{croatian}{babel} - -\ProcessOptions* -\ProcessOptionsX - -\RequirePackage{inputenc} -\RequirePackage[T1]{fontenc} -\RequirePackage[croatian]{babel} -\RequirePackage{amsopn} - -\DeclareMathOperator{\tg}{tg} -\DeclareMathOperator{\arctg}{arc\,tg} -\DeclareMathOperator{\ctg}{ctg} -\DeclareMathOperator{\arcctg}{arc\,ctg} -\DeclareMathOperator{\sh}{sh} -\DeclareMathOperator{\ch}{ch} -\DeclareMathOperator{\cth}{cth} -\DeclareMathOperator{\tgh}{th} -\let\th\tgh -\endinput -%% -%% End of file `hrlatex.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/etex/etex.src new/tex/plain/etex/etex.src --- old/tex/plain/etex/etex.src 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/plain/etex/etex.src 2006-01-13 00:46:46.000000000 +0100 @@ -0,0 +1,892 @@ +%% e-TeX V2.1;0 +%% Revision-date: 01-FEB-1999 22:36:22 /PB +%% Revision-history: (at-end) + +% The version number in the first line is compared with the corresponding +% element in e-TeX, and an error reported if incompatibility is detected. +% The cycle and revision numbers (that is, the element(s) following the +% period) are not used in this comparison, allowing enhancements to be made to +% this module and recorded in its header without introducing a risk of conflict. +% +% This allows to use this file with e-TeX versions 2.0 and 2.1! +% +% Other files whose headers must be kept in synch include "etexdefs.lib" and +% "language.def". + +% This is "etex.src", the (e-TeX) source file for the "etex" format file. +% To build the format from it, use one of the following commands or the +% local equivalent: + +% Generic: einitex *etex.src \dump +% emTeX: etex -i *etex.src \dump +% VMS: etex /init /noformat *"etex.src \dump" + +% Assume a purely IniTeX environment and set up a minimal \catcode r\'egime + +\catcode `\{=1 +\catcode `\}=2 +\catcode `\#=6 +\catcode `\^=7 +\catcode `\@=\catcode `\A + +% Define the basic error-reporting and abort mechanisms: + +\def \et@xmsg #1#2% + {\begingroup + \def \n {^^J}% + \def \ { }% + \newlinechar=\expandafter `\n + \if E#1% + \errorcontextlines=0 + \errmessage {e-TeX error: #2}% + \else + \message {\n ! e-TeX \if I#1 message% + \else \if W#1 warning% + \else \if F#1 fatal error% + \else + \ unknown (#1)% + \fi + \fi + \fi: #2% + }% + \fi + \endgroup + } + +% Note: a future version may report errors in the %<fac>-<s>-<code>[, <text>] +% format, allowing the more verbose <text>s to be read from file rather than +% stored in the format. + +\def \et@xabort #1% + {\et@xmsg {F}{#1}% + \batchmode + \end + } + +% Make sure this file is being read by e-TeX in extended mode; +% If it is, prepare to check version/revision compatibility, otherwise abort. + +\ifx \undefined \eTeXversion + \et@xabort {this file can be processed only in extended mode;\n + \ \ did you perhaps forget the asterisk?% + }% +\else + \begingroup + \catcode `\%=12 + \catcode `\?=14 + \xdef \et@xfilehdr + {\detokenize {%% e-TeX V}\the \eTeXversion \eTeXrevision}? + \xdef \et@xlibhdr + {\detokenize {%% e-TeXlib V}\the \eTeXversion \eTeXrevision}? + \endgroup +\fi + +% Assume extended mode, but no additional \catcodes/\defs yet; +% set up a simple e-TeX condition-reporting system: + +\def \et@xinf #1{\et@xmsg {I}{#1}} %%% not currently used +\def \et@xwarn #1{\et@xmsg {W}{#1}} +\def \et@xerr #1#2{{\errhelp={#2}\et@xmsg {E}{#1}}} + +% deactivate the processing of patterns and exceptions; these will be +% reinstated later, after the \uselanguage mechanism has been defined. + +\let \et@xpatterns=\patterns +\def \patterns + {\begingroup + \everyeof={\fi \endgroup}% + \message {[skipping from \noexpand \patterns to end-of-file...]}% + \iffalse + } + +% Read "plain.tex" (\patterns & \hyphenation will be skipped) + +\input plain + +% restore the catcode of commercial-at (@), which will just have been clobbered + +\catcode `\@=\catcode `\A + +% Assume an extended Plain environment (i.e. there are no longer any +% restrictions on the coding techniques we can use). First prepare to +% carry out consistency checks on the file headers and the current e-TeX +% version/revision levels: + +\newread \et@xinput + +\def \etexhdrchk #1#2% + {\openin \et@xinput=#2 + \ifeof \et@xinput + \chardef \etexstatus=0 % V1.0-1 + \else + \begingroup + \endlinechar=-1 + \readline \et@xinput to \et@xbuf + \closein \et@xinput + \def \p@rtition ##1.##2\endp@rtition {##1}% V2.1%0 + \xdef \et@xbuf + {\expandafter \p@rtition \et@xbuf .\endp@rtition}% V2.1;0 + \xdef \et@xtmp {\csname et@x#1hdr\endcsname}% + \xdef \et@xtmp + {\expandafter \p@rtition \et@xtmp .\endp@rtition}% V2.1;0 + \endgroup + \ifx \et@xtmp \et@xbuf + \chardef \etexstatus=2 % V1.1;4 + \else + \chardef \etexstatus=1 % V1.1;4 + \fi + \fi + } + +% Check the version number of this file: + +\def \et@xfmtsrc {etex.src} +\etexhdrchk {file} {\et@xfmtsrc} +\ifcase \etexstatus + \et@xerr {unable to open format source file "\et@xfmtsrc";} + {This should not happen; please ensure that your system + allows a file to be opened for reading more than once + concurrently.% + }% +\or + \et@xwarn {format source file "\et@xfmtsrc" has wrong header;\n + \ \ expected: "\et@xfilehdr"; found: "\et@xbuf";% + }% + {You are using a version of e-TeX which may be incompatible + with the source for the format file you are trying to + compile; please ensure that you have the most recent + version of each. I will proceed, but you should treat + the results with caution...% + }% +\fi + +% Module handling now implemented (V1.0-2) + +\def \module #1{\iftrue} +\let \endmodule=\fi + +\newtoks \et@xtoks + +\def \et@xl@@d #1 #2\endl@ad %%% the "#1 #2" code avoids trailing spaces + {\ifcsname module:#1\endcsname + \et@xwarn {duplicate module name "#1"}% + \else + \csname module:#1\endcsname %%% we exploit the side-effect explicitly + \et@xtoks=\expandafter + {\the \et@xtoks + \expandafter \let \csname module:#1\endcsname=\undefined + }% + \fi + } + +\def \et@xl@ad #1#2,#3\endl@ad %%% the #1#2 code avoids spurious leading spaces + {\et@xl@@d #1#2 \endl@ad + \if *#3* + \let \n@xt=\relax + \else + \def \n@xt {\et@xl@ad #3\endl@ad}% + \fi + \n@xt + } + +\def \et@xload #1 %%% needed because of the embedded \ifs... + {\def \module ##1% + {\unless + \ifcsname module:##1\endcsname + \message {Skipping module "##1";}% + \else + \message {Loading module "##1";}% + }% + \input #1 + \def \module ##1{\iftrue}% + } + +\def \load #1 from #2 %%% selective module loading from an e-TeX library file + {\etexhdrchk {lib} {#2}% + \ifcase \etexstatus + \et@xerr {unable to open library file "#2"; load aborted.} + {I got an <eof> on trying to open your library file; + please make sure it exists, is readable and is not locked.% + }% + \or + \et@xerr {library file "#2" has wrong header;\n + \ \ expected: "\et@xlibhdr"; found: "\et@xbuf";\n + \ \ load aborted.% + }% + {The first line of your library does not start with + the correct e-TeX header; you may need to update the + file to be compatible with the current version of + e-TeX, or you may simply have specified the wrong file.% + }% + \else + \et@xtoks={\et@xtoks={}}% + \et@xl@ad #1,\endl@ad + \et@xload {#2} + \the \et@xtoks + \fi + } + +\load interactionmodes from etexdefs.lib %%% \load <foo>[, <bar>...] from <baz> + +\def \@sk #1#2#3% + {\ifnum \interactionmode=\interactionmodes {errorstop} %%% V2.0;15 + \def \pr@mpt {\csname #1 \endcsname}% + \edef \pr@mptloop {{\escapechar=-1 \global \readline 16 to \pr@mpt}}% + \loop \pr@mptloop + \ch@ckforyn \pr@mpt {#2}% + \ifb@dresponse + \message {Please answer Y[es] or N[o]}% + \repeat + \else + \def \pr@mpt {#3}% + \ch@ckforyn \pr@mpt {#2}% + \fi + } + +\def \ch@ckforyn #1#2% Bernd Raichle's improved version, V1.0-1 + {\edef \@nswer {#1}% + \def \p@rse ##1##2\endp@rse + {\lowercase {\if y##1}\b@dresponsefalse \csname #2true\endcsname + \else \lowercase {\if n##1}\b@dresponsefalse \csname #2false\endcsname + \else + \b@dresponsetrue + \fi + \fi + }% + \expandafter \p@rse \@nswer \endp@rse + } + +\def \usef@llback %%% V1.0-3 + {\message {Using fallback mode (USenglish)}% + \addlanguage {USenglish}{hyphen}{}{2}{3}% + } + +% OK, that's all the utilities defined; on with the real work: +% First, re-instate \patterns: + +\let \patterns=\et@xpatterns + +% Define the language-handling commands + +\def \et@xlang {\csname newlanguage\endcsname} + +\def \uselanguage #1% + {\ifcsname lang@#1\endcsname + \language=\csname lang@#1\endcsname + \lefthyphenmin=\csname lhm@#1\endcsname + \righthyphenmin=\csname rhm@#1\endcsname + \ifdefined \uselanguage@hook % V1.0-1 + \uselanguage@hook {#1}% % V1.0-1 + \fi + \else + \et@xerr {language #1 undefined.}% + {You are trying to use a language which has not previously + been defined; remember that any language you want to use + will need to have been specified at the time the format + was created.% + }% + \fi + } + +\def \addlanguage #1#2#3#4#5% language patterns exceptions lhm rhm + {\expandafter \et@xlang \csname lang@#1\endcsname + \expandafter \chardef \csname lhm@#1\endcsname=#4 % V1.0-1 + \expandafter \chardef \csname rhm@#1\endcsname=#5 % V1.0-1 + \uselanguage {#1}% + \input #2 + \if *#3*\else \input #3 \fi + \ifdefined \addlanguage@hook % V1.0-4 + \addlanguage@hook {#1}% % V1.0-4 + \fi + \edef \fmtversion {\fmtversion/#1}% + } + +% Decrement \count 19, because \newlanguage will increment it again + +\advance \count 19 by -1 + +% We are about to try to process a user/site-specific file "language.def", +% which establishes a Babel-like language selection environment. Since +% there is always a risk of a spurious file of that name being found, +% we look for an e-TeX header in the first line. If the file can be opened, +% but doesn't have the right header, we interrogate the user as to whether +% to use fallback mode; in this mode, we simply establish USenglish as the +% sole language, with the et@x patterns, exceptions and left- and right- +% hyphen minima for TeX. If we can't interrogate the user (e.g. not in +% \errorstopmode), or if the user elects not to use fallback, we abort; +% if the file can't be found/opened, we use fallback unconditionally. + +\newif \ifb@dresponse +\newif \ifusef@llback + +\def \l@ngdefnfile {language.def} + +\etexhdrchk {file} {\l@ngdefnfile} +\ifcase \etexstatus + \et@xwarn {unable to open file "\l@ngdefnfile";}% + \usef@llback % unable to open "language.def" +\or + \et@xwarn {file "\l@ngdefnfile" has wrong header;\n + \ \ expected: "\et@xfilehdr"; found: "\et@xbuf";% + }% + \@sk {Use fallback?} {usef@llback} {y}% + \ifusef@llback + \usef@llback + \else + \input \l@ngdefnfile % use "language.def" after warning + \fi +\else + \input \l@ngdefnfile % "language.def" open & valid +\fi + +% All that was just to set up natural language handling... +% The "real" work of "etex.src", however, is to augment the non-primitives +% of Plain.TeX to incorporate e-TeX specific features, and to add new +% non-primitives to simplify access to new e-TeX specific primitives. + +\message {Augmenting the Plain TeX definitions:} +\message {\string \tracingall;} + +\def \tracingall + {\tracingonline=\@ne + \tracingcommands=\thr@@ % plain.tex has \tw@ + \tracingstats=\tw@ + \tracingpages=\@ne + \tracingoutput=\@ne + \tracinglostchars=\tw@ % plain.tex has \@ne + \tracingmacros=\tw@ + \tracingparagraphs=\@ne + \tracingrestores=\@ne + \showboxbreadth=\maxdimen + \showboxdepth=\maxdimen + \errorstopmode + \tracinggroups=\@ne + \tracingifs=\@ne + \tracingscantokens=\@ne + \tracingnesting=\@ne + \tracingassigns=\tw@ + } + +\message {Adding new e-TeX definitions:} + +\message {\string \eTeX,} +\def \eTeX {$\varepsilon$-\TeX} %%% the simple version, not suitable for maths; + %%% a more sophisticated one may find its way + %%% into "etexdefs.lib" in due course. + +\message {\string \loggingall,} +\def \loggingall {\tracingall \tracingonline=\z@} + +\message {\string \tracingnone,} +\def \tracingnone + {\tracingassigns=\z@ + \tracingnesting=\z@ + \tracingscantokens=\z@ + \tracingifs=\z@ + \tracinggroups=\z@ + \showboxdepth=\thr@@ + \showboxbreadth=5 + \tracingrestores=\z@ + \tracingparagraphs=\z@ + \tracingmacros=\z@ + \tracinglostchars=\@ne + \tracingoutput=\z@ + \tracingpages=\z@ + \tracingstats=\z@ + \tracingcommands=\z@ + \tracingonline=\z@ + } + +\message {register allocation;} + +\newcount \et@xins % our insertion counter (\insc@unt is used differently) + +% We have to adjust the Plain TeX register allocation counts for our +% slightly modified book-keeping: + +\advance \count 10 by 1 % \count 10=23 % allocates \count registers 23, 24, ... +\advance \count 11 by 1 % \count 11=10 % allocates \dimen registers 10, 11, ... +\advance \count 12 by 1 % \count 12=10 % allocates \skip registers 10, 11, ... +\advance \count 13 by 1 % \count 13=10 % allocates \muskip registers 10, 11, ... +\advance \count 14 by 1 % \count 14=10 % allocates \box registers 10, 11, ... +\advance \count 15 by 1 % \count 15=10 % allocates \toks registers 10, 11, ... +\advance \count 16 by 1 % \count 16=0 % allocates input streams 0, 1, ... +\advance \count 17 by 1 % \count 17=0 % allocates output streams 0, 1, ... +\advance \count 18 by 1 % \count 18=4 % allocates math families 4, 5, ... +\advance \count 19 by 1 % \count 19=0 % allocates \language codes 0, 1, ... + +\et@xins=\insc@unt % \et@xins=255 % allocates insertions 254, 253, ... + +% We don't change the Plain TeX definitions of \newcount, etc., but the +% \alloc@ macro doing the actual work is redefined. + +% When the normal register pool for \count, \dimen, \skip, \muskip, +% \box, or \toks registers is exhausted, we switch to the extended pool. + +\def \alloc@ #1#2#3#4#5% + {\ifnum \count 1#1 < #4% make sure there's still room + \allocationnumber=\count 1#1 + \global \advance \count 1#1 by \@ne + \global #3#5=\allocationnumber + \wlog {\string #5=\string #2\the \allocationnumber}% + \else \ifnum #1 < 6 + \begingroup \escapechar=\m@ne + \expandafter \alloc@@ \expandafter {\string #2}#5% + \else + \errmessage {No room for a new #2}% + \fi + \fi + } + +% The \expandafter construction used here allows the generation of +% \newcount and \globcount from #1=count. Moreover (and more important) +% this construction avoids the appearance of \outer macros inside +% macro definitions or conditionals. + +\def \alloc@@ #1#2% + {\endgroup % restore \escapechar + \message {Normal \csname#1\endcsname register pool exhausted, + switching to extended pool.}% + \global \expandafter + \let \csname new#1\expandafter \endcsname \csname glob#1\endcsname + \csname new#1\endcsname#2% + } + +% We do change the Plain TeX definition of \newinsert + +\outer \def \newinsert #1%make sure there's still room for ... + {\ch@ck 0 \et@xins \count % ... a \count, ... + {\ch@ck 1 \et@xins \dimen % ... \dimen, ... + {\ch@ck 2 \et@xins \skip % ... \skip, ... + {\ch@ck 4 \et@xins \box % ... and \box register + {\global \advance \et@xins by \m@ne + \unless + \ifnum \insc@unt < \et@xins + \global \insc@unt=\et@xins + \fi + \allocationnumber=\et@xins + \global \chardef #1=\allocationnumber + \wlog {\string #1=\string \insert \the \allocationnumber}% + }% + }% + }% + }% + } + +\def \ch@ck #1#2#3#4% + {\ifnum \count 1#1 < #2#4\else \errmessage {No room for a new #3}\fi} + +% And we define \reserveinserts, so that you can say \reserveinserts{17} +% in order to reserve room for up to 17 additional insertion classes that will +% not be taken away by \newcount, \newdimen, \newskip, or \newbox. + +\outer \def \reserveinserts#1% + {\global \insc@unt=\numexpr \et@xins \ifnum #1 > \z@ -#1\fi \relax} + +\message {extended register allocation;} + +% Now, we define \globcount, \globbox, etc., so that you can say +% \globcount\foo and \foo will be defined (with \countdef) to be the +% next count register from the vastly larger but somewhat less efficient +% extended register pool. We also define \loccount, etc., but these +% register definitions are local to the current group. + +\count 260=277 % globally allocates \count registers 277, 278, ... +\count 261=\@cclvi % globally allocates \dimen registers 256, 257, ... +\count 262=\@cclvi % globally allocates \skip registers 256, 257, ... +\count 263=\@cclvi % globally allocates \muskip registers 256, 257, ... +\count 264=\@cclvi % globally allocates \box registers 256, 257, ... +\count 265=\@cclvi % globally allocates \toks registers 256, 257, ... +\count 266=\@ne % globally allocates \marks classes 1, 2, ... + +\def \et@xmaxregs {32768} + +\count 270=\et@xmaxregs % locally allocates \count registers 32767, 32766, ... +\count 271=\et@xmaxregs % ditto for \dimen registers +\count 272=\et@xmaxregs % ditto for \skip registers +\count 273=\et@xmaxregs % ditto for \muskip registers +\count 274=\et@xmaxregs % ditto for \box registers +\count 275=\et@xmaxregs % ditto for \toks registers +\count 276=\et@xmaxregs % ditto for \marks classes + +% \count registers 256-259 and 267-269 are not (yet) used + +\outer \def \globcount {\et@xglob 0 \count \countdef} + \def \loccount {\et@xloc 0 \count \countdef} +\outer \def \globdimen {\et@xglob 1 \dimen \dimendef} + \def \locdimen {\et@xloc 1 \dimen \dimendef} +\outer \def \globskip {\et@xglob 2 \skip \skipdef} + \def \locskip {\et@xloc 2 \skip \skipdef} +\outer \def \globmuskip {\et@xglob 3 \muskip \muskipdef} + \def \locmuskip {\et@xloc 3 \muskip \muskipdef} +\outer \def \globbox {\et@xglob 4 \box \mathchardef} + \def \locbox {\et@xloc 4 \box \mathchardef} +\outer \def \globtoks {\et@xglob 5 \toks \toksdef} + \def \loctoks {\et@xloc 5 \toks \toksdef} +\outer \def \globmarks {\et@xglob 6 \marks \mathchardef} + \def \locmarks {\et@xloc 6 \marks \mathchardef} + +\let\newmark=\globmarks %%% 2.0;14 +\let\newmarks=\globmarks + +\def \et@xglob #1#2#3#4% + {\et@xchk #1#2% make sure there's still room + {\allocationnumber=\count 26#1 + \global \advance \count 26#1 by \@ne + \global #3#4=\allocationnumber + \wlog {\string #4=\string #2\the \allocationnumber}% + }% + } + +\def \et@xloc#1#2#3#4% + {\et@xchk #1#2% make sure there's still room + {\advance \count 27#1 by \m@ne + \allocationnumber=\count 27#1 + #3#4=\allocationnumber + \wlog {\string #4=\string #2\the \allocationnumber \space (local)}% + }% + } + +\def \et@xchk #1#2#3% + {\ifnum \count 26#1 < \count 27#1 + #3% + \else + \errmessage {No room for a new #2}% + \fi + } + +% Next we define \globcountblk, \loccountblk, etc., so that one can +% write \globcountblk\foo{17} and \foo will be defined (with \mathchardef) +% as the first (the zeroth?) of a block of 17 consecutive registers. +% Thus the user is intended to reference elements <\foo+0> to <\foo+n-1>, +% where n is the length of the block allocated. + +\outer \def \globcountblk {\et@xgblk 0 \count} + \def \loccountblk {\et@xlblk 0 \count} +\outer \def \globdimenblk {\et@xgblk 1 \dimen} + \def \locdimenblk {\et@xlblk 1 \dimen} +\outer \def \globskipblk {\et@xgblk 2 \skip} + \def \locskipblk {\et@xlblk 2 \skip} +\outer \def \globmuskipblk {\et@xgblk 3 \muskip} + \def \locmuskipblk {\et@xlblk 3 \muskip} +\outer \def \globboxblk {\et@xgblk 4 \box} + \def \locboxblk {\et@xlblk 4 \box} +\outer \def \globtoksblk {\et@xgblk 5 \toks} + \def \loctoksblk {\et@xlblk 5 \toks} +\outer \def \globmarksblk {\et@xgblk 6 \marks} + \def \locmarksblk {\et@xlblk 6 \marks} + +% And, both to provide a higher-level interface to the block allocation +% scheme, and to demonstrate possible applications of the new \...expr +% primitives, we also define \globcountvector and \loccountvector (etc) +% which allow the user to access elements with embedded arithmetic, as in + +% \globcountvector \foo {12} +% \foo {\count 0 + 3} = \foo {\count 1 * 2} + +\outer \def \globcountvector {\et@xgvec 0 \count} + \def \loccountvector {\et@xlvec 0 \count} +\outer \def \globdimenvector {\et@xgvec 1 \dimen} + \def \locdimenvector {\et@xlvec 1 \dimen} +\outer \def \globskipvector {\et@xgvec 2 \skip} + \def \locskipvector {\et@xlvec 2 \skip} +\outer \def \globmuskipvector {\et@xgvec 3 \muskip} + \def \locmuskipvector {\et@xlvec 3 \muskip} +\outer \def \globboxvector {\et@xgvec 4 \box} + \def \locboxvector {\et@xlvec 4 \box} +\outer \def \globtoksvector {\et@xgvec 5 \toks} + \def \loctoksvector {\et@xlvec 5 \toks} +\outer \def \globmarksvector {\et@xgvec 6 \marks} + \def \locmarksvector {\et@xlvec 6 \marks} + +\def \et@xgblk #1#2#3#4% + {\et@xchkblk #1#2{#4}% make sure there's still room + {\allocationnumber=\count 26#1 + \global \advance \count 26#1 by #4% + \global \mathchardef #3=\allocationnumber + \wlog {\string #3=\string #2blk{\number #4} at \the \allocationnumber}% + }% + } + +\def \et@xlblk #1#2#3#4% + {\et@xchkblk #1#2{#4}% make sure there's still room + {\advance \count 27#1 by -#4% + \allocationnumber=\count 27#1 + \mathchardef #3=\allocationnumber + \wlog {\string #3=\string #2blk{\number #4} + at \the \allocationnumber \space (local)% + }% + }% + } + +\begingroup +\catcode `\# = 12 +\gdef \et@xhash {#} +\endgroup + +\def \et@xgvec #1#2#3#4% + {\et@xchkblk #1#2{#4}% make sure there's still room + {\allocationnumber=\count 26#1 + \global \advance \count 26#1 by #4% + \ifx #2\box + \def \2{}% + \else \ifx #2\marks + \def \2{}% + \else + \def \2{\string #2}% + \fi + \fi + \xdef #3##1{\2 \noexpand \numexpr \the \allocationnumber+##1\relax}% + \wlog {\string #3 {\et@xhash 1} = + \2 {\the \allocationnumber+\et@xhash 1} (global #2 vector)% + }% + }% + } + +\def \et@xlvec #1#2#3#4% + {\et@xchkblk #1#2{#4}% make sure there's still room + {\advance \count 27#1 by -#4% + \allocationnumber=\count27#1 + \mathchardef #3=\allocationnumber + \ifx #2\box + \def \2{}% + \else \ifx #2\marks + \def \2{}% + \else + \def \2{\string #2}% + \fi + \fi + \edef #3##1{\2 \noexpand \numexpr \the \allocationnumber+##1\relax}% + \wlog {\string #3 {\et@xhash 1} = + \2 {\the \allocationnumber+\et@xhash 1} (local #2 vector)% + }% + }% + } + +\def \et@xchkblk #1#2#3#4% + {\ifnum #3 < \z@ + \errmessage {Negative register block size \number #3}% + \else \ifnum \numexpr \count 26#1+#3 > \count 27#1 + \errmessage {No room for new #2block of size \number#3}% + \else + #4% + \fi + \fi + } + +% In an attempt to reduce the overheads of e-TeX, we recycle all possible +% resources, including (as a penultimate step) the recycler itself... +% The user can circumvent (or force) this during format creation, +% by \letting \ifrecycle=\iffalse (or \iftrue, to force it). + +% As this file has grown by accretion, it is possible that we are no +% longer recycling all the resources we could; this will be investigated. + +\def \mayber@cycle {\expandafter \ifrecycle} +\def \forcer@cycle {\expandafter \iftrue} + +\ifdefined \ifrecycle + \mayber@cycle +\else + \forcer@cycle +\fi + +% There's a concealed \if... lurking here, which explains the +% strange indentation of the code that follows (V1.0-1) + + \def \r@cycle #1% + {\ifdefined #1 + \message {\string #1,}\let #1=\und@fined + \else + \message {\string #1 (not defined),} + \fi + } + {\newlinechar=`\! \message {!Recycling:}} + + \r@cycle \addlanguage + \r@cycle \@nswer + \r@cycle \@sk + \r@cycle \b@dresponsetrue + \r@cycle \b@dresponsefalse + \r@cycle \ch@ckforyn + \r@cycle \mayber@cycle + \r@cycle \et@xabort + \r@cycle \et@xbuf + \r@cycle \et@xfmtsrc + \r@cycle \et@xfilehdr + \r@cycle \et@xinf + \r@cycle \et@xpatterns +% \r@cycle \ifb@dresponse +% \r@cycle \ifusef@llback + \r@cycle \l@ngdefnfile + \r@cycle \n@xt + \r@cycle \p@rse + \r@cycle \pr@mpt + \r@cycle \pr@mptloop + \r@cycle \forcer@cycle + \r@cycle \usef@llback + \r@cycle \usef@llbacktrue + \r@cycle \usef@llbackfalse + +% The following are retained, since they may be needed by user code; with a few +% (regrettable) exceptions, all of these are given the \etex or \et@x prefix, +% to reduce as far as possible the risk of them clashing with other used-defined +% names. + +% The e-TeX team are willing to change the names of the remaining, at-risk, +% control sequences if it is demonstrated that the current names cause problems +% or difficulties. + + \def \r@tain #1% + {\ifdefined #1 + \message {\string #1,} + \else + \message {\string #1 (not defined),} + \fi + } + {\newlinechar=`\! \message {!Retaining:}} + + \r@tain \et@xerr + \r@tain \et@xinput + \r@tain \et@xlibhdr + \r@tain \et@xmsg + \r@tain \et@xtoks + \r@tain \et@xwarn + \r@tain \et@xl@@d + \r@tain \et@xl@ad + \r@tain \et@xload + \r@tain \et@xlang + \r@tain \et@xhash + \r@tain \eTeX + \r@tain \etexhdrchk +% \r@tain \endmodule + \r@tain \etexstatus + \r@tain \module + \r@tain \uselanguage + + \r@cycle \r@tain + \r@cycle \r@cycle + +\fi + +% And finally re-catcode commercial-at + +\catcode `\@=12 +\endinput + +%% Revision-history: + +01-FEB-1999: 2.1;0 Allow file to be used with e-TeX versions 2.0 and 2.1 + +25-MAR-1998: 2.0;19 Improved log message for \{glob|loc}{marks|box}vector (PEB) + +24-MAR-1998: 2.0;18 Optimisation of one section made (DC & PEB), + a couple of \if tests made more robust, + and spacing improved in one macro. + +24-MAR-1998: 2.0;17 Coding styles unified and all references to Peter + Breitenlohner eliminated from main code + +23-MAR-1998: 2.0;16 Continued from 2.0;15 + +20-MAR-1998: 2.0;15 Changes made here and in "etexdefs.lib" to + improve compatibility with LaTeX, and + \{glob,loc}{marks,box}vector re-thought. + +11-MAR-1998: 2.0;14 \newmark made synonym for \newmarks / PT + +10-MAR-1998: 2.0;13 Missing brace re-inserted in \...lvec /PT + +10-MAR-1998: 2.0;12 Typo corrected in Peter's name /PT + +10-MAR-1998: 2.0;11 "\...lvec" failed to use \et@xhash; fixed / PT + +10-MAR-1998: 2.0;10 \h@sh -> \et@xhash /PT + +06-MAR-1998: 2.0;9 Final tweaks by PEB ! + +05-MAR-1998: <missing version number> Final tweaks by PT + +28-Feb-1998: 2.0;8 Major re-work by PEB + +24-Feb-1998: 2.0;7 \tracingnesting -> \tw@ + +24-FEB-1998: 2.0;6 version-mismatch reduced in severity; + \tracingall and ...none improved; + aesthetic spaces around "=" removed + +24-Jan-1998: 2.0;5: block allocation of registers added + +21-Jan-1998: 2.0;4: released to e-TeX team for testing/comments + +20-Jan-1998: \glob... implemented, and coding simplified by + the implementation and use of of \max@xpr + +06-Jan-1998: Alpha-testing complete of extended and local register allocation. + +29-Dec-1997: The "%!" convention replaced by a corresponding "%%": + this should avoid any inadvertent conflict with Adobe conventions. + + \tracingall augmented with + \tracinglostchars=\tw@ %%% Q -- should this be default? + \tracingnesting=\@ne + + \tracingnone augmented. + +05-DEC-1997: A long-standing bug removed: left- and right- hyphenmin + were transposed in fallback mode :-((((( + +24-APR-1997: An interim release, to provide compatibility with Peter's + naming conventions for beta-test versions of e-TeX V2. + Consistency checking is now restricted to \eTeXversion, + and \eTeXrevision is ignored. + +01-NOV-1996: V1.1;5: Final stage? Checking that everything possible + is recycled whilst nothing that is needed is lost. Retained + names given \etex or \et@x prefix wherever possible. Some + potentially dangerous cs-names commented out of the recycle/retain + lists because they were synonyms of members of the if-else-fi set. + The definition of the e-TeX logo added: this had somehow slipped + through the net! Intended to be the final revision before public + release, but awaiting comments from other members of the team. + +31-OCT-1996: V1.1;4: errors noticed while proof-reading corrected; far + greater use made of concealed control sequences with + commercial-at (@); library file headers differentiated + from ordinary file headers; return-values for header-check + altered to allow fall-thru' if ok; fallback-use algorithm + significantly modified (major semantic shift). + +29-OCT-1996: V1.1;3: tidying up prior to release; careful check on + which control words can be re-cycled; \recycle made more + robust, to check whether one is trying to re-cycle something + that was never 'cycled' in the first place (PEB suggestion); + \et@xmsg re-written to use \message or \errmessage as necessary; + \errhelps provided for all places they might be referenced. + +27-OCT-1996: V1.1;2: minor version numbers re-introduced, using semi-colon + as delimiter and stopping pattern matching at the semi-colon; + \et@xfilehdr defined dynamically, based in \eTeXversion and + \eTeXrevision; \load now uses \etexhdrchk, so library + files are required to start with an e-TeX header; this will + have implications when e-TeX -> V2+, so this code should be + re-considered at this point. + +17-OCT-1996: V1.1: minor version numbers eliminated, to reduce the + need for users to update their "language.def" files. + +17-OCT-1996: V1.0-4: \addlanguage@hook added, version history moved to end. + +17-OCT-1996: Version 1.0-3 does away with the "fallback" file. + +16-OCT-1996: Version 1.0-2 implements module handling, so constant "3" + no longer used (see below). + +13-Oct-1996: Replaced \def by \chardef where possible; + eliminated dependency on "etexdefs.def", hard-coding + in the constant "3" (with comment) instead; + used Bernd's \ch@ckforyn; + re-catcoded `\@ earlier, to reduce number of \[if]csnames; + commented the strange indentation of the \recycles at end. + +11-Oct-1996: language handling commands modified (V1.0): PT/BR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/etex/etexdefs.lib new/tex/plain/etex/etexdefs.lib --- old/tex/plain/etex/etexdefs.lib 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/plain/etex/etexdefs.lib 2006-01-13 00:46:46.000000000 +0100 @@ -0,0 +1,85 @@ +%% e-TeXlib V2.0;8 24-MAR-1998 16:30:14 /PT + +% This is "etexdefs.def", the library file which +% defines symbolic names for e-TeX's constants. + +\module {grouptypes} +\def \grouptypes #1{\csname gr@up: #1\endcsname} +\def \etexgroupdef #1 + {\expandafter \expandafter \expandafter \chardef \grouptypes {#1}} +\etexgroupdef bottomlevel = 0 %%% {code for the outside world} +\etexgroupdef simple = 1 %%% {code for local structure only} +\etexgroupdef hbox = 2 %%% {code for `\.{\\hbox}\grp'} +\etexgroupdef adjustedhbox = 3 %%% {code for `\.{\\hbox}\grp' in vertical mode} +\etexgroupdef vbox = 4 %%% {code for `\.{\\vbox}\grp'} +\etexgroupdef vtop = 5 %%% {code for `\.{\\vtop}\grp'} +\etexgroupdef align = 6 %%% {code for `\.{\\halign}\grp', `\.{\\valign}\grp'} +\etexgroupdef noalign = 7 %%% {code for `\.{\\noalign}\grp'} +\etexgroupdef output = 8 %%% {code for output routine} +\etexgroupdef math = 9 %%% {code for, e.g, `\.{\char'136}\grp'} +\etexgroupdef disc = 10 %%% {code for `\.{\\discretionary}\grp\grp\grp'} +\etexgroupdef insert = 11 %%% {code for `\.{\\insert}\grp', `\.{\\vadjust}\grp'} +\etexgroupdef vcenter = 12 %%% {code for `\.{\\vcenter}\grp'} +\etexgroupdef mathchoice = 13 %%% {code for `\.{\\mathchoice}\grp\grp\grp\grp'} +\etexgroupdef semisimple = 14 %%% {code for `\.{\\begingroup...\\endgroup}'} +\etexgroupdef mathshift = 15 %%% {code for `\.{\$...\$}'} +\etexgroupdef mathleft = 16 %%% {code for `\.{\\left...\\right}'} +\endmodule + +\module {interactionmodes} +\def \interactionmodes #1{\csname m@de: #1\endcsname} +\def \etexmodedef #1 + {\expandafter \expandafter \expandafter \chardef \interactionmodes {#1}} +\etexmodedef batch = 0 %%% {omits all stops and omits terminal output} +\etexmodedef nonstop = 1 %%% {omits all stops} +\etexmodedef scroll = 2 %%% {omits error stops} +\etexmodedef errorstop = 3 %%% {stops at every opportunity to interact} +\endmodule + +\module {nodetypes} +\def \nodetypes #1{\csname n@de: #1\endcsname} +\def \etexnodedef #1 + {\expandafter \expandafter \expandafter \chardef \nodetypes {#1}} +\etexnodedef char = 0 %%% {|type| of character nodes} +\etexnodedef hlist = 1 %%% {|type| of hlist nodes} +\etexnodedef vlist = 2 %%% {|type| of vlist nodes} +\etexnodedef rule = 3 %%% {|type| of rule nodes} +\etexnodedef ins = 4 %%% {|type| of insertion nodes} +\etexnodedef mark = 5 %%% {|type| of a mark node} +\etexnodedef adjust = 6 %%% {|type| of an adjust node} +\etexnodedef ligature = 7 %%% {|type| of a ligature node} +\etexnodedef disc = 8 %%% {|type| of a discretionary node} +\etexnodedef whatsit = 9 %%% {|type| of special extension nodes} +\etexnodedef math = 10 %%% {|type| of a math node} +\etexnodedef glue = 11 %%% {|type| of that points to a glue specification} +\etexnodedef kern = 12 %%% {|type| of a kern node} +\etexnodedef penalty = 13 %%% {|type| of a penalty node} +\etexnodedef unset = 14 %%% {|type| for an unset node} +\etexnodedef maths = 15 %%% {|type| of nodes that occur only in maths mode} +\endmodule + +\module {iftypes} +\def \conditionaltypes #1{\csname @f: #1\endcsname} +\def \etexifdef #1 + {\expandafter \expandafter \expandafter \chardef \conditionaltypes {#1}} +\etexifdef charif = 1 +\etexifdef catif = 2 +\etexifdef numif = 3 +\etexifdef dimif = 4 +\etexifdef oddif = 5 +\etexifdef vmodeif = 6 +\etexifdef hmodeif = 7 +\etexifdef mmodeif = 8 +\etexifdef innerif = 9 +\etexifdef voidif = 10 +\etexifdef hboxif = 11 +\etexifdef vboxif = 12 +\etexifdef xif = 13 +\etexifdef eofif = 14 +\etexifdef trueif = 15 +\etexifdef falseif = 16 +\etexifdef caseif = 17 +\etexifdef definedif = 18 +\etexifdef csnameif = 19 +\etexifdef fontcharif = 20 +\endmodule diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etex.tlpobj new/tlpkg/tlpobj/etex.tlpobj --- old/tlpkg/tlpobj/etex.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/etex.tlpobj 2013-04-08 21:25:41.000000000 +0200 @@ -0,0 +1,19 @@ +name etex +category Package +revision 29743 +shortdesc An extended version of TeX, from the NTS project. +relocated 1 +longdesc An extended version of TeX (which is capable of running as if +longdesc it were TeX unmodified). E-TeX has been specified by the LaTeX +longdesc team as the engine for the development of LaTeX 2e, in the +longdesc immediate future; as a result, LaTeX programmers may (in all +longdesc current TeX distributions) assume e-TeX functionality. +longdesc Development versions of e-TeX are to be found in the TeX live +longdesc source repository. +runfiles size=9 + RELOC/tex/plain/etex/etex.src + RELOC/tex/plain/etex/etexdefs.lib +catalogue-ctan /systems/e-tex +catalogue-date 2012-03-09 15:12:11 +0100 +catalogue-license knuth +catalogue-version 2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hrlatex.tlpobj new/tlpkg/tlpobj/hrlatex.tlpobj --- old/tlpkg/tlpobj/hrlatex.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/hrlatex.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -name hrlatex -category Package -revision 18020 -shortdesc LaTeX support for Croatian documents. -relocated 1 -longdesc This package simplifies creation of new documents for the -longdesc (average) Croatian user. As an example, a class file hrdipl.cls -longdesc (designed for the graduation thesis at the University of -longdesc Zagreb) and sample thesis documents are included. -runfiles size=4 - RELOC/tex/latex/hrlatex/fsbispit.cls - RELOC/tex/latex/hrlatex/fsbmath.sty - RELOC/tex/latex/hrlatex/hrlatex.sty -catalogue-ctan /language/croatian/hrlatex -catalogue-date 2010-04-25 22:49:50 +0200 -catalogue-license lppl -catalogue-version 0.23 ++++++ histogr.doc.tar.xz -> etoc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/README new/doc/latex/etoc/README --- old/doc/latex/etoc/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/etoc/README 2013-05-15 23:52:26.000000000 +0200 @@ -0,0 +1,156 @@ +version 1.07f dated 2013/03/07 +documentation dated 2013/05/14 + +Package `etoc' +Completely customisable TOCs +Copyright (C) 2012, 2013 by Jean-Francois Burnol + +LICENSE +======= + + The copyright and license statement applies to `etoc.dtx' and to + its derived files. + + This work 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 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 author of this work is Jean-Francois Burnol <jfbu at free dot fr>. + This work has the LPPL maintenance status `author-maintained'. + +INSTALLATION +============ + + `latex etoc.dtx' --> this extracts the style file `etoc.sty' + + `latex etoc.dtx' (twice more) finishes producing the documentation + + Move `etoc.sty' to a suitable location within the TeX installation: + etoc.sty -> <TDS>/tex/latex/etoc/etoc.sty + + The generated auxiliary files may be discarded. + +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. + + 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 TOC defined somewhere + else in the document. + + The formatting inherited (and possibly customized by other + packages) from the document class may also be used in + compatibility mode. Regarding the global toc display, etoc + provides pre-defined styles based on a multi-column format, + optionally with a frame or a ruled title. + + As the assignment of levels to the sectioning units can be + changed at any time, etoc can be used in a quite general + manner to also create custom "lists of", additionally to the + tables of contents related to the document sectioning units. + No auxiliary file is used apart from the usual .toc file. + + +Change log +========== + + v1.07f [2013/03/07] + + new macros \etocthelinkedname, \etocthelinkednumber, + \etocthelinkedpage, and \etocthelink. + + + v1.07e [2013/03/01] + + improvements in the package own line styles with + regards to penalties and vertical spaces. + + addition to the documentation of an example of + a tree-like table of contents (uses tikz). + + more such examples added 2013/03/03. + + + v1.07d [2013/02/24] + + minor code improvements and new documentation + section "Another compatibility mode". + + + v1.07b [2013/02/02] + + removal of the \xspace from the macros \etocname, + \etocnumber, \etocpage. + + additional examples in the documentation. + + + v1.07 [2013/01/29] + + new commands: + + \etocthename, \etocthenumber, \etocthepage, \etoclink, + + \etoctoccontentsline, \etoctoccontentsline* + + \etocnopar, \etocaftercontentshook + + modified command: \etocmulticolstyle + + new documentation section "Surprising uses of etoc" which + explains how to do "Lists of arbitrary things", in + addition to the tables of contents. + + + v1.06 [2012/12/07] + + the standard macros \l@section etc... are modified only + during the calls to \tableofcontents; they can thus be + customized as will by the user (with the help of a + package like tocloft) and this will be taken into account + by etoc for the TOCs typeset in compatibility mode. + + + v1.05 [2012/12/01] + + \localtableofcontents replaces \tableofcontents* (for + compatibility with the memoir class). + + compatibility with KOMA-script and memoir document + classes. + + + v1.04 [2012/11/24] + + a (possibly local) table of contents can be labeled: + + \tableofcontents \label{toc:1} + + and reproduced elsewhere in the document (with a possibly + completely different layout): + + \tableofcontents \ref{toc:1} + + + v1.02 [2012/11/18] + + initial version. + Files old/doc/latex/etoc/etoc.pdf and new/doc/latex/etoc/etoc.pdf differ Files old/doc/latex/histogr/histogr.pdf and new/doc/latex/histogr/histogr.pdf differ 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 2013-05-16 03:51:35.000000000 +0200 @@ -0,0 +1,8 @@ +name etoc.doc +category Package +revision 30488 +shortdesc doc files of etoc +relocated 1 +docfiles size=65 + RELOC/doc/latex/etoc/README + RELOC/doc/latex/etoc/etoc.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/histogr.doc.tlpobj new/tlpkg/tlpobj/histogr.doc.tlpobj --- old/tlpkg/tlpobj/histogr.doc.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/histogr.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name histogr.doc -category Package -revision 15878 -shortdesc doc files of histogr -relocated 1 -docfiles size=27 - RELOC/doc/latex/histogr/histogr.pdf ++++++ histogr.doc.tar.xz -> etoc.tar.xz ++++++ Files old/doc/latex/histogr/histogr.pdf and new/doc/latex/histogr/histogr.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/etoc/etoc.sty new/tex/latex/etoc/etoc.sty --- old/tex/latex/etoc/etoc.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/etoc/etoc.sty 2013-04-07 01:08:33.000000000 +0200 @@ -0,0 +1,1122 @@ +%% +%% This is file `etoc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% etoc.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from etoc.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file etoc.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.) +%% +\ProvidesPackage{etoc} + [2013/03/07 v1.07f Completely customisable TOCs (jfB)] +%% +%% Package `etoc' by Jean-Francois Burnol +%% Copyright (C) 2012, 2013 by Jean-Francois Burnol +%% +\NeedsTeXFormat{LaTeX2e} +\RequirePackage{multicol} +%% \RequirePackage{xspace} %% REMOVED (1.07b) +\DeclareOption*{\PackageWarning{etoc}{Option `\CurrentOption' is unknown.}} +\ProcessOptions\relax +\newtoks\Etoc@toctoks +\def\Etoc@par{\par} +\newcommand*{\etocinline}{\def\Etoc@par{}} +\let\etocnopar\etocinline +\newif\ifEtoc@jj % book +\newif\ifEtoc@j % part +\newif\ifEtoc@ % chapter +\newif\ifEtoc@i % section +\newif\ifEtoc@ii % subsection +\newif\ifEtoc@iii % subsubsection +\newif\ifEtoc@iv % paragraph +\newif\ifEtoc@v % subparagraph +\newif\ifEtoc@number +\newif\ifEtoc@hyperref +\newif\ifEtoc@parskip % 1.07d +\newif\ifEtoc@tocwithid +\newif\ifEtoc@standard +\newif\ifEtoc@part +\newif\ifEtoc@localtoc +\newif\ifEtoc@skipthisone +\newif\ifEtoc@stoptoc +\newif\ifEtoc@notactive +\newcounter{etoc@tocid} +\newif\ifEtoc@mustclosegroup +\def\etoc@{\etoc@} % Delimiter in \Etoc@getnb etc.. macros. This def added 1.07f +\@ifclassloaded{memoir}{\def\Etoc@minf{-\thr@@}}{\def\Etoc@minf{-\tw@}} +\def\Etoc@@minustwo@@{-\tw@} +\let\Etoc@@minusone@@\m@ne +\chardef\Etoc@@zero@@ 0 +\let\Etoc@@one@@ \@ne +\let\Etoc@@two@@ \tw@ +\let\Etoc@@three@@ \thr@@ +\chardef\Etoc@@four@@ 4 +\chardef\Etoc@@five@@ 5 +\chardef\Etoc@@six@@ 6 +\let\Etoc@localtop\Etoc@@minustwo@@ +\def\Etoc@@minustwo@{minustwo} +\def\Etoc@@minusone@{minusone} +\def\Etoc@@zero@{zero} +\def\Etoc@@one@{one} +\def\Etoc@@two@{two} +\def\Etoc@@three@{three} +\def\Etoc@@four@{four} +\def\Etoc@@five@{five} +\def\Etoc@levellist{} +\def\Etoc@newlevel#1{% + \def\Etoc@levellist@elt{\noexpand\Etoc@levellist@elt\noexpand}% + \edef\Etoc@levellist{\Etoc@levellist\Etoc@levellist@elt#1}} +\def\etocsetlevel#1#2{% + \expandafter\Etoc@newlevel\csname l@#1\endcsname + \ifcase#2\relax + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@zero@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@zero@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@one@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@one@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@two@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@two@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@three@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@three@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@four@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@four@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@five@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@five@ + \or + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@six@@ + \else + \ifnum#2=\m@ne + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@minusone@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@minusone@ + \else + \ifnum#2=-\tw@ + \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@minustwo@@ + \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@minustwo@ + \else + \PackageWarning{etoc} + {unexpected value `#2' in \string\etocsetlevel.^^J% + Should be -2,-1, 0, 1, 2, 3, 4, 5, or 6. Set to 6 (=ignored)}% + \expandafter\let\csname Etoc@#1@@\endcsname\Etoc@@six@@ +\fi\fi\fi} +\etocsetlevel{book}{-2} +\etocsetlevel{part}{-1} +\etocsetlevel{chapter}{0} +\etocsetlevel{section}{1} +\etocsetlevel{subsection}{2} +\etocsetlevel{subsubsection}{3} +\etocsetlevel{paragraph}{4} +\etocsetlevel{subparagraph}{5} +\def\Etoc@setflags #1{% + \ifcase #1\relax + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@ifalse + \global\Etoc@true + \or + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@itrue + \or + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iitrue + \or + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiitrue + \or + \global\Etoc@vfalse + \global\Etoc@ivtrue + \or + \global\Etoc@vtrue + \else + \ifnum#1=\m@ne + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@ifalse + \global\Etoc@false + \global\Etoc@jtrue + \else + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@ifalse + \global\Etoc@false + \global\Etoc@jfalse + \global\Etoc@jjtrue + \fi + \fi} +\AtBeginDocument{% +\@ifpackageloaded{parskip}{\Etoc@parskiptrue}{}% +\@ifpackageloaded{hyperref}{\Etoc@hyperreftrue + \def\Etoc@et@hop#1#2#3#4#5{#1{#3}{#4}{#5}#2}% + \long\def\Etoc@gobblesixorfive#1#2#3#4#5#6{}} + {\def\Etoc@et@hop#1#2#3#4{#1{#3}{#4}#2}% + \long\def\Etoc@gobblesixorfive#1#2#3#4#5{}}% +} +\def\Etoc@swa#1{% + \Etoc@et@hop + {\Etoc@savedcontentsline{#1}} + {\Etoc@prefix\Etoc@contents}} +\def\Etoc@swb#1{% + \Etoc@et@hop + {\Etoc@savedcontentsline{#1}} + {\Etoc@contents}} +\let\etocskipfirstprefix\@thirdofthree +\def\Etoc@etoccontentsline#1{% + \global\expandafter\let\expandafter\Etoc@tmp\csname Etoc@#1@@\endcsname + \Etoc@skipthisonefalse + \let\Etoc@next\Etoc@gobblesixorfive + \ifnum\Etoc@tmp=\Etoc@@six@@ + \Etoc@skipthisonetrue + \else + \ifEtoc@localtoc + \let\Etoc@prenext\relax + \ifEtoc@stoptoc + \Etoc@skipthisonetrue + \fi + \ifnum\Etoc@tmp<\Etoc@localtop + \def\Etoc@prenext{\global\Etoc@stoptoctrue}% + \Etoc@skipthisonetrue + \fi + \ifEtoc@notactive + \def\Etoc@prenext{\Etoc@setflags{\Etoc@tmp}}% + \Etoc@skipthisonetrue + \fi + \Etoc@prenext + \fi + \fi + \ifnum\c@tocdepth<\Etoc@tmp\relax\else + \ifEtoc@skipthisone\else + \global\let\Etoc@next\relax + \ifcase\Etoc@tmp + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \Etoc@end@two\fi + \ifEtoc@i \Etoc@end@one\fi + \ifEtoc@ \else \def\Etoc@next{\Etoc@begin@zero}\fi + \def\Etoc@contents{\Etoc@contents@zero}% + \def\Etoc@prefix{\Etoc@prefix@zero}% + \or + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \Etoc@end@two\fi + \ifEtoc@i \else \def\Etoc@next{\Etoc@begin@one}\fi + \def\Etoc@contents{\Etoc@contents@one}% + \def\Etoc@prefix{\Etoc@prefix@one}% + \or + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \else \def\Etoc@next{\Etoc@begin@two}\fi + \def\Etoc@contents{\Etoc@contents@two}% + \def\Etoc@prefix{\Etoc@prefix@two}% + \or + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \else \def\Etoc@next{\Etoc@begin@three}\fi + \def\Etoc@contents{\Etoc@contents@three}% + \def\Etoc@prefix{\Etoc@prefix@three}% + \or + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \else \def\Etoc@next{\Etoc@begin@four}\fi + \def\Etoc@contents{\Etoc@contents@four}% + \def\Etoc@prefix{\Etoc@prefix@four}% + \or + \ifEtoc@v \else \def\Etoc@next{\Etoc@begin@five}\fi + \def\Etoc@contents{\Etoc@contents@five}% + \def\Etoc@prefix{\Etoc@prefix@five}% + \else + \ifnum\Etoc@tmp=\m@ne + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \Etoc@end@two\fi + \ifEtoc@i \Etoc@end@one\fi + \ifEtoc@ \Etoc@end@zero\fi + \ifEtoc@j \else \def\Etoc@next{\Etoc@begin@minusone}\fi + \def\Etoc@contents{\Etoc@contents@minusone}% + \def\Etoc@prefix{\Etoc@prefix@minusone}% + \else + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \Etoc@end@two\fi + \ifEtoc@i \Etoc@end@one\fi + \ifEtoc@ \Etoc@end@zero\fi + \ifEtoc@j \Etoc@end@minusone\fi + \ifEtoc@jj \else \def\Etoc@next{\Etoc@begin@minustwo}\fi + \def\Etoc@contents{\Etoc@contents@minustwo}% + \def\Etoc@prefix{\Etoc@prefix@minustwo}% + \fi + \fi + \ifnum\Etoc@tmp=\m@ne\Etoc@parttrue\else\Etoc@partfalse\fi + \Etoc@setflags{\Etoc@tmp}% + \fi\fi + \Etoc@next + \@firstoftwo{\Etoc@swa{#1}}{\Etoc@swb{#1}}} +\def\Etoc@lxyz #1#2{% + \@namedef {etoclink }{\leavevmode}% fall-back + \def\etocthelink {}% fall-back + \@namedef {etocname }{\leavevmode #1}% fall-back (perhaps linked) + \def\etocthename {#1}% (if link, will be removed later) + \def\etocthelinkedname {#1}% will probably get redefined + \@namedef {etocpage }{\leavevmode #2}% (perhaps linked) + \Etoc@getthepage #2\etoc@ % defines also \etocthelinkedpage (and \etoclink) + \Etoc@getnb #1\relax\relax\etoc@ % gets number *and* name, and \etoclink + \ifEtoc@number\else + \ifEtoc@part + \Etoc@getit #1\hspace\relax\etoc@ % additional job for parts + \fi + \fi} +\def\Etoc@getthepage #1{% + \let\Etoc@next\Etoc@getthepage@nohyp + \ifEtoc@hyperref\ifx #1\hyper@linkstart + \let\Etoc@next\Etoc@getthepage@hyp + \fi\fi + \Etoc@next #1% +} +\def\Etoc@getthepage@nohyp #1\etoc@ {% + \def\etocthepage {#1}% + \def\etocthelinkedpage {#1}% +} +\def\Etoc@getthepage@hyp #1#2#3#4#5\etoc@ {% + \@namedef{etoclink } ##1{\leavevmode #1{#2}{#3}{##1}#5}% + \edef\etocthelink ##1{\noexpand\hyperlink {#3}{##1}}% + \def\etocthepage {#4}% + \toks@ {#4}% + \edef\etocthelinkedpage {\noexpand\hyperlink {#3}{\the\toks@}}% +} +\def\Etoc@getnb #1{% + \let\Etoc@next\Etoc@getnb@nohyp + \ifEtoc@hyperref\ifx #1\hyper@linkstart + \let\Etoc@next\Etoc@getnb@hyp + \fi\fi + \Etoc@next #1% +} +\def\Etoc@getit #1{% + \let\Etoc@next\Etoc@getit@nohyp + \ifEtoc@hyperref\ifx #1\hyper@linkstart + \let\Etoc@next\Etoc@getit@hyp + \fi\fi + \Etoc@next #1% +} +\def\Etoc@getnb@nohyp #1#2#3\etoc@ {% + \def\Etoc@getname ##1\relax\relax\etoc@ {% + \@namedef {etocname }{\leavevmode ##1}% + \def\etocthename {##1}% + \def\etocthelinkedname {##1}% + }% + \ifx #1\numberline + \@namedef {etocnumber }{\leavevmode #2}% + \def\etocthenumber {#2}% + \def\etocthelinkednumber {#2}% + \Etoc@numbertrue + \Etoc@getname #3\etoc@ + \else % then \etocthename and \etocthelinkedname already defined + \@namedef {etocnumber }{\leavevmode}% + \def\etocthenumber {}% + \def\etocthelinkednumber {}% + \Etoc@numberfalse + \fi +} +\def\Etoc@getnb@hyp #1#2#3#4#5#6\etoc@ {% + \def\Etoc@getname ##1\relax\relax\etoc@ {% + \@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% + \def\etocthename {##1}% + \toks@ {##1}% + \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + }% + \def\Etoc@getnbr ##1##2##3\etoc@ {% + \ifx ##1\numberline + \@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##2}#5}% + \def\etocthenumber {##2}% + \toks@ {##2}% + \edef\etocthelinkednumber {\noexpand\hyperlink {#3}{\the\toks@}}% + \Etoc@numbertrue + \Etoc@getname ##3\etoc@ + \else + \@namedef {etocnumber }{\leavevmode}% + \def\etocthenumber {}% + \def\etocthelinkednumber {}% + \Etoc@numberfalse + \def\etocthename {#4}% + \toks@ {#4}% + \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + \fi + }% + \@namedef {etoclink }##1{\leavevmode #1{#2}{#3}{##1}#5}% + \edef\etocthelink ##1{\noexpand\hyperlink {#3}{##1}}% + \Etoc@getnbr #4\relax\relax\etoc@ +} +\def\Etoc@getit@nohyp #1\hspace#2#3\etoc@ {% + \def\Etoc@getname ##1\hspace\relax\etoc@ {% + \@namedef {etocname }{\leavevmode ##1}% + \def\etocthename {##1}% + \def\etocthelinkedname {##1}% + }% + \ifx\relax#2\else + \@namedef {etocnumber }{\leavevmode #1}% + \def\etocthenumber {#1}% + \def\etocthelinkednumber {#1}% + \Etoc@numbertrue + \Etoc@getname #3\etoc@ + \fi +} +\def\Etoc@getit@hyp #1#2#3#4#5#6\etoc@ {% + \def\Etoc@getname ##1\hspace\relax\etoc@ {% + \@namedef {etocname }{\leavevmode #1{#2}{#3}{##1}#5}% + \def\etocthename {##1}% + \toks@ {##1}% + \edef\etocthelinkedname {\noexpand\hyperlink {#3}{\the\toks@}}% + }% + \def\Etoc@getnbr ##1\hspace##2##3\etoc@ {% + \ifx\relax##2\else + \@namedef {etocnumber }{\leavevmode #1{#2}{#3}{##1}#5}% + \def\etocthenumber {##1}% + \toks@ {##1}% + \edef\etocthelinkednumber {\noexpand\hyperlink {#3}{\the\toks@}}% + \Etoc@numbertrue + \Etoc@getname ##3\etoc@ + \fi + }% + \Etoc@getnbr #4\hspace\relax\etoc@ +} +\newcommand*\etocthename {} +\newcommand*\etocthenumber {} +\newcommand*\etocthepage {} +\newcommand*\etocthelinkedname {} +\newcommand*\etocthelinkednumber {} +\newcommand*\etocthelinkedpage {} +\newcommand*\etocthelink {} +\DeclareRobustCommand*{\etocname} {} +\DeclareRobustCommand*{\etocnumber}{} +\DeclareRobustCommand*{\etocpage} {} +\DeclareRobustCommand*{\etoclink} {} +\DeclareRobustCommand*{\etocifnumbered} + {\ifEtoc@number\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\Etoc@readtoc#1{% + \ifeof #1 + \let\Etoc@nextread\@gobble + \global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}% + \else + \let\Etoc@nextread\Etoc@readtoc + \read #1 to \Etoc@buffer + \Etoc@toctoks=\expandafter\expandafter\expandafter + {\expandafter\the\expandafter\Etoc@toctoks\Etoc@buffer}% + \fi + \Etoc@nextread{#1}% +} +\IfFileExists{\jobname .toc} + {{\endlinechar=-1 + \makeatletter + \newread\Etoc@tf + \openin\Etoc@tf\@filef@und + \Etoc@readtoc\Etoc@tf + \closein\Etoc@tf}} + {\typeout{No file \jobname .toc.}} +\def\Etoc@openouttoc{% formerly \Etoc@starttoc +%% 1.07d: parskip and \@nobreakfalse stuff moved to \Etoc@tableofcontents + \ifEtoc@hyperref + \ifx\hyper@last\@undefined + \IfFileExists{\jobname .toc} + {\Hy@WarningNoLine + {old toc file detected, not used; run LaTeX again (cheers from etoc)}% + \global\Etoc@toctoks={}% + } + {}% + \fi + \fi + \if@filesw + \newwrite \tf@toc + \immediate \openout \tf@toc \jobname .toc\relax + \fi + \gdef\Etoc@openouttoc{}% 1.07d, rather than using a boolean +} +\def\Etoc@toctoc{% + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@ifalse + \global\Etoc@false + \global\Etoc@jfalse + \global\Etoc@jjfalse +\ifEtoc@standard + \etoc@setstyle{@minustwo}{}{}{}{}% + \etoc@setstyle{@minusone}{}{}{}{}% + \etoc@setstyle{@zero}{}{}{}{}% + \etoc@setstyle{@one}{}{}{}{}% + \etoc@setstyle{@two}{}{}{}{}% + \etoc@setstyle{@three}{}{}{}{}% + \etoc@setstyle{@four}{}{}{}{}% + \etoc@setstyle{@five}{}{}{}{}% +\else + \def\Etoc@levellist@elt##1{\let##1\Etoc@lxyz}% + \Etoc@levellist + \let\booknumberline\numberline + \let\partnumberline\numberline + \let\chapternumberline\numberline +\fi +\the\Etoc@toctoks +\ifEtoc@notactive\else + \ifEtoc@v \Etoc@end@five\fi + \ifEtoc@iv \Etoc@end@four\fi + \ifEtoc@iii \Etoc@end@three\fi + \ifEtoc@ii \Etoc@end@two\fi + \ifEtoc@i \Etoc@end@one\fi + \ifEtoc@ \Etoc@end@zero\fi + \ifEtoc@j \Etoc@end@minusone\fi + \ifEtoc@jj \Etoc@end@minustwo\fi +\fi} +\def\etoc@@startlocaltoc#1#2{% +\let\Etoc@next\relax + \ifEtoc@localtoc + \ifEtoc@notactive + \ifnum #1=#2\relax + \ifEtoc@jj \let\Etoc@localtop\Etoc@@minusone@@ \fi + \ifEtoc@j \let\Etoc@localtop\Etoc@@zero@@ \fi + \ifEtoc@ \let\Etoc@localtop\Etoc@@one@@ \fi + \ifEtoc@i \let\Etoc@localtop\Etoc@@two@@ \fi + \ifEtoc@ii \let\Etoc@localtop\Etoc@@three@@ \fi + \ifEtoc@iii \let\Etoc@localtop\Etoc@@four@@ \fi + \ifEtoc@iv \let\Etoc@localtop\Etoc@@five@@ \fi + \ifEtoc@v \let\Etoc@localtop\Etoc@@six@@ \fi + \def\Etoc@next{\global\Etoc@notactivefalse + \global\Etoc@vfalse + \global\Etoc@ivfalse + \global\Etoc@iiifalse + \global\Etoc@iifalse + \global\Etoc@ifalse + \global\Etoc@false + \global\Etoc@jfalse + \global\Etoc@jjfalse}% + \fi + \fi\fi +\Etoc@next} +\let\etoc@startlocaltoc\@gobble +\def\Etoc@localtableofcontents#1{% + \edef\Etoc@tmp{#1}% + \ifnum\Etoc@tmp<\@ne + \PackageWarning{etoc} + {Unknown toc id: run LaTeX to get references right}% + \leavevmode --unknown etoc ref: run latex again--\par + \let\Etoc@next\@gobble\else\let\Etoc@next\@firstofone\fi + \Etoc@next + {\edef\etoc@startlocaltoc##1{% + \noexpand\etoc@@startlocaltoc{##1}{#1}} + \Etoc@localtoctrue + \let\Etoc@localtop\Etoc@@minustwo@@ + \global\Etoc@stoptocfalse + \global\Etoc@notactivetrue + \Etoc@tableofcontents}% + \endgroup\ifEtoc@mustclosegroup\endgroup\fi} +\def\Etoc@getrefno #1#2\etoc@ {#1} +\def\Etoc@getref #1{\@ifundefined{r@#1}{0}{\expandafter\expandafter\expandafter + \Etoc@getrefno\csname r@#1\endcsname\relax\etoc@}} +\def\Etoc@ref#1{\Etoc@localtableofcontents{\Etoc@getref{#1}}} +\def\Etoc@label#1{\label{#1}\futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} +\@firstofone{\def\Etoc@again} {\futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} +\def\Etoc@t@bleofcontents{% + \ifx\Etoc@nexttoken\label + \def\Etoc@next{\expandafter\Etoc@label\@gobble}\else + \ifx\Etoc@nexttoken\@sptoken + \let\Etoc@next\Etoc@again\else + \ifEtoc@tocwithid + \def\Etoc@next{\Etoc@localtableofcontents{\c@etoc@tocid}}% + \else + \ifx\Etoc@nexttoken\ref + \def\Etoc@next{\expandafter\Etoc@ref\@gobble}% + \else + \def\Etoc@next{\Etoc@localtocfalse + \global\Etoc@notactivefalse + \Etoc@tableofcontents + \endgroup + \ifEtoc@mustclosegroup\endgroup\fi}% + \fi + \fi\fi\fi\Etoc@next} +\def\table@fcontents{% + \refstepcounter{etoc@tocid}% + \Etoc@tocwithidfalse + \futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} +\def\localtable@fcontents{% + \refstepcounter{etoc@tocid}% + \addtocontents{toc} + {\string\etoc@startlocaltoc{\arabic{etoc@tocid}}}% + \Etoc@tocwithidtrue + \futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} +\newcommand*\etocaftertitlehook{} +\newcommand*\etocaftercontentshook{} +\renewcommand*\tableofcontents{% + \Etoc@openouttoc + \Etoc@par + \begingroup % closed in \Etoc@t@bleofcontents or \Etoc@localtableofcontents + \def\etoc@startlocaltoc##1{\etoc@@startlocaltoc{##1}{\c@etoc@tocid}}% + \@ifstar + {\def\Etoc@aftertitlehook{}\table@fcontents} + {\let\Etoc@aftertitlehook\etocaftertitlehook\table@fcontents}} +\newcommand*\localtableofcontents{% + \Etoc@openouttoc + \Etoc@par + \begingroup % closed in \Etoc@t@bleofcontents or \Etoc@localtableofcontents + \@ifstar + {\def\Etoc@aftertitlehook{}\localtable@fcontents} + {\let\Etoc@aftertitlehook\etocaftertitlehook\localtable@fcontents}} +\newcommand\etocsettocstyle[2]{% +\def\Etoc@tableofcontents +{\ifnum\c@tocdepth>\Etoc@minf + \let\Etoc@@next\@firstofone\else + \let\Etoc@@next\@gobble +\fi +\Etoc@@next{#1\ifEtoc@parskip\parskip\z@skip\fi %1.07d + \Etoc@aftertitlehook + \let\Etoc@savedcontentsline\contentsline + \let\contentsline\Etoc@etoccontentsline + \Etoc@toctoc + \let\Etoc@@next\relax + \ifEtoc@tocwithid\else + \ifEtoc@localtoc + \ifEtoc@notactive + \def\Etoc@@next{\Etoc@localtocfalse + \global\Etoc@notactivefalse + \Etoc@toctoc}% + \fi\fi\fi + \Etoc@@next + \etocaftercontentshook + #2\@nobreakfalse}}} % 1.07d: \@nobreakfalse moved here +\newcommand*\etocsetstyle{\Etoc@standardfalse\etoc@setstyle} +\long\def\etoc@setstyle#1#2#3#4#5{% +\long\expandafter\def + \csname Etoc@begin@\csname Etoc@#1@\endcsname\endcsname {#2}% +\long\expandafter\def + \csname Etoc@prefix@\csname Etoc@#1@\endcsname\endcsname {#3}% +\long\expandafter\def + \csname Etoc@contents@\csname Etoc@#1@\endcsname\endcsname {#4}% +\long\expandafter\def + \csname Etoc@end@\csname Etoc@#1@\endcsname\endcsname {#5}} +\newcommand*\etocfontminustwo {\normalfont \LARGE \bfseries} +\newcommand*\etocfontminusone {\normalfont \large \bfseries} +\newcommand*\etocfontzero {\normalfont \large \bfseries} +\newcommand*\etocfontone {\normalfont \normalsize \bfseries} +\newcommand*\etocfonttwo {\normalfont \normalsize} +\newcommand*\etocfontthree {\normalfont \footnotesize} +\newcommand*\etocsepminustwo {4ex \@plus .5ex \@minus .5ex} +\newcommand*\etocsepminusone {4ex \@plus .5ex \@minus .5ex} +\newcommand*\etocsepzero {2.5ex \@plus .4ex \@minus .4ex} +\newcommand*\etocsepone {1.5ex \@plus .3ex \@minus .3ex} +%%\newcommand*\etocseptwo{1ex \@plus .15ex \@minus .15ex} % modified in 1.07e +\newcommand*\etocseptwo {.5ex \@plus .1ex \@minus .1ex} +\newcommand*\etocsepthree {.25ex \@plus .05ex \@minus .05ex} +\newcommand*\etocbaselinespreadminustwo {1} +\newcommand*\etocbaselinespreadminusone {1} +\newcommand*\etocbaselinespreadzero {1} +\newcommand*\etocbaselinespreadone {1} +\newcommand*\etocbaselinespreadtwo {1} +\newcommand*\etocbaselinespreadthree {.9} +\newcommand*\etocminustwoleftmargin {1.5em plus 0.5fil} +\newcommand*\etocminustworightmargin {1.5em plus -0.5fil} +\newcommand*\etocminusoneleftmargin {1em} +\newcommand*\etocminusonerightmargin {1em} +\newcommand*\etoctoclineleaders + {\hbox{\normalfont\normalsize\hb@xt@2ex {\hss.\hss}}} +\newcommand*\etocabbrevpagename {p.~} +\newcommand*\etocpartname {\partname} +\newcommand*\etocbookname {Book} +\def\etocdefaultlines{\Etoc@standardfalse +%% `book' in memoir class: +\etoc@setstyle{@minustwo} + {\addpenalty\@M\etocskipfirstprefix} + {\addpenalty\@secpenalty} + {\begingroup + \etocfontminustwo + \addvspace{\etocsepminustwo}% + \parindent \z@ + \leftskip \etocminustwoleftmargin + \rightskip \etocminustworightmargin + \parfillskip \@flushglue + \vbox{\etocifnumbered{\etocbookname\enspace\etocnumber:\quad}{}\etocname + \baselineskip\etocbaselinespreadminustwo\baselineskip + \par}% + \addpenalty\@M\addvspace{\etocsepminusone}% + \endgroup} + {}% +%% `part': +\etoc@setstyle{@minusone} + {\addpenalty\@M\etocskipfirstprefix} + {\addpenalty\@secpenalty} + {\begingroup + \etocfontminusone + \addvspace{\etocsepminusone}% + \parindent \z@ + \leftskip \etocminusoneleftmargin + \rightskip \etocminusonerightmargin + \parfillskip \@flushglue + \vbox{\etocifnumbered{\etocpartname\enspace\etocnumber.\quad}{}\etocname + \baselineskip\etocbaselinespreadminusone\baselineskip + \par}% + \addpenalty\@M\addvspace{\etocsepzero}% + \endgroup} + {}% +%% `chapter': +\etoc@setstyle{@zero} + {\addpenalty\@M\etocskipfirstprefix} + {\addpenalty\@itempenalty} + {\begingroup + \etocfontzero + \addvspace{\etocsepzero}% + \parindent \z@ \parfillskip \@flushglue + \vbox{\etocifnumbered{\etocnumber.\enspace}{}\etocname + \baselineskip\etocbaselinespreadzero\baselineskip + \par}% + \endgroup} + {\addpenalty{-\@highpenalty}\addvspace{\etocsepminusone}}% +%% `section': +\etoc@setstyle{@one} + {\addpenalty\@M\etocskipfirstprefix} + {\addpenalty\@itempenalty} + {\begingroup + \etocfontone + \addvspace{\etocsepone}% + \parindent \z@ \parfillskip \z@ + \setbox\z@\vbox{\parfillskip\@flushglue + \etocname\par + \setbox\tw@\lastbox + \global\setbox\@ne\hbox{\unhbox\tw@\ }}% + \dimen\z@=\wd\@ne + \setbox\z@=\etoctoclineleaders + \advance\dimen\z@\wd\z@ + \etocifnumbered + {\setbox\tw@\hbox{\etocnumber, \etocabbrevpagename\etocpage}} + {\setbox\tw@\hbox{\etocabbrevpagename\etocpage}}% + \advance\dimen\z@\wd\tw@ + \ifdim\dimen\z@ < \linewidth + \vbox{\etocname~% + \leaders\box\z@\hfil\box\tw@ + \baselineskip\etocbaselinespreadone\baselineskip + \par} + \else + \vbox{\etocname~% + \leaders\copy\z@\hfil\break + \hbox{}\leaders\box\z@\hfil\box\tw@ + \baselineskip\etocbaselinespreadone\baselineskip + \par} + \fi + \endgroup} + {\addpenalty\@secpenalty\addvspace{\etocsepzero}}% +%% `subsection': +\etoc@setstyle{@two} + {\addpenalty\@medpenalty\etocskipfirstprefix} + {\addpenalty\@itempenalty} + {\begingroup + \etocfonttwo + \addvspace{\etocseptwo}% + \parindent \z@ \parfillskip \z@ + \setbox\z@\vbox{\parfillskip\@flushglue + \etocname\par\setbox\tw@\lastbox + \global\setbox\@ne\hbox{\unhbox\tw@}}% + \dimen\z@=\wd\@ne + \setbox\z@=\etoctoclineleaders + \advance\dimen\z@\wd\z@ + \etocifnumbered + {\setbox\tw@\hbox{\etocnumber, \etocabbrevpagename\etocpage}} + {\setbox\tw@\hbox{\etocabbrevpagename\etocpage}}% + \advance\dimen\z@\wd\tw@ + \ifdim\dimen\z@ < \linewidth + \vbox{\etocname~% + \leaders\box\z@\hfil\box\tw@ + \baselineskip\etocbaselinespreadtwo\baselineskip + \par} + \else + \vbox{\etocname~% + \leaders\copy\z@\hfil\break + \hbox{}\leaders\box\z@\hfil\box\tw@ + \baselineskip\etocbaselinespreadtwo\baselineskip + \par} + \fi + \endgroup} + {\addpenalty\@secpenalty\addvspace{\etocsepone}}% +%% `subsubsection': +\etoc@setstyle{@three} + {\addpenalty\@M + \etocfontthree + \vspace{\etocsepthree}% + \noindent + \etocskipfirstprefix} + {\allowbreak\,--\,} + {\etocname} + {.\hfil + \begingroup + \baselineskip\etocbaselinespreadthree\baselineskip + \par + \endgroup + \addpenalty{-\@highpenalty}}% +\etoc@setstyle{@four}{}{}{}{}% +\etoc@setstyle{@five}{}{}{}{}% +} +\newcommand*\etocabovetocskip{3.5ex \@plus 1ex \@minus .2ex} +\newcommand*\etocbelowtocskip{3.5ex \@plus 1ex \@minus .2ex} +\newcommand*\etoccolumnsep{2em} +\newcommand*\etocmulticolsep{0ex} +\newcommand*\etocmulticolpretolerance{-1} +\newcommand*\etocmulticoltolerance{200} +\newcommand*\etocdefaultnbcol{2} +\newcommand*\etocinnertopsep{2ex} +\newcommand\etocmulticolstyle[2][\etocdefaultnbcol]{% +\etocsettocstyle + {\let\etocoldpar\par + \addvspace{\etocabovetocskip}% + \ifnum #1>\@ne\let\Etoc@next\@firstoftwo + \else \let\Etoc@next\@secondoftwo\fi + \Etoc@next{% + \multicolpretolerance\etocmulticolpretolerance + \multicoltolerance\etocmulticoltolerance + \setlength{\columnsep}{\etoccolumnsep}% + \setlength{\multicolsep}{\etocmulticolsep}% + \begin{multicols}{#1}[#2\etocoldpar\addvspace{\etocinnertopsep}]} + {#2\par\addvspace{\etocinnertopsep}% + \pretolerance\etocmulticolpretolerance + \tolerance\etocmulticoltolerance}} + {\ifnum #1>\@ne\let\Etoc@next\@firstofone + \else \let\Etoc@next\@gobble\fi + \Etoc@next{\end{multicols}}% + \addvspace{\etocbelowtocskip}}} +\newcommand*\etocinnerbottomsep{3.5ex} +\newcommand*\etocinnerleftsep{2em} +\newcommand*\etocinnerrightsep{2em} +\newcommand*\etoctoprule{\hrule} +\newcommand*\etocleftrule{\vrule} +\newcommand*\etocrightrule{\vrule} +\newcommand*\etocbottomrule{\hrule} +\newcommand*\etoctoprulecolorcmd{\relax} +\newcommand*\etocbottomrulecolorcmd{\relax} +\newcommand*\etocleftrulecolorcmd{\relax} +\newcommand*\etocrightrulecolorcmd{\relax} +\def\etoc@ruledheading #1{% + \hb@xt@\linewidth{\color@begingroup + \hss #1\hss\hskip-\linewidth + \etoctoprulecolorcmd\leaders\etoctoprule\hss + \phantom{#1}% + \leaders\etoctoprule\hss\color@endgroup}% + \nointerlineskip\vskip\etocinnertopsep} +\newcommand*\etocruledstyle[2][\etocdefaultnbcol]{% +\etocsettocstyle + {\addvspace{\etocabovetocskip}% + \ifnum #1>\@ne\let\Etoc@next\@firstoftwo + \else \let\Etoc@next\@secondoftwo\fi + \Etoc@next + {\multicolpretolerance\etocmulticolpretolerance + \multicoltolerance\etocmulticoltolerance + \setlength{\columnsep}{\etoccolumnsep}% + \setlength{\multicolsep}{\etocmulticolsep}% + \begin{multicols}{#1}[\etoc@ruledheading{#2}]} + {\etoc@ruledheading{#2}\nobreak + \pretolerance\etocmulticolpretolerance + \tolerance\etocmulticoltolerance}} + {\ifnum #1>\@ne\let\Etoc@next\@firstofone + \else \let\Etoc@next\@gobble\fi + \Etoc@next{\end{multicols}}% + \addvspace{\etocbelowtocskip}}} +\newcommand\etocframedmphook{\relax} +\newcommand*\etocbkgcolorcmd{\relax} +\def\Etoc@relax{\relax} +\newbox\etoc@framed@titlebox +\newbox\etoc@framed@contentsbox +\newcommand*\etocframedstyle[2][\etocdefaultnbcol]{% +\etocsettocstyle{% + \addvspace{\etocabovetocskip}% + \sbox\z@{#2}% + \dimen\z@\dp\z@ + \ifdim\wd\z@<\linewidth \dp\z@\z@ \else \dimen\z@\z@ \fi + \setbox\etoc@framed@titlebox=\hb@xt@\linewidth{\color@begingroup + \hss + \ifx\etocbkgcolorcmd\Etoc@relax\else + \sbox\tw@{\color{white}% + \vrule\@width\wd\z@\@height\ht\z@\@depth\dimen\z@}% + \ifdim\wd\z@<\linewidth \dp\tw@\z@\fi + \box\tw@ + \hskip-\wd\z@ + \fi + \copy\z@ + \hss + \hskip-\linewidth + \etoctoprulecolorcmd\leaders\etoctoprule\hss% + \hskip\wd\z@ + \etoctoprulecolorcmd\leaders\etoctoprule\hss\color@endgroup}% + \setbox\z@\hbox{\etocleftrule\etocrightrule}% + \dimen\tw@\linewidth\advance\dimen\tw@-\wd\z@ + \advance\dimen\tw@-\etocinnerleftsep + \advance\dimen\tw@-\etocinnerrightsep + \setbox\etoc@framed@contentsbox=\vbox\bgroup + \hsize\dimen\tw@ + \kern\dimen\z@ + \vskip\etocinnertopsep + \hbox\bgroup + \begin{minipage}{\hsize}% + \etocframedmphook + \ifnum #1>\@ne\let\Etoc@next\@firstoftwo + \else \let\Etoc@next\@secondoftwo\fi + \Etoc@next + {\multicolpretolerance\etocmulticolpretolerance + \multicoltolerance\etocmulticoltolerance + \setlength{\columnsep}{\etoccolumnsep}% + \setlength{\multicolsep}{\etocmulticolsep}% + \begin{multicols}{#1}} + {\pretolerance\etocmulticolpretolerance + \tolerance\etocmulticoltolerance}} + {\ifnum #1>\@ne\let\Etoc@next\@firstofone + \else \let\Etoc@next\@gobble\fi + \Etoc@next{\end{multicols}\unskip}% + \end{minipage}% + \egroup + \vskip\etocinnerbottomsep + \egroup + \vbox{\hsize\linewidth + \ifx\etocbkgcolorcmd\Etoc@relax\else + \kern\ht\etoc@framed@titlebox + \kern\dp\etoc@framed@titlebox + \hb@xt@\linewidth{\color@begingroup + \etocleftrulecolorcmd\etocleftrule + \etocbkgcolorcmd + \leaders\vrule + \@height\ht\etoc@framed@contentsbox + \@depth\dp\etoc@framed@contentsbox + \hss + \etocrightrulecolorcmd\etocrightrule + \color@endgroup}\nointerlineskip + \vskip-\dp\etoc@framed@contentsbox + \vskip-\ht\etoc@framed@contentsbox + \vskip-\dp\etoc@framed@titlebox + \vskip-\ht\etoc@framed@titlebox + \fi + \box\etoc@framed@titlebox\nointerlineskip + \hb@xt@\linewidth{\color@begingroup + {\etocleftrulecolorcmd\etocleftrule}% + \hss\box\etoc@framed@contentsbox\hss + \etocrightrulecolorcmd\etocrightrule\color@endgroup} + \nointerlineskip + \vskip\ht\etoc@framed@contentsbox + \vskip\dp\etoc@framed@contentsbox + \hb@xt@\linewidth{\color@begingroup\etocbottomrulecolorcmd + \leaders\etocbottomrule\hss\color@endgroup}} + \addvspace{\etocbelowtocskip}}} +\newcommand\etoc@multicoltoc[2][\etocdefaultnbcol]{% + \etocmulticolstyle[#1]{#2}% + \tableofcontents} +\newcommand\etoc@multicoltoci[2][\etocdefaultnbcol]{% + \etocmulticolstyle[#1]{#2}% + \tableofcontents*} +\newcommand\etoc@local@multicoltoc[2][\etocdefaultnbcol]{% + \etocmulticolstyle[#1]{#2}% + \localtableofcontents} +\newcommand\etoc@local@multicoltoci[2][\etocdefaultnbcol]{% + \etocmulticolstyle[#1]{#2}% + \localtableofcontents*} +\newcommand*\etoc@ruledtoc[2][\etocdefaultnbcol]{% + \etocruledstyle[#1]{#2}% + \tableofcontents} +\newcommand*\etoc@ruledtoci[2][\etocdefaultnbcol]{% + \etocruledstyle[#1]{#2}% + \tableofcontents*} +\newcommand*\etoc@local@ruledtoc[2][\etocdefaultnbcol]{% + \etocruledstyle[#1]{#2}% + \localtableofcontents} +\newcommand*\etoc@local@ruledtoci[2][\etocdefaultnbcol]{% + \etocruledstyle[#1]{#2}% + \localtableofcontents*} +\newcommand*\etoc@framedtoc[2][\etocdefaultnbcol]{% + \etocframedstyle[#1]{#2}% + \tableofcontents} +\newcommand*\etoc@framedtoci[2][\etocdefaultnbcol]{% + \etocframedstyle[#1]{#2}% + \tableofcontents*} +\newcommand*\etoc@local@framedtoc[2][\etocdefaultnbcol]{% + \etocframedstyle[#1]{#2}% + \localtableofcontents} +\newcommand*\etoc@local@framedtoci[2][\etocdefaultnbcol]{% + \etocframedstyle[#1]{#2}% + \localtableofcontents*} +\def\etocmulticol{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@multicoltoci} + {\etoc@multicoltoc}} +\def\etocruled{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@ruledtoci} + {\etoc@ruledtoc}} +\def\etocframed{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@framedtoci} + {\etoc@framedtoc}} +\def\etoclocalmulticol{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@local@multicoltoci} + {\etoc@local@multicoltoc}} +\def\etoclocalruled{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@local@ruledtoci} + {\etoc@local@ruledtoc}} +\def\etoclocalframed{\begingroup + \Etoc@mustclosegrouptrue + \@ifstar + {\etoc@local@framedtoci} + {\etoc@local@framedtoc}} +\def\etocarticlestyle{% + \etocsettocstyle + {\section *{\contentsname + \@mkboth {\MakeUppercase \contentsname} + {\MakeUppercase \contentsname}}} + {}} +\def\etocarticlestylenomarks{% + \etocsettocstyle + {\section *{\contentsname}} + {}} +\def\etocbookstyle{% + \etocsettocstyle + {\if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi + \chapter *{\contentsname + \@mkboth {\MakeUppercase \contentsname} + {\MakeUppercase \contentsname}}} + {\if@restonecol \twocolumn \fi}} +\def\etocbookstylenomarks{% + \etocsettocstyle + {\if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi + \chapter *{\contentsname}} + {\if@restonecol \twocolumn \fi}} +\let\etocreportstyle\etocbookstyle +\let\etocreportstylenomarks\etocbookstylenomarks +\def\etocmemoirtoctotocfmt #1#2{% + \def\Etoc@addsuitablecontentsline{\addcontentsline {toc}{#1}{#2}}% + \renewcommand*\etocaftertitlehook{% + \ifmem@em@starred@listof + \else\phantomsection\aftergroup\Etoc@addsuitablecontentsline\fi}} +\def\etocmemoirstyle{% + \etocsettocstyle + {\ensureonecol \par \begingroup \@nameuse {@tocmaketitle} + \Etoc@aftertitlehook\let\Etoc@aftertitlehook\relax + \parskip \cftparskip \@nameuse {cfttocbeforelisthook}} + {\@nameuse {cfttocafterlisthook}\endgroup\restorefromonecol}} +\def\etocscrartclstyle{% + \etocsettocstyle + {\let\if@dynlist\if@tocleft + \iftocfeature {toc}{onecolumn} + {\iftocfeature {toc}{leveldown} + {} + {\if@twocolumn \aftergroup \twocolumn \onecolumn \fi }} + {}% + \tocbasic@listhead {\listoftocname}% + \begingroup \expandafter \expandafter \expandafter + \endgroup \expandafter + \ifx + \csname microtypesetup\endcsname \relax + \else + \iftocfeature {toc}{noprotrusion}{} + {\microtypesetup {protrusion=false}% + \PackageInfo {tocbasic}% + {character protrusion at toc deactivated}}% + \fi + \setlength {\parskip }{\z@ }% + \setlength {\parindent }{\z@ }% + \setlength {\parfillskip }{\z@ \@plus 1fil}% + \csname tocbasic@@before@hook\endcsname + \csname tb@toc@before@hook\endcsname} + {\csname tb@toc@after@hook\endcsname + \csname tocbasic@@after@hook\endcsname}} +\let\etocscrbookstyle\etocscrartclstyle +\let\etocscrreprtstyle\etocscrartclstyle +\newcommand*\etocstandarddisplaystyle{\etocarticlestyle} +\newcommand*\etocmarkboth[1]{% + \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}} +\newcommand*\etocmarkbothnouc[1]{\@mkboth{#1}{#1}} +\newcommand\etoctocstyle[3][section]{\etocmulticolstyle[#2]% + {\csname #1\endcsname *{#3}}} +\newcommand\etoctocstylewithmarks[4][section]{\etocmulticolstyle[#2]% + {\csname #1\endcsname *{#3\etocmarkboth{#4}}}} +\newcommand\etoctocstylewithmarksnouc[4][section]{\etocmulticolstyle[#2]% + {\csname #1\endcsname *{#3\etocmarkbothnouc{#4}}}} +\def\Etoc@redefetocstyle#1{% + \renewcommand\etoctocstylewithmarks[4][#1] + {\etocmulticolstyle[##2]% + {\csname ##1\endcsname *{##3\etocmarkboth{##4}}}} + \renewcommand\etoctocstylewithmarksnouc[4][#1] + {\etocmulticolstyle[##2]% + {\csname ##1\endcsname *{##3\etocmarkbothnouc{##4}}}} + \renewcommand\etoctocstyle[3][#1]{% + \etocmulticolstyle[##2]{\csname ##1\endcsname *{##3}}}} +\@ifclassloaded{scrartcl} + {\renewcommand*\etocstandarddisplaystyle{\etocscrartclstyle}}{} +\@ifclassloaded{book} + {\renewcommand*\etocfontone{\normalfont\normalsize} + \renewcommand*\etocstandarddisplaystyle{\etocbookstyle} + \Etoc@redefetocstyle{chapter}}{} +\@ifclassloaded{report} + {\renewcommand*\etocfontone{\normalfont\normalsize} + \renewcommand*\etocstandarddisplaystyle{\etocreportstyle} + \Etoc@redefetocstyle{chapter}}{} +\@ifclassloaded{scrbook} + {\renewcommand*\etocfontone{\normalfont\normalsize} + \renewcommand*\etocstandarddisplaystyle{\etocscrbookstyle} + \Etoc@redefetocstyle{chapter}}{} +\@ifclassloaded{scrreprt} + {\renewcommand*\etocfontone{\normalfont\normalsize} + \renewcommand*\etocstandarddisplaystyle{\etocscrreprtstyle} + \Etoc@redefetocstyle{chapter}}{} +\@ifclassloaded{memoir} + {\renewcommand*\etocfontone{\normalfont\normalsize} + \etocmemoirtoctotocfmt{chapter}{\contentsname}% + \renewcommand*\etocstandarddisplaystyle{\etocmemoirstyle} + \Etoc@redefetocstyle{chapter}}{} +\def\Etoc@addtocontents #1#2% + {\ifEtoc@hyperref + \addtocontents {toc}{\protect\contentsline + {#1}{#2}% + {\thepage }{\@currentHref }}% + \else + \addtocontents {toc}{\protect\contentsline + {#1}{#2}{\thepage }}% + \fi} +\def\Etoc@addcontentsline@ #1#2#3% + {\@namedef{toclevel@#1}{#3}% + \addcontentsline {toc}{#1}{#2}} +\DeclareRobustCommand*{\etoctoccontentsline} + {\@ifstar{\Etoc@addcontentsline@}{\Etoc@addtocontents}} +\newcommand*\etocstandardlines{\Etoc@standardtrue} +\newcommand*\etoctoclines{\Etoc@standardfalse} % 1.07b +\etocdefaultlines % for initialization +\etocstandardlines +\etocstandarddisplaystyle +\endinput +%% +%% End of file `etoc.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoc.tlpobj new/tlpkg/tlpobj/etoc.tlpobj --- old/tlpkg/tlpobj/etoc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/etoc.tlpobj 2013-05-16 03:51:36.000000000 +0200 @@ -0,0 +1,26 @@ +name etoc +category Package +revision 30488 +shortdesc Completely customisable TOCs. +relocated 1 +longdesc The package gives the user complete control of how the entries +longdesc of the table of contents should be constituted from the name, +longdesc number, and page number of each sectioning unit. The layout is +longdesc controlled by the definition of 'line styles' for each +longdesc sectioning level used in the document. The package provides its +longdesc own custom line styles (which may be used as examples), and +longdesc continues to support the standard formatting inherited from the +longdesc LaTeX document classes, but the package can also allow the user +longdesc to delegate the details to packages dealing with list making +longdesc environments (such as enumitem). The package's default global +longdesc style typesets tables of contents in a multi-column format, +longdesc with either a standard heading, or a ruled title (optionally +longdesc with a frame around the table). The \tableofcontents command +longdesc may be used arbitrarily many times in the same document, while +longdesc \localtableofcontents provides a 'local' table of contents. +runfiles size=10 + RELOC/tex/latex/etoc/etoc.sty +catalogue-ctan /macros/latex/contrib/etoc +catalogue-date 2013-04-06 14:04:53 +0200 +catalogue-license lppl1.2 +catalogue-version 1.07f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/histogr.doc.tlpobj new/tlpkg/tlpobj/histogr.doc.tlpobj --- old/tlpkg/tlpobj/histogr.doc.tlpobj 2010-06-10 18:29:23.000000000 +0200 +++ new/tlpkg/tlpobj/histogr.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name histogr.doc -category Package -revision 15878 -shortdesc doc files of histogr -relocated 1 -docfiles size=27 - RELOC/doc/latex/histogr/histogr.pdf ++++++ hepunits.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 2010-09-19 00:35:41.000000000 +0200 @@ -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@gmail.com> +Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu> +Copyright 2009-2010 Khaled Hosny <khaledhosny@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. 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 2010-09-19 00:35:41.000000000 +0200 @@ -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@gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny@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/hepunits/ChangeLog new/doc/latex/hepunits/ChangeLog --- old/doc/latex/hepunits/ChangeLog 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -2007-09-27 Andy Buckley <andy@insectnation.org> - - * Ready for the momentous 1.1.1 release. - - * Removed "full screen" param from documentation PDF - configuration, since this is actually very annoying. - - * Added Makefile to build distribution tarball. - - * Fixed definition of \GeVovercsq, which was missing the second - power of c. Thanks to Jeroen Hegeman for the bug report. - -2005-12-12 Andy Buckley <andy@insectnation.org> - - * Added noprefixcmds option due to residual guilt about - contaminating everyone's command namespace. - - * Made basic manual. - - * Removed "derived" from default SIunits options. - - * Added SIunits options passing. - - * Started ChangeLog. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/README new/doc/latex/hepunits/README --- old/doc/latex/hepunits/README 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -hepunits --- a set of useful units for use in high energy physics -by Andy Buckley <andy@insectnation.org> ------------------------------------------------------------ - -hepunits is a LaTeX package built on the SIunits package which -adds a collection of useful HEP units to the existing SIunits set. -These include the energy units \MeV, \GeV, \TeV and the derived -momentum and mass units \MeVoverc, \MeVovercsq and so on. - -Additionally, some units are added for pure convenience. The -contents of the package with the exception of the energy units -mentioned above are subject to deprecation and addition, so please -provide feedback on which HEP units you'd like added to the -package. - -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. - -Author: Andy Buckley <andy@insectnation.org> Files old/doc/latex/hepunits/hepunits.pdf and new/doc/latex/hepunits/hepunits.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/hepunits.tex new/doc/latex/hepunits/hepunits.tex --- old/doc/latex/hepunits/hepunits.tex 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/hepunits.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,219 +0,0 @@ -\documentclass[12pt]{article} -\usepackage{maybemath, xspace, setspace, fancyvrb, a4wide} -\usepackage{url, relsize, booktabs, ccaption, braket} -\usepackage{hepunits} -\usepackage[colorlinks=true,bookmarks=true]{hyperref} -\newcommand{\hepunits}{\texttt{hepunits}\xspace} - -\let\OldCite\cite -\renewcommand{\cite}[1]{\mbox{\!\!\OldCite{#1}}} - -\onehalfspacing -\DefineShortVerb{\|} - -\author{Andy Buckley, \texttt{andy@insectnation.org}} -\title{The \hepunits \LaTeX{} package} - -\newcommand{\Or}{\ensuremath{\vert}\xspace} -\newcommand{\manifestsAs}{\ensuremath{\Rightarrow\quad}\xspace} -\newcommand{\texcmd}[1]{\texttt{\char`\\#1}} -\newcommand{\texenv}[1]{\texttt{\char`#1}} -\newcommand{\texopt}[1]{\texttt{\char`#1}} -\newcommand{\texarg}[1]{\texttt{\char`#1}} -\newcommand{\texpkg}[1]{\texttt{\char`#1}} -\newcommand{\texcls}[1]{\texttt{\char`#1}} -\newcommand{\texcommand}[1]{\texcmd{#1}} -\newcommand{\texoption}[1]{\texopt{#1}} -\newcommand{\texgen}[1]{\ensuremath{\braket{\text{\emph{#1}}}}} -\newenvironment{snippet}{\Verbatim}{\endVerbatim} - -\begin{document} -\maketitle - -\abstract{% - The \hepunits package extends the existing (and excellent) \texpkg{SIunits} - package to support units commonly used in high-energy physics. HEP uses a - rather specialised set of units to describe measurements of energies, masses, - momenta, reaction cross-sections, luminosities and so-on. Using this package - will provide particle physicists with a consistent and accurate way to refer - to dimensionful HEP quantities. -% -} - -\section{Recommended usage} -The basic usage mode for \hepunits is to place -% -\begin{snippet} -\usepackage{hepunits} -\end{snippet} -% -in the preamble of your document. \hepunits also supports the \texpkg{SIunits} -optional arguments (\texopt{thickspace}, \texopt{amssymb} and so-on), which are -passed on directly to the \texpkg{SIunits} package. By default the -\texopt{mediumspace}, \texopt{thickqspace}, \texopt{squaren} and -\texopt{textstyle} options are passed, but these can be overridden. -\texopt{amssymb} and \texopt{squaren} are considered to be mutually exclusive -options, but you can choose to pass neither option to \texpkg{SIunits} by using -the \hepunits \texopt{noamssquareissue} option. Additionally, the \hepunits -\texopt{notextstyle} option can be used to turn the \texpkg{SIunits} -\texopt{textstyle} off. On the whole, though, you should be able to use -\hepunits with no options in most circumstances and are likely only to need them -if you want access to the binary or derived units (using \texopt{binary} and -\texopt{derived}/\texopt{derivedinbase} respectively). - -Finally, the only \hepunits-specific option is \texopt{noprefixcmds}. This is -discussed at the end of the document and is probably only useful for macro -language pedants!\footnote{No offence intended to macro language pedants, of course\dots} - - -\section{Requirements} -\hepunits requires the \texpkg{SIunits}, \texpkg{xspace} and \texpkg{amsmath} -packages to be installed as part of your \TeX{} distribution. I don't know of -any distributions for which this isn't the case, so chances are you're safe to -just install \hepunits and use it right away! - - -\section{Provided units} -The HEP units provided by \hepunits are listed in Tables \ref{tab:normunits} and -\ref{tab:hepunits} below. All the example outputs have been produced with a -command like |\unit{1.0}{|\texgen{unit}|}| where \texgen{unit} is one of the -unit commands listed in the tables. - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ - -\midrule -Lengths & \\ -\texcmd{nm} & \unit{1.0}{\nm} \\ -\texcmd{micron} & \unit{1.0}{\micron} \\ -\texcmd{mm} & \unit{1.0}{\mm} \\ -\texcmd{cm} & \unit{1.0}{\cm} \\ - -\midrule -Times & \\ -\texcmd{ns} & \unit{1.0}{\ns} \\ -\texcmd{ps} & \unit{1.0}{\ps} \\ -\texcmd{fs} & \unit{1.0}{\fs} \\ -\texcmd{as} & \unit{1.0}{\as} \\ - -\midrule -Rates & \\ -\texcmd{mHz} & \unit{1.0}{\mHz} \\ -\texcmd{Hz} & \unit{1.0}{\Hz} \\ -\texcmd{kHz} & \unit{1.0}{\kHz} \\ -\texcmd{MHz} & \unit{1.0}{\MHz} \\ -\texcmd{GHz} & \unit{1.0}{\GHz} \\ -\texcmd{THz} & \unit{1.0}{\THz} \\ - -\midrule -Misc. & \\ -\texcmd{mrad} & \unit{1.0}{\mrad} \\ -\texcmd{gauss} & \unit{1.0}{\gauss} \\ - -\bottomrule -\end{tabular} -\caption{List of non-HEP specific units provided by \hepunits} -\label{tab:normunits} -\end{table} - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ -\midrule -Luminosities & \\ -\texcmd{invcmsqpersecond} & \unit{1.0}{\invcmsqpersecond} \\ -\texcmd{invcmsqpersec} & \unit{1.0}{\invcmsqpersec} \\ -\texcmd{lumiunits} & \unit{1.0}{\lumiunits} \\ - -\midrule -Cross-sections & \\ -\texcmd{barn} & \unit{1.0}{\barn} \\ -\texcmd{invbarn} & \unit{1.0}{\invbarn} \\ -\texcmd{nanobarn} & \unit{1.0}{\nanobarn} \\ -\texcmd{invnanobarn} / \texcmd{invnb} & \unit{1.0}{\invnanobarn} \\ -\texcmd{picobarn} & \unit{1.0}{\picobarn} \\ -\texcmd{invpicobarn} / \texcmd{invpb} & \unit{1.0}{\invpicobarn} \\ -\texcmd{femtobarn} & \unit{1.0}{\femtobarn} \\ -\texcmd{invfemtobarn} / \texcmd{invfb} & \unit{1.0}{\invfemtobarn} \\ -\texcmd{attobarn} & \unit{1.0}{\attobarn} \\ -\texcmd{invattobarn} / \texcmd{invab} & \unit{1.0}{\invattobarn} \\ - -\bottomrule -\end{tabular} -\caption{List of HEP-specific units provided by \hepunits} -\label{tab:hepunits} -\end{table} - - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ -\midrule -\eV-based units & \\ -\texcmd{eV} & \unit{1.0}{\eV} \\ -\texcmd{inveV} & \unit{1.0}{\inveV} \\ -\texcmd{eVoverc} & \unit{1.0}{\eVoverc} \\ -\texcmd{eVovercsq} & \unit{1.0}{\eVovercsq} \\ -\texcmd{meV} & \unit{1.0}{\meV} \\ -\texcmd{keV} & \unit{1.0}{\keV} \\ -\texcmd{MeV} & \unit{1.0}{\MeV} \\ -\texcmd{GeV} & \unit{1.0}{\GeV} \\ -\texcmd{TeV} & \unit{1.0}{\TeV} \\ -\texcmd{minveV} & \unit{1.0}{\minveV} \\ -\texcmd{kinveV} & \unit{1.0}{\kinveV} \\ -\texcmd{MinveV} & \unit{1.0}{\MinveV} \\ -\texcmd{GinveV} & \unit{1.0}{\GinveV} \\ -\texcmd{TinveV} & \unit{1.0}{\TinveV} \\ -\texcmd{meVoverc} & \unit{1.0}{\meVoverc} \\ -\texcmd{keVoverc} & \unit{1.0}{\keVoverc} \\ -\texcmd{MeVoverc} & \unit{1.0}{\MeVoverc} \\ -\texcmd{GeVoverc} & \unit{1.0}{\GeVoverc} \\ -\texcmd{TeVoverc} & \unit{1.0}{\TeVoverc} \\ -\texcmd{meVovercsq} & \unit{1.0}{\meVovercsq} \\ -\texcmd{keVovercsq} & \unit{1.0}{\keVovercsq} \\ -\texcmd{MeVovercsq} & \unit{1.0}{\MeVovercsq} \\ -\texcmd{GeVovercsq} & \unit{1.0}{\GeVovercsq} \\ -\texcmd{TeVovercsq} & \unit{1.0}{\TeVovercsq} \\ - -\bottomrule -\end{tabular} -\contcaption{List of HEP-specific units provided by \hepunits (cont.)} -\label{tab:hepunits2} -\end{table} - -Note that a lot of these units have, for convenience, been provided as explicit -commands with various SI prefixes, rather than just defining the base unit and -using the \texpkg{SIunits} prescription for the prefixes. Let's give a demo in -case you don't know what I'm waffling about\dots the ``usual'' \texpkg{SUunits} -way of doing things is like this: -|\unit{1.0}{\mega\eVoverc}|. This produces ``\unit{1.0}{\mega\eVoverc}'' -just like |\unit{1.0}{\MeVoverc}| would do. - -I've chosen to provide the explicit prefixed commands for convenience: choose -your own favourite way (the same applies even more so for most of the non-HEP -units). If you are bothered about the explictly prefixed commands clogging up -the \LaTeX{} macro namespace then pass the \texopt{noprefixcmds} option to -\hepunits and the offending commands won't be defined at all. This will make -life awkward when it comes to inverse cross-sections as used for integrated -luminosities, but with suitable use of \texcmd{invbarn} I'm sure you can make -do. - -\section{Summary} -\hepunits is a handy package for particle physicists who'd like their units to -look right, with upright \micro{s} and properly italicised $c$s in the -appropriate places. Fortunately most of the work has already been done by the -marvellous \texpkg{SIunits} package and I've just provided a few more commands -and an option passing wrapper on to that excellent piece of work. - -If you have any comments, criticism, huge cash donations etc., then please do -send them my way. Email to |andy@insectnation.org| is preferred, but if you can -find a way to get your message to me by carrier pigeon I'll be very impressed. - -\end{document} 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 2010-09-19 04:04:32.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/hepunits.doc.tlpobj new/tlpkg/tlpobj/hepunits.doc.tlpobj --- old/tlpkg/tlpobj/hepunits.doc.tlpobj 2010-06-10 18:29:19.000000000 +0200 +++ new/tlpkg/tlpobj/hepunits.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name hepunits.doc -category Package -revision 15878 -shortdesc doc files of hepunits -relocated 1 -docfiles size=27 - RELOC/doc/latex/hepunits/ChangeLog - RELOC/doc/latex/hepunits/README - RELOC/doc/latex/hepunits/hepunits.pdf - RELOC/doc/latex/hepunits/hepunits.tex ++++++ hepunits.doc.tar.xz -> euenc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/ChangeLog new/doc/latex/hepunits/ChangeLog --- old/doc/latex/hepunits/ChangeLog 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -2007-09-27 Andy Buckley <andy@insectnation.org> - - * Ready for the momentous 1.1.1 release. - - * Removed "full screen" param from documentation PDF - configuration, since this is actually very annoying. - - * Added Makefile to build distribution tarball. - - * Fixed definition of \GeVovercsq, which was missing the second - power of c. Thanks to Jeroen Hegeman for the bug report. - -2005-12-12 Andy Buckley <andy@insectnation.org> - - * Added noprefixcmds option due to residual guilt about - contaminating everyone's command namespace. - - * Made basic manual. - - * Removed "derived" from default SIunits options. - - * Added SIunits options passing. - - * Started ChangeLog. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/README new/doc/latex/hepunits/README --- old/doc/latex/hepunits/README 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -hepunits --- a set of useful units for use in high energy physics -by Andy Buckley <andy@insectnation.org> ------------------------------------------------------------ - -hepunits is a LaTeX package built on the SIunits package which -adds a collection of useful HEP units to the existing SIunits set. -These include the energy units \MeV, \GeV, \TeV and the derived -momentum and mass units \MeVoverc, \MeVovercsq and so on. - -Additionally, some units are added for pure convenience. The -contents of the package with the exception of the energy units -mentioned above are subject to deprecation and addition, so please -provide feedback on which HEP units you'd like added to the -package. - -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. - -Author: Andy Buckley <andy@insectnation.org> Files old/doc/latex/hepunits/hepunits.pdf and new/doc/latex/hepunits/hepunits.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/hepunits.tex new/doc/latex/hepunits/hepunits.tex --- old/doc/latex/hepunits/hepunits.tex 2007-09-29 01:13:53.000000000 +0200 +++ new/doc/latex/hepunits/hepunits.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,219 +0,0 @@ -\documentclass[12pt]{article} -\usepackage{maybemath, xspace, setspace, fancyvrb, a4wide} -\usepackage{url, relsize, booktabs, ccaption, braket} -\usepackage{hepunits} -\usepackage[colorlinks=true,bookmarks=true]{hyperref} -\newcommand{\hepunits}{\texttt{hepunits}\xspace} - -\let\OldCite\cite -\renewcommand{\cite}[1]{\mbox{\!\!\OldCite{#1}}} - -\onehalfspacing -\DefineShortVerb{\|} - -\author{Andy Buckley, \texttt{andy@insectnation.org}} -\title{The \hepunits \LaTeX{} package} - -\newcommand{\Or}{\ensuremath{\vert}\xspace} -\newcommand{\manifestsAs}{\ensuremath{\Rightarrow\quad}\xspace} -\newcommand{\texcmd}[1]{\texttt{\char`\\#1}} -\newcommand{\texenv}[1]{\texttt{\char`#1}} -\newcommand{\texopt}[1]{\texttt{\char`#1}} -\newcommand{\texarg}[1]{\texttt{\char`#1}} -\newcommand{\texpkg}[1]{\texttt{\char`#1}} -\newcommand{\texcls}[1]{\texttt{\char`#1}} -\newcommand{\texcommand}[1]{\texcmd{#1}} -\newcommand{\texoption}[1]{\texopt{#1}} -\newcommand{\texgen}[1]{\ensuremath{\braket{\text{\emph{#1}}}}} -\newenvironment{snippet}{\Verbatim}{\endVerbatim} - -\begin{document} -\maketitle - -\abstract{% - The \hepunits package extends the existing (and excellent) \texpkg{SIunits} - package to support units commonly used in high-energy physics. HEP uses a - rather specialised set of units to describe measurements of energies, masses, - momenta, reaction cross-sections, luminosities and so-on. Using this package - will provide particle physicists with a consistent and accurate way to refer - to dimensionful HEP quantities. -% -} - -\section{Recommended usage} -The basic usage mode for \hepunits is to place -% -\begin{snippet} -\usepackage{hepunits} -\end{snippet} -% -in the preamble of your document. \hepunits also supports the \texpkg{SIunits} -optional arguments (\texopt{thickspace}, \texopt{amssymb} and so-on), which are -passed on directly to the \texpkg{SIunits} package. By default the -\texopt{mediumspace}, \texopt{thickqspace}, \texopt{squaren} and -\texopt{textstyle} options are passed, but these can be overridden. -\texopt{amssymb} and \texopt{squaren} are considered to be mutually exclusive -options, but you can choose to pass neither option to \texpkg{SIunits} by using -the \hepunits \texopt{noamssquareissue} option. Additionally, the \hepunits -\texopt{notextstyle} option can be used to turn the \texpkg{SIunits} -\texopt{textstyle} off. On the whole, though, you should be able to use -\hepunits with no options in most circumstances and are likely only to need them -if you want access to the binary or derived units (using \texopt{binary} and -\texopt{derived}/\texopt{derivedinbase} respectively). - -Finally, the only \hepunits-specific option is \texopt{noprefixcmds}. This is -discussed at the end of the document and is probably only useful for macro -language pedants!\footnote{No offence intended to macro language pedants, of course\dots} - - -\section{Requirements} -\hepunits requires the \texpkg{SIunits}, \texpkg{xspace} and \texpkg{amsmath} -packages to be installed as part of your \TeX{} distribution. I don't know of -any distributions for which this isn't the case, so chances are you're safe to -just install \hepunits and use it right away! - - -\section{Provided units} -The HEP units provided by \hepunits are listed in Tables \ref{tab:normunits} and -\ref{tab:hepunits} below. All the example outputs have been produced with a -command like |\unit{1.0}{|\texgen{unit}|}| where \texgen{unit} is one of the -unit commands listed in the tables. - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ - -\midrule -Lengths & \\ -\texcmd{nm} & \unit{1.0}{\nm} \\ -\texcmd{micron} & \unit{1.0}{\micron} \\ -\texcmd{mm} & \unit{1.0}{\mm} \\ -\texcmd{cm} & \unit{1.0}{\cm} \\ - -\midrule -Times & \\ -\texcmd{ns} & \unit{1.0}{\ns} \\ -\texcmd{ps} & \unit{1.0}{\ps} \\ -\texcmd{fs} & \unit{1.0}{\fs} \\ -\texcmd{as} & \unit{1.0}{\as} \\ - -\midrule -Rates & \\ -\texcmd{mHz} & \unit{1.0}{\mHz} \\ -\texcmd{Hz} & \unit{1.0}{\Hz} \\ -\texcmd{kHz} & \unit{1.0}{\kHz} \\ -\texcmd{MHz} & \unit{1.0}{\MHz} \\ -\texcmd{GHz} & \unit{1.0}{\GHz} \\ -\texcmd{THz} & \unit{1.0}{\THz} \\ - -\midrule -Misc. & \\ -\texcmd{mrad} & \unit{1.0}{\mrad} \\ -\texcmd{gauss} & \unit{1.0}{\gauss} \\ - -\bottomrule -\end{tabular} -\caption{List of non-HEP specific units provided by \hepunits} -\label{tab:normunits} -\end{table} - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ -\midrule -Luminosities & \\ -\texcmd{invcmsqpersecond} & \unit{1.0}{\invcmsqpersecond} \\ -\texcmd{invcmsqpersec} & \unit{1.0}{\invcmsqpersec} \\ -\texcmd{lumiunits} & \unit{1.0}{\lumiunits} \\ - -\midrule -Cross-sections & \\ -\texcmd{barn} & \unit{1.0}{\barn} \\ -\texcmd{invbarn} & \unit{1.0}{\invbarn} \\ -\texcmd{nanobarn} & \unit{1.0}{\nanobarn} \\ -\texcmd{invnanobarn} / \texcmd{invnb} & \unit{1.0}{\invnanobarn} \\ -\texcmd{picobarn} & \unit{1.0}{\picobarn} \\ -\texcmd{invpicobarn} / \texcmd{invpb} & \unit{1.0}{\invpicobarn} \\ -\texcmd{femtobarn} & \unit{1.0}{\femtobarn} \\ -\texcmd{invfemtobarn} / \texcmd{invfb} & \unit{1.0}{\invfemtobarn} \\ -\texcmd{attobarn} & \unit{1.0}{\attobarn} \\ -\texcmd{invattobarn} / \texcmd{invab} & \unit{1.0}{\invattobarn} \\ - -\bottomrule -\end{tabular} -\caption{List of HEP-specific units provided by \hepunits} -\label{tab:hepunits} -\end{table} - - -\begin{table}[ht] -\centering -\begin{tabular}{ll} -\toprule -Unit command & Example \\ -\midrule -\eV-based units & \\ -\texcmd{eV} & \unit{1.0}{\eV} \\ -\texcmd{inveV} & \unit{1.0}{\inveV} \\ -\texcmd{eVoverc} & \unit{1.0}{\eVoverc} \\ -\texcmd{eVovercsq} & \unit{1.0}{\eVovercsq} \\ -\texcmd{meV} & \unit{1.0}{\meV} \\ -\texcmd{keV} & \unit{1.0}{\keV} \\ -\texcmd{MeV} & \unit{1.0}{\MeV} \\ -\texcmd{GeV} & \unit{1.0}{\GeV} \\ -\texcmd{TeV} & \unit{1.0}{\TeV} \\ -\texcmd{minveV} & \unit{1.0}{\minveV} \\ -\texcmd{kinveV} & \unit{1.0}{\kinveV} \\ -\texcmd{MinveV} & \unit{1.0}{\MinveV} \\ -\texcmd{GinveV} & \unit{1.0}{\GinveV} \\ -\texcmd{TinveV} & \unit{1.0}{\TinveV} \\ -\texcmd{meVoverc} & \unit{1.0}{\meVoverc} \\ -\texcmd{keVoverc} & \unit{1.0}{\keVoverc} \\ -\texcmd{MeVoverc} & \unit{1.0}{\MeVoverc} \\ -\texcmd{GeVoverc} & \unit{1.0}{\GeVoverc} \\ -\texcmd{TeVoverc} & \unit{1.0}{\TeVoverc} \\ -\texcmd{meVovercsq} & \unit{1.0}{\meVovercsq} \\ -\texcmd{keVovercsq} & \unit{1.0}{\keVovercsq} \\ -\texcmd{MeVovercsq} & \unit{1.0}{\MeVovercsq} \\ -\texcmd{GeVovercsq} & \unit{1.0}{\GeVovercsq} \\ -\texcmd{TeVovercsq} & \unit{1.0}{\TeVovercsq} \\ - -\bottomrule -\end{tabular} -\contcaption{List of HEP-specific units provided by \hepunits (cont.)} -\label{tab:hepunits2} -\end{table} - -Note that a lot of these units have, for convenience, been provided as explicit -commands with various SI prefixes, rather than just defining the base unit and -using the \texpkg{SIunits} prescription for the prefixes. Let's give a demo in -case you don't know what I'm waffling about\dots the ``usual'' \texpkg{SUunits} -way of doing things is like this: -|\unit{1.0}{\mega\eVoverc}|. This produces ``\unit{1.0}{\mega\eVoverc}'' -just like |\unit{1.0}{\MeVoverc}| would do. - -I've chosen to provide the explicit prefixed commands for convenience: choose -your own favourite way (the same applies even more so for most of the non-HEP -units). If you are bothered about the explictly prefixed commands clogging up -the \LaTeX{} macro namespace then pass the \texopt{noprefixcmds} option to -\hepunits and the offending commands won't be defined at all. This will make -life awkward when it comes to inverse cross-sections as used for integrated -luminosities, but with suitable use of \texcmd{invbarn} I'm sure you can make -do. - -\section{Summary} -\hepunits is a handy package for particle physicists who'd like their units to -look right, with upright \micro{s} and properly italicised $c$s in the -appropriate places. Fortunately most of the work has already been done by the -marvellous \texpkg{SIunits} package and I've just provided a few more commands -and an option passing wrapper on to that excellent piece of work. - -If you have any comments, criticism, huge cash donations etc., then please do -send them my way. Email to |andy@insectnation.org| is preferred, but if you can -find a way to get your message to me by carrier pigeon I'll be very impressed. - -\end{document} 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 2010-09-19 00:35:41.000000000 +0200 @@ -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@gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny@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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-09-19 00:35:41.000000000 +0200 @@ -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@gmail.com> +%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu> +%% Copyright 2009-2010 Khaled Hosny <khaledhosny@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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-02-15 01:56:51.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 2010-09-19 04:04:32.000000000 +0200 @@ -0,0 +1,34 @@ +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-ctan /macros/latex/contrib/euenc +catalogue-date 2010-09-19 01:22:04 +0200 +catalogue-license lppl1.3 +catalogue-version 0.1h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepunits.doc.tlpobj new/tlpkg/tlpobj/hepunits.doc.tlpobj --- old/tlpkg/tlpobj/hepunits.doc.tlpobj 2010-06-10 18:29:19.000000000 +0200 +++ new/tlpkg/tlpobj/hepunits.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name hepunits.doc -category Package -revision 15878 -shortdesc doc files of hepunits -relocated 1 -docfiles size=27 - RELOC/doc/latex/hepunits/ChangeLog - RELOC/doc/latex/hepunits/README - RELOC/doc/latex/hepunits/hepunits.pdf - RELOC/doc/latex/hepunits/hepunits.tex ++++++ hyphen-turkish.tar.xz -> 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/factura/factura.cls 2013-04-30 01:29:22.000000000 +0200 @@ -0,0 +1,841 @@ +%% +%% This is file `factura.cls', +%% *NOT* generated with the docstrip utility. +%% +%% Copyright 2013 Emilio Lazo Zaia +%% +%% 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". +%% +%% This Current Maintainer of this work is Emilio Lazo Zaia. +%% +%% This work consists of the files factura.cls, factura.def, +%% and factura-modelo.tex, factura-modelo-ya.tex and README. +%% +%% Emilio Lazo Zaia <emiliolazozaia@gmail.com> +%% +%% This file is in UTF-8 format with Unix-like line breaks (LF only). +%% Commands and commentaries are in spanish. +%% +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesClass{factura}[2013/04/29 v1.0 +^^J^^J +Clase para elaborar facturas legales en la +República Bolivariana de Venezuela.] + +\newif\if@prefactura \@prefacturafalse +\newif\if@presupuesto \@presupuestofalse +\newif\if@spanish \@spanishtrue +\newif\if@marco \@marcofalse +\newif\if@ivaexplicito \@ivaexplicitotrue +\newif\if@todosiva \@todosivafalse +\newif\if@confirmas \@confirmastrue +\newif\if@concondiciones \@concondicionestrue +\newif\if@filas \@filasfalse +\newif\if@centrado \@centradofalse +\newif\if@denom \@denomfalse +\newif\if@lineaitem \@lineaitemfalse +\newif\if@linea \@lineafalse +\newif\if@G \@Gfalse +\newif\if@BIA \@BIAfalse +\newif\if@BIR \@BIRfalse +\newif\if@Exento \@Exentofalse +\newif\if@csv \@csvfalse + +\LoadClass[12pt]{article} + +\RequirePackage[absolute]{textpos}% Es necesario 'textpos' para colocar texto en ubicaciones arbitrarias. +\RequirePackage{geometry}% 'geometry' para ajustar el tamaño de la página. +\RequirePackage{calc}% 'calc' para hacer aritmética con las dimensiones. +\RequirePackage{fp-upn}% Fundamental el paquete 'fp-upn' para todos los cálculos. +\RequirePackage{numprint}% Con 'numprint' expresamos los totales en el formato requerido. +\RequirePackage{fancybox}% El cuadro de la descripción lo hacemos con 'fancybox'. +\RequirePackage[dvipsnames]{xcolor}% Para el color en la numeración. +\RequirePackage{xifthen}% 'xifthen' para algunos de los condicionales. +\RequirePackage{etoolbox}% 'etoolbox' para los condicionales binarios. +\RequirePackage{expl3}% Para poder hacer el loop que uso en las líneas en blanco. +\RequirePackage{tabularx}% Con 'tabularx' hacemos la tabla. +\RequirePackage{environ}% Con 'environ' podemos usar tabularx dentro del ambiente de la factura y colocar texto en el enddef. + +% Gracias a Joseph Wright (Thanks to Joseph Wright): +% http://tex.stackexchange.com/questions/16189/repeat-command-n-times +\ExplSyntaxOn +\cs_new_eq:NN \Repeat \prg_replicate:nn +\ExplSyntaxOff + +\newboolean{Separado} \boolfalse{Separado} +\newboolean{SinCantidad} \boolfalse{SinCantidad} +\newboolean{Filas} \boolfalse{Filas} +\newboolean{G} \boolfalse{G} +\newboolean{SinLineasV} \boolfalse{SinLineasV} +% Condicional binario auxiliar para el separado en el estido 'sinlineasv'. +\newboolean{SeparadoSinLineasV} \boolfalse{SeparadoSinLineasV} +% Condicional auxiliar para hacer que la línea oblicua vaya desde el campo de la cantidad, en los casos de los estilos 'sinlineasv' y 'separado'. +\newboolean{LineaDesdeCantidad} +% Otro para que la línea vaya hasta el precio total, en el caso de 'sinlineasv' con 'filas'. +\newboolean{LineaHastaPT} + +% Se utiliza '\@Impuesto' como el factor del impuesto, el cual viene predefinido en '\@Alicuota'. +\def\@ImpuestoG{\@AlicuotaG} +\def\@ImpuestoR{\@AlicuotaR} +\def\@ImpuestoA{\@AlicuotaA} + +\DeclareOption{prefactura}{\@prefacturatrue}% La prefactura; con el diseño de la forma libre... para enviar por correo electrónico, fax o imprimir preliminarmente. +\DeclareOption{presupuesto}{\@presupuestotrue}% Cambia la denominación a 'PRESUPUESTO' y no 'FACTURA'. +\DeclareOption{nospanish}{\@spanishfalse}% No carga babel en castellano ni la codificación T1 de las letras. +\DeclareOption{sinfirmas}{\@confirmasfalse}% No agrega los espacios para firmar. +\DeclareOption{sincantidad}{\booltrue{SinCantidad}}% Para no colocar el campo de la cantidad. +\DeclareOption{sincond}{\@concondicionesfalse}% No agrega la línea de las condiciones de pago. +\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{siniva}{\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. +\DeclareOption{ivanoexplicito}{\@ivaexplicitofalse}% Cuando no se cobra IVA y tampoco se quiere que aparezca la totalización del IVA. +% Para la 'G' del IVA general y el porcentaje en su base imponible. +\DeclareOption{G}{\@Gtrue\booltrue{G}}% Con esta opción sale la letra 'G' en los items con IVA general, y sale el porcentaje en la base imponible general. +\DeclareOption{lineaitem}{\@lineaitemtrue}% Una línea en cada ítem. +\DeclareOption{linea}{\@lineatrue}% Para la línea que protege el espacio en blanco. +\DeclareOption{separado}{\booltrue{LineaDesdeCantidad}\booltrue{Separado}\booltrue{SeparadoSinLineasV}}% Encierra en un separado los totales de los items. +\DeclareOption{filas}{% Estilo de totalización en filas. + \ifbool{Separado}{\ClassWarning{factura}{La opción 'filas' no es compatible con la opción 'separado'. Sin efecto opción 'separado'}{}}{}% + \if@ivaexplicito\else% + \ClassWarning{factura}{La opción 'filas' no es compatible con la opción 'ivanoexplicito'. Sin efecto opción 'ivanoexplicito'.}{}% + \@ivaexplicitotrue% + \fi% + \@filastrue\booltrue{Filas}% + \boolfalse{LineaDesdeCantidad}% Quitamos esto porque la línea diagonal se coloca dentro del renglón de la factura en el modo 'filas', entonces es desde la descripción a menos que se use 'sinlineasv'. +} +\DeclareOption{centrado}{% Total y exento 'centrado'; sólo para estilo 'filas' + \if@filas% + \@centradotrue% + \else% + \ClassWarning{factura}{La opción 'centrado' no es compatible con el modo de totalización en columnas. Sin efecto opción 'centrado'.}{} + \fi} +\DeclareOption{sinlineasv}{% Estilo 'sinlineasv'. + \booltrue{SinLineasV}% + \booltrue{LineaDesdeCantidad}% + \boolfalse{Separado}% + \if@filas\booltrue{LineaHastaPT}\fi} +\DeclareOption{csv}{\@csvtrue}% Para la salida en modo csv también. + +\ProcessOptions\relax + +\AtBeginDocument{% + % Da error si algún campo necesario no está definido. + \ifx \@undefined \@Nombre \ClassError{factura}{** Hay que definir la razón social **}{} \fi% + \ifx \@undefined \@RIF \ClassError{factura}{** Hay que definir el R.I.F. **}{} \fi% + \ifx \@undefined \@Direccion \ClassError{factura}{** Hay que definir la dirección fiscal **}{} \fi% + \ifx \@undefined \@Tel \ClassError{factura}{** Hay que definir un número telefónico **}{} \fi% + \ifx \@undefined \@Email \ClassWarning{factura}{** Pudiera definirse una dirección de correo electrónico **}{} \fi% + \ifx \@undefined \@Fecha \ClassError{factura}{** Hay que definir la fecha de emisión **}{} \fi + \if@concondiciones% + \ifx \@undefined \@Condiciones \ClassError{factura}{** Hay que definir las condiciones de pago o usar la opción 'sincond' **}{} \fi% + \fi% + \if@confirmas% + \ifx \@undefined \@Emisor \ClassError{factura}{** Hay que definir el nombre del emisor cuando no se omite (con la opción 'sinfirmas') el espacio para firmar. **}{} \fi% + \fi% + \if@marco% + \ifx \@undefined \@Marco \ClassError{factura}{** Hay que definir el marco **}{} \fi% + \fi% + \if@denom% + \ifx \@undefined \@Num \ClassError{factura}{** Hay que definir el número de la factura **}{} \fi% + \fi} + +% Tamaño de la página con 'geometry', página limpia y sin sangre. +\pagestyle{empty} +\setlength\parindent{0pt} + +% \Fecha, \Nombre (\RS), \RIF, \CI, \Dirección, \Tel, \Email, \Emisor. +\def\Fecha#1{\gdef\@Fecha{#1}} +\def\Nombre#1{\gdef\@Nombre{#1}} +\let\RS\Nombre +\def\RIF#1{\gdef\@RIF{#1}} +\def\CI#1{\let\@@RIF\@@CI\gdef\@RIF{#1}} +\def\Direccion#1{\gdef\@Direccion{#1}} +\def\Tel#1{\gdef\@Tel{#1}} +\def\Email#1{\gdef\@Email{#1}} +\def\Emisor#1{\gdef\@Emisor{#1}} + +\def\Resumen#1{\gdef\@Resumen{#1}}% Resumen opcional que va colocado a la derecha en un óvalo. +\def\Marco#1{\gdef\@Marco{#1}}% Con \Marco le damos el nombre del archivo que contiene el formato de la factura para compilaciones con 'prefactura', 'presupuesto'. +\def\Denom#1{\gdef\@Denominacion{#1}}% La denominación puede ser 'FACTURA', 'PRESUPUESTO' u otra. +\def\@Denominacion{\@@DenomFactura}% Se predetermina la factura. + +% Número de la factura con \Num. +\def\Num#1{\gdef\@Num{\nplpadding{\@DigitosNumeracion}\npthousandsep{}\numprint{#1}}} +% También puede escribirse el número de control (\NumControl), sólo en las 'prefacturas', y el número de serie de control puede fijarse con \NumSerieControl. +% Si el número de control no se especifica, toma el mismo que el de la factura, y si el número de serie de control no se especifica, toma '00'. +\def\NumControl#1{\gdef\@NumControl{\nplpadding{\@DigitosNumeracion}\npthousandsep{}\numprint{#1}}} +\def\NumSerieControl#1{\gdef\@NumSerieControl{#1}} +\AtBeginDocument{% + \ifx\@undefined\@NumControl\let\@NumControl\@Num\fi% + \ifx\@undefined\@NumSerieControl\gdef\@NumSerieControl{00}\fi} + +% Cantidad de líneas en blanco al final del renglón de la factura. +\def\Lineas#1{\setcounter{Lineas}{#1}} + +% Texto que esclarece las condiciones de pago. +\def\Condiciones#1{\gdef\@Condiciones{#1}} + +% Longitudes para uso interno. +\newlength{\TamDatos} +\newlength{\TamResumen} +\newlength{\TamFinalOvalos} +\newlength{\TamLineaFirmas} +\newlength{\EspesorLineaFirmas} +\newlength{\NodoX} +\newlength{\NodoY} +\newlength{\NodoXX} +\newlength{\NodoYY} +\newlength{\SepTotales} + +% Longitudes que podemos cambiar, para la posición de varios elementos en la factura. +\newlength{\XInicioFecha} +\newlength{\YInicioFecha} +\newlength{\XInicioDenom} +\newlength{\YInicioDenom} +\newlength{\XInicioFirmas} +\newlength{\XFinFirmas} +\newlength{\YInicioFirmas} +\newlength{\XInicioCond} +\newlength{\XFinCond} +\newlength{\YInicioCond} +\newlength{\XInicioControl} +\newlength{\YInicioControl} +\newlength{\TamControl} +\newlength{\SepOvalos} +\newlength{\SepElementos} +\newlength{\SepMinTotales} + +% Cajas para uso interno. +\newbox{\CajaDatos} +\newbox{\CajaResumen} +\newbox{\CajaFirma} + +% Para las líneas en blanco en la factura. +\newcounter{Lineas}% + +% '1' cuando hay IVA R o IVA A, y '2' cuando hay ambos. +\newcounter{IVANoGeneral}% + +\input{factura.def}% Cargamos los valores predeterminados. + +% Establecemos los porcentajes de las alícuotas a través del factor, tomado del archivo .def. +\FPupn\@AlicuotaGPorc{\@AlicuotaG{} 100 * 2 round clip} +\FPupn\@AlicuotaRPorc{\@AlicuotaR{} 100 * 2 round clip} +\FPupn\@AlicuotaAPorc{\@AlicuotaA{} 100 * 2 round clip} + +% \SepMinTotales es el mínimo espacio entre los totales en el modo 'filas', y SepTotales es una dimensión estirable, con ese como su mínimo. +\expandafter\setlength{\SepTotales}{\the\SepMinTotales plus 1fill} + +\if@todosiva + \@BIRtrue + \@BIAtrue + \@Exentotrue + \@Gtrue +\fi + +\if@spanish + \RequirePackage[spanish]{babel}% Babel en castellano. + \RequirePackage[T1]{fontenc}% Codificación T1 para las tipografías. +\fi + +\if@linea + \RequirePackage{tikz}% Para la línea. + \RequirePackage{zref-savepos}% También determinar las coordenadas de la línea. + \AtEndDocument{\@Linea} +\fi + +\if@prefactura + \@marcotrue + \RequirePackage{graphicx} + \AtEndDocument{\@MARCO\@NUMCONTROL} + \@denomtrue +\fi + +\if@presupuesto + \@marcotrue + \RequirePackage{graphicx} + \AtEndDocument{\@MARCO} + \@denomtrue + \def\@Denominacion{\@@DenomPresupuesto} +\fi + +\AtBeginDocument{\@Encabezado} + +\if@denom% Coloca el texto de la denominación. + \AtEndDocument{\@DENOMINACION} +\fi + +\if@confirmas% Coloca las firmas. + \AtEndDocument{\@FIRMAS} +\fi + +\if@concondiciones% Coloca las condiciones de pago. + \AtEndDocument{\@CONDICIONES} +\fi + +\if@csv% Abre el archivo csv. + \newwrite\csv + \immediate\openout\csv=\jobname.csv +\fi + +\AtBeginDocument{\AtEndDocument{% + % La factura no puede ocupar más que una página. + \clearpage\ifthenelse{\value{page}>2}{\ClassError{factura}{** La factura ocupa más que una página **}{}}{\relax} + % Escribimos los totales al archivo csv. + \if@csv% + \if@Exento \write\csv{Totales: \space\space \@@BIE: \@Moneda \BIE} \fi% + \if@BIR% + \write\csv{Totales: \space\space \@@BIR: \@Moneda \BIR}% + \write\csv{Totales: \space\space\space \@@AlicuotaR: \@Moneda \AlicuotaR}% + \fi% + \write\csv{Totales: \space\space \@@BIG: \@Moneda \BIG}% + \write\csv{Totales: \space\space\space \@@AlicuotaG: \@Moneda \AlicuotaG}% + \if@BIA% + \write\csv{Totales: \space\space \@@BIA: \@Moneda \BIA}% + \write\csv{Totales: \space\space\space \@@AlicuotaA: \@Moneda \AlicuotaA}% + \fi% + \write\csv{Totales: \space\space\space \@@Total: \@Moneda \Total}% + \closeout\csv% + \fi}} + +% Comando para incluir la firma escaneada en el puesto donde va la línea de la firma del emisor. +% El primer parámetro es la posición en X, el segundo parámetro es la posición en Y, y +% el tercer parámeto deberá ser la inclusión del gráfico. +\newcommand{\Firma}[3]{% + \RequirePackage{graphicx}% + \def\tempX{#1}% + \def\tempY{#2}% + \ifthenelse{\equal{\tempX}{\empty}}{\def\tempX{0pt}}{}% + \ifthenelse{\equal{\tempY}{\empty}}{\def\tempY{0pt}}{}% + \savebox{\CajaFirma}{#3}% + \AtEndDocument{% + \begin{textblock*}{\TamLineaFirmas}(\textwidth+\oddsidemargin+1in-\TamLineaFirmas/2-\wd\CajaFirma/2-\XFinFirmas+\tempX,\YInicioFirmas-\ht\CajaFirma-\dp\CajaFirma+\tempY)% + \usebox{\CajaFirma}% + \end{textblock*}}}% + +\newcommand{\cliente}[1]{\input{#1.def}}% Para cada cliente se puede tener un archivo .def con su nombre y alguna macro cargada. Ese archivo lo ponemos incluir con '\cliente' en lugar de usar \input o \include, y la extensión deberá ser .def. + +% El ambiente 'factura', usando el paquete 'environ' para su definición, y el comando auxiliar \facturaauxcmd. +% Gracias a Heiko Oberdiek y David Carlisle (Thanks to Heiko Oberdiek and David Carlisle). +% http://tex.stackexchange.com/questions/108565/know-the-cell-width-with-tabul... +\NewEnviron{factura}{% + \expandafter\facturaauxcmd\expandafter{\BODY}% +} + +% Comando auxiliar para la definición del ambiente de la factura; al final de este comando está el texto que va en el enddef del ambiente de la factura. +\newcommand{\facturaauxcmd}[1] +{% + \ifx\undefined\Total\relax\else\ClassError{factura}{** Parece ya haber un renglón de montos **}{}\fi% + % + \renewcommand{\tabularxcolumn}[1]{m{##1}}% TODO: Alineación vertical cuando hay más de una línea. + % http://tex.stackexchange.com/questions/111203/tabularx-bottom-alignment-on-r... + % Comando para poner en cero los contadores de los totales porque el ambiente de la factura se evalúa tres veces y los totales se sumarían todos tres veces. + \newcommand{\@ZERO}{% + \FPset\BIG{0}\global\let\BIG\BIG% + \FPset\BIR{0}\global\let\BIR\BIR% + \FPset\BIA{0}\global\let\BIA\BIA% + \FPset\BIE{0}\global\let\BIE\BIE% + \FPset\AlicuotaG{0}\global\let\AlicuotaG\AlicuotaG% + \FPset\AlicuotaR{0}\global\let\AlicuotaR\AlicuotaR% + \FPset\AlicuotaA{0}\global\let\AlicuotaA\AlicuotaA% + }% + % + % Escribe la letra que designa al tipo de impuesto que aplica al ítem. + \newcommand\EscribeTipoDeImpuesto[1]{% + \if@G\letratipoiva\ \fi% El espacio antes de la letra. + \ifthenelse{\equal{##1}{E}}{\@DenomAlicuotaE\hfill}{}% Si está exento, escribimos '(E)' al lado del p/t también. + \ifthenelse{\equal{##1}{R}}{\@DenomAlicuotaR\hfill}{}% Si tiene IVA reducido, escribimos 'R'. + \ifthenelse{\equal{##1}{A}}{\@DenomAlicuotaA\hfill}{}% Si tiene IVA adicional, escribimos 'A'. + \ifthenelse{\equal{##1}{G}}{\if@G\@DenomAlicuotaG\hfill\fi}{}% Una 'G' para IVA general si hace falta. + \if@G\ \fi} % El espacio entre el tipo de impuesto y el precio. + % + % Suma el ítem actual a la base imponible acumulada. + \newcommand{\@TotalizaItem}[1]{% + \expandafter\FPupn\csname BI##1\endcsname{\PrecioT{} \expandafter\csname BI##1\endcsname{} + 2 round}% Agregamos a la base imponible. + \global\expandafter\let\csname BI##1\expandafter\endcsname\csname BI##1\endcsname% + % Si es un ítem exento, no hay alícuota a agregar. + \ifthenelse{\equal{##1}{E}}{}{% + \expandafter\FPupn\csname Alicuota##1\endcsname{\PrecioT{} \expandafter\csname @Impuesto##1\endcsname{} * \expandafter\csname Alicuota##1\endcsname{} + 2 round}% Agregamos al IVA. + \global\expandafter\let\csname Alicuota##1\expandafter\endcsname\csname Alicuota##1\endcsname}}% + % + % Comando para sumar todos los totales y general el total general. + \newcommand{\@TotalTotal}{% + \FPupn{\Total}{\BIE{} \BIR{} + \BIG{} + \BIA{} + \AlicuotaR{} + \AlicuotaG{} + \AlicuotaA{} + 2 round}% + \global\let\Total\Total}% + % + % Presentación de totales en modo de columnas. + \newcommand{\@EscribeTotalColBI}[1]{% + \ifbool{Separado}{\multicolumn{2}{|c}{}&\multicolumn{1}{r}}{&&}% + {\ \letratittotales \csname @@BI##1\endcsname% + \ifthenelse{\equal{##1}{G}}{% + % Colocamos el porcentaje explícito en la base imponible general si es requerido. + \if@G\ \hfill(\@AlicuotaGPorc\%)\else\mbox{}\fi} + {\hfill\ifthenelse{\equal{##1}{E}}{}{\ (\csname @Alicuota##1Porc\endcsname\%)}}}% + & \letratotales\numprint{\csname BI##1\endcsname} \\}% + % + \newcommand{\@EscribeTotalColAlicuota}[1]{% + \ifbool{Separado}{\multicolumn{2}{|c}{}&\multicolumn{1}{r}}{&&}% + {\ \letratittotales \csname @@Alicuota##1\endcsname\ \hfill (\csname @Alicuota##1Porc\endcsname\%)}% + & \letratotales\numprint{\csname Alicuota##1\endcsname} \\}% + % + % Presentación de totales en modo filas. + \newcommand{\@EscribeTotalFilasBI}[1]{% + \@EscribeTotalFilasBIizq{##1}: & \@EscribeTotalFilasBIder{##1}}% + % + \newcommand{\@EscribeTotalFilasSoloBI}[1]{% + {\letratittotales\@EscribeTotalFilasBIizq{##1}:} {\letratotales\@EscribeTotalFilasBIder{##1}}}% + % + \newcommand{\@EscribeTotalFilasBIizq}[1]{% + \letratittotales\csname @@BI##1\endcsname% + \ifthenelse{\equal{##1}{G}}% + {\if@G \ (\@AlicuotaGPorc\%)\fi}% Si hay otra B.I. que no sea general, colocamos el porcentaje explícito en la general. + {\ifthenelse{\equal{##1}{E}}{}{\ (\csname @Alicuota##1Porc\endcsname\%)}}}% + % + \newcommand{\@EscribeTotalFilasBIder}[1]{% + \letratotales\numprint{\csname BI##1\endcsname}}% + % + \newcommand{\@EscribeTotalFilasAlicuota}[1]{% + \@EscribeTotalFilasAlicuotaizq{##1}: & \@EscribeTotalFilasAlicuotader{##1}}% + % + \newcommand{\@EscribeTotalFilasSoloAlicuota}[1]{% + {\letratittotales\@EscribeTotalFilasAlicuotaizq{##1}:} {\letratotales\@EscribeTotalFilasAlicuotader{##1}}}% + % + \newcommand{\@EscribeTotalFilasAlicuotaizq}[1]{% + \letratittotales\csname @@Alicuota##1\endcsname \ (\csname @Alicuota##1Porc\endcsname\%)}% + % + \newcommand{\@EscribeTotalFilasAlicuotader}[1]{% + \letratotales\numprint{\csname Alicuota##1\endcsname}}% + % + \newcommand{\@EscribeTotalFilas}[2][]{% + \@EscribeTotalFilasAuxTabla{% + \csname @EscribeTotalFilasBI\endcsname{##2}% + \ifthenelse{\equal{##2}{E}}{% + \ifthenelse{\equal{##1}{T}}{% + \\% + \letratittotal\@@Total: & \letratotal\numprint{\Total}}{}}% + {\\% + \csname @EscribeTotalFilasAlicuota\endcsname{##2}}}}% + % + \newcommand{\@GeneraCajasTotalesFilas}{% + \if@Exento% + \newbox{\CajaBIE}\newbox{\CajaBIET}% + \savebox{\CajaBIE}{\@EscribeTotalFilasSoloBI{E}}% + \savebox{\CajaBIET}{\@EscribeTotalFilas[T]{E}}% + \fi% + \if@BIR% + \addtocounter{IVANoGeneral}{1}% + \newbox{\CajaBIR}\newbox{\CajaAliR}\newbox{\CajaBIAliR}% + \savebox{\CajaBIR}{\@EscribeTotalFilasSoloBI{R}}% + \savebox{\CajaAliR}{\@EscribeTotalFilasSoloAlicuota{R}}% + \savebox{\CajaBIAliR}{\@EscribeTotalFilas{R}}% + \fi% + \newbox{\CajaBIG}\newbox{\CajaAliG}\newbox{\CajaBIAliG}% + \savebox{\CajaBIG}{\@EscribeTotalFilasSoloBI{G}}% + \savebox{\CajaAliG}{\@EscribeTotalFilasSoloAlicuota{G}}% + \savebox{\CajaBIAliG}{\@EscribeTotalFilas{G}}% + \if@BIA% + \addtocounter{IVANoGeneral}{1}% + \newbox{\CajaBIA}\newbox{\CajaAliA}\newbox{\CajaBIAliA}% + \savebox{\CajaBIA}{\@EscribeTotalFilasSoloBI{A}}% + \savebox{\CajaAliA}{\@EscribeTotalFilasSoloAlicuota{A}}% + \savebox{\CajaBIAliA}{\@EscribeTotalFilas{A}}% + \fi}% + % + \newcommand{\@EscribeTotalesFilasGET}{% + \hspace*{\SepTotales}\usebox{\CajaBIG}% + \hspace*{\SepTotales}\usebox{\CajaAliG}% + \if@Exento\hspace*{\SepTotales}\usebox{\CajaBIE}\fi% + \hspace*{\SepTotales}\usebox{\CajaTotal}% + \if@centrado\hspace*{\SepTotales}\fi}% + % + \newcommand{\@EscribeTotalesFilasGxET}{% + \if@BIR\hspace*{\SepTotales}\usebox{\CajaBIAliR}\fi% + \hspace*{\SepTotales}\usebox{\CajaBIAliG}% + \if@BIA\hspace*{\SepTotales}\usebox{\CajaBIAliA}\fi% + \hspace*{\SepTotales}\if@Exento\usebox{\CajaBIET}\else\usebox{\CajaTotal}\fi% + \if@centrado\hspace*{\SepTotales}\fi}% + % + \newcommand{\@EscribeTotalesFilasRGA}{% + \hspace*{\SepTotales}\usebox{\CajaBIAliR}% + \hspace*{\SepTotales}\usebox{\CajaBIAliG}% + \hspace*{\SepTotales}\usebox{\CajaBIAliA}% + \hspace*{\SepTotales}}% + % + \newcommand{\@EscribeTotalesFilasRGAET}{% + \@EscribeTotalesFilasRGA% + \if@Exento\usebox{\CajaBIET}\else\usebox{\CajaTotal}\fi% + \if@centrado\hspace*{\SepTotales}\fi}% + % + \newcommand{\@EscribeTotalFilasAuxTabla}[1]{% + \begin{tabular}{@{}l@{\extracolsep{4pt}}r@{}}% + ##1% + \end{tabular}}% + % + % Comando interno para el ítem. + \newcommand{\@ITEM}[4]{% 1. [R|G|A|E]; 2. cantidad; 3. descripción; 4. p/u. + \ifbool{SinCantidad}{}{% + \letranumeros\numprint{##2}}% Se escribe la cantidad. + &% + ##3% Se escribe la descripción. + &% + \FPupn\PrecioU{##4 2 round}% + % Advertimos si el precio unitario tiene tres decimales. + \FPifeq\PrecioU{##4}\else\ClassWarning{factura}{** Se está introduciendo un precio con tres decimales: (##3 -> ##4) **}{}\fi% + \ifbool{SinCantidad}{}{% + {\EscribeTipoDeImpuesto{##1}}% + \letranumeros\numprint{\PrecioU}}% + &% + {\EscribeTipoDeImpuesto{##1}}% + \FPupn\PrecioT{##2 ##4 * 2 round}% + \global\let\PrecioT\PrecioT% + \letranumeros\numprint{\PrecioT}% + \ifbool{SinCantidad} + % Escribimos al .log el ítem. + {\if@csv\write\csv{"##3","##1","\PrecioT"}\fi}% + {\if@csv\write\csv{"##2","##3","##1 ##4","##1 \PrecioT"}\fi}% + % + \@TotalizaItem{##1}% + \\% + \if@lineaitem\hline\fi}% + % + \ifbool{SinCantidad} + {% + % Ítem normal. + \newcommand{\Item}[2]{\@ITEM{G}{1}{##1}{##2}}% + % Ítem con IVA reducido. + \newcommand{\ItemR}[2]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{1}{##1}{##2}}% + % Ítem con IVA adicional. + \newcommand{\ItemA}[2]{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{1}{##1}{##2}}% + % Ítem exento de IVA. + \newcommand{\ItemE}[2]{\global\@Exentotrue\@ITEM{E}{1}{##1}{##2}}% + % Ítem sin precio. + \newcommand{\ItemX}[1]{% + \if@csv\write\csv{"##1","0"}\fi% + & ##1 && \hfill ... \hfill\mbox{} \\}}% + {% + % Ítem normal. + \newcommand{\Item}[3]{\@ITEM{G}{##1}{##2}{##3}}% + % Ítem con IVA reducido. + \newcommand{\ItemR}[3]{\global\@BIRtrue\global\@Gtrue\@ITEM{R}{##1}{##2}{##3}}% + % Ítem con IVA adicional. + \newcommand{\ItemA}[3]{\global\@BIAtrue\global\@Gtrue\@ITEM{A}{##1}{##2}{##3}}% + % Ítem exento de IVA. + \newcommand{\ItemE}[3]{\global\@Exentotrue\@ITEM{E}{##1}{##2}{##3}}% + % Ítem sin precio. + \newcommand{\ItemX}[2]{% + \if@csv\write\csv{"##1","##2","0","0"}\fi% + \letranumeros\numprint{##1} &% + ##2 & \hfill ... \hfill\mbox{} & \hfill ... \hfill\mbox{} \\}}% + % Ya definimos todos los comandos; ahora agregamos el espacio dinámico entre los óvalos y el renglón de la factura. + \vfill% + % Este es el tipo de letra que tendrán los items, y en este tipo de letra se define el \baselineskip de toda la factura. + \letraitems% + \ifbool{SinCantidad} + {% + \ifbool{SinLineasV} + {\begin{tabularx}{\textwidth}{ l@{\extracolsep{0pt}}Xr r }} + {\begin{tabularx}{\textwidth}{|l@{\extracolsep{0pt}}Xr|r|}}% + % Antes, con tabular*: + % \begin{tabular*}{\textwidth}{|l@{\extracolsep{0pt}}l@{\extracolsep{\fill}}cc@{\extracolsep{0pt}}r|r|}% + \hline% + \@ZERO% + \if@csv\write\csv{"\@@Descripcion","\@@Precio (\@Moneda"}\fi% + &% Avanzamos hasta la descripción. + % Guardamos la posición X del nodo A de la línea, si hace falta. + \if@linea\hspace*{-\tabcolsep}\zsaveposx{LineaNodoACoordX}\hspace*{\tabcolsep}\fi% + \letratitrenglon \@@Descripcion% + &% Avanzamos hasta la columna fantasma del precio unitario, y guardamos la posición X del nodo B de la línea, si hiciera falta. + \if@linea% + \if@filas\hfill\mbox{}\fi% Si el estilo es 'filas' la línea va hasta el precio total. + \ifbool{LineaHastaPT}{} + {\hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}} + \fi% + \if@filas\else\hfill\mbox{}\fi% Si el estilo no es 'filas' la línea va hasta el principio de la columna fantasma. + &% Avanzamos hasta el precio total. + \mbox{}\hfill\letratitrenglon \@@Precio \space (\@Moneda)\hfill\mbox{}% + \if@linea% + \ifbool{LineaHastaPT} + {\hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}}{}% + \fi% + \\% + \hline} + {% + \ifbool{SinLineasV} + {\begin{tabularx}{\textwidth}{ c X r r }} + {\begin{tabularx}{\textwidth}{|c|X|r|r|}}% + % Antes, con tabular*: + % \begin{tabular*}{\textwidth}{|c|l@{\extracolsep{\fill}}cc@{\extracolsep{0pt}}|r|r|}% + \hline% + \@ZERO% + \if@csv\write\csv{"\@@Cantidad","\@@Descripcion","\@@PrecioU \space (\@Moneda)","\@@PrecioT \space (\@Moneda)"}\fi% + % Guardamos la posición X del nodo A de la línea, si hace falta; y lo hacemos desde aquí si el estilo que se está usando no es 'sinlineasv', así la línea diagonal comienza en la descripción. + \if@linea\ifbool{LineaDesdeCantidad}{\hspace*{-\tabcolsep}\zsaveposx{LineaNodoACoordX}\hspace*{\tabcolsep}}{}\fi% + \letratitrenglon \@@Cantidad% + &% Avanzamos hasta la descripción. + % Guardamos la posición X del nodo A de la línea, si hace falta; y lo hacemos dsede aquí si el estilo 'sinlineasv' se está usando para que la línea diagonal comience desde la cantidad y no desde la descripción. + \if@linea\ifbool{LineaDesdeCantidad}{}{\hspace*{-\tabcolsep}\zsaveposx{LineaNodoACoordX}\hspace*{\tabcolsep}}\fi% + \letratitrenglon \@@Descripcion% + &% Avanzamos hasta el precio unitario. + % Guardamos la posición X del nodo B de la línea. + % Ya que ya estamos en una columna fantasma no usada que es la del precio unitario, debemos retroceder a la columna anterior (-\tabcolsep) atravesando la línea vertical (-\arrayrulewidth). + \if@linea% + \ifbool{LineaHastaPT} + {}{% + \hspace*{-\tabcolsep}% + \ifbool{LineaDesdeCantidad}{}{\hspace*{-\arrayrulewidth}}% + \zsaveposx{LineaNodoBCoordX}% + \hspace*{\tabcolsep}% + \ifbool{LineaDesdeCantidad}{}{\hspace*{\arrayrulewidth}}}% + \fi% + \mbox{}\hfill% + \letratitrenglon \@@PrecioU \space (\@Moneda)\hfill\mbox{}% + &% Avanzamos hasta el precio total. + \mbox{}\hfill \letratitrenglon \@@PrecioT \space (\@Moneda)\hfill\mbox{}% + \if@linea% + \ifbool{LineaHastaPT} + {\hspace*{\tabcolsep}\zsaveposx{LineaNodoBCoordX}\hspace*{-\tabcolsep}}{}% + \fi% + \\% + \hline% + }% + % + #1% Aquí entran todos los items que el usuario declara dentro del ambiente. + \if@filas% + % Si hay líneas en blanco se colocan todas menos la última que debe ponerse a mano para poder fijar las coordenadas. + \ifnum\value{Lineas}>0 + \Repeat{\value{Lineas}-1}{&&&\\}% + \if@linea\zsaveposy{LineaNodoBCoordY}\fi% Se guarda la coordenada Y del punto de la derecha de la línea diagonal. + &&&\\% + \fi% + \hline% + \else% + % Si usamos el estilo 'separado', o 'sinlineasv' junto con 'separado' debemos cerrar primero con la línea horizontal. + \ifbool{SeparadoSinLineasV}{\if@lineaitem\else\hline\fi}{}% + % Agregamos las líneas espúreas. + \ifbool{Separado} + {\Repeat{\value{Lineas}}{\multicolumn{4}{|c|}{}\\}} + {\Repeat{\value{Lineas}}{&&&\\}}% + \if@ivaexplicito% + \if@Exento \@EscribeTotalColBI{E}\fi% + \if@BIR \@EscribeTotalColBI{R} \@EscribeTotalColAlicuota{R}\fi% + \@EscribeTotalColBI{G} \@EscribeTotalColAlicuota{G}% + \if@BIA \@EscribeTotalColBI{A} \@EscribeTotalColAlicuota{A}\fi% + \cline{4-4}% + \fi% Se acaba el condicional del IVA explícito (\if@ivaexplicito ... \fi). + \ifbool{Separado} + {\multicolumn{2}{|c}{}&\multicolumn{1}{r}}{&&}% Si usamos el estilo 'separado' debemos quitar las líneas verticales desde la cantidad hasta el precio total. + % Guardamos la coordenada Y del nodo B de la línea diagonal, si se pide que aparezca. + {\if@linea\zsaveposy{LineaNodoBCoordY}\fi% + \letratittotal\@@Total} & \@TotalTotal\letratotal\numprint{\Total} \\% + \hline% + \fi% + \end{tabularx}% + % + \if@filas% + \vfill% + \@TotalTotal% + \@GeneraCajasTotalesFilas% + \newbox{\CajaTotal}% + \savebox{\CajaTotal}{{\letratittotal\@@Total}: \letratotal\numprint{\Total}}% + % + \ifnum \value{IVANoGeneral}=0% + \newbox{\CajaGET}% + \savebox{\CajaGET}{\@EscribeTotalesFilasGET}% + \ifdim \the\wd\CajaGET < \textwidth% + \parbox{\textwidth}{\@EscribeTotalesFilasGET}% + \else% + \hspace*{\SepTotales}% + \usebox{\CajaBIAliG}\hspace*{\SepTotales}% + \if@Exento\usebox{\CajaBIET}\else\usebox{\CajaTotal}\fi% + \if@centrado\hspace*{\SepTotales}\fi% + \fi% + \fi% + \ifnum \value{IVANoGeneral}=1% + \newbox{\CajaGxET}% + \savebox{\CajaGxET}{\@EscribeTotalesFilasGxET}% + \ifdim \the\wd\CajaGxET < \textwidth% + \@EscribeTotalesFilasGxET% + \else% + \hspace*{\SepTotales}% + \if@BIR\usebox{\CajaBIAliR}\hspace*{\SepTotales}\fi% + \usebox{\CajaBIAliG}\hspace*{\SepTotales}% + \if@BIA\usebox{\CajaBIAliA}\hspace*{\SepTotales}\fi% + \par% + \if@centrado\hspace*{\SepTotales}\else\hfill\fi% + \if@Exento\usebox{\CajaBIE}\hspace*{\SepMinTotales}\fi\usebox{\CajaTotal}% + \if@centrado\hspace*{\SepTotales}\fi% + \fi% + \fi% + \ifnum \value{IVANoGeneral}=2% + \newbox{\CajaRGAET}% + \savebox{\CajaRGAET}{\@EscribeTotalesFilasRGAET}% + \ifdim \the\wd\CajaRGAET < \textwidth% + \@EscribeTotalesFilasRGAET% + \else% + \newbox{\CajaRGA}% + \savebox{\CajaRGA}{\@EscribeTotalesFilasRGA}% + \ifdim \the\wd\CajaRGA < \textwidth% + \@EscribeTotalesFilasRGA% + \par% + \if@centrado\hspace*{\SepTotales}\else\hfill\fi% + \if@Exento\usebox{\CajaBIE}\hspace*{\SepMinTotales}\fi\usebox{\CajaTotal}% + \if@centrado\hspace*{\SepTotales}\fi% + \else% Aquí casi cualquier cosa tiene aspecto feo. + \ClassWarning{factura}{Es mejor no usar la opción de totalización en filas en este caso, o disminuir los tamaños de los tipos de letra para la totalización}{}% + \centering{% + \begin{tabular}{r@{\hspace*{\SepMinTotales}}l} + \usebox{\CajaBIAliR} & \usebox{\CajaBIAliA} \\ + \usebox{\CajaBIAliG} & \if@Exento\usebox{\CajaBIET}\else\usebox{\CajaTotal}\fi + \end{tabular}}% + \fi% + \fi% + \fi% + \fi% + \vfill% +} + +% El comando para la descripción del servicio prestado en esta factura. +\newcommand{\desc}[2][]{% + \letradescrip% + \shadowbox{% + \parbox[t][\textheight-\pagetotal-2\fboxsep-2\fboxrule-\shadowsize-\SepElementos] + {\textwidth-\shadowsize-\fboxsep*2-\fboxrule*2}{% + \setlength{\parindent}{0.5cm}% + \setlength{\parskip}{10pt}% + \ifthenelse{\equal{#1}{*}}{}{\vfill}% + #2% + \ifthenelse{\equal{#1}{*}}{}{\vfill}% + }}% + \vspace*{-\baselineskip}% + \par} + +% Comando para escribir el encabezado. +\newcommand\@Encabezado{% + \@FECHA% + \ifx\@undefined\@Resumen% + \@DATOSCLIENTE% + \else% + \@DATOSCLIENTERESUMEN% + \fi} + +% Comando para el diseño de la forma libre. +\newcommand\@MARCO{% + \begin{textblock*}{\paperwidth}(0pt,0pt)% + \includegraphics{\@Marco}% + \end{textblock*}} + +% Comando que coloca la firma escaneada. +\newcommand\@FIRMAS{% + \begin{textblock*}{\textwidth+\oddsidemargin+1in-\XInicioFirmas-\XFinFirmas}(\XInicioFirmas,\YInicioFirmas)% + \letrafirmas% + \parbox{\TamLineaFirmas}{% + \rule{\TamLineaFirmas}{\EspesorLineaFirmas} + \centering \@@Conforme}% + \hfill% + \parbox{\TamLineaFirmas}{% + \rule{\TamLineaFirmas}{\EspesorLineaFirmas} + \centering \@Emisor}% La línea de arriba no puede terminar en '%'. + \end{textblock*}} + +% Comando que coloca las condiciones de pago. +\newcommand\@CONDICIONES{% + \begin{textblock*}{\textwidth+\oddsidemargin+1in-\XInicioCond-\XFinCond}(\XInicioCond,\YInicioCond)% + \letracondiciones% + \@Condiciones% + \end{textblock*}} + +% Comando que coloca el número de control. +\newcommand\@NUMCONTROL{% + \begin{textblock*}{\TamControl}(\XInicioControl,\YInicioControl)% + {\letradenom \@@Control \par \@NumSerieControl-}\space{\letranumeracion\@NumControl}% + \end{textblock*}} + +% Comando que coloca la denominación del documento. +\newcommand\@DENOMINACION{% + \begin{textblock*}{\textwidth}(\XInicioDenom,\YInicioDenom)% + {\letradenom\@Denominacion}\space\space{\letranumeracion N\textordmasculine\space\@Num}% + \end{textblock*}} + +% Comando que coloca la fecha. +\newcommand\@FECHA{% + \begin{textblock*}{\textwidth}(\XInicioFecha,\YInicioFecha)% + \hfill\letrafecha\@@Fecha{\ttfamily\ \@Fecha}% + \end{textblock*}} + +% Comando que coloca el óvalo con los datos del cliente. +\newcommand\@DATOSCLIENTE{% + \letraovalos% + \ovalbox{% + \parbox{\textwidth-\fboxsep*2-1pt}{% + \hfill {\letratitovalos \@@Datos} \hfill \mbox{}\par% + {\bfseries \@@Nombre} \@Nombre% + \dotfill% + {\bfseries \@@RIF} {\ttfamily \@RIF}% + \par% + {\bfseries \@@Direccion} \@Direccion% + \par% + {\bfseries \@@Tel} {\ttfamily \@Tel}% + \ifx\@undefined\@Email\relax\else% + \hspace*{0.2cm}$\diamond$\hspace*{0.2cm}{\bfseries \@@Email} {\ttfamily \@Email}\fi}}% + \par}% Para que textblock* esté en modo vertical. + +% Comando que coloca los dos óvalos, con los datos del cliente y el resumen. +\newcommand\@DATOSCLIENTERESUMEN{% + \letraovalos% + \savebox{\CajaDatos}{% + \parbox[t]{\textwidth/2-\SepOvalos-\fboxsep*2}{% + \hfill {\letratitovalos \@@Datos} \hfill \mbox{}\par% + {\bfseries \@@Nombre} \@Nombre \par% + {\bfseries \@@RIF} {\ttfamily \@RIF} \par% + {\bfseries \@@Direccion} \@Direccion \par% + {\bfseries \@@Tel} {\ttfamily \@Tel} \hfill \par% + \ifx\@undefined\@Email\relax\else% + {\bfseries \@@Email} {\ttfamily \@Email}\fi}}% + \savebox{\CajaResumen}{% + \parbox[t]{\textwidth/2-\SepOvalos-\fboxsep*2}{% + \hfill {\letratitovalos \@@Resumen} \hfill \mbox{}\par% + \null\vfill\@Resumen\vfill\null}}% + \setlength{\TamDatos}{\ht\CajaDatos+\dp\CajaDatos}% + \setlength{\TamResumen}{\ht\CajaResumen+\dp\CajaResumen}% + \ifthenelse{\TamDatos>\TamResumen} + {\setlength{\TamFinalOvalos}{\TamDatos}} + {\setlength{\TamFinalOvalos}{\TamResumen}}% + \ovalbox{\parbox[t][\TamFinalOvalos]{\textwidth/2-\SepOvalos-\fboxsep*2}{\usebox{\CajaDatos}}}% + \hfill% + \ovalbox{\parbox[t][\TamFinalOvalos]{\textwidth/2-\SepOvalos-\fboxsep*2}{\usebox{\CajaResumen}}}% + \par}% Para que textblock* esté en modo vertical. + +% Comando que coloca la línea diagonal. +\newcommand\@Linea{% + \letraitems% Volvemos a fijar el \baselineskip de la tabla. + \setlength{\NodoX}{\zposx{LineaNodoACoordX} sp}% + \setlength{\NodoY}{\zposy{LineaNodoBCoordY} sp}% + \setlength{\NodoXX}{\zposx{LineaNodoBCoordX} sp}% + \setlength{\NodoYY}{\zposy{LineaNodoBCoordY} sp}% + \addtolength{\NodoY}{\baselineskip/2}% + \if@filas% + \addtolength{\NodoY}{\arabic{Lineas}\baselineskip-\baselineskip}% + \else% + \addtolength{\NodoY}{\arabic{Lineas}\baselineskip}% + \if@ivaexplicito% + \addtolength{\NodoY}{2\baselineskip}% + \if@Exento\addtolength{\NodoY}{\baselineskip}\fi% + \if@BIR\addtolength{\NodoY}{2\baselineskip}\fi% + \if@BIA\addtolength{\NodoY}{2\baselineskip}\fi% + \fi% + \fi% + \begin{textblock*}{\paperwidth-\NodoX}(\NodoX,\paperheight-\NodoY)% + \begin{tikzpicture}% + \draw (\NodoX,\NodoY) --(\NodoXX,\NodoYY);% + \end{tikzpicture}% + \end{textblock*}} + +\endinput \ No newline at end of file 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/factura/factura.def 2013-04-30 01:29:22.000000000 +0200 @@ -0,0 +1,145 @@ +%% +%% This is file `factura.def', +%% *NOT* generated with the docstrip utility. +%% +%% Copyright 2013 Emilio Lazo Zaia +%% +%% 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". +%% +%% This Current Maintainer of this work is Emilio Lazo Zaia. +%% +%% This work consists of the files factura.cls, factura.def, +%% and factura-modelo.tex, factura-modelo-ya.tex and README. +%% +%% Emilio Lazo Zaia <emiliolazozaia@gmail.com> +%% +%% This file is in UTF-8 format with Unix-like line breaks (LF only). +%% Commands and commentaries are in spanish. +%% +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesFile{factura.def}[2013/04/29 v1.0 Archivo de valores iniciales para factura.cls] + +% Porcentajes de los distintos IVA (General, Reducido y Adicional): +\def\@AlicuotaG{0.12} +\def\@AlicuotaR{0.08} +\def\@AlicuotaA{0.22} + +% Al lado de cada ítem va la letra que designa el gravámen que aplica sobre él: +\def\@DenomAlicuotaG{G} +\def\@DenomAlicuotaR{R} +\def\@DenomAlicuotaA{A} +\def\@DenomAlicuotaE{(E)} + +% Moneda, separadores de miles y decimal: +\def\@Moneda{Bs.} +\npthousandsep{.} +\npdecimalsign{,} + +% La numeración de la factura tiene esta cantidad de dígitos: +\def\@DigitosNumeracion{5} + +% Tamaño de la página con 'geometry': +% El margen superior está definido desde el óvalo de los datos del cliente. +% El margen inferior está definido hasta el final de la descripción (o del renglón de la factura si no hay descripción). Hay elementos que salen fuera de estos márgenes, como las firmas, las condiciones de pago, la numeración y la fecha. +\geometry{letterpaper,vmargin={5cm,4.7cm},hmargin={1cm,1cm},footskip=0pt,headsep=0pt,headheight=0pt} +% Borde de las cajas ovaladas: +\cornersize*{1cm} +% \cornersize{0} +% Separación entre la línea de las cajas de y el texto que hay dentro: +\fboxsep=7pt% + +% Macros cuya definición es un texto, y no suele ser necesario cambiarlas: +\def\@@Fecha{Fecha de emisi\'on:} +\def\@@Nombre{Raz\'on social:} +\def\@@Cantidad{Cantidad} +\def\@@Descripcion{Descripci\'on} +\def\@@PrecioU{Precio U.} +\def\@@PrecioT{Precio T.} +\def\@@Precio{Precio} +\def\@@AlicuotaG{IVA G} +\def\@@AlicuotaR{IVA R} +\def\@@AlicuotaA{IVA A} +\def\@@BIG{B.I. G} +\def\@@BIR{B.I. R} +\def\@@BIA{B.I. A} +\def\@@BIE{Exento}% La base imponible exenta. ;) +\def\@@Total{TOTAL} +\def\@@RIF{R.I.F.:} +\def\@@CI{C.I.:} +\def\@@Direccion{Direcci\'on fiscal:} +\def\@@Tel{Tel\'efono:} +\def\@@Email{E-mail:} +\def\@@Datos{Datos del cliente} +\def\@@Resumen{Resumen del servicio} +\def\@@Conforme{Recib\'i conforme} +\def\@@DenomFactura{FACTURA} +\def\@@DenomPresupuesto{PRESUPUESTO} +\def\@@Control{N\textordmasculine\space CONTROL} + +% Líneas en blanco al finalizar los items: +\setcounter{Lineas}{0}% + +% Separación entre los óvalos: +\setlength{\SepOvalos}{0.25cm} + +% Separación mínima entre los totales en el modo de totalización en filas: +\setlength{\SepMinTotales}{0.8cm} + +% Suma de todos los espacios verticales entre los elementos en la factura, por ejemplo, entre los óvalos y el renglón de la 'factura', luego entre dicho renglón y la descripción. Si se define 0,4cm, habrá 0,2cm en estos espacios mencionados. +\setlength{\SepElementos}{0.4cm} + +% Posición (X,Y) de la fecha. +\setlength{\XInicioFecha}{1cm} +\setlength{\YInicioFecha}{4.3cm} + +% Posición (X,Y) de la denominación y el número. +\setlength{\XInicioDenom}{1cm} +\setlength{\YInicioDenom}{4.3cm} + +% Separación entre el inicio de una columna en la tabla y el inicio del texto. +\setlength{\tabcolsep}{0.15cm} + +% Posición (X,Y) de las firmas, tamaño y espesor de las líneas. +\setlength{\XInicioFirmas}{6cm} +\setlength{\XFinFirmas}{1cm} +\setlength{\YInicioFirmas}{25.2cm} +\setlength{\TamLineaFirmas}{5.5cm} +\setlength{\EspesorLineaFirmas}{1pt} + +% Posición (X,Y) de las condiciones de pago. +\setlength{\XInicioCond}{1cm} +\setlength{\XFinCond}{1cm} +\setlength{\YInicioCond}{23.6cm} + +% Posición (X,Y) del texto del número de control y el tamaño de su caja. +\setlength{\XInicioControl}{1cm} +\setlength{\YInicioControl}{24.5cm} +\setlength{\TamControl}{4cm} + +% Un tipo de letra diferente para cada elemento a mostrar: +\newcommand{\letraitems}{\fontsize{14}{18}\selectfont}% Esta es la letra de la descripción de los items; y el espacio \baselineskip de *toda* la tabla de la factura se fija en este comando únicamente (se predeterminó 18pt). +\newcommand{\letratitrenglon}{\fontsize{10}{10}\selectfont\bfseries}% Con este comando se cambia la letra del título de la tabla, es decir, los textos 'Cantidad, 'Descripción', etc... +\newcommand{\letratittotales}{\fontsize{12}{12}\selectfont\bfseries}% Tipo de letra de los títulos de los totales, por ejemplo los textos: 'B.I. G', 'IVA G'. +\newcommand{\letratotales}{\fontsize{14}{14}\selectfont}% Letra con la que salen los totales parciales, es decir, los números, exceptuando el total general. +\newcommand{\letratittotal}{\fontsize{12}{12}\selectfont\bfseries}% Letra con la que sale la palabra 'TOTAL'. +\newcommand{\letratotal}{\fontsize{14}{14}\selectfont\bfseries}% Letra para el total general, el monto. +\newcommand{\letratitovalos}{\fontsize{12}{13}\selectfont\slshape}% Tipo de letra para los títulos de los óvalos, por ejemplo: 'Datos del cliente'. +\newcommand{\letraovalos}{\fontsize{12}{13}\selectfont}% Tipo de letra para el texto en los óvalos. +\newcommand{\letranumeros}{\fontsize{14}{14}\selectfont}% Letra para los montos individuales de la factura y las cantidades. +\newcommand{\letratipoiva}{\fontsize{12}{12}\selectfont}% El tipo de IVA ('G', 'R', 'A' o '(E)') también tiene su tipo de letra. +\newcommand{\letradescrip}{\fontsize{14}{16.8}\selectfont}% Letra para la descripción general (comando \desc). +\newcommand{\letrafirmas}{\fontsize{12}{12}\selectfont}% Tipo de letra para el texto bajo las líneas para firmar. +\newcommand{\letracondiciones}{\fontsize{12}{12}\selectfont}% Tipo de letra para las condiciones de pago. +\newcommand{\letradenom}{\fontsize{14}{14}\selectfont\bfseries}% Letra para la denominación del documento ('FACTURA', 'PRESUPUESTO',...). +\newcommand{\letranumeracion}{\fontsize{14}{14}\selectfont\bfseries\color{Red}}% Letra para la numeración de la factura. +\newcommand{\letrafecha}{\fontsize{12}{12}\selectfont}% Letra para la fecha de emisión. + +\endinput \ No newline at end of file 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/factura.tlpobj 2013-04-30 03:49:37.000000000 +0200 @@ -0,0 +1,7 @@ +name factura +category Package +revision 30167 +relocated 1 +runfiles size=11 + RELOC/tex/latex/factura/factura.cls + RELOC/tex/latex/factura/factura.def 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 2011-06-23 04:15:51.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-turkish.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -name hyphen-turkish -category TLCore -revision 23085 -catalogue tkhyph -shortdesc Turkish hyphenation patterns. -relocated 1 -longdesc Hyphenation patterns for Turkish in T1/EC and UTF-8 encodings. -longdesc The patterns for Turkish were first produced for the Ottoman -longdesc Texts Project in 1987 and were suitable for both Modern Turkish -longdesc and Ottoman Turkish in Latin script, however the required -longdesc character set didn't fit into EC encoding, so support for -longdesc Ottoman Turkish had to be dropped to keep compatibility with 8- -longdesc bit engines. -depend hyphen-base -depend hyph-utf8 -execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex file_patterns=hyph-tr.pat.txt file_exceptions= -catalogue-ctan /language/hyphenation/tkhyph.tex -catalogue-date 2011-02-23 08:51:21 +0100 -catalogue-license other-free ++++++ hyphen-turkish.tar.xz -> 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/xelatex/facture/facture.cls 2011-09-26 02:45:20.000000000 +0200 @@ -0,0 +1,219 @@ +%% +%% This is file `facture.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% facture.dtx (with options: `facture') +%% +%% Droit d'auteur : Maïeul Rouquette 2011, +%% Licence Creative Commons - Paternité - Partage des Conditions Initiales à l'identique +%% http://creativecommons.org/licenses/by-sa/2.0/fr/ +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{facture}[2011/09/10 v1.0] +\LoadClass{article}%On se base sur la classe article +\RequirePackage{fontspec} +\RequirePackage{xunicode} +\RequirePackage{polyglossia} +\setmainlanguage{french} +\RequirePackage{numprint}%Pour gérer l'affichage des nombres +\RequirePackage{fltpoint}% Pour faire les calculs dans le tableau +\RequirePackage{tikz} % tikz est utilisé pour tracer des boites, par exemple +\RequirePackage{graphicx} % Pour insérer des images. Utiliser le format jpg pour plus de simplicité. +\RequirePackage{fancyhdr} % Pour entête et pied de page +\RequirePackage[paper=a4paper,top=2 cm, bottom=2 cm, left=1.5 cm, right=2.5 cm]{geometry} % On peut modifier ces valeurs pour augmenter ou réduire les marges. +\RequirePackage{ifthen} +\RequirePackage{array} +\RequirePackage{longtable} +\RequirePackage{colortbl} +\RequirePackage{advdate}%Pour manipuler les dates +\RequirePackage{xargs}%Pour des arguments conditionnels +\newif\ifsansTVA +\sansTVAfalse +\DeclareOption{sansTVA}{\sansTVAtrue} +\ProcessOptions +\definecolor{entetes}{HTML}{888888} +\definecolor{encadre}{RGB}{111,111,111} +\newcommand{\libelle}[1]{\textcolor{entetes}{\textbf#1}} +\setlength{\tabcolsep}{1pt} +\newcommand{\codeclient}{Code client :} +\newcommand{\datetxt}{Date:} +\newcommand{\datelimitetxt}{À payer avant:} +\newcommand{\facturation}{Facturation} +\newcommand{\facturetxt}{Facture} +\newcommand{\livraison}{Livraison} +\newcommand{\livraisonfacturation}{Livraison et Facturation} +\newcommand{\ntxt}{~n°} +\newcommand{\produit}{Produit} +\newcommand{\quantite}{Quantité} +\newcommand{\remise}{Remise} +\newcommand{\unite}{€} +\ifsansTVA% + \newcommand{\tottxt}{Total} + \newcommand{\prixtxt}{Prix} + \newcommand{\postTotaux}{\hfill TVA non applicable, art. 293 B} +\else% + \newcommand{\prixHT}{Prix HT} + \newcommand{\TVAtxt}{TVA} + \newcommand{\prixTTC}{Prix TTC} + \newcommand{\totHTtxt}{Total HT} + \newcommand{\totTVAtxt}{Total TVA} + \newcommand{\totTTCtxt}{Total TTC} + \newcommand{\postTotaux}{} +\fi +\npaddmissingzero +\nprounddigits{2} +\gdef\@TVAdefaut{19,6} +\gdef\@type{\facturetxt} +\renewcommand{\date}[1]{\SetDate[#1]} +\newcommand{\TVAdefaut}[1]{\gdef\@TVAdefaut{#1}} +\newcommand{\datelimite}[1]{\newcommand{\@datelimite}{#1}} +\newcommand{\dest}[1]{\newcommand{\@dest}{#1}} +\newcommand{\fact}[1]{\newcommand{\@fact}{#1}} +\newcommand{\adresseemet}[1]{\gdef\@adresseemet{#1}} +\newcommand{\nomemet}[1]{\gdef\@nomemet{#1}} +\newcommand{\type}[1]{\gdef\@type{#1}} +\newcommand{\numero}[1]{\gdef\@numero{#1}} +\newcommand{\codedest}[1]{\gdef\@codedest{#1}} + +\newcommand{\entete}{ + + \noindent\begin{tikzpicture} + + \noindent\node [font=\bf\Huge,text width=0.5\textwidth,text=entetes,text centered]{% + \@nomemet% + }; + + \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); + \draw[color=encadre,line width=1.5mm] (a) rectangle (c); + \end{tikzpicture} + + \vspace{3ex} + + \begin{flushright} + + {\Huge\libelle{\@type}} + + \end{flushright} + + \vspace{3ex} + + \begin{tikzpicture} + + \ifdef{\@fact}{ + \node[text width=0.33\textwidth,anchor=base]{ + \libelle{\facturation} + + \@fact + }; + }{} + + \node[xshift=0.33\textwidth,text width=0.33\textwidth,anchor=base]{\ifdef{\@fact}{ + \libelle{\livraison}} + {\libelle{\livraisonfacturation}} + + \@dest + }; + \node[text width=0.33\textwidth,xshift=0.66\textwidth,anchor=base]{ + \libelle{{\datetxt}} \today \\ + \ifdef{\@numero}{% + \libelle{{\@type\ntxt}} \@numero + }{} + \\ + \ifdef{\@codedest}{% + \libelle{{\codeclient}} \@codedest + }{} + \ifdef{\@datelimite}{\\\AdvanceDate[\@datelimite]\libelle{{\datelimitetxt}} \today}{} + }; + + \end{tikzpicture} + +} +\ifsansTVA + \xdef\tot{} +\else + \xdef\totTVA{} + \xdef\totHT{} + \xdef\totTTC{} +\fi +\newcolumntype{P}[1]{>{\raggedleft}p{#1}} +\newenvironment{facture}{% + \setlength{\extrarowheight}{0.5ex} + \setlength{\tabcolsep}{0.5em} + \arrayrulecolor{encadre} + \ifsansTVA% + \begin{longtable}{|p{0.2\textwidth}|P{0.2\textwidth}|P{0.2\textwidth}|P{0.2\textwidth}|P{0.2\textwidth}|}% + \hline% + \rowcolor{entetes}\centering\textbf\produit & \centering\textbf\quantite & \centering\textbf\prixtxt & \centering\textbf\remise & \centering\textbf\tottxt \tabularnewline[1ex]% + \else% + \begin{longtable}{|p{0.2\textwidth}|P{0.1\textwidth}|P{0.1\textwidth}|P{0.1\textwidth}|P{0.1\textwidth}|P{0.2\textwidth}|P{0.1\textwidth}|}% + \hline% + \rowcolor{entetes}\centering\textbf\produit & \centering\textbf\quantite & \centering\textbf\prixHT & \centering\textbf\remise & \centering\textbf\totHTtxt & \centering\textbf\TVAtxt & \textbf\prixTTC \tabularnewline[1ex]% + \fi% + \endhead% + \endfoot% + + }% +{% + \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}\\% + \else% + \libelle{\totHTtxt:}\hfill \numprint[\unite]{\totHT} \\% + \libelle{\totTVAtxt:}\hfill \numprint[\unite]{\totTVA} \\% + \libelle{\totTTCtxt:}\hfill \numprint[\unite]{\totTTC} \\ + \fi + \postTotaux}; + \end{tikzpicture} + + } +\newcommand{\lignesansTVA}[5]{#1 & #2 & #3 & #4 & #5 \tabularnewline[1ex]} +\newcommand{\afficheTVA}[1]{\raggedleft{\numprint[\%]{#1}} \hfill $\triangleright$ \numprint[\unite]{\TVA}} +\newcommandx{\ligne}[5][2=1,5=\@TVAdefaut,4=0,usedefault]{% + \ifsansTVA + \fpMul{\prix}{#3}{#2}% + \fpSub{\prix}{\prix}{#4}% + \fpAdd{\tot}{\prix}{\tot}% + \xdef\tot{\tot}% + \xdef\prix{\prix}% + %Affichage + \lignesansTVA{#1}{#2}{\numprint[\unite]{#3}}{\numprint[\unite]{#4}}{\numprint[\unite]{\prix}}% + \else + % Prix hors taxe + \fpMul{\HT}{#3}{#2}% + \fpSub{\HT}{\HT}{#4}% + \xdef\HT{\HT}%retenons + \fpAdd{\totHT}{\totHT}{\HT}% + \xdef\totHT{\totHT}% + % Calcul de la TVA + \fpDiv{\centieme}{#5}{100}% + \fpMul{\TVA}{\centieme}{\HT}% + \xdef\TVA{\TVA}%retenons + \fpAdd{\totTVA}{\totTVA}{\TVA}% + \xdef\totTVA{\totTVA}% + % Prix TTC + \fpAdd{\TTC}{\HT}{\TVA}% + \xdef\TTC{\TTC}% + \fpAdd{\totTTC}{\totTTC}{\TTC}% + \xdef\totTTC{\totTTC}% + % Affichage + #1 & #2 & \numprint[\unite]{#3} & \numprint[\unite]{#4} & \numprint[\unite]{\HT} & \afficheTVA{#5} & \numprint[\unite]{\TTC} \tabularnewline[1ex]% + \fi + \hline +} +\pagestyle{fancy} +\fancyhf{} +\renewcommand{\headrule}{}%Pas de règle après l'entête +\lfoot{\ifnumgreater{\thepage}{1}{\thepage}{}}%Indiquer le numéro de page, sauf sur la première +\newcommand{\pied}[1]{\rfoot{#1}}%Le pied définissable par l'utilisateur +\endinput +%% +%% End of file `facture.cls'. 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 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/facture.tlpobj 2011-09-26 04:24:25.000000000 +0200 @@ -0,0 +1,16 @@ +name facture +category Package +revision 24092 +shortdesc Generate an invoice. +relocated 1 +longdesc Une classe simple permettant de produite une facture, avec ou +longdesc sans TVA, avec gestion d'une adresse differente pour la +longdesc livraison et pour la facturation. A simple class that allows +longdesc production of an invoice, with or without VAT; different +longdesc addresses for delivery and for billing are permitted. +runfiles size=2 + RELOC/tex/xelatex/facture/facture.cls +catalogue-ctan /macros/xetex/latex/facture +catalogue-date 2011-09-24 18:52:18 +0200 +catalogue-license other-free +catalogue-version 1.0 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 2011-06-23 04:15:51.000000000 +0200 +++ new/tlpkg/tlpobj/hyphen-turkish.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -name hyphen-turkish -category TLCore -revision 23085 -catalogue tkhyph -shortdesc Turkish hyphenation patterns. -relocated 1 -longdesc Hyphenation patterns for Turkish in T1/EC and UTF-8 encodings. -longdesc The patterns for Turkish were first produced for the Ottoman -longdesc Texts Project in 1987 and were suitable for both Modern Turkish -longdesc and Ottoman Turkish in Latin script, however the required -longdesc character set didn't fit into EC encoding, so support for -longdesc Ottoman Turkish had to be dropped to keep compatibility with 8- -longdesc bit engines. -depend hyphen-base -depend hyph-utf8 -execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex file_patterns=hyph-tr.pat.txt file_exceptions= -catalogue-ctan /language/hyphenation/tkhyph.tex -catalogue-date 2011-02-23 08:51:21 +0100 -catalogue-license other-free -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org