diff options
| author | Karl Berry <karl@freefriends.org> | 2011-04-12 22:56:39 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-04-12 22:56:39 +0000 |
| commit | 3c9b5c2960ae2455180bdb3a4e67bf10175b39af (patch) | |
| tree | 53ac9731c23e82f60349ec920ed8d816738913dc /Master/texmf-dist/tex/latex/oberdiek | |
| parent | f437333cf5d63d69f5ab9fd1eb553af4175037d0 (diff) | |
oberdiek (12apr11)
git-svn-id: svn://tug.org/texlive/trunk@22061 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
96 files changed, 6060 insertions, 1707 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty index 9e71c2bc074..75f8d14ce0b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty @@ -32,28 +32,37 @@ %% accsupp-example1.tex, accsupp-example2.tex, %% accsupp-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ACCSUPP@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ACCSUPP@AtEnd{% \ACCSUPP@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -67,13 +76,12 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{254}{12}% ^^fe \TMP@EnsureCode{255}{12}% ^^ff -\g@addto@macro\ACCSUPP@AtEnd{\endinput} +\edef\ACCSUPP@AtEnd{\ACCSUPP@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{accsupp}% [2010/01/16 v0.3 Accessibility support by marked content (HO)] @@ -150,21 +158,21 @@ \let\ACCSUPP@driver\ACCSUPP@temp \fi \fi -\fi +\fi% \ifx\ACCSUPP@driver\relax \PackageError{accsupp}{% Missing driver option.\MessageBreak Package loading is aborted% }\@ehc \expandafter\ACCSUPP@AtEnd -\fi +\fi% \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{% \PackageError{accsupp}{% Unsupported driver `\ACCSUPP@driver'.\MessageBreak Package loading is aborted% }\@ehc \ACCSUPP@AtEnd -} +}% \DeclareBoolOption{unicode} \DeclareStringOption[page]{pdfliteral} \DeclareStringOption{Lang} @@ -299,7 +307,7 @@ }% \edef#1{(\ACCSUPP@temp)}% } -\ACCSUPP@AtEnd +\ACCSUPP@AtEnd% \endinput %% %% End of file `accsupp.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty index b82dfee762f..0f93791fe43 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1991-1994 by Pablo A. Straub -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2008 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,28 +44,37 @@ %% askinclude-test23.tex, askinclude-test24.tex. %% \NeedsTeXFormat{LaTeX2e} -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname AskInc@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AskInc@AtEnd{% \AskInc@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -78,12 +87,12 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput} \ProvidesPackage{askinclude}% [2008/08/11 v2.1 Interactive asking of included files]% \AtBeginDocument{% @@ -191,9 +200,8 @@ }{}% \fi }% - \AskInc@AtEnd - \expandafter\endinput -\fi + \expandafter\AskInc@AtEnd +\fi% \newcommand{\AskInc@OrgIncludeOnly}{}% \let\AskInc@OrgIncludeOnly\includeonly \renewcommand*{\includeonly}[1]{% @@ -674,7 +682,7 @@ \AskInc@Next } \AtBeginDocument{\AskInc@MainQuestion} -\AskInc@AtEnd +\AskInc@AtEnd% \endinput %% %% End of file `askinclude.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def new file mode 100644 index 00000000000..f06fe76d1b3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def @@ -0,0 +1,212 @@ +%% +%% This is file `atfi-dvipdfmx.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% attachfile2.dtx (with options: `dvipdfmx') +%% +%% This is a generated file. +%% +%% Copyright (C) 2005-2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file attachfile2.dtx +%% and the derived files +%% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{atfi-dvipdfmx.def}% + [2010/09/27 v2.6 attachfile2 driver for dvipdfmx/XeTeX (HO)]% +\def\atfi@special#1{% + \special{pdf:#1}% +} +\def\atfi@literal#1{% + \atfi@special{content #1}% +} +\def\atfi@GSAVE{q } +\def\atfi@GRESTORE{Q } +\def\atfi@SETLINEWIDTH{w } +\def\atfi@LINETO{l } +\def\atfi@MOVETO{m } +\def\atfi@STROKE{S } +\def\atfi@FILL{f } +\def\atfi@FILLSTROKE#1#2{#1#2B } +\def\atfi@SETRGBCOLORSTROKE{RG } +\def\atfi@SETRGBCOLORFILL{rg } +\def\atfi@SETGRAYSTROKE{G } +\def\atfi@SETGRAYFILL{g } +\def\atfi@SETCMYKCOLORSTROKE{K } +\def\atfi@SETCMYKCOLORFILL{k } +\def\atfi@RECTFILL{re f } +\def\atfi@RECTSTROKEFILL#1#2#3{#1#2#3re B } +\def\atfi@SETMITERLIMIT{M } +\def\atfi@SETFLAT{i } +\def\atfi@SETLINECAP{J } +\def\atfi@CURVETO{c } +\def\atfi@CURVETOV{v } +\def\atfi@CURVETOY{y } +\def\atfi@CLOSEPATH{h } +\def\atfi@SETLINEJOIN{j } +\newcounter{atfi@obj} +\renewcommand*{\theatfi@obj}{% + @atfi_obj_\number\c@atfi@obj +} +\define@key{AtFi@file}{Size}{% + \edef\atfi@params{\atfi@params/Size #1}% +} +\def\atfi@embedfile#1{% + \ltx@IfUndefined{atfi@fileobj@#1}{% + \stepcounter{atfi@obj}% + \begingroup + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% + \x + \fi + \ifx\atfi@params\ltx@empty + \else + \edef\atfi@params{/Params<<\atfi@params>>}% + \fi + \edef\atfi@FILE{#1}% + \filename@parse\atfi@FILE + \ifx\filename@area\ltx@empty + \edef\atfi@FILE{./\atfi@FILE}% + \fi + \EdefEscapeString\atfi@FILE{\atfi@FILE}% + \atfi@special{fstream % + \theatfi@obj + (\atfi@FILE)% + <<% + /Type/EmbeddedFile% + \atfi@mimetype + \atfi@params + >>% + }% + \atfi@special{close \theatfi@obj}% + \expandafter + \xdef\csname atfi@fileobj@#1\endcsname{\theatfi@obj}% + \endgroup + }{% + % file already embedded + }% +} +\def\atfi@xform{% + \stepcounter{atfi@obj}% + \smash{% + \rlap{% + \atfi@special{bxobj \theatfi@obj\space + width \the\wd\atfi@appearancebox\space + height \the\ht\atfi@appearancebox\space + depth \the\dp\atfi@appearancebox + }% + \usebox\atfi@appearancebox + \atfi@special{exobj}% + }% + }% + \edef\atfi@appearanceobj{\theatfi@obj}% +} +\let\atfi@xform@icon\atfi@xform +\def\atfi@refxform#1{% + \leavevmode + \atfi@special{uxobj #1}% +} +\def\atfi@insert@file@annot#1{% + \rule{0pt}{0pt}% + \ifatfi@appearance + \def\atfi@appearance@dict{% + /AP<<% + /N \atfi@appearanceobj + /R \atfi@appearanceobj + /D \atfi@appearanceobj + >>% + }% + \else + \let\atfi@appearance@dict\ltx@empty + \fi + \ltx@IfUndefined{atfi@fsobj@#1}{% + \begingroup + \ifxetex + \let\atfi@temp\Hy@Warning + \let\Hy@Warning\ltx@gobble + \fi + \hypersetup{unicode=false}% + \ifxetex + \let\Hy@Warning\atfi@temp + \fi + \atfi@pdfstringdef\atfi@file{#1}% + \stepcounter{atfi@obj}% + \atfi@special{obj \theatfi@obj <<% + /Type/Filespec% + /F(\atfi@file)% + \ifx\atfi@ucfilespec\ltx@empty + \else + /UF(\atfi@ucfilespec)% + \fi + /EF<<% + /F \@nameuse{atfi@fileobj@#1}% + >>% + >>% + }% + \expandafter\xdef\csname atfi@fsobj@#1\endcsname{% + \theatfi@obj + }% + \endgroup + }{% + }% + \begingroup + \dimen@=\atfi@scale\atfi@appearancewidth + \edef\atfi@rule{width \the\dimen@}% + \dimen@=\atfi@scale\atfi@appearanceheight + \edef\atfi@rule{\atfi@rule\space height \the\dimen@}% + \dimen@=\atfi@scale\atfi@appearancedepth + \edef\atfi@rule{\atfi@rule\space depth \the\dimen@}% + \atfi@special{ann \atfi@rule + <<% + /Subtype/FileAttachment% + \atfi@icon + \atfi@color@annot + \atfi@author + \atfi@date + \atfi@annotname + \atfi@description + \atfi@subject + \atfi@appearance@dict + /F \theatfi@flags + /FS \@nameuse{atfi@fsobj@#1}% + >>% + }% + \endgroup + \rule{0pt}{\atfi@appearanceheight}% + \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% + \rule{\atfi@appearancewidth}{0pt}% +} + +\endinput +%% +%% End of file `atfi-dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def index b630fa8e854..4ba9e5eb0ff 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def @@ -1,5 +1,5 @@ %% -%% This is file `atfidvips.def', +%% This is file `atfi-dvips.def', %% generated with the docstrip utility. %% %% The original source files were: @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,20 +28,18 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{atfipdftex.def}% - [2009/09/25 v2.5 attachfile2 driver for dvips (HO)]% +\ProvidesFile{atfi-dvips.def}% + [2010/09/27 v2.6 attachfile2 driver for dvips (HO)]% \def\atfi@literal#1{% \special{ps:atfi_dict begin{#1}atfi_?pdfmark end}% } - \def\atfi@header#1{% \special{! #1}% } - - \atfi@header{% userdict begin 20 dict dup /atfi_dict exch def end begin% /atfi_?pdfmark systemdict % @@ -232,7 +230,6 @@ } atfi_?pdfmark % end% } - \def\atfi@GSAVE{gsave } \def\atfi@GRESTORE{grestore } \def\atfi@SETLINEWIDTH{setlinewidth } @@ -265,52 +262,39 @@ \def\atfi@CURVETOY{atfi_curveto_y } \def\atfi@CLOSEPATH{closepath } \def\atfi@SETLINEJOIN{setlinejoin } - - \newcounter{atfi@obj} \renewcommand*{\theatfi@obj}{% {atfi_obj_\number\c@atfi@obj}% } - - \define@key{AtFi@file}{Size}{} - \def\atfi@embedfile#1{% - \@ifundefined{atfi@fileobj@#1}{% + \ltx@IfUndefined{atfi@fileobj@#1}{% \atfi@pdfstringdef\atfi@psfilename{#1}% \stepcounter{atfi@obj}% \expandafter\xdef\csname atfi@fileobj@#1\endcsname{\theatfi@obj}% \begingroup - \let\atfi@params\@empty - \@ifundefined{atfi@file@#1}{}{% - \edef\x{\noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}}% + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% \x - }% + \fi \atfi@literal{% /atfi_filename(\atfi@psfilename)def % atfi_filename status% {% - % ok: file found - % save parameters of status command /atfi_created exch def% /atfi_referenced exch def% /atfi_size exch def % - pop % drop parameter "pages" (storage space), never needed - % ghostscript: - % created: stat.st_ctime - % referenced: stat.st_mtime - % stat.st_ctime: interpretion depends on operating system: - % * unix: inode change time (not interesting) - % * win32: probably creation time - % --> /CreationDate - % stat.st_mtime: modification time --> /ModDate - % time values are seconds since 1970-01-01, GMT - % TODO: ghostscript offers "getenv" for getting the value - % of an environment variable. That could be used to - % to detect windows and settingthe /CreationDate entry. - % TODO: how are these values interpreted by other distiller - % programs? - % + pop % [% /_objdef \theatfi@obj /type/stream% @@ -329,12 +313,9 @@ /product where% {% pop % - % check for ghostscript product (Ghostscript) search% {% pop pop pop % - % ghostscript is running - % \ifatfi@creationdate \else false % TODO: test for windows @@ -347,8 +328,6 @@ /ModDate atfi_referenced atfi_convert_date% \fi } if% - % - % look for MD5Encode filter and calculate CheckSum } if % \ifatfi@checksum \else @@ -365,17 +344,12 @@ \theatfi@obj /CLOSE pdfmark% }{% - % error: file not found - % currently nothing is done } ifelse% }% \endgroup }{% - % file already embedded }% } - - \def\atfi@xform@icon{% \stepcounter{atfi@obj}% \edef\atfi@appearanceobj{\theatfi@obj}% @@ -399,7 +373,7 @@ \stepcounter{atfi@obj}% \edef\atfi@appearanceobj{\theatfi@obj}% \begingroup - \setbox0=\hbox{% + \setbox\ltx@zero=\hbox{% \atfi@literal{% [% /_objdef \atfi@appearanceobj @@ -425,13 +399,12 @@ }% }% % do not allocate any space for xobject definition - \dp0=\z@ - \ht0=\z@ - \wd0=\z@ - \mbox{\usebox0}% + \dp\ltx@zero=\z@ + \ht\ltx@zero=\z@ + \wd\ltx@zero=\z@ + \mbox{\usebox\ltx@zero}% \endgroup } - \def\atfi@refxform#1{% \raisebox{-\atfi@appearancedepth}{% \atfi@literal{% @@ -445,8 +418,6 @@ }% \rule{0pt}{\atfi@appearanceheight}% } - - \def\atfi@insert@file@annot#1{% \rule{0pt}{0pt}% \ifatfi@appearance @@ -458,11 +429,12 @@ >>% }% \else - \let\atfi@appearance@dict\@empty + \let\atfi@appearance@dict\ltx@empty \fi - \@ifundefined{atfi@fsobj@#1}{% + \ltx@IfUndefined{atfi@fsobj@#1}{% \stepcounter{atfi@obj}% - \expandafter\xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}% + \expandafter + \xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}% \begingroup \hypersetup{unicode=false}% \atfi@pdfstringdef\atfi@file{#1}% @@ -476,7 +448,7 @@ <<% /Type/Filespec% /F(\atfi@file)% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else /UF(\atfi@ucfilespec)% \fi @@ -507,9 +479,11 @@ \strip@pt\dimexpr\atfi@scale\atfi@appearancedepth\relax \space atfi_pdftodvipsy add % currentpoint % - exch \strip@pt\dimexpr\atfi@scale\atfi@appearancewidth\relax + exch % + \strip@pt\dimexpr\atfi@scale\atfi@appearancewidth\relax \space atfi_pdftodvipsx add % - exch \strip@pt\dimexpr\atfi@scale\atfi@appearanceheight\relax + exch % + \strip@pt\dimexpr\atfi@scale\atfi@appearanceheight\relax \space atfi_pdftodvipsy sub % ]% /ANN pdfmark% @@ -521,4 +495,4 @@ \endinput %% -%% End of file `atfidvips.def'. +%% End of file `atfi-dvips.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def index f0da8594c70..daba4d77f5e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def @@ -1,5 +1,5 @@ %% -%% This is file `atfipdftex.def', +%% This is file `atfi-pdftex.def', %% generated with the docstrip utility. %% %% The original source files were: @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,14 +28,45 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{atfipdftex.def}% - [2009/09/25 v2.5 attachfile2 driver for pdfTeX (HO)]% +\ProvidesFile{atfi-pdftex.def}% + [2010/09/27 v2.6 attachfile2 driver for pdfTeX (HO)]% +\ifluatex + \ifnum\luatexversion<39 % + \else + \begingroup + \escapechar=-1 % + \def\atfi@temp#1{% + \ltx@IfUndefined{\string#1}{% + \let#1\ltx@undefined + \directlua{% + if tex.enableprimitives then % + tex.enableprimitives('', {'\string#1'})% + end% + }% + \ltx@ifundefined{\string#1}{% + }{% + \global#1=#1% + \@PackageInfoNoLine{attachfile2}{% + \string#1 enabled% + }% + }% + }{}% + }% + \atfi@temp\pdfliteral + \atfi@temp\pdfobj + \atfi@temp\pdflastobj + \atfi@temp\pdfxform + \atfi@temp\pdflastxform + \atfi@temp\pdfrefxform + \atfi@temp\pdfannot + \endgroup + \fi +\fi \let\atfi@literal\pdfliteral - - \def\atfi@GSAVE{q } \def\atfi@GRESTORE{Q } \def\atfi@SETLINEWIDTH{w } @@ -60,21 +91,27 @@ \def\atfi@CURVETOY{y } \def\atfi@CLOSEPATH{h } \def\atfi@SETLINEJOIN{j } - - \define@key{AtFi@file}{Size}{% \edef\atfi@params{\atfi@params/Size #1}% } - \def\atfi@embedfile#1{% - \@ifundefined{atfi@fileobj@#1}{% + \ltx@IfUndefined{atfi@fileobj@#1}{% \begingroup - \let\atfi@params\@empty - \@ifundefined{atfi@file@#1}{}{% - \edef\x{\noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}}% + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% \x - }% - \ifx\atfi@params\@empty + \fi + \ifx\atfi@params\ltx@empty \else \edef\atfi@params{/Params<<\atfi@params>>}% \fi @@ -83,25 +120,21 @@ \atfi@mimetype \atfi@params } file {#1}% - \expandafter\xdef\csname atfi@fileobj@#1\endcsname{\the\pdflastobj}% + \expandafter + \xdef\csname atfi@fileobj@#1\endcsname{\the\pdflastobj}% \endgroup }{% % file already embedded }% } - - \def\atfi@xform{% \immediate\pdfxform\atfi@appearancebox \edef\atfi@appearanceobj{\the\pdflastxform}% } \let\atfi@xform@icon\atfi@xform - \def\atfi@refxform#1{% \pdfrefxform#1\relax } - - \def\atfi@insert@file@annot#1{% \rule{0pt}{0pt}% \ifatfi@appearance @@ -113,9 +146,9 @@ >>% }% \else - \let\atfi@appearance@dict\@empty + \let\atfi@appearance@dict\ltx@empty \fi - \@ifundefined{atfi@fsobj@#1}{% + \ltx@IfUndefined{atfi@fsobj@#1}{% \begingroup \hypersetup{unicode=false}% \atfi@pdfstringdef\atfi@file{#1}% @@ -123,7 +156,7 @@ <<% /Type/Filespec% /F(\atfi@file)% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else /UF(\atfi@ucfilespec)% \fi @@ -160,4 +193,4 @@ \endinput %% -%% End of file `atfipdftex.def'. +%% End of file `atfi-pdftex.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty index 20f5ef0e689..3098ffaefca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,139 +28,142 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2009/09/25 v2.5 attach files into PDF (HO)]% -\RequirePackage{ifpdf} + [2010/09/27 v2.6 attach files into PDF (HO)]% +\RequirePackage{ifpdf}[2009/04/10] +\RequirePackage{ifxetex} +\RequirePackage{ifluatex}[2009/04/10] \RequirePackage{keyval} \RequirePackage{color} -\RequirePackage{kvoptions}[2006/08/17] +\RequirePackage{infwarerr}[2010/04/08] +\RequirePackage{ltxcmds}[2010/04/26] +\RequirePackage{kvoptions}[2009/07/21] +\RequirePackage{pdftexcmds}[2010/04/01] \RequirePackage{pdfescape}[2007/11/11] - - \RequirePackage{hyperref} \RequirePackage{hycolor}[2008/07/29] - - -\def\atfi@hexdigit#1{% - \ifcase#1% - 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or - a\or b\or c\or d\or e\or f% - \fi -} -\def\atfi@hexchar#1{% - \atfi@hexdigit{\numexpr\dimexpr.0625\dimexpr`#1sp\relax\relax\relax}% - \atfi@hexdigit{% - \numexpr`#1-16*\dimexpr.0625\dimexpr`#1sp\relax\relax\relax +\ltx@IfUndefined{pdfmatch}{% + \def\atfi@Match#1#2#3#4#5{}% +}{% + \def\atfi@Match#1#2#3{% + \begingroup + \edef\^{\ltx@backslashchar\string^}% + \edef\.{\ltx@backslashchar.}% + \let\#\ltx@hashchar + \edef\[{\ltx@backslashchar[}% ]] + \edef\${\ltx@backslashchar$}% + \let\%\ltx@percentchar + \edef\&{\string&}% + \edef\({\ltx@backslashchar(}% + \edef\){\ltx@backslashchar)}% + \edef\|{\ltx@backslashchar|}% + \edef\*{\ltx@backslashchar*}% + \edef\+{\ltx@backslashchar+}% + \edef\?{\ltx@backslashchar?}% + \edef\{{\ltx@backslashchar\ltx@leftbracechar}% + \edef\}{\ltx@rightbracechar}% + \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \edef\~{\string~}% + \ifcase\pdfmatch#3{#2}{#1} % + \endgroup + \expandafter\ltx@secondoftwo + \or + \endgroup + \expandafter\ltx@firstoftwo + \else + \atfi@Warning{% + Internal error: Wrong pattern!\MessageBreak + --> #2 <--\MessageBreak + Pattern check ignored% + }% + \endgroup + \expandafter\ltx@firstoftwo + \fi + }% + \def\atfi@PatToken{% + [% + -% first character + !% + \#$\%\&'% + \*\+\.% + 0-9% + A-Z% + \^_`% + a-z% + \{\}\|\~% + ]+% + }% + \begingroup + \lccode64=13 % @ + \lowercase{\endgroup + \def\atfi@CR{@}% + }% + \def\atfi@PatQuotedString{% + "% + ([^"\\\atfi@CR]|\\.)*% + "% + }% + \ltx@ifpackagelater{ltxcmds}{2010/09/11}{}{% + \begingroup + \lccode`0=`\{\relax + \lowercase{\endgroup + \def\ltx@leftbracechar{0}% + }% + \begingroup + \lccode`0=`\}\relax + \lowercase{\endgroup + \def\ltx@rightbracechar{0}% + }% }% } -\def\atfi@tohex#1{% - \ifx\relax#1% - \else - \atfi@hexchar{#1}% - \expandafter\atfi@tohex - \fi -} - - -\def\atfi@converttoname#1#2{% - \edef#1{#2}% - \@onelevel@sanitize#1% - \edef#1{\expandafter\atfi@spacetoother#1 \relax}% - \edef#1{\expandafter\atfi@converttokens#1\relax}% +\def\atfi@Warning{\PackageWarning{attachfile2}} +\SetupKeyvalOptions{% + family=AtFi,% + prefix=atfi@% } - -\edef\atfi@hash{\string#}% -\catcode`\ =12\relax% -\def\atfi@space{ }% -\catcode`\ =10\relax% - -\def\atfi@spacetoother#1 #2\relax{% - #1% - \ifx\\#2\\% +\def\atfi@setup{\setkeys{AtFi}} +\DeclareBoolOption{draft} +\DeclareComplementaryOption{final}{draft} +\def\atfi@mimetype{} +\define@key{AtFi}{mimetype}{% + \edef\atfi@mimetype{#1}% + \ifx\atfi@mimetype\ltx@empty \else - \atfi@space - \@ReturnAfterFi{% - \atfi@spacetoother #2\relax + \atfi@Match\atfi@mimetype{% + ^(application|audio|image|model|text|video|x-\atfi@PatToken)% + /% + ([a-z\-\+_\.0-9]+)% + (; ?\atfi@PatToken=(\atfi@PatToken|\atfi@PatQuotedString))*$% + }{icase}{}{% + \atfi@Warning{% + Invalid value `\atfi@mimetype'\MessageBreak + of option `mimetype'.\MessageBreak + Value is discarded% + }% + \let\atfi@mimetype\ltx@empty }% \fi -} -\long\def\@ReturnAfterFi#1\fi{\fi#1} - -\def\atfi@converttokens#1{% - \ifx\relax#1% + \ifx\atfi@mimetype\ltx@empty \else - \ifnum`#1<33 % - \ifcase`#1% - % drop illegal zero - \else - \atfi@hash\atfi@hexchar#1% - \fi - \else - \ifnum`#1>126 % - \atfi@hash\atfi@hexchar#1% - \else - \ifnum`#1=40 % ( - \atfi@hash 28% - \else\ifnum`#1=41 % ) - \atfi@hash 29% - \else\ifnum`#1=60 % < - \atfi@hash 3c% - \else\ifnum`#1=62 % > - \atfi@hash 3e% - \else\ifnum`#1=91 % [ - \atfi@hash 5b% - \else\ifnum`#1=93 % ] - \atfi@hash 5d% - \else\ifnum`#1=123 % { - \atfi@hash 7b% - \else\ifnum`#1=125 % } - \atfi@hash 7d% - \else\ifnum`#1=47 % / - \atfi@hash 2f% - \else\ifnum`#1=37 % % - \atfi@hash 25% - \else - #1% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi - \fi - \expandafter\atfi@converttokens + \EdefEscapeName\atfi@mimetype{\atfi@mimetype}% + \edef\atfi@mimetype{/Subtype/\atfi@mimetype}% \fi } - - -\newif\ifatfi@draft -\let\atfi@finaltrue\atfi@draftfalse -\let\atfi@finalfalse\atfi@drafttrue -\define@key{AtFi}{final}[true]{% - \csname atfi@final#1\endcsname -} -\define@key{AtFi}{draft}[true]{% - \csname atfi@draft#1\endcsname -} - -\def\atfi@mimetype{} -\define@key{AtFi}{mimetype}{% - \atfi@converttoname\atfi@mimetype{#1}% - \edef\atfi@mimetype{/Subtype/\atfi@mimetype}% -} - \define@key{AtFi}{icon}{% \def\atfi@icon{/Name/#1}% \def\atfi@icon@icon{#1}% } -\setkeys{AtFi}{icon=PushPin} - +\atfi@setup{icon=PushPin} \define@key{AtFi}{color}{% \HyColor@AttachfileColor{#1}% \atfi@color@tex\atfi@color@inline\atfi@color@annot {attachfile2}{color}% } -\setkeys{AtFi}{color=1 0.9255 0.7765} - +\atfi@setup{color=1 0.9255 0.7765} \def\atfi@pad@ii#1{% \ifnum#1>9 % \number#1% @@ -168,7 +171,7 @@ 0\number#1% \fi% } -\let\atfi@timezone\@empty +\let\atfi@timezone\ltx@empty \define@key{AtFi}{timezone}{\def\atfi@timezone{#1}} \edef\atfi@time{\the\time} \def\atfi@hours{% @@ -191,105 +194,138 @@ \EdefEscapeString\atfi@date{#1}% \edef\atfi@date{/M(\atfi@date)}% } - -\let\atfi@annotname\@empty -\define@key{AtFi}{annotname}{% - \atfi@pdfstringdef\atfi@annotname{#1}% - \edef\atfi@annotname{/NM(\atfi@annotname)}% -} - \DeclareRobustCommand{\atfi@pdfstringdef}[2]{% \pdfstringdef\atfi@temp@string{#2}% \edef#1{\atfi@temp@string}% } - +\def\atfi@NoValue{\NoValue} +\def\atfi@DefNoValueName#1#2#3{% + \def#1{#3}% + \ifx#1\atfi@NoValue + \let#1\ltx@empty + \else + \atfi@pdfstringdef#1{#1}% + \edef#1{/#2(#1)}% + \fi +} +\let\atfi@annotname\ltx@empty +\define@key{AtFi}{annotname}[\NoValue]{% + \atfi@DefNoValueName\atfi@annotname{NM}{#1}% +} \def\atfi@author{} -\define@key{AtFi}{author}{% - \atfi@pdfstringdef\atfi@author{#1}% - \edef\atfi@author{/T(\atfi@author)}% +\define@key{AtFi}{author}[\NoValue]{% + \atfi@DefNoValueName\atfi@author{T}{#1}% } - \def\atfi@description{} -\define@key{AtFi}{description}{% - \atfi@pdfstringdef\atfi@description{#1}% - \edef\atfi@description{/Contents(\atfi@description)}% +\define@key{AtFi}{description}[\NoValue]{% + \atfi@DefNoValueName\atfi@description{Contents}{#1}% } - \def\atfi@subject{} -\define@key{AtFi}{subject}{% - \atfi@pdfstringdef\atfi@subject{#1}% - \edef\atfi@subject{/Subj(\atfi@subject)}% -} - -\newif\ifatfi@print -\atfi@printtrue -\define@key{AtFi}{print}[true]{\csname atfi@print#1\endcsname} - -\newif\ifatfi@zoom -\atfi@zoomtrue -\define@key{AtFi}{zoom}[true]{\csname atfi@zoom#1\endcsname} - -\newif\ifatfi@appearance -\atfi@appearancetrue -\define@key{AtFi}{appearance}[true]{% - \csname atfi@appearance#1\endcsname +\define@key{AtFi}{subject}[\NoValue]{% + \atfi@DefNoValueName\atfi@subject{Subj}{#1}% } - -\def\atfi@scale{1} -\define@key{AtFi}{scale}[1]{% - \def\atfi@scale{#1}% -} - +\DeclareBoolOption[true]{print} +\DeclareBoolOption[true]{zoom} +\DeclareBoolOption[true]{appearance} +\DeclareStringOption[1]{scale} \def\atfi@ucfilespec{} \define@key{AtFi}{ucfilespec}[1]{% \def\atfi@ucfilespec{#1}% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else \atfi@pdfstringdef\atfi@ucfilespec{#1}% \fi } - -\newif\ifatfi@nofiles -\atfi@nofilesfalse -\define@key{AtFi}{nofiles}[true]{% - \csname atfi@nofiles#1\endcsname -} - -\let\atfi@driver\@empty +\DeclareBoolOption{nofiles} +\let\atfi@driver\ltx@empty \def\atfi@driver@pdftex{pdftex} \def\atfi@driver@dvips{dvips} - -\define@key{AtFi}{pdftex}[true]{% +\def\atfi@driver@dvipdfmx{dvipdfmx} +\DeclareVoidOption{pdftex}{% \let\atfi@driver\atfi@driver@pdftex } -\define@key{AtFi}{dvips}[true]{% +\DeclareVoidOption{dvips}{% \let\atfi@driver\atfi@driver@dvips } - +\DeclareVoidOption{dvipdfmx}{% + \let\atfi@driver\atfi@driver@dvipdfmx +} +\DeclareVoidOption{xetex}{% + \let\atfi@driver\atfi@driver@dvipdfmx +} +\DeclareStringOption{driverfallback} \DeclareRobustCommand{\attachfilesetup}[1]{\setkeys{AtFi}{#1}} - +\DeclareLocalOptions{% + annotname,% + appearance,% + author,% + color,% + date,% + description,% + icon,% + mimetype,% + nofiles,% + print,% + scale,% + subject,% + timezone,% + ucfilespec,% + zoom,% +} \InputIfFileExists{attachfile.cfg}{}{} - -\ProcessKeyvalOptions{AtFi} - - +\ProcessKeyvalOptions* +\def\atfi@DisableOption{% + \DisableKeyvalOption[action=error,package=attachfile2]{AtFi}% +} \ifpdf % ignoring other driver options \let\atfi@driver\atfi@driver@pdftex \else - \ifx\atfi@driver\@empty - \PackageWarningNoLine{attachfile2}{% - Driver is not specified,\MessageBreak - enforce draft settings% - }% - \atfi@drafttrue + \ifx\atfi@driver\atfi@driver@pdftex + \let\atfi@driver\ltx@empty + \PackageError{attachfile2}{% + Wrong driver option `pdftex',\MessageBreak + because pdfTeX in PDF mode is not detected% + }\@ehc + \fi + \ifxetex + \let\atfi@driver\atfi@driver@dvipdfmx + \else + \ifx\atfi@driver\ltx@empty + \ifx\atfi@driverfallback\ltx@empty + \else + \expandafter\let\expandafter\atfi@driver + \csname atfi@driver@\atfi@driverfallback\endcsname + \ifx\atfi@driver\atfi@driver@dvips + \else + \ifx\atfi@driver\atfi@driver@dvipdfmx + \else + \let\atfi@driver\ltx@empty + \PackageWarningNoLine{attachfile2}{% + Option `driverfallback' with unsupported\MessageBreak + DVI driver (\atfi@driverfallback)% + }% + \fi + \fi + \fi + \ifx\atfi@driver\ltx@empty + \PackageWarningNoLine{attachfile2}{% + Driver is not specified,\MessageBreak + enforce draft settings% + }% + \atfi@drafttrue + \fi + \fi \fi \fi - - +\atfi@DisableOption{pdftex} +\atfi@DisableOption{dvips} +\atfi@DisableOption{dvipdfmx} +\atfi@DisableOption{xetex} +\atfi@DisableOption{driverfallback} \DeclareRobustCommand{\notextattachfile}[2][]{% \begingroup - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \ifatfi@print \leavevmode \begingroup @@ -297,12 +333,13 @@ #2\strut \endgroup \else - \setbox0=\hbox{#2\strut}% + \sbox\ltx@zero{#2\strut}% \makebox[\wd0]{}% \fi \endgroup } - +\atfi@DisableOption{draft}% +\atfi@DisableOption{final}% \ifatfi@draft \def\atfi@dummy@pushpin{% \raisebox{-1.25bp}{\parbox[b][14bp]{24bp}{}}% @@ -316,13 +353,9 @@ \DeclareRobustCommand{\attachfile}[2][]{% \noattachfile[{#1}]% }% - \expandafter\endinput + \expandafter\endinput \fi - - -\input{atfi\atfi@driver.def} - - +\input{atfi-\atfi@driver.def} \def\atfi@acroGraph@data{% \atfi@GSAVE 0.5 \atfi@SETGRAYFILL @@ -521,13 +554,11 @@ \atfi@STROKE \atfi@GRESTORE } -\DeclareRobustCommand{\atfi@acroTag}{% +\def\atfi@acroTag{% \raisebox{-1.6bp}{\parbox[b][17bp]{25bp}{% \rule{0pt}{0pt}\atfi@literal{\atfi@acroTag@data}}% }% } - - \def\attachfile@timezone#1{% \ifx\\#1\\% % no timezone information given @@ -536,58 +567,92 @@ \fi } \newcommand*{\attachfile@file}[2][]{% - \ifx\\#2\\% + \EdefUnescapeHex\atfi@filename{#2}% + \ifx\atfi@filename\ltx@empty \PackageError{attachfile2}{Empty file name}\@ehc \else - \edef\atfi@restore{\uccode0=\the\uccode0 \relax}% - \let\atfi@filename\@empty - \atfi@getfilename#2\relax\relax - \atfi@restore \@namedef{atfi@file@\atfi@filename}{#1}% \fi } -\begingroup - \catcode0=12 % - \gdef\atfi@getfilename#1#2{% - \ifx\relax#1% - \else - \uccode0=\numexpr 16*\atfi@hexnum{#1} + \atfi@hexnum{#2}\relax - \uppercase{% - \edef\atfi@filename{% - \atfi@filename^^@% - }% - }% - \expandafter\atfi@getfilename - \fi - }% -\endgroup -\def\atfi@hexnum#1{% - \ifnum`#1<58 % - \numexpr `#1-48\relax - \else - \numexpr `#1-87\relax - \fi -} - \InputIfFileExists{\jobname.atfi}{}{}% - \newif\ifatfi@checksum \define@key{AtFi@file}{CheckSum}{% \atfi@checksumtrue \edef\atfi@params{\atfi@params/CheckSum<#1>}% } \newif\ifatfi@creationdate +\define@key{AtFi@file}{CreationDateTZ}{% + \ifatfi@creationdate + \else + \atfi@creationdatetrue + \edef\atfi@params{% + \atfi@params + /CreationDate(#1)% + }% + \fi +} \define@key{AtFi@file}{CreationDate}{% - \atfi@creationdatetrue - \edef\atfi@params{\atfi@params/CreationDate(D:#1\atfi@timezone)}% + \ifatfi@creationdate + \else + \atfi@creationdatetrue + \edef\atfi@params{% + \atfi@params + /CreationDate(#1\atfi@timezone)% + }% + \fi } \newif\ifatfi@moddate +\define@key{AtFi@file}{ModDateTZ}{% + \ifatfi@moddate + \else + \atfi@moddatetrue + \edef\atfi@params{% + \atfi@params + /ModDate(#1)% + }% + \fi +} \define@key{AtFi@file}{ModDate}{% - \atfi@moddatetrue - \edef\atfi@params{\atfi@params/ModDate(D:#1\atfi@timezone)}% + \ifatfi@moddate + \else + \atfi@moddatetrue + \edef\atfi@params{% + \atfi@params + /ModDate(D:#1\atfi@timezone)% + }% + \fi } - - +\let\atfi@temp\ltx@one +\ltx@IfUndefined{pdf@filesize}{% + \let\atfi@temp\ltx@zero +}{} +\ltx@IfUndefined{pdf@filemoddate}{% + \let\atfi@temp\ltx@zero +}{} +\ltx@IfUndefined{pdf@filemdfivesum}{% + \let\atfi@temp\ltx@zero +}{} +\ifcase\atfi@temp + \let\atfi@pdftexdata\ltx@gobble +\or + \def\atfi@pdftexdata#1{% + \edef\atfi@temp{\pdf@filesize{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{Size=\atfi@temp}% + \edef\atfi@temp{\pdf@filemoddate{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{ModDateTZ=\atfi@temp}% + \fi + \edef\atfi@temp{\pdf@filemdfivesum{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{CheckSum=\atfi@temp}% + \fi + \fi + }% +\fi \if@filesw \else \atfi@nofilestrue @@ -597,7 +662,7 @@ File `\jobname.atfi' will not be written because of\MessageBreak \string\nofiles\space or option `nofiles'% }% - \let\atfi@writefile\@gobble + \let\atfi@writefile\ltx@gobble \else \newwrite\atfi@stream \immediate\openout\atfi@stream=\jobname.atfi\relax @@ -606,78 +671,66 @@ }% \def\atfi@writefile#1{% \begingroup - \def\file{#1}% - \@onelevel@sanitize\file - \edef\file{\@firstofone{\expandafter\atfi@replace\file} \@nil}% - \edef\file{\expandafter\atfi@tohex\file\relax}% + \EdefEscapeHex\atfi@temp{#1}% \immediate\write\atfi@stream{% \string\attachfile@file[% - \@ifundefined{atfi@file@#1}{}{\@nameuse{atfi@file@#1}}% - ]{\file}% + \ltx@ifundefined{atfi@file@#1}{}{\@nameuse{atfi@file@#1}}% + ]{\atfi@temp}% }% \endgroup }% \fi - +\atfi@DisableOption{nofiles} \def\atfi@attachfile#1#2{% - \@ifundefined{atfi@fileobj@#2}{% + \ltx@IfUndefined{atfi@fileobj@#2}{% \atfi@writefile{#2}% }{% % don't need duplicates }% - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \atfi@embedfile{#2}% \atfi@set@appearance@icon \atfi@flags@to@int \atfi@insert@file@annot{#2}% \endgroup } - - -\def\atfi@replace#1 #2\@nil{% - #1% - \ifx\\#2\\% - \else - \atfi@space - \@ReturnAfterFi{% - \atfi@replace#2\@nil - }% - \fi -}% - -\long\def\@ReturnAfterFi#1\fi{\fi#1} - - \newlength{\atfi@appearancewidth} \newlength{\atfi@appearanceheight} \newlength{\atfi@appearancedepth} \newsavebox{\atfi@appearancebox} - \def\atfi@set@appearance@icon{% - \@ifundefined{atfi@appobj@\atfi@icon@icon}{% - \savebox{\atfi@appearancebox}{\@nameuse{atfi@acro\atfi@icon@icon}}% - \expandafter\xdef\csname atfi@appwidth@\atfi@icon@icon\endcsname{% + \ltx@IfUndefined{atfi@appobj@\atfi@icon@icon}{% + \savebox{\atfi@appearancebox}{% + \@nameuse{atfi@acro\atfi@icon@icon}% + }% + \expandafter + \xdef\csname atfi@appwidth@\atfi@icon@icon\endcsname{% \the\wd\atfi@appearancebox }% - \expandafter\xdef\csname atfi@appheight@\atfi@icon@icon\endcsname{% + \expandafter + \xdef\csname atfi@appheight@\atfi@icon@icon\endcsname{% \the\ht\atfi@appearancebox }% - \expandafter\xdef\csname atfi@appdepth@\atfi@icon@icon\endcsname{% + \expandafter + \xdef\csname atfi@appdepth@\atfi@icon@icon\endcsname{% \the\dp\atfi@appearancebox }% \atfi@xform@icon - \global\expandafter\let\csname atfi@appobj@\atfi@icon@icon\endcsname + \global\expandafter\let + \csname atfi@appobj@\atfi@icon@icon\endcsname \atfi@appearanceobj }{% }% % optimization: \setlength dropped - \atfi@appearancewidth=\@nameuse{atfi@appwidth@\atfi@icon@icon}\relax - \atfi@appearanceheight=\@nameuse{atfi@appheight@\atfi@icon@icon}\relax - \atfi@appearancedepth=\@nameuse{atfi@appdepth@\atfi@icon@icon}\relax + \atfi@appearancewidth=% + \@nameuse{atfi@appwidth@\atfi@icon@icon}\relax + \atfi@appearanceheight=% + \@nameuse{atfi@appheight@\atfi@icon@icon}\relax + \atfi@appearancedepth=% + \@nameuse{atfi@appdepth@\atfi@icon@icon}\relax \expandafter\let\expandafter\atfi@appearanceobj \csname atfi@appobj@\atfi@icon@icon\endcsname } - \def\atfi@set@appearance#1{% \savebox{\atfi@appearancebox}{#1}% \atfi@appearancewidth=\wd\atfi@appearancebox @@ -685,7 +738,6 @@ \atfi@appearancedepth=\dp\atfi@appearancebox \atfi@xform } - \newcounter{atfi@flags} \DeclareRobustCommand{\atfi@flags@to@int}{% \setcounter{atfi@flags}{0}% @@ -697,13 +749,17 @@ \addtocounter{atfi@flags}{8}% \fi% } - \def\atfi@textattachfile#1#2{% \endgroup \atfi@textattachfile@i{#1}{#2}% } \def\atfi@textattachfile@i#1#2#3{% - \setkeys{AtFi}{#1}% + \ltx@IfUndefined{atfi@fileobj@#2}{% + \atfi@writefile{#2}% + }{% + % don't need duplicates + }% + \atfi@setup{#1}% \atfi@embedfile{#2}% \atfi@set@appearance{% \leavevmode @@ -716,7 +772,6 @@ \atfi@insert@file@annot{#2}% \endgroup } - \DeclareRobustCommand{\attachfile}[1][]{% \begingroup \let\do\@makeother @@ -736,10 +791,11 @@ } \DeclareRobustCommand{\noattachfile}[1][]{% \begingroup - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \atfi@set@appearance@icon \ifatfi@print - \expandafter\atfi@refxform\csname atfi@appobj@\atfi@icon@icon\endcsname + \expandafter + \atfi@refxform\csname atfi@appobj@\atfi@icon@icon\endcsname \else \makebox[\atfi@appearancewidth]{}% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty index d794769e345..8c43c51c5df 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty @@ -30,28 +30,37 @@ %% atveryend.sty, atveryend.pdf, atveryend.ins, atveryend.drv, %% atveryend-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname AtVeryEnd@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AtVeryEnd@AtEnd{% \AtVeryEnd@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{9}{10}% (tab) \TMP@EnsureCode{39}{12}% ' @@ -61,10 +70,11 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` -\g@addto@macro{\AtVeryEnd@AtEnd}{\endinput}% +\edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{atveryend}% [2010/03/24 v1.5 Hooks at very end of document (HO)] @@ -433,7 +443,7 @@ \ifx\makelabels\AtVeryEnd@temp \else \expandafter\AtVeryEnd@AtEnd -\fi +\fi% \let\AtVeryEnd@PatchLetter=N% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname endletter\endcsname\relax @@ -514,7 +524,7 @@ \@backslashchar endletter is not in expected form% }% \fi -\AtVeryEnd@AtEnd +\AtVeryEnd@AtEnd% \endinput %% %% End of file `atveryend.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty index 315d0157dcf..1b98ebdb4a7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007, 2009 by +%% Copyright (C) 2006, 2007, 2009, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,13 +31,31 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{auxhook}% - [2009/12/14 v1.2 Hooks for auxiliary files (HO)]% + [2011/03/04 v1.3 Hooks for auxiliary files (HO)]% \providecommand*{\@beginmainauxhook}{} \providecommand*{\@beginpartauxhook}{} -\newcommand{\AddLineBeginMainAux}[1]{% - \g@addto@macro\@beginmainauxhook{% - \immediate\write\@mainaux{#1}% +\ifx\AtBeginDocument\@firstofone + \global\let\@beginmainauxhook\relax +\else + \g@addto@macro{\@beginmainauxhook}{% + \global\let\@beginmainauxhook\relax }% +\fi +\newcommand{\AddLineBeginMainAux}[1]{% + \ifx\@beginmainauxhook\relax + \if@filesw + \PackageInfo{auxhook}{% + \@backslashchar AddLineBeginMainAux comes a little late,% + \MessageBreak + because the main .aux file is already opened% + }% + \immediate\write\@mainaux{#1}% + \fi + \else + \g@addto@macro\@beginmainauxhook{% + \immediate\write\@mainaux{#1}% + }% + \fi } \newcommand{\AddLineBeginPartAux}[1]{% \g@addto@macro\@beginpartauxhook{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index d6b4a13c749..8ccf737fe67 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2010/04/08 v1.12 bookmark driver for dvipdfm (HO)]% + [2011/03/20 v1.19 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} @@ -50,7 +50,7 @@ \@whilesw\ifBKM@sw\fi{% \def\BKM@abslevel{1}% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}\BKM@abslevel }% @@ -142,7 +142,9 @@ out \ifBKM@DvipdfmxOutlineOpen [% \ifBKM@open - \ifnum\BKM@level<\BKM@openlevel + \ifnum\BKM@level<% + \expandafter\ltx@firstofone\expandafter + {\number\BKM@openlevel} % \else -% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index d4a7f73c69a..0e13b50b022 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2010/04/08 v1.12 bookmark driver for dvips (HO)]% + [2011/03/20 v1.19 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 51cfc201bd4..5acba29a243 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2010/04/08 v1.12 bookmark driver for dvipsone (HO)]% + [2011/03/20 v1.19 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index 697a2482a82..66f1aada205 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,10 +34,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2010/04/08 v1.12 bookmark driver for pdfTeX (HO)]% + [2011/03/20 v1.19 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -150,7 +150,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index 6897861aa2b..f1e25c09f7d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2010/04/08 v1.12 bookmark driver for textures (HO)]% + [2011/03/20 v1.19 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index bfb2ec8123a..11e6f524222 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2010/04/08 v1.12 bookmark driver for VTeX (HO)]% + [2011/03/20 v1.19 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% @@ -55,7 +55,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \def\BKM@parent{0}% \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index d7f2e1f616b..d1a108def90 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2010/04/08 v1.12 PDF bookmarks (HO)]% + [2011/03/20 v1.19 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -78,8 +78,10 @@ \RequirePackage{ifpdf}[2009/04/10] \RequirePackage{ifxetex} \RequirePackage{ifvtex}[2008/11/04] -\RequirePackage{hyperref} +\RequirePackage{pdftexcmds}[2010/11/04] +\RequirePackage{hyperref}[2010/06/18] \RequirePackage{auxhook}[2007/04/06] +\RequirePackage{kvsetkeys}[2010/03/01] \RequirePackage{kvoptions}[2009/08/13] \RequirePackage{hycolor}[2008/09/08] \RequirePackage{bitset} @@ -91,6 +93,8 @@ color,% depth,% dest,% + draft,% + final,% gotor,% italic,% keeplevel,% @@ -106,15 +110,36 @@ uri,% view,% } -\newcommand*{\bookmarksetup}{\setkeys{BKM}} +\newcommand*{\bookmarksetup}{\kvsetkeys{BKM}} \def\BKM@setup#1{% \bookmarksetup{#1}% + \ifx\BKM@HookNext\ltx@empty + \else + \expandafter\bookmarksetup\expandafter{\BKM@HookNext}% + \BKM@HookNextClear + \fi \BKM@hook \ifBKM@keeplevel \else \xdef\BKM@currentlevel{\BKM@level}% \fi } +\newcommand*{\bookmarksetupnext}[1]{% + \ltx@GlobalAppendToMacro\BKM@HookNext{,#1}% +} +\def\BKM@HookNextClear{% + \global\let\BKM@HookNext\ltx@empty +} +\BKM@HookNextClear +\DeclareBoolOption{draft} +\DeclareComplementaryOption{final}{draft} +\pdf@ifdraftmode\BKM@drafttrue{} +\def\BKM@DisableOptions{% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{draft}% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{final}% +} \DeclareBoolOption[\ifHy@bookmarksopen true\else false\fi]{open} \def\bookmark@open{% \ifBKM@open\ltx@one\else\ltx@zero\fi @@ -131,7 +156,7 @@ \ifx\BKM@param\@empty \def\BKM@depth{\c@tocdepth}% \else - \@ifundefined{toclevel@\BKM@param}{% + \ltx@IfUndefined{toclevel@\BKM@param}{% \@onelevel@sanitize\BKM@param \edef\BKM@temp{\expandafter\@car\BKM@param\@nil}% \ifcase 0\expandafter\ifx\BKM@temp-1\fi @@ -142,29 +167,68 @@ \fi \relax \PackageWarning{bookmark}{% - Unknown document division name (\BKM@param)% + Unknown document division name (\BKM@param)\MessageBreak + for option `depth'% }% \else - \BKM@SetDepth\BKM@param + \BKM@SetDepth\BKM@depth\BKM@param \fi }{% - \BKM@SetDepth{\csname toclevel@\BKM@param\endcsname}% + \BKM@SetDepth\BKM@depth{% + \csname toclevel@\BKM@param\endcsname + }% }% \fi } \def\bookmark@depth{\BKM@depth} -\def\BKM@SetDepth#1{% +\def\BKM@SetDepthOrLevel#1#2{% \begingroup \setbox\z@=\hbox{% - \count@=#1\relax + \count@=#2\relax \expandafter }% \expandafter\endgroup - \expandafter\def\expandafter\BKM@depth\expandafter{\the\count@}% + \expandafter\def\expandafter#1\expandafter{\the\count@}% } \DeclareStringOption[\BKM@currentlevel]{level}[\BKM@currentlevel] +\define@key{BKM}{level}{% + \edef\BKM@param{#1}% + \ifx\BKM@param\BKM@MacroCurrentLevel + \let\BKM@level\BKM@param + \else + \ltx@IfUndefined{toclevel@\BKM@param}{% + \@onelevel@sanitize\BKM@param + \edef\BKM@temp{\expandafter\@car\BKM@param\@nil}% + \ifcase 0\expandafter\ifx\BKM@temp-1\fi + \expandafter\ifnum\expandafter`\BKM@temp>47 % + \expandafter\ifnum\expandafter`\BKM@temp<58 % + 1% + \fi + \fi + \relax + \PackageWarning{bookmark}{% + Unknown document division name (\BKM@param)\MessageBreak + for option `level'% + }% + \else + \BKM@SetDepthOrLevel\BKM@level\BKM@param + \fi + }{% + \BKM@SetDepthOrLevel\BKM@level{% + \csname toclevel@\BKM@param\endcsname + }% + }% + \fi +} +\def\BKM@MacroCurrentLevel{\BKM@currentlevel} \DeclareBoolOption{keeplevel} \DeclareBoolOption{startatroot} +\def\BKM@startatrootfalse{% + \global\let\ifBKM@startatroot\iffalse +} +\def\BKM@startatroottrue{% + \global\let\ifBKM@startatroot\iftrue +} \define@key{BKM}{rellevel}{% \BKM@CalcExpr\BKM@level{#1}+\BKM@currentlevel } @@ -405,7 +469,11 @@ \def\BKM@@CalcParam#1#2#3\@nil{% \ifx\calc#1% \@ifundefined{calc@assign@dimen}{% - \setlength{\dimen@}{\dimexpr#2\relax}% + \@ifundefined{dimexpr}{% + \setlength{\dimen@}{#2}% + }{% + \setlength{\dimen@}{\dimexpr#2\relax}% + }% }{% \setlength{\dimen@}{#2}% }% @@ -418,8 +486,9 @@ \fi } \DeclareBoolOption{atend} -\def\BKM@DisableOptions{% - \DisableKeyvalOption{BKM}{atend}% +\g@addto@macro\BKM@DisableOptions{% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{atend}% } \newcommand*{\bookmarkdefinestyle}[2]{% \@ifundefined{BKM@style@#1}{% @@ -496,7 +565,8 @@ \def\BKM@driver{#1}% }% \g@addto@macro\BKM@DisableOptions{% - \DisableKeyvalOption{BKM}{#1}% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{#1}% }% } \BKM@DefineDriverKey{pdftex} @@ -536,8 +606,31 @@ \fi \ProcessKeyvalOptions* \BKM@DisableOptions +\ifBKM@draft + \PackageWarningNoLine{bookmark}{Draft mode on}% + \let\bookmarksetup\ltx@gobble + \let\BookmarkAtEnd\ltx@gobble + \let\bookmarkdefinestyle\ltx@gobbletwo + \let\bookmarkget\ltx@gobble + \renewcommand*{\pdfbookmark}[3][]{}% + \let\currentpdfbookmark\ltx@gobbletwo + \let\subpdfbookmark\ltx@gobbletwo + \let\belowpdfbookmark\ltx@gobbletwo + \newcommand*{\bookmark}[2][]{}% + \renewcommand*{\Hy@writebookmark}[5]{}% + \let\ReadBookmarks\relax + \let\BKM@DefGotoNameAction\ltx@gobbletwo % package `hypdestopt' + \expandafter\endinput +\fi \newif\ifBKM@DvipdfmxOutlineOpen \ltx@IfUndefined{SpecialDvipdfmxOutlineOpen}{% + \ifxetex + \ifdim\number\XeTeXversion\XeTeXrevision in<0.9995in % + \else + \chardef\SpecialDvipdfmxOutlineOpen\ltx@one + \BKM@DvipdfmxOutlineOpentrue + \fi + \fi }{% \ifnum\SpecialDvipdfmxOutlineOpen>\z@ \BKM@DvipdfmxOutlineOpentrue @@ -627,10 +720,12 @@ \begingroup \ifBKM@numbered \let\numberline\Hy@numberline + \let\booknumberline\Hy@numberline \let\partnumberline\Hy@numberline \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\booknumberline\@gobble \let\partnumberline\@gobble \let\chapternumberline\@gobble \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index eaccfb6bbf3..e5c6d78b7c9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -30,9 +30,8 @@ %% %% This work consists of the main source file embedfile.dtx %% and the derived files -%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, -%% \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty, -%% embedfile-example-plain.tex, +%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, \immediate \write 18 {mkdir -p texmf/,}\edef {texmf/,} +%% dtx-attach.sty, embedfile-example-plain.tex, %% embedfile-example-collection.tex, embedfile-test1.tex, %% embedfile-test2.tex, embedfile-test3.tex, %% embedfile-test4.tex. diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty index 27721ad5b31..8d8e8dac917 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty @@ -30,14 +30,18 @@ %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, %% epstopdf-base.sty, epstopdf-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@epstopdf-base.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,29 +96,38 @@ \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2010/02/09 v2.5 Base part for package epstopdf] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/02/09 v2.5 Base part for package epstopdf]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -123,9 +138,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{96}{12}% ` +\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput} \RequirePackage{infwarerr}[2007/09/09] \RequirePackage{grfext}\relax \RequirePackage{kvoptions}[2007/10/02] @@ -136,9 +151,8 @@ No graphics package \string`graphic{s,x}\string' loaded% }% \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput -\fi + \expandafter\ETE@AtEnd +\fi% \begingroup \def\x{pdftex.def}% \ifx\Gin@driver\x @@ -148,9 +162,8 @@ }% \endgroup \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput - \fi + \expandafter\ETE@AtEnd + \fi% \endgroup \begingroup \expandafter\ifx\csname pdf@shellescape\endcsname\relax @@ -444,7 +457,7 @@ } \InputIfFileExists{epstopdf-sys.cfg}{}{} \InputIfFileExists{epstopdf.cfg}{}{} -\ETE@AtEnd +\ETE@AtEnd% \endinput %% %% End of file `epstopdf-base.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 40fdf757eef..dd6ab9a6412 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -30,14 +30,18 @@ %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, %% epstopdf-base.sty, epstopdf-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@epstopdf.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,33 +96,48 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput} \let\ETE@SavedAtEnd\ETE@AtEnd \RequirePackage{epstopdf-base}[2010/02/09] \let\ETE@AtEnd\ETE@SavedAtEnd @@ -124,7 +145,7 @@ \expandafter\epstopdfsetup\expandafter{\CurrentOption}% } \ProcessOptions*\relax -\ETE@AtEnd +\ETE@AtEnd% \endinput %% %% End of file `epstopdf.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty index 40f08e69b0e..4ad72de078c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -30,14 +30,18 @@ %% grfext.sty, grfext.pdf, grfext.ins, grfext.drv, grfext-test1.tex, %% grfext-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@grfext.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,39 +96,48 @@ \fi \expandafter\x\csname ver@grfext.sty\endcsname \ProvidesPackage{grfext}% - [2007/09/30 v1.0 Managing graphics extensions (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/08/19 v1.1 Managing graphics extensions (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname grfext@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\grfext@AtEnd{% \grfext@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] +\edef\grfext@AtEnd{\grfext@AtEnd\noexpand\endinput} \@ifundefined{@expandtwoargs}{% \def\@expandtwoargs#1#2#3{% \edef\reserved@a{\noexpand#1{#2}{#3}}% @@ -231,7 +246,26 @@ }% } \let\grfext@@Print\grfext@Print -\grfext@AtEnd +\RequirePackage{kvdefinekeys}[2010/03/01] +\kv@define@key{Gin}{AppendGraphicsExtensions}{% + \AppendGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{AppendGraphicsExtensions*}{% + \AppendGraphicsExtensions*{#1}% +} +\kv@define@key{Gin}{PrependGraphicsExtensions}{% + \PrependGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{PrependGraphicsExtensions*}{% + \PrependGraphicsExtensions*{#1}% +} +\kv@define@key{Gin}{RemoveGraphicsExtensions}{% + \RemoveGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{PrintGraphicsExtensions}[]{% + \PrintGraphicsExtensions +} +\grfext@AtEnd% \endinput %% %% End of file `grfext.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index 5bb1954a3e2..343ad25527e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2010/01/28 v1.11 Extended file name support for graphics (HO)]% + [2010/12/09 v1.13 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -53,12 +53,14 @@ \@makeother\* \catcode`\^=7 % \catcode`\~=\active -\RequirePackage{ifpdf} +\RequirePackage{ifpdf}[2010/01/28] +\RequirePackage{ifxetex}[2010/09/12] \RequirePackage{kvoptions}[2006/08/17] \SetupKeyvalOptions{% family=Gin,% prefix=grffile@% } +\DeclareDefaultOption{\@unknownoptionerror} \DeclareBoolOption[true]{multidot} \DeclareBoolOption[true]{babel} \DeclareBoolOption[false]{extendedchars} @@ -72,21 +74,25 @@ \PassOptionsToPackage\CurrentOption{graphics}% } \RequirePackage{pdftexcmds}[2007/11/11] -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdf@filesize\endcsname\relax - \grffile@spacefalse - \let\grffile@space@disabled\@empty - \def\grffile@spacetrue{% - \PackageWarning{grffile}{% - Option `space' is not available,\MessageBreak - because it needs pdfTeX >= 1.30% - }% - }% +\ifxetex + \grffile@spacetrue \else - \ifpdf - \grffile@spacetrue - \else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf@filesize\endcsname\relax \grffile@spacefalse + \let\grffile@space@disabled\@empty + \def\grffile@spacetrue{% + \PackageWarning{grffile}{% + Option `space' is not available,\MessageBreak + because it needs pdfTeX >= 1.30 or XeTeX% + }% + }% + \else + \ifpdf + \grffile@spacetrue + \else + \grffile@spacefalse + \fi \fi \fi \ProcessKeyvalOptions* @@ -135,7 +141,8 @@ \fi } \def\grffile@extchar@Ginclude@graphics#1{% - \def\grffile@filename{#1}% + \toks@{#1}% + \edef\grffile@filename{\the\toks@}% \ifx\grffile@inputencoding\@empty \else \ifx\grfile@filenameencoding\@empty @@ -161,8 +168,9 @@ \fi \fi \fi + \toks@\expandafter{\grffile@filename}% \edef\x{\endgroup - \noexpand\grffile@Ginclude@graphics{\grffile@filename}% + \noexpand\grffile@Ginclude@graphics{\the\toks@}% }% \x } @@ -194,24 +202,92 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@filesize\endcsname\relax - \begingroup - \let\on@line\@empty - \PackageInfo{grffile}{% - \string\grffile@IfFileExists\space without space support,% - \MessageBreak - because pdfTeX's \string\pdffilesize\space is not available% + \ifxetex + \long\def\grffile@XeTeX@IfFileExists#1{% + \openin\@inputcheck"#1" % + \ifeof\@inputcheck + \closein\@inputcheck + \expandafter\@secondoftwo + \else + \closein\@inputcheck + \expandafter\@firstoftwo + \fi }% - \endgroup - \def\grffile@IfFileExists#1{% - \IfFileExists{#1}{% - \let\grffile@IFE@next\@firstoftwo - }{% - \let\grffile@IFE@next\@secondoftwo + \long\def\grffile@IfFileExists#1{% + \grffile@XeTeX@IfFileExists{#1}{% + \edef\grffile@file@found{#1}% + \@firstoftwo + }{% + \let\reserved@a\@secondoftwo + \ifx\input@path\@undefined + \else + \expandafter\@tfor\expandafter\reserved@b\expandafter + :\expandafter=\input@path\do{% + \grffile@XeTeX@IfFileExists{\reserved@b#1}{% + \edef\grffile@file@found{\reserved@b#1}% + \let\reserved@a\@firstoftwo + \@break@tfor + }{}% + }% + \fi + \reserved@a + }% }% - \grffile@IFE@next - }% + \def\grffile@org@Gread@QTm#1{% + \IfFileExists{\Gin@base.bb}{% + \Gread@eps{\Gin@base.bb}% + }{% + \G@measure@QTm{\Gin@base}{\Gin@ext}% + }% + }% + \ifx\Gread@QTm\grffile@org@Gread@QTm + \def\Gread@QTm#1{% + \grffile@IfFileExists{\Gin@base.bb}{% + \Gread@eps{\Gin@base.bb}% + }{% + \G@measure@QTm{\Gin@base}{\Gin@ext}% + }% + }% + \PackageInfo{grffile}{\string\Gread@QTm\space patched}% + \else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname Gread@QTm\endcsname\relax + \PackageWarning{grffile}{% + \string\Gread@QTm\space of xetex.def not found% + }% + \else + \let\grffile@org@Gread@QTm\Gread@QTm + \def\Gread@QTm#1{% + \let\grffile@saved@IfFileExists\IfFileExists + \let\IfFileExists\grffile@IfFileExists + \grffile@org@GreadQTm{#1}% + \let\IfFileExists\grffile@saved@IfFileExists + }% + \fi + \fi + \else + \begingroup + \let\on@line\@empty + \PackageInfo{grffile}{% + \string\grffile@IfFileExists\space without space support,% + \MessageBreak + because pdfTeX's \string\pdffilesize\space is not available% + \MessageBreak + or XeTeX is not running% + }% + \endgroup + \long\def\grffile@IfFileExists#1{% + \IfFileExists{#1}{% + \let\grffile@IFE@next\@firstoftwo + }{% + \let\grffile@file@found\@filef@und + \let\grffile@IFE@next\@secondoftwo + }% + \grffile@IFE@next + }% + \fi \else - \def\grffile@IfFileExists#1{% + \long\def\grffile@IfFileExists#1{% \expandafter\expandafter\expandafter \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\% \let\reserved@a\@secondoftwo @@ -248,7 +324,6 @@ \grffile@org@Ginclude@graphics{#1}% \endgroup }% - \def\grffile@filename@simple#1.#2\\{% \ifx\\#2\\% \def\filename@base{#1}% @@ -258,7 +333,6 @@ \grffile@analyze@ext{#1}.{#2}\\% \fi } - \def\grffile@analyze@ext#1.#2\\{% \let\grffile@next\relax \ifx\\#2\\% @@ -283,7 +357,6 @@ \fi \grffile@next } - \def\grffile@try@extlist{% \@for\grffile@temp:=\Gin@extensions\do{% \grffile@IfFileExists{\filename@area\filename@base\grffile@temp}{% @@ -297,7 +370,6 @@ \expandafter\grffile@use@last@ext\filename@base.\\% \fi } - \def\grffile@use@last@ext#1.#2\\{% \ifx\\#2\\% \edef\filename@base{\expandafter\filename@dot\filename@base\\}% @@ -332,6 +404,53 @@ \grffile@option@status{multidot} \grffile@option@status{extendedchars} \grffile@option@status{space} +\def\grffile@Gin@ii@graphicx[#1]#2{% + \def\@tempa{[}% + \def\@tempb{#2}% + \ifx\@tempa\@tempb + \def\@tempa{\Gin@iii[#1][}% hash-ok + \expandafter\@tempa + \else + \begingroup + \@tempswafalse + \toks@{\Ginclude@graphics{#2}}% + \setkeys{Gin}{#1}% + \Gin@esetsize + \the\toks@ + \endgroup + \fi +} +\def\grffile@Gin@ii@fixed[#1]#2{% + \def\@tempa{[}% + \begingroup + \toks@={#2}% + \edef\@tempb{\the\toks@}% + \expandafter\endgroup + \ifx\@tempa\@tempb + \def\@tempa{\Gin@iii[#1][}% hash-ok + \expandafter\@tempa + \else + \begingroup + \@tempswafalse + \toks@{\Ginclude@graphics{#2}}% + \setkeys{Gin}{#1}% + \Gin@esetsize + \the\toks@ + \endgroup + \fi +} +\def\grffile@Fix@Gin@ii{% + \let\Gin@ii\grffile@Gin@ii@fixed + \begingroup + \escapechar=92 % + \PackageInfo{grffile}{\string\Gin@ii\space of package `graphicx' fixed}% + \endgroup +} +\ifx\Gin@ii\grffile@Gin@ii@graphicx + \grffile@Fix@Gin@ii +\else + \AtBeginDocument{\grffile@Fix@Gin@ii}% +\fi \grffile@RestoreCatcodes \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty index fe9d8817314..b4acd18a630 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1999-2010 by +%% Copyright (C) 1999-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2010/04/24 v0.19 Private additional ltxdoc support (HO)] + [2011/02/04 v0.21 Private additional ltxdoc support (HO)] \PassOptionsToPackage{pdfencoding=auto}{hyperref} \RequirePackage[numbered]{hypdoc}[2010/03/26] \RequirePackage{hyperref}[2010/03/30] @@ -88,7 +88,7 @@ \addcontentsline{toc}{subsection}{[#1]}% hash-ok \def\HistLabel##1{% \begingroup - \edef\@currentlabel{[#1]}% hash-ok + \protected@edef\@currentlabel{[#1]}% hash-ok \label{##1}% \endgroup }% @@ -102,7 +102,7 @@ }% \def\HistLabel##1{% \begingroup - \edef\@currentlabel{[#1]}% hash-ok + \protected@edef\@currentlabel{[#1]}% hash-ok \label{##1}% \endgroup }% @@ -115,6 +115,7 @@ \itemize }% \let\endVersion\enditemize + \raggedright }{} \newcommand{\URL}[2]{% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty new file mode 100644 index 00000000000..c69c85a7b81 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty @@ -0,0 +1,169 @@ +%% +%% This is file `hopatch.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hopatch.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file hopatch.dtx +%% and the derived files +%% hopatch.sty, hopatch.pdf, hopatch.ins, hopatch.drv, +%% hopatch-test1.tex, hopatch-test2.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOpatch@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOpatch@AtEnd{% + \HOpatch@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\HOpatch@AtEnd{\HOpatch@AtEnd\noexpand\endinput} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{hopatch}% + [2011/01/30 v1.0 Wrapper for package hooks (HO)] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/12/12]% +\else + \RequirePackage{ltxcmds}[2010/12/12]% +\fi +\def\HOpatch@counter{0}% +\ltx@ifundefined{numexpr}{% + \def\HOpatch@StepCounter{% + \begingroup + \count@\HOpatch@counter\relax + \advance\count@\ltx@one\relax + \edef\x{\endgroup + \noexpand\def\noexpand\HOpatch@counter{\the\count@}% + }% + }% +}{% + \def\HOpatch@StepCounter{% + \edef\HOpatch@counter{% + \the\numexpr\HOpatch@counter+\ltx@one\relax + }% + }% +} +\def\HOpatch@list{} +\def\HOpatch@Add{% + \ltx@LocalAppendToMacro\HOpatch@list +} +\def\hopatch@AfterPackage#1{% + \ltx@ifpackageloaded{#1}{% + \ltx@firstofone + }{% + \HOpatch@AfterPackage{#1}% + }% +} +\def\HOpatch@AfterPackage#1{% + \edef\HOpatch@temp{#1}% + \HOpatch@StepCounter + \expandafter\HOpatch@@AfterPackage + \csname HOpatch@\HOpatch@counter\expandafter\endcsname{% + \HOpatch@temp + }% +} +\def\HOpatch@@AfterPackage#1#2#3{% + \begingroup + \toks@{#3}% + \xdef\HOpatch@gtemp{% + \noexpand\ltx@ifpackageloaded{#2}{% + \noexpand\let\noexpand#1\noexpand\relax + \the\toks@ + }{}% + }% + \endgroup + \let#1\HOpatch@gtemp + \HOpatch@Add#1% + \HOpatch@Try{AfterPackage}{#2}#1% + \HOpatch@Try{AtEndPackage}{#2}#1% + \HOpatch@Try{AtEndOfPackageFile}{#2}#1% +} +\def\HOpatch@Try#1#2#3{% + \ltx@ifundefined{#1}{}{% + \csname #1\endcsname{#2}{#3}% + }% +} +\AtBeginDocument{\HOpatch@list} +\ltx@ifundefined{AtEndPreamble}{}{% + \AtEndPreamble{\HOpatch@list}% +} +\ltx@ifundefined{AfterEndPreamble}{}{% + \AfterEndPreamble{% + \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded + \let\HOpatch@OrgIfPackageLater\@ifpackagelater + \let\HOpatch@OrgIfClassLoaded\@ifclassloaded + \let\HOpatch@OrgIfClassLater\@ifclasslater + \let\@ifpackageloaded\ltx@ifpackageloaded + \let\@ifpackagelater\ltx@ifpackagelater + \let\@ifclassloaded\ltx@ifclassloaded + \let\@ifclasslater\ltx@ifclasslater + \HOpatch@list + \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded + \let\@ifpackagelater\HOpatch@OrgIfPackageLater + \let\@ifclassloaded\HOpatch@OrgIfClassLoaded + \let\@ifclasslater\HOpatch@OrgIfClassLater + }% +} +\HOpatch@AtEnd% +\endinput +%% +%% End of file `hopatch.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty index 21429ff6084..4bbab81e8be 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,8 +35,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2009/12/12 v1.6 Color options of hyperref/bookmark (HO)]% -\RequirePackage{xcolor-patch}[2009/12/12] + [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]% +\RequirePackage{xcolor-patch}[2011/01/30] \begingroup \catcode`\!=13 % \catcode`\:=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty index 2c8f27cc56e..194d0f67bc5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1999-2001, 2006-2008 by +%% Copyright (C) 1999-2001, 2006-2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,11 +31,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypcap}% - [2008/09/08 v1.10 Adjusting anchors of captions (HO)] + [2011/02/16 v1.11 Adjusting anchors of captions (HO)] \@ifundefined{hyper@@anchor}{% \PackageError{hypcap}{You have to load 'hyperref' first}\@ehc \endinput }{} +\RequirePackage{letltxmacro}[2008/06/24] \newcommand*\hc@org@caption{} \let\hc@org@caption\caption \newif\if@capstart @@ -97,8 +98,8 @@ } \def\hc@redef#1#2#3{% \newcommand#1{}% - \expandafter\let\expandafter#1\csname#3\endcsname - \expandafter\let\expandafter#2\csname end#3\endcsname + \expandafter\LetLtxMacro\expandafter#1\csname#3\endcsname + \expandafter\LetLtxMacro\expandafter#2\csname end#3\endcsname \renewenvironment*{#3}[1][]{% \ifx\\##1\\% #1\relax diff --git a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty index 8bb492be242..5e7e9bfc583 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -43,9 +43,34 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{inputenx}% - [2010/01/11 v1.6 Enhanced input encoding handling (HO)]% + [2011/04/10 v1.8 Enhanced input encoding handling (HO)]% \providecommand*{\CurrentInputEncodingName}{} \providecommand*{\CurrentInputEncodingOption}{} +\def\IEX@SetFileCatcodes{% + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\^=7 % + \catcode`\@=11 % + \catcode`\~=\active + \catcode`\%=14 % + \catcode`\`=12 % +} +\def\IEX@SaveFileCatcodes{% + \edef\IEX@RestoreFileCatcodes{% + \catcode`\noexpand\\=\the\catcode`\\\relax + \catcode`\noexpand\{=\the\catcode`\{\relax + \catcode`\noexpand\}=\the\catcode`\}\relax + \catcode`\noexpand\#=\the\catcode`\#\relax + \catcode`\noexpand\^=\the\catcode`\^\relax + \catcode`\noexpand\@=\the\catcode`\@\relax + \catcode`\noexpand\~=\the\catcode`\~\relax + \catcode`\noexpand\%=\the\catcode`\%\relax + \catcode`\noexpand\`=\the\catcode`\`\relax + \catcode`\noexpand\<=\the\catcode`\<\relax + }% +} \def\IEX@LookupEncoding#1{% \edef\CurrentInputEncodingName{#1}% \@onelevel@sanitize\CurrentInputEncodingName @@ -86,6 +111,7 @@ } \def\IEX@DoLookup{% \begingroup + \IEX@SetFileCatcodes \advance\endlinechar\@M \IfFileExists{ix-alias.cfg}{% \input{ix-alias.cfg}% @@ -160,7 +186,10 @@ \IEX@LookupEncoding\InputEncodingNew \ifx\CurrentInputEncodingOption\@empty \else + \IEX@SaveFileCatcodes + \IEX@SetFileCatcodes \inputencoding{\CurrentInputEncodingOption}% + \IEX@RestoreFileCatcodes \fi \IEX@AfterHook } diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def index a268146d4ba..8b652127c0c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -41,7 +41,7 @@ %% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, %% inputenx-utf8enc.txt. %% -\ProvidesFile{ix-alias.def}[2010/01/11 v1.6 Alias list (inputenx)] +\ProvidesFile{ix-alias.def}[2011/04/10 v1.8 Alias list (inputenx)] \InputenxAlias{ascii}{x-ascii} \InputenxAlias{atarist}{x-atarist} \InputenxAlias{iso-8859-1}{x-iso-8859-1} @@ -99,6 +99,7 @@ \InputenxAlias{macukr}{x-mac-cyrillic} \InputenxAlias{next}{x-nextstep} \InputenxAlias{us-ascii}{x-ascii} +\InputenxAlias{verbatim}{x-verbatim} \endinput %% %% End of file `ix-alias.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def index 20a5dd69fbf..cfcf28a8834 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-math.def}% - [2010/01/11 v1.6 Math list (inputenx)]% + [2011/04/10 v1.8 Math list (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareMathMeaning{\ss}{\beta} diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def index 09c22b29b08..006910a1fea 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-name.def}% - [2010/01/11 v1.6 Name list (inputenx)]% + [2011/04/10 v1.8 Name list (inputenx)]% \InputenxName{AE}{00C6}% LATIN CAPITAL LETTER AE \InputenxName{Aacute}{00C1}% LATIN CAPITAL LETTER A WITH ACUTE \InputenxName{Abreve}{0102}% LATIN CAPITAL LETTER A WITH BREVE diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def index 3bd21bb9357..7c7da332805 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-slot.def}% - [2010/01/11 v1.6 SLOT and UC to Encodings (inputenx)]% + [2011/04/10 v1.8 SLOT and UC to Encodings (inputenx)]% \InputenxSlot{128}{00A0}{\do{nextstep}} \InputenxSlot{128}{00C4}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{128}{00C7}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def index 99c974ca99a..4dc31a11ad8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-uc.def}% - [2010/01/11 v1.6 UC to LICR (inputenx)]% + [2011/04/10 v1.8 UC to LICR (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \InputenxUC{00A0}{\nobreakspace}{} @@ -250,7 +250,7 @@ \InputenxUC{0120}{\.G}{} \InputenxUC{0121}{\.g}{} \InputenxUC{0122}{\c G}{} -\InputenxUC{0123}{\v g}{} +\InputenxUC{0123}{\c g}{} \InputenxUC{0124}{\^H}{} \InputenxUC{0125}{\^h}{} \InputenxUC{0126}{\textmalteseH}{% @@ -360,6 +360,27 @@ \textit{f}% }% } +\InputenxUC{01CD}{\v A}{} +\InputenxUC{01CE}{\v a}{} +\InputenxUC{01CF}{\v I}{} +\InputenxUC{01D0}{\v\i}{} +\InputenxUC{01D1}{\v O}{} +\InputenxUC{01D2}{\v o}{} +\InputenxUC{01D3}{\v U}{} +\InputenxUC{01D4}{\v u}{} +\InputenxUC{01E2}{\@tabacckludge=\AE}{} +\InputenxUC{01E3}{\@tabacckludge=\ae}{} +\InputenxUC{01E6}{\v G}{} +\InputenxUC{01E7}{\v g}{} +\InputenxUC{01E8}{\v K}{} +\InputenxUC{01E9}{\v k}{} +\InputenxUC{01F0}{\v\j}{} +\InputenxUC{01F4}{\@tabacckludge'G}{} +\InputenxUC{01F5}{\@tabacckludge'g}{} +\InputenxUC{01F8}{\@tabacckludge`N}{} +\InputenxUC{01F9}{\@tabacckludge`n}{} +\InputenxUC{01FC}{\@tabacckludge'\AE}{} +\InputenxUC{01FD}{\@tabacckludge'\ae}{} \InputenxUC{0218}{\textcommabelow S}{% \ProvideTextCommandDefault{\textcommabelow}[1]{% \hmode@bgroup @@ -424,6 +445,14 @@ \egroup }% } +\InputenxUC{0226}{\.A}{} +\InputenxUC{0227}{\.a}{} +\InputenxUC{0228}{\c E}{} +\InputenxUC{0229}{\c e}{} +\InputenxUC{022E}{\.O}{} +\InputenxUC{022F}{\.o}{} +\InputenxUC{0232}{\@tabacckludge=y}{} +\InputenxUC{0237}{\j}{} \InputenxUC{02C6}{\textasciicircum}{} \InputenxUC{02C7}{\textasciicaron}{% \ProvideTextCommandDefault{\textasciicaron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu index ac76104ad4c..7ca8d43441b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-utf8enc.dfu}% - [2010/01/11 v1.6 Additions of inputenx for utf8enc.dfu]% + [2011/04/10 v1.8 Additions of inputenx for utf8enc.dfu]% \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00AD}{\-} \DeclareUnicodeCharacter{0100}{\@tabacckludge=A} @@ -60,7 +60,7 @@ \DeclareUnicodeCharacter{0120}{\.G} \DeclareUnicodeCharacter{0121}{\.g} \DeclareUnicodeCharacter{0122}{\c G} -\DeclareUnicodeCharacter{0123}{\v g} +\DeclareUnicodeCharacter{0123}{\c g} \DeclareUnicodeCharacter{0124}{\^H} \DeclareUnicodeCharacter{0125}{\^h} \DeclareUnicodeCharacter{0126}{\textmalteseH} @@ -100,6 +100,37 @@ \DeclareUnicodeCharacter{0175}{\^w} \DeclareUnicodeCharacter{0176}{\^Y} \DeclareUnicodeCharacter{0177}{\^y} +\DeclareUnicodeCharacter{01CD}{\v A} +\DeclareUnicodeCharacter{01CE}{\v a} +\DeclareUnicodeCharacter{01CF}{\v I} +\DeclareUnicodeCharacter{01D0}{\v\i} +\DeclareUnicodeCharacter{01D1}{\v O} +\DeclareUnicodeCharacter{01D2}{\v o} +\DeclareUnicodeCharacter{01D3}{\v U} +\DeclareUnicodeCharacter{01D4}{\v u} +\DeclareUnicodeCharacter{01E2}{\@tabacckludge=\AE} +\DeclareUnicodeCharacter{01E3}{\@tabacckludge=\ae} +\DeclareUnicodeCharacter{01E6}{\v G} +\DeclareUnicodeCharacter{01E7}{\v g} +\DeclareUnicodeCharacter{01E8}{\v K} +\DeclareUnicodeCharacter{01E9}{\v k} +\DeclareUnicodeCharacter{01F0}{\v\j} +\DeclareUnicodeCharacter{01F4}{\@tabacckludge'G} +\DeclareUnicodeCharacter{01F5}{\@tabacckludge'g} +\DeclareUnicodeCharacter{01F8}{\@tabacckludge`N} +\DeclareUnicodeCharacter{01F9}{\@tabacckludge`n} +\DeclareUnicodeCharacter{01FC}{\@tabacckludge'\AE} +\DeclareUnicodeCharacter{01FD}{\@tabacckludge'\ae} +\DeclareUnicodeCharacter{0226}{\.A} +\DeclareUnicodeCharacter{0227}{\.a} +\DeclareUnicodeCharacter{0228}{\c E} +\DeclareUnicodeCharacter{0229}{\c e} +\DeclareUnicodeCharacter{022E}{\.O} +\DeclareUnicodeCharacter{022F}{\.o} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=Y} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=y} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=y} +\DeclareUnicodeCharacter{0237}{\j} \DeclareUnicodeCharacter{1E02}{\.B} \DeclareUnicodeCharacter{1E03}{\.b} \DeclareUnicodeCharacter{1E0A}{\.D} diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index 944bfd58692..ea8df787840 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -30,34 +30,44 @@ %% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv, %% kvoptions-patch.sty, example-mycolorsetup.sty, %% kvoptions-test1.tex, kvoptions-test2.tex, -%% kvoptions-test3.tex. +%% kvoptions-test3.tex, kvoptions-test4.tex, +%% kvoptions-test4.sty. %% %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. \NeedsTeXFormat{LaTeX2e} -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -69,25 +79,21 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | -\edef\KVO@AtEnd{% - \KVO@AtEnd - \noexpand\endinput -} +\edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \ProvidesPackage{kvoptions-patch}% - [2010/02/22 v3.7 LaTeX patch for keyval options (HO)]% + [2010/12/23 v3.10 LaTeX patch for keyval options (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax \PackageWarningNoLine{kvoptions-patch}{% Package loading is aborted, because e-TeX is missing% }% \expandafter\KVO@AtEnd -\fi +\fi% \RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \else @@ -97,7 +103,7 @@ before \string\documentclass% }\@ehd \expandafter\KVO@AtEnd -\fi +\fi% \@ifpackageloaded{xkvltxp}{% \PackageWarningNoLine{kvoptions}{% Option `patch' cannot be used together with\MessageBreak @@ -105,7 +111,7 @@ Therefore package loading is aborted% }% \KVO@AtEnd -}{} +}{}% \def\@if@ptions#1#2#3{% \begingroup \KVO@normalize\KVO@temp{#3}% @@ -498,7 +504,7 @@ \let\@fileswith@pti@ns\KVO@fileswith@pti@ns \fi \let\KVO@Patch=Y -\KVO@AtEnd +\KVO@AtEnd% \endinput %% %% End of file `kvoptions-patch.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 5ba1a34682a..bf0eecf4b0a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -30,19 +30,24 @@ %% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv, %% kvoptions-patch.sty, example-mycolorsetup.sty, %% kvoptions-test1.tex, kvoptions-test2.tex, -%% kvoptions-test3.tex. +%% kvoptions-test3.tex, kvoptions-test4.tex, +%% kvoptions-test4.sty. %% %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@kvoptions.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -50,7 +55,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -62,21 +66,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -95,29 +102,38 @@ \fi \expandafter\x\csname ver@kvoptions.sty\endcsname \ProvidesPackage{kvoptions}% - [2010/02/22 v3.7 Keyval support for LaTeX options (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{1}{14}% ^^A (comment) \TMP@EnsureCode{2}{14}% ^^A (comment) @@ -131,22 +147,17 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` +\edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \@ifundefined{define@key}{% \RequirePackage{keyval}\relax }{} +\RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{kvsetkeys}[2007/09/29] -\@ifundefined{@onelevel@sanitize}{% - \def\@onelevel@sanitize#1{% - \edef#1{\expandafter\strip@prefix\meaning#1}% - }% -}{} -\@ifundefined{strip@prefix}{% - \def\strip@prefix#1>{}% -}{} \@ifundefined{@x@protect}{% \def\@x@protect#1\fi#2#3{% \fi\protect#1% @@ -162,7 +173,7 @@ \DeclareOption{debugshow}{\catcode\@ne=9 } \DeclareOption{patch}{% \AtEndOfPackage{% - \RequirePackage{kvoptions-patch}[2010/02/22]% + \RequirePackage{kvoptions-patch}[2010/12/23]% }% } \ProcessOptions\relax @@ -182,14 +193,25 @@ \@currname.\@currext\endcsname{#1}% } \def\KVO@prefix{% - \@ifundefined{KVO@prefix@\@currname.\@currext}{% + \ltx@ifundefined{KVO@prefix@\@currname.\@currext}{% \@currname @% }{% \csname KVO@prefix@\@currname.\@currext\endcsname }% } +\define@key{KVO}{setkeys}{% + \expandafter\def\csname KVO@setkeys@% + \@currname.\@currext\endcsname{#1}% +} +\def\KVO@setkeys{% + \ltx@IfUndefined{KVO@setkeys@\@currname.\@currext}{% + \setkeys + }{% + \csname KVO@setkeys@\@currname.\@currext\endcsname + }% +} \newcommand*{\SetupKeyvalOptions}{% - \setkeys{KVO}% + \kvsetkeys{KVO}% } \newcommand*{\DeclareBoolOption}[2][false]{% \KVO@ifdefinable{if\KVO@prefix#2}{% @@ -268,7 +290,7 @@ } \def\KVO@boolkey#1#2#3#4#5{% \edef\KVO@param{#5}% - \@onelevel@sanitize\KVO@param + \ltx@onelevel@sanitize\KVO@param \ifx\KVO@param\KVO@true \expandafter\@firstofone \else @@ -299,8 +321,8 @@ } \def\KVO@true{true} \def\KVO@false{false} -\@onelevel@sanitize\KVO@true -\@onelevel@sanitize\KVO@false +\ltx@onelevel@sanitize\KVO@true +\ltx@onelevel@sanitize\KVO@false \newcommand*{\DeclareStringOption}[2][]{% \@ifnextchar[{% \KVO@DeclareStringOption{#1}{#2}@% @@ -337,7 +359,7 @@ \x }% } -\newcommand*{\DeclareVoidOption}[1]{% +\newcommand*{\DeclareVoidOption}[2]{% \begingroup \let\next\@gobbletwo \KVO@ifdefinable{\KVO@prefix#1}{% @@ -360,7 +382,12 @@ }% }% \x - \@namedef{\KVO@prefix#1}% + \begingroup + \toks@{#2}% + \expandafter\endgroup + \expandafter\def + \csname\KVO@prefix#1\expandafter\endcsname + \expandafter{\the\toks@}% }% } \def\KVO@VOID@{@VOID@} @@ -416,7 +443,7 @@ } \newcommand*{\DisableKeyvalOption}[3][]{% \begingroup - \setkeys{KVOdyn}{#1}% + \kvsetkeys{KVOdyn}{#1}% \def\x{\endgroup}% \@ifundefined{KVO@action@\KVOdyn@action}{% \PackageError{kvoptions}{% @@ -590,7 +617,7 @@ }% ,% }% - \@onelevel@sanitize\KVO@CurrentOption + \ltx@onelevel@sanitize\KVO@CurrentOption \else \edef\KVO@temp{% \KVO@temp @@ -623,7 +650,7 @@ }{% \@ifundefined{KVO@default@\@currname.\@currext}{% \ifx\KVO@Patch Y% - \@onelevel@sanitize\CurrentOption + \ltx@onelevel@sanitize\CurrentOption \fi \ifx\@unusedoptionlist\@empty \global\let\@unusedoptionlist\CurrentOption @@ -672,7 +699,7 @@ }% \edef\KVO@temp{\endgroup \noexpand\KVO@calldefault{\the\toks\tw@}% - \noexpand\setkeys{#1}{\the\toks@}% + \noexpand\KVO@setkeys{#1}{\the\toks@}% }% \KVO@temp \let\CurrentOption\@empty @@ -729,7 +756,7 @@ }% \edef\KVO@temp{\endgroup \noexpand\KVO@calldefault{\the\toks\tw@}% - \noexpand\setkeys{#1}{\the\toks@}% + \noexpand\KVO@setkeys{#1}{\the\toks@}% }% \KVO@temp \let\CurrentOption\@empty @@ -770,7 +797,7 @@ \@ifstar{}\@gobble }% \fi -\KVO@AtEnd +\KVO@AtEnd% \endinput %% %% End of file `kvoptions.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty index 744be21d84e..3a5ddaddbce 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2008 by +%% Copyright (C) 2008, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,28 +31,37 @@ %% letltxmacro-showcases.tex, letltxmacro-test1.tex, %% letltxmacro-test2.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname llm@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\llm@AtEnd{% \llm@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -61,39 +70,51 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \edef\llm@AtEnd{% \llm@AtEnd \escapechar\the\escapechar\relax + \noexpand\endinput } \escapechar=92 % `\\ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{letltxmacro}% - [2008/06/24 v1.3 Let assignment for LaTeX macros (HO)] -\newcommand*{\LetLtxMacro}[2]{% + [2010/09/02 v1.4 Let assignment for LaTeX macros (HO)] +\newcommand*{\LetLtxMacro}{% + \llm@ModeLetLtxMacro{}% +} +\newcommand*{\GlobalLetLtxMacro}{% + \llm@ModeLetLtxMacro\global +} +\newcommand*{\llm@ModeLetLtxMacro}[3]{% + \edef\llm@escapechar{\the\escapechar}% + \escapechar=-1 % \edef\reserved@a{% \noexpand\protect \expandafter\noexpand - \csname\expandafter\@gobble\string#2 \endcsname + \csname\string#3 \endcsname }% - \ifx\reserved@a#2\relax - \edef#1{% + \ifx\reserved@a#3\relax + #1\edef#2{% \noexpand\protect \expandafter\noexpand - \csname\expandafter\@gobble\string#1 \endcsname + \csname\string#2 \endcsname }% - \expandafter\let - \csname\expandafter\@gobble\string#1 \expandafter\endcsname - \csname\expandafter\@gobble\string#2 \endcsname + #1\expandafter\let + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname \expandafter\llm@LetLtxMacro - \csname\expandafter\@gobble\string#1 \expandafter\endcsname - \csname\expandafter\@gobble\string#2 \endcsname + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname{#1}% \else - \llm@LetLtxMacro{#1}{#2}% + \llm@LetLtxMacro{#2}{#3}{#1}% \fi + \escapechar=\llm@escapechar\relax } -\def\llm@LetLtxMacro#1#2{% +\def\llm@LetLtxMacro#1#2#3{% + \escapechar=92 % \expandafter\llm@CheckParams\meaning#2:->\@nil{% \begingroup \def\@protected@testopt{% @@ -122,7 +143,8 @@ \else \edef\x{% \noexpand\@testopt - \expandafter\noexpand\csname\string#2\endcsname + \expandafter\noexpand + \csname\string#2\endcsname }% \expandafter\expandafter\expandafter\def \expandafter\expandafter\expandafter\y @@ -140,19 +162,21 @@ \else \llm@protected\xdef\llm@GlobalTemp{% \llm@testopt - \expandafter\noexpand\csname\string#1\endcsname + \expandafter\noexpand + \csname\string#1\endcsname {\the\toks@}% }% \fi \expandafter\endgroup\ifx\llm@testopt\@empty - \let#1=#2\relax + #3\let#1=#2\relax \else - \let#1=\llm@GlobalTemp - \expandafter\let\csname\string#1\expandafter\endcsname - \csname\string#2\endcsname + #3\let#1=\llm@GlobalTemp + #3\expandafter\let + \csname\string#1\expandafter\endcsname + \csname\string#2\endcsname \fi }{% - \let#1=#2\relax + #3\let#1=#2\relax }% } \def\llm@CheckParams#1:->#2\@nil{% @@ -179,7 +203,7 @@ \@onelevel@sanitize\llm@protectedmacro \def\llm@CarThree#1#2#3#4\llm@nil{#1#2#3}% \def\llm@CarTwo#1#2#3\llm@nil{#1#2}% -\llm@AtEnd +\llm@AtEnd% \endinput %% %% End of file `letltxmacro.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty index 894346ee89d..f7f733264a7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty @@ -32,28 +32,37 @@ %% listingsutf8-test3.tex, listingsutf8-test4.tex, %% listingsutf8-test5.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname lstU@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\lstU@AtEnd{% \lstU@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -70,14 +79,15 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{95}{8}% _ (subscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | \TMP@EnsureCode{126}{13}% ~ (active) -\g@addto@macro\lstU@AtEnd{\endinput} +\edef\lstU@AtEnd{\lstU@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] @@ -103,10 +113,10 @@ \expandafter\lstU@AtEnd \fi } -\lstU@temp{scantokens}{It is provided by e-TeX} -\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30} +\lstU@temp{scantokens}{It is provided by e-TeX}% +\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30}% +\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30}% +\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30}% \RequirePackage{stringenc}[2007/10/22] \newif\iflstU@utfviii \def\lstU@inputenc#1{% @@ -150,7 +160,7 @@ }% } \expandafter\lstU@temp\lst@InputListing{#1}\@nil -\lstU@AtEnd +\lstU@AtEnd% \endinput %% %% End of file `listingsutf8.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index 7492c2ee620..ef1b85c3829 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2009, 2010 by +%% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,30 +29,40 @@ %% and the derived files %% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv, %% luacolor-test1.tex, luacolor-test2.tex, luacolor-test3.tex, -%% oberdiek.luacolor.lua, luacolor.lua. +%% oberdiek.luacolor.lua, luacolor.lua, +%% oberdiek.luacolor-pre065.lua, luacolor-pre065.lua. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname LuaCol@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\LuaCol@AtEnd{% \LuaCol@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{34}{12}% " \TMP@EnsureCode{39}{12}% ' @@ -66,28 +76,31 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{95}{12}% _ (other!) \TMP@EnsureCode{96}{12}% ` -\edef\LuaCol@AtEnd{% - \LuaCol@AtEnd - \noexpand\endinput -} +\edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2010/03/09 v1.2 Coloring based on LuaTeX's node attributes (HO)] + [2011/03/29 v1.4 Coloring based on LuaTeX's node attributes (HO)] \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{ifluatex}[2009/04/10]% +\RequirePackage{ifpdf}[2010/01/28]% +\RequirePackage{ltxcmds}[2010/04/26]% \RequirePackage{color} \ifluatex - \RequirePackage{luatex}[2010/03/09]% + \ltx@ifpackageloaded{luatexbase-attr}{% + }{% + \RequirePackage{luatex}[2010/03/09]% + }% \else \@PackageError{luacolor}{% This package may only be run using LuaTeX% }\@ehc \expandafter\LuaCol@AtEnd -\fi +\fi% \ifnum\luatexversion<36 % \def\LuaCol@directlua{\directlua0 }% \else @@ -98,10 +111,14 @@ \@PackageWarningNoLine{luacolor}{% Colors are disabled by option `monochrome'% }% + \def\set@color{}% + \def\reset@color{}% + \def\set@page@color{}% + \def\define@color#1#2{}% \expandafter\LuaCol@AtEnd -\fi +\fi% \LuaCol@directlua{% - require("oberdiek.luacolor")% + require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% } \RequirePackage{ifpdf}[2007/09/09] \ifpdf @@ -130,15 +147,24 @@ \@PackageInfoNoLine{luacolor}{% Type of color \string\special: \reserved@a }% - \fi + \fi% \endgroup \fi -\newattribute\LuaCol@Attribute +\ltx@IfUndefined{newluatexattribute}{% + \newattribute\LuaCol@Attribute +}{% + \newluatexattribute\LuaCol@Attribute +} +\ltx@IfUndefined{setluatexattribute}{% + \let\LuaCol@setattribute\setattribute +}{% + \let\LuaCol@setattribute\setluatexattribute +} \LuaCol@directlua{% oberdiek.luacolor.setattribute(\number\allocationnumber)% } \protected\def\set@color{% - \setattribute\LuaCol@Attribute{% + \LuaCol@setattribute\LuaCol@Attribute{% \LuaCol@directlua{% oberdiek.luacolor.get("\luatexluaescapestring{\current@color}")% }% @@ -155,7 +181,44 @@ \luacolorProcessBox\AtBeginShipoutBox } \set@color -\LuaCol@AtEnd +\ifpdf + \ltx@IfUndefined{pdfxform}{% + \ifnum\luatexversion>36 % + \directlua{% + tex.enableprimitives('',{% + 'pdfxform','pdflastxform','pdfrefxform'% + })% + }% + \fi + }{}% + \ltx@IfUndefined{protected}{% + \ifnum\luatexversion>36 % + \directlua{tex.enableprimitives('',{'protected'})}% + \fi + }{}% + \ltx@IfUndefined{pdfxform}{% + \@PackageWarning{luacolor}{\string\pdfxform\space not found}% + }{% + \let\LuaCol@org@pdfxform\pdfxform + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname protected\endcsname\relax + \@PackageWarning{luacolor}{\string\protected\space not found}% + \else + \expandafter\protected + \fi + \def\pdfxform{% + \begingroup + \afterassignment\LuaCol@pdfxform + \count@=% + }% + \def\LuaCol@pdfxform{% + \luacolorProcessBox\count@ + \LuaCol@org@pdfxform\count@ + \endgroup + }% + }% +\fi +\LuaCol@AtEnd% \endinput %% %% End of file `luacolor.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/pagegrid.sty b/Master/texmf-dist/tex/latex/oberdiek/pagegrid.sty new file mode 100644 index 00000000000..60f2670d004 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/pagegrid.sty @@ -0,0 +1,413 @@ +%% +%% This is file `pagegrid.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pagegrid.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2009 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file pagegrid.dtx +%% and the derived files +%% pagegrid.sty, pagegrid.pdf, pagegrid.ins, pagegrid.drv, +%% pagegrid-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@pagegrid.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pagegrid}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pagegrid.sty\endcsname +\ProvidesPackage{pagegrid}% + [2009/12/04 v1.4 Print page grid in background (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname pagegrid@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\pagegrid@AtEnd{% + \pagegrid@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{9}{10}% (tab) +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{59}{12}% ; +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{63}{12}% ? +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{95}{8}% _ (subscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{124}{12}% | +\edef\pagegrid@AtEnd{\pagegrid@AtEnd\noexpand\endinput} +\RequirePackage{tikz} +\RequirePackage{atbegshi}[2009/12/02] +\RequirePackage{kvoptions}[2009/07/17] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname stockwidth\endcsname\relax + \def\pagegrid@width{\paperwidth}% + \def\pagegrid@height{\paperheight}% +\else + \def\pagegrid@width{\stockwidth}% + \def\pagegrid@height{\stockheight}% +\fi +\SetupKeyvalOptions{% + family=pagegrid,% + prefix=pagegrid@,% +} +\def\pagegrid@init{% + \let\pagegrid@origin@a\@empty + \let\pagegrid@origin@b\@empty + \let\pagegrid@init\relax +} +\let\pagegrid@@init\pagegrid@init +\def\pagegrid@origin@a{bl} +\def\pagegrid@origin@b{tr} +\def\pagegrid@SetOrigin#1{% + \pagegrid@init + \ifx\pagegrid@origin@a\@empty + \def\pagegrid@origin@a{#1}% + \else + \ifx\pagegrid@origin@b\@empty + \else + \let\pagegrid@origin@a\pagegrid@origin@b + \fi + \def\pagegrid@origin@b{#1}% + \fi +} +\def\pagegrid@temp#1{% + \DeclareVoidOption{#1}{\pagegrid@SetOrigin{#1}}% + \@namedef{pagegrid@N@#1}{#1}% +} +\pagegrid@temp{bl} +\pagegrid@temp{br} +\pagegrid@temp{tl} +\pagegrid@temp{tr} +\def\pagegrid@temp#1#2{% + \DeclareVoidOption{#2}{\pagegrid@SetOrigin{#1}}% +}% +\pagegrid@temp{bl}{lb} +\pagegrid@temp{br}{rb} +\pagegrid@temp{tl}{lt} +\pagegrid@temp{tr}{rt} +\pagegrid@temp{bl}{bottom-left} +\pagegrid@temp{br}{bottom-right} +\pagegrid@temp{tl}{top-left} +\pagegrid@temp{tr}{top-right} +\pagegrid@temp{bl}{left-bottom} +\pagegrid@temp{br}{right-bottom} +\pagegrid@temp{tl}{left-top} +\pagegrid@temp{tr}{right-top} +\DeclareBoolOption[true]{enable} +\DeclareComplementaryOption{disable}{enable} +\DeclareBoolOption{foreground} +\newlength{\pagegrid@step} +\define@key{pagegrid}{step}{% + \setlength{\pagegrid@step}{#1}% +} +\DeclareStringOption[red]{firstcolor} +\DeclareStringOption[blue]{secondcolor} +\DeclareBoolOption[true]{arrows} +\newlength\pagegrid@arrowlength +\pagegrid@arrowlength=\z@ +\define@key{pagegrid}{arrowlength}{% + \setlength{\pagegrid@arrowlength}{#1}% +} +\define@key{pagegrid}{double}[true]{% + \@ifundefined{pagegrid@double@#1}{% + \PackageWarning{pagegrid}{% + Unsupported value `#1' for option `double'.\MessageBreak + Known values are:\MessageBreak + `false', `first', `last', `true'.\MessageBreak + Now `false' is used% + }% + \chardef\pagegrid@double\z@ + }{% + \chardef\pagegrid@double\csname pagegrid@double@#1\endcsname\relax + }% +} +\@namedef{pagegrid@double@false}{0} +\@namedef{pagegrid@double@first}{1} +\@namedef{pagegrid@double@last}{2} +\@namedef{pagegrid@double@true}{2} +\chardef\pagegrid@double\z@ +\newcommand*{\pagegridsetup}{% + \let\pagegrid@init\pagegrid@@init + \setkeys{pagegrid}% +} +\pagegridsetup{% + step=1mm% +} +\InputIfFileExists{pagegrid.cfg}{}% +\ProcessKeyvalOptions*\relax +\AtBeginDocument{% + \ifdim\pagegrid@arrowlength>\z@ + \else + \pagegrid@arrowlength=10\pagegrid@step + \fi +} +\def\pagegridShipoutDoubleBegin{% + \begingroup + \let\newlabel\@gobbletwo + \let\zref@newlabel\@gobbletwo + \let\@writefile\@gobbletwo + \let\select@language\@gobble +} +\def\pagegridShipoutDoubleEnd{% + \endgroup +} +\def\pagegrid@WriteDouble#1#2{% + \immediate\write#1{% + \@backslashchar csname % + pagegridShipoutDouble#2% + \@backslashchar endcsname% + }% +} +\def\pagegrid@ShipoutDouble#1{% + \begingroup + \if@filesw + \pagegrid@WriteDouble\@mainaux{Begin}% + \ifx\@auxout\@partaux + \pagegrid@WriteDouble\@partaux{Begin}% + \def\pagegrid@temp{% + \pagegrid@WriteDouble\@mainaux{End}% + \pagegrid@WriteDouble\@partaux{End}% + }% + \else + \def\pagegrid@temp{% + \pagegrid@WriteDouble\@mainaux{End}% + }% + \fi + \else + \def\pagegrid@temp{}% + \fi + \let\protect\noexpand + \AtBeginShipoutOriginalShipout\copy#1\relax + \pagegrid@temp + \endgroup +} +\AtBeginShipout{% + \ifdim\pagegrid@step>\z@ + \else + \pagegrid@enablefalse + \fi + \ifpagegrid@enable + \ifnum\pagegrid@double=\@ne + \pagegrid@ShipoutDouble\AtBeginShipoutBox + \else + \ifnum\pagegrid@double=\tw@ + \@ifundefined{pagegrid@DoubleBox}{% + \newbox\pagegrid@DoubleBox + }{}% + \setbox\pagegrid@DoubleBox=\copy\AtBeginShipoutBox + \fi + \fi + \ifpagegrid@foreground + \expandafter\AtBeginShipoutUpperLeftForeground + \else + \expandafter\AtBeginShipoutUpperLeft + \fi + {% + \put(0,0){% + \makebox(0,0)[lt]{% + \begin{tikzpicture}[% + bl/.style={},% + br/.style={xshift=\pagegrid@width,xscale=-1},% + tl/.style={yshift=\pagegrid@height,yscale=-1},% + tr/.style={xshift=\pagegrid@width,% + yshift=\pagegrid@height,scale=-1}% + ]% + \useasboundingbox + (0mm,\pagegrid@height) rectangle (0mm,\pagegrid@height);% + \draw[% + \pagegrid@origin@a,% + step=\pagegrid@step,% + style=help lines,% + ultra thin% + ] (0mm,0mm) grid (\pagegrid@width,\pagegrid@height);% + \ifx\pagegrid@origin@b\@empty + \else + \draw[% + \pagegrid@origin@b,% + step=10\pagegrid@step,% + {\pagegrid@secondcolor},% + very thin% + ] (0mm,0mm) grid (\pagegrid@width,\pagegrid@height);% + \fi + \draw[% + \pagegrid@origin@a,% + step=10\pagegrid@step,% + {\pagegrid@firstcolor},% + very thin% + ] (0mm,0mm) grid (\pagegrid@width,\pagegrid@height);% + \ifx\pagegrid@origin@b\@empty + \else + \draw[% + \pagegrid@origin@b,% + step=50\pagegrid@step,% + {\pagegrid@secondcolor},% + thick% + ] (0mm,0mm) grid (\pagegrid@width,\pagegrid@height);% + \fi + \draw[% + \pagegrid@origin@a,% + step=50\pagegrid@step,% + {\pagegrid@firstcolor},% + thick% + ] (0mm,0mm) grid (\pagegrid@width,\pagegrid@height);% + \ifpagegrid@arrows + \ifx\pagegrid@origin@b\@empty + \else + \draw[% + \pagegrid@origin@b,% + {\pagegrid@secondcolor},% + stroke,% + line width=1pt,% + line cap=round% + ] (0mm,0mm) % + -- (\pagegrid@arrowlength,\pagegrid@arrowlength) % + (\pagegrid@arrowlength,.5\pagegrid@arrowlength) % + -- (\pagegrid@arrowlength,\pagegrid@arrowlength) % + -- (.5\pagegrid@arrowlength,\pagegrid@arrowlength);% + \fi + \draw[% + \pagegrid@origin@a,% + {\pagegrid@firstcolor},% + stroke,% + line width=1pt,% + line cap=round% + ] (0mm,0mm) % + -- (\pagegrid@arrowlength,\pagegrid@arrowlength) % + (\pagegrid@arrowlength,.5\pagegrid@arrowlength) % + -- (\pagegrid@arrowlength,\pagegrid@arrowlength) % + -- (.5\pagegrid@arrowlength,\pagegrid@arrowlength);% + \fi + \end{tikzpicture}% + }% + }% + }% + \ifnum\pagegrid@double=\tw@ + \pagegrid@ShipoutDouble\pagegrid@DoubleBox + \fi + \fi +} +\pagegrid@AtEnd% +\endinput +%% +%% End of file `pagegrid.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty b/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty index 71892655052..319f56341e4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by +%% Copyright (C) 2006, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,31 +28,360 @@ %% This work consists of the main source file pmboxdraw.dtx %% and the derived files %% pmboxdraw.sty, pmboxdraw.pdf, pmboxdraw.ins, pmboxdraw.drv, -%% pmboxdrawenc.dfu. +%% pmboxdrawenc.dfu, pmboxdraw-test1.tex. %% -\NeedsTeXFormat{LaTeX2e} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@pmboxdraw.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pmboxdraw}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pmboxdraw.sty\endcsname \ProvidesPackage{pmboxdraw}% - [2006/05/03 v1.0 Poor man's box drawing characters (HO)]% -\DeclareFontEncoding{pmboxdraw}{}{} -\DeclareFontFamily{pmboxdraw}{pmboxdraw}{} -\DeclareFontShape{pmboxdraw}{pmboxdraw}{m}{n}{ <-> cmr10 }{} -\DeclareFontSubstitution{pmboxdraw}{pmboxdraw}{m}{n} -\newcommand*{\pmboxdrawbox}[1]{% + [2011/03/24 v1.1 Poor man's box drawing characters (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname pmbd@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\pmbd@AtEnd{% + \pmbd@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\pmbd@AtEnd{\pmbd@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% +\else + \let\TMP@RequirePackage\RequirePackage +\fi +\TMP@RequirePackage{ltxcmds}[2010/12/12]% +\TMP@RequirePackage{kvsetkeys}[2011/01/30]% +\TMP@RequirePackage{kvdefinekeys}[2011/01/30]% +\TMP@RequirePackage{infwarerr}[2010/04/08]% +\ltx@newif\ifpmbd@latex +\ltx@IfUndefined{fmtname}{}{% + \def\pmbd@tmp{LaTeX2e}% + \ifx\pmbd@tmp\fmtname + \pmbd@latextrue + \fi +} +\ifpmbd@latex + \DeclareFontEncoding{pmboxdraw}{}{}% + \DeclareFontFamily{pmboxdraw}{pmboxdraw}{}% + \DeclareFontShape{pmboxdraw}{pmboxdraw}{m}{n}{ <-> cmr10 }{}% + \DeclareFontSubstitution{pmboxdraw}{pmboxdraw}{m}{n}% + \RequirePackage{kvoptions}[2010/02/22]% + \SetupKeyvalOptions{% + family=PMBD,% + prefix=pmbd@% + }% +\fi +\ltx@IfUndefined{dimexpr}{% + \catcode36=9 % + \catcode38=14 % +}{% + \catcode36=14 % + \catcode38=9 % +} +\ltx@IfUndefined{protected}{% + \def\pmbd@ProtectedDef#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\DeclareRobustCommand*#1}% + }% + \pmbd@temp + }% + \def\pmbd@ProtectedDefOne#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\DeclareRobustCommand*#1[1]}% + }% + \pmbd@temp + }% +}{% + \def\pmbd@ProtectedDef#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\protected\def#1}% + }% + \pmbd@temp + }% + \def\pmbd@ProtectedDefOne#1{% + \let\pmbd@temp\ltx@gobblethree + \@ifdefinable#1{% + \def\pmbd@temp{\protected\def#1}% + }% + \pmbd@temp##1% + }% +} +\pmbd@ProtectedDef\pmboxdrawsetup{% + \kvsetkeys{PMBD}% +} +\catcode47=11 % +\def\pmbd@temp#1#2{% + \DeclareStringOption[\width]{#1/width}% + \DeclareStringOption[\height]{#1/height}% + \DeclareStringOption[\depth]{#1/depth}% + \DeclareStringOption[{#2}]{#1/box/default}% + \expandafter\DeclareStringOption\expandafter[% + \csname pmbd@#1/box/default\endcsname + ]{#1/box}% +} +\pmbd@temp{BoxDrawing}{\strut0}% +\pmbd@temp{Block}{% + \begingroup + \sbox\z@{\strut}% + \dimen@=\ht\z@ + \advance\dimen@\dp\z@ + \wd\z@=\dimen@ + \box\z@ + \endgroup +}% +\pmbd@temp{Shade}{% + \begingroup + \sbox\z@{\strut}% + \dimen@=\ht\z@ + \advance\dimen@\dp\z@ + \wd\z@=\dimen@ + \box\z@ + \endgroup +}% +\pmbd@temp{TerminalGraphic}{% + \begingroup + \sbox\z@{\"A}% + \wd\z@=\ht\z@ + \dp\z@=\z@ + \box\z@ + \endgroup +}% +\DeclareStringOption[.1\width]{BoxDrawing/thinlinewidth} +\DeclareStringOption[.25\width]{BoxDrawing/thicklinewidth} +\DeclareStringOption[.25\width]{BoxDrawing/doublelinesep} +\DeclareStringOption[\strut0]{box} %% +\DeclareStringOption[.1\width]{rulewidth} +\DeclareStringOption[.25\width]{doublerulesep} +\pmbd@ProtectedDefOne\pmboxdrawUniRobust{% + \comma@parse{#1}{% + \ltx@IfUndefined{pmbd@U+\comma@entry}{% + \begingroup\expandafter\endgroup + \expandafter + \TextSymbolUnavailable\csname U+\comma@entry\endcsname + }{% + \csname pmbd@U+\comma@entry\endcsname + }% + \@gobble + }% +} +\newcommand*{\pmboxdrawuni}[1]{% + \ifx\texorpdfstring\ltx@undefined + \expandafter\ltx@firstoftwo + \else + \ifx\texorpdfstring\relax + \expandafter\expandafter\expandafter\ltx@firstoftwo + \else + \expandafter\expandafter\expandafter\texorpdfstring + \fi + \fi + {% + \pmboxdrawUniRobust{#1}% + }{% + \expandafter\ifx\csname ifHy@unicode\expandafter\endcsname + \csname iftrue\endcsname + \expandafter\unichar\expandafter{\number"#1}% + \fi + }% +} +\pmbd@ProtectedDefOne\pmboxdrawbox{% \def\pmbd@box{#1}% } -\pmboxdrawbox{\strut0} -\newcommand*{\pmboxdrawrulewidth}[1]{% +\pmbd@ProtectedDefOne\pmboxdrawrulewidth{% \def\pmbd@rulewidth{#1}% } -\pmboxdrawrulewidth{.1\width} -\newcommand*{\pmboxdrawdoublerulesep}[1]{% +\pmbd@ProtectedDefOne\pmboxdrawdoublerulesep{% \def\pmbd@doublerulesep{#1}% } -\pmboxdrawdoublerulesep{.25\width} +\def\pmbd@UniDef#1#2{% + \expandafter\pmbd@ProtectedDef\expandafter#1\expandafter{% + \csname pmbd@U+#2\endcsname + }% +} +\ltx@ifpackageloaded{calc}{% + \def\pmbd@SetLength{% + \setlength + }% +}{% + \ltx@IfUndefined{dimexpr}{% + \def\pmbd@SetDim#1#2{% + #1=#2\relax + }% + }{% + \def\pmbd@SetDim#1#2{% + #1=\dimexpr#2\relax + }% + }% + \def\pmbd@SetLength{% + \ltx@ifpackageloaded{calc}{% + \setlength + }{% + \pmbd@SetDim + }% + }% + \AtBeginDocument{% + \ltx@ifpackageloaded{calc}{% + \def\pmbd@SetLength{\setlength}% + }{% + \let\pmbd@SetLength\pmbd@SetDim + }% + }% +} +\newdimen\pmbd@W +\newdimen\pmbd@H +\newdimen\pmbd@L +\newdimen\pmbd@Thin +\newdimen\pmbd@Thick +\newdimen\pmbd@Sep +\dimendef\pmbd@A=2 % +\dimendef\pmbd@B=4 % +\dimendef\pmbd@C=6 % +\dimendef\pmbd@D=8 % +\def\pmbd@BeginBox#1{% + \ltx@leavevmode + \@begin@tempboxa\hbox{% + \csname pmbd@#1/box\endcsname + }% + \pmbd@SetLength\pmbd@W{% + \csname pmbd@#1/width\endcsname + }% + \pmbd@SetLength\pmbd@H{% + \csname pmbd@#1/height\endcsname + }% + \pmbd@SetLength\pmbd@L{% + \csname pmbd@#1/depth\endcsname + }% + \advance\pmbd@H\pmbd@L + \setbox\ltx@zero\hbox to \pmbd@W\bgroup +} +\def\pmbd@EndBox{% + \hss + \egroup + \ht\ltx@zero=\pmbd@H + \dp\ltx@zero=\z@ + \ifdim\pmbd@L=\z@ + \else + \lower\pmbd@L + \fi + \box\ltx@zero + \@end@tempboxa +} +\def\pmbd@Rule#1#2#3{% + \vrule\@width#1\@height#2\@depth#3\relax +} \def\pmbd@begin{% \begingroup - \setbox\z@\hbox{\pmbd@box}% - \leavevmode + \sbox\z@{\pmbd@box}% + \ltx@leavevmode \setbox\tw@\hb@xt@\wd\z@\bgroup } \def\pmbd@end{% @@ -62,253 +391,2039 @@ \box\tw@ \endgroup } -\DeclareTextCommandDefault{\textupblock}{% - \pmbd@begin - \dimen@-\ht\z@ - \advance\dimen@\dp\z@ - \vrule\@width\wd\z@\@depth.5\dimen@ - \pmbd@end +\def\pmbd@LowerBlock#1{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W{#1\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textdnblock}{% - \pmbd@begin - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \vrule\@width\wd\z@\@height.5\dimen@ - \pmbd@end +\def\pmbd@LeftBlock#1{% + \pmbd@BeginBox{Block}% + \pmbd@Rule{#1\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textblock}{% - \pmbd@begin - \vrule\@width\wd\z@ - \pmbd@end +\pmbd@UniDef\textupblock{2580} +\@namedef{pmbd@U+2580}{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textlfblock}{% - \pmbd@begin - \vrule\@width.5\wd\z@ - \hfill - \pmbd@end +\@namedef{pmbd@U+2581}{% + \pmbd@LowerBlock{.125}% } -\DeclareTextCommandDefault{\textrtblock}{% - \pmbd@begin - \hfill - \vrule\@width.5\wd\z@ - \pmbd@end +\@namedef{pmbd@U+2582}{% + \pmbd@LowerBlock{.25}% } -\DeclareTextCommandDefault{\textltshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textltshade - }{% - \textcolor[gray]{.75}% - }{% - \vrule\@width\wd\z@ - }% - \pmbd@end +\@namedef{pmbd@U+2583}{% + \pmbd@LowerBlock{.375}% } -\DeclareTextCommandDefault{\textshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textshade - }{% - \textcolor[gray]{.5}% - }{% - \vrule\@width\wd\z@ - }% - \pmbd@end +\pmbd@UniDef\textdnblock{2584} +\@namedef{pmbd@U+2584}{% + \pmbd@LowerBlock{.5}% } -\DeclareTextCommandDefault{\textdkshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textdkshade +\@namedef{pmbd@U+2585}{% + \pmbd@LowerBlock{.625}% +} +\@namedef{pmbd@U+2586}{% + \pmbd@LowerBlock{.75}% +} +\@namedef{pmbd@U+2587}{% + \pmbd@LowerBlock{.875}% +} +\pmbd@UniDef\textblock{2588} +\@namedef{pmbd@U+2588}{% + \pmbd@LowerBlock{}% +} +\@namedef{pmbd@U+2589}{% + \pmbd@LeftBlock{.875}% +} +\@namedef{pmbd@U+258A}{% + \pmbd@LeftBlock{.75}% +} +\@namedef{pmbd@U+258B}{% + \pmbd@LeftBlock{.625}% +} +\pmbd@UniDef\textlfblock{258C} +\@namedef{pmbd@U+258C}{% + \pmbd@LeftBlock{.5}% +} +\@namedef{pmbd@U+258D}{% + \pmbd@LeftBlock{.375}% +} +\@namedef{pmbd@U+258E}{% + \pmbd@LeftBlock{.25}% +} +\@namedef{pmbd@U+258F}{% + \pmbd@LeftBlock{.125}% +} +\pmbd@UniDef\textrtblock{2590} +\@namedef{pmbd@U+2590}{% + \pmbd@BeginBox{Block}% + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2594}{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W\pmbd@H{-.875\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2595}{% + \pmbd@BeginBox{Block}% + \kern.875\pmbd@W + \pmbd@Rule{.125\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox +} +\def\pmbd@Shade#1#2{% + \pmbd@BeginBox{Shade}% + \ltx@ifundefined{textcolor}{% + \pmbd@colorwarning{#1}% }{% - \textcolor[gray]{.25}% + \textcolor[gray]{\csname pmbd@Shade/#2\endcsname}% }{% - \vrule\@width\wd\z@ + \pmbd@Rule\pmbd@W\pmbd@H\z@ }% - \pmbd@end + \pmbd@EndBox +} +\DeclareStringOption[.75]{Shade/light} +\pmbd@UniDef\textltshade{2591} +\@namedef{pmbd@U+2591}{% + \pmbd@Shade{2591}{light}% +} +\DeclareStringOption[.5]{Shade/medium} +\pmbd@UniDef\textshade{2592} +\@namedef{pmbd@U+2592}{% + \pmbd@Shade{2592}{medium}% +} +\DeclareStringOption[.25]{Shade/dark} +\pmbd@UniDef\textdkshade{2593} +\@namedef{pmbd@U+2593}{% + \pmbd@Shade{2593}{dark}% } \def\pmbd@colorwarning#1{% \PackageWarning{pmboxdraw}{% - \string#1\space requires package \string`color\string'\MessageBreak + U+#1 requires package \string`color\string'\MessageBreak }% \@firstofone } -\def\pmbd@beginA{% - \pmbd@begin - \def\width{\wd\z@}% - \def\height{\ht\z@}% - \def\depth{\dp\z@}% - \setlength{\dimen@}{\pmbd@rulewidth}% - \edef\pmbd@rulewidth{\number\dimen@ sp}% +\def\pmbd@BeginTerminal{% + \pmbd@BeginBox{TerminalGraphic}% } -\DeclareTextCommandDefault{\textSFx}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+2596}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxi}{% - \pmbd@beginA - \hss - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\@namedef{pmbd@U+2597}{% + \pmbd@BeginTerminal + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFi}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+2598}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFiii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+2599}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth-.5\dimen\tw@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+259A}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFiv}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth-.5\dimen\tw@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+259B}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFviii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth\dp\z@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+259C}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFix}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth\dp\z@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+259D}{% + \pmbd@BeginTerminal + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFvi}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\@namedef{pmbd@U+259E}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFvii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@depth-.5\dimen\tw@ - \hss - \pmbd@end +\@namedef{pmbd@U+259F}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFv}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\def\pmbd@BeginDraw#1#2{% + \pmbd@BeginBox{BoxDrawing}% + \ifx#1X% + \pmbd@SetLength\pmbd@Thin\pmbd@BoxDrawing/thinlinewidth% + \fi + \ifx#2X% + \pmbd@SetLength\pmbd@Thick\pmbd@BoxDrawing/thicklinewidth% + \fi +} +\pmbd@UniDef\textSFx{2500} +\@namedef{pmbd@U+2500}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + \pmbd@EndBox +} +\@namedef{pmbd@U+2501}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFxi{2502} +\@namedef{pmbd@U+2502}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2503}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFi{250C} +\@namedef{pmbd@U+250C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250F}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFiii{2510} +\@namedef{pmbd@U+2510}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2511}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2512}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2513}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFii{2514} +\@namedef{pmbd@U+2514}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2515}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2516}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2517}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFiv{2518} +\@namedef{pmbd@U+2518}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2519}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFviii{251C} +\@namedef{pmbd@U+251C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+251D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+251E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2520}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2521}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2522}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2523}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFix{2524} +\@namedef{pmbd@U+2524}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2525}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2526}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \kern.5\pmbd@D +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2527}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \kern.5\pmbd@D +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2528}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2529}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+252A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+252B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFvi{252C} +\@namedef{pmbd@U+252C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \kern\pmbd@C +$ \advance\pmbd@C-\pmbd@W +$ \pmbd@Rule{-\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2530}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2531}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2532}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2533}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFvii{2534} +\@namedef{pmbd@U+2534}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2535}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2536}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \kern\pmbd@C +$ \advance\pmbd@C-\pmbd@W +$ \pmbd@Rule{-\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2537}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2538}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2539}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+253A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+253B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFv{253C} +\@namedef{pmbd@U+253C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+253D}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+253E}{% + \pmbd@BeginDraw XX% + \rlap{% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+253F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thick\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2540}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2541}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2542}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2543}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2544}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2545}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2546}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2547}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2548}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2549}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+254A}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+254B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thick\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\def\pmbd@BeginDouble{% + \pmbd@BeginDraw X-% + \pmbd@SetLength\pmbd@Sep\pmbd@BoxDrawing/doublelinesep% } \def\pmbd@beginB{% \pmbd@beginA @@ -320,145 +2435,146 @@ \advance\dimen@\pmbd@rulewidth \edef\pmbd@doublesepV{\number\dimen@ sp}% } -\DeclareTextCommandDefault{\textSFxliii}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\pmbd@UniDef\textSFxliii{2550} +\@namedef{pmbd@U+2550}{% + \pmbd@BeginDouble +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A-\pmbd@Sep +$ \pmbd@A=.5\pmbd@A +& \pmbd@A=.5\dimexpr\pmbd@H-\pmbd@Sep\relax +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \advance\pmbd@A\pmbd@Sep +$ \advance\pmbd@A\pmbd@Thin +$ \advance\pmbd@B-\pmbd@Sep +$ \advance\pmbd@B-\pmbd@Thin +& \pmbd@A=\dimexpr\pmbd@A+\pmbd@Sep+\pmbd@Thin\relax +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxiv}{% - \pmbd@beginB - \hss - \vrule\@width\pmbd@rulewidth - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\pmbd@UniDef\textSFxxiv{2551} +\@namedef{pmbd@U+2551}{% + \pmbd@BeginDouble +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Sep +$ \pmbd@A=.5\pmbd@A +$ \advance\pmbd@A-.5\pmbd@Thin +$ \kern\pmbd@A +& \kern\dimexpr.5\dimexpr\pmbd@W-\pmbd@Sep\relax-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \kern\pmbd@Sep + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFli}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \kern.5\wd\z@ - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \rlap{% - \kern.5\wd\z@ - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFli{2552} +\@namedef{pmbd@U+2552}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Thin + \pmbd@C=.5\pmbd@C + \kern\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Sep + \pmbd@A=.5\pmbd@A + \advance\pmbd@A\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \kern-\pmbd@D + \advance\pmbd@A-\pmbd@Sep + \advance\pmbd@A-\pmbd@Thin + \advance\pmbd@B\pmbd@Sep + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFlii}{% - \pmbd@beginB - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \dimen4 \wd\z@ - \advance\dimen4 \pmbd@doublesepH - \hb@xt@\wd\z@{% - \hfill - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFlii{2553} +\@namedef{pmbd@U+2553}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Sep + \pmbd@C=.5\pmbd@C + \advance\pmbd@C-\pmbd@Thin + \kern\pmbd@C + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Thin + \pmbd@A=.5\pmbd@A + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \kern-\pmbd@D + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern\pmbd@Sep + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxxix}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \dimen4 \wd\z@ - \begingroup - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \advance\dimen4 \pmbd@doublesepH - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \kern\pmbd@doublesepH - \kern\pmbd@rulewidth - \hss - }% - }% - \endgroup - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \advance\dimen4 -\pmbd@doublesepH - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \hss - \kern\pmbd@rulewidth - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFxxxix{2554} +\@namedef{pmbd@U+2554}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Sep + \pmbd@C=.5\pmbd@C + \advance\pmbd@C-\pmbd@Thin + \kern\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Sep + \pmbd@A=.5\pmbd@A + \advance\pmbd@A\pmbd@Thin + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \advance\pmbd@D-\pmbd@Sep + \advance\pmbd@D-\pmbd@Thin + \kern-\pmbd@D + \advance\pmbd@A-\pmbd@Sep + \advance\pmbd@A-\pmbd@Thin + \advance\pmbd@B\pmbd@Sep + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxii}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \rlap{% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFxxii{2555} +\@namedef{pmbd@U+2555}{% + \pmbd@BeginDouble + \pmbd@A=\pmbd@H + \advance\pmbd@A-\pmbd@Sep + \pmbd@A=.5\pmbd@A + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@C=\pmbd@W + \advance\pmbd@C\pmbd@Thin + \pmbd@C=.5\pmbd@C + \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B + \kern-\pmbd@C + \advance\pmbd@A\pmbd@Sep + \advance\pmbd@A\pmbd@Thin + \advance\pmbd@B-\pmbd@Sep + \advance\pmbd@B-\pmbd@Thin + \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxi}{% +\pmbd@UniDef\textSFxxi{2556} +\@namedef{pmbd@U+2556}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -477,7 +2593,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxv}{% +\pmbd@UniDef\textSFxxv{2557} +\@namedef{pmbd@U+2557}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -515,7 +2632,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFl}{% +\pmbd@UniDef\textSFl{2558} +\@namedef{pmbd@U+2558}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -539,7 +2657,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlix}{% +\pmbd@UniDef\textSFxlix{2559} +\@namedef{pmbd@U+2559}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -561,7 +2680,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxviii}{% +\pmbd@UniDef\textSFxxxviii{255A} +\@namedef{pmbd@U+255A}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -605,7 +2725,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxviii}{% +\pmbd@UniDef\textSFxxviii{255B} +\@namedef{pmbd@U+255B}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -627,7 +2748,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxvii}{% +\pmbd@UniDef\textSFxxvii{255C} +\@namedef{pmbd@U+255C}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -646,7 +2768,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxvi}{% +\pmbd@UniDef\textSFxxvi{255D} +\@namedef{pmbd@U+255D}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -684,7 +2807,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxvi}{% +\pmbd@UniDef\textSFxxxvi{255E} +\@namedef{pmbd@U+255E}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -708,7 +2832,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxvii}{% +\pmbd@UniDef\textSFxxxvii{255F} +\@namedef{pmbd@U+255F}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -730,7 +2855,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlii}{% +\pmbd@UniDef\textSFxlii{2560} +\@namedef{pmbd@U+2560}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -773,7 +2899,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxix}{% +\pmbd@UniDef\textSFxix{2561} +\@namedef{pmbd@U+2561}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -795,7 +2922,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxx}{% +\pmbd@UniDef\textSFxx{2562} +\@namedef{pmbd@U+2562}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -814,7 +2942,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxiii}{% +\pmbd@UniDef\textSFxxiii{2563} +\@namedef{pmbd@U+2563}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -851,7 +2980,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlvii}{% +\pmbd@UniDef\textSFxlvii{2564} +\@namedef{pmbd@U+2564}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -873,7 +3003,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlviii}{% +\pmbd@UniDef\textSFxlviii{2565} +\@namedef{pmbd@U+2565}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -890,7 +3021,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxli}{% +\pmbd@UniDef\textSFxli{2566} +\@namedef{pmbd@U+2566}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -920,7 +3052,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlv}{% +\pmbd@UniDef\textSFxlv{2567} +\@namedef{pmbd@U+2567}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -942,7 +3075,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlvi}{% +\pmbd@UniDef\textSFxlvi{2568} +\@namedef{pmbd@U+2568}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -959,7 +3093,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxl}{% +\pmbd@UniDef\textSFxl{2569} +\@namedef{pmbd@U+2569}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -993,7 +3128,8 @@ \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ \pmbd@end } -\DeclareTextCommandDefault{\textSFliv}{% +\pmbd@UniDef\textSFliv{256A} +\@namedef{pmbd@U+256A}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1015,7 +3151,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFliii}{% +\pmbd@UniDef\textSFliii{256B} +\@namedef{pmbd@U+256B}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1032,7 +3169,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxliv}{% +\pmbd@UniDef\textSFxliv{256C} +\@namedef{pmbd@U+256C}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1077,6 +3215,181 @@ \hss \pmbd@end } +\@namedef{pmbd@U+2574}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2575}{% + \pmbd@BeginDraw X-% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2576}{% + \pmbd@BeginDraw X-% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2577}{% + \pmbd@BeginDraw X-% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2578}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2579}{% + \pmbd@BeginDraw -X% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257A}{% + \pmbd@BeginDraw -X% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257B}{% + \pmbd@BeginDraw -X% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+257C}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257D}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+257E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257F}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\def\pmbd@beginA{% + \pmbd@begin + \def\width{\wd\z@}% + \def\height{\ht\z@}% + \def\depth{\dp\z@}% + \setlength{\dimen@}{\pmbd@rulewidth}% + \edef\pmbd@rulewidth{\number\dimen@ sp}% +} +\pmbd@AtEnd% \endinput %% %% End of file `pmboxdraw.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu b/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu index aca78dbf955..9d85e214f15 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu +++ b/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by +%% Copyright (C) 2006, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,21 +28,71 @@ %% This work consists of the main source file pmboxdraw.dtx %% and the derived files %% pmboxdraw.sty, pmboxdraw.pdf, pmboxdraw.ins, pmboxdraw.drv, -%% pmboxdrawenc.dfu. +%% pmboxdrawenc.dfu, pmboxdraw-test1.tex. %% \ProvidesFile{pmboxdrawenc.dfu}% - [2006/05/03 v1.0 UTF-8 support for box drawing characters]% + [2011/03/24 v1.1 UTF-8 support for box drawing characters]% \DeclareUnicodeCharacter{2500}{\textSFx} +\DeclareUnicodeCharacter{2501}{\pmboxdrawuni{2501}} \DeclareUnicodeCharacter{2502}{\textSFxi} +\DeclareUnicodeCharacter{2503}{\pmboxdrawuni{2503}} \DeclareUnicodeCharacter{250C}{\textSFi} +\DeclareUnicodeCharacter{250D}{\pmboxdrawuni{250D}} +\DeclareUnicodeCharacter{250E}{\pmboxdrawuni{250E}} +\DeclareUnicodeCharacter{250F}{\pmboxdrawuni{250F}} \DeclareUnicodeCharacter{2510}{\textSFiii} +\DeclareUnicodeCharacter{2511}{\pmboxdrawuni{2511}} +\DeclareUnicodeCharacter{2512}{\pmboxdrawuni{2512}} +\DeclareUnicodeCharacter{2513}{\pmboxdrawuni{2513}} \DeclareUnicodeCharacter{2514}{\textSFii} +\DeclareUnicodeCharacter{2515}{\pmboxdrawuni{2515}} +\DeclareUnicodeCharacter{2516}{\pmboxdrawuni{2516}} +\DeclareUnicodeCharacter{2517}{\pmboxdrawuni{2517}} \DeclareUnicodeCharacter{2518}{\textSFiv} +\DeclareUnicodeCharacter{2519}{\pmboxdrawuni{2519}} +\DeclareUnicodeCharacter{251A}{\pmboxdrawuni{251A}} +\DeclareUnicodeCharacter{251B}{\pmboxdrawuni{251B}} \DeclareUnicodeCharacter{251C}{\textSFviii} +\DeclareUnicodeCharacter{251D}{\pmboxdrawuni{251D}} +\DeclareUnicodeCharacter{251E}{\pmboxdrawuni{251E}} +\DeclareUnicodeCharacter{251F}{\pmboxdrawuni{251F}} +\DeclareUnicodeCharacter{2520}{\pmboxdrawuni{2520}} +\DeclareUnicodeCharacter{2521}{\pmboxdrawuni{2521}} +\DeclareUnicodeCharacter{2522}{\pmboxdrawuni{2522}} +\DeclareUnicodeCharacter{2523}{\pmboxdrawuni{2523}} \DeclareUnicodeCharacter{2524}{\textSFix} \DeclareUnicodeCharacter{252C}{\textSFvi} +\DeclareUnicodeCharacter{252D}{\pmboxdrawuni{252D}} +\DeclareUnicodeCharacter{252E}{\pmboxdrawuni{252E}} +\DeclareUnicodeCharacter{252F}{\pmboxdrawuni{252F}} +\DeclareUnicodeCharacter{2530}{\pmboxdrawuni{2530}} +\DeclareUnicodeCharacter{2531}{\pmboxdrawuni{2531}} +\DeclareUnicodeCharacter{2532}{\pmboxdrawuni{2532}} +\DeclareUnicodeCharacter{2533}{\pmboxdrawuni{2533}} \DeclareUnicodeCharacter{2534}{\textSFvii} +\DeclareUnicodeCharacter{2535}{\pmboxdrawuni{2535}} +\DeclareUnicodeCharacter{2536}{\pmboxdrawuni{2536}} +\DeclareUnicodeCharacter{2537}{\pmboxdrawuni{2537}} +\DeclareUnicodeCharacter{2538}{\pmboxdrawuni{2538}} +\DeclareUnicodeCharacter{2539}{\pmboxdrawuni{2539}} +\DeclareUnicodeCharacter{253A}{\pmboxdrawuni{253A}} +\DeclareUnicodeCharacter{253B}{\pmboxdrawuni{253B}} \DeclareUnicodeCharacter{253C}{\textSFv} +\DeclareUnicodeCharacter{253D}{\pmboxdrawuni{253D}} +\DeclareUnicodeCharacter{253E}{\pmboxdrawuni{253E}} +\DeclareUnicodeCharacter{253F}{\pmboxdrawuni{253F}} +\DeclareUnicodeCharacter{2540}{\pmboxdrawuni{2540}} +\DeclareUnicodeCharacter{2541}{\pmboxdrawuni{2541}} +\DeclareUnicodeCharacter{2542}{\pmboxdrawuni{2542}} +\DeclareUnicodeCharacter{2543}{\pmboxdrawuni{2543}} +\DeclareUnicodeCharacter{2544}{\pmboxdrawuni{2544}} +\DeclareUnicodeCharacter{2545}{\pmboxdrawuni{2545}} +\DeclareUnicodeCharacter{2546}{\pmboxdrawuni{2546}} +\DeclareUnicodeCharacter{2547}{\pmboxdrawuni{2547}} +\DeclareUnicodeCharacter{2548}{\pmboxdrawuni{2548}} +\DeclareUnicodeCharacter{2549}{\pmboxdrawuni{2549}} +\DeclareUnicodeCharacter{254A}{\pmboxdrawuni{254A}} +\DeclareUnicodeCharacter{254B}{\pmboxdrawuni{254B}} \DeclareUnicodeCharacter{2550}{\textSFxliii} \DeclareUnicodeCharacter{2551}{\textSFxxiv} \DeclareUnicodeCharacter{2552}{\textSFli} @@ -72,14 +122,50 @@ \DeclareUnicodeCharacter{256A}{\textSFliv} \DeclareUnicodeCharacter{256B}{\textSFliii} \DeclareUnicodeCharacter{256C}{\textSFxliv} +\DeclareUnicodeCharacter{2574}{\pmboxdrawuni{2574}} +\DeclareUnicodeCharacter{2575}{\pmboxdrawuni{2575}} +\DeclareUnicodeCharacter{2576}{\pmboxdrawuni{2576}} +\DeclareUnicodeCharacter{2577}{\pmboxdrawuni{2577}} +\DeclareUnicodeCharacter{2578}{\pmboxdrawuni{2578}} +\DeclareUnicodeCharacter{2579}{\pmboxdrawuni{2579}} +\DeclareUnicodeCharacter{257A}{\pmboxdrawuni{257A}} +\DeclareUnicodeCharacter{257B}{\pmboxdrawuni{257B}} +\DeclareUnicodeCharacter{257C}{\pmboxdrawuni{257C}} +\DeclareUnicodeCharacter{257D}{\pmboxdrawuni{257D}} +\DeclareUnicodeCharacter{257E}{\pmboxdrawuni{257E}} +\DeclareUnicodeCharacter{257F}{\pmboxdrawuni{257R}} \DeclareUnicodeCharacter{2580}{\textupblock} +\DeclareUnicodeCharacter{2581}{\pmboxdrawuni{2581}} +\DeclareUnicodeCharacter{2582}{\pmboxdrawuni{2582}} +\DeclareUnicodeCharacter{2583}{\pmboxdrawuni{2583}} \DeclareUnicodeCharacter{2584}{\textdnblock} +\DeclareUnicodeCharacter{2585}{\pmboxdrawuni{2585}} +\DeclareUnicodeCharacter{2586}{\pmboxdrawuni{2586}} +\DeclareUnicodeCharacter{2587}{\pmboxdrawuni{2587}} \DeclareUnicodeCharacter{2588}{\textblock} +\DeclareUnicodeCharacter{2589}{\pmboxdrawuni{2589}} +\DeclareUnicodeCharacter{258A}{\pmboxdrawuni{258A}} +\DeclareUnicodeCharacter{258B}{\pmboxdrawuni{258B}} \DeclareUnicodeCharacter{258C}{\textlfblock} +\DeclareUnicodeCharacter{258D}{\pmboxdrawuni{258D}} +\DeclareUnicodeCharacter{258E}{\pmboxdrawuni{258E}} +\DeclareUnicodeCharacter{258F}{\pmboxdrawuni{258F}} \DeclareUnicodeCharacter{2590}{\textrtblock} \DeclareUnicodeCharacter{2591}{\textltshade} \DeclareUnicodeCharacter{2592}{\textshade} \DeclareUnicodeCharacter{2593}{\textdkshade} +\DeclareUnicodeCharacter{2594}{\pmboxdrawuni{2594}} +\DeclareUnicodeCharacter{2595}{\pmboxdrawuni{2595}} +\DeclareUnicodeCharacter{2596}{\pmboxdrawuni{2596}} +\DeclareUnicodeCharacter{2597}{\pmboxdrawuni{2597}} +\DeclareUnicodeCharacter{2598}{\pmboxdrawuni{2598}} +\DeclareUnicodeCharacter{2599}{\pmboxdrawuni{2599}} +\DeclareUnicodeCharacter{259A}{\pmboxdrawuni{259A}} +\DeclareUnicodeCharacter{259B}{\pmboxdrawuni{259B}} +\DeclareUnicodeCharacter{259C}{\pmboxdrawuni{259C}} +\DeclareUnicodeCharacter{259D}{\pmboxdrawuni{259D}} +\DeclareUnicodeCharacter{259E}{\pmboxdrawuni{259E}} +\DeclareUnicodeCharacter{259F}{\pmboxdrawuni{259F}} \endinput %% %% End of file `pmboxdrawenc.dfu'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty index d9c147d3a72..4992b01821a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1998, 2000, 2006, 2008 by +%% Copyright (C) 1998, 2000, 2006, 2008, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -27,35 +27,226 @@ %% %% This work consists of the main source file refcount.dtx %% and the derived files -%% refcount.sty, refcount.pdf, refcount.ins, refcount.drv. +%% refcount.sty, refcount.pdf, refcount.ins, refcount.drv, +%% refcount-test1.tex, refcount-test2.tex, refcount-test3.tex, +%% refcount-test4.tex. %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{refcount} - [2008/08/11 v3.1 Data extraction from references (HO)]% - -\def\setrefcountdefault#1{% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@refcount.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{refcount}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@refcount.sty\endcsname +\ProvidesPackage{refcount}% + [2010/12/01 v3.2 Data extraction from references (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname rc@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\rc@AtEnd{% + \rc@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\rc@AtEnd{\rc@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ltxcmds.sty\relax + \input infwarerr.sty\relax +\else + \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{infwarerr}[2010/04/08]% +\fi +\ltx@IfUndefined{@ifdefinable}{% + \def\rc@IfDefinable#1{% + \ifx#1\ltx@undefined + \expandafter\ltx@firstofone + \else + \ifx#1\relax + \expandafter\expandafter\expandafter\ltx@firstofone + \else + \@PackageError{refcount}{% + Command \string#1 is already defined.\MessageBreak + It will not redefined by this package% + }\@ehc + \expandafter\expandafter\expandafter\ltx@gobble + \fi + \fi + }% +}{% + \let\rc@IfDefinable\@ifdefinable +} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + #1\def#3##1{#4}% + }% + }% + }{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \DeclareRobustCommand#2#3[1]{#4}% + }% + }% + }% +}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \protected#1\def#3##1{#4}% + }% + }% +} +\ltx@IfUndefined{newcommand}{% + \def\rc@newcommand*#1[#2]#3{% hash-ok + \rc@IfDefinable#1{% + \ifcase#2 % + \def#1{#3}% + \or + \def#1##1{#3}% + \or + \def#1##1##2{#3}% + \else + \rc@InternalError + \fi + }% + }% +}{% + \let\rc@newcommand\newcommand +} +\rc@RobustDefOne\long{}\setrefcountdefault{% \def\rc@default{#1}% } \setrefcountdefault{0} - -\def\rc@cartwo#1#2#3\@nil{#2} - -\long\def\rc@refused#1{% - \expandafter\ifx\csname r@#1\endcsname\relax - \protect\G@refundefinedtrue +\ltx@IfUndefined{G@refundefinedtrue}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \protect\G@refundefinedtrue + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \csname protect\expandafter\endcsname + \csname G@refundefinedtrue\endcsname + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +} +\ltx@IfUndefined{@latex@warning}{% + \def\rc@WarningUndefined#1{% + \ltx@ifundefined{thepage}{% + \def\thepage{\number\count0 }% + }{}% + \@PackageWarning{refcount}{% + Reference `#1' on page \thepage\space undefined% + }% + }% +}{% + \def\rc@WarningUndefined#1{% \@latex@warning{% Reference `#1' on page \thepage\space undefined% }% - \fi -} - -\newcommand*{\refused}[1]{% - \begingroup - \csname @safe@activestrue\endcsname - \rc@refused{#1}{}% - \endgroup + }% } - \def\rc@set#1#2#3#4{% \begingroup \csname @safe@activestrue\endcsname @@ -72,70 +263,118 @@ }% \fi } - - -\newcommand*{\setcounterref}{\rc@set\setcounter\@car} -\newcommand*{\addtocounterref}{\rc@set\addtocounter\@car} -\newcommand*{\setcounterpageref}{\rc@set\setcounter\rc@cartwo} -\newcommand*{\addtocounterpageref}{\rc@set\addtocounter\rc@cartwo} - -\newcommand*{\getrefnumber}[1]{% - \expandafter\ifx\csname r@#1\endcsname\relax +\rc@newcommand*{\setcounterref}[0]{% + \rc@set\setcounter\ltx@car +} +\rc@newcommand*{\addtocounterref}[0]{% + \rc@set\addtocounter\ltx@car +} +\rc@newcommand*{\setcounterpageref}[0]{% + \rc@set\setcounter\ltx@cartwo +} +\rc@newcommand*{\addtocounterpageref}[0]{% + \rc@set\addtocounter\ltx@cartwo +} +\rc@newcommand*{\getrefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero \rc@default - \else - \expandafter\expandafter\expandafter\@car - \csname r@#1\endcsname\@nil - \fi + }{% + \expandafter\expandafter\expandafter\rc@extract@ + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\endcsname + \expandafter{\rc@default}\@nil + }% } -\newcommand*{\getpagerefnumber}[1]{% - \expandafter\ifx\csname r@#1\endcsname\relax +\rc@newcommand*{\getpagerefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero \rc@default - \else - \expandafter\expandafter\expandafter\rc@cartwo - \csname r@#1\endcsname\rc@default\rc@default\@nil - \fi + }{% + \expandafter\expandafter\expandafter\rc@extract@page + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter{% + \expandafter\rc@default + \expandafter}\expandafter{\rc@default}\@nil + }% } -\newcommand*{\getrefbykeydefault}[2]{% +\rc@newcommand*{\getrefbykeydefault}[2]{% + \romannumeral \expandafter\rc@getrefbykeydefault \csname r@#1\expandafter\endcsname \csname rc@extract@#2\endcsname } -\def\rc@getrefbykeydefault#1#2#3{% +\long\def\rc@getrefbykeydefault#1#2#3{% \ifx#1\relax % reference is undefined - #3% - \else - \ifx#2\relax - % extract method is missing + \ltx@ReturnAfterElseFi{% + \ltx@zero #3% - \else - \expandafter\rc@generic#1{#3}{#3}{#3}{#3}{#3}\@nil#2{#3}% - \fi + }% + \else + \ltx@ReturnAfterFi{% + \ifx#2\relax + % extract method is missing + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3% + }% + \else + \ltx@ReturnAfterFi{% + \expandafter + \rc@generic#1{#3}{#3}{#3}{#3}{#3}\@nil#2{#3}% + }% + \fi + }% \fi } -\def\rc@generic#1#2\@nil#3#4{% +\long\def\rc@generic#1#2\@nil#3#4{% #3{#1\TR@TitleReference\@empty{#4}\@nil}{#1}#2\@nil } -\def\rc@extract@{% - \expandafter\@car\@gobble +\long\def\rc@extract@#1#2#3\@nil{% + \ltx@zero + #2% } -\def\rc@extract@page{% - \expandafter\@car\@gobbletwo +\long\def\rc@extract@page#1#2#3#4\@nil{% + \ltx@zero + #3% } -\def\rc@extract@name{% - \expandafter\@car\@gobblefour\@empty +\long\def\rc@extract@name#1#2#3#4#5\@nil{% + \ltx@zero + #4% } -\def\rc@extract@anchor{% - \expandafter\@car\@gobblefour +\long\def\rc@extract@anchor#1#2#3#4#5#6\@nil{% + \ltx@zero + #5% } -\def\rc@extract@url{% - \expandafter\expandafter\expandafter\@car\expandafter - \@gobble\@gobblefour +\long\def\rc@extract@url#1#2#3#4#5#6#7\@nil{% + \ltx@zero + #6% } -\def\rc@extract@title#1#2\@nil{% +\long\def\rc@extract@title#1#2\@nil{% \rc@@extract@title#1% } -\def\rc@@extract@title#1\TR@TitleReference#2#3#4\@nil{#3} +\long\def\rc@@extract@title#1\TR@TitleReference#2#3#4\@nil{% + \ltx@zero + #3% +} +\rc@newcommand*{\IfRefUndefinedExpandable}[1]{% + \ltx@ifundefined{r@#1}\ltx@firstoftwo\ltx@secondoftwo +} +\rc@RobustDefOne{}*\IfRefUndefinedBabel{% + \begingroup + \csname safe@actives@true\endcsname + \expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname r@#1\endcsname\relax + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +\rc@AtEnd% \endinput %% %% End of file `refcount.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty b/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty index 93802df25f7..dd385a0ada7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty @@ -31,28 +31,37 @@ %% rerunfilecheck.drv, rerunfilecheck-example.cfg, %% rerunfilecheck-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ReFiCh@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ReFiCh@AtEnd{% \ReFiCh@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -64,12 +73,11 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` -\g@addto@macro\ReFiCh@AtEnd{\endinput} +\edef\ReFiCh@AtEnd{\ReFiCh@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rerunfilecheck}% [2010/03/16 v1.6 Rerun checks for auxiliary files (HO)] @@ -116,7 +124,7 @@ \newcommand*{\RerunFileCheck}[3]{}% \renewcommand*{\RerunFileCheckSetup}[1]{}% \expandafter\ReFiCh@AtEnd -\fi +\fi% \ifReFiCh@partaux \let\ReFiCh@org@include\@include \def\@include#1 {% @@ -337,7 +345,7 @@ \@onelevel@sanitize\ReFiCh@AuxEmptyUnix \def\ReFiCh@AuxEmptyDos{A62A15ECE803E2EBE94952FCC9933BC0;9}% \@onelevel@sanitize\ReFiCh@AuxEmptyDos -\ReFiCh@AtEnd +\ReFiCh@AtEnd% \endinput %% %% End of file `rerunfilecheck.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty index 83d38945e4d..55c396f9292 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty @@ -30,14 +30,18 @@ %% resizegather.sty, resizegather.pdf, resizegather.ins, resizegather.drv, %% resizegather-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@resizegather.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,29 +96,38 @@ \fi \expandafter\x\csname ver@resizegather.sty\endcsname \ProvidesPackage{resizegather}% - [2010/03/01 v1.2 Automatically resizing of too large equations (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v1.2 Automatically resizing of too large equations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ResizeGather@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ResizeGather@AtEnd{% \ResizeGather@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -130,13 +145,13 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` +\edef\ResizeGather@AtEnd{\ResizeGather@AtEnd\noexpand\endinput} \RequirePackage{kvoptions}[2009/12/04] \SetupKeyvalOptions{% family=resizegather,% @@ -299,7 +314,7 @@ \fi \fi } -\ResizeGather@AtEnd +\ResizeGather@AtEnd% \endinput %% %% End of file `resizegather.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def index 6d84d11e1e5..fe90ef93107 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-ascii.def}% - [2010/01/11 v1.6 Input encoding ascii (inputenx)]% + [2011/04/10 v1.8 Input encoding ascii (inputenx)]% \csname @inpenc@test\endcsname \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def index c7b57802237..54917ba89c3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-atarist.def}% - [2010/01/11 v1.6 Input encoding atarist (inputenx)]% + [2011/04/10 v1.8 Input encoding atarist (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def index a6b518ae750..c0044c9e87e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1250.def}% - [2010/01/11 v1.6 Input encoding cp1250 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1250 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def index 7f328036983..e81f011fd42 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1251.def}% - [2010/01/11 v1.6 Input encoding cp1251 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1251 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def index 31cc20e9115..c6bb74982f6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1252.def}% - [2010/01/11 v1.6 Input encoding cp1252 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1252 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def index bd681b4cdb2..38ff123ad40 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1257.def}% - [2010/01/11 v1.6 Input encoding cp1257 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1257 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -201,7 +201,7 @@ \DeclareInputText{233}{\@tabacckludge'e} \DeclareInputText{234}{\@tabacckludge'z} \DeclareInputText{235}{\.e} -\DeclareInputText{236}{\v g} +\DeclareInputText{236}{\c g} \DeclareInputText{237}{\c k} \DeclareInputText{238}{\@tabacckludge=\i} \DeclareInputText{239}{\c l} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def index d30f23b33ad..3261bca9028 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp437.def}% - [2010/01/11 v1.6 Input encoding cp437 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp437 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def index d4b4eb87c09..f3243584afb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp850.def}% - [2010/01/11 v1.6 Input encoding cp850 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp850 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def index 0310cc5f2d6..ed78ca1d788 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp852.def}% - [2010/01/11 v1.6 Input encoding cp852 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp852 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def index ed0ce76241c..e786eb65f49 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp855.def}% - [2010/01/11 v1.6 Input encoding cp855 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp855 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def index 092ff25cafe..e0b8549a04f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp858.def}% - [2010/01/11 v1.6 Input encoding cp858 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp858 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def index db854e7b7d1..ac60031691e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp865.def}% - [2010/01/11 v1.6 Input encoding cp865 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp865 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def index 354ee49d194..f2bc8a2c05f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp866.def}% - [2010/01/11 v1.6 Input encoding cp866 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp866 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def index dc8122fcc38..a464238c01a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-dec-mcs.def}% - [2010/01/11 v1.6 Input encoding dec-mcs (inputenx)]% + [2011/04/10 v1.8 Input encoding dec-mcs (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcent}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def index f7e59418ac7..ffd0cc0d80a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-1.def}% - [2010/01/11 v1.6 Input encoding iso-8859-1 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-1 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def index 0c04bab5ce1..e19fb748249 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-10.def}% - [2010/01/11 v1.6 Input encoding iso-8859-10 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-10 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -79,7 +79,7 @@ \DeclareInputText{176}{\textdegree} \DeclareInputText{177}{\k a} \DeclareInputText{178}{\@tabacckludge=e} -\DeclareInputText{179}{\v g} +\DeclareInputText{179}{\c g} \DeclareInputText{180}{\@tabacckludge=\i} \DeclareInputText{181}{\~\i} \DeclareInputText{182}{\c k} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def index 977337b2682..e7096a0c97b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-13.def}% - [2010/01/11 v1.6 Input encoding iso-8859-13 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-13 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% @@ -166,7 +166,7 @@ \DeclareInputText{233}{\@tabacckludge'e} \DeclareInputText{234}{\@tabacckludge'z} \DeclareInputText{235}{\.e} -\DeclareInputText{236}{\v g} +\DeclareInputText{236}{\c g} \DeclareInputText{237}{\c k} \DeclareInputText{238}{\@tabacckludge=\i} \DeclareInputText{239}{\c l} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def index a1a4941772b..c2ab0b334ad 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-14.def}% - [2010/01/11 v1.6 Input encoding iso-8859-14 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-14 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareInputText{160}{\nobreakspace} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def index 05a1cb37e2c..42c03f1de51 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-15.def}% - [2010/01/11 v1.6 Input encoding iso-8859-15 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-15 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciimacron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def index 286599589a4..b6395715e54 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-16.def}% - [2010/01/11 v1.6 Input encoding iso-8859-16 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-16 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcommabelow}[1]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def index caddcfecf60..74edd80d79c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-2.def}% - [2010/01/11 v1.6 Input encoding iso-8859-2 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-2 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def index f8485e8f44f..7944e027d20 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-3.def}% - [2010/01/11 v1.6 Input encoding iso-8859-3 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-3 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def index e3a3907e77a..c5a283b48f1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-4.def}% - [2010/01/11 v1.6 Input encoding iso-8859-4 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-4 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -105,7 +105,7 @@ \DeclareInputText{184}{\c\ } \DeclareInputText{185}{\v s} \DeclareInputText{186}{\@tabacckludge=e} -\DeclareInputText{187}{\v g} +\DeclareInputText{187}{\c g} \DeclareInputText{188}{\texttstroke} \DeclareInputText{189}{\NG} \DeclareInputText{190}{\v z} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def index 1e6ac6a5476..8f9b4f6a839 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-5.def}% - [2010/01/11 v1.6 Input encoding iso-8859-5 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-5 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textnumero}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def index da12674ef95..d3b725896af 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-8.def}% - [2010/01/11 v1.6 Input encoding iso-8859-8 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-8 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def index 8fed6ddc564..5c25e4614ab 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-9.def}% - [2010/01/11 v1.6 Input encoding iso-8859-9 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-9 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def index 81542f86f27..125a4a581b8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-koi8-r.def}% - [2010/01/11 v1.6 Input encoding koi8-r (inputenx)]% + [2011/04/10 v1.8 Input encoding koi8-r (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def index 799472a5b99..559d9b83b90 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-centeuro.def}% - [2010/01/11 v1.6 Input encoding mac-centeuro (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-centeuro (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciicaron}{% @@ -130,7 +130,7 @@ \DeclareInputText{171}{\k e} \DeclareInputText{172}{\textasciidieresis} \DeclareInputText{173}{\textnotequal} -\DeclareInputText{174}{\v g} +\DeclareInputText{174}{\c g} \DeclareInputText{175}{\k I} \DeclareInputText{176}{\k i} \DeclareInputText{177}{\@tabacckludge=I} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def index 3ad7b2a4f8a..db2cb2789bc 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-cyrillic.def}% - [2010/01/11 v1.6 Input encoding mac-cyrillic (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-cyrillic (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def index 192e16e78c2..0d74096d145 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-roman.def}% - [2010/01/11 v1.6 Input encoding mac-roman (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-roman (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textOmega}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def index 43eaaf6b8ef..93b955da8e3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-nextstep.def}% - [2010/01/11 v1.6 Input encoding nextstep (inputenx)]% + [2011/04/10 v1.8 Input encoding nextstep (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def new file mode 100644 index 00000000000..48099ba3989 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def @@ -0,0 +1,64 @@ +%% +%% This is file `x-verbatim.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% inputenx.dtx (with options: `verbatim') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file inputenx.dtx +%% and the derived files +%% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, +%% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, +%% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, +%% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, +%% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, +%% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, +%% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, +%% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, +%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, +%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, +%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, +%% inputenx-utf8enc.txt. +%% +\ProvidesFile{x-verbatim.def}% + [2011/04/10 v1.8 Input encoding verbatim (inputenx)]% +\csname @inpenc@test\endcsname +\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} +\makeatletter +\def\IPX@VerbatimLoop#1#2{% + \@tempcnta#1\relax + \loop + \catcode\@tempcnta=12 % + \ifnum\@tempcnta<#2\relax + \advance\@tempcnta\@ne + \repeat +} +\IPX@VerbatimLoop{1}{8} +\IPX@VerbatimLoop{11}{11} +\IPX@VerbatimLoop{14}{31} +\IPX@VerbatimLoop{127}{255} +\RestoreAtCatcode +\endinput +%% +%% End of file `x-verbatim.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty index 20a0f7bab24..8696830d331 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,28 +34,9 @@ %% hycolor-test-xcol4.tex. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2009/12/12 xcolor patch] -\@ifpackageloaded{xcolor}{% - \@firstofone -}{% - \@ifpackageloaded{scrlfile}{% - \AfterPackage{xcolor}% - }{% - \def\reserved@a{% - \edef\x{% - \endgroup - \noexpand\AtBeginDocument{% - \noexpand\@ifpackageloaded{xcolor}{\the\toks@}{}% - }% - }% - \x - }% - \begingroup - \afterassignment\reserved@a - \toks@ - }% -}% -{% +\ProvidesPackage{xcolor-patch}[2011/01/30 xcolor patch] +\RequirePackage{hopatch}[2011/01/30] +\hopatch@AfterPackage{xcolor}{% \long\def\reserved@a#1#2#3{% \long\def\@@tmp##1##2{% \ifx#1##1% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index eb9c4536056..3562d99da32 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/05/01 v2.17 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty index 58e78fb7455..1fdb3ecd5e5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,30 +29,30 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2010/05/01 v2.17 Module abspos for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module abspos for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2010/05/01] +\RequirePackage{zref-savepos}[2011/03/18] \ifx\ZREF@savepos@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-pagelayout}[2010/05/01] +\RequirePackage{zref-pagelayout}[2011/03/18] \zref@addprop{savepos}{abspage} \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 4ddad0871e9..ddfe2afab5c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,22 +29,24 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/05/01 v2.17 Module base for zref (HO)]% + [2011/03/18 v2.21 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/03/01] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] +\RequirePackage{kvdefinekeys}[2010/03/01] +\RequirePackage{pdftexcmds}[2010/04/01] \def\ZREF@name{zref} \ltx@IfUndefined{protected}{% \RequirePackage{makerobust}[2006/03/18]% @@ -157,7 +159,7 @@ }% }% } -\ZREF@Robust\def\zref@addprop#1#2{% +\ZREF@Robust\def\zref@addprops#1#2{% \zref@listexists{#1}{% \comma@parse{#2}{% \zref@propexists\comma@entry{% @@ -176,7 +178,23 @@ }% }% } -\ZREF@Robust\def\zref@localaddprop#1#2{% +\ZREF@Robust\def\zref@addprop#1#2{% + \zref@listexists{#1}{% + \zref@propexists{#2}{% + \zref@iflistcontainsprop{#1}{#2}{% + \PackageWarning\ZREF@name{% + Property `#2' is already in list `#1'% + }% + }{% + \begingroup\expandafter\endgroup + \expandafter\g@addto@macro + \csname Z@L@#1\expandafter\endcsname + \expandafter{\csname#2\endcsname}% + }% + }% + }% +} +\ZREF@Robust\def\zref@localaddprops#1#2{% \zref@listexists{#1}{% \comma@parse{#2}{% \zref@propexists\comma@entry{% @@ -195,6 +213,96 @@ }% }% } +\ZREF@Robust\def\zref@localaddprop#1#2{% + \zref@listexists{#1}{% + \zref@propexists{#2}{% + \zref@iflistcontainsprop{#1}{#2}{% + \PackageWarning\ZREF@name{% + Property `#2' is already in list `#1'% + }% + }{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \csname Z@L@#1\expandafter\endcsname + \expandafter{\csname#2\endcsname}% + }% + }% + }% +} +\ltx@IfUndefined{pdf@strcmp}{% + \ZREF@Robust\def\zref@delprop{% + \ZREF@delprop\gdef + }% + \ZREF@Robust\def\zref@localdelprop{% + \ZREF@delprop\def + }% + \def\ZREF@delprop#1#2#3{% + \zref@listexists{#2}{% + \begingroup + \escapechar=-1 % + \def\ZREF@param{#3}% + \@onelevel@sanitize\ZREF@param + \toks@{}% + \expandafter\expandafter\expandafter\ZREF@@delprop + \csname Z@L@#2\endcsname!% + \expandafter\endgroup + \expandafter#1\csname Z@L@#2\expandafter\endcsname + \expandafter{% + \the\toks@ + }% + }% + }% + \def\ZREF@@delprop#1{% + \expandafter\ZREF@@@delprop\expandafter{\string#1}#1% + }% + \def\ZREF@@@delprop#1#2{% + \ifx#2!% + \else + \def\ZREF@temp{#1}% + \@onelevel@sanitize\ZREF@temp + \ifx\ZREF@param\ZREF@temp + \else + \toks@\expandafter{% + \the\expandafter\toks@\csname#1\endcsname + }% + \fi + \expandafter\ZREF@@delprop + \fi + }% +}{% + \ZREF@Robust\def\zref@delprop{% + \ZREF@delprop\xdef + }% + \ZREF@Robust\def\zref@localdelprop{% + \ZREF@delprop\edef + }% + \def\ZREF@delprop#1#2#3{% + \zref@listexists{#2}{% + \def\ZREF@param{#3}% + \edef\ZREF@SavedEscapechar{\the\escapechar}% + \escapechar=-1 % + \expandafter#1\csname Z@L@#2% + \expandafter\expandafter\expandafter\endcsname{% + \expandafter\expandafter\expandafter\ZREF@@delprop + \csname Z@L@#2\endcsname!% + }% + \escapechar=\ZREF@SavedEscapechar\relax + }% + }% + \def\ZREF@@delprop#1{% + \expandafter\ZREF@@@delprop\expandafter{\string#1}#1% + }% + \def\ZREF@@@delprop#1#2{% + \ifx#2!% + \else + \ifnum\pdf@strcmp{#1}{\ZREF@param}=\ltx@zero + \else + \expandafter\noexpand\csname#1\endcsname + \fi + \expandafter\ZREF@@delprop + \fi + }% +} \def\zref@ifpropundefined#1{% \ltx@ifundefined{Z@E@#1}% } @@ -310,6 +418,77 @@ \expandafter\ZREF@label\expandafter{\the\toks@}{#1}% \@esphack } +\ZREF@Robust\def\zref@labelbykv#1#2{% + \@bsphack + \begingroup + \let\Z@L@ZREF@temp\ltx@empty + \kvsetkeys{ZREF@LABEL}{#1}% + \ifZREF@immediate + \expandafter\zref@wrapper@immediate\expandafter{% + \expandafter\ZREF@label\expandafter{\Z@L@ZREF@temp}{#2}% + }% + \else + \expandafter\ZREF@label\expandafter{\Z@L@ZREF@temp}{#2}% + \fi + \endgroup + \@esphack +} +\kv@define@key{ZREF@LABEL}{prop}{% + \edef\ZREF@param{#1}% + \zref@propexists\ZREF@param{% + \zref@iflistcontainsprop{ZREF@temp}\ZREF@param{}{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \expandafter\Z@L@ZREF@temp + \expandafter{\csname\ZREF@param\endcsname}% + }% + }% +} +\kv@define@key{ZREF@LABEL}{list}{% + \zref@listforloop{#1}{% + \zref@iflistcontainsprop{ZREF@temp}\zref@prop{}{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \expandafter\Z@L@ZREF@temp + \expandafter{\csname\zref@prop\endcsname}% + }% + \ltx@gobble + }% +} +\kv@define@key{ZREF@LABEL}{delprop}{% + \zref@propexists{#1}{% + \zref@localdelprop{ZREF@temp}{#1}% + }% +} +\kv@define@key{ZREF@LABEL}{immediate}[true]{% + \edef\ZREF@param{#1}% + \ifx\ZREF@param\ZREF@true + \ZREF@immediatetrue + \else + \ifx\ZREF@param\ZREF@false + \ZREF@immediatefalse + \else + \PackageWarning\ZREF@name{% + Option `immediate' expects `true' or `false'.\MessageBreak + Ignoring invalid value `\ZREF@param'% + }% + \fi + \fi +} +\def\ZREF@false{false} +\def\ZREF@true{true} +\kv@define@key{ZREF@LABEL}{values}[]{% + \kv@parse{#1}{% + \ifx\kv@value\relax + \@PackageWarning\ZREF@name{% + Missing value for property `\kv@key'% + }% + \expandafter\ltx@gobbletwo + \else + \expandafter\zref@setcurrent + \fi + }% +} \newif\ifZREF@immediate \ZREF@Robust{\long\def}\zref@wrapper@immediate#1{% \begingroup @@ -525,7 +704,22 @@ \zref@newlist\ZREF@mainlist \zref@newprop{default}{\@currentlabel} \zref@newprop*{page}{\thepage} -\zref@addprop\ZREF@mainlist{default,page} +\zref@addprops\ZREF@mainlist{default,page} +\def\ZREF@NewPropAnchor{% + \zref@newprop{anchor}{% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% + }% + \global\let\ZREF@NewPropAnchor\relax +} +\def\ZREF@NewPropTitle{% + \gdef\zref@titleref@current{}% + \zref@newprop{title}{\zref@titleref@current}% + \global\let\ZREF@NewPropTitle\relax +} +\def\ZREF@NewPropTheotype{% + \zref@newprop{theotype}{}% + \global\let\ZREF@NewPropTheotype\relax +} \let\ZREF@base@ok=Y \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 8cac67f2bc4..5a774fd4cdd 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/05/01 v2.17 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index be6d516bc9f..31f88f5a82d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/05/01 v2.17 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2010/05/01] +\RequirePackage{zref-savepos}[2011/03/18] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% @@ -62,7 +62,7 @@ \providecommand\ZREF@df@min{2} \providecommand\ZREF@df@unit{.44em} \providecommand\ZREF@df@dot{.} -\newcommand*{\zdotfillsetup}{\setkeys{ZREF@DF}} +\newcommand*{\zdotfillsetup}{\kvsetkeys{ZREF@DF}} \ZREF@IfDefinable\zdotfill\def{% {% \leavevmode diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty new file mode 100644 index 00000000000..e74e3b4ddfa --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty @@ -0,0 +1,62 @@ +%% +%% This is file `zref-env.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `env') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-env}% + [2011/03/18 v2.21 Module env for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] +\ifx\ZREF@base@ok Y% +\else + \expandafter\endinput +\fi +\zref@newprop{envname}[]{\@currenvir} +\zref@newprop{envline}[]{\zref@env@line} +\def\zref@env@line{% + \ifx\@currenvline\ltx@empty + \else + \expandafter + \ZREF@ENV@line\@currenvline\ltx@empty line \ltx@empty\@nil + \fi +} +\def\ZREF@ENV@line#1line #2\ltx@empty#3\@nil{#2}% +\endinput +%% +%% End of file `zref-env.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 38f106cea3a..0ca0fedd5c1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,29 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/05/01 v2.17 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\ltx@ifpackageloaded{zref-xr}{}{% - \zref@newprop{anchor}[]{% - \ltx@ifundefined{@currentHref}{}{\@currentHref}% - }% -} +\ZREF@NewPropAnchor \zref@addprop\ZREF@mainlist{anchor}% \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index c4820c2b996..f603dbfe945 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/05/01 v2.17 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] -\RequirePackage{zref-abspage}[2010/05/01] + [2011/03/18 v2.21 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] +\RequirePackage{zref-abspage}[2011/03/18] \RequirePackage{atveryend}[2009/12/07] \ifx\ZREF@base@ok Y% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index 913adbaffb9..78078f2a6fe 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,24 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/05/01 v2.17 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{kvsetkeys}[2009/07/30] \newcommand*{\zref@marks@register}[3][]{% \edef\ZREF@TempName{#1}% \edef\ZREF@TempNum{\ZREF@number#2}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index 8e8ef707587..c472c5d5c20 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,27 +29,27 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/05/01 v2.17 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] -\RequirePackage{zref-thepage}[2010/05/01] -\RequirePackage{zref-lastpage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{zref-thepage}[2011/03/18] +\RequirePackage{zref-lastpage}[2011/03/18] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty index 03c9352f3b5..e8609998fd5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2010/05/01 v2.17 Module pageattr for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module pageattr for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -83,7 +83,7 @@ \def\zref@pdfpageattr#1{}% \def\zref@pdfpageattr@used#1{}% }{% - \RequirePackage{zref-thepage}[2010/05/01]% + \RequirePackage{zref-thepage}[2011/03/18]% \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}% \zref@addprop{thepage}{pdfpageattr}% \let\ZREF@temp=Y% @@ -95,7 +95,7 @@ \def\zref@pdfpagesattr{}% \def\zref@pdfpagesattr@used{}% }{% - \RequirePackage{zref-lastpage}[2010/05/01]% + \RequirePackage{zref-lastpage}[2011/03/18]% \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}% \zref@addprop{LastPage}{pdfpagesattr}% \let\ZREF@temp=Y% @@ -103,7 +103,7 @@ \ifx\ZREF@temp N% \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \RequirePackage{atveryend}[2010/03/24] \RequirePackage{pdftexcmds}[2010/04/01] \let\ZREF@temp=Y% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty index e92c9cfa012..1c16d9b5c50 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2010/05/01 v2.17 Module pagelayout for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module pagelayout for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-thepage}[2010/05/01] +\RequirePackage{zref-thepage}[2011/03/18] \RequirePackage{ifluatex}[2010/03/01] \RequirePackage{atveryend}[2010/03/24] \ifluatex @@ -118,7 +118,7 @@ \ZREF@temp\columnsep \ltx@newif\ifZREF@pl@list \ZREF@IfDefinable\zlistpagelayout\def{% - {\ZREF@pl@listtrue}% + {\global\ZREF@pl@listtrue}% } \def\ZREF@pl@AfterLastShipout{% \ifZREF@pl@list @@ -129,7 +129,7 @@ \ZREF@org@testdef{##1}{##2}{##3}% \def\ZREF@temp{##1}% \ifx\ZREF@temp\ZREF@RefPrefix - \expandafter\xdef\csname##1@##2\endcsname{##3}% + \expandafter\gdef\csname##1@##2\endcsname{##3}% \fi }% }{}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index 4971af69c66..4c1abf6d2ca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,28 +29,28 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/05/01 v2.17 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} -\zref@addprop{perpage}{abspage,page,pagevalue} +\zref@addprops{perpage}{abspage,page,pagevalue} \newcounter{zpage} \zref@require@unique \let\ZREF@org@stepcounter\stepcounter diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index abfd3be94be..388e23a1f64 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/05/01 v2.17 Module runs for zref (HO)]% + [2011/03/18 v2.21 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index 1216f0e6cf9..86515034226 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/05/01 v2.17 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -72,12 +72,17 @@ \zref@newlist{savepos} \zref@newprop*{posx}[0]{\the\pdflastxpos} \zref@newprop*{posy}[0]{\the\pdflastypos} -\zref@addprop{savepos}{posx,posy} +\zref@addprops{savepos}{posx,posy} +\def\zref@savepos{% + \if@filesw + \pdfsavepos + \fi +} \ZREF@IfDefinable\zsavepos\def{% #1{% \@bsphack \if@filesw - \pdfsavepos + \zref@savepos \zref@labelbylist{#1}{savepos}% \fi \@esphack diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index f61c704f942..1d407e42b03 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,26 +29,26 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/05/01 v2.17 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 2b4aed81388..42bb1160412 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,28 +29,27 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/05/01 v2.17 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} -\let\zref@titleref@current\ltx@empty -\zref@newprop{title}{\zref@titleref@current}% +\ZREF@NewPropTitle \zref@addprop\ZREF@mainlist{title}% \newif\ifzref@titleref@expand \let\ZREF@titleref@hook\ltx@empty @@ -100,7 +99,7 @@ \def\zref@titleref@current{#1}% }% \ZREF@IfDefinable\ztitlerefsetup\def{% - {\setkeys{ZREF@TR}}% + {\kvsetkeys{ZREF@TR}}% }% \ZREF@IfDefinable\ztitleref\def{% {\zref@wrapper@babel\ZREF@titleref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 8759cc82790..640b5c6c9c2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,26 +29,26 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/05/01 v2.17 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] -\RequirePackage{zref-lastpage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{zref-lastpage}[2011/03/18] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index 600dc10fbf0..a6b08557b0e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/05/01 v2.17 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module user for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -54,6 +54,12 @@ \expandafter\zref@wrapper@babel\expandafter\zref@label \fi }% +\newcommand*{\zkvlabel}[1]{% + \ifx\label\ltx@gobble + \expandafter\ltx@gobblethree + \fi + \zref@wrapper@babel{\zref@labelbykv{#1}}% +}% \newcommand*{\zref}[2][default]{% robust because of optional argument \zref@propexists{#1}{% \zref@wrapper@babel\ZREF@zref{#2}{#1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 468ae836c32..c14b713c02b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/05/01 v2.17 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -52,26 +52,6 @@ \zref@newprop{url}{}% \zref@newprop{urluse}{}% \zref@newprop{externaldocument}{}% -\def\ZREF@xr@NewPropAnchor{% - \ltx@ifpackageloaded{zref-hyper}{% - }{% - \zref@newprop{anchor}{% - \ltx@ifundefined{@currentHref}{}{\@currentHref}% - }% - }% - \global\let\ZREF@xr@NewPropAnchor\relax -} -\def\ZREF@xr@NewPropTitle{% - \ltx@ifpackageloaded{zref-title}{% - }{% - \zref@newprop{title}{}% - }% - \global\let\ZREF@xr@NewPropTitle\relax -} -\def\ZREF@xr@NewPropTheotype{% - \zref@newprop{theotype}{}% - \global\let\ZREF@xr@NewPropTheotype -} \providecommand*{\zref@xr@ext}{% \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% @@ -88,7 +68,7 @@ } \DeclareBoolOption[false]{urluse} \newcommand*{\zxrsetup}{% - \setkeys{ZREF@XR}% + \kvsetkeys{ZREF@XR}% }% \newcount\ZREF@xr@URL \ZREF@xr@URL=\ltx@zero @@ -120,8 +100,8 @@ } \ZREF@IfDefinable\zexternaldocument\def{% {% - \ZREF@xr@NewPropAnchor - \ZREF@xr@NewPropTitle + \ZREF@NewPropAnchor + \ZREF@NewPropTitle \begingroup \csname @safe@actives@true\endcsname \makeatletter @@ -291,7 +271,7 @@ \ifx\\#4\\% \else % ntheorem knows an optional argument at the end of \newlabel - \ZREF@xr@NewPropTheotype + \ZREF@NewPropTheotype \expandafter\ltx@LocalAppendToMacro \csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}% \fi @@ -365,8 +345,8 @@ Zref label `#1' is already in use\MessageBreak in file `\ZREF@xr@file'% }% - \edef\ZREF@xr@ignored@empty{% - \the\numexpr\ZREF@xr@ignored+1% + \edef\ZREF@xr@ignored@zref{% + \the\numexpr\ZREF@xr@ignored@zref+1% }% }% \def\ZREF@xr@ltx@ignorewarning#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index cdc2a903d59..5844e3a4060 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/05/01 v2.17 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2011/03/18] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/05/01]% + \RequirePackage{zref-#1}[2011/03/18]% }% }% } |